diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 8fd3df7d..62129380 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -1679,6 +1679,7 @@ def scouttrooperArmor(owner, inventory): scouttrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); scouttrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); scouttrooper_boots = core.objectService.createObject("object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_boots.iff", owner.getPlanet()) + scouttrooper_gloves = core.objectService.createObject("object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_belt.iff", owner.getPlanet()) scouttrooper_gloves = core.objectService.createObject("object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_gloves.iff", owner.getPlanet()) inventory.add(scouttrooper_bicep_r); @@ -1688,6 +1689,7 @@ def scouttrooperArmor(owner, inventory): inventory.add(scouttrooper_leggings); inventory.add(scouttrooper_helmet); inventory.add(scouttrooper_chest); + inventory.add(scouttrooper_belt); inventory.add(scouttrooper_boots); inventory.add(scouttrooper_gloves); screenOne(core, owner) diff --git a/scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py b/scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py index 12dc55c4..45a597c3 100644 --- a/scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py +++ b/scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py @@ -8,7 +8,7 @@ def addDynamicGroup(core): mobileTemplates = Vector() mobileTemplates.add('undead_deathtrooper') dynamicGroup.setMobiles(mobileTemplates) - dynamicGroup.setGroupMembersNumber(5) + dynamicGroup.setGroupMembersNumber(-5) dynamicGroup.setName('dathomir_deathtroopers_1') dynamicGroup.setMaxSpawns(-1) dynamicGroup.setMinSpawnDistance(10) diff --git a/scripts/static_spawns/corellia/factional_recruiters.py b/scripts/static_spawns/corellia/factional_recruiters.py index d8b0b77e..b8352a69 100644 --- a/scripts/static_spawns/corellia/factional_recruiters.py +++ b/scripts/static_spawns/corellia/factional_recruiters.py @@ -17,12 +17,12 @@ def addPlanetSpawns(core, planet): #rebrecruiter tyrena tyrenaCantina = core.objectService.getObject(long(2625352)) - if tyrenaCantina not None: + if tyrenaCantina is not None: 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)) - if cnetCantina not None: + if cnetCantina is not None: 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)) diff --git a/scripts/static_spawns/corellia/placeholder.txt b/scripts/static_spawns/corellia/placeholder.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/static_spawns/dantooine/placeholder.txt b/scripts/static_spawns/dantooine/placeholder.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/static_spawns/kaas/placeholder.txt b/scripts/static_spawns/kaas/placeholder.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/static_spawns/lok/placeholder.txt b/scripts/static_spawns/lok/placeholder.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/static_spawns/naboo/placeholder.txt b/scripts/static_spawns/naboo/placeholder.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/static_spawns/talus/factional_recruiters.py b/scripts/static_spawns/talus/factional_recruiters.py index dce4d239..27cc1c66 100644 --- a/scripts/static_spawns/talus/factional_recruiters.py +++ b/scripts/static_spawns/talus/factional_recruiters.py @@ -16,7 +16,7 @@ def addPlanetSpawns(core, planet): #Reb recruiter dearicCantina = core.objectService.getObject(long(3175388)) - if dearicCantina not None: + if dearicCantina is not None: 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/talus/placeholder.txt b/scripts/static_spawns/talus/placeholder.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/static_spawns/tatooine/anchorhead.py b/scripts/static_spawns/tatooine/anchorhead.py index c88d5de0..9fe02161 100644 --- a/scripts/static_spawns/tatooine/anchorhead.py +++ b/scripts/static_spawns/tatooine/anchorhead.py @@ -17,7 +17,7 @@ def addPlanetSpawns(core, planet): cantina = core.objectService.getObject(long(1213343)) # Cantina Interior - if cantina not None: + if cantina is not None: borraSetas = stcSvc.spawnObject('borrasetas', 'tatooine', cantina.getCellByCellNumber(2), float(9.8), float(0.4), float(-1.2), float(0.75), float(0), float(-0.65), float(0)) # Outside diff --git a/scripts/static_spawns/tatooine/bestine.py b/scripts/static_spawns/tatooine/bestine.py index 59e5ad57..c7596c07 100644 --- a/scripts/static_spawns/tatooine/bestine.py +++ b/scripts/static_spawns/tatooine/bestine.py @@ -12,7 +12,7 @@ def addPlanetSpawns(core, planet): # City hall cityhall = core.objectService.getObject(long(926472)) - if cityhall not None: + if cityhall is not None: indigoSiyan = stcSvc.spawnObject('indigosiyan', 'tatooine', cityhall.getCellByCellNumber(11), float(24.7), float(3.2), float(-30.7), float(0.99), float(0), float(-0.06), float(0)) keanna = stcSvc.spawnObject('keanna', 'tatooine', cityhall.getCellByCellNumber(8), float(-18.7), float(3.2), float(20.6), float(0.2), float(0), float(-0.97), float(0)) oberhaur = stcSvc.spawnObject('oberhaur', 'tatooine', cityhall.getCellByCellNumber(8), float(-21.9), float(3.2), float(26.9), float(0.01), float(0), float(0.99), float(0)) @@ -24,20 +24,20 @@ def addPlanetSpawns(core, planet): #Miscellaneous Building Interiors pilotguildhall = core.objectService.getObject(long(1028590)) - if pilotguildhall not None: + if pilotguildhall is not None: akalColzet = stcSvc.spawnObject('akalcolzet', 'tatooine', pilotguildhall.getCellByCellNumber(10), float(0.7), float(1.8), float(-14), float(0.99), float(0), float(0), float(0)) fariousgletchhouse = core.objectService.getObject(long(1278979)) - if fariousgletchhouse not None: + if fariousgletchhouse is not None: fariousGletch = stcSvc.spawnObject('fariousgletch', 'tatooine', fariousgletchhouse.getCellByCellNumber(10), float(2.0), float(-0.4), float(-5.7), float(0.98), float(0), float(-0.15), float(0)) hillbase = core.objectService.getObject(long(1279918)) - if hillbase not None: + if hillbase is not None: pfilbeeJhorn = stcSvc.spawnObject('pfilbee', 'tatooine', hillbase.getCellByCellNumber(5), float(5.1), float(0.1), float(-3.8), float(0.71), float(0), float(-0.7), float(0)) #Hotel interior hotel = core.objectService.getObject(long(1223845)) - if hotel not None: + if hotel is not None: gilBurtin = stcSvc.spawnObject('gilburtin', 'tatooine', hotel.getCellByCellNumber(5), float(20.3), float(1.6), float(12.8), float(0), float(0), float(0.99), float(0)) # Outside diff --git a/scripts/static_spawns/tatooine/darklighter_cave.py b/scripts/static_spawns/tatooine/darklighter_cave.py index 0ac7e0a8..7da7da06 100644 --- a/scripts/static_spawns/tatooine/darklighter_cave.py +++ b/scripts/static_spawns/tatooine/darklighter_cave.py @@ -17,7 +17,7 @@ def addPlanetSpawns(core, planet): cave = core.objectService.getObject(long(-466404036409557011)) - if cave not None: + if cave is not None: 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(Options.INVULNERABLE) diff --git a/scripts/static_spawns/tatooine/factional_recruiters.py b/scripts/static_spawns/tatooine/factional_recruiters.py index cb152da9..4df1c48d 100644 --- a/scripts/static_spawns/tatooine/factional_recruiters.py +++ b/scripts/static_spawns/tatooine/factional_recruiters.py @@ -16,7 +16,7 @@ def addPlanetSpawns(core, planet): #Imp recruiter Eisley smallImpHouse = core.objectService.getObject(long(1280129)) - if smallImpHouse not None: + if smallImpHouse is not None: stcSvc.spawnObject('imperial_recruiter', 'tatooine', smallImpHouse.getCellByCellNumber(3), float(-6), float(1), float(9.2), float(0.71), float(0), float(0.70), float(0)) #Imp recruiter Bestine @@ -29,7 +29,7 @@ def addPlanetSpawns(core, planet): #Anchorhead cantina anchCantina = core.objectService.getObject(long(1213343)) - if anchCantina not None: + if anchCantina is not None: stcSvc.spawnObject('rebel_recruiter', 'tatooine', anchCantina.getCellByCellNumber(6), float(-6.1), float(-1.8), float(-6.2), float(0), float(0), float(0), float(-90)) return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/jabba_tp_pod_racer_bunker.py b/scripts/static_spawns/tatooine/jabba_tp_pod_racer_bunker.py index 365ab34d..007cc7c7 100644 --- a/scripts/static_spawns/tatooine/jabba_tp_pod_racer_bunker.py +++ b/scripts/static_spawns/tatooine/jabba_tp_pod_racer_bunker.py @@ -35,7 +35,7 @@ def addPlanetSpawns(core, planet): stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-728.1), float(11), float(-6255.1), float(0), float(0), float(0), float(0), 45) bunker = core.objectService.getObject(long(-466404037726719318)) - if bunker not None: + if bunker is not None: stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(2), float(-4.1), float(0.3), float(1.6), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(3), float(4.1), float(0.3), float(-3.5), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(4), float(3.2), float(-12), float(26.6), float(0), float(0), float(0), float(0), 45) diff --git a/scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py b/scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py index fc484a33..75bbbaf0 100644 --- a/scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py +++ b/scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py @@ -24,7 +24,7 @@ def addPlanetSpawns(core, planet): # TODO Check all NPCs for personalized scripting, change format. bunker = core.objectService.getObject(long(-466404037494797872)) - if bunker not None: + if bunker is not None: stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(2), float(-3.8), float(0.3), float(2.9), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(3), float(3.6), float(0.3), float(-3.7), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(5), float(29.8), float(-12), float(25.4), float(0), float(0), float(0), float(0), 45) diff --git a/scripts/static_spawns/tatooine/jabba_tp_sand_splitter_cave.py b/scripts/static_spawns/tatooine/jabba_tp_sand_splitter_cave.py index 8bfee12f..4952b0a7 100644 --- a/scripts/static_spawns/tatooine/jabba_tp_sand_splitter_cave.py +++ b/scripts/static_spawns/tatooine/jabba_tp_sand_splitter_cave.py @@ -15,7 +15,7 @@ def addPlanetSpawns(core, planet): # TODO Check all NPCs for personalized scripting, change format. cave = core.objectService.getObject(long(-466404038393479071)) - if cave not None: + if cave is not None: stcSvc.spawnObject('sand_splitter_knave', 'tatooine', cave.getCellByCellNumber(1), float(42.6), float(-23.3), float(4.9), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('sand_splitter_knave', 'tatooine', cave.getCellByCellNumber(2), float(41.5), float(-34.4), float(-21.8), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('sand_splitter_ruffian', 'tatooine', cave.getCellByCellNumber(2), float(40), float(-37.9), float(-52.7), float(0), float(0), float(0), float(0), 45) diff --git a/scripts/static_spawns/tatooine/jabba_tp_sennex_bunker.py b/scripts/static_spawns/tatooine/jabba_tp_sennex_bunker.py index bcf684ed..d7f0a4ec 100644 --- a/scripts/static_spawns/tatooine/jabba_tp_sennex_bunker.py +++ b/scripts/static_spawns/tatooine/jabba_tp_sennex_bunker.py @@ -17,7 +17,7 @@ def addPlanetSpawns(core, planet): # TODO Check all NPCs for personalized scripting, change format. bunker = core.objectService.getObject(long(-466404036409557025)) - if bunker not None: + if bunker is not None: stcSvc.spawnObject('sennex_guard', 'tatooine', bunker.getCellByCellNumber(2), float(-4), float(0.3), float(-0.9), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('sennex_guard', 'tatooine', bunker.getCellByCellNumber(4), float(3.7), float(-4), float(9), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('sennex_guard', 'tatooine', bunker.getCellByCellNumber(5), float(8.3), float(-12), float(26.6), float(0), float(0), float(0), float(0), 45) diff --git a/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_bunker.py b/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_bunker.py index cb2c192e..887f754b 100644 --- a/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_bunker.py +++ b/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_bunker.py @@ -15,7 +15,7 @@ def addPlanetSpawns(core, planet): # TODO Check all NPCs for personalized scripting, change format. bunker = core.objectService.getObject(long(-466404038502638198)) - if bunker not None: + if bunker is not None: stcSvc.spawnObject('valarian_bookie', 'tatooine', bunker.getCellByCellNumber(3), float(-3.7), float(0.3), float(-4), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('valarian_bookie', 'tatooine', bunker.getCellByCellNumber(4), float(-3.2), float(-3.3), float(5), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('valarian_bookie', 'tatooine', bunker.getCellByCellNumber(5), float(3.4), float(-6.8), float(-2.1), float(0), float(0), float(0), float(0), 45) diff --git a/scripts/static_spawns/tatooine/jabba_tp_valarian_hacker_bunker.py b/scripts/static_spawns/tatooine/jabba_tp_valarian_hacker_bunker.py index f12e8310..d6f2ad11 100644 --- a/scripts/static_spawns/tatooine/jabba_tp_valarian_hacker_bunker.py +++ b/scripts/static_spawns/tatooine/jabba_tp_valarian_hacker_bunker.py @@ -20,7 +20,7 @@ def addPlanetSpawns(core, planet): stcSvc.spawnObject('valarian_hacker', 'tatooine', long(0), float(-5372.5), float(64.3), float(-6902.4), float(0), float(0), float(0), float(0), 45) bunker = core.objectService.getObject(long(-466404036467088174)) - if bunker not None: + if bunker is not None: stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(2), float(-3.7), float(0.3), float(3.1), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(3), float(3.8), float(-0.3), float(-4), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(4), float(3.4), float(-3.3), float(4.8), float(0), float(0), float(0), float(0), 45) diff --git a/scripts/static_spawns/tatooine/jabbas_palace.py b/scripts/static_spawns/tatooine/jabbas_palace.py index 16e66e3d..7c467995 100644 --- a/scripts/static_spawns/tatooine/jabbas_palace.py +++ b/scripts/static_spawns/tatooine/jabbas_palace.py @@ -14,7 +14,7 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService building = core.objectService.getObject(long(-466404040703346823)) - if building not None: + if building is not None: #reelo baruk stcSvc.spawnObject('object/mobile/shared_reelo_baruk.iff', 'tatooine', building.getCellByCellNumber(1), float(-3.5), float(0.2), float(113.5), float(0), float(0), float(0), float(0)) @@ -72,11 +72,11 @@ def addPlanetSpawns(core, planet): # G5P0 stcSvc.spawnObject('object/mobile/shared_3po_protocol_droid_red.iff', 'tatooine', building.getCellByCellNumber(22), float(-14.3), float(2.0), float(47.4), float(0.71), float(0), float(0.70), float(0)) - #outside Palace + #outside Palace - 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 = 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 is smuggler: smuggler.setCustomName('Smuggler Pilot') smuggler.setOptionsBitmask(Options.INVULNERABLE) - return + return diff --git a/scripts/static_spawns/tatooine/mos_eisley.py b/scripts/static_spawns/tatooine/mos_eisley.py index 16c7032c..9fed163a 100644 --- a/scripts/static_spawns/tatooine/mos_eisley.py +++ b/scripts/static_spawns/tatooine/mos_eisley.py @@ -100,7 +100,7 @@ def addPlanetSpawns(core, planet): #Eisley Legacy Quest NPCs building = core.objectService.getObject(long(1279956)) - if building not None: + if building is not None: mayor = stcSvc.spawnObject('mos_eisley_mayor', 'tatooine', building.getCellByCellNumber(4), float(1.2), float(2.5), float(5.4), float(0), float(0), float(0), float(0)) enthaKandela = stcSvc.spawnObject('enthakandela', 'tatooine', long(0), float(3511), float(5.0), float(-4785), float(0.70), float(0.71)) @@ -108,7 +108,7 @@ def addPlanetSpawns(core, planet): purvis = stcSvc.spawnObject('purvisarrison', 'tatooine', long(0), float(3512.4), float(5.0), float(-4764.9), float(0.38), float(-0.92)) building = core.objectService.getObject(long(1189630)) - if building not None: + if building is not None: peawpRdawc = stcSvc.spawnObject('peawprdawc', 'tatooine', building.getCellByCellNumber(9), float(-11.8), float(1.1), float(-10.1), float(0), float(0), float(0), float(0)) nikoBrehe = stcSvc.spawnObject('nikobrehe', 'tatooine', long(0), float(3506.7), float(5.0), float(-4795.8), float(0.70), float(0.71)) @@ -158,7 +158,7 @@ def addPlanetSpawns(core, planet): # Looped Patrol must end in same cell like the start point!!! #building id: 1105845 Buildingid + cell ! - if building not None: + if building is not None: trehla = stcSvc.spawnObject('trehla', 'tatooine', long(1105845 + 8), float(24.21), float(2.12), float(73.49), float(0.92), float(0), float(-0.38), float(0)) patrolpointsCells = Vector() # Vector Building reference Patrolpoint CellID aiSvc.addPatrolPointCell(patrolpointsCells, trehla.getGrandparent(), Point3D(float(25.11), float(2.10), float(50.22)), 7)