diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 9e9ff385..939c67d4 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -1698,60 +1698,12 @@ def scouttrooperArmor(owner, inventory): def snowtrooperArmor(owner, inventory): snowtrooper_bicep_r = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_bicep_r.iff", owner.getPlanet()) - snowtrooper_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - snowtrooper_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - snowtrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - snowtrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - snowtrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - snowtrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - snowtrooper_bicep_l = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_bicep_l.iff", owner.getPlanet()) - snowtrooper_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - snowtrooper_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - snowtrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - snowtrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - snowtrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - snowtrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - snowtrooper_bracer_r = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_bracer_r.iff", owner.getPlanet()) - snowtrooper_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - snowtrooper_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - snowtrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - snowtrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - snowtrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - snowtrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - snowtrooper_bracer_l = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_bracer_l.iff", owner.getPlanet()) - snowtrooper_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - snowtrooper_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - snowtrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - snowtrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - snowtrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - snowtrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - snowtrooper_leggings = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_leggings.iff", owner.getPlanet()) - snowtrooper_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - snowtrooper_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - snowtrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - snowtrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - snowtrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - snowtrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - snowtrooper_helmet = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_helmet.iff", owner.getPlanet()) - snowtrooper_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - snowtrooper_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - snowtrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - snowtrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - snowtrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - snowtrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - - snowtrooper_chest = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_chest_plate.iff", owner.getPlanet()) - snowtrooper_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - snowtrooper_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - snowtrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - snowtrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - snowtrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - snowtrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); + snowtrooper_chest = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_chest_plate.iff", owner.getPlanet()) snowtrooper_boots = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_boots.iff", owner.getPlanet()) snowtrooper_gloves = core.objectService.createObject("object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_gloves.iff", owner.getPlanet()) diff --git a/scripts/conversation/outbreak_imperial_officer_gate_keeper.py b/scripts/conversation/outbreak_imperial_officer_gate_keeper.py index 38ce1f4c..3d11aa00 100644 --- a/scripts/conversation/outbreak_imperial_officer_gate_keeper.py +++ b/scripts/conversation/outbreak_imperial_officer_gate_keeper.py @@ -7,7 +7,7 @@ from java.util import Vector import sys def startConversation(core, actor, npc): - options = new Vector() + #options = new Vector() #options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/New Conversation Response 4'), 0) #core.conversationService.sendConversationOptions(actor, npc, handleOptionScreen1) core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/arven_wendik:s_4')) # I'm too busy to talk. @@ -15,7 +15,7 @@ def startConversation(core, actor, npc): # Handle Response for Begin Conversationdef handleOptionScreen1(core, actor, npc, selection): - if selection == 0: + #if selection == 0: # New Conversation Response 4 return diff --git a/scripts/conversation/outbreak_imperial_trooper_gate_keeper.py b/scripts/conversation/outbreak_imperial_trooper_gate_keeper.py index 38ce1f4c..3d11aa00 100644 --- a/scripts/conversation/outbreak_imperial_trooper_gate_keeper.py +++ b/scripts/conversation/outbreak_imperial_trooper_gate_keeper.py @@ -7,7 +7,7 @@ from java.util import Vector import sys def startConversation(core, actor, npc): - options = new Vector() + #options = new Vector() #options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/New Conversation Response 4'), 0) #core.conversationService.sendConversationOptions(actor, npc, handleOptionScreen1) core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/arven_wendik:s_4')) # I'm too busy to talk. @@ -15,7 +15,7 @@ def startConversation(core, actor, npc): # Handle Response for Begin Conversationdef handleOptionScreen1(core, actor, npc, selection): - if selection == 0: + #if selection == 0: # New Conversation Response 4 return diff --git a/scripts/mobiles/dathomir/outbreak_facility_stormtrooper_survivor.py b/scripts/mobiles/dathomir/outbreak_facility_stormtrooper_survivor.py index 7ff29f07..a174ac38 100644 --- a/scripts/mobiles/dathomir/outbreak_facility_stormtrooper_survivor.py +++ b/scripts/mobiles/dathomir/outbreak_facility_stormtrooper_survivor.py @@ -10,7 +10,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('outbreak_imperial_officer_gate_keeper') + mobileTemplate.setCreatureName('outbreak_facility_stormtrooper_survivor') mobileTemplate.setLevel(90) mobileTemplate.setDifficulty(Difficulty.BOSS) @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 0, 'kinetic') + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_e11.iff', WeaponType.RIFLE, 1.0, 0, 'kinetic') weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) @@ -32,5 +32,5 @@ def addTemplate(core): mobileTemplate.setDefaultAttack('meleeHit') mobileTemplate.setAttacks(attacks) - core.spawnService.addMobileTemplate('outbreak_imperial_officer_gate_keeper', mobileTemplate) + core.spawnService.addMobileTemplate('outbreak_facility_stormtrooper_survivor', mobileTemplate) return \ No newline at end of file diff --git a/scripts/static_spawns/dathomir/quarantine_zone.py b/scripts/static_spawns/dathomir/quarantine_zone.py index beec1a3f..1eccbd6c 100644 --- a/scripts/static_spawns/dathomir/quarantine_zone.py +++ b/scripts/static_spawns/dathomir/quarantine_zone.py @@ -16,11 +16,11 @@ def addPlanetSpawns(core, planet): gateofficer1 = stcSvc.spawnObject('outbreak_imperial_officer_gate_keeper', 'dathomir', long(0), float(-5780), float(510), float(-6550), float(0.40), float(0.85)) # Imperial Gate Troopers - Exit - trooper1 = stcSvc.spawnObject('vic_dark_trooper_80', 'dathomir', long(0), float(-5775), float(510), float(-6553), float(0.36), float(0.85)) - trooper2 = stcSvc.spawnObject('vic_dark_trooper_80', 'dathomir', long(0), float(-5775), float(510), float(-6553), float(0.36), float(0.85)) - trooper3 = stcSvc.spawnObject('vic_dark_trooper_80', 'dathomir', long(0), float(-5775), float(510), float(-6553), float(0.36), float(0.85)) - trooper4 = stcSvc.spawnObject('vic_dark_trooper_80', 'dathomir', long(0), float(-5775), float(510), float(-6553), float(0.36), float(0.85)) - exittrooper1 = stcSvc.spawnObject('outbreak_facility_stormtrooper_survivor', 'dathomir', long(0), float(-5783), float(510), float(-6552), float(-1.38), float(0.85)) + trooper1 = stcSvc.spawnObject('vic_dark_trooper_80', 'dathomir', long(0), float(-5793), float(510), float(-6553), float(0.56), float(0.85)) + trooper2 = stcSvc.spawnObject('vic_dark_trooper_80', 'dathomir', long(0), float(-5784), float(510), float(-6560), float(0.28), float(0.85)) + trooper3 = stcSvc.spawnObject('vic_dark_trooper_80', 'dathomir', long(0), float(-5789), float(510), float(-6562), float(0.23), float(0.85)) + trooper4 = stcSvc.spawnObject('vic_dark_trooper_80', 'dathomir', long(0), float(-5794), float(510), float(-6557), float(0.32), float(0.85)) + exittrooper1 = stcSvc.spawnObject('outbreak_facility_stormtrooper_survivor', 'dathomir', long(0), float(-5783), float(510), float(-6552), float(0.38), float(0.85)) # Camp Alpha -5915, -6645 alphaguard1 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-5917), float(560), float(-6640), float(0.42), float(0.85)) @@ -51,5 +51,5 @@ def addPlanetSpawns(core, planet): # Camp Epsilon -7463 -7392 # Rancor Boss - rancorboss1 = stcSvc.spawnObject('outbreak_afflicted_rancor', 'dathomir', long(0), float(-7155), float(560), float(-6955), float(-1.29), float(0.85)) + #rancorboss1 = stcSvc.spawnObject('outbreak_afflicted_rancor', 'dathomir', long(0), float(-7155), float(560), float(-6955), float(-1.29), float(0.85)) return