diff --git a/scripts/static_spawns/corellia/coronet.py b/scripts/static_spawns/corellia/coronet.py index 969074dc..ea2f2550 100644 --- a/scripts/static_spawns/corellia/coronet.py +++ b/scripts/static_spawns/corellia/coronet.py @@ -9,32 +9,32 @@ def addPlanetSpawns(core, planet): #-Coronet ralMundi = stcSvc.spawnObject('object/mobile/shared_dressed_noble_fat_twilek_male_02.iff', 'corellia', long(0), float(-138.975), float(28), float(-4718.86), float(-0.97), float(0.21)) ralMundi.setCustomName2('Ral Mundi') - ralMundi.setOptionsBitmask(256) + ralMundi.setOptionsBitmask(Options.INVULNERABLE) ioTsomcren = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_moncal_male_01.iff', 'corellia', long(0), float(-140.701), float(28), float(-4719.16), float(-0.97), float(0.21)) ioTsomcren.setCustomName2('Io Tsomcren') - ioTsomcren.setOptionsBitmask(256) + ioTsomcren.setOptionsBitmask(Options.INVULNERABLE) tarthJax = stcSvc.spawnObject('object/mobile/shared_dressed_binayre_pirate_zabrak_male_01.iff', 'corellia', long(0), float(-137.464), float(28), float(-4718.83), float(-0.97), float(0.21)) tarthJax.setCustomName2('Tarth Jaxx') - tarthJax.setOptionsBitmask(256) + tarthJax.setOptionsBitmask(Options.INVULNERABLE) rebCoord = stcSvc.spawnObject('object/mobile/shared_dressed_rebel_communication_female_01.iff', 'corellia', long(0), float(94.8749), float(28), float(-4519.08), float(-0.97), float(0.21)) rebCoord.setCustomName2('Rebel Coordinator') - rebCoord.setOptionsBitmask(264) + rebCoord.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE) huntrJavz = stcSvc.spawnObject('object/mobile/ep3/shared_ep3_rodian_hunter_m.iff', 'corellia', long(0), float(-51.79), float(28), float(-4662.65), float(0.11), float(0.21)) huntrJavz.setCustomName2('Hunter Javeezo') - huntrJavz.setOptionsBitmask(256) + huntrJavz.setOptionsBitmask(Options.INVULNERABLE) dw_heraldRebel = stcSvc.spawnObject('object/mobile/shared_dressed_rebel_general_moncal_male_01.iff', 'corellia', long(0), float(-213.64), float(28), float(-4445.46), float(-0.97), float(0.21)) dw_heraldRebel.setCustomName2('Lutin Nightstalker') - dw_heraldRebel.setOptionsBitmask(256) + dw_heraldRebel.setOptionsBitmask(Options.INVULNERABLE) #---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.setOptionsBitmask(Options.INVULNERABLE) 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') @@ -59,14 +59,14 @@ def addPlanetSpawns(core, planet): 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.setOptionsBitmask(Options.INVULNERABLE) 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') 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.setOptionsBitmask(Options.INVULNERABLE) #---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)) @@ -89,7 +89,7 @@ def addPlanetSpawns(core, planet): 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.setOptionsBitmask(Options.INVULNERABLE) 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') @@ -106,20 +106,20 @@ def addPlanetSpawns(core, planet): #-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)) stregand.setCustomName2('Stregand') - stregand.setOptionsBitmask(256) + stregand.setOptionsBitmask(Options.INVULNERABLE) borgan = stcSvc.spawnObject('object/creature/npc/base/shared_whiphid_base_male.iff', 'corellia', long(0), float(-34.4), float(28), float(-4418.2), float(0.75), float(0.21)) borgan.setCustomName2('Borgan') - borgan.setOptionsBitmask(256) + borgan.setOptionsBitmask(Options.INVULNERABLE) #Lt. Joth - wrong appearance - looking for a bearded guy with BLUE CorSec Jacket ltJoth = stcSvc.spawnObject('object/mobile/shared_dressed_corellia_cec_officer.iff', 'corellia', long(0), float(-283), float(28), float(-4697), float(0.07), float(0.11)) ltJoth.setCustomName2('Lieutenant Joth') - ltJoth.setOptionsBitmask(256) + ltJoth.setOptionsBitmask(Options.INVULNERABLE) mackJasper = stcSvc.spawnObject('object/mobile/shared_dressed_corsec_officer_human_male_01.iff', 'corellia', long(0), float(-68.2), float(28), float(-4631.8), float(-0.97), float(0.21)) mackJasper.setCustomName2('Lieutenant Mack Jasper') - mackJasper.setOptionsBitmask(256) + mackJasper.setOptionsBitmask(Options.INVULNERABLE) #-Coronet Misc NPCS #Profession Counselor diff --git a/scripts/static_spawns/corellia/factional_recruiters.py b/scripts/static_spawns/corellia/factional_recruiters.py index 17de611c..30f938d9 100644 --- a/scripts/static_spawns/corellia/factional_recruiters.py +++ b/scripts/static_spawns/corellia/factional_recruiters.py @@ -13,15 +13,15 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService #recruiter Imp Outpost - stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_4.iff', 'corellia', long(0), float(6718), float(315), float(-5809), float(0), float(0), float(0), float(0)) + stcSvc.spawnObject('imperial_recruiter', 'corellia', long(0), float(6718), float(315), float(-5809), float(0), float(0), float(0), float(0)) #rebrecruiter tyrena tyrenaCantina = core.objectService.getObject(long(2625352)) - stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_moncal_male_01.iff', 'corellia', tyrenaCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(0.4), float(0), float(-0.707), float(0), float(0.707)) + stcSvc.spawnObject('rebel_recruiter', 'corellia', tyrenaCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(0.4), float(0), float(-0.707), float(0), float(0.707)) #cnet cantina cnetCantina = core.objectService.getObject(long(8105493)) - stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_twilek_female_01.iff', 'corellia', cnetCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(0.4), float(0), float(-0.707), float(0), float(0.707)) + stcSvc.spawnObject('rebel_recruiter', 'corellia', cnetCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(0.4), float(0), float(-0.707), float(0), float(0.707)) return \ No newline at end of file diff --git a/scripts/static_spawns/dantooine/factional_recruiters.py b/scripts/static_spawns/dantooine/factional_recruiters.py index 22c27df9..de277d5b 100644 --- a/scripts/static_spawns/dantooine/factional_recruiters.py +++ b/scripts/static_spawns/dantooine/factional_recruiters.py @@ -13,10 +13,10 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService #imprecruiter Imp Outpost - stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_6.iff', 'dantooine', long(0), float(-4198), float(3), float(-2411), float(0.819), float(-0.572)) + stcSvc.spawnObject('imperial_recruiter', 'dantooine', long(0), float(-4198), float(3), float(-2411), float(0.819), float(-0.572)) #rebrecruiter abandoned base - stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_moncal_male_01.iff', 'dantooine', long(0), float(-6817), float(46), float(5511), float(0), float(-0.707), float(0), float(0.707)) + stcSvc.spawnObject('rebel_recruiter', 'dantooine', long(0), float(-6817), float(46), float(5511), float(0), float(-0.707), float(0), float(0.707)) return \ No newline at end of file diff --git a/scripts/static_spawns/lok/factional_recruiters.py b/scripts/static_spawns/lok/factional_recruiters.py index 8a6e3cd3..bfa34cd3 100644 --- a/scripts/static_spawns/lok/factional_recruiters.py +++ b/scripts/static_spawns/lok/factional_recruiters.py @@ -13,6 +13,6 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService #recruiter Imp Outpost - stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_4.iff', 'lok', long(0), float(-1843), float(12), float(-3069), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('imperial_recruiter', 'lok', long(0), float(-1843), float(12), float(-3069), float(0.71), float(0), float(0.70), float(0)) return \ No newline at end of file diff --git a/scripts/static_spawns/naboo/factional_recruiters.py b/scripts/static_spawns/naboo/factional_recruiters.py index 4be2c940..0860b935 100644 --- a/scripts/static_spawns/naboo/factional_recruiters.py +++ b/scripts/static_spawns/naboo/factional_recruiters.py @@ -12,13 +12,13 @@ def addPlanetSpawns(core, planet): stcSvc = core.staticService objSvc = core.objectService #recruiter theed - stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_3.iff', 'naboo', long(0), float(-4927.9), float(6), float(4230.5), float(-0.998), float(0), float(0.06), float(0)) + stcSvc.spawnObject('imperial_recruiter', 'naboo', long(0), float(-4927.9), float(6), float(4230.5), float(-0.998), float(0), float(0.06), float(0)) #deeja Peek - stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_5.iff', 'naboo', long(0), float(5307), float(326), float(-1584), float(0), float(0), float(0), float(0)) + stcSvc.spawnObject('imperial_recruiter', 'naboo', long(0), float(5307), float(326), float(-1584), float(0), float(0), float(0), float(0)) #Rebrecruiter Moenia - stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_02.iff', 'naboo', long(0), float(4827), float(4), float(-4697), float(0), float(-0.707), float(0), float(0.707)) + stcSvc.spawnObject('rebel_recruiter', 'naboo', long(0), float(4827), float(4), float(-4697), float(0), float(-0.707), float(0), float(0.707)) return \ No newline at end of file diff --git a/scripts/static_spawns/talus/factional_recruiters.py b/scripts/static_spawns/talus/factional_recruiters.py index 31a1a19c..219a1571 100644 --- a/scripts/static_spawns/talus/factional_recruiters.py +++ b/scripts/static_spawns/talus/factional_recruiters.py @@ -12,10 +12,10 @@ def addPlanetSpawns(core, planet): stcSvc = core.staticService objSvc = core.objectService #recruiter Imp Outpost - stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_6.iff', 'talus', long(0), float(-2192), float(20), float(2269), float(0), float(0), float(0), float(0)) + stcSvc.spawnObject('imperial_recruiter', 'talus', long(0), float(-2192), float(20), float(2269), float(0), float(0), float(0), float(0)) #Reb recruiter dearicCantina = core.objectService.getObject(long(3175388)) - stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_02.iff', 'talus', dearicCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(-0.7), float(0), float(-0.707), float(0), float(0.707)) + stcSvc.spawnObject('rebel_recruiter', 'talus', dearicCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(-0.7), float(0), float(-0.707), float(0), float(0.707)) return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/darklighter_cave.py b/scripts/static_spawns/tatooine/darklighter_cave.py index c8c82261..87731a61 100644 --- a/scripts/static_spawns/tatooine/darklighter_cave.py +++ b/scripts/static_spawns/tatooine/darklighter_cave.py @@ -19,7 +19,7 @@ def addPlanetSpawns(core, planet): lifter = stcSvc.spawnObject('object/mobile/shared_cll8_binary_load_lifter.iff', 'tatooine', cave.getCellByCellNumber(2), float(8.8), float(-21.8), float(-38.1), float(0.71), float(0), float(0.70), float(0)) lifter.setCustomName('a Binary Load Lifter') - lifter.setOptionsBitmask(256) + lifter.setOptionsBitmask(Options.INVULNERABLE) stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(4), float(-34.7), float(-49.1), float(-109.5), float(0.71), float(0), float(0.70), float(0)) diff --git a/scripts/static_spawns/tatooine/jabbas_palace.py b/scripts/static_spawns/tatooine/jabbas_palace.py index c1f61b37..4b1aaa03 100644 --- a/scripts/static_spawns/tatooine/jabbas_palace.py +++ b/scripts/static_spawns/tatooine/jabbas_palace.py @@ -77,6 +77,6 @@ def addPlanetSpawns(core, planet): smuggler = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_jabba_henchman.iff', 'tatooine', long(0), float(-5863), float(90), float(-6198.2), float(0.71), float(0), float(0.70), float(0)) #still need to find correct template if smuggler: smuggler.setCustomName('Smuggler Pilot') - smuggler.setOptionsBitmask(256) + smuggler.setOptionsBitmask(Options.INVULNERABLE) return diff --git a/scripts/static_spawns/tatooine/luckydespot.py b/scripts/static_spawns/tatooine/luckydespot.py index 147f9123..65feae93 100644 --- a/scripts/static_spawns/tatooine/luckydespot.py +++ b/scripts/static_spawns/tatooine/luckydespot.py @@ -17,6 +17,6 @@ def addPlanetSpawns(core, planet): # Disabled for now. She seems to be the cause for quite a few crashes (but not the only reason for the crashes) #valarian = stcSvc.spawnObject('object/mobile/shared_lady_valarian.iff', 'tatooine', building.getCellByCellNumber(4), float(-21.5), float(9.0), float(0.5), float(0), float(0.70), float(0), float(-0.71)) #valarian.setCustomName('Lady Valarian') - #valarian.setOptionsBitmask(256) + #valarian.setOptionsBitmask(Options.INVULNERABLE) return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_eisley_wt_bunker.py b/scripts/static_spawns/tatooine/mos_eisley_wt_bunker.py index 0c174975..4bdcc8d1 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_wt_bunker.py +++ b/scripts/static_spawns/tatooine/mos_eisley_wt_bunker.py @@ -31,7 +31,7 @@ def addPlanetSpawns(core, planet): #1st room wt_reciptionist = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_opening_wh_receptionist.iff', 'tatooine', wt_bunker.getCellByCellNumber(5), float(-0.3), float(-12), float(34.4), float(0), float(0), float(0), float(0)) - wt_reciptionist.setOptionsBitmask(256) + wt_reciptionist.setOptionsBitmask(Options.INVULNERABLE) wt_reciptionist.setCustomName('White Thranta Reciptionist') wt_guard8 = stcSvc.spawnObject('white_thranta_security_guard', 'tatooine', wt_bunker.getCellByCellNumber(5), float(8.9), float(-12), float(50.8), float(0), float(0), float(0), float(0), 45) @@ -84,26 +84,26 @@ def addPlanetSpawns(core, planet): prisoner = stcSvc.spawnObject('object/mobile/shared_bothan_female.iff', 'tatooine', wt_bunker.getCellByCellNumber(21), float(-40.5), float(-12), float(130.8), float(-0.700), float(0), float(0.713), float(0)) prisoner.setCustomName('Carkufluv Reoslav\'Kre') - prisoner.setOptionsBitmask(256) + prisoner.setOptionsBitmask(Options.INVULNERABLE) prisoner1 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_rodian_female_01.iff', 'tatooine', wt_bunker.getCellByCellNumber(21), float(-43), float(-12), float(133.9), float(0.737), float(0), float(-0.676), float(0)) prisoner1.setCustomName('Basse Crestinglighter') - prisoner1.setOptionsBitmask(256) + prisoner1.setOptionsBitmask(Options.INVULNERABLE) prisoner1.setPosture(Posture.KnockedDown) prisoner2 = stcSvc.spawnObject('object/mobile/shared_dressed_fancy_human_female.iff', 'tatooine', wt_bunker.getCellByCellNumber(21), float(-33.3), float(-12), float(137.9), float(0), float(0), float(1), float(0)) prisoner2.setCustomName('Setweoko I\'tvo') - prisoner2.setOptionsBitmask(256) + prisoner2.setOptionsBitmask(Options.INVULNERABLE) prisoner2.setPosture(Posture.KnockedDown) prisoner3 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_trandoshan_female_01.iff', 'tatooine', wt_bunker.getCellByCellNumber(21), float(-30), float(-12), float(133.1), float(0.713), float(0), float(0.701), float(0)) prisoner3.setCustomName('Itzoosko') - prisoner3.setOptionsBitmask(256) + prisoner3.setOptionsBitmask(Options.INVULNERABLE) prisoner3.setPosture(Posture.KnockedDown) prisoner4 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_twilek_female_01.iff', 'tatooine', wt_bunker.getCellByCellNumber(21), float(-36), float(-12), float(129.9), float(0.994), float(0), float(0.105), float(0)) prisoner4.setCustomName('Ogavi Stibi') - prisoner4.setOptionsBitmask(256) + prisoner4.setOptionsBitmask(Options.INVULNERABLE) durr = stcSvc.spawnObject('durr_rodak', 'tatooine', wt_bunker.getCellByCellNumber(29), float(-153.7), float(-44), float(97.8), float(0), float(0), float(0), float(0), 45) diff --git a/scripts/static_spawns/tatooine/mos_entha.py b/scripts/static_spawns/tatooine/mos_entha.py index 838733e6..f44bded4 100644 --- a/scripts/static_spawns/tatooine/mos_entha.py +++ b/scripts/static_spawns/tatooine/mos_entha.py @@ -18,7 +18,7 @@ def addPlanetSpawns(core, planet): #Outside ankwee = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_entha_ankwee.iff', 'tatooine', long(0), float(1351), float(5.0), float(3108), float(0.42), float(0.91)) ankwee.setCustomName('An\'kwee') - ankwee.setOptionsBitmask(256) + ankwee.setOptionsBitmask(Options.INVULNERABLE) sarlin = stcSvc.spawnObject('sarlin', 'tatooine', long(0), float(1537), float(7), float(3052), float(0.6), float(0.8)) diff --git a/scripts/static_spawns/tatooine/mos_espa.py b/scripts/static_spawns/tatooine/mos_espa.py index 09829cd8..bc7504ad 100644 --- a/scripts/static_spawns/tatooine/mos_espa.py +++ b/scripts/static_spawns/tatooine/mos_espa.py @@ -22,51 +22,51 @@ 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.setOptionsBitmask(Options.INVULNERABLE) diala = stcSvc.spawnObject('diala', 'tatooine', long(0), float(-3105), float(5), float(2314), float(0.48), float(0.88)) #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', building.getCellByCellNumber(2), float(4.7), float(-0.5), float(2.4), float(-0.71), float(0), float(0.70), float(0)) #watto.setCustomName2('Watto') - #watto.setOptionsBitmask(256) + #watto.setOptionsBitmask(Options.INVULNERABLE) #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)) commoner18.setCustomName('a Commoner') - commoner18.setOptionsBitmask(256) + commoner18.setOptionsBitmask(Options.INVULNERABLE) jawa10 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(-2966.3), float(5.0), float(2196.9), float(0), float(0)) jawa10.setCustomName('a Jawa') - jawa10.setOptionsBitmask(256) + jawa10.setOptionsBitmask(Options.INVULNERABLE) commoner19 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_06.iff', 'tatooine', long(0), float(-2960.4), float(5.0), float(2271.3), float(0), float(0)) commoner19.setCustomName('a Commoner') - commoner19.setOptionsBitmask(256) + commoner19.setOptionsBitmask(Options.INVULNERABLE) commoner20 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_devaronian_male_01.iff', 'tatooine', long(0), float(-2934.3), float(5.0), float(2298.9), float(0.71), float(0.71)) commoner20.setCustomName('a Commoner') - commoner20.setOptionsBitmask(256) + commoner20.setOptionsBitmask(Options.INVULNERABLE) commoner21 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_human_female_01.iff', 'tatooine', long(0), float(-2897.7), float(5.0), float(2345.4), float(0.71), float(0.71)) commoner21.setCustomName('a Commoner') - commoner21.setOptionsBitmask(256) + commoner21.setOptionsBitmask(Options.INVULNERABLE) commoner22 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_fat_twilek_male_01.iff', 'tatooine', long(0), float(-2763.8), float(5.0), float(2305.2), float(0.71), float(0.71)) commoner22.setCustomName('a Commoner') - commoner22.setOptionsBitmask(256) + commoner22.setOptionsBitmask(Options.INVULNERABLE) jawa11 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(-2936.8), float(5.0), float(2078.4), float(0.95105), float(0.3090)) jawa11.setCustomName('a Jawa') - jawa11.setOptionsBitmask(256) + jawa11.setOptionsBitmask(Options.INVULNERABLE) businessman4 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_trandoshan_male_02.iff', 'tatooine', long(0), float(-2914.2), float(5.0), float(2022.4), float(0), float(0)) businessman4.setCustomName('a Businessman') - businessman4.setOptionsBitmask(256) + businessman4.setOptionsBitmask(Options.INVULNERABLE) commoner23 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_moncal_male_01.iff', 'tatooine', long(0), float(-2904.1), float(5.0), float(1965.3), float(0.71), float(0.71)) commoner23.setCustomName('a Commoner') - commoner23.setOptionsBitmask(256) + commoner23.setOptionsBitmask(Options.INVULNERABLE) #Junkdealer will be added as soon as i can find coords stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-3060.50), float(5), float(2181.71), float(0), float(1)) diff --git a/scripts/static_spawns/tatooine/squill_cave.py b/scripts/static_spawns/tatooine/squill_cave.py index 1433e2a6..9f982b36 100644 --- a/scripts/static_spawns/tatooine/squill_cave.py +++ b/scripts/static_spawns/tatooine/squill_cave.py @@ -96,7 +96,7 @@ def addPlanetSpawns(core, planet): hermit = stcSvc.spawnObject('object/mobile/shared_dressed_hermit_of_tatooine.iff', 'tatooine', cave.getCellByCellNumber(27), float(38.2), float(-69.1), float(-103.1), float(-0.75), float(0), float(-0.65), float(0)) #hermit.setCustomName('quest_hero_of_tatooine_hermit') hermit.setCustomName('a Hermit') - hermit.setOptionsBitmask(256) + hermit.setOptionsBitmask(Options.INVULNERABLE)