Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/services/SimulationService.java

scripts/commands/bandflourish.py

@@ -0,0 +1,57 @@
+import sys
+
+def setup():
+    return
+
+def run(core, actor, target, commandString):
+
+    if len(commandString) <= 0:
+      actor.sendSystemMessage('@performance:flourish_not_valid', 0)
+      return
+
+    if commandString == 'on':
+      actor.setAcceptBandflourishes(1)
+      actor.sendSystemMessage('@performance:band_flourish_status_on', 0)
+      return
+    if commandString == 'off':
+      actor.setAcceptBandflourishes(0)
+      actor.sendSystemMessage('@performance:band_flourish_status_off', 0)
+      return
+
+    try:
+      flourish = int(commandString)
+    except ValueError:
+      actor.sendSystemMessage('@performance:flourish_not_valid', 0)
+      return
+
+    if flourish < 1 or flourish > 9:
+      actor.sendSystemMessage('@performance:flourish_not_valid', 0)
+      return
+
+    if actor.getPerformanceId() <= 0:
+      actor.sendSystemMessage('@performance:flourish_not_performing', 0)
+      return
+      
+    animation = 'skill_action_' + str(flourish)
+    if flourish == 9:
+      animation = 'mistake'
+
+    if actor.getAcceptBandflourishes():
+      actor.sendSystemMessage('@performance:flourish_perform_band_self', 0)
+      actor.sendSystemMessage('@performance:flourish_perform', 0)
+      actor.doSkillAnimation(animation)
+
+    group = core.objectService.getObject(actor.getGroupId())
+    if not group:
+      return
+
+    for creature in group.getMemberList():
+      if creature == actor:
+        continue
+      if creature.getAcceptBandflourishes():
+        creature.sendSystemMessage('@performance:flourish_perform_band_member', 0)
+        creature.sendSystemMessage('@performance:flourish_perform', 0)
+        creature.doSkillAnimation(animation)
+    return
+
+

scripts/commands/findfriend.py

@@ -0,0 +1,18 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    ghost = actor.getSlottedObject('ghost')
+    friend = commandString.split(' ')[0]
+    
+    if ghost.getFriendList().contains(friend):
+        friendObj = core.chatService.getObjectByFirstName(friend)
+        if friendObj is not None:
+            if friendObj.getSlottedObject('ghost').getFriendList().contains(actor.getCustomName().lower().split(' ')[0]):
+                fPos = friendObj.getPosition()
+                core.commandService.callCommand(actor, 'waypoint', None, friendObj.getPlanet().name + ' ' + str(fPos.x) + ' ' + str(fPos.z) + ' ' + str(fPos.y) + ' blue ' + friendObj.getCustomName())
+                return
+        return
+    return

scripts/commands/flourish.py

@@ -0,0 +1,31 @@
+import sys
+
+def setup():
+    return
+
+def run(core, actor, target, commandString):
+
+    if len(commandString) <= 0:
+      actor.sendSystemMessage('@performance:flourish_not_valid', 0)
+      return
+
+    try:
+      flourish = int(commandString)
+    except ValueError:
+      actor.sendSystemMessage('@performance:flourish_not_valid', 0)
+      return
+
+    if flourish < 1 or flourish > 9:
+      actor.sendSystemMessage('@performance:flourish_not_valid', 0)
+      return
+
+    if actor.getPerformanceId() <= 0:
+      actor.sendSystemMessage('@performance:flourish_not_performing', 0)
+      return
+      
+    actor.sendSystemMessage('@performance:flourish_perform', 0)
+    animation = 'skill_action_' + str(flourish)
+    if flourish == 9:
+      animation = 'mistake'
+
+    actor.doSkillAnimation(animation)

scripts/commands/groupdance.py

@@ -0,0 +1,11 @@
+import sys
+
+def setup():
+    return
+
+def run(core, actor, target, commandString):
+
+    newState = actor.toggleGroupDance()
+    msg = '@performance:dance_group_on' if newState else '@performance:dance_group_off'
+    actor.sendSystemMessage(msg, 0)
+    return

scripts/commands/of_medical_sup_1.py

@@ -0,0 +1,52 @@
+from engine.resources.container import StaticContainerPermissions
+import time
+import sys
+
+def setup(core, actor, target, command):
+    return
+    
+def run(core, actor, target, commandString):
+    doStimDrop(core, actor)
+    return
+
+def doStimDrop(core, actor):
+    actor.sendSystemMessage('Stims incoming Mr. Bossman!', 0)
+    stcSvc = core.staticService
+    shuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_lambda_shuttle.iff', actor.getPlanet().getName(), long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w)
+    shuttle.setPosture(0)
+    time.sleep(10) # Wait time before shuttle arrives after command is called
+    shuttle.setPosture(2)
+    time.sleep(20) # wait time for the crate to show (length of landing animation for shuttle)
+    spawnCrate(core, actor, shuttle)
+    time.sleep(5) # Wait time for the shuttle to leave after crate is spawned
+    shuttle.setPosture(0)
+    time.sleep(20) # How long the take-off sequence is, until the Shuttle is destroyed
+    core.objectService.destroyObject(shuttle)
+    return
+
+def spawnCrate(core, actor, shuttle):
+    crate = core.staticService.spawnObject('object/tangible/container/drum/shared_supply_drop_crate.iff', shuttle.getPlanet().getName(), long(0), shuttle.getPosition().x, shuttle.getPosition().y, shuttle.getPosition().z, shuttle.getOrientation().y, shuttle.getOrientation().w)
+    crate.setCustomName('Supply Crate')
+	
+    group = core.objectService.getObject(actor.getGroupId())
+    
+    permissions = StaticContainerPermissions()
+    permissions.canRemove(group, crate)
+    permissions.canView(group, crate)
+    crate.setContainerPermissions(permissions)
+	
+    if actor.hasSkill('expertise_of_tactical_sup_1'):
+        for i in range(0, 8):
+            tactical = core.objectService.createObject('object/tangible/loot/generic_usable/shared_stim_syringe_generic.iff', actor.getPlanet()) #FIXME: Use the correct template
+            tactical.setCustomName('Tactical Serum A')
+            crate.add(tactical)
+    
+    for i in range(0, 8):
+        stimpack = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_e.iff', actor.getPlanet()) #FIXME: Use the correct template
+        stimpack.setCustomName('Field Stimpack A')
+        crate.add(stimpack)
+    
+    time.sleep(60)
+    core.objectService.destroyObject(crate)
+    
+    return

