diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 62129380..449aab3e 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -369,7 +369,7 @@ def miscHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, miscHandlerCallback) - window.addListBoxMenuItem('Backpack', 0) + window.addListBoxMenuItem('Instrument', 0) window.addListBoxMenuItem('Heroism Jewelry Set', 1) window.addListBoxMenuItem('Belt of Master Bodo Baas', 2) window.addListBoxMenuItem('Starter Equipment Box', 3) @@ -385,7 +385,7 @@ def miscHandlerCallback(owner, window, eventType, returnList): return if returnList.get(0)=='0': - backpack(owner, inventory) + instrument(owner, inventory) return if returnList.get(0)=='1': heroismJewelry(owner, inventory) @@ -1955,8 +1955,8 @@ def jediBelt(owner, inventory): screenOne(core, owner) return -def backpack(owner, inventory): - # inventory.add(core.objectService.createObject("object/tangible/wearables/backpack/shared_backpack_s01.iff", owner.getPlanet())) +def instrument(owner, inventory): + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_slitherhorn.iff", owner.getPlanet())) screenOne(core, owner) return diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 6d12b33a..be310f6f 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -367,8 +367,8 @@ public class CreatureObject extends TangibleObject implements IPersistent { } if (getPosture() == resources.datatables.Posture.SkillAnimating) { - //stopPerformance(); - NGECore.getInstance().entertainmentService.stopPerformance(this); + stopPerformance(); + //NGECore.getInstance().entertainmentService.stopPerformance(this);//FIXME: Maximum recursion. } if (getPosture() == posture) {