projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-15 05:13:14 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from ProjectSWGCore/master

Browse Source 
test
This commit is contained in:
tacef
2014-05-17 09:56:28 +02:00
parent 4f2a9e4aba 255aa29578
commit c95ce01e1d
161 changed files with 1464 additions and 2162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ngengine_public.jar
BIN
View File
Binary file not shown.
options.cfg
+4 -1
View File
@@ -1,3 +1,6 @@
LOAD.SNAPSHOT_OBJECTS=1
LOAD.BUILDOUT_OBJECTS=1
LOAD.RESOURCE.SYSTEM=1
LOAD.RESOURCE.SYSTEM=1
# Misc
CLEAN.ODB.FOLDERS=0
scripts/buffs/drink_breath_of_heaven.py
-14
View File
@@ -1,14 +0,0 @@
import sys
def setup(core, actor, buff):
return
def add(core, actor, buff):
core.skillModService.addSkillMod(actor, 'constitution_modified', 80)
core.skillModService.addSkillMod(actor, 'expertise_dodge', 3)
return
def remove(core, actor, buff):
core.skillModService.deductSkillMod(actor, 'constitution_modified', 80)
core.skillModService.deductSkillMod(actor, 'expertise_dodge', 3)
return
scripts/buffs/invis_sp_buff_invis_notrace_1.py
+22
View File
@@ -0,0 +1,22 @@
import sys
def setup(core, actor, buff):
return
def add(core, actor, buff):
actor.setInStealth(True)
actor.setRadarVisible(False)
if actor.getSkillMod('expertise_sp_covert_mastery_1'):
core.skillModService.addSkillMod(actor, 'sp_covert_mastery')
return
def remove(core, actor, buff):
actor.setInStealth(False)
actor.setRadarVisible(True)
if actor.getSkillMod('expertise_sp_covert_mastery_1'):
core.skillModService.deductSkillMod(actor, 'sp_covert_mastery')
return
scripts/buffs/me_stasis_1.py
+2 -2
View File
@@ -5,10 +5,10 @@ def setup(core, actor, buff):
def add(core, actor, buff):
actor.playEffectObject('clienteffect/medic_stasis.cef', 'me_stasis_1')
actor.setSpeedMultiplierBase(0.2)
core.skillModService.deductSkillMod(actor, 'movement', 8)
return
def remove(core, actor, buff):
actor.setSpeedMultiplierBase(1)
core.skillModService.addSkillMod(actor, 'movement', 8)
return
scripts/collections/master_bounty_hunter_1a.py
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_bountyhunter_master")
return
scripts/collections/master_commando_1a.py
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_commando_master")
return
scripts/collections/master_entertainer_1a.py
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_social_entertainer_master")
return
scripts/collections/master_force_sensitive_1a.py
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_jedi_master")
return
scripts/collections/master_medic_1a.py
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_medic_master")
return
scripts/collections/master_officer_1a.py
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_officer_master")
return
scripts/collections/master_smuggler_1a.py
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_smuggler_master")
return
scripts/collections/master_spy_1a.py
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_spy_master")
return
scripts/collections/master_trader_0a.py
-15
View File
@@ -1,15 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_chef_master")
core.collectionService.addCollection(actor, "new_prof_crafting_tailor_master")
return
scripts/collections/master_trader_0b.py
-14
View File
@@ -1,14 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_architect_master")
return
scripts/collections/master_trader_0c.py
-15
View File
@@ -1,15 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_armorsmith_master")
core.collectionService.addCollection(actor, "new_prof_crafting_weaponsmith_master")
return
scripts/collections/master_trader_0d.py
-14
View File
@@ -1,14 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_droidengineer_master")
return
scripts/collections/profession_master.py
+60
View File
@@ -0,0 +1,60 @@
import sys
def bounty_hunter_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_bountyhunter_master")
return
def commando_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_commando_master")
return
def entertainer_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_social_entertainer_master")
return
def force_sensitive_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_jedi_master")
return
def medic_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_medic_master")
return
def officer_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_officer_master")
return
def smuggler_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_officer_master")
return
def spy_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_spy_master")
return
def trader_0a(core, actor):
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_chef_master")
core.collectionService.addCollection(actor, "new_prof_crafting_tailor_master")
return
def trader_0b(core, actor):
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_architect_master")
return
def trader_0c(core, actor):
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_armorsmith_master")
core.collectionService.addCollection(actor, "new_prof_crafting_weaponsmith_master")
return
def trader_0d(core, actor):
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_droidengineer_master")
return
scripts/commands/bh_armor_sprint_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, buff):
core.buffService.addBuffToCreature(actor, 'bh_power_sprint_1')
core.buffService.addBuffToCreature(actor, 'bh_power_sprint_1', actor)
return
def run(core, actor, target, commandString):
scripts/commands/bh_cover_1.py
+1 -1
View File
@@ -4,5 +4,5 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'bh_cover_1')
core.buffService.addBuffToCreature(actor, 'bh_cover_1', actor)
return
scripts/commands/bh_shields_1.py
+3 -3
View File
@@ -4,7 +4,7 @@ def setup(core, actor, target, command):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'bh_shields')
core.buffService.addBuffToCreature(actor, 'bh_shields_charged')
core.buffService.addBuffToCreature(actor, 'bh_shields_handler')
core.buffService.addBuffToCreature(actor, 'bh_shields', actor)
core.buffService.addBuffToCreature(actor, 'bh_shields_charged', actor)
core.buffService.addBuffToCreature(actor, 'bh_shields_handler', actor)
return
scripts/commands/co_first_aid_training.py
+1 -1
View File
@@ -4,5 +4,5 @@ def setup():
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'co_first_aid_training')
core.buffService.addBuffToCreature(actor, 'co_first_aid_training', actor)
return
scripts/commands/combat/bh_return_fire_command_1.py
+1 -1
View File
@@ -6,6 +6,6 @@ def setup(core, actor, target, command):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'bh_return_fire_1')
core.buffService.addBuffToCreature(actor, 'bh_return_fire_1', actor)
return
scripts/commands/combat/en_spiral_kick_0.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_spiral_kick_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_spiral_kick_2.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_spiral_kick_3.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_spiral_kick_4.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_thrill.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_debuff_thrill')
core.buffService.addBuffToCreature(target, 'en_debuff_thrill', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_thrill_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1')
core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_thrill_2.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1')
core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_thrill_3.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_debuff_thrill_2')
core.buffService.addBuffToCreature(target, 'en_debuff_thrill_2', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_void_dance_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_void_dance_buff_1')
core.buffService.addBuffToCreature(target, 'en_void_dance_buff_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_void_dance_2.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_void_dance_buff_2')
core.buffService.addBuffToCreature(target, 'en_void_dance_buff_2', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/en_void_dance_3.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'en_void_dance_buff_3')
core.buffService.addBuffToCreature(target, 'en_void_dance_buff_3', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/me_burst_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'me_burst_1')
core.buffService.addBuffToCreature(target, 'me_burst_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/me_cranial_smash_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'me_cranial_smash_1')
core.buffService.addBuffToCreature(target, 'me_cranial_smash_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/me_doom.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'me_doom')
core.buffService.addBuffToCreature(target, 'me_doom', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/me_electrolyte_drain_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'me_electrolyte_drain_1')
core.buffService.addBuffToCreature(target, 'me_electrolyte_drain_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/me_induce_insanity_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'me_induce_insanity_1')
core.buffService.addBuffToCreature(target, 'me_induce_insanity_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/me_serotonin_purge_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'me_serotonin_purge_1')
core.buffService.addBuffToCreature(target, 'me_serotonin_purge_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/me_stasis_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('me_stasis_1')
core.buffService.addBuffToCreature(target, 'me_stasis_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_ae_dm_cc_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_1')
core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_ae_dm_cc_2.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_2')
core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_2', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_ae_dm_cc_3.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_3')
core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_3', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_cc_melee_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_cc_melee_1')
core.buffService.addBuffToCreature(target, 'of_cc_melee_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_cc_melee_2.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_cc_melee_2')
core.buffService.addBuffToCreature(target, 'of_cc_melee_2', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_cc_melee_3.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_cc_melee_3')
core.buffService.addBuffToCreature(target, 'of_cc_melee_3', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_cc_melee_4.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_cc_melee_4')
core.buffService.addBuffToCreature(target, 'of_cc_melee_4', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_cc_melee_5.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_cc_melee_5')
core.buffService.addBuffToCreature(target, 'of_cc_melee_5', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_cc_melee_6.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_cc_melee_6')
core.buffService.addBuffToCreature(target, 'of_cc_melee_6', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_cc_melee_7.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_cc_melee_7')
core.buffService.addBuffToCreature(target, 'of_cc_melee_7', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deadeye_debuff.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deadeye_debuff')
core.buffService.addBuffToCreature(target, 'of_deadeye_debuff', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deb_def_1.py
+5 -5
View File
@@ -1,11 +1,11 @@
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deb_def_1')
core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
if actor.getSkillMod('expertise_of_adv_paint_debuff'):
core.buffService.addBuffToCreature(target, 'of_deb_def_1')
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_1')
core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_1', actor)
if actor.getSkillMod('expertise_of_adv_paint_expose'):
core.buffService.addBuffToCreature(target, 'of_deb_def_1')
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_1')
core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deb_def_2.py
+5 -5
View File
@@ -1,11 +1,11 @@
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deb_def_2')
core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
if actor.getSkillMod('expertise_of_adv_paint_debuff'):
core.buffService.addBuffToCreature(target, 'of_deb_def_2')
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_2')
core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_2', actor)
if actor.getSkillMod('expertise_of_adv_paint_expose'):
core.buffService.addBuffToCreature(target, 'of_deb_def_2')
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_2')
core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_2', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deb_def_3.py
+5 -5
View File
@@ -1,11 +1,11 @@
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deb_def_3')
core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
if actor.getSkillMod('expertise_of_adv_paint_debuff'):
core.buffService.addBuffToCreature(target, 'of_deb_def_3')
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_3')
core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_3', actor)
if actor.getSkillMod('expertise_of_adv_paint_expose'):
core.buffService.addBuffToCreature(target, 'of_deb_def_3')
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_3')
core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_3', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deb_def_4.py
+5 -5
View File
@@ -1,11 +1,11 @@
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deb_def_4')
core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
if actor.getSkillMod('expertise_of_adv_paint_debuff'):
core.buffService.addBuffToCreature(target, 'of_deb_def_4')
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_4')
core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_4', actor)
if actor.getSkillMod('expertise_of_adv_paint_expose'):
core.buffService.addBuffToCreature(target, 'of_deb_def_4')
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_4')
core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_4', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deb_def_5.py
+5 -5
View File
@@ -1,11 +1,11 @@
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deb_def_5')
core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
if actor.getSkillMod('expertise_of_adv_paint_debuff'):
core.buffService.addBuffToCreature(target, 'of_deb_def_5')
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_5')
core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_5', actor)
if actor.getSkillMod('expertise_of_adv_paint_expose'):
core.buffService.addBuffToCreature(target, 'of_deb_def_5')
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_5')
core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_5', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deb_def_6.py
+5 -5
View File
@@ -1,11 +1,11 @@
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deb_def_6')
core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
if actor.getSkillMod('expertise_of_adv_paint_debuff'):
core.buffService.addBuffToCreature(target, 'of_deb_def_6')
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_6')
core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_6', actor)
if actor.getSkillMod('expertise_of_adv_paint_expose'):
core.buffService.addBuffToCreature(target, 'of_deb_def_6')
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_6')
core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_6', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deb_def_7.py
+5 -5
View File
@@ -1,11 +1,11 @@
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deb_def_7')
core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
if actor.getSkillMod('expertise_of_adv_paint_debuff'):
core.buffService.addBuffToCreature(target, 'of_deb_def_7')
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_7')
core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_7', actor)
if actor.getSkillMod('expertise_of_adv_paint_expose'):
core.buffService.addBuffToCreature(target, 'of_deb_def_7')
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_7')
core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_7', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_deb_def_8.py
+5 -5
View File
@@ -1,11 +1,11 @@
def setup(core, actor, target, command):
core.buffService.addBuffToCreature(target, 'of_deb_def_8;)
core.buffService.addBuffToCreature(target, 'of_deb_def_8', actor)
if actor.getSkillMod('expertise_of_adv_paint_debuff'):
core.buffService.addBuffToCreature(target, 'of_deb_def_8')
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_8')
core.buffService.addBuffToCreature(target, 'of_deb_def_8', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_8', actor)
if actor.getSkillMod('expertise_of_adv_paint_expose'):
core.buffService.addBuffToCreature(target, 'of_deb_def_8')
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_8')
core.buffService.addBuffToCreature(target, 'of_deb_def_8', actor)
core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_8', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_decapitate_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_decap_bleed_1')
core.buffService.addBuffToCreature(target, 'of_decap_bleed_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_decapitate_2.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_decap_bleed_2')
core.buffService.addBuffToCreature(target, 'of_decap_bleed_2', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_decapitate_3.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_decap_bleed_3')
core.buffService.addBuffToCreature(target, 'of_decap_bleed_3', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_decapitate_4.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_decap_bleed_4')
core.buffService.addBuffToCreature(target, 'of_decap_bleed_4', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_decapitate_5.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_decap_bleed_5')
core.buffService.addBuffToCreature(target, 'of_decap_bleed_5', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_decapitate_6.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_decap_bleed_6')
core.buffService.addBuffToCreature(target, 'of_decap_bleed_6', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_del_ae_dm_dot_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_dot_bomb_1')
core.buffService.addBuffToCreature(target, 'of_dot_bomb_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_del_ae_dm_dot_2.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_dot_bomb_1')
core.buffService.addBuffToCreature(target, 'of_dot_bomb_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_del_ae_dm_dot_3.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_dot_bomb_1')
core.buffService.addBuffToCreature(target, 'of_dot_bomb_1', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_pistol_bleed_1.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_pistol_bleed')
core.buffService.addBuffToCreature(target, 'of_pistol_bleed', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_vortex_1.py
+2 -2
View File
@@ -1,8 +1,8 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_vortex_bleed_1')
command.setBuffNameTarget('of_vortex_root')
core.buffService.addBuffToCreature(target, 'of_vortex_bleed_1', actor)
core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_vortex_2.py
+2 -2
View File
@@ -1,8 +1,8 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_vortex_bleed_2')
command.setBuffNameTarget('of_vortex_root')
core.buffService.addBuffToCreature(target, 'of_vortex_bleed_2', actor)
core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_vortex_3.py
+2 -2
View File
@@ -1,8 +1,8 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_vortex_bleed_3')
command.setBuffNameTarget('of_vortex_root')
core.buffService.addBuffToCreature(target, 'of_vortex_bleed_3', actor)
core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_vortex_4.py
+2 -2
View File
@@ -1,8 +1,8 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_vortex_bleed_4')
command.setBuffNameTarget('of_vortex_root')
core.buffService.addBuffToCreature(target, 'of_vortex_bleed_4', actor)
core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
return
def preRun(core, actor, target, command):
scripts/commands/combat/of_vortex_5.py
+2 -2
View File
@@ -1,8 +1,8 @@
import sys
def setup(core, actor, target, command):
command.setBuffNameTarget('of_vortex_bleed_5')
command.setBuffNameTarget('of_vortex_root')
core.buffService.addBuffToCreature(target, 'of_vortex_bleed_5', actor)
core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
return
def preRun(core, actor, target, command):
scripts/commands/en_action_regen.py
+1 -1
View File
@@ -4,5 +4,5 @@ def setup():
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'en_action_regen')
core.buffService.addBuffToCreature(actor, 'en_action_regen', actor)
return
scripts/commands/me_cure_affliction_1.py
+1 -1
View File
@@ -4,5 +4,5 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'me_cure_affliction_1', target)
core.buffService.addBuffToCreature(actor, 'me_cure_affliction_1', actor)
return
scripts/commands/transferitemmisc.py
+1 -1
View File
@@ -28,7 +28,7 @@ def run(core, actor, target, commandString):
if target.isLootItem():
target.setLootItem(0)
actor.sendSystemMessage('You looted ' + target.getTrueName() + ' from corpse.', 0)
actor.sendSystemMessage('You looted ' + target.getStf().getStfValue() + ' from corpse.', 0)
if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer):
target.getContainer().transferTo(actor, container, target)
scripts/conversation/respec.py
+34 -70
View File
@@ -6,91 +6,55 @@ import sys
def startConversation(core, actor, npc):
convSvc = core.conversationService
prose = ProsePackage('conversation/respecseller', 's_31')
outOfBand = OutOfBand()
outOfBand.addProsePackage(prose)
convSvc.sendConversationMessage(actor, npc, outOfBand)
prose2 = ProsePackage('conversation/respecseller', 's_32')
outOfBand2 = OutOfBand()
outOfBand2.addProsePackage(prose2)
prose3 = ProsePackage('conversation/respecseller', 's_33')
outOfBand3 = OutOfBand()
outOfBand3.addProsePackage(prose3)
option1 = ConversationOption(outOfBand2, 0)
option2 = ConversationOption(outOfBand3, 1)
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/respecseller:s_31'))
options = Vector()
options.add(option1)
options.add(option2)
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_32'), 0))
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_33'), 1))
convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen)
return
return
def handleFirstScreen(core, actor, npc, selection):
if selection == 0:
# respec
# TODO: check for prices
convSvc = core.conversationService
prose = ProsePackage('conversation/respecseller', 's_58')
outOfBand = OutOfBand()
outOfBand.addProsePackage(prose)
convSvc.sendConversationMessage(actor, npc, outOfBand)
prose2 = ProsePackage('conversation/respecseller', 's_60')
outOfBand2 = OutOfBand()
outOfBand2.addProsePackage(prose2)
prose3 = ProsePackage('conversation/respecseller', 's_64')
outOfBand3 = OutOfBand()
outOfBand3.addProsePackage(prose3)
option1 = ConversationOption(outOfBand2, 0)
option2 = ConversationOption(outOfBand3, 1)
options = Vector()
options.add(option1)
options.add(option2)
convSvc.sendConversationOptions(actor, npc, options, handleRespecScreen)
return
if selection == 1:
# expertise reset
# TODO: check for prices
convSvc = core.conversationService
prose = ProsePackage('conversation/respecseller', 's_35')
outOfBand = OutOfBand()
outOfBand.addProsePackage(prose)
convSvc.sendConversationMessage(actor, npc, outOfBand)
prose2 = ProsePackage('conversation/respecseller', 's_71')
outOfBand2 = OutOfBand()
outOfBand2.addProsePackage(prose2)
prose3 = ProsePackage('conversation/respecseller', 's_72')
outOfBand3 = OutOfBand()
outOfBand3.addProsePackage(prose3)
option1 = ConversationOption(outOfBand2, 0)
option2 = ConversationOption(outOfBand3, 1)
options = Vector()
options.add(option1)
options.add(option2)
convSvc.sendConversationOptions(actor, npc, options, handleResetScreen)
return
convSvc = core.conversationService
def handleRespecScreen(core, actor, npc, selection):
# TODO: check for prices
if selection == 0: # respec
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/respecseller:s_58'))
options = Vector()
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_60'), 0))
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_64'), 1))
convSvc.sendConversationOptions(actor, npc, options, handleRespecScreen)
if selection == 1: # expertise reset
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/respecseller:s_35'))
options = Vector()
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_71'), 0))
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_72'), 1))
convSvc.sendConversationOptions(actor, npc, options, handleResetScreen)
return
def handleRespecScreen(core, actor, npc, selection):
if selection == 0:
core.skillService.sendRespecWindow(actor)
core.conversationService.handleEndConversation(actor, npc)
return
def handleResetScreen(core, actor, npc, selection):
if selection == 0:
core.skillService.resetExpertise(actor)
core.conversationService.handleEndConversation(actor, npc)
return
core.conversationService.handleEndConversation(actor, npc)
return
def endConversation(core, actor, npc):
core.conversationService.sendStopConversation(actor, npc, 'conversation/respecseller', 's_38')
return
scripts/object/intangible/data_item/guild_stone.py
+1
View File
@@ -1,4 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'object/guild_access_device')
return
scripts/object/tangible/furniture/technical/guild_registry_initial.py
+1
View File
@@ -1,4 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'object/guild_registry')
return
scripts/radial/npc/corpse.py
+8 -8
View File
@@ -5,7 +5,7 @@ def createRadial(core, owner, target, radials):
#owner.sendSystemMessage('Correct Loot Radial created', 0)
radials.clear()
radials.add(RadialOptions(0, 36, 0, 'Loot'))
if target.getAttachment('AI') and core.resourceService.canHarvest(owner, target):
if target.getAttachment('AI') and core.resourceService and core.resourceService.canHarvest(owner, target):
radials.add(RadialOptions(0, 163, 3, '@sui:harvest_corpse'))
radials.add(RadialOptions(2, 164, 3, '@sui:harvest_meat'))
radials.add(RadialOptions(2, 165, 3, '@sui:harvest_hide'))
@@ -15,13 +15,7 @@ def createRadial(core, owner, target, radials):
return
def handleSelection(core, owner, target, option):
if option == 164 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target):
core.resourceService.doHarvest(owner, target, 'meat')
if option == 165 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target):
core.resourceService.doHarvest(owner, target, 'hide')
if option == 166 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target):
core.resourceService.doHarvest(owner, target, 'bone')
if option == 36 and target:
#core.lootService.handleLootRequest(owner,target)
core.lootService.handleLootRequest(owner,target)
@@ -30,5 +24,11 @@ def handleSelection(core, owner, target, option):
#core.lootService.handleCreditDrop(owner, lootedObjectInventory)
if option == 15 and target:
core.objectService.destroyObject(target)
if option == 164 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target):
core.resourceService.doHarvest(owner, target, 'meat')
if option == 165 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target):
core.resourceService.doHarvest(owner, target, 'hide')
if option == 166 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target):
core.resourceService.doHarvest(owner, target, 'bone')
return
scripts/radial/object/guild_access_device.py
+30
View File
@@ -0,0 +1,30 @@
from resources.common import RadialOptions
from services.sui.SUIService import InputBoxType
from java.util import Vector
from main import NGECore
import sys
def createRadial(core, owner, target, radials):
#radials.clear()
if owner.getGuildId() != 0:
guild = core.guildService.getGuildById(owner.getGuildId)
if guild is None:
return
if guild.getLeader() == owner.getObjectID():
radials.add(RadialOptions(0, RadialOptions.serverGuildGuildManagement, 3, '@guild:menu_guild_management'))
radials.add(RadialOptions(0, RadialOptions.serverGuildMemberManagement, 3, '@guild:menu_member_management'))
#Guild Management
radials.add(RadialOptions(3, RadialOptions.serverGuildDisband, 3, '@guild:menu_disband'))
#Member Management
radials.add(RadialOptions(4, RadialOptions.serverGuildSponsor, 3, '@guild:menu_sponsor'))
return
return
def handleSelection(core, owner, target, option):
return
scripts/radial/object/guild_registry.py
+47
View File
@@ -0,0 +1,47 @@
from resources.common import RadialOptions
from services.sui.SUIService import InputBoxType
from java.util import Vector
from main import NGECore
import sys
def createRadial(core, owner, target, radials):
#radials.clear()
if owner.getGuildId() == 0:
radials.add(RadialOptions(0, RadialOptions.serverGuildCreate, 3, '@guild:menu_create'))
return
return
def handleSelection(core, owner, target, option):
suiSvc = NGECore().getInstance().suiService
# Create Guild
if option == 185 and target:
wndGuildCreate = core.suiService.createInputBox(InputBoxType.INPUT_BOX_OK_CANCEL, '@guild:create_name_title', '@guild:create_name_prompt', owner, owner, 0, handleGuildCreateName)
wndGuildCreate.setProperty("txtInput:MaxLength", "24");
wndGuildCreate.setProperty("txtInput:NumericInteger", "false")
suiSvc.openSUIWindow(wndGuildCreate)
return
return
def handleGuildCreateName(owner, window, eventType, returnList):
suiSvc = NGECore().getInstance().suiService
if eventType == 0:
guildName = str(returnList.get(0))
if guildName is not None:
owner.setAttachment('guildName', guildName)
wndGuildInitials = NGECore().getInstance().suiService.createInputBox(InputBoxType.INPUT_BOX_OK, '@guild:create_abbrev_title', '@guild:create_abbrev_prompt', owner, owner, 0, doGuildCreate)
wndGuildInitials.setProperty("txtInput:MaxLength", "4");
wndGuildInitials.setProperty("txtInput:NumericInteger", "false")
suiSvc.openSUIWindow(wndGuildInitials)
return
return
def doGuildCreate(owner, window, eventType, returnList):
if eventType == 0:
guild = NGECore().getInstance().guildService.createGuild(str(returnList.get(0)), str(owner.getAttachment('guildName')), owner)
owner.setGuildId(guild.getId())
return
return
scripts/static_spawns/corellia/coronet.py
+26 -26
View File
@@ -33,75 +33,75 @@ def addPlanetSpawns(core, planet):
#---Coronet-CityHall-interrior
brantlee = stcSvc.spawnObject('object/mobile/shared_dressed_brantlee_spondoon.iff', 'corellia', long(1855463), float(-25.7), float(1.3), float(-0.5), float(0.98), float(0.01))
brantlee.setCustomName2('Brantlee Spondoon')
brantlee.setOptionsBitmask(256)
#brantlee.setCustomName2('Brantlee Spondoon')
#brantlee.setOptionsBitmask(256)
cor_brawlr00 = stcSvc.spawnObject('object/mobile/shared_dressed_brawler_trainer_01.iff', 'corellia', long(1855463), float(-1.7274), float(7.9), float(-32.175), float(0.5), float(0.01))
cor_brawlr00.setCustomName2('a brawler')
#cor_brawlr00.setCustomName2('a brawler')
cor_btdiplmt02 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_bothan_male_01.iff', 'corellia', long(1855463), float(5.228), float(0.3), float(2.9167), float(-0.47), float(0.21))
cor_btdiplmt02.setCustomName2('a Bothan Diplomat')
#cor_btdiplmt02.setCustomName2('a Bothan Diplomat')
cor_btinfobkr00 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_bothan_female_02.iff', 'corellia', long(1855463), float(5.228), float(0.3), float(4.016), float(0.99), float(0.01))
cor_btinfobkr00.setCustomName2('a Bothan Information Broker')
#cor_btinfobkr00.setCustomName2('a Bothan Information Broker')
cor_btinfobkr01 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_bothan_male_02.iff', 'corellia', long(1855463), float(5.345), float(2.278), float(-27.0615), float(-0.14), float(0.22))
cor_btinfobkr01.setCustomName2('a Bothan Information Broker')
#cor_btinfobkr01.setCustomName2('a Bothan Information Broker')
cor_ent00 = stcSvc.spawnObject('object/mobile/shared_dressed_twk_entertainer.iff', 'corellia', long(1855463), float(0.767877), float(0.3), float(-2.902), float(-0.50), float(0.11))
cor_ent00.setCustomName2('an Entertainer')
#cor_ent00.setCustomName2('an Entertainer')
cor_farmer00 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_02.iff', 'corellia', long(1855463), float(-18.6014), float(1.3026), float(-11.314), float(-0.45), float(0.21))
cor_farmer00.setCustomName2('a farmer')
#cor_farmer00.setCustomName2('a farmer')
cor_farmer01 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_female_01.iff', 'corellia', long(1855463), float(0.767877), float(0.3), float(-4.002), float(-0.45), float(0.21))
cor_farmer01.setCustomName2('a farmer')
#cor_farmer01.setCustomName2('a farmer')
galluraHanderin = stcSvc.spawnObject('object/mobile/shared_dressed_noble_human_female_02.iff', 'corellia', long(1855463), float(-6.51554), float(1.303), float(9.6562), float(0.1), float(0.01))
galluraHanderin.setCustomName2('Gallura Handerin')
galluraHanderin.setOptionsBitmask(256)
#galluraHanderin.setCustomName2('Gallura Handerin')
#galluraHanderin.setOptionsBitmask(256)
corsec_agent00 = stcSvc.spawnObject('object/mobile/shared_dressed_corellia_local_corsec_chief.iff', 'corellia', long(1855463), float(-0.332), float(0.3), float(-2.902), float(0.89), float(0.01))
corsec_agent00.setCustomName2('a CorSec Agent')
#corsec_agent00.setCustomName2('a CorSec Agent')
thaleDustrunner = stcSvc.spawnObject('object/mobile/shared_dressed_criminal_smuggler_human_male_01.iff', 'corellia', long(1855463), float(-0.05), float(3.078), float(-10.9388), float(0.99), float(0.11))
thaleDustrunner.setCustomName2('Thale Dustrunner')
thaleDustrunner.setOptionsBitmask(256)
#thaleDustrunner.setCustomName2('Thale Dustrunner')
#thaleDustrunner.setOptionsBitmask(256)
#---Coronet-StarPort-interrior
cor_btdiplmt00 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_bothan_female_01.iff', 'corellia', long(1855678), float(56.669), float(-0.521137), float(33.7689), float(0.99), float(0.11))
cor_btdiplmt00.setCustomName2('a Bothan Diplomat')
#cor_btdiplmt00.setCustomName2('a Bothan Diplomat')
cor_btdiplmt01 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_bothan_male_01.iff', 'corellia', long(1855672), float(8.651), float(0.6394), float(74.448), float(-0.47), float(0.21))
cor_btdiplmt01.setCustomName2('a Bothan Diplomat')
#cor_btdiplmt01.setCustomName2('a Bothan Diplomat')
corsec_cadt00 = stcSvc.spawnObject('object/mobile/shared_dressed_corsec_pilot_human_female_01.iff', 'corellia', long(1855678), float(37.163), float(0.6394), float(40.706), float(0.99), float(0.11))
corsec_cadt00.setCustomName2('a CorSec cadet')
#corsec_cadt00.setCustomName2('a CorSec cadet')
farmer02 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_04.iff', 'corellia', long(1855683), float(-62.767), float(2.6394), float(40.66), float(-0.45), float(0.21))
farmer02.setCustomName2('a farmer')
#farmer02.setCustomName2('a farmer')
gambler00 = stcSvc.spawnObject('object/mobile/ep3/shared_ep3_cheated_gambler.iff', 'corellia', long(1855675), float(-4.61669), float(0.6394), float(67.826), float(0.99), float(0.11))
gambler00.setCustomName2('a gambler')
#gambler00.setCustomName2('a gambler')
cor_hunter00 = stcSvc.spawnObject('object/mobile/shared_dressed_trader_thug_male_moncal_02.iff', 'corellia', long(1855672), float(8.651), float(0.6394), float(75.548), float(0.99), float(0.11))
cor_hunter00.setCustomName2('a hunter')
#cor_hunter00.setCustomName2('a hunter')
jessbConvorr = stcSvc.spawnObject('object/mobile/shared_dressed_corellia_jesseb_convorr.iff', 'corellia', long(1855684), float(50.2), float(1.0), float(20.1), float(-0.47), float(0.21))
jessbConvorr.setCustomName2('Jesseb Convorr')
jessbConvorr.setOptionsBitmask(256)
#jessbConvorr.setCustomName2('Jesseb Convorr')
#jessbConvorr.setOptionsBitmask(256)
cor_merc00 = stcSvc.spawnObject('object/mobile/shared_dressed_mercenary_strong_hum_m.iff', 'corellia', long(1855683), float(-62.767), float(2.6394), float(41.76), float(0.99), float(0.11))
cor_merc00.setCustomName2('a mercenary')
#cor_merc00.setCustomName2('a mercenary')
cor_miner00 = stcSvc.spawnObject('object/mobile/shared_dressed_mand_miner_hum_03.iff', 'corellia', long(1855678), float(37.163), float(0.6394), float(39.606), float(-0.47), float(0.21))
cor_miner00.setCustomName2('a miner')
#cor_miner00.setCustomName2('a miner')
cor_scintst00 = stcSvc.spawnObject('object/mobile/shared_dressed_twi_female_scientist_01.iff', 'corellia', long(1855678), float(56.669), float(-0.521137), float(32.6689), float(-0.47), float(0.21))
cor_scintst00.setCustomName2('a Scientist')
#cor_scintst00.setCustomName2('a Scientist')
cor_slice00 = stcSvc.spawnObject('object/mobile/shared_dressed_criminal_slicer_human_male_01.iff', 'corellia', long(1855675), float(-4.61669), float(0.6394), float(66.7263), float(-0.5), float(0.21))
cor_slice00.setCustomName2('a slicer')
#cor_slice00.setCustomName2('a slicer')
#-Coronet-Legacy NPCs
stregand = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_bith_male_01.iff', 'corellia', long(0), float(-33), float(28), float(-4424), float(0.67), float(0.21))
scripts/static_spawns/tatooine/anchorhead.py
+3 -3
View File
@@ -17,11 +17,11 @@ def addPlanetSpawns(core, planet):
# Cantina Interior
rebRecruiter = stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_01.iff', 'tatooine', long(1213345), float(-2.2), float(0.4), float(-5.4), float(0), float(0))
rebRecruiter.setOptionsBitmask(264)
#rebRecruiter.setOptionsBitmask(264)
borraSetas = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_rodian_female_03.iff', 'tatooine', long(1213345), float(9.8), float(0.4), float(-1.2), float(-0.65), float(0.75))
borraSetas.setCustomName2('Borra Setas')
borraSetas.setOptionsBitmask(256)
#borraSetas.setCustomName2('Borra Setas')
#borraSetas.setOptionsBitmask(256)
# Outside
aaphKoden = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_aaph_koden.iff', 'tatooine', long(0), float(129), float(5.0), float(-5399), float(-0.67), float(0.73))
scripts/static_spawns/tatooine/bestine.py
+38 -38
View File
@@ -17,84 +17,84 @@ def addPlanetSpawns(core, planet):
# City hall
indigoSiyan = stcSvc.spawnObject('object/mobile/shared_dressed_indigo_siyan.iff', 'tatooine', long(926483), float(24.7), float(3.2), float(-30.7), float(-0.06), float(0.99))
indigoSiyan.setCustomName2('Indigo Siyan')
indigoSiyan.setOptionsBitmask(256)
#indigoSiyan.setCustomName2('Indigo Siyan')
#indigoSiyan.setOptionsBitmask(256)
keanna = stcSvc.spawnObject('object/mobile/shared_dressed_keanna_likyna.iff', 'tatooine', long(926480), float(-18.7), float(3.2), float(20.6), float(-0.97), float(0.2))
keanna.setCustomName2('Keanna Li\'kyna')
keanna.setOptionsBitmask(256)
#keanna.setCustomName2('Keanna Li\'kyna')
#keanna.setOptionsBitmask(256)
oberhaur = stcSvc.spawnObject('object/mobile/shared_space_imperial_tier2_tatooine_oberhaur.iff', 'tatooine', long(926480), float(-21.9), float(3.2), float(26.9), float(0.99), float(0.01))
oberhaur.setCustomName2('Commander Oberhaur')
oberhaur.setOptionsBitmask(256)
#oberhaur.setCustomName2('Commander Oberhaur')
#oberhaur.setOptionsBitmask(256)
seanTrenwell = stcSvc.spawnObject('object/mobile/shared_dressed_sean_trenwell.iff', 'tatooine', long(926483), float(19.4), float(3.2), float(-36), float(-0.06), float(0.99))
seanTrenwell.setCustomName2('Sean Trenwell')
seanTrenwell.setOptionsBitmask(256)
#seanTrenwell.setCustomName2('Sean Trenwell')
#seanTrenwell.setOptionsBitmask(256)
talmont = stcSvc.spawnObject('object/mobile/shared_prefect_talmont.iff', 'tatooine', long(926475), float(-1.9), float(3.1), float(-10.3), float(0.99), float(0))
talmont.setCustomName2('Prefect Talmont')
talmont.setOptionsBitmask(256)
#talmont.setCustomName2('Prefect Talmont')
#talmont.setOptionsBitmask(256)
tourAryon = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_tour_aryon.iff', 'tatooine', long(926479), float(-36.8), float(1.3), float(0.3), float(0.8), float(0.59))
tourAryon.setCustomName2('Tour Aryon')
tourAryon.setOptionsBitmask(256)
#tourAryon.setCustomName2('Tour Aryon')
#tourAryon.setOptionsBitmask(256)
victorVisalis = stcSvc.spawnObject('object/mobile/shared_dressed_victor_visalis.iff', 'tatooine', long(926480), float(-26.7), float(3.2), float(20.8), float(0.96), float(0.24))
victorVisalis.setCustomName2('Victor Visalis')
victorVisalis.setOptionsBitmask(256)
#victorVisalis.setCustomName2('Victor Visalis')
#victorVisalis.setOptionsBitmask(256)
wilhalmSkrim = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_wilhalm_skrim.iff', 'tatooine', long(926482), float(28.9), float(1.3), float(-6.0), float(0.23), float(0.97))
wilhalmSkrim.setCustomName2('Wilhalm Skrim')
wilhalmSkrim.setOptionsBitmask(256)
#wilhalmSkrim.setCustomName2('Wilhalm Skrim')
#wilhalmSkrim.setOptionsBitmask(256)
#Miscellaneous Building Interiors
akalColzet = stcSvc.spawnObject('object/mobile/shared_dressed_imperial_trainer_space_01.iff', 'tatooine', long(1212359), float(0.7), float(1.8), float(-14), float(0), float(0.99))
akalColzet.setCustomName2('lt. Akal Colzet')
akalColzet.setOptionsBitmask(256)
#akalColzet.setCustomName2('lt. Akal Colzet')
#akalColzet.setOptionsBitmask(256)
fariousGletch = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_farious_gletch.iff', 'tatooine', long(1278989), float(2.0), float(-0.4), float(-5.7), float(-0.15), float(0.98))
fariousGletch.setCustomName2('Farious Gletch')
fariousGletch.setOptionsBitmask(256)
#fariousGletch.setCustomName2('Farious Gletch')
#fariousGletch.setOptionsBitmask(256)
pfilbeeJhorn = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_pfilbee_jhorn.iff', 'tatooine', long(1279923), float(5.1), float(0.1), float(-3.8), float(-0.7), float(0.71))
pfilbeeJhorn.setCustomName2('Pfilbee Jhorn')
pfilbeeJhorn.setOptionsBitmask(256)
#pfilbeeJhorn.setCustomName2('Pfilbee Jhorn')
#pfilbeeJhorn.setOptionsBitmask(256)
#Hotel interior
gilBurtin = stcSvc.spawnObject('object/mobile/shared_dressed_industrialist_trainer_01.iff', 'tatooine', long(1223850), float(20.3), float(1.6), float(12.8), float(0.99), float(0))
gilBurtin.setCustomName2('Gil Burtin')
gilBurtin.setOptionsBitmask(256)
#gilBurtin.setCustomName2('Gil Burtin')
#gilBurtin.setOptionsBitmask(256)
# Outside
barak = stcSvc.spawnObject('object/mobile/shared_smuggler_broker_barak.iff', 'tatooine', long(0), float(-1049), float(5.0), float(-3537), float(0.97), float(0.23))
barak.setCustomName2('Barak')
barak.setOptionsBitmask(256)
#barak.setCustomName2('Barak')
#barak.setOptionsBitmask(256)
barrezz = stcSvc.spawnObject('object/mobile/shared_dressed_dressed_legacy_barrezz.iff', 'tatooine', long(0), float(-1146.8), float(98.0), float(-3892.1), float(0.75), float(0.65))
barrezz.setCustomName2('Commander Barrezz')
barrezz.setOptionsBitmask(256)
#barrezz.setCustomName2('Commander Barrezz')
#barrezz.setOptionsBitmask(256)
jasha = stcSvc.spawnObject('object/mobile/shared_dressed_bestinejobs_jasha.iff', 'tatooine', long(0), float(-1128), float(98.0), float(-3900), float(-0.42), float(0.90))
jasha.setCustomName2('Captain Jasha')
jasha.setOptionsBitmask(256)
#jasha.setCustomName2('Captain Jasha')
#jasha.setOptionsBitmask(256)
dkrn = stcSvc.spawnObject('object/mobile/shared_dressed_imperial_general_m.iff', 'tatooine', long(0), float(-1160), float(5.0), float(-3525), float(0.90), float(-0.41))
dkrn.setCustomName2('Commander D\'krn')
dkrn.setOptionsBitmask(256)
#dkrn.setCustomName2('Commander D\'krn')
#dkrn.setOptionsBitmask(256)
gunham = stcSvc.spawnObject('object/mobile/shared_dressed_imperial_lieutenant_m.iff', 'tatooine', long(0), float(-1125), float(12.2), float(-3620), float(0.9), float(0.42))
gunham.setCustomName2('Commander Gunham')
gunham.setOptionsBitmask(256)
#gunham.setCustomName2('Commander Gunham')
#gunham.setOptionsBitmask(256)
kormundThrylle = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_kormund_thrylle.iff', 'tatooine', long(0), float(-1043), float(10.0), float(-3530), float(0.99), float(0.06))
kormundThrylle.setCustomName2('Kormund Thrylle')
kormundThrylle.setOptionsBitmask(256)
#kormundThrylle.setCustomName2('Kormund Thrylle')
#kormundThrylle.setOptionsBitmask(256)
calebKnolar = stcSvc.spawnObject('object/mobile/shared_dressed_imperial_major_cold_m.iff', 'tatooine', long(0), float(-1149), float(98.0), float(-3903), float(0.42), float(0.91))
calebKnolar.setCustomName2('Major Caleb Knolar')
calebKnolar.setOptionsBitmask(256)
#calebKnolar.setCustomName2('Major Caleb Knolar')
#calebKnolar.setOptionsBitmask(256)
return
scripts/static_spawns/tatooine/jabbas_palace.py
+30 -30
View File
@@ -18,65 +18,65 @@ def addPlanetSpawns(core, planet):
# TODO Verify proper cell IDs once Jabba's Palace is spawning properly again.
reelo = stcSvc.spawnObject('object/mobile/shared_reelo_baruk.iff', 'tatooine', long(26560), float(-3.5), float(0.2), float(113.5), float(0), float(0))
reelo.setCustomName2('Reelo Baruk')
reelo.setOptionsBitmask(264)
#reelo.setCustomName2('Reelo Baruk')
#reelo.setOptionsBitmask(264)
reeyees = stcSvc.spawnObject('object/mobile/shared_dressed_gran_thug_male_01.iff', 'tatooine', long(26560), float(5.8), float(0.2), float(115.7), float(0.70), float(-0.71))
reeyees.setCustomName2('Ree-Yees')
reeyees.setOptionsBitmask(264)
#reeyees.setCustomName2('Ree-Yees')
#reeyees.setOptionsBitmask(264)
ephant = stcSvc.spawnObject('object/mobile/shared_ephant_mon.iff', 'tatooine', long(26564), float(-6.1), float(5.8), float(86.1), float(0), float(0))
ephant.setCustomName2('Ephant Mon')
ephant.setOptionsBitmask(264)
#ephant.setCustomName2('Ephant Mon')
#ephant.setOptionsBitmask(264)
porcellus = stcSvc.spawnObject('object/mobile/shared_dressed_porcellus.iff', 'tatooine', long(26572), float(-44.0), float(3.0), float(63.4), float(0), float(0))
porcellus.setCustomName2('Porcellus')
porcellus.setOptionsBitmask(264)
#porcellus.setCustomName2('Porcellus')
#porcellus.setOptionsBitmask(264)
barada = stcSvc.spawnObject('object/mobile/shared_barada.iff', 'tatooine', long(26596), float(31.2), float(0.2), float(-1.0), float(0.98), float(-0.17))
barada.setCustomName2('Barada')
barada.setOptionsBitmask(264)
#barada.setCustomName2('Barada')
#barada.setOptionsBitmask(264)
bibMain = stcSvc.spawnObject('object/mobile/shared_bib_fortuna.iff', 'tatooine', long(26582), float(-11.1), float(2.0), float(49.5), float(0.70), float(0.71))
bibMain.setCustomName2('Bib Fortuna')
bibMain.setOptionsBitmask(264)
#bibMain.setCustomName2('Bib Fortuna')
#bibMain.setOptionsBitmask(264)
jabba = stcSvc.spawnObject('object/mobile/shared_jabba_the_hutt.iff', 'tatooine', long(26582), float(-17.0), float(2.8), float(44.9), float(0.70), float(0.71))
jabba.setCustomName2('Jabba the Hutt')
jabba.setOptionsBitmask(264)
#jabba.setCustomName2('Jabba the Hutt')
#jabba.setOptionsBitmask(264)
oola = stcSvc.spawnObject('object/mobile/shared_oola.iff', 'tatooine', long(26582), float(-10.3), float(2.0), float(43.9), float(0.70), float(-0.71))
oola.setCustomName2('Oola')
oola.setOptionsBitmask(264)
#oola.setCustomName2('Oola')
#oola.setOptionsBitmask(264)
bobaFett = stcSvc.spawnObject('object/mobile/shared_boba_fett.iff', 'tatooine', long(26582), float(-1.0), float(3.0), float(33.1), float(0), float(0))
bobaFett.setCustomName2('Boba Fett')
bobaFett.setOptionsBitmask(264)
#bobaFett.setCustomName2('Boba Fett')
#bobaFett.setOptionsBitmask(264)
ev9d9 = stcSvc.spawnObject('object/mobile/shared_ev_9d9.iff', 'tatooine', long(26574), float(18.8), float(0.2), float(78.7), float(1.0), float(0))
ev9d9.setCustomName2('EV-9D9')
ev9d9.setOptionsBitmask(264)
#ev9d9.setCustomName2('EV-9D9')
#ev9d9.setOptionsBitmask(264)
malakili = stcSvc.spawnObject('object/mobile/shared_malakili.iff', 'tatooine', long(26599), float(17.3), float(-11.0), float(43.8), float(0), float(0))
malakili.setCustomName2('Malakili')
malakili.setOptionsBitmask(264)
#malakili.setCustomName2('Malakili')
#malakili.setOptionsBitmask(264)
# TODO Need to somehow get the cellID for the Rancor Pit or it will NEVER be spawned.
maxRebo = stcSvc.spawnObject('object/mobile/shared_max_rebo.iff', 'tatooine', long(26582), float(-1.4), float(3.0), float(26.9), float(0.42), float(-0.9))
maxRebo.setCustomName2('Max Rebo')
maxRebo.setOptionsBitmask(264)
#maxRebo.setCustomName2('Max Rebo')
#maxRebo.setOptionsBitmask(264)
droopy = stcSvc.spawnObject('object/mobile/shared_droopy_mccool.iff', 'tatooine', long(26582), float(-3.9), float(3.0), float(26.1), float(0.42), float(-0.9))
droopy.setCustomName2('Droopy McCool')
droopy.setOptionsBitmask(264)
#droopy.setCustomName2('Droopy McCool')
#droopy.setOptionsBitmask(264)
sySnootles = stcSvc.spawnObject('object/mobile/shared_sy_snootles.iff', 'tatooine', long(26582), float(-1.4), float(3.0), float(29.8), float(0.42), float(-0.))
sySnootles.setCustomName2('Sy Snootles')
sySnootles.setOptionsBitmask(264)
#sySnootles.setCustomName2('Sy Snootles')
#sySnootles.setOptionsBitmask(264)
g5po = stcSvc.spawnObject('object/mobile/shared_3po_protocol_droid_red.iff', 'tatooine', long(26582), float(-14.3), float(2.0), float(47.4), float(0.70), float(0.71))
g5po.setCustomName2('G5-PO')
g5po.setOptionsBitmask(264)
#g5po.setCustomName2('G5-PO')
#g5po.setOptionsBitmask(264)
return
scripts/static_spawns/tatooine/mos_eisley.py
+66 -66
View File
@@ -17,134 +17,134 @@ def addPlanetSpawns(core, planet):
#Cantina Interior
wuher = stcSvc.spawnObject('object/mobile/shared_wuher.iff', 'tatooine', long(1082877), float(8.6), float(-0.9), float(0.4), float(0.71), float(0.71))
wuher.setCustomName2('Wuher')
wuher.setOptionsBitmask(256)
#wuher.setCustomName2('Wuher')
#wuher.setOptionsBitmask(256)
chadraFanFemale = stcSvc.spawnObject('object/mobile/shared_chadra_fan_female.iff', 'tatooine', long(1082877), float(10.6), float(-0.9), float(-1.5), float(0.42), float(0.90))
chadraFanFemale.setCustomName2('a Chadra Fan Female')
chadraFanFemale.setOptionsBitmask(256)
#chadraFanFemale.setCustomName2('a Chadra Fan Female')
#chadraFanFemale.setOptionsBitmask(256)
chadraFanMale = stcSvc.spawnObject('object/mobile/shared_chadra_fan_male.iff', 'tatooine', long(1082877), float(10.7), float(-0.9), float(-0.3), float(0.64), float(0.77))
chadraFanMale.setCustomName2('a Chadra Fan Male')
chadraFanMale.setOptionsBitmask(256)
#chadraFanMale.setCustomName2('a Chadra Fan Male')
#chadraFanMale.setOptionsBitmask(256)
muftak = stcSvc.spawnObject('object/mobile/shared_muftak.iff', 'tatooine', long(1082877), float(20.3), float(-0.9), float(4.9), float(0.82), float(0.57))
muftak.setCustomName2('Muftak')
muftak.setOptionsBitmask(256)
#muftak.setCustomName2('Muftak')
#muftak.setOptionsBitmask(256)
chissMale1 = stcSvc.spawnObject('object/mobile/ep3/shared_ep3_etyyy_chiss_poacher_01.iff', 'tatooine', long(1082877), float(1.7), float(-0.9), float(-5.0), float(0.71), float(0.71))
chissMale1.setCustomName2('a Chiss Male')
chissMale1.setOptionsBitmask(256)
#chissMale1.setCustomName2('a Chiss Male')
#chissMale1.setOptionsBitmask(256)
chissMale2 = stcSvc.spawnObject('object/mobile/ep3/shared_ep3_etyyy_chiss_poacher_02.iff', 'tatooine', long(1082877), float(3.4), float(-0.9), float(-4.8), float(0), float(0))
chissMale2.setCustomName2('a Chiss Male')
chissMale2.setOptionsBitmask(256)
#chissMale2.setCustomName2('a Chiss Male')
#chissMale2.setOptionsBitmask(256)
cantinaStorm = stcSvc.spawnObject('object/mobile/shared_stormtrooper.iff', 'tatooine', long(1082877), float(2.9), float(-0.9), float(-6.5), float(0.71), float(0.71))
cantinaStorm.setCustomName2('a Stormtrooper')
cantinaStorm.setOptionsBitmask(256)
#cantinaStorm.setCustomName2('a Stormtrooper')
#cantinaStorm.setOptionsBitmask(256)
cantinaStormL = stcSvc.spawnObject('object/mobile/shared_stormtrooper_groupleader.iff', 'tatooine', long(1082877), float(3.6), float(-0.9), float(-7.9), float(0.71), float(0.71))
cantinaStormL.setCustomName2('a Stormtrooper Squad Leader')
cantinaStormL.setOptionsBitmask(256)
#cantinaStormL.setCustomName2('a Stormtrooper Squad Leader')
#cantinaStormL.setOptionsBitmask(256)
figrinDan = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(3.7), float(-0.9), float(-14.4), float(0.42), float(0.91))
figrinDan.setCustomName2('Figrin D\'an')
figrinDan.setOptionsBitmask(256)
#figrinDan.setCustomName2('Figrin D\'an')
#figrinDan.setOptionsBitmask(256)
techMor = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(4.0), float(-0.9), float(-17.0), float(0.42), float(0.91))
techMor.setCustomName2('Tech M\'or')
techMor.setOptionsBitmask(256)
#techMor.setCustomName2('Tech M\'or')
#techMor.setOptionsBitmask(256)
doikkNats = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(2.2), float(-0.9), float(-16.4), float(0.42), float(0.91))
doikkNats.setCustomName2('Doikk Na\'ts')
doikkNats.setOptionsBitmask(256)
#doikkNats.setCustomName2('Doikk Na\'ts')
#doikkNats.setOptionsBitmask(256)
tednDahai = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(1.3), float(-0.9), float(-15.2), float(0.42), float(0.91))
tednDahai.setCustomName2('Tedn Dahai')
tednDahai.setOptionsBitmask(256)
#tednDahai.setCustomName2('Tedn Dahai')
#tednDahai.setOptionsBitmask(256)
nalanCheel = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(0.5), float(-0.9), float(-17.1), float(0.42), float(0.91))
nalanCheel.setCustomName2('Nalan Cheel')
nalanCheel.setOptionsBitmask(256)
#nalanCheel.setCustomName2('Nalan Cheel')
#nalanCheel.setOptionsBitmask(256)
businessman1 = stcSvc.spawnObject('object/mobile/shared_dressed_businessman_human_male_01.iff', 'tatooine', long(1082877), float(11.0), float(-0.9), float(2.1), float(0.38), float(-0.92))
businessman1.setCustomName2('a Businessman')
businessman1.setOptionsBitmask(256)
#businessman1.setCustomName2('a Businessman')
#businessman1.setOptionsBitmask(256)
commoner1 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_aqualish_male_01.iff', 'tatooine', long(1082877), float(10.3), float(-0.9), float(2.7), float(0.82), float(0.57))
commoner1.setCustomName2('a Commoner')
commoner1.setOptionsBitmask(256)
#commoner1.setCustomName2('a Commoner')
#commoner1.setOptionsBitmask(256)
entertainer1 = stcSvc.spawnObject('object/mobile/shared_dressed_entertainer_trainer_twk_female_01.iff', 'tatooine', long(1082877), float(9.4), float(-0.9), float(3.9), float(0.38), float(-0.92))
entertainer1.setCustomName2('an Entertainer')
entertainer1.setOptionsBitmask(256)
#entertainer1.setCustomName2('an Entertainer')
#entertainer1.setOptionsBitmask(256)
noble1 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_trandoshan_male_01.iff', 'tatooine', long(1082877), float(8.6), float(-0.9), float(4.8), float(0.82), float(0.57))
noble1.setCustomName2('a Noble')
noble1.setOptionsBitmask(256)
#noble1.setCustomName2('a Noble')
#noble1.setOptionsBitmask(256)
commoner2 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_trandoshan_female_01.iff', 'tatooine', long(1082877), float(4.1), float(-0.9), float(5.7), float(1), float(0))
commoner2.setCustomName2('a Commoner')
commoner2.setOptionsBitmask(256)
#commoner2.setCustomName2('a Commoner')
#commoner2.setOptionsBitmask(256)
commoner3 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_bothan_female_01.iff', 'tatooine', long(1082877), float(3.1), float(-0.9), float(5.9), float(1), float(0))
commoner3.setCustomName2('a Commoner')
commoner3.setOptionsBitmask(256)
#commoner3.setCustomName2('a Commoner')
#commoner3.setOptionsBitmask(256)
commoner4 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_fat_twilek_male_01.iff', 'tatooine', long(1082877), float(1.7), float(-0.9), float(6.0), float(1), float(0))
commoner4.setCustomName2('a Commoner')
commoner4.setOptionsBitmask(256)
#commoner4.setCustomName2('a Commoner')
#commoner4.setOptionsBitmask(256)
commoner5 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_bothan_male_01.iff', 'tatooine', long(1082877), float(-0.4), float(-0.9), float(5.9), float(1), float(0))
commoner5.setCustomName2('a Commoner')
commoner5.setOptionsBitmask(256)
#commoner5.setCustomName2('a Commoner')
#commoner5.setOptionsBitmask(256)
commoner6 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_05.iff', 'tatooine', long(1082877), float(16.0), float(-0.9), float(4.1), float(0), float(0))
commoner6.setCustomName2('a Commoner')
commoner6.setOptionsBitmask(256)
#commoner6.setCustomName2('a Commoner')
#commoner6.setOptionsBitmask(256)
commoner7 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_fat_zabrak_male_01.iff', 'tatooine', long(1082877), float(8.8), float(-0.9), float(-6.0), float(0.98), float(-0.22))
commoner7.setCustomName2('a Patron')
commoner7.setOptionsBitmask(256)
#commoner7.setCustomName2('a Patron')
#commoner7.setOptionsBitmask(256)
commoner8 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_08.iff', 'tatooine', long(1082877), float(6.8), float(-0.9), float(-6.5), float(0.98), float(-0.22))
commoner8.setCustomName2('a Patron')
commoner8.setOptionsBitmask(256)
#commoner8.setCustomName2('a Patron')
#commoner8.setOptionsBitmask(256)
commoner9 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_aqualish_male_09.iff', 'tatooine', long(1082877), float(1.1), float(-0.9), float(-7.7), float(0.42), float(0.91))
commoner9.setCustomName2('a Commoner')
commoner9.setOptionsBitmask(256)
#commoner9.setCustomName2('a Commoner')
#commoner9.setOptionsBitmask(256)
commoner10 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_nikto_male_04.iff', 'tatooine', long(1082877), float(2.1), float(-0.9), float(-8.4), float(0.42), float(0.91))
commoner10.setCustomName2('a Commoner')
commoner10.setOptionsBitmask(256)
#commoner10.setCustomName2('a Commoner')
#commoner10.setOptionsBitmask(256)
anetiaKahryn = stcSvc.spawnObject('object/mobile/shared_dressed_twk_entertainer.iff', 'tatooine', long(1082878), float(19.8), float(-0.9), float(-21), float(-0.03), float(0.99))
anetiaKahryn.setCustomName2('Anetia Kah\'ryn')
anetiaKahryn.setOptionsBitmask(256)
#anetiaKahryn.setCustomName2('Anetia Kah\'ryn')
#anetiaKahryn.setOptionsBitmask(256)
dravis = stcSvc.spawnObject('object/mobile/shared_space_privateer_tier1_tatooine.iff', 'tatooine', long(1082886), float(-21.7), float(-0.9), float(25.5), float(0.99), float(0.03))
dravis.setCustomName2('Dravis')
dravis.setOptionsBitmask(256)
#dravis.setCustomName2('Dravis')
#dravis.setOptionsBitmask(256)
talonKarrde = stcSvc.spawnObject('object/mobile/shared_dressed_talon_karrde.iff', 'tatooine', long(1082887), float(-25.7), float(-0.5), float(8.8), float(0.21), float(0.97))
talonKarrde.setCustomName2('Talon Karrde')
talonKarrde.setOptionsBitmask(256)
#talonKarrde.setCustomName2('Talon Karrde')
#talonKarrde.setOptionsBitmask(256)
#Starport Interior
bartender1 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_nikto_male_04.iff', 'tatooine', long(1106380), float(-59.1), float(2.6), float(39.5), float(0), float(0))
bartender1.setCustomName2('a Bartender')
bartender1.setOptionsBitmask(256)
#bartender1.setCustomName2('a Bartender')
#bartender1.setOptionsBitmask(256)
#City Hall Interior
#Lucky Despot Interior TODO: Check Cell IDs for Spawned NPCS inside once Lucky Despot is spawning properly again.
hansolo1 = stcSvc.spawnObject('object/mobile/shared_han_solo.iff', 'tatooine', long(26949), float(32.3), float(7.0), float(1.6), float(0), float(0))
hansolo1.setCustomName2('Han Solo')
hansolo1.setOptionsBitmask(256)
#hansolo1.setCustomName2('Han Solo')
#hansolo1.setOptionsBitmask(256)
#Medical Center Interior
@@ -290,7 +290,7 @@ def addPlanetSpawns(core, planet):
vourk.setOptionsBitmask(256)
mayor = stcSvc.spawnObject('object/mobile/shared_dressed_mayor_mikdanyell_guhrantt.iff', 'tatooine', long(1279960), float(1.2), float(2.5), float(5.4), float(0), float(0))
mayor.setOptionsBitmask(264)
#mayor.setOptionsBitmask(264)
enthaKandela = stcSvc.spawnObject('object/mobile/shared_dressed_entha_kandela.iff', 'tatooine', long(0), float(3511), float(5.0), float(-4785), float(0.70), float(0.71))
enthaKandela.setCustomName2('Entha Kandela')
@@ -301,8 +301,8 @@ def addPlanetSpawns(core, planet):
purvis.setOptionsBitmask(256)
peawpRdawc = stcSvc.spawnObject('object/mobile/shared_peawp_bodyguard_trainer.iff', 'tatooine', long(1189639), float(-11.8), float(1.1), float(-10.1), float(0), float(0))
peawpRdawc.setCustomName2('Peawp R\'dawc')
peawpRdawc.setOptionsBitmask(256)
#peawpRdawc.setCustomName2('Peawp R\'dawc')
#peawpRdawc.setOptionsBitmask(256)
nikoBrehe = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_opening_niko.iff', 'tatooine', long(0), float(3506.7), float(5.0), float(-4795.8), float(0.70), float(0.71))
nikoBrehe.setOptionsBitmask(264)
@@ -315,7 +315,7 @@ def addPlanetSpawns(core, planet):
#recruiters
impRecruiter = stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_f.iff', 'tatooine', long(1280132), float(-6), float(1), float(9.2), float(0.70), float(0.71))
impRecruiter.setOptionsBitmask(264)
#impRecruiter.setOptionsBitmask(264)
scripts/static_spawns/tatooine/mos_espa.py
+4 -4
View File
@@ -17,14 +17,14 @@ def addPlanetSpawns(core, planet):
# Cantina Interior
dalaSocuna = stcSvc.spawnObject('object/mobile/shared_space_rebel_tier1_tatooine_socuna.iff', 'tatooine', long(1256068), float(-28.4), float(-0.5), float(9.4), float(0.33), float(0.94))
dalaSocuna.setCustomName2('Commander Da\'la Socuna')
dalaSocuna.setOptionsBitmask(256)
#dalaSocuna.setCustomName2('Commander Da\'la Socuna')
#dalaSocuna.setOptionsBitmask(256)
#Watto's Shop ****TODO: Get Proper cells for Watto's Shop once Buildout structures are spawning as intended again.
watto = stcSvc.spawnObject('object/mobile/shared_watto.iff', 'tatooine', long(26670), float(4.7), float(-0.5), float(2.4), float(0.70), float(-0.71))
watto.setCustomName2('Watto')
watto.setOptionsBitmask(256)
#watto.setCustomName2('Watto')
#watto.setOptionsBitmask(256)
#Exterior Uninteractable NPCs
commoner18 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_zabrak_female_02.iff', 'tatooine', long(0), float(-2915.3), float(5.0), float(2148.5), float(0), float(0))
src/main/NGECore.java
+18 -2
View File
@@ -21,6 +21,7 @@
******************************************************************************/
package main;
import java.io.File;
import java.io.IOException;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@@ -59,7 +60,6 @@ import services.ConnectionService;
import services.ConversationService;
import services.DevService;
import services.EntertainmentService;
import services.EquipmentService;
import services.GroupService;
import services.housing.HousingService;
import services.InstanceService;
@@ -84,9 +84,10 @@ import services.collections.CollectionService;
import services.combat.CombatService;
import services.command.CombatCommand;
import services.command.CommandService;
import services.equipment.EquipmentService;
import services.gcw.FactionService;
import services.gcw.GCWService;
import services.guild.GuildService;
import services.GuildService;
import services.LoginService;
import services.map.MapService;
import services.mission.MissionService;
@@ -256,6 +257,21 @@ public class NGECore {
options.setFilePath("options.cfg");
boolean optionsConfigLoaded = options.loadConfigFile();
if (optionsConfigLoaded && options.getInt("CLEAN.ODB.FOLDERS") > 0) {
File baseFolder = new File("./odb");
if (baseFolder.isDirectory()) {
for (File odbFolder : baseFolder.listFiles()) {
if (odbFolder.isDirectory()) {
for (File file : odbFolder.listFiles()) {
if (!file.isDirectory() && !file.getName().equals("placeholder.txt")) { file.delete(); }
}
}
}
}
System.out.println("Cleaned ODB Folders.");
}
// Database
databaseConnection = new DatabaseConnection();
databaseConnection.connect(config.getString("DB.URL"), config.getString("DB.NAME"), config.getString("DB.USER"), config.getString("DB.PASS"), "postgresql");
src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java
-5
View File
@@ -22,15 +22,10 @@
package protocol.swg.auctionManagerClientListener;
import java.nio.ByteOrder;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
import java.util.Vector;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.CRC;
import protocol.swg.SWGMessage;
import services.bazaar.AuctionItem;
src/protocol/swg/auctionManagerClientListener/CreateAuctionMessage.java
-1
View File
@@ -26,7 +26,6 @@ import java.nio.ByteBuffer;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.Utilities;
import protocol.swg.SWGMessage;
public class CreateAuctionMessage extends SWGMessage {
src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java
-1
View File
@@ -26,7 +26,6 @@ import java.nio.ByteBuffer;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.Utilities;
import protocol.swg.SWGMessage;
public class CreateImmediateAuctionMessage extends SWGMessage {
src/protocol/swg/auctionManagerClientListener/GetAuctionDetailsResponse.java
-1
View File
@@ -25,7 +25,6 @@ import java.nio.ByteOrder;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.objects.SWGObject;
import protocol.swg.SWGMessage;
import resources.objects.tangible.TangibleObject;
import services.bazaar.AuctionItem;
src/protocol/swg/chat/ChatOnLeaveRoom.java
-1
View File
@@ -25,7 +25,6 @@ import java.nio.ByteOrder;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.StringUtilities;
import protocol.swg.SWGMessage;
public class ChatOnLeaveRoom extends SWGMessage {
src/protocol/swg/chat/ChatSendToRoom.java
-1
View File
@@ -26,7 +26,6 @@ import java.nio.ByteBuffer;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.StringUtilities;
import protocol.swg.SWGMessage;
public class ChatSendToRoom extends SWGMessage {
src/protocol/swg/objectControllerObjects/CombatSpam.java
+1
View File
@@ -28,6 +28,7 @@ import org.apache.mina.core.buffer.IoBuffer;
import protocol.swg.ObjControllerMessage;
import resources.datatables.HitType;
@SuppressWarnings("unused")
public class CombatSpam extends ObjControllerObject{
private long attackerId;
src/protocol/swg/objectControllerObjects/MissionListRequest.java
-3
View File
@@ -23,9 +23,6 @@ package protocol.swg.objectControllerObjects;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.StringUtilities;
import resources.common.Console;
public class MissionListRequest extends ObjControllerObject {
private long objectId;

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