scripts/commands/of_tactical_sup_1.py

@@ -1,72 +0,0 @@
-from engine.resources.container import StaticContainerPermissions
-import time
-import sys
-
-def setup(core, actor, target, command):
-    return
-    
-def run(core, actor, target, commandString):
-    doStimDrop(core, actor)
-    return
-
-def doStimDrop(core, actor):
-    stcSvc = core.staticService
-    shuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_lambda_shuttle.iff', actor.getPlanet().getName(), long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w)
-    shuttle.setPosture(0)
-    time.sleep(10) # Wait time before shuttle arrives after command is called
-    shuttle.setPosture(2)
-    time.sleep(20) # wait time for the crate to show (length of landing animation for shuttle)
-    spawnCrate(core, actor, shuttle)
-    time.sleep(5) # Wait time for the shuttle to leave after crate is spawned
-    shuttle.setPosture(0)
-    time.sleep(20) # How long the take-off sequence is, until the Shuttle is destroyed
-    core.objectService.destroyObject(shuttle)
-    return
-
-def spawnCrate(core, actor, shuttle):
-    crate = core.staticService.spawnObject('object/tangible/container/loot/shared_npe_loot_crate_low.iff', shuttle.getPlanet().getName(), long(0), shuttle.getPosition().x, shuttle.getPosition().y, shuttle.getPosition().z, shuttle.getOrientation().y, shuttle.getOrientation().w)
-    crate.setCustomName('Supply Crate')
-    
-    permissions = StaticContainerPermissions()
-    permissions.canRemove(actor, crate)
-    permissions.canView(actor, crate)
-    crate.setContainerPermissions(permissions)
-    
-    tac1 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac1)
-    tac2 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac2)
-    tac3 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac3)
-    tac4 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac4)
-    tac5 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac5)
-    tac6 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac6)
-    tac7 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac7)
-    tac8 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac8)
-    
-    stim1 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim1)
-    stim2 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim2)
-    stim3 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim3)
-    stim4 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim4)
-    stim5 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim5)
-    stim6 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim6)
-    stim7 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim7)
-    stim8 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim8)
-    
-    time.sleep(60)
-    core.objectService.destroyObject(crate)
-    
-    return

scripts/commands/of_tactical_sup_2.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, buff):
-    return
-    
-def run(core, actor, target, commandString):
-    print (' shuttle called!')
-    lambdaShuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_event_lambda_shuttle.iff', actor.getPlanet().getName(), 
-                                       long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w)
-    
-    lambdaShuttle.setPosture(0) # 0 or 2?
-    print ('posture set!')
-    return

scripts/commands/of_tactical_sup_3.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, buff):
-    return
-    
-def run(core, actor, target, commandString):
-    print (' shuttle called!')
-    lambdaShuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_event_lambda_shuttle.iff', actor.getPlanet().getName(), 
-                                       long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w)
-    
-    lambdaShuttle.setPosture(0) # 0 or 2?
-    print ('posture set!')
-    return

scripts/commands/of_tactical_sup_4.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, buff):
-    return
-    
-def run(core, actor, target, commandString):
-    print (' shuttle called!')
-    lambdaShuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_event_lambda_shuttle.iff', actor.getPlanet().getName(), 
-                                       long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w)
-    
-    lambdaShuttle.setPosture(0) # 0 or 2?
-    print ('posture set!')
-    return

scripts/commands/of_tactical_sup_5.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, buff):
-    return
-    
-def run(core, actor, target, commandString):
-    print (' shuttle called!')
-    lambdaShuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_event_lambda_shuttle.iff', actor.getPlanet().getName(), 
-                                       long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w)
-    
-    lambdaShuttle.setPosture(0) # 0 or 2?
-    print ('posture set!')
-    return

scripts/commands/of_tactical_sup_6.py

