lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed underscores from NPC template elements.

Browse Source
This commit is contained in:
MobiusDev
2018-12-20 17:51:48 +00:00
parent b831ca2578
commit 43710d966f
1463 changed files with 461606 additions and 462698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
View File

@ -287,9 +287,9 @@ public class NpcData implements IGameXmlReader
}
break;
}
case "hit_time":
case "hitTime":
{
set.set("hit_time", npc_node.getTextContent()); // TODO: Implement me default 600 (value in ms)
set.set("hitTime", npc_node.getTextContent()); // TODO: Implement me default 600 (value in ms)
break;
}
}
@ -317,7 +317,7 @@ public class NpcData implements IGameXmlReader
set.set("fakePlayerTalkable", parseBoolean(attrs, "fakePlayerTalkable"));
break;
}
case "skill_list":
case "skillList":
{
skills = new HashMap<>();
for (Node skill_list_node = npc_node.getFirstChild(); skill_list_node != null; skill_list_node = skill_list_node.getNextSibling())
@ -348,19 +348,19 @@ public class NpcData implements IGameXmlReader
set.set("spiritShotChance", parseInteger(attrs, "spiritChance"));
break;
}
case "corpse_time":
case "corpseTime":
{
set.set("corpseTime", npc_node.getTextContent());
break;
}
case "ex_crt_effect":
case "exCrtEffect":
{
set.set("ex_crt_effect", npc_node.getTextContent()); // TODO: Implement me default ? type boolean
set.set("exCrtEffect", npc_node.getTextContent()); // TODO: Implement me default ? type boolean
break;
}
case "s_npc_prop_hp_rate":
case "sNpcPropHpRate":
{
set.set("s_npc_prop_hp_rate", npc_node.getTextContent()); // TODO: Implement me default 1 type double
set.set("sNpcPropHpRate", npc_node.getTextContent()); // TODO: Implement me default 1 type double
break;
}
case "ai":
@ -387,7 +387,7 @@ public class NpcData implements IGameXmlReader
set.set("longRangeSkillChance", parseInteger(attrs, "longRangeChance"));
break;
}
case "clan_list":
case "clanList":
{
for (Node clan_list_node = ai_node.getFirstChild(); clan_list_node != null; clan_list_node = clan_list_node.getNextSibling())
{
@ -403,7 +403,7 @@ public class NpcData implements IGameXmlReader
clans.add(getOrCreateClanId(clan_list_node.getTextContent()));
break;
}
case "ignore_npc_id":
case "ignoreNpcId":
{
if (ignoreClanNpcIds == null)
{
@ -420,7 +420,7 @@ public class NpcData implements IGameXmlReader
}
break;
}
case "drop_lists":
case "dropLists":
{
for (Node drop_lists_node = npc_node.getFirstChild(); drop_lists_node != null; drop_lists_node = drop_lists_node.getNextSibling())
{
@ -461,14 +461,14 @@ public class NpcData implements IGameXmlReader
}
break;
}
case "extend_drop":
case "extendDrop":
{
final List<Integer> extendDrop = new ArrayList<>();
forEach(npc_node, "id", idNode ->
{
extendDrop.add(Integer.parseInt(idNode.getTextContent()));
});
set.set("extend_drop", extendDrop);
set.set("extendDrop", extendDrop);
break;
}
case "collision":
@ -629,7 +629,7 @@ public class NpcData implements IGameXmlReader
switch (dropHolder.getDropType())
{
case DROP:
case LUCKY_DROP: // Lucky drops are added to normal drops and calculated later
case LUCKY: // Lucky drops are added to normal drops and calculated later
{
template.addDrop(dropHolder);
break;

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/DropType.java
View File

@ -23,5 +23,5 @@ public enum DropType
{
DROP,
SPOIL,
LUCKY_DROP;
LUCKY;
}

12
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@ -168,7 +168,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
_passableDoor = set.getBoolean("passableDoor", false);
_hasSummoner = set.getBoolean("hasSummoner", false);
_canBeSown = set.getBoolean("canBeSown", false);
_canBeCrt = set.getBoolean("ex_crt_effect", true);
_canBeCrt = set.getBoolean("exCrtEffect", true);
_isDeathPenalty = set.getBoolean("isDeathPenalty", false);
_corpseTime = set.getInt("corpseTime", Config.DEFAULT_CORPSE_TIME);
@ -188,8 +188,8 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
_minSkillChance = set.getInt("minSkillChance", 7);
_maxSkillChance = set.getInt("maxSkillChance", 15);
_hitTimeFactor = set.getInt("hit_time", 100) / 100d;
_hitTimeFactorSkill = set.getInt("hit_time_skill", 100) / 100d;
_hitTimeFactor = set.getInt("hitTime", 100) / 100d;
_hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d;
_collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0);
_collisionHeightGrown = set.getDouble("collisionHeightGrown", 0);
@ -199,7 +199,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
_mpRewardTicks = set.getInt("mpRewardTicks", 0);
_mpRewardAffectType = set.getEnum("mpRewardAffectType", MpRewardAffectType.class, MpRewardAffectType.SOLO);
_extendDrop = set.getList("extend_drop", Integer.class);
_extendDrop = set.getList("extendDrop", Integer.class);
if (Config.ENABLE_NPC_STAT_MULTIPIERS) // Custom NPC Stat Multipliers
{
@ -682,7 +682,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
switch (dropType)
{
case DROP:
case LUCKY_DROP: // never happens
case LUCKY: // never happens
{
return _dropListDeath;
}
@ -866,7 +866,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
}
break;
}
case LUCKY_DROP:
case LUCKY:
{
// try chance before luck
if (((Rnd.nextDouble() * 100) < dropItem.getChance()) && (killer.getActingPlayer() != null) && killer.getActingPlayer().tryLuck())