diff --git a/options.cfg b/options.cfg index dbb392f6..ac85b4ef 100644 --- a/options.cfg +++ b/options.cfg @@ -1,6 +1,6 @@ -LOAD.SNAPSHOT_OBJECTS=0 -LOAD.BUILDOUT_OBJECTS=0 -LOAD.RESOURCE.SYSTEM=0 +LOAD.SNAPSHOT_OBJECTS=1 +LOAD.BUILDOUT_OBJECTS=1 +LOAD.RESOURCE.SYSTEM=1 # Misc -CLEAN.ODB.FOLDERS=1 \ No newline at end of file +CLEAN.ODB.FOLDERS=0 \ No newline at end of file diff --git a/scripts/mobiles/dantooine/ancient_graul.py b/scripts/mobiles/dantooine/ancient_graul.py index 12b0cc43..ad67d937 100644 --- a/scripts/mobiles/dantooine/ancient_graul.py +++ b/scripts/mobiles/dantooine/ancient_graul.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_slinking_voritor_hunter.iff') diff --git a/scripts/mobiles/dantooine/bile_drenched_quenker.py b/scripts/mobiles/dantooine/bile_drenched_quenker.py index aa5a2f0a..573db740 100644 --- a/scripts/mobiles/dantooine/bile_drenched_quenker.py +++ b/scripts/mobiles/dantooine/bile_drenched_quenker.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_quenker_relic_reaper.iff') diff --git a/scripts/mobiles/dantooine/dark_adept.py b/scripts/mobiles/dantooine/dark_adept.py index 85529f17..7598e097 100644 --- a/scripts/mobiles/dantooine/dark_adept.py +++ b/scripts/mobiles/dantooine/dark_adept.py @@ -20,6 +20,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup('dark jedi') mobileTemplate.setAssistRange(12) mobileTemplate.setRespawnTime(300) + mobileTemplate.setOptionsBitmask(192) templates = Vector() diff --git a/scripts/mobiles/dantooine/dark_jedi_knight.py b/scripts/mobiles/dantooine/dark_jedi_knight.py index 8af7c2bd..b083645b 100644 --- a/scripts/mobiles/dantooine/dark_jedi_knight.py +++ b/scripts/mobiles/dantooine/dark_jedi_knight.py @@ -20,6 +20,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup('dark jedi') mobileTemplate.setAssistRange(12) mobileTemplate.setRespawnTime(300) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_dark_jedi_male_human_01.iff') diff --git a/scripts/mobiles/dantooine/dark_jedi_master.py b/scripts/mobiles/dantooine/dark_jedi_master.py index f5310c74..29ca5598 100644 --- a/scripts/mobiles/dantooine/dark_jedi_master.py +++ b/scripts/mobiles/dantooine/dark_jedi_master.py @@ -18,6 +18,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup('dark jedi') mobileTemplate.setAssistRange(12) mobileTemplate.setRespawnTime(300) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_dark_jedi_master_female_twk_01.iff') diff --git a/scripts/mobiles/dantooine/frenzied_graul.py b/scripts/mobiles/dantooine/frenzied_graul.py index df303523..6136f813 100644 --- a/scripts/mobiles/dantooine/frenzied_graul.py +++ b/scripts/mobiles/dantooine/frenzied_graul.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_slinking_voritor_hunter.iff') diff --git a/scripts/mobiles/dantooine/grassland_voritor_tracker.py b/scripts/mobiles/dantooine/grassland_voritor_tracker.py index f282a787..ead1fdf3 100644 --- a/scripts/mobiles/dantooine/grassland_voritor_tracker.py +++ b/scripts/mobiles/dantooine/grassland_voritor_tracker.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("voritor lizard") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_grassland_voritor_tracker.iff') diff --git a/scripts/mobiles/dantooine/graul.py b/scripts/mobiles/dantooine/graul.py index 6aba3a56..6376c849 100644 --- a/scripts/mobiles/dantooine/graul.py +++ b/scripts/mobiles/dantooine/graul.py @@ -24,9 +24,10 @@ def addTemplate(core): mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() - templates.add('object/mobile/shared_slinking_voritor_hunter.iff') + templates.add('object/mobile/shared_graul.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/dantooine/graul_mangler.py b/scripts/mobiles/dantooine/graul_mangler.py index 4c728978..03cb6e5f 100644 --- a/scripts/mobiles/dantooine/graul_mangler.py +++ b/scripts/mobiles/dantooine/graul_mangler.py @@ -24,9 +24,10 @@ def addTemplate(core): mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() - templates.add('object/mobile/shared_slinking_voritor_hunter.iff') + templates.add('object/mobile/shared_graul.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/dantooine/graul_marauder.py b/scripts/mobiles/dantooine/graul_marauder.py index fa12e708..a3abb435 100644 --- a/scripts/mobiles/dantooine/graul_marauder.py +++ b/scripts/mobiles/dantooine/graul_marauder.py @@ -24,9 +24,10 @@ def addTemplate(core): mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() - templates.add('object/mobile/shared_slinking_voritor_hunter.iff') + templates.add('object/mobile/shared_graul.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/dantooine/graul_mauler.py b/scripts/mobiles/dantooine/graul_mauler.py index 186c99f3..a7a221bf 100644 --- a/scripts/mobiles/dantooine/graul_mauler.py +++ b/scripts/mobiles/dantooine/graul_mauler.py @@ -24,9 +24,10 @@ def addTemplate(core): mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() - templates.add('object/mobile/shared_slinking_voritor_hunter.iff') + templates.add('object/mobile/shared_graul.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/dantooine/horned_voritor_jungle_lizard.py b/scripts/mobiles/dantooine/horned_voritor_jungle_lizard.py index f50dec14..1c54312e 100644 --- a/scripts/mobiles/dantooine/horned_voritor_jungle_lizard.py +++ b/scripts/mobiles/dantooine/horned_voritor_jungle_lizard.py @@ -7,7 +7,7 @@ def addTemplate(core): mobileTemplate = MobileTemplate() mobileTemplate.setCreatureName('horned_voritor_jungle_lizard') mobileTemplate.setLevel(73) - mobileTemplate.setDifficulty(1) + mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) mobileTemplate.setAttackSpeed(1.0) mobileTemplate.setWeaponType(6) @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("voritor lizard") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_voritor_lizard.iff') diff --git a/scripts/mobiles/dantooine/hostile_thune_mother.py b/scripts/mobiles/dantooine/hostile_thune_mother.py index 4e552885..91953e60 100644 --- a/scripts/mobiles/dantooine/hostile_thune_mother.py +++ b/scripts/mobiles/dantooine/hostile_thune_mother.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_thune.iff') diff --git a/scripts/mobiles/dantooine/huurton.py b/scripts/mobiles/dantooine/huurton.py index b38b24d1..ffecdd01 100644 --- a/scripts/mobiles/dantooine/huurton.py +++ b/scripts/mobiles/dantooine/huurton.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_huurton.iff') diff --git a/scripts/mobiles/dantooine/huurton_bloodhunter.py b/scripts/mobiles/dantooine/huurton_bloodhunter.py index 5ccb2380..b475e391 100644 --- a/scripts/mobiles/dantooine/huurton_bloodhunter.py +++ b/scripts/mobiles/dantooine/huurton_bloodhunter.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_huurton.iff') diff --git a/scripts/mobiles/dantooine/huurton_howler.py b/scripts/mobiles/dantooine/huurton_howler.py index 2e13b941..298d084c 100644 --- a/scripts/mobiles/dantooine/huurton_howler.py +++ b/scripts/mobiles/dantooine/huurton_howler.py @@ -5,7 +5,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('huurton') + mobileTemplate.setCreatureName('huurton_howler') mobileTemplate.setLevel(65) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_huurton.iff') @@ -38,5 +39,5 @@ def addTemplate(core): mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) - core.spawnService.addMobileTemplate('huurton', mobileTemplate) + core.spawnService.addMobileTemplate('huurton_howler', mobileTemplate) return \ No newline at end of file diff --git a/scripts/mobiles/dantooine/huurton_huntress.py b/scripts/mobiles/dantooine/huurton_huntress.py index e9a71f4d..9e100764 100644 --- a/scripts/mobiles/dantooine/huurton_huntress.py +++ b/scripts/mobiles/dantooine/huurton_huntress.py @@ -24,6 +24,8 @@ def addTemplate(core): mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) + templates = Vector() templates.add('object/mobile/shared_huurton.iff') diff --git a/scripts/mobiles/dantooine/huurton_matron.py b/scripts/mobiles/dantooine/huurton_matron.py index 8a934e66..7a4e8537 100644 --- a/scripts/mobiles/dantooine/huurton_matron.py +++ b/scripts/mobiles/dantooine/huurton_matron.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_huurton.iff') diff --git a/scripts/mobiles/dantooine/huurton_pub.py b/scripts/mobiles/dantooine/huurton_pub.py index dd4b2742..d1d57c75 100644 --- a/scripts/mobiles/dantooine/huurton_pub.py +++ b/scripts/mobiles/dantooine/huurton_pub.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_huurton_pup.iff') diff --git a/scripts/mobiles/dantooine/huurton_reaper.py b/scripts/mobiles/dantooine/huurton_reaper.py index 8f29fbc6..244538f7 100644 --- a/scripts/mobiles/dantooine/huurton_reaper.py +++ b/scripts/mobiles/dantooine/huurton_reaper.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_huurton.iff') diff --git a/scripts/mobiles/dantooine/huurton_stalker.py b/scripts/mobiles/dantooine/huurton_stalker.py index 79a1f24e..381d1716 100644 --- a/scripts/mobiles/dantooine/huurton_stalker.py +++ b/scripts/mobiles/dantooine/huurton_stalker.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_huurton.iff') diff --git a/scripts/mobiles/dantooine/infant_graul.py b/scripts/mobiles/dantooine/infant_graul.py index ad563462..c38fc121 100644 --- a/scripts/mobiles/dantooine/infant_graul.py +++ b/scripts/mobiles/dantooine/infant_graul.py @@ -23,10 +23,11 @@ def addTemplate(core): mobileTemplate.setHideAmount(650) mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() - templates.add('object/mobile/shared_slinking_voritor_hunter.iff') + templates.add('object/mobile/shared_infant_graul.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/dantooine/mammoth_thune.py b/scripts/mobiles/dantooine/mammoth_thune.py index 0826d4d5..4fd07c82 100644 --- a/scripts/mobiles/dantooine/mammoth_thune.py +++ b/scripts/mobiles/dantooine/mammoth_thune.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_thune_hue.iff') diff --git a/scripts/mobiles/dantooine/quenker.py b/scripts/mobiles/dantooine/quenker.py index 722c0586..9f575295 100644 --- a/scripts/mobiles/dantooine/quenker.py +++ b/scripts/mobiles/dantooine/quenker.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_quenker.iff') diff --git a/scripts/mobiles/dantooine/quenker_ravager.py b/scripts/mobiles/dantooine/quenker_ravager.py index e132cb3d..125f1b1b 100644 --- a/scripts/mobiles/dantooine/quenker_ravager.py +++ b/scripts/mobiles/dantooine/quenker_ravager.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_quenker_hue.iff') diff --git a/scripts/mobiles/dantooine/quenker_relic_reaper.py b/scripts/mobiles/dantooine/quenker_relic_reaper.py index b168a00d..ae6ec1a7 100644 --- a/scripts/mobiles/dantooine/quenker_relic_reaper.py +++ b/scripts/mobiles/dantooine/quenker_relic_reaper.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_quenker_relic_reaper.iff') diff --git a/scripts/mobiles/dantooine/savage_quenker.py b/scripts/mobiles/dantooine/savage_quenker.py index 25ff0080..3f5a26b7 100644 --- a/scripts/mobiles/dantooine/savage_quenker.py +++ b/scripts/mobiles/dantooine/savage_quenker.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_quenker_relic_reaper.iff') diff --git a/scripts/mobiles/dantooine/slinking_voritor_hunter.py b/scripts/mobiles/dantooine/slinking_voritor_hunter.py index d71f6d85..e4b22c92 100644 --- a/scripts/mobiles/dantooine/slinking_voritor_hunter.py +++ b/scripts/mobiles/dantooine/slinking_voritor_hunter.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(50) mobileTemplate.setSocialGroup("voritor lizard") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(True) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_slinking_voritor_hunter.iff') diff --git a/scripts/mobiles/dantooine/spiked_slasher.py b/scripts/mobiles/dantooine/spiked_slasher.py index d5e3cadc..2f3d2330 100644 --- a/scripts/mobiles/dantooine/spiked_slasher.py +++ b/scripts/mobiles/dantooine/spiked_slasher.py @@ -23,7 +23,8 @@ def addTemplate(core): mobileTemplate.setHideAmount(50) mobileTemplate.setSocialGroup("voritor lizard") mobileTemplate.setAssistRange(12) - mobileTemplate.setStalker(False) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_voritor_lizard_hue.iff') diff --git a/scripts/mobiles/dantooine/terrible_quenker.py b/scripts/mobiles/dantooine/terrible_quenker.py index 32945295..de6a648c 100644 --- a/scripts/mobiles/dantooine/terrible_quenker.py +++ b/scripts/mobiles/dantooine/terrible_quenker.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_quenker.iff') diff --git a/scripts/mobiles/dantooine/thune.py b/scripts/mobiles/dantooine/thune.py index 6ff0786b..e8653e89 100644 --- a/scripts/mobiles/dantooine/thune.py +++ b/scripts/mobiles/dantooine/thune.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_thune.iff') diff --git a/scripts/mobiles/dantooine/thune_grassland_guardian.py b/scripts/mobiles/dantooine/thune_grassland_guardian.py index 3c258b12..9c99c933 100644 --- a/scripts/mobiles/dantooine/thune_grassland_guardian.py +++ b/scripts/mobiles/dantooine/thune_grassland_guardian.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_thune_grassland_guardian.iff') diff --git a/scripts/mobiles/dantooine/thune_herd_leader.py b/scripts/mobiles/dantooine/thune_herd_leader.py index 50956a23..3ab09c93 100644 --- a/scripts/mobiles/dantooine/thune_herd_leader.py +++ b/scripts/mobiles/dantooine/thune_herd_leader.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_thune_herd_leader.iff') diff --git a/scripts/mobiles/dantooine/vexed_voritor_lizard.py b/scripts/mobiles/dantooine/vexed_voritor_lizard.py index 35921fc4..84d6a944 100644 --- a/scripts/mobiles/dantooine/vexed_voritor_lizard.py +++ b/scripts/mobiles/dantooine/vexed_voritor_lizard.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("voritor lizard") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_vexed_voritor_lizard.iff') diff --git a/scripts/mobiles/dantooine/voritor_dasher.py b/scripts/mobiles/dantooine/voritor_dasher.py index abfb43a9..5b805437 100644 --- a/scripts/mobiles/dantooine/voritor_dasher.py +++ b/scripts/mobiles/dantooine/voritor_dasher.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("voritor lizard") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_voritor_dasher.iff') diff --git a/scripts/mobiles/dantooine/voritor_lizard.py b/scripts/mobiles/dantooine/voritor_lizard.py index e6e7ca8f..b8b72b90 100644 --- a/scripts/mobiles/dantooine/voritor_lizard.py +++ b/scripts/mobiles/dantooine/voritor_lizard.py @@ -24,6 +24,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("voritor lizard") mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_voritor_lizard.iff') diff --git a/scripts/mobiles/dynamicgroups/bol_group_1.py b/scripts/mobiles/dynamicgroups/bol_group_1.py index d49dee9b..f26dd786 100644 --- a/scripts/mobiles/dynamicgroups/bol_group_1.py +++ b/scripts/mobiles/dynamicgroups/bol_group_1.py @@ -10,7 +10,7 @@ def addDynamicGroup(core): mobileTemplates.add('bol') mobileTemplates.add('bol_pack_runner') dynamicGroup.setMobiles(mobileTemplates) - dynamicGroup.setGroupMembersNumber(-3) + dynamicGroup.setGroupMembersNumber(2) dynamicGroup.setName('bol_group_1') dynamicGroup.setMaxSpawns(-1) dynamicGroup.setMinSpawnDistance(150) diff --git a/scripts/mobiles/dynamicgroups/voritor_nw_group_1.py b/scripts/mobiles/dynamicgroups/voritor_nw_group_1.py index 288ff2b9..6e2e927c 100644 --- a/scripts/mobiles/dynamicgroups/voritor_nw_group_1.py +++ b/scripts/mobiles/dynamicgroups/voritor_nw_group_1.py @@ -7,11 +7,11 @@ from services.spawn import MobileTemplate def addDynamicGroup(core): dynamicGroup = DynamicSpawnGroup() mobileTemplates = Vector() - mobileTemplates.add('graul_mauler') + mobileTemplates.add('voritor_dasher') dynamicGroup.setMobiles(mobileTemplates) dynamicGroup.setGroupMembersNumber(-3) dynamicGroup.setName('graul_mauler_nw_group_1') dynamicGroup.setMaxSpawns(-1) dynamicGroup.setMinSpawnDistance(150) - core.spawnService.addDynamicGroup('graul_mauler_nw_group_1', dynamicGroup) + core.spawnService.addDynamicGroup('voritor_nw_group_1', dynamicGroup) return diff --git a/scripts/mobiles/lairgroups/mixed_lair_group_1.py b/scripts/mobiles/lairgroups/mixed_lair_group_1.py new file mode 100644 index 00000000..571b1f66 --- /dev/null +++ b/scripts/mobiles/lairgroups/mixed_lair_group_1.py @@ -0,0 +1,21 @@ +# Spawn Group file created with PSWG Planetary Spawn Tool +import sys +from services.spawn import LairSpawnTemplate +from java.util import Vector + +def addLairGroup(core): + spawnTemplates = Vector() + spawnTemplate = LairSpawnTemplate(-1, 'dantooine_huurton_lair_1', -1, -1) + spawnTemplates.add(spawnTemplate) + spawnTemplate = LairSpawnTemplate(-1, 'dantooine_huurton_lair_2', -1, -1) + spawnTemplates.add(spawnTemplate) + spawnTemplate = LairSpawnTemplate(-1, 'dantooine_bol_lair_1', -1, -1) + spawnTemplates.add(spawnTemplate) + spawnTemplate = LairSpawnTemplate(-1, 'dantooine_piket_lair_1', -1, -1) + spawnTemplates.add(spawnTemplate) + spawnTemplate = LairSpawnTemplate(-1, 'dantooine_piket_longhorn_lair_1', -1, -1) + spawnTemplates.add(spawnTemplate) + spawnTemplate = LairSpawnTemplate(-1, 'dantooine_quenker_lair_1', -1, -1) + spawnTemplates.add(spawnTemplate) + core.spawnService.addLairGroup('mixed_lair_group_1', spawnTemplates) + return diff --git a/scripts/mobiles/spawnareas/dantooine_central_dyn_1.py b/scripts/mobiles/spawnareas/dantooine_central_dyn_1.py index 6dbe4b18..3b07695b 100644 --- a/scripts/mobiles/spawnareas/dantooine_central_dyn_1.py +++ b/scripts/mobiles/spawnareas/dantooine_central_dyn_1.py @@ -8,5 +8,5 @@ def addSpawnArea(core): dynamicGroups.add('thunes_1') dynamicGroups.add('kunga_central_group_1') dynamicGroups.add('huurton_group_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -828, 749, 4669, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, 1567, -1585, 2293, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_central_dyn_2.py b/scripts/mobiles/spawnareas/dantooine_central_dyn_2.py index 22958950..78a77203 100644 --- a/scripts/mobiles/spawnareas/dantooine_central_dyn_2.py +++ b/scripts/mobiles/spawnareas/dantooine_central_dyn_2.py @@ -8,5 +8,5 @@ def addSpawnArea(core): dynamicGroups.add('piket_longhorn_group_1') dynamicGroups.add('huurton_group_2') dynamicGroups.add('kunga_central_group_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -4023, 2182, 4300, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -1607, 32, 2129, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_central_dyn_3.py b/scripts/mobiles/spawnareas/dantooine_central_dyn_3.py index 60ae52c2..0bdc52f1 100644 --- a/scripts/mobiles/spawnareas/dantooine_central_dyn_3.py +++ b/scripts/mobiles/spawnareas/dantooine_central_dyn_3.py @@ -8,5 +8,5 @@ def addSpawnArea(core): dynamicGroups.add('bol_group_1') dynamicGroups.add('piket_longhorn_group_1') dynamicGroups.add('huurton_group_2') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -3081, -2056, 3706, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -1320, -3981, 1843, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_east_dyn_1.py b/scripts/mobiles/spawnareas/dantooine_east_dyn_1.py index b1d4ae7c..5bd67259 100644 --- a/scripts/mobiles/spawnareas/dantooine_east_dyn_1.py +++ b/scripts/mobiles/spawnareas/dantooine_east_dyn_1.py @@ -5,5 +5,5 @@ from java.util import Vector def addSpawnArea(core): dynamicGroups = Vector() dynamicGroups.add('voritors_east_group_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, 3717, 544, 4894, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, 6236, -2015, 2437, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_east_dyn_2.py b/scripts/mobiles/spawnareas/dantooine_east_dyn_2.py index a1fc7a00..82a7ce51 100644 --- a/scripts/mobiles/spawnareas/dantooine_east_dyn_2.py +++ b/scripts/mobiles/spawnareas/dantooine_east_dyn_2.py @@ -6,5 +6,5 @@ def addSpawnArea(core): dynamicGroups = Vector() dynamicGroups.add('voritors_east_group_1') dynamicGroups.add('jantas_nw_group_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, 2960, -4022, 5181, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, 5581, -6603, 2560, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_east_dyn_3.py b/scripts/mobiles/spawnareas/dantooine_east_dyn_3.py index 9d774217..9661ae60 100644 --- a/scripts/mobiles/spawnareas/dantooine_east_dyn_3.py +++ b/scripts/mobiles/spawnareas/dantooine_east_dyn_3.py @@ -7,5 +7,5 @@ def addSpawnArea(core): dynamicGroups.add('piket_plains_walker_group') dynamicGroups.add('quenker_relic_reaper_group') dynamicGroups.add('thune_group_2') - core.spawnService.addDynamicSpawnArea(dynamicGroups, 1403, 3575, 5406, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, 4106, 646, 2682, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_imperial_op_lair.py b/scripts/mobiles/spawnareas/dantooine_imperial_op_lair.py index 7cae5f05..40d8b8ee 100644 --- a/scripts/mobiles/spawnareas/dantooine_imperial_op_lair.py +++ b/scripts/mobiles/spawnareas/dantooine_imperial_op_lair.py @@ -2,5 +2,5 @@ import sys def addSpawnArea(core): - core.spawnService.addLairSpawnArea('mixed_lair_group_1', -4720, -1585, 2048, 'dantooine') + core.spawnService.addLairSpawnArea('mixed_lair_group_1', -3450, -2793, 1024, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_mining_lair.py b/scripts/mobiles/spawnareas/dantooine_mining_lair.py index 237b4334..1ef6d3ef 100644 --- a/scripts/mobiles/spawnareas/dantooine_mining_lair.py +++ b/scripts/mobiles/spawnareas/dantooine_mining_lair.py @@ -2,5 +2,5 @@ import sys def addSpawnArea(core): - core.spawnService.addLairSpawnArea('mixed_lair_group_1', -284, 2853, 2048, 'dantooine') + core.spawnService.addLairSpawnArea('mixed_lair_group_1', 748, 1711, 1024, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_north_dyn_1.py b/scripts/mobiles/spawnareas/dantooine_north_dyn_1.py index 9b86f1d7..07f70f0c 100644 --- a/scripts/mobiles/spawnareas/dantooine_north_dyn_1.py +++ b/scripts/mobiles/spawnareas/dantooine_north_dyn_1.py @@ -7,5 +7,5 @@ def addSpawnArea(core): dynamicGroups.add('force_sensitives_wild_1') dynamicGroups.add('graul_mauler_nw_group_1') dynamicGroups.add('voritors_wild_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -1299, 8101, 3993, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, 891, 6135, 1986, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_north_dyn_2.py b/scripts/mobiles/spawnareas/dantooine_north_dyn_2.py index 1f0ff922..e0ad6fe4 100644 --- a/scripts/mobiles/spawnareas/dantooine_north_dyn_2.py +++ b/scripts/mobiles/spawnareas/dantooine_north_dyn_2.py @@ -8,5 +8,5 @@ def addSpawnArea(core): dynamicGroups.add('quenker_group_south_1') dynamicGroups.add('mokk_group_1') dynamicGroups.add('bol_group_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -1688, 4169, 2191, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -501, 3104, 1085, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_north_dyn_3.py b/scripts/mobiles/spawnareas/dantooine_north_dyn_3.py index 526afc88..1a8df597 100644 --- a/scripts/mobiles/spawnareas/dantooine_north_dyn_3.py +++ b/scripts/mobiles/spawnareas/dantooine_north_dyn_3.py @@ -8,5 +8,5 @@ def addSpawnArea(core): dynamicGroups.add('huurton_group_1') dynamicGroups.add('bol_group_1') dynamicGroups.add('quenker_group_south_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, 297, 4886, 2457, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, 1710, 3739, 1208, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_nw_dyn_1.py b/scripts/mobiles/spawnareas/dantooine_nw_dyn_1.py index 53fbe992..8f92dba8 100644 --- a/scripts/mobiles/spawnareas/dantooine_nw_dyn_1.py +++ b/scripts/mobiles/spawnareas/dantooine_nw_dyn_1.py @@ -7,5 +7,5 @@ def addSpawnArea(core): dynamicGroups.add('voritor_nw_group_1') dynamicGroups.add('graul_mauler_nw_group_1') dynamicGroups.add('jantas_nw_group_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -7464, 7651, 6492, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -4064, 4497, 3235, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_pirate_lair.py b/scripts/mobiles/spawnareas/dantooine_pirate_lair.py index f95aaa18..a9f935e9 100644 --- a/scripts/mobiles/spawnareas/dantooine_pirate_lair.py +++ b/scripts/mobiles/spawnareas/dantooine_pirate_lair.py @@ -2,5 +2,5 @@ import sys def addSpawnArea(core): - core.spawnService.addLairSpawnArea('mixed_lair_group_1', 1096, -6029, 2048, 'dantooine') + core.spawnService.addLairSpawnArea('mixed_lair_group_1', 2017, -6869, 1024, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_south_dyn_1.py b/scripts/mobiles/spawnareas/dantooine_south_dyn_1.py index d93e9a1b..bea60b2e 100644 --- a/scripts/mobiles/spawnareas/dantooine_south_dyn_1.py +++ b/scripts/mobiles/spawnareas/dantooine_south_dyn_1.py @@ -6,5 +6,5 @@ def addSpawnArea(core): dynamicGroups = Vector() dynamicGroups.add('huurton_group_1') dynamicGroups.add('quenker_group_south_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -112, -2117, 4485, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, 2079, -4268, 2232, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_south_dyn_2.py b/scripts/mobiles/spawnareas/dantooine_south_dyn_2.py index 18d6b152..523d03d2 100644 --- a/scripts/mobiles/spawnareas/dantooine_south_dyn_2.py +++ b/scripts/mobiles/spawnareas/dantooine_south_dyn_2.py @@ -10,5 +10,5 @@ def addSpawnArea(core): dynamicGroups.add('thune_group_2') dynamicGroups.add('bol_group_1') dynamicGroups.add('voritors_wild_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -4228, -5087, 5283, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -1586, -7688, 2621, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_sw_dyn_1.py b/scripts/mobiles/spawnareas/dantooine_sw_dyn_1.py index fcf1709b..90a299b4 100644 --- a/scripts/mobiles/spawnareas/dantooine_sw_dyn_1.py +++ b/scripts/mobiles/spawnareas/dantooine_sw_dyn_1.py @@ -8,5 +8,5 @@ def addSpawnArea(core): dynamicGroups.add('voritors_wild_1') dynamicGroups.add('quenker_relic_reaper_group') dynamicGroups.add('graul_mauler_nw_group_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -7546, -2425, 4464, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -5354, -4759, 2211, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/dantooine_west_dyn_1.py b/scripts/mobiles/spawnareas/dantooine_west_dyn_1.py index 3c54c5f6..dd18bea0 100644 --- a/scripts/mobiles/spawnareas/dantooine_west_dyn_1.py +++ b/scripts/mobiles/spawnareas/dantooine_west_dyn_1.py @@ -7,5 +7,5 @@ def addSpawnArea(core): dynamicGroups.add('kunga_central_group_1') dynamicGroups.add('piket_longhorn_group_1') dynamicGroups.add('thunes_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -7832, 1507, 3993, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -5682, -540, 1986, 'dantooine') return diff --git a/scripts/mobiles/spawnareas/force_sensitives_dynamic_1.py b/scripts/mobiles/spawnareas/force_sensitives_dynamic_1.py index ebd86b28..e7528e13 100644 --- a/scripts/mobiles/spawnareas/force_sensitives_dynamic_1.py +++ b/scripts/mobiles/spawnareas/force_sensitives_dynamic_1.py @@ -6,5 +6,5 @@ def addSpawnArea(core): dynamicGroups = Vector() dynamicGroups.add('force_sensitives_wild_1') dynamicGroups.add('dark_jedi_wild_1') - core.spawnService.addDynamicSpawnArea(dynamicGroups, 2468, 7446, 5120, 'dantooine') + core.spawnService.addDynamicSpawnArea(dynamicGroups, 5233, 4722, 2580, 'dantooine') return diff --git a/scripts/static_spawns/dantooine/imperial_outpost.py b/scripts/static_spawns/dantooine/imperial_outpost.py new file mode 100644 index 00000000..85ab98ae --- /dev/null +++ b/scripts/static_spawns/dantooine/imperial_outpost.py @@ -0,0 +1,12 @@ +import sys +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + stcSvc = core.staticService + objSvc = core.objectService + + zefAndo = stcSvc.spawnObject('object/mobile/shared_dressed_legacy_zef.iff', 'tatooine', long(0), float(-2574.9), float(0), float(-5516.7), float(0), float(0)) + zefAndo.setCustomName2('Zef Ando') + zefAndo.setOptionsBitmask(256) + return diff --git a/src/services/DevService.java b/src/services/DevService.java index 31b4987c..4075c7e3 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -144,6 +144,9 @@ public class DevService implements INetworkDispatch { suiOptions.put((long) 124, "Teleport to Mos Eisley"); if (creature.getClient().isGM()) { suiOptions.put((long) 164, "Teleport to Mining Outpost"); + suiOptions.put((long) 165, "Teleport to Spawn Area #1"); + suiOptions.put((long) 166, "Teleport to Imperial Op"); + suiOptions.put((long) 167, "Teleport to Rebel Base "); } break; @@ -1252,6 +1255,14 @@ public class DevService implements INetworkDispatch { case 164: core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), new Point3D(-284,18,2853), player.getOrientation(), null); return; + + case 165: + core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), new Point3D(-1586,18,-7688), player.getOrientation(), null); + return; + + case 166: + core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), new Point3D(-4211,18,-2349), player.getOrientation(), null); + return; case 123: TangibleObject arakydDroids = (TangibleObject) core.objectService.createObject("object/tangible/mission/shared_mission_bounty_droid_probot.iff", planet); diff --git a/src/services/spawn/DynamicSpawnArea.java b/src/services/spawn/DynamicSpawnArea.java index f45e7196..0a9ed88a 100644 --- a/src/services/spawn/DynamicSpawnArea.java +++ b/src/services/spawn/DynamicSpawnArea.java @@ -59,10 +59,12 @@ public class DynamicSpawnArea extends SpawnArea { public void onEnter(EnterEvent event) { SWGObject object = event.object; - + // ToDo: Mounted players must be handled too + System.out.println("Entering object " + object.getClass().getName()); if(object == null || !(object instanceof CreatureObject)) return; + CreatureObject creature = (CreatureObject) object; if(creature.getSlottedObject("ghost") == null) @@ -91,8 +93,14 @@ public class DynamicSpawnArea extends SpawnArea { Vector groupMembers = new Vector(); Point3D randomGroupPosition = getRandomPosition(creature.getWorldPosition(), 32, 100); int spawnCount = spawnGroup.getGroupMembersNumber(); - if (spawnCount<0) - spawnCount = Math.abs(spawnCount) + new Random().nextInt(spawnGroup.getMobiles().size()-Math.abs(spawnCount)); + if (spawnCount<0){ + int spawnCount2 = 1; + if (Math.abs(spawnCount) many NPC groups int index = new Random().nextInt(spawnGroups.size()); this.spawnGroup = spawnGroups.get(index); + Vector groupMembers = new Vector(); Point3D randomGroupPosition = getRandomPosition(creature.getWorldPosition(), 32, 100); int spawnCount = spawnGroup.getGroupMembersNumber(); - if (spawnCount<0) - spawnCount = Math.abs(spawnCount) + new Random().nextInt(spawnGroup.getMobiles().size()-Math.abs(spawnCount)); + if (spawnCount<0){ + int spawnCount2 = 1; + if (Math.abs(spawnCount)