From 0786a6ae0890bba6f2257b845e53eec0a4eb0f06 Mon Sep 17 00:00:00 2001 From: Treeku Date: Sat, 21 Dec 2013 11:54:35 +0000 Subject: [PATCH 1/9] No longer "forever in an old group" after logoff --- src/services/ConnectionService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java index 18ac17e1..a09272b1 100644 --- a/src/services/ConnectionService.java +++ b/src/services/ConnectionService.java @@ -189,6 +189,7 @@ public class ConnectionService implements INetworkDispatch { object.setInviteCounter(0); object.setInviteSenderId(0); object.setInviteSenderName(""); + core.groupService.handleGroupDisband(object); object.setClient(null); PlayerObject ghost = (PlayerObject) object.getSlottedObject("ghost"); From fb0de037f0791aed2d549abced27845f08dcbc85 Mon Sep 17 00:00:00 2001 From: Treeku Date: Sun, 22 Dec 2013 23:01:23 +0000 Subject: [PATCH 2/9] GetOption() --- src/resources/objects/tangible/TangibleObject.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java index 2b89cd36..d624557f 100644 --- a/src/resources/objects/tangible/TangibleObject.java +++ b/src/resources/objects/tangible/TangibleObject.java @@ -147,6 +147,12 @@ public class TangibleObject extends SWGObject { } } + public boolean getOption(int option) { + synchronized(objectMutex) { + return ((optionsBitmask & option) == option); + } + } + public void addOption(int option) { setOptionsBitmask(getOptionsBitmask() | option); } From 4ff7a7cf10dac051d08fd8c687cdf46e7983cbd4 Mon Sep 17 00:00:00 2001 From: Levarrishawk Date: Fri, 27 Dec 2013 23:25:35 -0500 Subject: [PATCH 3/9] Preliminary spawning of Mos Eisley Background NPCs INCOMPLETE: uninteractible NPCs within Mos Eisley cantina. --- scripts/static_spawns/tatooine.py | 104 ++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index 2a84eb1f..e56377a2 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -3,6 +3,7 @@ import sys def addPlanetSpawns(core, planet): stcSvc = core.staticService +# Wayfar Life Day, by Wefi stcSvc.spawnObject('object/mobile/shared_lifeday_saun_dann.iff', 'tatooine', long(0), float(-5037.00), float(75), float(-6561), float(-0.75), float(0)) # Life Day stcSvc.spawnObject('object/tangible/holiday/life_day/shared_main_lifeday_tree.iff', 'tatooine', long(0), float(-5043.00), float(75), float(-6541.00), float(0.999132931232), float(-0.0416347384453)) # Lifeday Tree @@ -17,6 +18,109 @@ def addPlanetSpawns(core, planet): bandtat4.setCustomName2('Sunil Eide') stcSvc.spawnObject('object/tangible/instrument/shared_nalargon.iff', 'tatooine', long(0), float(-5045.00), float(75), float(-6555), float(0.999132931232), float(-0.0416347384453)) # Drums stcSvc.spawnObject('object/tangible/instrument/shared_ommni_box.iff', 'tatooine', long(0), float(-5043.00), float(75), float(-6559), float(0.999132931232), float(-0.0416347384453)) # Box + +# Mos Eisley Spawns: WORK IN PROGRESS by Levarris + + #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') + + 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') + + 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') + + 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') + + 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') + + 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') + + 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') + + 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') + + 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 Dan') + + 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') + + 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') + + 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') + + 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') + + businessman1 = stcSvc.spawnObject('object/mobile/shared_dressed_businessman_human_male_01.iff', 'tatooine', long(1082877), float(10.7), float(-0.9), float(1.9), float(0.42), float(0.91)) + businessman1.setCustomName2('a Businessman') + + 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.42), float(0.91)) + commoner1.setCustomName2('a Commoner') + + 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.42), float(0.91)) + entertainer1.setCustomName2('an Entertainer') + + 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.42), float(0.91)) + noble1.setCustomName2('a Noble') + + 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(0.42), float(0.91)) + commoner2.setCustomName2('a Commoner') + + 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(0.42), float(0.91)) + commoner3.setCustomName2('a Commoner') + + 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(0.42), float(0.91)) + commoner4.setCustomName2('a Commoner') + + 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(0.42), float(0.91)) + commoner5.setCustomName2('a Commoner') + + 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.42), float(0.91)) + commoner6.setCustomName2('a Commoner') + + 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.42), float(0.91)) + commoner7.setCustomName2('a Patron') + + commoner2 = 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.42), float(0.91)) + commoner2.setCustomName2('a Commoner') + + #Starport Interior + + #City Hall Interior + + #Lucky Despot Interior + + #Medical Center Interior + + #Theater Interior + + #Miscellaneous Building Interiors + + #Outside + +# Mos Espa NPC Spawns +# Mos Entha NPC Spawns + +# Bestine NPC Spawns + +# Anchorhead NPC Spawns + +# Mos Taike NPC Spawns + +# Wayfar NPC Spawns + +# Jabba's Palace Theme Park Spawns + return \ No newline at end of file From 82af3605d615fa04c60d44a753da480f6466cb83 Mon Sep 17 00:00:00 2001 From: Levarrishawk Date: Sat, 28 Dec 2013 00:44:57 -0500 Subject: [PATCH 4/9] Added more NPCs to tatooine. Additional NPCs added, in need of proper rotational values and state bitmasks on select objects. --- scripts/static_spawns/tatooine.py | 62 ++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index e56377a2..3ed56b07 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -91,8 +91,14 @@ def addPlanetSpawns(core, planet): 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.42), float(0.91)) commoner7.setCustomName2('a Patron') - commoner2 = 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.42), float(0.91)) - commoner2.setCustomName2('a Commoner') + 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.42), float(0.91)) + commoner8.setCustomName2('a Patron') + + 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') + + 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') #Starport Interior @@ -107,7 +113,59 @@ def addPlanetSpawns(core, planet): #Miscellaneous Building Interiors #Outside + businessman2 = stcSvc.spawnObject('object/mobile/shared_dressed_businessman_human_male_01.iff', 'tatooine', long(0), float(3532.7), float(5.0), float(-4788.1), float(0), float(0)) + businessman2.setCustomName2('a Businessman') + noble2 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_human_female_01.iff', 'tatooine', long(0), float(3542.3), float(5.0), float(-4826.0), float(0.42), float(0.91)) + noble2.setCustomName2('a Noble') + + commoner11 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_06.iff', 'tatooine', long(0), float(3529.1), float(5.0), float(-4900.4), float(0.42), float(0.91)) + commoner11.setCustomName2('a Commoner') + + businessman3 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_trandoshan_male_02.iff', 'tatooine', long(0), float(3532.7), float(5.0), float(-4788.1), float(0), float(0)) + businessman3.setCustomName2('a Businessman') + + jawa1 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3663.3), float(5.0), float(-4858.6), float(0), float(0)) + jawa1.setCustomName2('a Jawa') + + commoner12 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_moncal_male_01.iff', 'tatooine', long(0), float(3532.7), float(5.0), float(-4788.1), float(0), float(0)) + commoner12.setCustomName2('a Scientist') + + commoner13 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_zabrak_female_02.iff', 'tatooine', long(0), float(3559.7), float(5.0), float(-4725.9), float(0), float(0)) + commoner13.setCustomName2('a Commoner') + + commoner14 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_devaronian_male_01.iff', 'tatooine', long(0), float(3527.7), float(5.0), float(-4721.1), float(0), float(0)) + commoner14.setCustomName2('a Commoner') + + commoner15 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_aqualish_female_01.iff', 'tatooine', long(0), float(3513.7), float(5.0), float(-4740.4), float(0), float(0)) + commoner15.setCustomName2('a Commoner') + + ltHarburik = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_lt_harburik.iff', 'tatooine', long(0), float(3485.4), float(5.0), float(-4788.1), float(0), float(0)) + ltHarburik.setCustomName2('Lieutenant Harburik') + + jawa2 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3475.4), float(5.0), float(-4852.7), float(0), float(0)) + jawa2.setCustomName2('a Jawa') + + jawa3 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3469.3), float(5.0), float(-4861.5), float(0), float(0)) + jawa3.setCustomName2('a Jawa') + + jawa4 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3486.1), float(5.0), float(-4884.7), float(0), float(0)) + jawa4.setCustomName2('a Jawa') + + jawa5 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3487.1), float(5.0), float(-4886.0), float(0), float(0)) + jawa5.setCustomName2('a Jawa') + + jawa6 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3488.8), float(5.0), float(-4884.4), float(0), float(0)) + jawa6.setCustomName2('a Jawa') + + jawa7 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3472.2), float(5.0), float(-4918.4), float(0), float(0)) + jawa7.setCustomName2('a Jawa') + + jawa8 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3471.4), float(5.0), float(-4919.5), float(0), float(0)) + jawa8.setCustomName2('a Jawa') + + jawa9 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3470.3), float(5.0), float(-4918.7), float(0), float(0)) + jawa9.setCustomName2('a Jawa') # Mos Espa NPC Spawns # Mos Entha NPC Spawns From 9c96c6f95b9a5fdad20106a011d12dd24f2c7af0 Mon Sep 17 00:00:00 2001 From: Fingies Date: Fri, 27 Dec 2013 22:36:36 -0800 Subject: [PATCH 5/9] Added Bib Fortuna --- scripts/static_spawns/tatooine.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index 3ed56b07..9778e3d4 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -166,6 +166,10 @@ def addPlanetSpawns(core, planet): jawa9 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3470.3), float(5.0), float(-4918.7), float(0), float(0)) jawa9.setCustomName2('a Jawa') + + bib = stcSvc.spawnObject('object/mobile/shared_bib_fortuna.iff', 'tatooine', long(0), float(3552.4), float(5.0), float(-4933.2), float(0), float(0)) + bib.setCustomName2('Bib Fortuna') + # Mos Espa NPC Spawns # Mos Entha NPC Spawns From 2e05a0575d6604d3710284c6febf74c63ad7a806 Mon Sep 17 00:00:00 2001 From: Fingies Date: Fri, 27 Dec 2013 23:20:45 -0800 Subject: [PATCH 6/9] Revert "Added Bib Fortuna" This reverts commit 9c96c6f95b9a5fdad20106a011d12dd24f2c7af0. --- scripts/static_spawns/tatooine.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index 9778e3d4..3ed56b07 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -166,10 +166,6 @@ def addPlanetSpawns(core, planet): jawa9 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3470.3), float(5.0), float(-4918.7), float(0), float(0)) jawa9.setCustomName2('a Jawa') - - bib = stcSvc.spawnObject('object/mobile/shared_bib_fortuna.iff', 'tatooine', long(0), float(3552.4), float(5.0), float(-4933.2), float(0), float(0)) - bib.setCustomName2('Bib Fortuna') - # Mos Espa NPC Spawns # Mos Entha NPC Spawns From fa7ece0fdc8fdda2185bf2653b9b99ffd3a11c42 Mon Sep 17 00:00:00 2001 From: Fingies Date: Fri, 27 Dec 2013 23:22:02 -0800 Subject: [PATCH 7/9] Revert "Revert "Added Bib Fortuna"" This reverts commit 2e05a0575d6604d3710284c6febf74c63ad7a806. --- scripts/static_spawns/tatooine.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index 3ed56b07..9778e3d4 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -166,6 +166,10 @@ def addPlanetSpawns(core, planet): jawa9 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3470.3), float(5.0), float(-4918.7), float(0), float(0)) jawa9.setCustomName2('a Jawa') + + bib = stcSvc.spawnObject('object/mobile/shared_bib_fortuna.iff', 'tatooine', long(0), float(3552.4), float(5.0), float(-4933.2), float(0), float(0)) + bib.setCustomName2('Bib Fortuna') + # Mos Espa NPC Spawns # Mos Entha NPC Spawns From dc9b66e40f5477a46706fcae32ed1b66b82a54c9 Mon Sep 17 00:00:00 2001 From: Fingies Date: Sat, 28 Dec 2013 02:14:05 -0800 Subject: [PATCH 8/9] Added Static NPC Spawns for Lok --- scripts/static_spawns/lok.py | 49 +++++++++++++++++++++++++++++++++ src/services/StaticService.java | 1 + 2 files changed, 50 insertions(+) create mode 100644 scripts/static_spawns/lok.py diff --git a/scripts/static_spawns/lok.py b/scripts/static_spawns/lok.py new file mode 100644 index 00000000..acb0f8a6 --- /dev/null +++ b/scripts/static_spawns/lok.py @@ -0,0 +1,49 @@ + +import sys + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService +#Nym's Stronghold -Fingies + + #Outside + + nymtech = stcSvc.spawnObject('object/mobile/shared_dressed_nym_technician_2.iff', 'lok', long(0), float(372.87), float(11.99), float(4984.83), float(0.97), float(-0.21)) + nymtech.setCustomName2('Nym\'s Fuel Technician') + disgrunt1 = stcSvc.spawnObject('object/mobile/shared_nym_themepark_d_townsperson_lead.iff', 'lok', long(0), float(473.28), float(23.00), float(4945.03), float(0.043), float(0.99)) + disgrunt1.setCustomName2('a disgruntled townsperson') + guard1 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_guard_weak_nikto_m.iff', 'lok', long(0), float(472.82), float(22.57), float(4920.00), float(0), float(0)) + guard1.setCustomName2('Nym\'s Guard') + guard2 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_guard_weak_hum_m.iff', 'lok', long(0), float(480.74), float(22.64), float(4920.02), float(0), float(0)) + guard2.setCustomName2('Nym\'s Guard') + + #Nym's Palace - Interior + + brawl1 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_brawler_hum_f.iff', 'lok', long(6595511), float(5.7), float(1.3), float(-6.1), float(0.90), float(-0.42)) + brawl1.setCustomName2('Nym\'s Brawler') + surv1 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_surveyer_rod_m.iff', 'lok', long(6595511), float(4.5), float(1.3), float(-4.1), float(0.078), float(-0.99)) + surv1.setCustomName2('Nym\'s Surveyor') + bodyg1 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_bodyguard_hum_m.iff', 'lok', long(6595511), float(7.8), float(1.3), float(-6.8), float(0.782), float(0.622)) + bodyg1.setCustomName2('Nym\'s Bodyguard') + mako = stcSvc.spawnObject('object/mobile/shared_nym_themepark_mako_ghast.iff', 'lok', long(6595511), float(5.5), float(4.1), float(-13.9), float(0.309), float(0.951)) + mako.setCustomName2('Mako Ghast') + bodyg2 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_bodyguard_rod_m.iff', 'lok', long(6595511), float(0.3), float(1.3), float(3.2), float(0.707), float(0.707)) + bodyg2.setCustomName2('Nym\'s Bodyguard') + bodyg3 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_bodyguard_rod_m.iff', 'lok', long(6595511), float(-1.6), float(1.3), float(3.0), float(0.707), float(-0.707)) + bodyg3.setCustomName2('Nym\'s Bodyguard') + surv2 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_surveyer_rod_m.iff', 'lok', long(6595511), float(-9.1), float(1.3), float(-5.9), float(1), float(0)) + surv2.setCustomName2('Nym\'s Surveyor') + brawl2 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_brawler_tran_m.iff', 'lok', long(6595511), float(-9.1), float(1.3), float(-3.1), float(0.0087), float(0.999)) + brawl2.setCustomName2('Nym\'s Brawler') + guard3 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_guard_weak_hum_m.iff', 'lok', long(6595511), float(-19.7), float(2.3), float(-17.6), float(0.999), float(0.0087)) + guard3.setCustomName2('Nym\'s Guard') + creep1 = stcSvc.spawnObject('object/mobile/shared_slicer_kelson_sharphorn.iff', 'lok', long(6595511), float(-4.2), float(2.3), float(7.6), float(0.0174), float(0.9998)) + creep1.setCustomName2('Kelson Sharphorn') + guard4 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_guard_weak_hum_m.iff', 'lok', long(6595511), float(24.8), float(2.3), float(7.9), float(0.0174), float(0.9998)) + guard4.setCustomName2('Nym\'s Guard') + guard5 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_guard_weak_hum_m.iff', 'lok', long(6595511), float(3.7), float(4.1), float(-9.5), float(0.9998), float(0.0174)) + guard5.setCustomName2('Nym\'s Guard') + guard6 = stcSvc.spawnObject('object/mobile/shared_dressed_nym_guard_weak_rod_m.iff', 'lok', long(6595511), float(-3.7), float(4.1), float(-9.5), float(1), float(0)) + guard6.setCustomName2('Nym\'s Guard') + + diff --git a/src/services/StaticService.java b/src/services/StaticService.java index e8e72860..a0447d0a 100644 --- a/src/services/StaticService.java +++ b/src/services/StaticService.java @@ -55,6 +55,7 @@ public class StaticService implements INetworkDispatch { spawnPlanetStaticObjs("rori"); spawnPlanetStaticObjs("naboo"); spawnPlanetStaticObjs("tatooine"); + spawnPlanetStaticObjs("lok"); } @Override From 9fdce3b6250a939fa4ea02ef9b9e02de125364a0 Mon Sep 17 00:00:00 2001 From: Levarrishawk Date: Sat, 28 Dec 2013 06:23:55 -0500 Subject: [PATCH 9/9] Added Option & State Masks --- scripts/static_spawns/tatooine.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index 9778e3d4..9817b21c 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -1,4 +1,6 @@ import sys +from resources.datatables import Options +from resources.datatables import StateStatus def addPlanetSpawns(core, planet): @@ -24,6 +26,8 @@ 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.addOption(Options.INVULNERABLE) + wuher.setStateBitmask(StateStatus.SittingOnChair) 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')