@@ -1,70 +0,0 @@
-from engine.resources.container import StaticContainerPermissions
-import time
-import sys
-
-def setup(core, actor, buff):
-    return
-    
-def run(core, actor, target, commandString):
-    doStimDrop(core, actor)
-    return
-
-def doStimDrop(core, actor):
-    stcSvc = core.staticService
-    time.sleep(10) # Wait time before shuttle arrives after command is called
-    shuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_lambda_shuttle.iff', actor.getPlanet().getName(), long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w)
-    shuttle.setPosture(0)
-    time.sleep(1)
-    shuttle.setPosture(2)
-    time.sleep(20) # wait time for the crate to show (length of landing animation for shuttle)
-    spawnCrate(core, actor, shuttle)
-    time.sleep(5) # Wait time for the shuttle to leave after crate is spawned
-    shuttle.setPosture(0)
-    time.sleep(20) # How long the take-off sequence is, until the Shuttle is destroyed
-    core.objectService.destroyObject(shuttle)
-    return
-
-def spawnCrate(core, actor, shuttle):
-    crate = core.staticService.spawnObject('object/tangible/container/loot/shared_npe_loot_crate_low.iff', shuttle.getPlanet().getName(), long(0), shuttle.getPosition().x, shuttle.getPosition().y, shuttle.getPosition().z, shuttle.getOrientation().y, shuttle.getOrientation().w)
-    crate.setCustomName('Supply Crate')
-    
-    permissions = StaticContainerPermissions()
-    permissions.canRemove(actor, crate)
-    permissions.canView(actor, crate)
-    crate.setContainerPermissions(permissions)
-    
-    tac1 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac1)
-    tac2 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac2)
-    tac3 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac3)
-    tac4 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac4)
-    tac5 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac5)
-    tac6 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac6)
-    tac7 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac7)
-    tac8 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet())
-    crate.add(tac8)
-    
-    stim1 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim1)
-    stim2 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim2)
-    stim3 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim3)
-    stim4 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim4)
-    stim5 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim5)
-    stim6 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim6)
-    stim7 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim7)
-    stim8 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet())
-    crate.add(stim8)
-    
-    return

scripts/commands/requestwaypointatposition.py

@@ -7,7 +7,7 @@ def run(core, actor, target, commandString):
 
     commandArgs = commandString.split("(^-,=+_)color_13548(,+-=_^)=1")
 
-    newString = commandArgs[1]
+    newString = commandArgs[0]
     print (newString)
     cmdService = core.commandService
     cmdService.callCommand(actor, 'waypoint', None, newString) # No need to re-create a script

scripts/commands/startdance.py

@@ -0,0 +1,96 @@
+from services.sui import SUIWindow
+from services.sui import SUIService
+from services.sui.SUIWindow import Trigger
+from services.sui.SUIService import ListBoxType
+from java.util import Vector
+from java.util import HashMap
+import sys
+
+def setup():
+    return
+
+def run(core, actor, target, commandString):
+    
+    entSvc = core.entertainmentService
+    global actorObject
+    global coreObject
+    global availableDances
+    global suiWindow
+    actorObject = actor
+    coreObject = core
+
+    if len(commandString) > 0:
+        params = commandString.split(" ")
+        startDance(core, actor, params[0], 0)
+        return
+    else:
+
+        availableDances = entSvc.getAvailableDances(actor)
+        print availableDances
+
+        suiSvc = core.suiService
+        suiWindow = suiSvc.createListBox(ListBoxType.LIST_BOX_OK_CANCEL, "@performance:select_dance", "@performance:available_dances", availableDances, actor, None, 10)
+
+        returnList = Vector()
+        returnList.add("List.lstList:SelectedRow")
+        suiWindow.addHandler(0, '', Trigger.TRIGGER_OK, returnList, handleStartdance)
+        
+        suiSvc.openSUIWindow(suiWindow)
+        return
+    return
+
+
+def handleStartdance(core, owner, eventType, returnList):
+
+    item = suiWindow.getMenuItems().get(int(returnList.get(0)))
+
+    if not item:
+      return
+        
+    #if eventType == 0:
+    startDance(coreObject, actorObject, '', int(item.getObjectId()))
+    return
+
+def startDance(core, actor, danceName, visual):
+
+    entSvc = core.entertainmentService
+
+    if visual <= 0:
+      visual = entSvc.getDanceVisualId(danceName)
+
+    if visual <= 0:
+      return
+
+    if not entSvc.isDance(visual):
+      actor.sendSystemMessage('@performance:dance_unknown_self',0)
+      return
+
+    if not entSvc.canDance(actor, visual):
+      actor.sendSystemMessage('@performance:dance_lack_skill_self',0)
+      return
+
+    if actor.getPerformanceId() > 0:
+      actor.sendSystemMessage('@performance:already_performing_self',0)
+      return
+
+    #TODO: check costume, posture, etc?
+
+    actor.sendSystemMessage('@performance:dance_start_self',0);
+    actor.notifyAudience('@performance:dance_start_other');
+
+    danceVisual = 'dance_' + str(visual)
+
+    if not actor.getPerformanceWatchee():
+      #this also notifies the client with a delta4
+      actor.setPerformanceWatchee(actor)
+  
+    #this should send a CREO3 
+    actor.setPosture(0x09);
+
+    dance = entSvc.getDance(visual)
+
+    # send CREO6 here
+    # second param is some sort of counter or start tick
+    actor.startPerformance(dance.getLineNumber(), -842249156 , danceVisual, 1)
+
+    return

scripts/commands/stopdance.py

