projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-01-17 00:05:17 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from ProjectSWGCore/master

Browse Source 
Fork update
This commit is contained in:
Iosnowore-Kun
2014-11-09 12:52:14 -05:00
parent ba840980c1 16d52e6782
commit cc85b44e11
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/character_builder_terminal.py
View File

@@ -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

4
src/resources/objects/creature/CreatureObject.java
View File

@@ -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) {