Default NPC type should be set as Folk.

This commit is contained in:
MobiusDevelopment
2021-11-23 02:07:30 +00:00
parent 3227e80226
commit a8aa0f4917
48 changed files with 48 additions and 48 deletions

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -681,7 +681,7 @@ public class NpcTable
final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values())
{
if (t.getName().startsWith(letter) && "Npc".equals(t.getType()))
if (t.getName().startsWith(letter) && "Folk".equals(t.getType()))
{
list.add(t);
}

View File

@@ -681,7 +681,7 @@ public class NpcTable
final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values())
{
if (t.getName().startsWith(letter) && "Npc".equals(t.getType()))
if (t.getName().startsWith(letter) && "Folk".equals(t.getType()))
{
list.add(t);
}

View File

@@ -761,7 +761,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -121,7 +121,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -761,7 +761,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -121,7 +121,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -774,7 +774,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");

View File

@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
*/
public List<NpcTemplate> getAllNpcStartingWith(String text)
{
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text));
return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
}
/**

View File

@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85);
_type = set.getString("type", "Npc");
_type = set.getString("type", "Folk");
_name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", "");