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

Implementation of item template default values.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ManorSeedData.java
View File

@@ -261,15 +261,15 @@ public class ManorSeedData implements IXmlReader
*/
public List<Integer> getSeedsForCastle(int castleId)
{
final List<Integer> seedsID = new ArrayList<>();
final List<Integer> seedIds = new ArrayList<>();
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;
}
/**

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java
View File

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

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java
View File

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

34
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java
View File

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