projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-11 21:45:43 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into darkk_ent

Browse Source
This commit is contained in:
darkk1138
2013-12-04 22:43:41 +01:00
parent 6bd1c7b02c 470215c05d
commit c4dc69fd92
70 changed files with 3090 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/buffs/armor_break.py
+3 -1
View File
@@ -2,9 +2,11 @@ import sys
def setup(core, actor, buff):
actor.addSkillMod('expertise_innate_reduction_all_player', 6 * buff.getStacks())
actor.addSkillMod('expertise_innate_reduction_all_mob', 600 * buff.getStacks())
return
def removeBuff(core, actor, buff):
actor.deductSkillMod('expertise_innate_reduction_all_mob', 600 * buff.getStacks())
actor.deductSkillMod('expertise_innate_reduction_all_player', 6 * buff.getStacks())
return
scripts/buffs/co_position_secured.py
+2 -2
View File
@@ -43,8 +43,8 @@ def removeBuff(core, actor, buff):
if actor.getGroupId() != 0 and core.objectService.getObject(actor.getGroupId()):
group = core.objectService.getObject(actor.getGroupId())
for member in group.getMemberList():
core.buffService.removeBuffToCreature(member, 'co_base_of_operations')
core.buffService.removeBuffFromCreature(member, member.getBuffByName('co_base_of_operations'))
else:
core.buffService.removeBuffToCreature(actor, 'co_base_of_operations')
core.buffService.removeBuffFromCreature(actor, actor.getBuffByName('co_base_of_operations'))
return
scripts/commands/co_position_secured.py
+1 -1
View File
@@ -6,7 +6,7 @@ def setup():
def run(core, actor, target, commandString):
if actor.hasBuff('co_position_secured'):
core.buffService.removeBuffFromCreature(actor, actor.getBuff('co_position_secured'))
core.buffService.removeBuffFromCreature(actor, actor.getBuffByName('co_position_secured'))
else:
core.buffService.addBuffToCreature(actor, 'co_position_secured')
scripts/commands/inspire.py
+4
View File
@@ -6,6 +6,10 @@ def setup():
return
def run(core, actor, target, commandString):
if (actor.getProfession() != "entertainer_1a"):
return
print ('Buffing Player: ' + str(target.getObjectId()) + ' or: ' + target.getCustomName())
openBuffWindow = BuffBuilderStartMessage(actor.getObjectId(), actor.getObjectId(), target.getObjectId())
objController = ObjControllerMessage(11, openBuffWindow)
scripts/commands/of_focus_fire_1.py
+4 -2
View File
@@ -6,7 +6,9 @@ def setup(core, actor, buff):
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_1')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_1')
if group is not None:
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_1')
return
return
scripts/commands/of_focus_fire_2.py
+7 -4
View File
@@ -4,8 +4,11 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_1')
core.buffService.addBuffToCreature(actor, 'of_focus_fire_2')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_2')
return
if group is not None:
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_2')
return
return
scripts/commands/of_focus_fire_3.py
+7 -4
View File
@@ -4,8 +4,11 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_1')
core.buffService.addBuffToCreature(actor, 'of_focus_fire_3')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_3')
return
if group is not None:
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_3')
return
return
scripts/commands/of_tactical_sup_1.py
+72
View File
@@ -0,0 +1,72 @@
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
+13
View File
@@ -0,0 +1,13 @@
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
+13
View File
@@ -0,0 +1,13 @@
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
+13
View File
@@ -0,0 +1,13 @@
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
+13
View File
@@ -0,0 +1,13 @@
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
+70
View File
@@ -0,0 +1,70 @@
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/pvp.py
+63 -65
View File
@@ -1,74 +1,72 @@
from resources.objects.creature import CreatureObject
from protocol.swg import UpdatePVPStatusMessage
from resources.common import PvpStatus
from resources.common import FactionStatus
import sys
import time
def setup():
return
def run(core, actor, target, commandString):
actorFaction = actor.getFaction()
actorStatus = actor.getFactionStatus()
pvpStatus = UpdatePVPStatusMessage(actor.getObjectId())
if commandString == ('imperial') and actorFaction != "imperial":
actor.setFaction('imperial')
return
if commandString == ('rebel') and actorFaction != "rebel":
actor.setFaction('rebel')
return
if commandString == ('neutral') and actorFaction != "neutral":
actor.setFaction('neutral')
return
if actorStatus == 0 and actorFaction == "imperial":
actor.setFactionStatus(1)
#print ("FactionStatus: " + str(actor.getFactionStatus()))
actor.sendSystemMessage('You are no longer On Leave.', 0)
return
faction = actor.getFaction()
factionStatus = actor.getFactionStatus()
if actorStatus == 0 and actorFaction == "rebel":
actor.setFactionStatus(1)
#print ("FactionStatus: " + str(actor.getFactionStatus()))
actor.sendSystemMessage('You are no longer On Leave.', 0)
return
if actor.getPvpStatus(PvpStatus.GoingOvert) or actor.getPvpStatus(PvpStatus.GoingCovert):
actor.sendSystemMessage('@faction_recruiter:pvp_status_changing', 0)
return
if actorStatus == 1 and actorFaction == "imperial":
actor.setFactionStatus(2)
pvpStatus.setFaction(UpdatePVPStatusMessage.factionCRC.Imperial)
pvpStatus.setStatus(55)
actor.notifyObservers(pvpStatus.serialize(), True)
actor.sendSystemMessage('@faction_recruiter:overt_complete', 0)
print ("FactionStatus: " + str(actor.getFactionStatus()))
return
if actorStatus == 1 and actorFaction == "rebel":
actor.setFactionStatus(2)
pvpStatus.setFaction(UpdatePVPStatusMessage.factionCRC.Rebel)
pvpStatus.setStatus(55)
actor.notifyObservers(pvpStatus.serialize(), True)
actor.sendSystemMessage('@faction_recruiter:overt_complete', 0)
print ("FactionStatus: " + str(actor.getFactionStatus()))
return
if actorStatus == 2 and actorFaction == "imperial":
actor.setFactionStatus(1)
pvpStatus.setFaction(UpdatePVPStatusMessage.factionCRC.Imperial)
pvpStatus.setStatus(16)
actor.notifyObservers(pvpStatus.serialize(), True)
actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)
print ("FactionStatus: " + str(actor.getFactionStatus()))
return
if actorStatus == 2 and actorFaction == "rebel":
actor.setFactionStatus(1)
pvpStatus.setFaction(UpdatePVPStatusMessage.factionCRC.Rebel)
pvpStatus.setStatus(16)
actor.notifyObservers(pvpStatus.serialize(), True)
actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)
print ("FactionStatus: " + str(actor.getFactionStatus()))
return
return
if commandString != '' and commandString != faction:
if commandString == 'rebel' or commandString == 'imperial' or commandString == 'neutral':
actor.sendSystemMessage('@faction_recruiter:sui_resig_complete_in_5', 0)
if actor.getFactionStatus() == FactionStatus.SpecialForces:
actor.setPvpStatus(PvpStatus.GoingCovert, True)
time.sleep(300)
actor.setPvpStatus(PvpStatus.GoingCovert | PvpStatus.Overt | PvpStatus.Attackable | PvpStatus.Aggressive | PvpStatus.Enemy, False)
actor.setFactionStatus(FactionStatus.OnLeave)
if actor.getFaction() != '' and actor.getFaction() != 'neutral':
time.sleep(1)
actor.setFaction('')
actor.sendSystemMessage('@faction_recruiter:resign_complete', 0)
time.sleep(1)
actor.setFaction(commandString)
return
if faction == 'neutral' or faction == '':
actor.sendSystemMessage('@faction_recruiter:not_aligned', 0)
return
if factionStatus == FactionStatus.OnLeave:
actor.sendSystemMessage('@faction_recruiter:on_leave_to_covert', 0)
actor.setPvpStatus(PvpStatus.GoingCovert, True)
time.sleep(1)
actor.setFactionStatus(FactionStatus.Combatant)
actor.setPvpStatus(PvpStatus.GoingCovert, False)
actor.setPvpStatus(PvpStatus.Enemy, True)
actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)
return
if factionStatus == FactionStatus.Combatant:
actor.sendSystemMessage('@faction_recruiter:covert_to_overt', 0)
actor.setPvpStatus(PvpStatus.GoingOvert, True)
time.sleep(30)
actor.setFactionStatus(FactionStatus.SpecialForces)
actor.setPvpStatus(PvpStatus.GoingOvert, False)
actor.setPvpStatus(PvpStatus.Overt | PvpStatus.Attackable | PvpStatus.Aggressive, True)
actor.sendSystemMessage('@faction_recruiter:overt_complete', 0)
return
if factionStatus == FactionStatus.SpecialForces:
actor.sendSystemMessage('@faction_recruiter:overt_to_covert', 0)
actor.setPvpStatus(PvpStatus.GoingCovert, True)
time.sleep(300)
actor.setFactionStatus(FactionStatus.Combatant)
actor.setPvpStatus(PvpStatus.GoingCovert | PvpStatus.Overt | PvpStatus.Attackable | PvpStatus.Aggressive, False)
actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)
return
return
scripts/commands/setgodmode.py
+39
View File
@@ -0,0 +1,39 @@
import sys
from engine.resources.scene import Point3D
def setup():
return
def run(core, actor, target, commandString):
playerObject = actor.getSlottedObject('ghost')
if not playerObject:
return
commandArgs = commandString.split(' ')
command = commandArgs[0]
arg1 = commandArgs[1]
if commandArgs[2]:
arg2 = commandArgs[2]
if commandArgs[3]:
arg3 = commandArgs[3]
if commandArgs[4]:
arg4 = commandArgs[4]
if not command:
return
if command == 'giveExperience' and arg1:
core.playerService.giveExperience(actor, int(arg1))
if command == 'setSpeed' and arg1:
actor.sendSystemMessage('Your speed was ' + str(actor.getSpeedMultiplierBase()) + '. Don\'t forget to set this back or it\'ll permanently imbalance your speed. Default without buffs or mods is 1.', 2)
actor.setSpeedMultiplierBase(float(arg1))
actor.sendSystemMessage('Your new speed is ' + str(actor.getSpeedMultiplierBase()) + '.', 2)
if command == 'teleport' and arg2 and arg3 and arg4:
position = Point3D(float(arg2), float(arg3), float(arg4))
core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName(arg1), position, actor.getOrientation(), None)
return
scripts/expertise/expertise_of_tactical_sup_1.py
+6 -4
View File
@@ -36,11 +36,13 @@ 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/object/creature/npc/theme_park/lambda_shuttle.py
+1
View File
@@ -1,4 +1,5 @@
import sys
def setup(core, object):
#object.setPosture(2)
return
scripts/skillMods/movement.py
+2 -5
View File
@@ -2,13 +2,10 @@ import sys
def add(core, actor, name, base):
actor.addSkillMod(name, base)
actor.getSkillMod(name).setModifier(10)
modifier = actor.getSkillMod(name).getModifier()
actor.setSpeedMultiplierBase(actor.getSpeedMultiplierBase() + float(float(base) / float(modifier)))
actor.setSpeedMultiplierBase(actor.getSpeedMultiplierBase() + base / 100)
return
def deduct(core, actor, name, base):
modifier = actor.getSkillMod(name).getModifier()
actor.setSpeedMultiplierBase(actor.getSpeedMultiplierBase() - float(float(base) / float(modifier)))
actor.setSpeedMultiplierBase(actor.getSpeedMultiplierBase() - base / 100)
actor.deductSkillMod(name, base)
return
scripts/starter_clothing/crafting_artisan_trandoshan_male.py
+2 -3
View File
@@ -2,10 +2,9 @@ import sys
def CraftingArtisanTrandoshanMale(core, object):
shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s03.iff', object.getPlanet())
vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.if', object.getPlanet())
vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', object.getPlanet())
necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet())
pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.ifff', object.getPlanet())
inventory = object.getSlottedObject('inventory')
pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', object.getPlanet())
object._add(shirt)
object._add(vest)
object._add(necklace)
scripts/static_map_locations.py
+3 -3
View File
@@ -59,11 +59,11 @@ def corelliaLocations(core, planet):
# Cities
mapService.addLocation(planet, 'Coronet', -178, -4504, 17, 0, 0)
mapService.addLocation(planet, 'Tyrena', -5140, 2450, 17, 0, 0)
mapService.addLocation(planet, 'Tyrena', -5140, -2450, 17, 0, 0)
mapService.addLocation(planet, 'Bela Vistal', 6766, -5692, 17, 0, 0)
mapService.addLocation(planet, 'Kor Vella', -3420, 3146, 17, 0, 0)
mapService.addLocation(planet, 'Doaba Guerfel', 3274, 5582, 17, 0, 0)
mapService.addLocation(planet, 'Vreni Island', -5538, 6176, 17, 0, 0)
mapService.addLocation(planet, 'Vreni Island', -5538, -6176, 17, 0, 0)
def nabooLocations(core, planet):
@@ -158,4 +158,4 @@ def lokLocations(core, planet):
#mapService.addLocation(planet, 'Pandath Spaceport', 0, 0, 17, 0, 0)
scripts/static_travel_points.py
+1 -13
View File
@@ -26,10 +26,6 @@ def addPoints(core, planet):
kashyyyk_mainPoints(core, planet)
if planet.getName() == 'mustafar':
mustafarPoints(core, planet)
if planet.getName() == 'kaas':
kaasPoints(core, planet)
if planet.getName() == 'taanab':
taanabPoints(core, planet)
return
def corelliaPoints(core, planet):
@@ -154,12 +150,4 @@ def mustafarPoints(core, planet):
trvSvc = core.travelService
trvSvc.addTravelPoint(planet, "Mensix Mining Facility", 405, 230, -1352)
return
#def kaasPoints(core, planet):
#trvSvc = core.travelService
#Return
#def taanabPoints(core, planet):
#trvSvc = core.travelService
#return
return