@@ -0,0 +1,19 @@
+import sys
+
+def setup():
+    return
+
+def run(core, actor, target, commandString):
+    entSvc = core.entertainmentService
+
+    if (actor.getPerformanceId() <= 0):
+      actor.sendSystemMessage('@performance:dance_not_performing', 0)
+      return
+
+    #since we need to stop performance for any posture change,
+    # all packets are triggered in setPosture.
+    # this may not be very consistent, but it prevents
+    # duplicate code.
+    actor.setPosture(0x00)
+
+    return

scripts/commands/tip.py

@@ -1,6 +1,4 @@
-from resources.objects.creature import CreatureObject
 from java.util import Date
-from engine.resources.objects import SWGObject
 from services.chat import ChatService
 from services.chat import Mail
 from services.sui import SUIWindow
@@ -8,6 +6,7 @@ from services.sui import SUIService
 from services.sui.SUIWindow import Trigger
 from services.sui.SUIService import MessageBoxType
 from java.util import Vector
+from main import NGECore
 import sys
 
 # initialize global vars (happens at compile time)
@@ -81,7 +80,8 @@ def run(core, actor, target, commandString):
         return
     return
 
-def handleBankTip(core, owner, eventType, returnList):
+def handleBankTip(owner, window, eventType, returnList):
+    core = NGECore.getInstance()
     chatSvc = core.chatService
     actorGlobal = core.objectService.getObject(actorID)
     targetGlobal = core.objectService.getObject(targetID)
@@ -115,7 +115,7 @@ def handleBankTip(core, owner, eventType, returnList):
             actorMail.setSubject('@base_player:wire_mail_subject')
             actorMail.setSenderName('bank')
             
-            targetGlobal.setBankCredits(int(tipAmount))
+            targetGlobal.setBankCredits(int(tipAmount) + int(targetGlobal.getBankCredits()))
             actorGlobal.setBankCredits(int(actorFunds) - int(totalLost))
             actorGlobal.sendSystemMessage('You have successfully sent ' + tipAmount + ' bank credits to ' + targetGlobal.getCustomName(), 0)
             targetGlobal.sendSystemMessage('You have successfully received ' + tipAmount + ' bank credits from ' + actorGlobal.getCustomName(), 0)

scripts/expertise/expertise_of_tactical_sup_1.py

@@ -37,12 +37,8 @@ def removeExpertisePoint(core, actor):
 # this checks what abilities the player gets by level, need to also call this on level-up
 def addAbilities(core, actor, player):
 	
-	actor.addAbility('of_tactical_sup_1')
-	
 	return
 
 def removeAbilities(core, actor, player):
 	
-	actor.removeAbility('of_tactical_sup_1')
-	
 	return

scripts/faction/aakuans.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'fed_dub' or enemy == 'binayre' or enemy == 'liberation_party':
+		return 1
+	return 0

scripts/faction/afarathu.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec':
+		return 1
+	return 0

scripts/faction/alkhara.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'tusken_raider':
+		return 1
+	return 0

scripts/faction/bandit.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'townsperson':
+		return 1
+	return 0

scripts/faction/beldonnas_league.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'corsec':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'followers_of_lord_nyax' or enemy == 'lost_aqualish':
+		return 1
+	return 0

scripts/faction/binayre.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'fed_dub' or enemy == 'aakuans' or enemy == 'corsec':
+		return 1
+	return 0

scripts/faction/bloodrazor.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'canyon_corsair' or enemy == 'nym':
+		return 1
+	return 0

scripts/faction/borvo.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'gungan' or enemy == 'trade_federation' or enemy == 'jabba':
+		return 1
+	return 0

scripts/faction/canyon_corsair.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'bloodrazor' or enemy == 'nym':
+		return 1
+	return 0

scripts/faction/cobral.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'restuss':
+		return 1
+	return 0

scripts/faction/cor_swoop.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'smashball':
+		return 1
+	return 0

scripts/faction/corsec.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'afarathu' or enemy == 'followers_of_lord_nyax' or enemy == 'beldonnas_league' or enemy == 'monumenter' or enemy == 'rogue_corsec' or enemy == 'lost_aqualish':
+		return 1
+	return 0

scripts/faction/dantari_raiders.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'kunga_tribe' or enemy == 'mokk_tribe' or enemy == 'janta_tribe':
+		return 1
+	return 0

scripts/faction/desert_demon.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'swoop':
+		return 1
+	return 0

scripts/faction/donkuwah_tribe.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'gondula_tribe' or enemy == 'panshee_tribe':
+		return 1
+	return 0

scripts/faction/drall.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec' or enemy == 'fed_dub':
+		return 1
+	return 0

scripts/faction/endor_marauder.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'gondula_tribe' or enemy == 'panshee_tribe':
+		return 1
+	return 0

scripts/faction/fed_dub.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'liberation_party' or enemy == 'binayre' or enemy == 'lost_aqualish' or enemy == 'drall':
+		return 1
+	return 0

scripts/faction/flail.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'hidden_daggers':
+		return 1
+	return 0

scripts/faction/followers_of_lord_nyax.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec' or enemy == 'beldonnas_league':
+		return 1
+	return 0

scripts/faction/forest_kerritamba.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'forest_outcast':
+		return 1
+	return 0

scripts/faction/forest_outcast.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'forest_kerritamba':
+		return 1
+	return 0

scripts/faction/fs_villager.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'sith_shadow':
+		return 1
+	return 0

scripts/faction/garyn.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'restuss':
+		return 1
+	return 0

