Implementation of item template default values.

This commit is contained in:
MobiusDevelopment 2020-01-27 02:48:10 +00:00
parent 053319b432
commit fb21f2c562
97 changed files with 30 additions and 83297 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -3,23 +3,13 @@
<item id="9200" type="Armor" name="Jester Hat - Firework"> <item id="9200" type="Armor" name="Jester Hat - Firework">
<!-- A festive, shadow-type jester hat with 2 points. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. --> <!-- A festive, shadow-type jester hat with 2 points. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. -->
<set name="bodypart" val="dhair"/> <set name="bodypart" val="dhair"/>
<set name="crystallizable" val="false"/>
<set name="armor_type" val="none"/> <set name="armor_type" val="none"/>
<set name="weight" val="10"/> <set name="weight" val="10"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="avoid_modify" val="0"/>
<set name="duration" val="300"/> <set name="duration" val="300"/>
<set name="p_def" val="0"/>
<set name="m_def" val="0"/>
<set name="mp_bonus" val="0"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="false"/> <set name="sellable" val="false"/>
<set name="dropable" val="false"/> <set name="dropable" val="false"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="false"/> <set name="tradeable" val="false"/>
<set name="item_skill_id" val="0"/>
<set name="item_skill_lvl" val="0"/>
<for> <for>
<add val="0" order="0x10" stat="pDef"/> <add val="0" order="0x10" stat="pDef"/>
</for> </for>
@ -27,23 +17,13 @@
<item id="9201" type="Armor" name="Wizard Hat - Firework"> <item id="9201" type="Armor" name="Wizard Hat - Firework">
<!-- A shadow-type wizard hat with a wide brim and bent tip. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. --> <!-- A shadow-type wizard hat with a wide brim and bent tip. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. -->
<set name="bodypart" val="dhair"/> <set name="bodypart" val="dhair"/>
<set name="crystallizable" val="false"/>
<set name="armor_type" val="none"/> <set name="armor_type" val="none"/>
<set name="weight" val="10"/> <set name="weight" val="10"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="avoid_modify" val="0"/>
<set name="duration" val="300"/> <set name="duration" val="300"/>
<set name="p_def" val="0"/>
<set name="m_def" val="0"/>
<set name="mp_bonus" val="0"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="false"/> <set name="sellable" val="false"/>
<set name="dropable" val="false"/> <set name="dropable" val="false"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="false"/> <set name="tradeable" val="false"/>
<set name="item_skill_id" val="0"/>
<set name="item_skill_lvl" val="0"/>
<for> <for>
<add val="0" order="0x10" stat="pDef"/> <add val="0" order="0x10" stat="pDef"/>
</for> </for>
@ -51,23 +31,13 @@
<item id="9202" type="Armor" name="Dapper Hat - Firework"> <item id="9202" type="Armor" name="Dapper Hat - Firework">
<!-- A shadow-type hair accessory with a visor. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. --> <!-- A shadow-type hair accessory with a visor. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. -->
<set name="bodypart" val="dhair"/> <set name="bodypart" val="dhair"/>
<set name="crystallizable" val="false"/>
<set name="armor_type" val="none"/> <set name="armor_type" val="none"/>
<set name="weight" val="10"/> <set name="weight" val="10"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="avoid_modify" val="0"/>
<set name="duration" val="300"/> <set name="duration" val="300"/>
<set name="p_def" val="0"/>
<set name="m_def" val="0"/>
<set name="mp_bonus" val="0"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="false"/> <set name="sellable" val="false"/>
<set name="dropable" val="false"/> <set name="dropable" val="false"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="false"/> <set name="tradeable" val="false"/>
<set name="item_skill_id" val="0"/>
<set name="item_skill_lvl" val="0"/>
<for> <for>
<add val="0" order="0x10" stat="pDef"/> <add val="0" order="0x10" stat="pDef"/>
</for> </for>
@ -75,23 +45,13 @@
<item id="9203" type="Armor" name="Romantic Chapeau - Firework"> <item id="9203" type="Armor" name="Romantic Chapeau - Firework">
<!-- A shadow-type hair accessory adorned with feathers. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. --> <!-- A shadow-type hair accessory adorned with feathers. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. -->
<set name="bodypart" val="dhair"/> <set name="bodypart" val="dhair"/>
<set name="crystallizable" val="false"/>
<set name="armor_type" val="none"/> <set name="armor_type" val="none"/>
<set name="weight" val="10"/> <set name="weight" val="10"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="avoid_modify" val="0"/>
<set name="duration" val="300"/> <set name="duration" val="300"/>
<set name="p_def" val="0"/>
<set name="m_def" val="0"/>
<set name="mp_bonus" val="0"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="false"/> <set name="sellable" val="false"/>
<set name="dropable" val="false"/> <set name="dropable" val="false"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="false"/> <set name="tradeable" val="false"/>
<set name="item_skill_id" val="0"/>
<set name="item_skill_lvl" val="0"/>
<for> <for>
<add val="0" order="0x10" stat="pDef"/> <add val="0" order="0x10" stat="pDef"/>
</for> </for>
@ -99,92 +59,47 @@
<item id="9204" type="Armor" name="Iron Circlet - Firework"> <item id="9204" type="Armor" name="Iron Circlet - Firework">
<!-- A shadow-type hair accessory made of iron. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. --> <!-- A shadow-type hair accessory made of iron. Uses 2 hair accessory slots. An event hair accessory that grants a magical effect. This item cannot be exchanged, dropped, or sold. -->
<set name="bodypart" val="dhair"/> <set name="bodypart" val="dhair"/>
<set name="crystallizable" val="false"/>
<set name="armor_type" val="none"/> <set name="armor_type" val="none"/>
<set name="weight" val="10"/> <set name="weight" val="10"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="avoid_modify" val="0"/>
<set name="duration" val="300"/> <set name="duration" val="300"/>
<set name="p_def" val="0"/>
<set name="m_def" val="0"/>
<set name="mp_bonus" val="0"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="false"/> <set name="sellable" val="false"/>
<set name="dropable" val="false"/> <set name="dropable" val="false"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="false"/> <set name="tradeable" val="false"/>
<set name="item_skill_id" val="0"/>
<set name="item_skill_lvl" val="0"/>
<for> <for>
<add val="0" order="0x10" stat="pDef"/> <add val="0" order="0x10" stat="pDef"/>
</for> </for>
</item> </item>
<item id="9205" type="EtcItem" name="Alchemist's Chest Key (Event)"> <item id="9205" type="EtcItem" name="Alchemist's Chest Key (Event)">
<!-- A key to open an Alchemist's Treasure Chest. For use in events only --> <!-- A key to open an Alchemist's Treasure Chest. For use in events only -->
<set name="crystallizable" val="false"/>
<set name="item_type" val="none"/> <set name="item_type" val="none"/>
<set name="weight" val="10"/> <set name="weight" val="10"/>
<set name="consume_type" val="stackable"/> <set name="consume_type" val="stackable"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="duration" val="-1"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="true"/>
<set name="dropable" val="true"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="true"/>
</item> </item>
<item id="9206" type="EtcItem" name="Greater Healing Potion (Event)"> <item id="9206" type="EtcItem" name="Greater Healing Potion (Event)">
<!-- A magical potion that quickly restores HP. Its effect lasts for 15 seconds. Designed for use in events only. --> <!-- A magical potion that quickly restores HP. Its effect lasts for 15 seconds. Designed for use in events only. -->
<set name="crystallizable" val="false"/>
<set name="item_type" val="potion"/> <set name="item_type" val="potion"/>
<set name="weight" val="5"/> <set name="weight" val="5"/>
<set name="consume_type" val="stackable"/> <set name="consume_type" val="stackable"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="duration" val="-1"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="true"/>
<set name="dropable" val="true"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="true"/>
</item> </item>
<item id="9207" type="EtcItem" name="Quick Healing Potion (Event)"> <item id="9207" type="EtcItem" name="Quick Healing Potion (Event)">
<!-- A magical potion that quickly restores HP. Its effect is temporary. Designed for use in events only. --> <!-- A magical potion that quickly restores HP. Its effect is temporary. Designed for use in events only. -->
<set name="crystallizable" val="false"/>
<set name="item_type" val="potion"/> <set name="item_type" val="potion"/>
<set name="weight" val="5"/> <set name="weight" val="5"/>
<set name="consume_type" val="stackable"/> <set name="consume_type" val="stackable"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="duration" val="-1"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="true"/>
<set name="dropable" val="true"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="true"/>
</item> </item>
<item id="9208" type="Armor" name="Phantom Mask (Event)"> <item id="9208" type="Armor" name="Phantom Mask (Event)">
<!-- A feathered hair accessory. This item cannot be exchanged or dropped. --> <!-- A feathered hair accessory. This item cannot be exchanged or dropped. -->
<set name="bodypart" val="dhair"/> <set name="bodypart" val="dhair"/>
<set name="crystallizable" val="false"/>
<set name="armor_type" val="none"/> <set name="armor_type" val="none"/>
<set name="weight" val="10"/> <set name="weight" val="10"/>
<set name="crystal_type" val="none"/> <set name="crystal_type" val="none"/>
<set name="avoid_modify" val="0"/>
<set name="duration" val="-1"/>
<set name="p_def" val="0"/>
<set name="m_def" val="0"/>
<set name="mp_bonus" val="0"/>
<set name="price" val="0"/>
<set name="crystal_count" val="0"/>
<set name="sellable" val="false"/> <set name="sellable" val="false"/>
<set name="dropable" val="false"/> <set name="dropable" val="false"/>
<set name="destroyable" val="true"/>
<set name="tradeable" val="false"/> <set name="tradeable" val="false"/>
<set name="item_skill_id" val="0"/>
<set name="item_skill_lvl" val="0"/>
<for> <for>
<add val="0" order="0x10" stat="pDef"/> <add val="0" order="0x10" stat="pDef"/>
</for> </for>

