Merge branch 'master' into darkk_ent

Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java

scripts/buffs/proc_old_light_jedi_gift.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+	
+def removeBuff(core, actor, buff):
+	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

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

scripts/commands/waypoint.py

@@ -67,6 +67,24 @@ def run(core, actor, target, commandString):
         actorPlayer.waypointAdd(waypoint)
         actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
         return
+    
+    #/wp planet x z y name
+    elif len(commandArgs) >= 3 and isFloat(commandArgs[2]) and isFloat(commandArgs[3]) and isFloat(commandArgs[4]):
+        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', core.terrainService.getPlanetByName(commandArgs[1]), float(commandArgs[2]), float(commandArgs[4]), float(commandArgs[3]))
+        waypoint.setActive(True)
+        waypoint.setColor(WaypointObject.BLUE)
+        name = commandString.split(" ", 5)
+        print (name)
+        if name == "":
+            name = "Waypoint"
+
+        waypoint.setName(name[5])
+        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+        actorPlayer.getWaypoints().add(waypoint)
+        actorPlayer.waypointAdd(waypoint)
+        actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
+        return
+    
     #/wp NAME
     else:
         waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), actor.getWorldPosition().x, actor.getWorldPosition().z, actor.getWorldPosition().y)

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/wearables/robe/robe_jedi_dark_s01.py

@@ -1,4 +1,18 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 100)
+	core.skillModService.addSkillMod(actor, 'precision_modified', 100)
+	
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 100)
+	core.skillModService.deductSkillMod(actor, 'precision_modified', 100)
+
+
+	return
+	

scripts/object/tangible/wearables/robe/robe_jedi_dark_s02.py

@@ -1,4 +1,18 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 145)
+	core.skillModService.addSkillMod(actor, 'precision_modified', 145)
+
+	
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 145)
+	core.skillModService.deductSkillMod(actor, 'precision_modified', 145)
+
+	return
+	

scripts/object/tangible/wearables/robe/robe_jedi_dark_s03.py

@@ -1,4 +1,19 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 185)
+	core.skillModService.addSkillMod(actor, 'precision_modified', 185)
+	core.skillModService.addSkillMod(actor, 'luck_modified', 185)
+	
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 185)
+	core.skillModService.deductSkillMod(actor, 'precision_modified', 185)
+	core.skillModService.deductSkillMod(actor, 'luck_modified', 185)
+
+	return
+	

scripts/object/tangible/wearables/robe/robe_jedi_dark_s04.py

@@ -1,4 +1,31 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 250)
+	core.skillModService.addSkillMod(actor, 'precision_modified', 250)
+	core.skillModService.addSkillMod(actor, 'luck_modified', 250)
+	
+	Buff = actor.getBuffByName('proc_old_dark_jedi_gift')
+	if actor.getBuffList().contains(Buff):
+		core.buffService.removeBuffFromCreature(actor, Buff)
+		return
+		
+	if actor:
+		core.buffService.addBuffToCreature(actor, 'proc_old_dark_jedi_gift')
+		return
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 250)
+	core.skillModService.deductSkillMod(actor, 'precision_modified', 250)
+	core.skillModService.deductSkillMod(actor, 'luck_modified', 250)
+	
+	Buff = actor.getBuffByName('proc_old_dark_jedi_gift')
+	if actor.getBuffList().contains(Buff):
+		core.buffService.removeBuffFromCreature(actor, Buff)
+		return
+	return
+	

scripts/object/tangible/wearables/robe/robe_jedi_light_s01.py

@@ -1,4 +1,18 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 100)
+	core.skillModService.addSkillMod(actor, 'strength_modified', 100)
+	
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 100)
+	core.skillModService.deductSkillMod(actor, 'strength_modified', 100)
+
+
+	return
+	

scripts/object/tangible/wearables/robe/robe_jedi_light_s02.py

@@ -1,4 +1,18 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 145)
+	core.skillModService.addSkillMod(actor, 'strength_modified', 145)
+	
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 145)
+	core.skillModService.deductSkillMod(actor, 'strength_modified', 145)
+
+
+	return
+	

