From 534ae6deabdf443882b94ee8f4affb57e60255e3 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Sat, 16 Jan 2021 15:45:38 +0100 Subject: [PATCH] Support for selling more types of items to junk dealers --- .../support/objects/StaticItemCreator.kt | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/objects/StaticItemCreator.kt b/src/main/java/com/projectswg/holocore/resources/support/objects/StaticItemCreator.kt index ba2633293..1e2351adf 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/objects/StaticItemCreator.kt +++ b/src/main/java/com/projectswg/holocore/resources/support/objects/StaticItemCreator.kt @@ -105,6 +105,7 @@ object StaticItemCreator { applySkillMods(obj, info.skillMods) applyColors(obj, info.color) applySetBonus(obj, info.wornItemBuff) + applyItemValue(info.value, obj) } private fun applyAttributes(obj: TangibleObject, info: StaticItemLoader.WearableItemInfo?) { @@ -128,6 +129,7 @@ object StaticItemCreator { obj.addAttribute("species_restrictions.species_name", raceRestriction) applySetBonus(obj, info.wornItemBuff) + applyItemValue(info.value, obj); } private fun applyAttributes(obj: TangibleObject, info: StaticItemLoader.WeaponItemInfo?) { @@ -152,11 +154,8 @@ object StaticItemCreator { // Not all weapons have a proc effect obj.addAttribute("proc_name", "@ui_buff:${info.procEffect}") - // TODO set DPS - obj.addAttribute("cat_wpn_other.wpn_range", String.format("%d-%dm", info.minRange, info.maxRange)) - // Ziggy: Special Action Cost would go under cat_wpn_other as well, but it's a pre-NGE artifact. - + val weapon = obj as WeaponObject weapon.type = info.weaponType weapon.attackSpeed = info.attackSpeed.toFloat() @@ -166,6 +165,8 @@ object StaticItemCreator { weapon.elementalType = info.elementalType weapon.minDamage = info.minDamage weapon.maxDamage = info.maxDamage + + applyItemValue(info.value, obj); } private fun applyAttributes(obj: TangibleObject, info: StaticItemLoader.CollectionItemInfo?) { @@ -186,9 +187,7 @@ object StaticItemCreator { obj.counter = info.charges } - if (info.value > 0) { - obj.setServerAttribute(ServerAttribute.ITEM_VALUE, info.value) - } + applyItemValue(info.value, obj); } @Suppress("UNUSED_PARAMETER") @@ -234,10 +233,7 @@ object StaticItemCreator { obj.counter = info.charges } - if (info.value > 0) { - obj.setServerAttribute(ServerAttribute.ITEM_VALUE, info.value) - } - + applyItemValue(info.value, obj); applyColors(obj, info.color) } @@ -250,6 +246,7 @@ object StaticItemCreator { obj.counter = info.charges } + applyItemValue(info.value, obj); applyColors(obj, info.color) } @@ -309,5 +306,11 @@ object StaticItemCreator { return if (races.isEmpty()) "" else races.substring(0, races.length - 1) } - + + private fun applyItemValue(value: Int, obj: TangibleObject) { + if (value > 0) { + obj.setServerAttribute(ServerAttribute.ITEM_VALUE, value) + } + } + }