diff --git a/scripts/mobiles/canon/storm_commando.py b/scripts/mobiles/canon/storm_commando.py deleted file mode 100644 index da0cf4fa..00000000 --- a/scripts/mobiles/canon/storm_commando.py +++ /dev/null @@ -1,34 +0,0 @@ -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('storm_commando') - mobileTemplate.setLevel(71) - mobileTemplate.setDifficulty(Difficulty.NORMAL) - - templates = Vector() - templates.add('object/mobile/shared_dressed_scout_trooper_black_black.iff') - mobileTemplate.setTemplates(templates) - - weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', WeaponType.PISTOL, 1.0, 24, 'energy') - weaponTemplates.add(weapontemplate) - weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_dx2.iff', WeaponType.PISTOL, 1.0, 24, 'energy') - weaponTemplates.add(weapontemplate) - mobileTemplate.setWeaponTemplateVector(weaponTemplates) - - - attacks = Vector() - mobileTemplate.setDefaultAttack('rangedShot') - mobileTemplate.setAttacks(attacks) - - core.spawnService.addMobileTemplate('storm_commando', mobileTemplate) - - return diff --git a/scripts/mobiles/canon/stormtrooper.py b/scripts/mobiles/canon/stormtrooper.py deleted file mode 100644 index 712c70dd..00000000 --- a/scripts/mobiles/canon/stormtrooper.py +++ /dev/null @@ -1,33 +0,0 @@ -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('stormtrooper') - mobileTemplate.setLevel(90) - mobileTemplate.setDifficulty(Difficulty.NORMAL) - - templates = Vector() - templates.add('object/mobile/shared_dressed_stormtrooper_m.iff') - mobileTemplate.setTemplates(templates) - - weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_e11.iff', WeaponType.RIFLE, 1.0, 24, 'energy') - weaponTemplates.add(weapontemplate) - weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_t21.iff', WeaponType.RIFLE, 1.0, 24, 'energy') - weaponTemplates.add(weapontemplate) - mobileTemplate.setWeaponTemplateVector(weaponTemplates) - - - attacks = Vector() - mobileTemplate.setDefaultAttack('rangedShot') - mobileTemplate.setAttacks(attacks) - - core.spawnService.addMobileTemplate('stormtrooper', mobileTemplate) - return \ No newline at end of file diff --git a/scripts/mobiles/canon/scout_trooper.py b/scripts/mobiles/generic/faction/imperial/scout_trooper.py similarity index 100% rename from scripts/mobiles/canon/scout_trooper.py rename to scripts/mobiles/generic/faction/imperial/scout_trooper.py diff --git a/scripts/mobiles/generic/faction/imperial/storm_commando.py b/scripts/mobiles/generic/faction/imperial/storm_commando.py index bee45122..da0cf4fa 100644 --- a/scripts/mobiles/generic/faction/imperial/storm_commando.py +++ b/scripts/mobiles/generic/faction/imperial/storm_commando.py @@ -4,40 +4,31 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options -from resources.datatables import FactionStatus from java.util import Vector - def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mission_storm_commando') - mobileTemplate.setLevel(29) + mobileTemplate.setCreatureName('storm_commando') + mobileTemplate.setLevel(71) mobileTemplate.setDifficulty(Difficulty.NORMAL) - mobileTemplate.setMinSpawnDistance(4) - mobileTemplate.setMaxSpawnDistance(8) - mobileTemplate.setDeathblow(True) - mobileTemplate.setScale(1) - mobileTemplate.setSocialGroup("imperial") - mobileTemplate.setAssistRange(6) - mobileTemplate.setStalker(True) - mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(FactionStatus.Combatant) - templates = Vector() - templates.add('object/mobile/shared_dressed_stormtrooper_commando_m.iff') - templates.add('object/mobile/shared_dressed_stormtrooper_commando1_m.iff') + templates.add('object/mobile/shared_dressed_scout_trooper_black_black.iff') mobileTemplate.setTemplates(templates) - + weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e11.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', WeaponType.PISTOL, 1.0, 24, 'energy') weaponTemplates.add(weapontemplate) + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_dx2.iff', WeaponType.PISTOL, 1.0, 24, 'energy') + weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) + attacks = Vector() mobileTemplate.setDefaultAttack('rangedShot') mobileTemplate.setAttacks(attacks) - core.spawnService.addMobileTemplate('stormcommando', mobileTemplate) - return \ No newline at end of file + core.spawnService.addMobileTemplate('storm_commando', mobileTemplate) + + return diff --git a/scripts/mobiles/generic/faction/imperial/stormtrooper.py b/scripts/mobiles/generic/faction/imperial/stormtrooper.py index b466d1d0..712c70dd 100644 --- a/scripts/mobiles/generic/faction/imperial/stormtrooper.py +++ b/scripts/mobiles/generic/faction/imperial/stormtrooper.py @@ -4,36 +4,27 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options -from resources.datatables import FactionStatus from java.util import Vector - def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mission_stormtrooper') - mobileTemplate.setLevel(3) + mobileTemplate.setCreatureName('stormtrooper') + mobileTemplate.setLevel(90) mobileTemplate.setDifficulty(Difficulty.NORMAL) - mobileTemplate.setMinSpawnDistance(4) - mobileTemplate.setMaxSpawnDistance(8) - mobileTemplate.setDeathblow(False) - mobileTemplate.setScale(1) - mobileTemplate.setSocialGroup("imperial") - mobileTemplate.setAssistRange(5) - mobileTemplate.setStalker(False) - mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(FactionStatus.Combatant) - templates = Vector() - templates.add('object/mobile/shared_stormtrooper.iff') + templates.add('object/mobile/shared_dressed_stormtrooper_m.iff') mobileTemplate.setTemplates(templates) - + weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e11.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_e11.iff', WeaponType.RIFLE, 1.0, 24, 'energy') weaponTemplates.add(weapontemplate) + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_t21.iff', WeaponType.RIFLE, 1.0, 24, 'energy') + weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) + attacks = Vector() mobileTemplate.setDefaultAttack('rangedShot') mobileTemplate.setAttacks(attacks) diff --git a/scripts/mobiles/canon/stormtrooper_squad_leader.py b/scripts/mobiles/generic/faction/imperial/stormtrooper_squad_leader.py similarity index 100% rename from scripts/mobiles/canon/stormtrooper_squad_leader.py rename to scripts/mobiles/generic/faction/imperial/stormtrooper_squad_leader.py diff --git a/scripts/mobiles/canon/swamp_trooper.py b/scripts/mobiles/generic/faction/imperial/swamp_trooper.py similarity index 100% rename from scripts/mobiles/canon/swamp_trooper.py rename to scripts/mobiles/generic/faction/imperial/swamp_trooper.py