scripts/faction/gondula_tribe.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'donkuwah_tribe' or enemy == 'korga_tribe' or enemy == 'panshee_tribe' or enemy == 'pubam' or enemy == 'endor_marauder':
+		return 1
+	return 0

scripts/faction/gungan.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'plasma_thief' or enemy == 'swamp_rat' or enemy == 'borvo':
+		return 1
+	return 0

scripts/faction/hidden_daggers.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'rogue_corsec':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec' or enemy == 'beldonnas_league' or enemy == 'flail':
+		return 1
+	return 0

scripts/faction/hutt.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'panshee_tribe':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'naboo_security_force' or enemy == 'nym' or enemy == 'imperial' or enemy == 'jabba' or enemy == 'borvo' or enemy == 'corsec' or enemy == 'narmle':
+		return 1
+	return 0

scripts/faction/imperial.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'rebel':
+		return 1
+	return 0

scripts/faction/jabba.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'hutt':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'valarian' or enemy == 'borvo':
+		return 1
+	return 0

scripts/faction/janta_tribe.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'kunga_tribe' or enemy == 'dantari_raiders':
+		return 1
+	return 0

scripts/faction/jawa.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'tusken_raider':
+		return 1
+	return 0

scripts/faction/kobola.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'narmle' or enemy == 'spice_collective':
+		return 1
+	return 0

scripts/faction/korga_tribe.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'gondula_tribe' or enemy == 'panshee_tribe':
+		return 1
+	return 0

scripts/faction/kunga_tribe.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'mokk_tribe' or enemy == 'dantari_raiders':
+		return 1
+	return 0

scripts/faction/liberation_party.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'fed_dub' or enemy == 'corsec':
+		return 1
+	return 0

scripts/faction/lok_mercenaries.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'bloodrazor' or enemy == 'canyon_corsair':
+		return 1
+	return 0

scripts/faction/lost_aqualish.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'beldonnas_league' or enemy == 'fed_dub' or enemy == 'corsec':
+		return 1
+	return 0

scripts/faction/meatlump.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec' or enemy == 'rogue_corsec' or enemy == 'beldonnas_league':
+		return 1
+	return 0

scripts/faction/mokk_tribe.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'janta_tribe' or enemy == 'dantari_raiders':
+		return 1
+	return 0

scripts/faction/monumenter.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec' or enemy == 'beldonnas_league':
+		return 1
+	return 0

scripts/faction/mtn_clan.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'nightsister':
+		return 1
+	return 0

scripts/faction/naboo.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'borvo':
+		return 1
+	return 0

scripts/faction/naboo_pirate.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'naboo_security_force':
+		return 1
+	return 0

scripts/faction/naboo_security_force.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'borvo' or enemy == 'naboo_pirate' or enemy == 'plasma_thief' or enemy == 'swamp_rat' or enemy == 'trade_federation':
+		return 1
+	return 0

scripts/faction/narmle.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'restuss':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'narmle' or enemy == 'spice_collective' or enemy == 'kobola':
+		return 1
+	return 0

scripts/faction/nightsister.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'mtn_clan' or enemy == 'imperial':
+		return 1
+	return 0

scripts/faction/nym.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'bloodrazor' or enemy == 'canyon_corsair':
+		return 1
+	return 0

scripts/faction/olag_greck.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec' or enemy == 'beldonnas_league':
+		return 1
+	return 0

scripts/faction/panshee_tribe.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'donkuwah_tribe' or enemy == 'korga_tribe' or enemy == 'gondula_tribe' or enemy == 'pubam' or enemy == 'endor_marauder':
+		return 1
+	return 0

scripts/faction/pirate.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'fed_dub' or enemy == 'binayre' or enemy == 'liberation_party':
+		return 1
+	return 0

scripts/faction/plasma_thief.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'gungan':
+		return 1
+	return 0

scripts/faction/pubam.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'gondula_tribe' or enemy == 'panshee_tribe':
+		return 1
+	return 0

scripts/faction/rebel.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'imperial':
+		return 1
+	return 0

scripts/faction/restuss.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'narmle':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'garyn' or enemy == 'cobral':
+		return 1
+	return 0

scripts/faction/rogue_corsec.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'hidden_daggers':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec':
+		return 1
+	return 0

scripts/faction/rorgungan.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'spice_collective':
+		return 1
+	return 0

scripts/faction/sif.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'hutt':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'rebel' or enemy == 'imperial':
+		return 1
+	return 0

scripts/faction/sith_shadow.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'rebel' or ally == 'imperial':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'fs_villager':
+		return 1
+	return 0

scripts/faction/smashball.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'corsec' or enemy == 'cor_swoop':
+		return 1
+	return 0

scripts/faction/spice_collective.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'narmle' or enemy == 'rorgungan' or enemy == 'kobola':
+		return 1
+	return 0

scripts/faction/spider_nightsister.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'mtn_clan':
+		return 1
+	return 0

scripts/faction/swamp_rat.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'gungan':
+		return 1
+	return 0

scripts/faction/swoop.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'desert_demon':
+		return 1
+	return 0

scripts/faction/thug.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'townsperson':
+		return 1
+	return 0

scripts/faction/townsperson.py

@@ -0,0 +1,11 @@
+import sys
+
+def isAlly(ally):
+	if ally == 'rebel' or ally == 'imperial':
+		return 1
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'thug' or enemy == 'bandit':
+		return 1
+	return 0

