Merge branch 'master' into darkk_ent

Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
This commit is contained in:
darkk1138
2013-12-07 16:37:52 +01:00
129 changed files with 2348 additions and 312 deletions
+2
View File
@@ -45,6 +45,8 @@ Then export the following folders to your clientdata folder(should be located in
- snapshot
- terrain
Export the same folders from sku1_client.toc, sku2_client.toc and sku3_client.toc to avoid errors with kashyyyk.
Now you're ready to run the core!
Contributing and Submitting patches
@@ -0,0 +1,8 @@
import sys
def setup(core, actor, buff):
return
def removeBuff(core, actor, buff):
return
+52
View File
@@ -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
-72
View File
@@ -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
-13
View File
@@ -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
-13
View File
@@ -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
-13
View File
@@ -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
-13
View File
@@ -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
-70
View File
@@ -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
@@ -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
+18
View File
@@ -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)
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'corsec':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'tusken_raider':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'townsperson':
return 1
return 0
+11
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'bloodrazor' or enemy == 'nym':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'restuss':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'smashball':
return 1
return 0
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'swoop':
return 1
return 0
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'hidden_daggers':
return 1
return 0
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'forest_outcast':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'forest_kerritamba':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'sith_shadow':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'restuss':
return 1
return 0
+9
View File
@@ -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
+9
View File
@@ -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
+11
View File
@@ -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
+11
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'rebel':
return 1
return 0
+11
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'tusken_raider':
return 1
return 0
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'nightsister':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'borvo':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'naboo_security_force':
return 1
return 0
+9
View File
@@ -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
+11
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'gungan':
return 1
return 0
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'imperial':
return 1
return 0
+11
View File
@@ -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
+11
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'spice_collective':
return 1
return 0
+11
View File
@@ -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
+11
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'mtn_clan':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'gungan':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'desert_demon':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'townsperson':
return 1
return 0
+11
View File
@@ -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
+9
View File
@@ -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
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'jawa' or enemy == 'alkhara':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'jabba':
return 1
return 0
+9
View File
@@ -0,0 +1,9 @@
import sys
def isAlly(ally):
return 0
def isEnemy(enemy):
if enemy == 'hutt' or enemy == 'jabba':
return 1
return 0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+4
View File
@@ -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
+1 -1
View File
@@ -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):
+1 -2
View File
@@ -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):
+6 -1
View File
@@ -55,6 +55,7 @@ import services.SkillService;
import services.StaticService;
import services.TerrainService;
import services.WeatherService;
import services.ai.AIService;
import services.chat.ChatService;
import services.collections.CollectionService;
import services.combat.CombatService;
@@ -66,6 +67,7 @@ import services.guild.GuildService;
import services.map.MapService;
import services.object.ObjectService;
import services.object.UpdateService;
import services.spawn.SpawnService;
import services.sui.SUIService;
import services.trade.TradeService;
import services.travel.TravelService;
@@ -140,6 +142,8 @@ public class NGECore {
public CollectionService collectionService;
public EntertainmentService entertainmentService;
public WeatherService weatherService;
public SpawnService spawnService;
public AIService aiService;
// Login Server
public NetworkDispatch loginDispatch;
@@ -214,7 +218,8 @@ public class NGECore {
skillModService = new SkillModService(this);
equipmentService = new EquipmentService(this);
entertainmentService = new EntertainmentService(this);
spawnService = new SpawnService(this);
aiService = new AIService(this);
// Ping Server
try {
@@ -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();
}
}
@@ -0,0 +1,76 @@
/*******************************************************************************
* 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.objectControllerObjects;
import java.nio.ByteOrder;
import org.apache.mina.core.buffer.IoBuffer;
import protocol.swg.ObjControllerMessage;
import resources.common.Console;
import resources.common.StringUtilities;
public class MissionListRequest extends ObjControllerObject {
private long objectId;
private long terminalId;
private int tickCount;
@Override
public void deserialize(IoBuffer data) {
Console.println("MissionListRequest: " + StringUtilities.bytesToHex(data.array()));
setObjectId(data.getLong());
data.get(); // unk byte
setTickCount(data.get());
setTerminalId(data.getLong());
}
@Override
public IoBuffer serialize() {
return null;
}
public long getObjectId() {
return objectId;
}
public void setObjectId(long objectId) {
this.objectId = objectId;
}
public long getTerminalId() {
return terminalId;
}
public void setTerminalId(long terminalId) {
this.terminalId = terminalId;
}
public int getTickCount() {
return tickCount;
}
public void setTickCount(int tickCount) {
this.tickCount = tickCount;
}
}
+30
View File
@@ -0,0 +1,30 @@
/*******************************************************************************
* 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 Difficulty {
public static byte NORMAL = 0; // Normal
public static byte ELITE = 1; // Elite
public static byte BOSS = 2; // Gold elite
}
@@ -26,10 +26,11 @@ public class ObjControllerOpcodes {
public static final int DATA_TRANSFORM = 0x71000000;
public static final int DATA_TRANSFORM_WITH_PARENT = 0xF1000000;
public static final int COMMAND_QUEUE_ENQUEUE = 0x16010000;
public static final int TARGET_UPDATE = 0x26010000;
public static final int HOVER_TARGET = 0x26010000;
public static final int TARGET_UPDATE = 0xC5040000;
public static final int OBJECT_MENU_REQUEST = 0x46010000;
public static final int SECURE_TRADE = 0x15010000;
public static final int USE_OBJECT = 0xC5040000;
public static final int BUFF_BUILDER_CHANGE = 0x5A020000;
public static final int MISSION_LIST_REQUEST = 0x5F000000;
}

Some files were not shown because too many files have changed in this diff Show More