scripts/object/tangible/wearables/robe/robe_jedi_light_s03.py

@@ -1,4 +1,19 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'agility_modified', 185)
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 185)
+	core.skillModService.addSkillMod(actor, 'strength_modified', 185)
+	
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'agility_modified', 185)
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 185)
+	core.skillModService.deductSkillMod(actor, 'strength_modified', 185)
+
+	return
+	

scripts/object/tangible/wearables/robe/robe_jedi_light_s04.py

@@ -1,4 +1,31 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'agility_modified', 250)
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 250)
+	core.skillModService.addSkillMod(actor, 'strength_modified', 250)
+	
+	Buff = actor.getBuffByName('proc_old_light_jedi_gift')
+	if actor.getBuffList().contains(Buff):
+		core.buffService.removeBuffFromCreature(actor, Buff)
+		return
+		
+	if actor:
+		core.buffService.addBuffToCreature(actor, 'proc_old_light_jedi_gift')
+		return
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'agility_modified', 250)
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 250)
+	core.skillModService.deductSkillMod(actor, 'strength_modified', 250)
+	
+	Buff = actor.getBuffByName('proc_old_light_jedi_gift')
+	if actor.getBuffList().contains(Buff):
+		core.buffService.removeBuffFromCreature(actor, Buff)
+		return
+	return
+	

scripts/object/tangible/wearables/robe/robe_jedi_light_s05.py

@@ -1,4 +1,34 @@
 import sys
 
+def setup(core, object):
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'agility_modified', 250)
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 250)
+	core.skillModService.addSkillMod(actor, 'strength_modified', 250)
+	
+	Buff = actor.getBuffByName('proc_old_light_jedi_gift')
+	if actor.getBuffList().contains(Buff):
+		core.buffService.removeBuffFromCreature(actor, Buff)
+		return
+		
+	if actor:
+		core.buffService.addBuffToCreature(actor, 'proc_old_light_jedi_gift')
+		return
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'agility_modified', 250)
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 250)
+	core.skillModService.deductSkillMod(actor, 'strength_modified', 250)
+	
+	Buff = actor.getBuffByName('proc_old_light_jedi_gift')
+	if actor.getBuffList().contains(Buff):
+		core.buffService.removeBuffFromCreature(actor, Buff)
+		return
+	return
+	import sys
+
 def setup(core, object):
 	return

scripts/object/tangible/wearables/robe/robe_jedi_padawan.py

@@ -1,4 +1,15 @@
 import sys
 
 def setup(core, object):
-	return
+	return
+	
+def equip(core, actor, target):
+	core.skillModService.addSkillMod(actor, 'agility_modified', 21)
+	
+	return
+	
+def unequip(core, actor, target):
+	core.skillModService.deductSkillMod(actor, 'agility_modified', 21)
+
+	return
+	

scripts/radial/default.py

@@ -2,8 +2,12 @@ from resources.common import RadialOptions
 import sys
 
 def createRadial(core, owner, target, radials):
+	radials.add(RadialOptions(0, 21, 1, ''))
+	radials.add(RadialOptions(0, 7, 1, ''))
 	return
 	
 def handleSelection(core, owner, target, option):
+	if option == 21 and target:
+		core.objectService.useObject(owner, target)
 	return
 	

scripts/static_map_locations.py

@@ -74,7 +74,7 @@ def nabooLocations(core, planet):
 	mapService.addLocation(planet, 'Theed', -5488, 4380, 17, 0, 0)
 	mapService.addLocation(planet, 'Keren', 1888, 2700, 17, 0, 0)
 	mapService.addLocation(planet, 'Moenia', 4836, -4830.5, 17, 0, 0)
-	mapService.addLocation(planet, 'Deeja Peek', 4686, -1375, 17, 0, 0)
+	mapService.addLocation(planet, 'Deeja Peak', 4686, -1375, 17, 0, 0)
 	mapService.addLocation(planet, 'Kaadara', 5288, 6687, 17, 0, 0)
 
 def roriLocations(core, planet):

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):