scripts/faction/trade_federation.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'borvo' or enemy == 'naboo_security_force':
+		return 1
+	return 0

scripts/faction/tusken_raider.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'jawa' or enemy == 'alkhara':
+		return 1
+	return 0

scripts/faction/valarian.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'jabba':
+		return 1
+	return 0

scripts/faction/yavin_scavenger.py

@@ -0,0 +1,9 @@
+import sys
+
+def isAlly(ally):
+	return 0
+
+def isEnemy(enemy):
+	if enemy == 'hutt' or enemy == 'jabba':
+		return 1
+	return 0

scripts/object/tangible/terminal/terminal_mission.py

@@ -1,7 +1,9 @@
+from resources.common import TerminalType
 import sys
 
 def setup(core, object):
 
 	core.mapService.addLocation(object.getPlanet(), 'Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 44, 0)
+	object.setAttachment("terminalType", TerminalType.MISSION_GENERIC)
 	return
 	

scripts/object/tangible/travel/travel_ticket/base/base_travel_ticket.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'travel_ticket')
 	return

scripts/radial/travel_terminal.py

@@ -8,13 +8,10 @@ def createRadial(core, owner, target, radials):
 def handleSelection(core, owner, target, option):
 
     if option == 21 and target:
-        print ('Owner: ' + str(owner.getObjectId()))
-        
+
         if owner is not None:
             tpm = EnterTicketPurchaseModeMessage(owner.getPlanet().getName(), core.mapService.getClosestCityName(owner), owner)
             owner.getClient().getSession().write(tpm.serialize())
-            print ('Planet name: ' + owner.getPlanet().getName())
-            print ('City name: ' + core.mapService.getClosestCityName(owner))
             return
     return
     

scripts/radial/travel_ticket.py

@@ -0,0 +1,40 @@
+from resources.common import RadialOptions
+import sys
+
+def createRadial(core, owner, target, radials):
+    radials.clear
+    
+    radials.add(RadialOptions(0, 21, 1, 'Use Travel Ticket'))
+    #radials.add(RadialOptions(0, 7, 1, ''))
+    #radials.add(RadialOptions(0, 15, 1, ''))
+    return
+    
+def handleSelection(core, owner, target, option):
+
+    if option == 21 and target:
+        
+        tp = core.travelService.getNearestTravelPoint(owner)
+        
+        if owner is not None and tp is not None:
+            print (str(tp.getLocation().getDistance2D(owner.getWorldPosition())))
+            if tp.getLocation().getDistance2D(owner.getWorldPosition()) <= float(25):
+                if tp.isShuttleAvailable() is True:
+                    core.travelService.doTransport(owner, core.travelService.getTravelPointByName(target.getStringAttribute('@obj_attr_n:travel_arrival_planet'),
+                                                                                                  target.getStringAttribute('@obj_attr_n:travel_arrival_point')))
+                    core.objectService.destroyObject(target)
+                    return
+                return
+            else:
+                owner.sendSystemMessage('@travel:boarding_too_far', 0)
+                return
+            return
+        return
+    
+    if option == 15 and target:
+        core.commandService.callCommand(owner, 'serverdestroyobject', target, None)
+        return
+    return
+    
+def handleSUI(owner, window, eventType, returnList):
+
+    return

scripts/static_travel_points.py

@@ -40,11 +40,10 @@ def corelliaPoints(core, planet):
     trvSvc.addTravelPoint(planet, "Kor Vella Shuttleport", -3775, 86, 3234)
     trvSvc.addTravelPoint(planet, "Bela Vistal Shuttleport A", 6644, 330, -5922)
     trvSvc.addTravelPoint(planet, "Bela Vistal Shuttleport B", 6930, 330, -5534)
-   
     trvSvc.addTravelPoint(planet, "Coronet Starport", -51, 28, -4735)
     trvSvc.addTravelPoint(planet, "Tyrena Starport", -4975, 21, -2230)
     trvSvc.addTravelPoint(planet, "Kor Vella Starport", -3136, 31, 2894)
-    trvSvc.addTravelPoint(planet, "Doaba Guerful Starport", 3377, 308, 5605)
+    trvSvc.addTravelPoint(planet, "Doaba Guerfel Starport", 3377, 308, 5605)
     return        
 
 def dantooinePoints(core, planet):

src/main/NGECore.java

@@ -35,7 +35,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import net.engio.mbassy.bus.config.BusConfiguration;
-
 import resources.common.RadialOptions;
 import resources.common.ThreadMonitor;
 import resources.objects.creature.CreatureObject;
@@ -47,6 +46,7 @@ import services.EntertainmentService;
 import services.EquipmentService;
 import services.GroupService;
 import services.LoginService;
+import services.MissionService;
 import services.PlayerService;
 import services.ScriptService;
 import services.SimulationService;
