swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-10-16 07:13:29 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Merge remote-tracking branch 'upstream/master'"

Browse Source 
This reverts commit 369ece8ecc, reversing
changes made to ddffe98299.
This commit is contained in:
RisTanA
2020-06-07 02:15:55 -07:00
parent 369ece8ecc
commit 9058eae8db
70 changed files with 1124 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/item/static_item_base.java
+4 -4
View File
@@ -177,7 +177,7 @@ public class static_item_base extends script.base_script
if (requiredLevelToEquip != 0 && !hasScript(self, "systems.combat.combat_weapon"))
{
names[free] = utils.packStringId(new string_id("proc/proc", "required_combat_level"));
attribs[free++] = Integer.toString(requiredLevelToEquip);
attribs[free++] = "" + requiredLevelToEquip;
}
String requiredSkillToEquip = itemData.getString("required_skill");
if (requiredSkillToEquip != null && !requiredSkillToEquip.equals("") && !hasScript(self, "systems.combat.combat_weapon"))
@@ -230,7 +230,7 @@ public class static_item_base extends script.base_script
if (requiredLevelForEffect != 0)
{
names[free] = utils.packStringId(new string_id("proc/proc", "effect_level"));
attribs[free++] = Integer.toString(requiredLevelForEffect);
attribs[free++] = "" + requiredLevelForEffect;
}
String buffName = typeData.getString("buff_name");
if (buffName != null && !buffName.equals("") && buffIdentity == 0)
@@ -316,9 +316,9 @@ public class static_item_base extends script.base_script
}
int tier = itemData.getInt("tier");
names[free] = "tier";
attribs[free++] = Integer.toString(tier);
attribs[free++] = "" + tier;
names[free] = "tooltip.tier";
attribs[free++] = Integer.toString(tier);
attribs[free++] = "" + tier;
if (static_item.isUniqueStaticItem(self))
{
names[free] = "unique";