View File

@ -261,15 +261,15 @@ public class ManorSeedData implements IXmlReader
*/ */
public List<Integer> getSeedsForCastle(int castleId) public List<Integer> getSeedsForCastle(int castleId)
{ {
final List<Integer> seedsID = new ArrayList<>(); final List<Integer> seedIds = new ArrayList<>();
for (SeedDataHolder seed : _seeds.values()) for (SeedDataHolder seed : _seeds.values())
{ {
if ((seed.getCastleId() == castleId) && !seedsID.contains(seed.getId())) if ((seed.getCastleId() == castleId) && !seedIds.contains(seed.getId()))
{ {
seedsID.add(seed.getId()); seedIds.add(seed.getId());
} }
} }
return seedsID; return seedIds;
} }
/** /**

View File

@ -56,14 +56,14 @@ public class Armor extends Item
public Armor(ArmorType type, StatSet set) public Armor(ArmorType type, StatSet set)
{ {
super(type, set); super(type, set);
_avoidModifier = set.getInt("avoid_modify"); _avoidModifier = set.getInt("avoid_modify", 0);
_pDef = set.getInt("p_def"); _pDef = set.getInt("p_def", 0);
_mDef = set.getInt("m_def"); _mDef = set.getInt("m_def", 0);
_mpBonus = set.getInt("mp_bonus", 0); _mpBonus = set.getInt("mp_bonus", 0);
_hpBonus = set.getInt("hp_bonus", 0); _hpBonus = set.getInt("hp_bonus", 0);
final int sId = set.getInt("item_skill_id"); final int sId = set.getInt("item_skill_id", 0);
final int sLv = set.getInt("item_skill_lvl"); final int sLv = set.getInt("item_skill_lvl", 0);
if ((sId > 0) && (sLv > 0)) if ((sId > 0) && (sLv > 0))
{ {
_itemSkill = SkillTable.getInstance().getInfo(sId, sLv); _itemSkill = SkillTable.getInstance().getInfo(sId, sLv);

View File

@ -168,8 +168,8 @@ public abstract class Item
_name = set.getString("name"); _name = set.getString("name");
_type1 = set.getInt("type1"); // needed for item list (inventory) _type1 = set.getInt("type1"); // needed for item list (inventory)
_type2 = set.getInt("type2"); // different lists for armor, weapon, etc _type2 = set.getInt("type2"); // different lists for armor, weapon, etc
_weight = set.getInt("weight"); _weight = set.getInt("weight", 0);
_crystallizable = set.getBoolean("crystallizable"); _crystallizable = set.getBoolean("crystallizable", false);
_stackable = set.getBoolean("stackable", false); _stackable = set.getBoolean("stackable", false);
switch (set.getString("crystal_type", "")) switch (set.getString("crystal_type", ""))
{ {
@ -204,7 +204,7 @@ public abstract class Item
break; break;
} }
} }
_duration = set.getInt("duration"); _duration = set.getInt("duration", -1);
switch (set.getString("bodypart", "")) switch (set.getString("bodypart", ""))
{ {
case "chest": case "chest":
@ -331,7 +331,7 @@ public abstract class Item
} }
} }
_referencePrice = set.getInt("price"); _referencePrice = set.getInt("price", 0);
_crystalCount = set.getInt("crystal_count", 0); _crystalCount = set.getInt("crystal_count", 0);
_sellable = set.getBoolean("sellable", true); _sellable = set.getBoolean("sellable", true);
_dropable = set.getBoolean("dropable", true); _dropable = set.getBoolean("dropable", true);

View File

@ -89,32 +89,32 @@ public class Weapon extends Item
_pDam = set.getInt("p_dam"); _pDam = set.getInt("p_dam");
_rndDam = set.getInt("rnd_dam"); _rndDam = set.getInt("rnd_dam");
_critical = set.getInt("critical"); _critical = set.getInt("critical");
_hitModifier = set.getDouble("hit_modify"); _hitModifier = set.getDouble("hit_modify", 0);
_avoidModifier = set.getInt("avoid_modify"); _avoidModifier = set.getInt("avoid_modify", 0);
_shieldDef = set.getInt("shield_def"); _shieldDef = set.getInt("shield_def", 0);
_shieldDefRate = set.getDouble("shield_def_rate"); _shieldDefRate = set.getDouble("shield_def_rate", 0);
_atkSpeed = set.getInt("atk_speed"); _atkSpeed = set.getInt("atk_speed", 0);
_atkReuse = set.getInt("atk_reuse", type == WeaponType.BOW ? 1500 : 0); _atkReuse = set.getInt("atk_reuse", type == WeaponType.BOW ? 1500 : 0);
_mpConsume = set.getInt("mp_consume"); _mpConsume = set.getInt("mp_consume", 0);
_mDam = set.getInt("m_dam"); _mDam = set.getInt("m_dam", 0);
int sId = set.getInt("item_skill_id"); int sId = set.getInt("item_skill_id", 0);
int sLv = set.getInt("item_skill_lvl"); int sLv = set.getInt("item_skill_lvl", 0);
if ((sId > 0) && (sLv > 0)) if ((sId > 0) && (sLv > 0))
{ {
_itemSkill = SkillTable.getInstance().getInfo(sId, sLv); _itemSkill = SkillTable.getInstance().getInfo(sId, sLv);
} }
sId = set.getInt("enchant4_skill_id"); sId = set.getInt("enchant4_skill_id", 0);
sLv = set.getInt("enchant4_skill_lvl"); sLv = set.getInt("enchant4_skill_lvl", 0);
if ((sId > 0) && (sLv > 0)) if ((sId > 0) && (sLv > 0))
{ {
_enchant4Skill = SkillTable.getInstance().getInfo(sId, sLv); _enchant4Skill = SkillTable.getInstance().getInfo(sId, sLv);
} }
sId = set.getInt("onCast_skill_id"); sId = set.getInt("onCast_skill_id", 0);
sLv = set.getInt("onCast_skill_lvl"); sLv = set.getInt("onCast_skill_lvl", 0);
int sCh = set.getInt("onCast_skill_chance"); int sCh = set.getInt("onCast_skill_chance", 0);
if ((sId > 0) && (sLv > 0) && (sCh > 0)) if ((sId > 0) && (sLv > 0) && (sCh > 0))
{ {
final Skill skill = SkillTable.getInstance().getInfo(sId, sLv); final Skill skill = SkillTable.getInstance().getInfo(sId, sLv);
@ -122,9 +122,9 @@ public class Weapon extends Item
attachOnCast(skill); attachOnCast(skill);
} }
sId = set.getInt("onCrit_skill_id"); sId = set.getInt("onCrit_skill_id", 0);
sLv = set.getInt("onCrit_skill_lvl"); sLv = set.getInt("onCrit_skill_lvl", 0);
sCh = set.getInt("onCrit_skill_chance"); sCh = set.getInt("onCrit_skill_chance", 0);
if ((sId > 0) && (sLv > 0) && (sCh > 0)) if ((sId > 0) && (sLv > 0) && (sCh > 0))
{ {
final Skill skill = SkillTable.getInstance().getInfo(sId, sLv); final Skill skill = SkillTable.getInstance().getInfo(sId, sLv);