@@ -144,6 +144,7 @@ public class NGECore {
 	public WeatherService weatherService;
 	public SpawnService spawnService;
 	public AIService aiService;
+	//public MissionService missionService;
 	
 	// Login Server
 	public NetworkDispatch loginDispatch;
@@ -219,6 +220,7 @@ public class NGECore {
 		equipmentService = new EquipmentService(this);
 		entertainmentService = new EntertainmentService(this);
 		aiService = new AIService(this);
+		//missionService = new MissionService(this);
 		
 		// Ping Server
 		try {
@@ -249,6 +251,7 @@ public class NGECore {
 		zoneDispatch.addService(playerService);
 		zoneDispatch.addService(buffService);
 		zoneDispatch.addService(entertainmentService);
+		//zoneDispatch.addService(missionService);
 
 		zoneServer = new MINAServer(zoneDispatch, config.getInt("ZONE.PORT"));
 		zoneServer.start();

src/protocol/swg/FactionResponseMessage.java

@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2013 <Project SWG>
+ * 
+ * This File is part of NGECore2.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
+ * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
+ ******************************************************************************/
+package protocol.swg;
+
+import java.nio.ByteOrder;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.mina.core.buffer.IoBuffer;
+
+import resources.common.Opcodes;
+
+public class FactionResponseMessage extends SWGMessage {
+	
+	private Map<String, Integer> factionStandingMap;
+	private int factionRank = 0;
+	private int rebelPoints = 0;
+	private int imperialPoints = 0;
+	
+	public FactionResponseMessage(Map<String, Integer> factionStandingMap, int factionRank) {
+		this.factionStandingMap = new TreeMap<String, Integer>();
+		this.factionStandingMap.putAll(factionStandingMap);
+		this.factionRank = factionRank;
+		
+		if (this.factionStandingMap.containsKey("rebel")) {
+			this.rebelPoints = this.factionStandingMap.get("rebel");
+		}
+		
+		if (this.factionStandingMap.containsKey("imperial")) {
+			this.imperialPoints = this.factionStandingMap.get("imperial");
+		}
+	}
+	
+	public void deserialize(IoBuffer data) {
+		
+	}
+	
+	public IoBuffer serialize() {
+		IoBuffer result = IoBuffer.allocate(26).order(ByteOrder.LITTLE_ENDIAN);
+		result.setAutoExpand(true);
+		result.putShort((short) 2);
+		result.putInt(Opcodes.FactionResponseMessage);
+		result.putInt(factionRank);
+		result.putInt(rebelPoints);
+		result.putInt(imperialPoints);
+		result.putInt(factionStandingMap.size());
+		for (String faction : factionStandingMap.keySet()) {
+			result.put(getAsciiString(faction));
+		}
+		result.putInt(factionStandingMap.size());
+		for (Integer points : factionStandingMap.values()) {
+			result.putInt(points);
+		}
+		
+		return result.flip();	
+	}
+	
+}

src/protocol/swg/objectControllerObjects/CommandEnqueue.java

@@ -39,6 +39,15 @@ public class CommandEnqueue extends ObjControllerObject {
 	public static final int STAND					= 0xA8A25C79;
 	public static final int ATTACK					= 0xA8FEF90A;
 	public static final int TRANSFERITEM			= 0x3CFB449D;
+
+    //ent
+	// this really needed?
+    public static final int STARTDANCE 				= 0x7B1DCBE0;
+    public static final int STOPDANCE 				= 0xECC171CC;
+    public static final int FLOURISH 				= 0xC8998CE9;
+    public static final int FLO 					= 0x3B159B76;
+    public static final int BANDFLOURISH 			= 0xF4C60EC3;
+    public static final int BANDFLO 				= 0xDD3FB008;
 	
 	private int actionCounter;
 	private int commandCRC;

src/protocol/swg/objectControllerObjects/MissionListRequest.java

@@ -39,6 +39,7 @@ public class MissionListRequest extends ObjControllerObject {
 	public void deserialize(IoBuffer data) {
 		Console.println("MissionListRequest: " + StringUtilities.bytesToHex(data.array()));
 		setObjectId(data.getLong());
+		data.getInt(); // unk
 		data.get(); // unk byte
 		setTickCount(data.get());
 		setTerminalId(data.getLong());

src/resources/common/ObjControllerOpcodes.java

@@ -31,6 +31,6 @@ public class ObjControllerOpcodes {
 	public static final int OBJECT_MENU_REQUEST = 0x46010000;
 	public static final int SECURE_TRADE = 0x15010000;
 	public static final int BUFF_BUILDER_CHANGE = 0x5A020000;
-	public static final int MISSION_LIST_REQUEST = 0x5F000000;
+	public static final int MISSION_LIST_REQUEST = 0xF5000000;
 	
 }

src/resources/common/Opcodes.java

@@ -56,5 +56,6 @@ public class Opcodes {
 	public static int PlayMusicMessage = CRC.StringtoCRC("PlayMusicMessage");
 	public static int PlanetTravelPointListRequest = 0x96405D4D;
 	public static int FactionRequestMessage = CRC.StringtoCRC("FactionRequestMessage");
+	public static int FactionResponseMessage = CRC.StringtoCRC("FactionResponseMessage");
 	
 }

src/resources/common/Performance.java

@@ -0,0 +1,254 @@
+package resources.common;
+
+public class Performance {
+
+	
+	private String performanceName;
+	private int instrumentAudioId;
+	private String requiredSong;
+	private String requiredInstrument;
+	private String requiredDance;
+	private int danceVisualId;
+	private int actionPointsPerLoop;
+	private float loopDuration;
+	private int type;
+	private int baseXp;
+	private int flourishXpMod;
+	private int healMindWound;
+	private int healShockWound;
+	private String requiredSkillMod;
+	private int requiredSkillModValue;
+	private String mainloop;
+	private String flourish1;
+	private String flourish2;
+	private String flourish3;
+	private String flourish4;
+	private String flourish5;
+	private String flourish6;
+	private String flourish7;
+	private String flourish8;
+	private String intro;
+	private String outro;
+	private int lineNumber;
+	
+	public Performance() {
+		
+	}
+
+	public int getBaseXp() {
+		return baseXp;
+	}
+
+	public void setBaseXp(int baseXp) {
+		this.baseXp = baseXp;
+	}
+	
+	public String getPerformanceName() {
+		return performanceName;
+	}
+
+	public void setPerformanceName(String performanceName) {
+		this.performanceName = performanceName;
+	}
+
+	public int getInstrumentAudioId() {
+		return instrumentAudioId;
+	}
+
+	public void setInstrumentAudioId(int instrumentAudioId) {
+		this.instrumentAudioId = instrumentAudioId;
+	}
+
+	public int getRequiredSkillModValue() {
+		return requiredSkillModValue;
+	}
+
+	public void setRequiredSkillModValue(int requiredSkillModValue) {
+		this.requiredSkillModValue = requiredSkillModValue;
+	}
+
+	public String getRequiredSong() {
+		return requiredSong;
+	}
+
+	public void setRequiredSong(String requiredSong) {
+		this.requiredSong = requiredSong;
+	}
+
+	public String getRequiredInstrument() {
+		return requiredInstrument;
+	}
+
+	public void setRequiredInstrument(String requiredInstrument) {
+		this.requiredInstrument = requiredInstrument;
+	}
+
+	public String getRequiredDance() {
+		return requiredDance;
+	}
+
+	public void setRequiredDance(String requiredDance) {
+		this.requiredDance = requiredDance;
+	}
+
+	public int getDanceVisualId() {
+		return danceVisualId;
+	}
+
+	public void setDanceVisualId(int danceVisualId) {
+		this.danceVisualId = danceVisualId;
+	}
+
+	public int getActionPointsPerLoop() {
+		return actionPointsPerLoop;
+	}
+
+	public void setActionPointsPerLoop(int actionPointsPerLoop) {
+		this.actionPointsPerLoop = actionPointsPerLoop;
+	}
+
+	public float getLoopDuration() {
+		return loopDuration;
+	}
+
+	public void setLoopDuration(float loopDuration) {
+		this.loopDuration = loopDuration;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	public int getFlourishXpMod() {
+		return flourishXpMod;
+	}
+
+	public void setFlourishXpMod(int flourishXpMod) {
+		this.flourishXpMod = flourishXpMod;
+	}
+
+	public int getHealMindWound() {
+		return healMindWound;
+	}
+
+	public void setHealMindWound(int healMindWound) {
+		this.healMindWound = healMindWound;
+	}
+
+	public int getHealShockWound() {
+		return healShockWound;
+	}
+	
+	public int getLineNumber() {
+		return lineNumber;
+	}
+
+	public void setHealShockWound(int healShockWound) {
+		this.healShockWound = healShockWound;
+	}
+
+	public String getRequiredSkillMod() {
+		return requiredSkillMod;
+	}
+
+	public void setRequiredSkillMod(String requiredSkillMod) {
+		this.requiredSkillMod = requiredSkillMod;
+	}
+
+	public String getMainloop() {
+		return mainloop;
+	}
+
+	public void setMainloop(String mainloop) {
+		this.mainloop = mainloop;
+	}
+
+	public String getFlourish1() {
+		return flourish1;
+	}
+
+	public void setFlourish1(String flourish1) {
+		this.flourish1 = flourish1;
+	}
+
+	public String getFlourish2() {
+		return flourish2;
+	}
+
+	public void setFlourish2(String flourish2) {
+		this.flourish2 = flourish2;
+	}
+
+	public String getFlourish3() {
+		return flourish3;
+	}
+
+	public void setFlourish3(String flourish3) {
+		this.flourish3 = flourish3;
+	}
+
+	public String getFlourish4() {
+		return flourish4;
+	}
+
+	public void setFlourish4(String flourish4) {
+		this.flourish4 = flourish4;
+	}
+
+	public String getFlourish5() {
+		return flourish5;
+	}
+
+	public void setFlourish5(String flourish5) {
+		this.flourish5 = flourish5;
+	}
+
+	public String getFlourish6() {
+		return flourish6;
+	}
+
+	public void setFlourish6(String flourish6) {
+		this.flourish6 = flourish6;
+	}
+
+	public String getFlourish7() {
+		return flourish7;
+	}
+
+	public void setFlourish7(String flourish7) {
+		this.flourish7 = flourish7;
+	}
+
+	public String getFlourish8() {
+		return flourish8;
+	}
+
+	public void setFlourish8(String flourish8) {
+		this.flourish8 = flourish8;
+	}
+
+	public String getIntro() {
+		return intro;
+	}
+
+	public void setIntro(String intro) {
+		this.intro = intro;
+	}
+
+	public String getOutro() {
+		return outro;
+	}
+
+	public void setOutro(String outro) {
+		this.outro = outro;
+	}
+
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+	
+}

src/resources/common/StateStatus.java

@@ -1,3 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2013 <Project SWG>
+ * 
+ * This File is part of NGECore2.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
+ * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
+ ******************************************************************************/
 package resources.common;
 
 public class StateStatus {