From d5d3fa49f2e02eabb1326eee0de642a811c711ae Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sun, 2 Nov 2014 14:22:06 -0500 Subject: [PATCH 1/9] Fixed some warnings in ObjectService --- options.cfg | 2 +- src/services/object/ObjectService.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/options.cfg b/options.cfg index 6f466e49..6c88a6b9 100644 --- a/options.cfg +++ b/options.cfg @@ -28,4 +28,4 @@ DO.ISOLATION.TESTS=0 # Toggles GCW Invasions System. # 1 = On, 0 = Off. -ENABLE.INVASIONS=0 +ENABLE.INVASIONS=1 diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index ab0f4eae..857b54ac 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -1288,7 +1288,8 @@ public class ObjectService implements INetworkDispatch { if(! checkIfObjectAlreadyInList(object.getObjectID())) objectList.put(object.getObjectID(), object); } else { - Thread.currentThread().dumpStack(); + Thread.currentThread(); + Thread.dumpStack(); } }); @@ -1731,12 +1732,12 @@ public class ObjectService implements INetworkDispatch { } private void addCellsToBuildings(){ - Iterator it = null; + Iterator it = null; synchronized(buildingMap){ it = buildingMap.entrySet().iterator(); } while (it.hasNext()) { - Map.Entry pairs = (Map.Entry)it.next(); + Map.Entry pairs = (Map.Entry)it.next(); long buildingId = (long) pairs.getKey(); BuildingObject building = (BuildingObject)pairs.getValue(); //System.out.println("We have buildingId " +buildingId); From d0e22aeed6abbd0933ebf223855598d4a4e7e62b Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 8 Nov 2014 15:15:58 -0500 Subject: [PATCH 2/9] Changed invasions back to 0 --- options.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options.cfg b/options.cfg index 6c88a6b9..6f466e49 100644 --- a/options.cfg +++ b/options.cfg @@ -28,4 +28,4 @@ DO.ISOLATION.TESTS=0 # Toggles GCW Invasions System. # 1 = On, 0 = Off. -ENABLE.INVASIONS=1 +ENABLE.INVASIONS=0 From 842abb6d8789fc7025fba911e0b522350cb4100b Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 8 Nov 2014 15:19:12 -0500 Subject: [PATCH 3/9] Added cooldown to binoculars --- scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py b/scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py index 02df443d..ca6b996e 100644 --- a/scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py +++ b/scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py @@ -2,6 +2,7 @@ import sys def setup(core, object): object.setIntAttribute('no_trade', 1) + object.setIntAttribute('reuse_time', 5) object.setAttachment('radial_filename', 'object/usable') object.setStfFilename('static_item_n') object.setStfName('invasion_gcw_binoculars_01_01') From d90e9a97b8618327d979a641961b49b79fe3f034 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 8 Nov 2014 15:19:56 -0500 Subject: [PATCH 4/9] Added stats to blackwing crystal --- .../lightsaber/lightsaber_module_blackwing_crystal.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py index ccad8904..77e03485 100644 --- a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py +++ b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py @@ -1,4 +1,9 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setStringAttribute('condition', '100/100') + object.setStringAttribute('@obj_attr_n:color', 'Blackwing Bezoar') + object.setAttachment('radial_filename', 'item/tunable') + object.setStringAttribute('@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ') + return + \ No newline at end of file From 30917c1e0e8e27c1a72b417ab59e9fb828752aa1 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 8 Nov 2014 15:25:41 -0500 Subject: [PATCH 5/9] Removed protection from katarn armor This caused a bug with protection because the protection was already coded as shown here: https://github.com/ProjectSWGCore/NGECore2/tree/master/scripts/object/tangible/wearables/armor/clone_trooper --- scripts/character_builder_terminal.py | 50 +-------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 78901ad4..17d09fa7 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -595,6 +595,7 @@ def compositeArmor(owner, inventory): comp_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); comp_boots = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_boots.iff", owner.getPlanet()) comp_gloves = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_gloves.iff", owner.getPlanet()) + inventory.add(comp_bicep_r); inventory.add(comp_bicep_l); inventory.add(comp_bracer_r); @@ -610,60 +611,11 @@ def compositeArmor(owner, inventory): def clonetrooperArmor(owner, inventory): clonetrooper_bicep_r = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bicep_r.iff", owner.getPlanet()) - clonetrooper_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - clonetrooper_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - clonetrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - clonetrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - clonetrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - clonetrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - clonetrooper_bicep_l = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bicep_l.iff", owner.getPlanet()) - clonetrooper_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - clonetrooper_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - clonetrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - clonetrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - clonetrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - clonetrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - - clonetrooper_bracer_r = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bracer_r.iff", owner.getPlanet()) - clonetrooper_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - clonetrooper_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - clonetrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - clonetrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - clonetrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - clonetrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - clonetrooper_bracer_l = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bracer_l.iff", owner.getPlanet()) - clonetrooper_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - clonetrooper_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - clonetrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - clonetrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - clonetrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - clonetrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - clonetrooper_leggings = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_leggings.iff", owner.getPlanet()) - clonetrooper_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - clonetrooper_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - clonetrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - clonetrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - clonetrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - clonetrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - clonetrooper_helmet = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_helmet.iff", owner.getPlanet()) - clonetrooper_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - clonetrooper_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - clonetrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - clonetrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - clonetrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - clonetrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); - clonetrooper_chest = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_chest_plate.iff", owner.getPlanet()) - clonetrooper_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000); - clonetrooper_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000); - clonetrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000); - clonetrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000); - clonetrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000); - clonetrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000); clonetrooper_boots = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_boots.iff", owner.getPlanet()) clonetrooper_gloves = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_gloves.iff", owner.getPlanet()) From a7a4f781644520e3ed3ecd4fa7b978219e0e9776 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 8 Nov 2014 18:48:42 -0500 Subject: [PATCH 6/9] Added level 5 deathtroopers Started work on Quarantine zone NPCs. --- .../mobiles/dathomir/undead_deathtrooper.py | 90 +++++++++++++++++++ .../dynamicgroups/dathomir_quarantine_1.py | 16 ++++ ...ine_entrance.py => dathomir_quarantine.py} | 3 +- .../static_spawns/dathomir/placeholder.txt | 0 4 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 scripts/mobiles/dathomir/undead_deathtrooper.py create mode 100644 scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py rename scripts/mobiles/spawnareas/{dathomir_quarantine_entrance.py => dathomir_quarantine.py} (65%) delete mode 100644 scripts/static_spawns/dathomir/placeholder.txt diff --git a/scripts/mobiles/dathomir/undead_deathtrooper.py b/scripts/mobiles/dathomir/undead_deathtrooper.py new file mode 100644 index 00000000..7db73dd9 --- /dev/null +++ b/scripts/mobiles/dathomir/undead_deathtrooper.py @@ -0,0 +1,90 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('eow_outbreak_undead_deathtrooper') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(5) + mobileTemplate.setMaxSpawnDistance(10) + mobileTemplate.setDeathblow(True) + mobileTemplate.setSocialGroup('undead') + mobileTemplate.setAssistRange(12) + mobileTemplate.setRespawnTime(300) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_01_f.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_01_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_02_f.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_03_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_04_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_05_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_06_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_07_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_08_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_09_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_10_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_11_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_12_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_13_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_14_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_15_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_16_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_17_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_18_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_19_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_20_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_21_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_22_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_23_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_24_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_25_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_26_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_27_m.iff') + templates.add('object/mobile/shared_outbreak_undead_deathtrooper_28_m.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_e11', WeaponType.RIFLE, 0.8, 0, 'energy') + weaponTemplates.add(weapontemplate) + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.ONEHANDEDMELEE, 1.0, 4, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureRangedShot') + mobileTemplate.setDefaultAttack('creatureMeleeHit') + mobileTemplate.setAttacks(attacks) + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + mobileTemplate.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + mobileTemplate.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 3 + mobileTemplate.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + core.spawnService.addMobileTemplate('undead_deathtrooper', mobileTemplate) + + return \ No newline at end of file diff --git a/scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py b/scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py new file mode 100644 index 00000000..12dc55c4 --- /dev/null +++ b/scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py @@ -0,0 +1,16 @@ +import sys +from java.util import Vector +from services.spawn import DynamicSpawnGroup +from services.spawn import MobileTemplate + +def addDynamicGroup(core): + dynamicGroup = DynamicSpawnGroup() + mobileTemplates = Vector() + mobileTemplates.add('undead_deathtrooper') + dynamicGroup.setMobiles(mobileTemplates) + dynamicGroup.setGroupMembersNumber(5) + dynamicGroup.setName('dathomir_deathtroopers_1') + dynamicGroup.setMaxSpawns(-1) + dynamicGroup.setMinSpawnDistance(10) + core.spawnService.addDynamicGroup('dathomir_level_5_deathtroopers', dynamicGroup) + return diff --git a/scripts/mobiles/spawnareas/dathomir_quarantine_entrance.py b/scripts/mobiles/spawnareas/dathomir_quarantine.py similarity index 65% rename from scripts/mobiles/spawnareas/dathomir_quarantine_entrance.py rename to scripts/mobiles/spawnareas/dathomir_quarantine.py index 3660d7b6..1b18ad73 100644 --- a/scripts/mobiles/spawnareas/dathomir_quarantine_entrance.py +++ b/scripts/mobiles/spawnareas/dathomir_quarantine.py @@ -1,9 +1,8 @@ -# Spawn Area file created with PSWG Planetary Spawn Tool import sys from java.util import Vector def addSpawnArea(core): dynamicGroups = Vector() - dynamicGroups.add('dark_jedi_wild_1') + dynamicGroups.add('dathomir_level_5_deathtroopers') core.spawnService.addDynamicSpawnArea(dynamicGroups, -5700, -6478, 100, 'dathomir') return diff --git a/scripts/static_spawns/dathomir/placeholder.txt b/scripts/static_spawns/dathomir/placeholder.txt deleted file mode 100644 index e69de29b..00000000 From 9552da49dbb9706271b99c72cb7ed640235297d2 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 8 Nov 2014 18:59:05 -0500 Subject: [PATCH 7/9] Fixed invalid weapon --- scripts/mobiles/dathomir/undead_deathtrooper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mobiles/dathomir/undead_deathtrooper.py b/scripts/mobiles/dathomir/undead_deathtrooper.py index 7db73dd9..bf2c3dd8 100644 --- a/scripts/mobiles/dathomir/undead_deathtrooper.py +++ b/scripts/mobiles/dathomir/undead_deathtrooper.py @@ -54,7 +54,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_e11', WeaponType.RIFLE, 0.8, 0, 'energy') + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_e11.iff', WeaponType.RIFLE, 0.8, 0, 'energy') weaponTemplates.add(weapontemplate) weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.ONEHANDEDMELEE, 1.0, 4, 'kinetic') weaponTemplates.add(weapontemplate) From 360262765822991c8be81e35c2acba2cf6e01fb4 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 8 Nov 2014 19:18:19 -0500 Subject: [PATCH 8/9] Changed deathtrooper loot, aggro/assist range and attacks --- .../mobiles/dathomir/undead_deathtrooper.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/scripts/mobiles/dathomir/undead_deathtrooper.py b/scripts/mobiles/dathomir/undead_deathtrooper.py index bf2c3dd8..e3ff624f 100644 --- a/scripts/mobiles/dathomir/undead_deathtrooper.py +++ b/scripts/mobiles/dathomir/undead_deathtrooper.py @@ -9,7 +9,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('eow_outbreak_undead_deathtrooper') + mobileTemplate.setCreatureName('eow_outbreak_undead_deathtrooper') ##TODO: Needs correct stf name mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(Difficulty.NORMAL) @@ -17,7 +17,7 @@ def addTemplate(core): mobileTemplate.setMaxSpawnDistance(10) mobileTemplate.setDeathblow(True) mobileTemplate.setSocialGroup('undead') - mobileTemplate.setAssistRange(12) + mobileTemplate.setAssistRange(15) mobileTemplate.setRespawnTime(300) mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE) @@ -61,8 +61,8 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureRangedShot') - mobileTemplate.setDefaultAttack('creatureMeleeHit') + mobileTemplate.setDefaultAttack('RangedShot') + mobileTemplate.setDefaultAttack('MeleeHit') mobileTemplate.setAttacks(attacks) lootPoolNames_1 = ['Junk'] @@ -70,20 +70,10 @@ def addTemplate(core): lootGroupChance_1 = 65 mobileTemplate.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) - lootPoolNames_2 = ['jedi_relic_1'] - lootPoolChances_2 = [100] - lootGroupChance_2 = 85 - mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) - lootPoolNames_4 = ['random_stat_jewelry'] lootPoolChances_4 = [100] lootGroupChance_4 = 8 mobileTemplate.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) - - lootPoolNames_5 = ['sithholocrons'] - lootPoolChances_5 = [100] - lootGroupChance_5 = 3 - mobileTemplate.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) core.spawnService.addMobileTemplate('undead_deathtrooper', mobileTemplate) From bd33445757b4363e43bd3b1231a6ed2748aa8d73 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 8 Nov 2014 19:18:31 -0500 Subject: [PATCH 9/9] Added more static spawn areas for deathtroopers --- scripts/mobiles/spawnareas/dathomir_quarantine.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/mobiles/spawnareas/dathomir_quarantine.py b/scripts/mobiles/spawnareas/dathomir_quarantine.py index 1b18ad73..5b8f0b6f 100644 --- a/scripts/mobiles/spawnareas/dathomir_quarantine.py +++ b/scripts/mobiles/spawnareas/dathomir_quarantine.py @@ -4,5 +4,9 @@ from java.util import Vector def addSpawnArea(core): dynamicGroups = Vector() dynamicGroups.add('dathomir_level_5_deathtroopers') - core.spawnService.addDynamicSpawnArea(dynamicGroups, -5700, -6478, 100, 'dathomir') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -5700, -6500, 100, 'dathomir') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -5640, -6550, 100, 'dathomir') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -5850, -6400, 100, 'dathomir') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -5800, -6500, 100, 'dathomir') + core.spawnService.addDynamicSpawnArea(dynamicGroups, -5600, -6525, 100, 'dathomir') return