From a96352df9b75abbadcddfc9e14f460b6556c3452 Mon Sep 17 00:00:00 2001 From: tacef Date: Sat, 26 Apr 2014 09:27:31 +0200 Subject: [PATCH 01/29] Naboo House Deed's added Also fixed typos corellia house deed's --- .../player_house_corellia_large_style_01.py | 2 +- .../player_house_corellia_large_style_02.py | 5 ++--- .../player_house_corellia_medium_style_01.py | 1 + .../houses/player_house_naboo_large_style_01.py | 15 +++++++++++++++ .../houses/player_house_naboo_medium_style_01.py | 14 ++++++++++++++ .../houses/player_house_naboo_small_style_01.py | 14 ++++++++++++++ .../houses/player_house_naboo_small_style_02.py | 14 ++++++++++++++ .../player_house_naboo_small_window_style_01.py | 14 ++++++++++++++ .../player/player_house_naboo_large_style_01.py | 7 +++++++ .../player/player_house_naboo_medium_style_01.py | 7 +++++++ .../player/player_house_naboo_small_style_01.py | 7 +++++++ .../player/player_house_naboo_small_style_02.py | 7 +++++++ .../player_house_naboo_small_window_style_01.py | 7 +++++++ .../player_house_deed/naboo_house_large_deed.py | 11 ++++++++++- .../player_house_deed/naboo_house_medium_deed.py | 8 ++++++++ .../player_house_deed/naboo_house_small_deed.py | 8 ++++++++ .../naboo_house_small_style_02_deed.py | 8 ++++++++ .../naboo_house_small_window_deed.py | 8 ++++++++ 18 files changed, 152 insertions(+), 5 deletions(-) create mode 100644 scripts/houses/player_house_naboo_large_style_01.py create mode 100644 scripts/houses/player_house_naboo_medium_style_01.py create mode 100644 scripts/houses/player_house_naboo_small_style_01.py create mode 100644 scripts/houses/player_house_naboo_small_style_02.py create mode 100644 scripts/houses/player_house_naboo_small_window_style_01.py diff --git a/scripts/houses/player_house_corellia_large_style_01.py b/scripts/houses/player_house_corellia_large_style_01.py index c47098c5..44d9fd81 100644 --- a/scripts/houses/player_house_corellia_large_style_01.py +++ b/scripts/houses/player_house_corellia_large_style_01.py @@ -3,7 +3,7 @@ from services.housing import HouseTemplate from engine.resources.scene import Point3D def setup(core): - houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_large_deed.iff", "object/building/player/shared_player_house_corellia_large_style_01.iff", 2) + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_large_deed.iff", "object/building/player/shared_player_house_corellia_large_style_01.iff", 5) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4))) houseTemplate.addPlaceablePlanet("corellia") diff --git a/scripts/houses/player_house_corellia_large_style_02.py b/scripts/houses/player_house_corellia_large_style_02.py index 6e005a55..7d35d0de 100644 --- a/scripts/houses/player_house_corellia_large_style_02.py +++ b/scripts/houses/player_house_corellia_large_style_02.py @@ -3,12 +3,11 @@ from services.housing import HouseTemplate from engine.resources.scene import Point3D def setup(core): - houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.iff", 2) + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.iff", 5) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1))) houseTemplate.addPlaceablePlanet("corellia") houseTemplate.addPlaceablePlanet("talus") - houseTemplate.setDefaultItemLimit(500) - + houseTemplate.setDefaultItemLimit(500) core.housingService.addHousingTemplate(houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_medium_style_01.py b/scripts/houses/player_house_corellia_medium_style_01.py index d8a293c7..27988156 100644 --- a/scripts/houses/player_house_corellia_medium_style_01.py +++ b/scripts/houses/player_house_corellia_medium_style_01.py @@ -6,6 +6,7 @@ def setup(core): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_medium_deed.iff", "object/building/player/shared_player_house_corellia_medium_style_01.iff", 2) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3),float(2.26),float(7.7))) + houseTemplate.addPlaceablePlanet("corellia") houseTemplate.addPlaceablePlanet("talus") houseTemplate.setDefaultItemLimit(200) core.housingService.addHousingTemplate(houseTemplate) diff --git a/scripts/houses/player_house_naboo_large_style_01.py b/scripts/houses/player_house_naboo_large_style_01.py new file mode 100644 index 00000000..afaf05dd --- /dev/null +++ b/scripts/houses/player_house_naboo_large_style_01.py @@ -0,0 +1,15 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_large_deed.iff", "object/building/player/shared_player_house_naboo_large_style_01.iff", 5) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7), float(3), float(-15.5))) + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_naboo_medium_style_01.py b/scripts/houses/player_house_naboo_medium_style_01.py new file mode 100644 index 00000000..fd16fd70 --- /dev/null +++ b/scripts/houses/player_house_naboo_medium_style_01.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_medium_deed.iff", "object/building/player/shared_player_house_naboo_medium_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-2.2),float(3),float(-11.5))) + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_naboo_small_style_01.py b/scripts/houses/player_house_naboo_small_style_01.py new file mode 100644 index 00000000..eb092bce --- /dev/null +++ b/scripts/houses/player_house_naboo_small_style_01.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_deed.iff", "object/building/player/shared_player_house_naboo_small_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2))) + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_naboo_small_style_02.py b/scripts/houses/player_house_naboo_small_style_02.py new file mode 100644 index 00000000..f5f35f0f --- /dev/null +++ b/scripts/houses/player_house_naboo_small_style_02.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_style_02_deed.iff", "object/building/player/shared_player_house_naboo_small_style_02.iff", 1) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(8.4),float(3),float(7.2))) + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(100) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_naboo_small_window_style_01.py b/scripts/houses/player_house_naboo_small_window_style_01.py new file mode 100644 index 00000000..7ffa7dec --- /dev/null +++ b/scripts/houses/player_house_naboo_small_window_style_01.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_window_deed.iff", "object/building/player/shared_player_house_naboo_small_window_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2))) + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_naboo_large_style_01.py b/scripts/object/building/player/player_house_naboo_large_style_01.py index ccad8904..7a05615e 100644 --- a/scripts/object/building/player/player_house_naboo_large_style_01.py +++ b/scripts/object/building/player/player_house_naboo_large_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -7, 3, -15.5, 0, 1, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 14.8, 4.5, -1.8, 0.707108, -0.707108, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_naboo_medium_style_01.py b/scripts/object/building/player/player_house_naboo_medium_style_01.py index ccad8904..fd60d18b 100644 --- a/scripts/object/building/player/player_house_naboo_medium_style_01.py +++ b/scripts/object/building/player/player_house_naboo_medium_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -2.2, 3, -11.5, 1, 1, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 9.8, 0.7, -10.4, 0, 1, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_naboo_small_style_01.py b/scripts/object/building/player/player_house_naboo_small_style_01.py index ccad8904..cacc9a2a 100644 --- a/scripts/object/building/player/player_house_naboo_small_style_01.py +++ b/scripts/object/building/player/player_house_naboo_small_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.7, 3, -8.2, 0, 1, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 0, 0.7, 6.2, 1, 0, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_naboo_small_style_02.py b/scripts/object/building/player/player_house_naboo_small_style_02.py index ccad8904..90382dc1 100644 --- a/scripts/object/building/player/player_house_naboo_small_style_02.py +++ b/scripts/object/building/player/player_house_naboo_small_style_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 8.4, 3, 7.2, 0.2, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 0.4, 0.5, 6.2, 1, 0, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_naboo_small_window_style_01.py b/scripts/object/building/player/player_house_naboo_small_window_style_01.py index ccad8904..cacc9a2a 100644 --- a/scripts/object/building/player/player_house_naboo_small_window_style_01.py +++ b/scripts/object/building/player/player_house_naboo_small_window_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.7, 3, -8.2, 0, 1, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 0, 0.7, 6.2, 1, 0, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_large_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_large_deed.py index ccad8904..0f0a6353 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_large_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_large_deed.py @@ -1,4 +1,13 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_naboo_large_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_large_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + + + + diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_medium_deed.py index ccad8904..22d9b33e 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_medium_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_medium_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_naboo_medium_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_medium_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_deed.py index ccad8904..edff2158 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_naboo_small_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_small_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_style_02_deed.py index ccad8904..adeca170 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_naboo_small_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_small_style_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_window_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_window_deed.py index ccad8904..8ebc7feb 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_window_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_window_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_player_house_naboo_small_window_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_small_window_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file From 3e5e748d6b6c9b5d092143bf5f512583afbb1aa0 Mon Sep 17 00:00:00 2001 From: tacef Date: Sat, 26 Apr 2014 15:19:44 +0200 Subject: [PATCH 02/29] Continued Work on Playerhouse deed Altered Objectservice again to support storyteller house deeds --- scripts/houses/player_house_sandcrawler.py | 19 +++++++++++++++++++ .../player_house_tatooine_large_style_01.py | 15 +++++++++++++++ .../player_house_tatooine_medium_style_01.py | 14 ++++++++++++++ .../player_house_tatooine_small_style_01.py | 14 ++++++++++++++ .../player_house_tatooine_small_style_02.py | 14 ++++++++++++++ ...er_house_tatooine_small_window_style_01.py | 14 ++++++++++++++ .../player/player_house_sandcrawler.py | 8 ++++++++ .../player_house_tatooine_large_style_01.py | 7 +++++++ .../player_house_tatooine_medium_style_01.py | 7 +++++++ .../player_house_tatooine_small_style_01.py | 7 +++++++ .../player_house_tatooine_small_style_02.py | 7 +++++++ ...er_house_tatooine_small_window_style_01.py | 7 +++++++ .../tatooine_house_large_deed.py | 8 ++++++++ .../tatooine_house_medium_deed.py | 8 ++++++++ .../tatooine_house_small_deed.py | 8 ++++++++ .../tatooine_house_small_style_02_deed.py | 8 ++++++++ .../tatooine_house_window_small_deed.py | 8 ++++++++ ...structure_deed_player_house_sandcrawler.py | 8 ++++++++ src/services/object/ObjectService.java | 2 +- 19 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 scripts/houses/player_house_sandcrawler.py create mode 100644 scripts/houses/player_house_tatooine_large_style_01.py create mode 100644 scripts/houses/player_house_tatooine_medium_style_01.py create mode 100644 scripts/houses/player_house_tatooine_small_style_01.py create mode 100644 scripts/houses/player_house_tatooine_small_style_02.py create mode 100644 scripts/houses/player_house_tatooine_small_window_style_01.py diff --git a/scripts/houses/player_house_sandcrawler.py b/scripts/houses/player_house_sandcrawler.py new file mode 100644 index 00000000..c14d2b8c --- /dev/null +++ b/scripts/houses/player_house_sandcrawler.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff", "object/building/player/shared_player_house_sandcrawler.iff", 3) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-8.75), float(3.86), float(1))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(350) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_large_style_01.py b/scripts/houses/player_house_tatooine_large_style_01.py new file mode 100644 index 00000000..3085eb20 --- /dev/null +++ b/scripts/houses/player_house_tatooine_large_style_01.py @@ -0,0 +1,15 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_large_deed.iff", "object/building/player/shared_player_house_tatooine_large_style_01.iff", 5) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-3), float(3), float(15.8))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_medium_style_01.py b/scripts/houses/player_house_tatooine_medium_style_01.py new file mode 100644 index 00000000..d173048d --- /dev/null +++ b/scripts/houses/player_house_tatooine_medium_style_01.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_medium_deed.iff", "object/building/player/shared_player_house_tatooine_medium_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(4.3),float(2.26),float(12.5))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_small_style_01.py b/scripts/houses/player_house_tatooine_small_style_01.py new file mode 100644 index 00000000..eff8a21d --- /dev/null +++ b/scripts/houses/player_house_tatooine_small_style_01.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(7.9))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_small_style_02.py b/scripts/houses/player_house_tatooine_small_style_02.py new file mode 100644 index 00000000..e5484c22 --- /dev/null +++ b/scripts/houses/player_house_tatooine_small_style_02.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_style_02_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_small_window_style_01.py b/scripts/houses/player_house_tatooine_small_window_style_01.py new file mode 100644 index 00000000..eff8a21d --- /dev/null +++ b/scripts/houses/player_house_tatooine_small_window_style_01.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(7.9))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_sandcrawler.py b/scripts/object/building/player/player_house_sandcrawler.py index ccad8904..3d2f2529 100644 --- a/scripts/object/building/player/player_house_sandcrawler.py +++ b/scripts/object/building/player/player_house_sandcrawler.py @@ -1,4 +1,12 @@ import sys +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -8.75, 3.86, 1, 0.5, 0.5, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 6, 3.5, 0.7, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_tatooine_large_style_01.py b/scripts/object/building/player/player_house_tatooine_large_style_01.py index ccad8904..89f9d082 100644 --- a/scripts/object/building/player/player_house_tatooine_large_style_01.py +++ b/scripts/object/building/player/player_house_tatooine_large_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -3, 3, 15.8, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 9, 0.5, 12, 1, 0, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_tatooine_medium_style_01.py b/scripts/object/building/player/player_house_tatooine_medium_style_01.py index ccad8904..3b5cb8e9 100644 --- a/scripts/object/building/player/player_house_tatooine_medium_style_01.py +++ b/scripts/object/building/player/player_house_tatooine_medium_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 4.3, 2.26, 12.5, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 4, 0.5, 6.5, 1, 0, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_tatooine_small_style_01.py b/scripts/object/building/player/player_house_tatooine_small_style_01.py index ccad8904..2c07f46e 100644 --- a/scripts/object/building/player/player_house_tatooine_small_style_01.py +++ b/scripts/object/building/player/player_house_tatooine_small_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.7, 3, 7.9, 1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -6, 0.7, 6.2, 1, 0, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_tatooine_small_style_02.py b/scripts/object/building/player/player_house_tatooine_small_style_02.py index ccad8904..f4846b69 100644 --- a/scripts/object/building/player/player_house_tatooine_small_style_02.py +++ b/scripts/object/building/player/player_house_tatooine_small_style_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 4, 3, 7.6, 1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -6, 0.7, 6.2, 1, 0, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_tatooine_small_window_style_01.py b/scripts/object/building/player/player_house_tatooine_small_window_style_01.py index ccad8904..2c07f46e 100644 --- a/scripts/object/building/player/player_house_tatooine_small_window_style_01.py +++ b/scripts/object/building/player/player_house_tatooine_small_window_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.7, 3, 7.9, 1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -6, 0.7, 6.2, 1, 0, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_large_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_large_deed.py index ccad8904..7110ddc2 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_large_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_large_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_large_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_large_deed.iff') + object.setLotRequirement(5) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_deed.py index ccad8904..b9918233 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_tatooine_medium_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_medium_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_deed.py index ccad8904..dd23d101 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_tatooine_small_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_style_02_deed.py index ccad8904..31de820d 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_tatooine_house_small_style_02_deed.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_window_small_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_window_small_deed.py index ccad8904..8f52a919 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_window_small_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_window_small_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_tatooine_small_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_window_small_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.py b/scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.py index ccad8904..5a653b5c 100644 --- a/scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.py +++ b/scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/shared_construction_structure.iff') + object.setStructureTemplate('object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff') + object.setLotRequirement(5) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 1ae312c9..7ca96482 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -334,7 +334,7 @@ public class ObjectService implements INetworkDispatch { object = new Harvester_Deed(objectID, planet, Template, position, orientation); - } else if(Template.startsWith("object/tangible/deed/player_house_deed") || Template.startsWith("object/tangible/deed/guild_deed") || Template.startsWith("object/tangible/deed/city_deed") || Template.startsWith("object/tangible/tcg")) { + } else if(Template.startsWith("object/tangible/deed/player_house_deed") || Template.startsWith("object/tangible/deed/guild_deed") || Template.startsWith("object/tangible/deed/city_deed") || Template.startsWith("object/tangible/tcg") || Template.startsWith("object/tangible/saga_system")) { object = new Player_House_Deed(objectID, planet, Template, position, orientation); From caf9bf2f4b78493ed851a2fbdd2c8bfd79a1c471 Mon Sep 17 00:00:00 2001 From: tacef Date: Sat, 26 Apr 2014 15:40:12 +0200 Subject: [PATCH 03/29] Updated Objectservice to just load playerdeed out of TCG and Saga_system --- src/services/object/ObjectService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 7ca96482..3209d650 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -334,7 +334,7 @@ public class ObjectService implements INetworkDispatch { object = new Harvester_Deed(objectID, planet, Template, position, orientation); - } else if(Template.startsWith("object/tangible/deed/player_house_deed") || Template.startsWith("object/tangible/deed/guild_deed") || Template.startsWith("object/tangible/deed/city_deed") || Template.startsWith("object/tangible/tcg") || Template.startsWith("object/tangible/saga_system")) { + } else if(Template.startsWith("object/tangible/deed/player_house_deed") || Template.startsWith("object/tangible/deed/guild_deed") || Template.startsWith("object/tangible/deed/city_deed") || Template.startsWith("object/tangible/tcg/series3/shared_structure_deed_sith_meditation_room_deed.iff") || Template.startsWith("object/tangible/tcg/series5/shared_structure_deed_player_house_atat.iff") || Template.startsWith("object/tangible/tcg/series5/shared_structure_deed_player_house_hangar.iff") || Template.startsWith("object/tangible/tcg/series3/shared_structure_deed_jedi_meditation_room_deed.iff") || Template.startsWith("object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff")) { object = new Player_House_Deed(objectID, planet, Template, position, orientation); From 8afe1e4af1b8970741d51fab711a625f81e478ae Mon Sep 17 00:00:00 2001 From: Treeku Date: Sat, 26 Apr 2014 16:15:26 +0100 Subject: [PATCH 04/29] Fixed agility.py issue --- scripts/skillMods/agility.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/skillMods/agility.py b/scripts/skillMods/agility.py index 3ea2c7a9..7978281a 100644 --- a/scripts/skillMods/agility.py +++ b/scripts/skillMods/agility.py @@ -1,14 +1,14 @@ import sys -def add(core, actor, skillMod, value): - core.skillModService.addSkillMod('display_only_dodge', skillMod.getBase()) - core.skillModService.addSkillMod('display_only_parry', skillMod.getBase() / 2) - core.skillModService.addSkillMod('display_only_evasion', skillMod.getBase()) +def add(core, actor, skillMod, divisor): + core.skillModService.addSkillMod(actor, 'display_only_dodge', skillMod.getBase()) + core.skillModService.addSkillMod(actor, 'display_only_parry', skillMod.getBase() / 2) + core.skillModService.addSkillMod(actor, 'display_only_evasion', skillMod.getBase()) return -def deduct(core, actor, skillMod, value): - core.skillModService.deductSkillMod('display_only_dodge', skillMod.getBase()) - core.skillModService.deductSkillMod('display_only_parry', skillMod.getBase() / 2) - core.skillModService.deductSkillMod('display_only_evasion', skillMod.getBase()) +def deduct(core, actor, skillMod, divisor): + core.skillModService.deductSkillMod(actor, 'display_only_dodge', skillMod.getBase()) + core.skillModService.deductSkillMod(actor, 'display_only_parry', skillMod.getBase() / 2) + core.skillModService.deductSkillMod(actor, 'display_only_evasion', skillMod.getBase()) return - \ No newline at end of file + From 4c29a54689995880e31db2f567e72d10d1cb3517 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sat, 26 Apr 2014 19:22:50 +0200 Subject: [PATCH 05/29] Bounty Hunter - Fixed Dread Strike expertise It was granting unused abilities --- scripts/expertise/expertise_bh_dread_strike_1.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/scripts/expertise/expertise_bh_dread_strike_1.py b/scripts/expertise/expertise_bh_dread_strike_1.py index ae817cd0..8b2f96c9 100644 --- a/scripts/expertise/expertise_bh_dread_strike_1.py +++ b/scripts/expertise/expertise_bh_dread_strike_1.py @@ -1,22 +1,9 @@ import sys def addAbilities(core, actor, player): - if actor.getLevel() >= 26: - actor.addAbility("bh_dread_strike_1") - if actor.getLevel() >= 34: - actor.addAbility("bh_dread_strike_2") - if actor.getLevel() >= 48: - actor.addAbility("bh_dread_strike_3") - if actor.getLevel() >= 62: - actor.addAbility("bh_dread_strike_4") - if actor.getLevel() >= 76: - actor.addAbility("bh_dread_strike_5") + actor.addAbility("bh_dread_strike_1") return def removeAbilities(core, actor, player): actor.removeAbility("bh_dread_strike_1") - actor.removeAbility("bh_dread_strike_2") - actor.removeAbility("bh_dread_strike_3") - actor.removeAbility("bh_dread_strike_4") - actor.removeAbility("bh_dread_strike_5") return From ec2e010c7e0555db6aef75787810203c2461eb36 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sat, 26 Apr 2014 19:23:55 +0200 Subject: [PATCH 06/29] Bounty Hunter - Fixed Fumble expertise Was granting unused abilities that were removed in a BH expertise revamp. --- scripts/expertise/expertise_bh_fumble_1.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/scripts/expertise/expertise_bh_fumble_1.py b/scripts/expertise/expertise_bh_fumble_1.py index c9f10511..f39cdd09 100644 --- a/scripts/expertise/expertise_bh_fumble_1.py +++ b/scripts/expertise/expertise_bh_fumble_1.py @@ -1,25 +1,9 @@ import sys def addAbilities(core, actor, player): - if actor.getLevel() >= 26: - actor.addAbility("bh_fumble_1") - if actor.getLevel() >= 34: - actor.addAbility("bh_fumble_2") - if actor.getLevel() >= 48: - actor.addAbility("bh_fumble_3") - if actor.getLevel() >= 62: - actor.addAbility("bh_fumble_4") - if actor.getLevel() >= 76: - actor.addAbility("bh_fumble_5") - if actor.getLevel() >= 90: - actor.addAbility("bh_fumble_6") + actor.addAbility("bh_fumble_1") return def removeAbilities(core, actor, player): actor.removeAbility("bh_fumble_1") - actor.removeAbility("bh_fumble_2") - actor.removeAbility("bh_fumble_3") - actor.removeAbility("bh_fumble_4") - actor.removeAbility("bh_fumble_5") - actor.removeAbility("bh_fumble_6") return From 114bcd85e521bf9e0f49a8947fe854fc7e73c750 Mon Sep 17 00:00:00 2001 From: tacef Date: Sat, 26 Apr 2014 20:10:11 +0200 Subject: [PATCH 07/29] Added more House deeds Also fixed structureterminal positions in Cityhalls. (need testing) --- .../houses/player_house_tcg_8_bespin_house.py | 19 +++++++++++++++++++ .../houses/player_merchant_tent_style_01.py | 18 ++++++++++++++++++ .../houses/player_merchant_tent_style_02.py | 18 ++++++++++++++++++ .../houses/player_merchant_tent_style_03.py | 18 ++++++++++++++++++ .../building/player/city/cityhall_corellia.py | 2 +- .../building/player/city/cityhall_naboo.py | 3 +-- .../building/player/city/cityhall_tatooine.py | 2 +- .../player/player_house_tcg_8_bespin_house.py | 7 +++++++ .../player/player_merchant_tent_style_01.py | 7 +++++++ .../player/player_merchant_tent_style_02.py | 7 +++++++ .../player/player_merchant_tent_style_03.py | 7 +++++++ .../merchant_tent_style_01_deed.py | 8 ++++++++ .../merchant_tent_style_02_deed.py | 8 ++++++++ .../merchant_tent_style_03_deed.py | 8 ++++++++ .../player_house_tcg_8_bespin_house_deed.py | 8 ++++++++ 15 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 scripts/houses/player_house_tcg_8_bespin_house.py create mode 100644 scripts/houses/player_merchant_tent_style_01.py create mode 100644 scripts/houses/player_merchant_tent_style_02.py create mode 100644 scripts/houses/player_merchant_tent_style_03.py diff --git a/scripts/houses/player_house_tcg_8_bespin_house.py b/scripts/houses/player_house_tcg_8_bespin_house.py new file mode 100644 index 00000000..c7ac7d0b --- /dev/null +++ b/scripts/houses/player_house_tcg_8_bespin_house.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_player_house_tcg_8_bespin_house_deed.iff", "object/building/player/shared_player_house_tcg_8_bespin_house.iff", 3) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(0), float(2.86), float(-3.5))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(350) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_merchant_tent_style_01.py b/scripts/houses/player_merchant_tent_style_01.py new file mode 100644 index 00000000..3eef6c91 --- /dev/null +++ b/scripts/houses/player_merchant_tent_style_01.py @@ -0,0 +1,18 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_01_deed.iff", "object/building/player/shared_player_merchant_tent_style_01.iff", 1) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_merchant_tent_style_02.py b/scripts/houses/player_merchant_tent_style_02.py new file mode 100644 index 00000000..811c5a5e --- /dev/null +++ b/scripts/houses/player_merchant_tent_style_02.py @@ -0,0 +1,18 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_02_deed.iff", "object/building/player/shared_player_merchant_tent_style_02.iff", 1) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_merchant_tent_style_03.py b/scripts/houses/player_merchant_tent_style_03.py new file mode 100644 index 00000000..d908b947 --- /dev/null +++ b/scripts/houses/player_merchant_tent_style_03.py @@ -0,0 +1,18 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_03_deed.iff", "object/building/player/shared_player_merchant_tent_style_03.iff", 1) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/object/building/player/city/cityhall_corellia.py b/scripts/object/building/player/city/cityhall_corellia.py index 161f75e3..6b2cbced 100644 --- a/scripts/object/building/player/city/cityhall_corellia.py +++ b/scripts/object/building/player/city/cityhall_corellia.py @@ -7,7 +7,7 @@ def setup(core, object): print(sign) object.setAttachment("structureSign", sign) - structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4) + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -17.2, 1.5 , 8, 1, 0 ,4) #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') structureterminal.setAttachment('housing_parentstruct', object) diff --git a/scripts/object/building/player/city/cityhall_naboo.py b/scripts/object/building/player/city/cityhall_naboo.py index 161f75e3..4e456185 100644 --- a/scripts/object/building/player/city/cityhall_naboo.py +++ b/scripts/object/building/player/city/cityhall_naboo.py @@ -7,10 +7,9 @@ def setup(core, object): print(sign) object.setAttachment("structureSign", sign) - structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4) + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -17.2, 1.5 , 8, 1, 0 ,4) #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') structureterminal.setAttachment('housing_parentstruct', object) - cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5) #cityterminal.setAttachment('housing_parentstruct', object) diff --git a/scripts/object/building/player/city/cityhall_tatooine.py b/scripts/object/building/player/city/cityhall_tatooine.py index 161f75e3..6b2cbced 100644 --- a/scripts/object/building/player/city/cityhall_tatooine.py +++ b/scripts/object/building/player/city/cityhall_tatooine.py @@ -7,7 +7,7 @@ def setup(core, object): print(sign) object.setAttachment("structureSign", sign) - structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4) + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -17.2, 1.5 , 8, 1, 0 ,4) #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') structureterminal.setAttachment('housing_parentstruct', object) diff --git a/scripts/object/building/player/player_house_tcg_8_bespin_house.py b/scripts/object/building/player/player_house_tcg_8_bespin_house.py index ccad8904..2c07f46e 100644 --- a/scripts/object/building/player/player_house_tcg_8_bespin_house.py +++ b/scripts/object/building/player/player_house_tcg_8_bespin_house.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.7, 3, 7.9, 1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -6, 0.7, 6.2, 1, 0, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_merchant_tent_style_01.py b/scripts/object/building/player/player_merchant_tent_style_01.py index ccad8904..4f29b4f2 100644 --- a/scripts/object/building/player/player_merchant_tent_style_01.py +++ b/scripts/object/building/player/player_merchant_tent_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/shared_streetsign_upright_style_01.iff', 3.5, -0.3, 3.5, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -3.4, 0.5, 0, 0.7, 0.7, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_merchant_tent_style_02.py b/scripts/object/building/player/player_merchant_tent_style_02.py index ccad8904..4f29b4f2 100644 --- a/scripts/object/building/player/player_merchant_tent_style_02.py +++ b/scripts/object/building/player/player_merchant_tent_style_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/shared_streetsign_upright_style_01.iff', 3.5, -0.3, 3.5, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -3.4, 0.5, 0, 0.7, 0.7, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_merchant_tent_style_03.py b/scripts/object/building/player/player_merchant_tent_style_03.py index ccad8904..4f29b4f2 100644 --- a/scripts/object/building/player/player_merchant_tent_style_03.py +++ b/scripts/object/building/player/player_merchant_tent_style_03.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/shared_streetsign_upright_style_01.iff', 3.5, -0.3, 3.5, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -3.4, 0.5, 0, 0.7, 0.7, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_01_deed.py b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_01_deed.py index ccad8904..39fa9d08 100644 --- a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_01_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_01_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_merchant_tent_style_01_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_02_deed.py index ccad8904..387a8928 100644 --- a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_merchant_tent_style_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_03_deed.py b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_03_deed.py index ccad8904..38c8003f 100644 --- a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_03_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_03_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_merchant_tent_style_03_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.py b/scripts/object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.py index ccad8904..937edeb4 100644 --- a/scripts/object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_player_house_tcg_8_bespin_house_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file From 983c94c692af40cd3d562bbb2415a9765c4b0ff1 Mon Sep 17 00:00:00 2001 From: tacef Date: Sat, 26 Apr 2014 21:46:32 +0200 Subject: [PATCH 08/29] Started Work on Imperial Recruiter --- scripts/conversation/imp_recruiter.py | 147 ++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 scripts/conversation/imp_recruiter.py diff --git a/scripts/conversation/imp_recruiter.py b/scripts/conversation/imp_recruiter.py new file mode 100644 index 00000000..9b6af43c --- /dev/null +++ b/scripts/conversation/imp_recruiter.py @@ -0,0 +1,147 @@ +from resources.common import ConversationOption +from resources.common import OutOfBand +from resources.common import ProsePackage +from resources.common import RadialOptions +from resources.datatables import PvpStatus +from resources.datatables import FactionStatus + +from services.sui import SUIWindow +from services.sui.SUIWindow import Trigger + +from java.util import Vector +import sys + + +impRecruiterRef = 0 + + +def startConversation(core, actor, npc): + global coreRef + global impRecruiterRef + coreRef = core + impRecruiterRef = npc + convSvc = core.conversationService + faction = actor.getFaction() + factionStatus = actor.getFactionStatus() + + if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial': + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_414') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_428') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_85') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_70') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + return + + if actor.getFaction == 'imperial' and actor.getFactionstatus == FactionStatus.OnLeave: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_80') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_49') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_410') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_324') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + return + + if actor.getFaction() == 'rebel': + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_306') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + return + +def handleFirstScreen(core, actor, npc, selection): + + convSvc = core.conversationService + if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial': + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_432') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_434') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_55') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + + + if selection == 1: + return + + if selection == 2: + convSvc.sendConversationOptions(actor, npc, options, endConversation) + return + return + + +def handleSecondScreen(core, actor, npc, selection): + convSvc = core.conversationService + + + + if selection == 0: + actor.setFaction('imperial') + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_116') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_117') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + option1 = ConversationOption(outOfBand2, 0) + + + options = Vector() + options.add(option1) + + + convSvc.sendConversationOptions(actor, npc, options, endConversation) + return + + +def endConversation(core, actor, npc): + if actor.getFaction() == 'rebel': + npc.playEffectObject('all_b_emt_backhand', '') + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_308') + else: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_100') + return \ No newline at end of file From 3e02e080cf485e254f820f75d7591c32c1b3a145 Mon Sep 17 00:00:00 2001 From: zingzing175 Date: Sat, 26 Apr 2014 15:52:46 -0700 Subject: [PATCH 09/29] Revert "Fixed agility.py issue" This reverts commit 8afe1e4af1b8970741d51fab711a625f81e478ae. --- scripts/skillMods/agility.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/skillMods/agility.py b/scripts/skillMods/agility.py index 7978281a..3ea2c7a9 100644 --- a/scripts/skillMods/agility.py +++ b/scripts/skillMods/agility.py @@ -1,14 +1,14 @@ import sys -def add(core, actor, skillMod, divisor): - core.skillModService.addSkillMod(actor, 'display_only_dodge', skillMod.getBase()) - core.skillModService.addSkillMod(actor, 'display_only_parry', skillMod.getBase() / 2) - core.skillModService.addSkillMod(actor, 'display_only_evasion', skillMod.getBase()) +def add(core, actor, skillMod, value): + core.skillModService.addSkillMod('display_only_dodge', skillMod.getBase()) + core.skillModService.addSkillMod('display_only_parry', skillMod.getBase() / 2) + core.skillModService.addSkillMod('display_only_evasion', skillMod.getBase()) return -def deduct(core, actor, skillMod, divisor): - core.skillModService.deductSkillMod(actor, 'display_only_dodge', skillMod.getBase()) - core.skillModService.deductSkillMod(actor, 'display_only_parry', skillMod.getBase() / 2) - core.skillModService.deductSkillMod(actor, 'display_only_evasion', skillMod.getBase()) +def deduct(core, actor, skillMod, value): + core.skillModService.deductSkillMod('display_only_dodge', skillMod.getBase()) + core.skillModService.deductSkillMod('display_only_parry', skillMod.getBase() / 2) + core.skillModService.deductSkillMod('display_only_evasion', skillMod.getBase()) return - + \ No newline at end of file From 563f2572bf0903dd8efefbfd0075e8343c33fcc3 Mon Sep 17 00:00:00 2001 From: zingzing175 Date: Sat, 26 Apr 2014 16:21:30 -0700 Subject: [PATCH 10/29] Revert "Revert "Fixed agility.py issue"" This reverts commit 3e02e080cf485e254f820f75d7591c32c1b3a145. --- scripts/skillMods/agility.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/skillMods/agility.py b/scripts/skillMods/agility.py index 3ea2c7a9..7978281a 100644 --- a/scripts/skillMods/agility.py +++ b/scripts/skillMods/agility.py @@ -1,14 +1,14 @@ import sys -def add(core, actor, skillMod, value): - core.skillModService.addSkillMod('display_only_dodge', skillMod.getBase()) - core.skillModService.addSkillMod('display_only_parry', skillMod.getBase() / 2) - core.skillModService.addSkillMod('display_only_evasion', skillMod.getBase()) +def add(core, actor, skillMod, divisor): + core.skillModService.addSkillMod(actor, 'display_only_dodge', skillMod.getBase()) + core.skillModService.addSkillMod(actor, 'display_only_parry', skillMod.getBase() / 2) + core.skillModService.addSkillMod(actor, 'display_only_evasion', skillMod.getBase()) return -def deduct(core, actor, skillMod, value): - core.skillModService.deductSkillMod('display_only_dodge', skillMod.getBase()) - core.skillModService.deductSkillMod('display_only_parry', skillMod.getBase() / 2) - core.skillModService.deductSkillMod('display_only_evasion', skillMod.getBase()) +def deduct(core, actor, skillMod, divisor): + core.skillModService.deductSkillMod(actor, 'display_only_dodge', skillMod.getBase()) + core.skillModService.deductSkillMod(actor, 'display_only_parry', skillMod.getBase() / 2) + core.skillModService.deductSkillMod(actor, 'display_only_evasion', skillMod.getBase()) return - \ No newline at end of file + From 20970e915b0e8eb1e83b0ae76ff49ca4e0e0f477 Mon Sep 17 00:00:00 2001 From: zingzing175 Date: Sat, 26 Apr 2014 16:47:03 -0700 Subject: [PATCH 11/29] Added action add to Officer Inspiration, fixed a couple base skill mods, fixed officer buffs. --- scripts/skillMods/agility_modified.py | 16 ++++++++-------- scripts/skillMods/constitution.py | 8 ++++---- scripts/skillMods/constitution_modified.py | 8 ++++---- .../skillMods/expertise_critical_niche_all.py | 4 ++-- scripts/skillMods/healing_action.py | 1 + 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/scripts/skillMods/agility_modified.py b/scripts/skillMods/agility_modified.py index 9f9e8568..f5752055 100644 --- a/scripts/skillMods/agility_modified.py +++ b/scripts/skillMods/agility_modified.py @@ -1,14 +1,14 @@ import sys -def add(core, actor, skillMod, value): - core.skillModService.addSkillMod('display_only_dodge', base) - core.skillModService.addSkillMod('display_only_parry', base / 2) - core.skillModService.addSkillMod('display_only_evasion', base) +def add((core, actor, skillMod, divisor): + core.skillModService.addSkillMod('display_only_dodge', skillMod.getBase()) + core.skillModService.addSkillMod('display_only_parry', skillMod.getBase() / 2) + core.skillModService.addSkillMod('display_only_evasion', skillMod.getBase()) return -def deduct(core, actor, skillMod, value): - core.skillModService.deductSkillMod('display_only_dodge', base) - core.skillModService.deductSkillMod('display_only_parry', base / 2) - core.skillModService.deductSkillMod('display_only_evasion', base) +def deduct((core, actor, skillMod, divisor): + core.skillModService.deductSkillMod('display_only_dodge', skillMod.getBase()) + core.skillModService.deductSkillMod('display_only_parry', skillMod.getBase() / 2) + core.skillModService.deductSkillMod('display_only_evasion', skillMod.getBase()) return \ No newline at end of file diff --git a/scripts/skillMods/constitution.py b/scripts/skillMods/constitution.py index 73c88999..299bf30d 100644 --- a/scripts/skillMods/constitution.py +++ b/scripts/skillMods/constitution.py @@ -1,12 +1,12 @@ import sys def add(core, actor, skillMod, value): - actor.setMaxHealth(actor.getMaxHealth() + base * 8) - actor.setMaxAction(actor.getMaxAction() + base * 2) + actor.setMaxHealth(actor.getMaxHealth() + skillMod.getBase() * 8) + actor.setMaxAction(actor.getMaxAction() + skillMod.getBase() * 2) return def deduct(core, actor, skillMod, value): - actor.setMaxHealth(actor.getMaxHealth() - base * 8) - actor.setMaxAction(actor.getMaxAction() - base * 2) + actor.setMaxHealth(actor.getMaxHealth() - skillMod.getBase() * 8) + actor.setMaxAction(actor.getMaxAction() - skillMod.getBase() * 2) return \ No newline at end of file diff --git a/scripts/skillMods/constitution_modified.py b/scripts/skillMods/constitution_modified.py index 73c88999..299bf30d 100644 --- a/scripts/skillMods/constitution_modified.py +++ b/scripts/skillMods/constitution_modified.py @@ -1,12 +1,12 @@ import sys def add(core, actor, skillMod, value): - actor.setMaxHealth(actor.getMaxHealth() + base * 8) - actor.setMaxAction(actor.getMaxAction() + base * 2) + actor.setMaxHealth(actor.getMaxHealth() + skillMod.getBase() * 8) + actor.setMaxAction(actor.getMaxAction() + skillMod.getBase() * 2) return def deduct(core, actor, skillMod, value): - actor.setMaxHealth(actor.getMaxHealth() - base * 8) - actor.setMaxAction(actor.getMaxAction() - base * 2) + actor.setMaxHealth(actor.getMaxHealth() - skillMod.getBase() * 8) + actor.setMaxAction(actor.getMaxAction() - skillMod.getBase() * 2) return \ No newline at end of file diff --git a/scripts/skillMods/expertise_critical_niche_all.py b/scripts/skillMods/expertise_critical_niche_all.py index b6492df5..f2d7d723 100644 --- a/scripts/skillMods/expertise_critical_niche_all.py +++ b/scripts/skillMods/expertise_critical_niche_all.py @@ -1,10 +1,10 @@ import sys def add(core, actor, skillMod, value): - core.skillModService.addSkillMod(actor, 'display_only_critical', 100 * base) + core.skillModService.addSkillMod(actor, 'display_only_critical', 100 * skillMod.getBase()) return def deduct(core, actor, skillMod, value): - core.skillModService.deductSkillMod(actor, 'display_only_critical', 100 * base) + core.skillModService.deductSkillMod(actor, 'display_only_critical', 100 * skillMod.getBase()) return \ No newline at end of file diff --git a/scripts/skillMods/healing_action.py b/scripts/skillMods/healing_action.py index 6cd11173..026370f5 100644 --- a/scripts/skillMods/healing_action.py +++ b/scripts/skillMods/healing_action.py @@ -1,6 +1,7 @@ import sys def add(core, actor, skillMod, divisor): + actor.setAction(actor.getAction() + skillMod.getBase()) return def deduct(core, actor, skillMod, divisor): From 55622980a6ac00e12866c70a0776e5d8994c43b6 Mon Sep 17 00:00:00 2001 From: Treeku Date: Sun, 27 Apr 2014 01:06:57 +0100 Subject: [PATCH 12/29] Fixed minor agility_modified.py error --- scripts/skillMods/agility_modified.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/skillMods/agility_modified.py b/scripts/skillMods/agility_modified.py index f5752055..7978281a 100644 --- a/scripts/skillMods/agility_modified.py +++ b/scripts/skillMods/agility_modified.py @@ -1,14 +1,14 @@ import sys -def add((core, actor, skillMod, divisor): - core.skillModService.addSkillMod('display_only_dodge', skillMod.getBase()) - core.skillModService.addSkillMod('display_only_parry', skillMod.getBase() / 2) - core.skillModService.addSkillMod('display_only_evasion', skillMod.getBase()) +def add(core, actor, skillMod, divisor): + core.skillModService.addSkillMod(actor, 'display_only_dodge', skillMod.getBase()) + core.skillModService.addSkillMod(actor, 'display_only_parry', skillMod.getBase() / 2) + core.skillModService.addSkillMod(actor, 'display_only_evasion', skillMod.getBase()) return -def deduct((core, actor, skillMod, divisor): - core.skillModService.deductSkillMod('display_only_dodge', skillMod.getBase()) - core.skillModService.deductSkillMod('display_only_parry', skillMod.getBase() / 2) - core.skillModService.deductSkillMod('display_only_evasion', skillMod.getBase()) +def deduct(core, actor, skillMod, divisor): + core.skillModService.deductSkillMod(actor, 'display_only_dodge', skillMod.getBase()) + core.skillModService.deductSkillMod(actor, 'display_only_parry', skillMod.getBase() / 2) + core.skillModService.deductSkillMod(actor, 'display_only_evasion', skillMod.getBase()) return - \ No newline at end of file + From ade3071607b5bfc8f86da9c227e438917b17eb30 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Sat, 26 Apr 2014 20:23:25 -0400 Subject: [PATCH 13/29] Scripted Stormtrooper Squad Leader NPC Tested and works. --- .../canon/stormtrooper_squad_leader.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 scripts/mobiles/canon/stormtrooper_squad_leader.py diff --git a/scripts/mobiles/canon/stormtrooper_squad_leader.py b/scripts/mobiles/canon/stormtrooper_squad_leader.py new file mode 100644 index 00000000..8fbea697 --- /dev/null +++ b/scripts/mobiles/canon/stormtrooper_squad_leader.py @@ -0,0 +1,31 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('stormtrooper_squad_leader') + mobileTemplate.setLevel(28) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(24) + mobileTemplate.setAttackSpeed(0.4) + mobileTemplate.setWeaponType(1) + + templates = Vector() + templates.add('object/mobile/shared_dressed_stormtrooper_squad_leader_white_white.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', 0, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('stormtrooper_squad_leader', mobileTemplate) + From 2c39bc74fb244ab39fbed19d4e67d5c516c01d78 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Sat, 26 Apr 2014 21:33:24 -0400 Subject: [PATCH 14/29] Scripted Imperial Swamp Trooper Tested and works. --- scripts/mobiles/canon/swamp_trooper.py | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 scripts/mobiles/canon/swamp_trooper.py diff --git a/scripts/mobiles/canon/swamp_trooper.py b/scripts/mobiles/canon/swamp_trooper.py new file mode 100644 index 00000000..4ade7e9a --- /dev/null +++ b/scripts/mobiles/canon/swamp_trooper.py @@ -0,0 +1,31 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('swamp_trooper') + mobileTemplate.setLevel(33) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(24) + mobileTemplate.setAttackSpeed(0.4) + mobileTemplate.setWeaponType(0) + + templates = Vector() + templates.add('object/mobile/shared_dressed_swamp_trooper_m.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', 0, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('swamp_trooper', mobileTemplate) + From 80556f169c8d089949f4e3f5978ccc4aaa6a915c Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Sat, 26 Apr 2014 21:42:57 -0400 Subject: [PATCH 15/29] Scripted Imperial Scout Trooper NPC Tested and works. --- scripts/mobiles/canon/scout_trooper.py | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 scripts/mobiles/canon/scout_trooper.py diff --git a/scripts/mobiles/canon/scout_trooper.py b/scripts/mobiles/canon/scout_trooper.py new file mode 100644 index 00000000..2b446944 --- /dev/null +++ b/scripts/mobiles/canon/scout_trooper.py @@ -0,0 +1,31 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('scout_trooper') + mobileTemplate.setLevel(90) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(24) + mobileTemplate.setAttackSpeed(0.4) + mobileTemplate.setWeaponType(1) + + templates = Vector() + templates.add('object/mobile/shared_dressed_scout_trooper_m.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', 0, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('scout_trooper', mobileTemplate) + From 2ce108ce4461b8956f51b4d764968ad0a940a2a6 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Sat, 26 Apr 2014 23:05:07 -0400 Subject: [PATCH 16/29] Fixed Loot Item --- scripts/loot/lootItems/clothing/robes/apprentice_robe.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/loot/lootItems/clothing/robes/apprentice_robe.py b/scripts/loot/lootItems/clothing/robes/apprentice_robe.py index 25d13f68..a717ac1b 100644 --- a/scripts/loot/lootItems/clothing/robes/apprentice_robe.py +++ b/scripts/loot/lootItems/clothing/robes/apprentice_robe.py @@ -1,7 +1,6 @@ - def itemTemplate(): - return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff'] + return ['object/tangible/wearables/robe/shared_robe_jedi_light_s02.iff'] def customItemName(): From b6693334fead3c60ba0aafac3c6f6ae97456caaf Mon Sep 17 00:00:00 2001 From: tacef Date: Sun, 27 Apr 2014 11:14:17 +0200 Subject: [PATCH 17/29] Added Medical Cloning Droid Conversation --- scripts/conversation/medical_cloning_droid.py | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 scripts/conversation/medical_cloning_droid.py diff --git a/scripts/conversation/medical_cloning_droid.py b/scripts/conversation/medical_cloning_droid.py new file mode 100644 index 00000000..78bac164 --- /dev/null +++ b/scripts/conversation/medical_cloning_droid.py @@ -0,0 +1,91 @@ +from resources.common import ConversationOption +from resources.common import OutOfBand +from resources.common import ProsePackage +from resources.common import RadialOptions + + +from services.sui import SUIWindow +from services.sui.SUIWindow import Trigger + +from java.util import Vector +import sys + + + + +def startConversation(core, actor, npc): + global coreRef + coreRef = core + convSvc = core.conversationService + + + if actor.getBuffByName('cloning_sickness'): + prose = ProsePackage('conversation/clone_droid', 's_6') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/clone_droid', 's_8') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/clone_droid', 's_12') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + return + else: + core.conversationService.sendStopConversation(actor, npc, 'conversation/clone_droid', 's_4') + return + return + +def handleFirstScreen(core, actor, npc, selection): + + convSvc = core.conversationService + if selection == 0: + prose = ProsePackage('conversation/clone_droid', 's_10') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/clone_droid', 's_12') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + option1 = ConversationOption(outOfBand2, 0) + + + options = Vector() + options.add(option1) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + + return + + + if selection == 1: + core.buffService.removeBuffFromCreature(actor, actor.getBuffByName("cloning_sickness")); + core.conversationService.sendStopConversation(actor, npc, 'conversation/clone_droid', 's_14') + return + return + + +def handleSecondScreen(core, actor, npc, selection): + convSvc = core.conversationService + + + + if selection == 0: + core.buffService.removeBuffFromCreature(actor, actor.getBuffByName("cloning_sickness")); + core.conversationService.sendStopConversation(actor, npc, 'conversation/clone_droid', 's_14') + return + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/clone_droid', 's_4') + return + From bc7b2f02cc44a4db63db3f7c002483a8e8f18c56 Mon Sep 17 00:00:00 2001 From: tacef Date: Sun, 27 Apr 2014 17:10:03 +0200 Subject: [PATCH 18/29] Updated Imperial Recruiter Conversation You are now able to resign from military --- scripts/conversation/imp_recruiter.py | 252 ++++++++++++++++++++++---- 1 file changed, 219 insertions(+), 33 deletions(-) diff --git a/scripts/conversation/imp_recruiter.py b/scripts/conversation/imp_recruiter.py index 9b6af43c..ca49befb 100644 --- a/scripts/conversation/imp_recruiter.py +++ b/scripts/conversation/imp_recruiter.py @@ -24,7 +24,10 @@ def startConversation(core, actor, npc): faction = actor.getFaction() factionStatus = actor.getFactionStatus() - if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial': + if actor.getPvpStatus(PvpStatus.GoingOvert) or actor.getPvpStatus(PvpStatus.GoingCovert): + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_444') + return + elif actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial': prose = ProsePackage('conversation/faction_recruiter_imperial', 's_414') outOfBand = OutOfBand() outOfBand.addProsePackage(prose) @@ -35,23 +38,17 @@ def startConversation(core, actor, npc): prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_85') outOfBand3 = OutOfBand() outOfBand3.addProsePackage(prose3) - prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_70') - outOfBand4 = OutOfBand() - outOfBand4.addProsePackage(prose4) option1 = ConversationOption(outOfBand2, 0) option2 = ConversationOption(outOfBand3, 1) - option3 = ConversationOption(outOfBand4, 1) options = Vector() options.add(option1) options.add(option2) - options.add(option3) convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) return - - if actor.getFaction == 'imperial' and actor.getFactionstatus == FactionStatus.OnLeave: + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.OnLeave: prose = ProsePackage('conversation/faction_recruiter_imperial', 's_80') outOfBand = OutOfBand() outOfBand.addProsePackage(prose) @@ -68,14 +65,50 @@ def startConversation(core, actor, npc): option1 = ConversationOption(outOfBand2, 0) option2 = ConversationOption(outOfBand3, 1) option3 = ConversationOption(outOfBand4, 1) - return + - if actor.getFaction() == 'rebel': - prose = ProsePackage('conversation/faction_recruiter_imperial', 's_306') + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + return + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant or actor.getFactionStatus() == FactionStatus.SpecialForces: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_310') outOfBand = OutOfBand() outOfBand.addProsePackage(prose) convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_49') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_88') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_410') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_324') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + options.add(option4) + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + return + elif actor.getFaction() == 'rebel': + npc.setCurrentAnimation('all_b_emt_backhand') + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_308') + return + return def handleFirstScreen(core, actor, npc, selection): @@ -89,7 +122,7 @@ def handleFirstScreen(core, actor, npc, selection): prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_434') outOfBand2 = OutOfBand() outOfBand2.addProsePackage(prose2) - prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_55') + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_440') outOfBand3 = OutOfBand() outOfBand3.addProsePackage(prose3) option1 = ConversationOption(outOfBand2, 0) @@ -108,40 +141,193 @@ def handleFirstScreen(core, actor, npc, selection): return if selection == 2: - convSvc.sendConversationOptions(actor, npc, options, endConversation) + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_442') return return + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.OnLeave: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_50') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_97') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_93') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_88') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_55') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + options.add(option4) + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + + if selection == 1: + percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue() + outOfBand = OutOfBand() + prose1 = ProsePackage("conversation/faction_recruiter_imperial", 's_412',0,"percent,@conversation/faction_recruiter_imperial:s_412", "TO", str(100 - percent)) + outOfBand.addProsePackage(prose1) + convSvc.sendConversationMessage(actor, npc, outOfBand) + return + + if selection == 2: + return + return + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant or actor.getFactionStatus() == FactionStatus.SpecialForces: + + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_50') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_97') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_93') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_88') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_55') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + options.add(option4) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + + if selection == 1: + percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue() + outOfBand = OutOfBand() + OutOfBand.addProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent)) + OutOfBand.addProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "DI", str(100 - percent)) + convSvc.sendConversationMessage(actor, npc, outOfBand) + return + + if selection == 2: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_92') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_96') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + return + + def handleSecondScreen(core, actor, npc, selection): convSvc = core.conversationService + if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial': + if selection == 0: + actor.setFaction('imperial') + actor.setFactionStatus(FactionStatus.OnLeave) - if selection == 0: - actor.setFaction('imperial') - prose = ProsePackage('conversation/faction_recruiter_imperial', 's_116') - outOfBand = OutOfBand() - outOfBand.addProsePackage(prose) - convSvc.sendConversationMessage(actor, npc, outOfBand) - prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_117') - outOfBand2 = OutOfBand() - outOfBand2.addProsePackage(prose2) - option1 = ConversationOption(outOfBand2, 0) + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_116') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_438') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + option1 = ConversationOption(outOfBand2, 0) + + + options = Vector() + options.add(option1) + + + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_100') + return + if selection ==1: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_442') + return + return + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.OnLeave: + return + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant or actor.getFactionStatus() == FactionStatus.SpecialForces: + if selection == 0: + return + if selection == 1: + return + if selection == 2: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_92') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_96') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) - - options = Vector() - options.add(option1) + + + options = Vector() + options.add(option1) + options.add(option2) - - convSvc.sendConversationOptions(actor, npc, options, endConversation) + + convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen) + return + if selection == 3: + return return +def handleThirdScreen(core, actor, npc, selection): + if selection == 0: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_94') + actor.setFaction('neutral') + return + if selection == 1: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_98') + return + return + def endConversation(core, actor, npc): - if actor.getFaction() == 'rebel': - npc.playEffectObject('all_b_emt_backhand', '') - core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_308') - else: - core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_100') + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_304') return \ No newline at end of file From 4849a16e38f8c461b92fbda8b745f3097b14108b Mon Sep 17 00:00:00 2001 From: tacef Date: Sun, 27 Apr 2014 17:43:41 +0200 Subject: [PATCH 19/29] Updated Imperial Recruiter Conversation again - Join military - go Combatant - go SF - leave Military --- scripts/conversation/imp_recruiter.py | 61 +++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/scripts/conversation/imp_recruiter.py b/scripts/conversation/imp_recruiter.py index ca49befb..354d601a 100644 --- a/scripts/conversation/imp_recruiter.py +++ b/scripts/conversation/imp_recruiter.py @@ -284,6 +284,57 @@ def handleSecondScreen(core, actor, npc, selection): return return elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.OnLeave: + if selection == 0: + actor.setFactionStatus(FactionStatus.Combatant) + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_300') + return + + if selection == 1: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_64') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_66') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_302') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleFourthScreen) + return + if selection == 2: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_92') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_96') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen) + return return elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant or actor.getFactionStatus() == FactionStatus.SpecialForces: if selection == 0: @@ -327,6 +378,16 @@ def handleThirdScreen(core, actor, npc, selection): core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_98') return return + +def handleFourthScreen(core, actor, npc, selection): + if selection == 0: + actor.setFactionStatus(FactionStatus.SpecialForces) + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_68') + return + if selection == 1: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_72') + return + return def endConversation(core, actor, npc): core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_304') From 34f726f037e42537067d5d1d28e5456c07babc77 Mon Sep 17 00:00:00 2001 From: tacef Date: Sun, 27 Apr 2014 19:57:47 +0200 Subject: [PATCH 20/29] Updated Imperial Recruiter again --- scripts/conversation/imp_recruiter.py | 228 ++++++++++++++++++++++++-- 1 file changed, 211 insertions(+), 17 deletions(-) diff --git a/scripts/conversation/imp_recruiter.py b/scripts/conversation/imp_recruiter.py index 354d601a..0cd82394 100644 --- a/scripts/conversation/imp_recruiter.py +++ b/scripts/conversation/imp_recruiter.py @@ -74,7 +74,7 @@ def startConversation(core, actor, npc): convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) return - elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant or actor.getFactionStatus() == FactionStatus.SpecialForces: + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant: prose = ProsePackage('conversation/faction_recruiter_imperial', 's_310') outOfBand = OutOfBand() outOfBand.addProsePackage(prose) @@ -82,9 +82,6 @@ def startConversation(core, actor, npc): prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_49') outOfBand2 = OutOfBand() outOfBand2.addProsePackage(prose2) - prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_88') - outOfBand3 = OutOfBand() - outOfBand3.addProsePackage(prose3) prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_410') outOfBand4 = OutOfBand() outOfBand4.addProsePackage(prose4) @@ -92,14 +89,37 @@ def startConversation(core, actor, npc): outOfBand5 = OutOfBand() outOfBand5.addProsePackage(prose5) option1 = ConversationOption(outOfBand2, 0) - option2 = ConversationOption(outOfBand3, 1) - option3 = ConversationOption(outOfBand4, 1) + option2 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option4) + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + + return + elif actor.getFactionStatus() == FactionStatus.SpecialForces: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_310') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_49') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_410') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_324') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand4, 1) option4 = ConversationOption(outOfBand5, 1) options = Vector() options.add(option1) options.add(option2) - options.add(option3) options.add(option4) convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) @@ -188,14 +208,13 @@ def handleFirstScreen(core, actor, npc, selection): if selection == 2: return return - elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant or actor.getFactionStatus() == FactionStatus.SpecialForces: - + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant: if selection == 0: prose = ProsePackage('conversation/faction_recruiter_imperial', 's_50') outOfBand = OutOfBand() outOfBand.addProsePackage(prose) convSvc.sendConversationMessage(actor, npc, outOfBand) - prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_97') + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_74') outOfBand2 = OutOfBand() outOfBand2.addProsePackage(prose2) prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_93') @@ -224,10 +243,7 @@ def handleFirstScreen(core, actor, npc, selection): if selection == 1: percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue() - outOfBand = OutOfBand() - OutOfBand.addProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent)) - OutOfBand.addProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "DI", str(100 - percent)) - convSvc.sendConversationMessage(actor, npc, outOfBand) + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent))) return if selection == 2: @@ -252,6 +268,48 @@ def handleFirstScreen(core, actor, npc, selection): convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) return return + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.SpecialForces: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_50') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_74') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_97') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_88') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_55') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + options.add(option4) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + + if selection == 1: + percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue() + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent))) + return + + if selection == 2: + + return + return def handleSecondScreen(core, actor, npc, selection): @@ -335,11 +393,57 @@ def handleSecondScreen(core, actor, npc, selection): convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen) return - return - elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant or actor.getFactionStatus() == FactionStatus.SpecialForces: - if selection == 0: + if selection == 3: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_95') return + return + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_76') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_79') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_70') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleFithScreen) + return + if selection == 1: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_64') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_66') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_302') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleFourthScreen) return if selection == 2: prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90') @@ -366,6 +470,80 @@ def handleSecondScreen(core, actor, npc, selection): return if selection == 3: return + return + elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.SpecialForces: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_76') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_79') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_70') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleFithScreen) + return + + if selection == 1: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_54') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_56') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_84') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleSixthScreen) + return + if selection == 2: + prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_92') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_96') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen) + return + if selection == 3: + return return def handleThirdScreen(core, actor, npc, selection): @@ -389,6 +567,22 @@ def handleFourthScreen(core, actor, npc, selection): return return +def handleFithScreen(core, actor, npc, selection): + if selection == 0: + actor.setFactionStatus(FactionStatus.OnLeave); + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_82') + return + +def handleSixthScreen(core, actor, npc, selection): + if selection == 0: + actor.setFactionStatus(FactionStatus.Combatant) + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_58') + return + if selection == 1: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_57') + return + return + def endConversation(core, actor, npc): core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_304') return \ No newline at end of file From ac776668b8cb6bb207b280e0a50a60cbb25398e5 Mon Sep 17 00:00:00 2001 From: tacef Date: Sun, 27 Apr 2014 21:11:32 +0200 Subject: [PATCH 21/29] Added Rebel Recruiter Conversation Fixed error in Imperial recruiter Conversation --- scripts/conversation/imp_recruiter.py | 5 +- scripts/conversation/reb_recruiter.py | 585 ++++++++++++++++++++++++++ 2 files changed, 586 insertions(+), 4 deletions(-) create mode 100644 scripts/conversation/reb_recruiter.py diff --git a/scripts/conversation/imp_recruiter.py b/scripts/conversation/imp_recruiter.py index 0cd82394..399294b1 100644 --- a/scripts/conversation/imp_recruiter.py +++ b/scripts/conversation/imp_recruiter.py @@ -199,10 +199,7 @@ def handleFirstScreen(core, actor, npc, selection): if selection == 1: percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue() - outOfBand = OutOfBand() - prose1 = ProsePackage("conversation/faction_recruiter_imperial", 's_412',0,"percent,@conversation/faction_recruiter_imperial:s_412", "TO", str(100 - percent)) - outOfBand.addProsePackage(prose1) - convSvc.sendConversationMessage(actor, npc, outOfBand) + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent))) return if selection == 2: diff --git a/scripts/conversation/reb_recruiter.py b/scripts/conversation/reb_recruiter.py new file mode 100644 index 00000000..9c8b803d --- /dev/null +++ b/scripts/conversation/reb_recruiter.py @@ -0,0 +1,585 @@ +from resources.common import ConversationOption +from resources.common import OutOfBand +from resources.common import ProsePackage +from resources.common import RadialOptions +from resources.datatables import PvpStatus +from resources.datatables import FactionStatus + +from services.sui import SUIWindow +from services.sui.SUIWindow import Trigger + +from java.util import Vector +import sys + + +impRecruiterRef = 0 + + +def startConversation(core, actor, npc): + global coreRef + global impRecruiterRef + coreRef = core + impRecruiterRef = npc + convSvc = core.conversationService + faction = actor.getFaction() + factionStatus = actor.getFactionStatus() + + if actor.getPvpStatus(PvpStatus.GoingOvert) or actor.getPvpStatus(PvpStatus.GoingCovert): + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_364') + return + elif actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial': + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_334') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_348') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_83') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + return + elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.OnLeave: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_216') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_49') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_330') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_rebel', 's_248') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + return + elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.Combatant: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_216') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_49') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose4 = ProsePackage('conversation/faction_recruiter_rebel', 's_330') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_rebel', 's_248') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option4) + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + + return + elif actor.getFactionStatus() == FactionStatus.SpecialForces: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_216') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_49') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose4 = ProsePackage('conversation/faction_recruiter_rebel', 's_330') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_rebel', 's_248') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option4) + convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen) + + return + elif actor.getFaction() == 'imperial': + npc.setCurrentAnimation('all_b_emt_backhand') + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_230') + return + return + +def handleFirstScreen(core, actor, npc, selection): + + convSvc = core.conversationService + if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial': + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_352') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_354') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + + + if selection == 1: + return + + if selection == 2: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_362') + return + return + elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.OnLeave: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_50') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_95') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_93') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_rebel', 's_74') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + options.add(option4) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + + if selection == 1: + percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue() + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_imperial:s_332", percent, "TO", str(100 - percent))) + return + + if selection == 2: + return + return + elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.Combatant: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_50') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_86') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_93') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_rebel', 's_74') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + options.add(option4) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + + if selection == 1: + percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue() + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_rebel:s_332", percent, "TO", str(100 - percent))) + return + + if selection == 2: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_76') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_78') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + return + elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.SpecialForces: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_50') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_90') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_95') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + prose4 = ProsePackage('conversation/faction_recruiter_rebel', 's_78') + outOfBand4 = OutOfBand() + outOfBand4.addProsePackage(prose4) + prose5 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand5 = OutOfBand() + outOfBand5.addProsePackage(prose5) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + option3 = ConversationOption(outOfBand4, 1) + option4 = ConversationOption(outOfBand5, 1) + + + options = Vector() + options.add(option1) + options.add(option2) + options.add(option3) + options.add(option4) + + convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) + return + + if selection == 1: + percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue() + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_rebel:s_332", percent, "TO", str(100 - percent))) + return + + if selection == 2: + + return + return + + +def handleSecondScreen(core, actor, npc, selection): + convSvc = core.conversationService + + + if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial': + if selection == 0: + actor.setFaction('imperial') + actor.setFactionStatus(FactionStatus.OnLeave) + + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_99') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_358') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + option1 = ConversationOption(outOfBand2, 0) + + + options = Vector() + options.add(option1) + + + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_356') + return + if selection ==1: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_362') + return + return + elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.OnLeave: + if selection == 0: + actor.setFactionStatus(FactionStatus.Combatant) + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_224') + return + + if selection == 1: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_64') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_66') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_226') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleFourthScreen) + return + if selection == 2: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_76') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_78') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen) + return + if selection == 3: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_97') + return + return + elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.Combatant: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_88') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_90') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_94') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleFithScreen) + return + + if selection == 1: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_64') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_66') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_226') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleFourthScreen) + return + if selection == 2: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_76') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_78') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen) + return + if selection == 3: + return + return + elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.SpecialForces: + if selection == 0: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_88') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_90') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_94') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleFithScreen) + return + + if selection == 1: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_54') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_56') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleSixthScreen) + return + if selection == 2: + prose = ProsePackage('conversation/faction_recruiter_rebel', 's_76') + outOfBand = OutOfBand() + outOfBand.addProsePackage(prose) + convSvc.sendConversationMessage(actor, npc, outOfBand) + prose2 = ProsePackage('conversation/faction_recruiter_rebel', 's_74') + outOfBand2 = OutOfBand() + outOfBand2.addProsePackage(prose2) + prose3 = ProsePackage('conversation/faction_recruiter_rebel', 's_360') + outOfBand3 = OutOfBand() + outOfBand3.addProsePackage(prose3) + option1 = ConversationOption(outOfBand2, 0) + option2 = ConversationOption(outOfBand3, 1) + + + + options = Vector() + options.add(option1) + options.add(option2) + + + convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen) + return + if selection == 3: + return + return + +def handleThirdScreen(core, actor, npc, selection): + if selection == 0: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_58') + actor.setFaction('neutral') + return + + if selection == 1: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_80') + return + return + +def handleFourthScreen(core, actor, npc, selection): + if selection == 0: + actor.setFactionStatus(FactionStatus.SpecialForces) + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_224') + return + if selection == 1: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_72') + return + return + +def handleFithScreen(core, actor, npc, selection): + if selection == 0: + actor.setFactionStatus(FactionStatus.OnLeave); + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_58') + return + +def handleSixthScreen(core, actor, npc, selection): + if selection == 0: + actor.setFactionStatus(FactionStatus.Combatant) + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_92') + return + if selection == 1: + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_57') + return + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_304') + return \ No newline at end of file From b77d99328af8a693f62275004ac2cd6ce20296d0 Mon Sep 17 00:00:00 2001 From: tacef Date: Sun, 27 Apr 2014 22:16:59 +0200 Subject: [PATCH 22/29] Added more creatures to mos eisley Added Worrts Added Rills --- .../mobiles/lairgroups/tatooine_starter.py | 10 +++++-- .../lairs/tatooine_rill_lair_neutral_small.py | 5 ++++ .../tatooine_worrt_lair_neutral_small.py | 5 ++++ scripts/mobiles/spawnareas/mos_eisley_lair.py | 5 ++-- scripts/mobiles/tatooine/rill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/worrt.py | 30 +++++++++++++++++++ 6 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 scripts/mobiles/lairs/tatooine_rill_lair_neutral_small.py create mode 100644 scripts/mobiles/lairs/tatooine_worrt_lair_neutral_small.py create mode 100644 scripts/mobiles/tatooine/rill.py create mode 100644 scripts/mobiles/tatooine/worrt.py diff --git a/scripts/mobiles/lairgroups/tatooine_starter.py b/scripts/mobiles/lairgroups/tatooine_starter.py index 55242c03..55016760 100644 --- a/scripts/mobiles/lairgroups/tatooine_starter.py +++ b/scripts/mobiles/lairgroups/tatooine_starter.py @@ -5,9 +5,13 @@ from java.util import Vector def addLairGroup(core): spawnTemplate1 = LairSpawnTemplate(-1, 'tatooine_kreetle_lair_neutral_small', 5, 20) spawnTemplate2 = LairSpawnTemplate(-1, 'tatooine_womprat_lair_neutral_small', 5, 15) - + spawnTemplate3 = LairSpawnTemplate(-1, 'tatooine_rill_lair_neutral_small', 5, 15) + spawnTemplate4 = LairSpawnTemplate(-1, 'tatooine_worrt_lair_neutral_small', 5, 15) spawnTemplates = Vector() - #spawnTemplates.add(spawnTemplate1) + spawnTemplates.add(spawnTemplate1) spawnTemplates.add(spawnTemplate2) + spawnTemplates.add(spawnTemplate3) + spawnTemplates.add(spawnTemplate4) - core.spawnService.addLairGroup('tatooine_starter', spawnTemplates) \ No newline at end of file + core.spawnService.addLairGroup('tatooine_starter', spawnTemplates) + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/tatooine_rill_lair_neutral_small.py b/scripts/mobiles/lairs/tatooine_rill_lair_neutral_small.py new file mode 100644 index 00000000..5eed8400 --- /dev/null +++ b/scripts/mobiles/lairs/tatooine_rill_lair_neutral_small.py @@ -0,0 +1,5 @@ +import sys + +def addTemplate(core): + core.spawnService.addLairTemplate('tatooine_rill_lair_neutral_small', 'rill', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/tatooine_worrt_lair_neutral_small.py b/scripts/mobiles/lairs/tatooine_worrt_lair_neutral_small.py new file mode 100644 index 00000000..87905581 --- /dev/null +++ b/scripts/mobiles/lairs/tatooine_worrt_lair_neutral_small.py @@ -0,0 +1,5 @@ +import sys + +def addTemplate(core): + core.spawnService.addLairTemplate('tatooine_worrt_lair_neutral_small', 'worrt', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/spawnareas/mos_eisley_lair.py b/scripts/mobiles/spawnareas/mos_eisley_lair.py index fe0b5291..6b2de98f 100644 --- a/scripts/mobiles/spawnareas/mos_eisley_lair.py +++ b/scripts/mobiles/spawnareas/mos_eisley_lair.py @@ -1,6 +1,5 @@ import sys def addSpawnArea(core): - core.spawnService.addLairSpawnArea('tatooine_starter', 3400, -4775, 2048, 'tatooine') - - + core.spawnService.addLairSpawnArea('tatooine_starter', 3730, -4655, 1024, 'tatooine') + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/rill.py b/scripts/mobiles/tatooine/rill.py new file mode 100644 index 00000000..9e82c0c2 --- /dev/null +++ b/scripts/mobiles/tatooine/rill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rill') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/worrt.py b/scripts/mobiles/tatooine/worrt.py new file mode 100644 index 00000000..1ce16573 --- /dev/null +++ b/scripts/mobiles/tatooine/worrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('worrt') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_minor_worrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('worrt', mobileTemplate) + return \ No newline at end of file From 5e97870d66a9fee273e5a9f9a47ee1becc0d07b7 Mon Sep 17 00:00:00 2001 From: Treeku Date: Sun, 27 Apr 2014 21:23:28 +0100 Subject: [PATCH 23/29] Fixed issue with skillMod deduction --- src/services/SkillModService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/SkillModService.java b/src/services/SkillModService.java index b72dc14e..c0a4de48 100644 --- a/src/services/SkillModService.java +++ b/src/services/SkillModService.java @@ -127,7 +127,7 @@ public class SkillModService implements INetworkDispatch { synchronized(creature.getMutex()) { SkillMod skillMod = creature.getSkillMods().get(name); - if (skillMod == null || base <= 0 || modifier <= 0) { + if (skillMod == null || (base <= 0 && modifier <= 0)) { return; } else { skillMod.deductBase(base); From a740e0c6ca29a0931f5f60728524a19166f60aa6 Mon Sep 17 00:00:00 2001 From: Light2 Date: Mon, 28 Apr 2014 16:17:31 +0200 Subject: [PATCH 24/29] bazaar retrieve item fix --- .../AuctionQueryHeadersMessage.java | 4 +++- .../AuctionQueryHeadersResponseMessage.java | 22 ++++++++++++++++++- .../CreateImmediateAuctionMessage.java | 7 ++++-- .../objects/{deed => tangible}/Deed.java | 6 +++-- .../{deed => tangible}/Harvester_Deed.java | 2 +- .../{deed => tangible}/Player_House_Deed.java | 5 ++--- src/services/DevService.java | 4 ++-- src/services/bazaar/BazaarService.java | 1 + src/services/housing/HousingService.java | 8 +++---- src/services/object/ObjectService.java | 4 ++-- src/services/resources/HarvesterService.java | 2 +- 11 files changed, 46 insertions(+), 19 deletions(-) rename src/resources/objects/{deed => tangible}/Deed.java (93%) rename src/resources/objects/{deed => tangible}/Harvester_Deed.java (99%) rename src/resources/objects/{deed => tangible}/Player_House_Deed.java (98%) diff --git a/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersMessage.java b/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersMessage.java index e0ce1fd6..b92f96c3 100644 --- a/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersMessage.java +++ b/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersMessage.java @@ -52,6 +52,7 @@ public class AuctionQueryHeadersMessage extends SWGMessage { setScreen(data.getInt()); setCategory(data.getInt()); setItemTypeCRC(data.getInt()); + data.get(); // unk int size = data.getInt(); try { setSearchString(new String(ByteBuffer.allocate(size * 2).put(data.array(), data.position(), size * 2).array(), "UTF-16LE")); @@ -59,11 +60,12 @@ public class AuctionQueryHeadersMessage extends SWGMessage { e.printStackTrace(); } data.position(data.position() + size * 2); + setUnkInt(data.getInt()); setMinPrice(data.getInt()); setMaxPrice(data.getInt()); setIncludeEntranceFee(data.get()); - data.skip(6); // unk + data.skip(5); // unk setVendorId(data.getLong()); setVendorFlag(data.get()); setOffset(data.getShort()); diff --git a/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java b/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java index a36bb523..e67de9b2 100644 --- a/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java +++ b/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java @@ -103,7 +103,27 @@ public class AuctionQueryHeadersResponseMessage extends SWGMessage { result.putInt((int) ((item.getExpireTime() - System.currentTimeMillis()) / 1000)); result.putInt(item.getPrice()); result.putShort((short) 0); + result.putLong(item.getOwnerId()); + result.put((byte) (item.isAuction() ? 0 : 1)); + result.putLong(0); result.put((byte) 0); + result.putInt(2); // unk + result.putInt(0); + result.putShort((short) 0); + result.putInt(item.getItemType()); + + //result.putInt(0x400C); // category bitmask? + result.putInt(0); + int options = 0; + + if(item.getOwnerId() == playerId && (item.getStatus() == AuctionItem.OFFERED || item.getStatus() == AuctionItem.FORSALE)) + options |= 0x800; + + result.putInt(item.getAuctionOptions() | options); + result.putInt(0); + + + /*result.put((byte) 0); result.putInt(CRC.StringtoCRC(item.getItem().getTemplate())); result.putShort((short) 0); result.put((byte) 0); @@ -117,7 +137,7 @@ public class AuctionQueryHeadersResponseMessage extends SWGMessage { result.putInt(item.getItemType()); result.putInt(0); result.putInt(0); - result.putInt(0); + result.putInt(0);*/ /* result.put((byte) (item.isAuction() ? 0 : 1)); diff --git a/src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java b/src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java index 33307c41..6db48c5b 100644 --- a/src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java +++ b/src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java @@ -26,6 +26,7 @@ import java.nio.ByteBuffer; import org.apache.mina.core.buffer.IoBuffer; +import engine.resources.common.Utilities; import protocol.swg.SWGMessage; public class CreateImmediateAuctionMessage extends SWGMessage { @@ -100,8 +101,10 @@ public class CreateImmediateAuctionMessage extends SWGMessage { this.description = description; } - public byte getPremium() { - return premium; + public boolean getPremium() { + if(premium == 1) + return true; + return false; } public void setPremium(byte premium) { diff --git a/src/resources/objects/deed/Deed.java b/src/resources/objects/tangible/Deed.java similarity index 93% rename from src/resources/objects/deed/Deed.java rename to src/resources/objects/tangible/Deed.java index f98c6398..8b3b9292 100644 --- a/src/resources/objects/deed/Deed.java +++ b/src/resources/objects/tangible/Deed.java @@ -19,16 +19,18 @@ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. ******************************************************************************/ -package resources.objects.deed; +package resources.objects.tangible; + +import com.sleepycat.persist.model.Persistent; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; -import resources.objects.tangible.TangibleObject; /** * @author Charon */ +@Persistent(version=0) public class Deed extends TangibleObject { public Deed(long objectID, Planet planet, String template, Point3D position, Quaternion orientation){ diff --git a/src/resources/objects/deed/Harvester_Deed.java b/src/resources/objects/tangible/Harvester_Deed.java similarity index 99% rename from src/resources/objects/deed/Harvester_Deed.java rename to src/resources/objects/tangible/Harvester_Deed.java index 945d9eb3..33976efd 100644 --- a/src/resources/objects/deed/Harvester_Deed.java +++ b/src/resources/objects/tangible/Harvester_Deed.java @@ -19,7 +19,7 @@ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. ******************************************************************************/ -package resources.objects.deed; +package resources.objects.tangible; import com.sleepycat.persist.model.Persistent; import engine.resources.scene.Planet; diff --git a/src/resources/objects/deed/Player_House_Deed.java b/src/resources/objects/tangible/Player_House_Deed.java similarity index 98% rename from src/resources/objects/deed/Player_House_Deed.java rename to src/resources/objects/tangible/Player_House_Deed.java index 448f3da9..a03467f7 100644 --- a/src/resources/objects/deed/Player_House_Deed.java +++ b/src/resources/objects/tangible/Player_House_Deed.java @@ -19,7 +19,7 @@ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. ******************************************************************************/ -package resources.objects.deed; +package resources.objects.tangible; import com.sleepycat.persist.model.Persistent; import engine.resources.scene.Planet; @@ -40,8 +40,7 @@ public class Player_House_Deed extends Deed { private int BMR=0; private int surplusMaintenance=0; private int lotRequirement; - - + public Player_House_Deed(long objectID, Planet planet, String template, Point3D position, Quaternion orientation){ super(objectID, planet, template, position, orientation); } diff --git a/src/services/DevService.java b/src/services/DevService.java index 1a7f453d..422e608d 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -39,9 +39,9 @@ import resources.common.SpawnPoint; import resources.datatables.WeaponType; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; -import resources.objects.deed.Harvester_Deed; -import resources.objects.deed.Player_House_Deed; import resources.objects.player.PlayerObject; +import resources.objects.tangible.Harvester_Deed; +import resources.objects.tangible.Player_House_Deed; import resources.objects.tangible.TangibleObject; import resources.objects.tool.SurveyTool; import resources.objects.weapon.WeaponObject; diff --git a/src/services/bazaar/BazaarService.java b/src/services/bazaar/BazaarService.java index 52f77554..4d074039 100644 --- a/src/services/bazaar/BazaarService.java +++ b/src/services/bazaar/BazaarService.java @@ -471,6 +471,7 @@ public class BazaarService implements INetworkDispatch { else if(item.getItem() instanceof IntangibleObject) player.getSlottedObject("datapad").add(item.getItem()); + core.objectService.getObjectList().put(item.getObjectId(), item.getItem()); removeAuctionItem(item); player.getClient().getSession().write(response.serialize()); diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java index 1c6611d8..48ee0a28 100644 --- a/src/services/housing/HousingService.java +++ b/src/services/housing/HousingService.java @@ -39,8 +39,8 @@ import main.NGECore; import protocol.swg.EnterStructurePlacementModeMessage; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; -import resources.objects.deed.Player_House_Deed; import resources.objects.player.PlayerObject; +import resources.objects.tangible.Player_House_Deed; import resources.objects.tangible.TangibleObject; import services.sui.SUIWindow; import services.sui.SUIWindow.SUICallback; @@ -134,9 +134,9 @@ public class HousingService implements INetworkDispatch { building.setConditionDamage(100); // Save structure to DB - //building.createTransaction(core.getBuildingODB().getEnvironment()); - //core.getBuildingODB().put(building, Long.class, BuildingObject.class, building.getTransaction()); - //building.getTransaction().commitSync(); + /*building.createTransaction(core.getBuildingODB().getEnvironment()); + core.getBuildingODB().put(building, Long.class, BuildingObject.class, building.getTransaction()); + building.getTransaction().commitSync();*/ } @SuppressWarnings("unchecked") diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 358ad44a..ee1a1a32 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -102,8 +102,6 @@ import resources.objects.building.BuildingObject; import resources.objects.cell.CellObject; import resources.objects.craft.DraftSchematic; import resources.objects.creature.CreatureObject; -import resources.objects.deed.Harvester_Deed; -import resources.objects.deed.Player_House_Deed; import resources.objects.factorycrate.FactoryCrateObject; import resources.objects.group.GroupObject; import resources.objects.guild.GuildObject; @@ -117,6 +115,8 @@ import resources.objects.resource.GalacticResource; import resources.objects.resource.ResourceContainerObject; import resources.objects.resource.ResourceRoot; import resources.objects.staticobject.StaticObject; +import resources.objects.tangible.Harvester_Deed; +import resources.objects.tangible.Player_House_Deed; import resources.objects.tangible.TangibleObject; import resources.objects.tool.SurveyTool; import resources.objects.waypoint.WaypointObject; diff --git a/src/services/resources/HarvesterService.java b/src/services/resources/HarvesterService.java index 7dd955eb..21d9b5c5 100644 --- a/src/services/resources/HarvesterService.java +++ b/src/services/resources/HarvesterService.java @@ -54,7 +54,6 @@ import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; import resources.common.ObjControllerOpcodes; import resources.objects.creature.CreatureObject; -import resources.objects.deed.Harvester_Deed; import resources.objects.harvester.HarvesterMessageBuilder; import resources.objects.harvester.HarvesterObject; import resources.objects.installation.InstallationObject; @@ -62,6 +61,7 @@ import resources.objects.player.PlayerObject; import resources.objects.resource.GalacticResource; import resources.objects.resource.ResourceContainerObject; import resources.objects.resource.ResourceRoot; +import resources.objects.tangible.Harvester_Deed; import resources.objects.tangible.TangibleObject; import resources.objects.waypoint.WaypointObject; import services.chat.Mail; From a8894d57c05e47d4d4450eb228efe091b1b718e1 Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 28 Apr 2014 20:38:57 +0200 Subject: [PATCH 25/29] Added Creature scripts for Tatooine(needs more testing) Also altered existing scripts to support weapontemplate(needs more testing) --- .../tatooine/adolescent_krayt_dragon.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/armodragon.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/bantha.py | 21 +++++++++++-- scripts/mobiles/tatooine/bantha_low.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/bantha_matriarch.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/blight_boar.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/bocatt.py | 30 +++++++++++++++++++ .../mobiles/tatooine/bonecracker_bantha.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/bull_bantha.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/bull_ronto.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/cannibal_dewback.py | 30 +++++++++++++++++++ .../mobiles/tatooine/canyon_krayt_dragon.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/carion_kreetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/cave_beetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/city_rockmite.py | 30 +++++++++++++++++++ .../mobiles/tatooine/city_sewer_swamprat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/cupa.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/death_kreetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/desert_eopie.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/desert_kreetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/desert_razorback.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/desert_squill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/dewback.py | 20 +++++++++++-- scripts/mobiles/tatooine/dimu_bantha.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/diseased_bocatt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/domestic_eopie.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/dragonet.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/drooling_nuna.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/dune_bantha.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/dune_beetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/dune_lizard.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/dwarf_bantha.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/dwarf_eopie.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/dwarf_nuna.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/elder_zucca_boar.py | 30 +++++++++++++++++++ .../tatooine/elite_dewback_cannibal.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/elite_dragonet.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/elite_dune_lizard.py | 30 +++++++++++++++++++ .../tatooine/elite_giant_sand_beetle.py | 30 +++++++++++++++++++ .../mobiles/tatooine/elite_mutant_womprat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/elite_ronto.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/elite_scyk.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/elite_sevorrt.py | 30 +++++++++++++++++++ .../tatooine/enraged_mountain_dewback.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/enraged_squill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/eoni.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/eopie.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/eopie_herdmaster.py | 30 +++++++++++++++++++ .../tatooine/female_mountain_squill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/feral_bantha.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/furios_ronto.py | 30 +++++++++++++++++++ .../tatooine/giant_canyon_krayt_dragon.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/giant_sand_beetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/giant_worrt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/gorg.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/gorg_glutton.py | 30 +++++++++++++++++++ .../mobiles/tatooine/grand_krayt_dragon.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/great_squill.py | 30 +++++++++++++++++++ .../tatooine/greater_desert_womprat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/grizzled_dewback.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/harmony_worrt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/jundland_eopie.py | 30 +++++++++++++++++++ .../tatooine/juvenile_canyon_krayt_dragon.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/krayt_dragon.py | 23 ++++++++++---- .../mobiles/tatooine/krayt_dragon_ancient.py | 23 ++++++++++---- scripts/mobiles/tatooine/kreetle.py | 22 ++++++++++---- scripts/mobiles/tatooine/kreetle_swarmling.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/large_cave_beetle.py | 30 +++++++++++++++++++ .../mobiles/tatooine/large_rock_beetle1.py | 30 +++++++++++++++++++ .../mobiles/tatooine/large_rock_beetle2.py | 30 +++++++++++++++++++ .../mobiles/tatooine/large_rock_beetle3.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/large_sand_beetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/lesser_bocatt.py | 30 +++++++++++++++++++ .../mobiles/tatooine/lesser_desert_womprat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/lesser_dewback.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/malignant_squill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/minor_worrt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/mound_mite.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/mountain_dewback.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/mountain_squill.py | 30 +++++++++++++++++++ .../tatooine/mountain_squill_guardian.py | 30 +++++++++++++++++++ .../tatooine/mountain_squill_hunter.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/mountain_worrt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/mutant_womprat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/overkreetle.py | 30 +++++++++++++++++++ .../tatooine/parry_stormtrooper_dewback.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/plaque_rat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/razorback_felspur.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/razorclaw.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/rock_beetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/rock_beetle1.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/rock_beetle_cave.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/rockmite.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/ronto.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/runted_rill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/sand_beetle.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/sandreaver.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/savage_zucca_boar.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/scyk.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/sevorrt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/sewer_worrt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/sickly_womprat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/slum_rat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/snarlfang.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/squill.py | 30 +++++++++++++++++++ .../mobiles/tatooine/stormtrooper_dewback.py | 30 +++++++++++++++++++ .../mobiles/tatooine/sunstained_dunelizard.py | 30 +++++++++++++++++++ .../tatooine/swarming_lesser_dewback.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/tame_rill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/tame_womprat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/tame_worrt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/tatooine_mynock.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/tempest_till.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/tormented_bocatt.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/tusken_bantha.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/tusken_raider.py | 2 +- scripts/mobiles/tatooine/twisted_dewback.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/twisted_rill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/twisted_womprat.py | 30 +++++++++++++++++++ .../mobiles/tatooine/variegated_womprat.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/vicious_rill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/volatile_scyk.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/wasteland_cupa.py | 30 +++++++++++++++++++ .../mobiles/tatooine/wild_bladeback_boar.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/wild_dune_boar.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/womprat.py | 24 ++++++++++----- scripts/mobiles/tatooine/wonderous_cupa.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/worrt_gutbuster.py | 30 +++++++++++++++++++ .../mobiles/tatooine/young_mountain_squill.py | 30 +++++++++++++++++++ scripts/mobiles/tatooine/zucca_boar.py | 30 +++++++++++++++++++ 130 files changed, 3793 insertions(+), 32 deletions(-) create mode 100644 scripts/mobiles/tatooine/adolescent_krayt_dragon.py create mode 100644 scripts/mobiles/tatooine/armodragon.py create mode 100644 scripts/mobiles/tatooine/bantha_low.py create mode 100644 scripts/mobiles/tatooine/bantha_matriarch.py create mode 100644 scripts/mobiles/tatooine/blight_boar.py create mode 100644 scripts/mobiles/tatooine/bocatt.py create mode 100644 scripts/mobiles/tatooine/bonecracker_bantha.py create mode 100644 scripts/mobiles/tatooine/bull_bantha.py create mode 100644 scripts/mobiles/tatooine/bull_ronto.py create mode 100644 scripts/mobiles/tatooine/cannibal_dewback.py create mode 100644 scripts/mobiles/tatooine/canyon_krayt_dragon.py create mode 100644 scripts/mobiles/tatooine/carion_kreetle.py create mode 100644 scripts/mobiles/tatooine/cave_beetle.py create mode 100644 scripts/mobiles/tatooine/city_rockmite.py create mode 100644 scripts/mobiles/tatooine/city_sewer_swamprat.py create mode 100644 scripts/mobiles/tatooine/cupa.py create mode 100644 scripts/mobiles/tatooine/death_kreetle.py create mode 100644 scripts/mobiles/tatooine/desert_eopie.py create mode 100644 scripts/mobiles/tatooine/desert_kreetle.py create mode 100644 scripts/mobiles/tatooine/desert_razorback.py create mode 100644 scripts/mobiles/tatooine/desert_squill.py create mode 100644 scripts/mobiles/tatooine/dimu_bantha.py create mode 100644 scripts/mobiles/tatooine/diseased_bocatt.py create mode 100644 scripts/mobiles/tatooine/domestic_eopie.py create mode 100644 scripts/mobiles/tatooine/dragonet.py create mode 100644 scripts/mobiles/tatooine/drooling_nuna.py create mode 100644 scripts/mobiles/tatooine/dune_bantha.py create mode 100644 scripts/mobiles/tatooine/dune_beetle.py create mode 100644 scripts/mobiles/tatooine/dune_lizard.py create mode 100644 scripts/mobiles/tatooine/dwarf_bantha.py create mode 100644 scripts/mobiles/tatooine/dwarf_eopie.py create mode 100644 scripts/mobiles/tatooine/dwarf_nuna.py create mode 100644 scripts/mobiles/tatooine/elder_zucca_boar.py create mode 100644 scripts/mobiles/tatooine/elite_dewback_cannibal.py create mode 100644 scripts/mobiles/tatooine/elite_dragonet.py create mode 100644 scripts/mobiles/tatooine/elite_dune_lizard.py create mode 100644 scripts/mobiles/tatooine/elite_giant_sand_beetle.py create mode 100644 scripts/mobiles/tatooine/elite_mutant_womprat.py create mode 100644 scripts/mobiles/tatooine/elite_ronto.py create mode 100644 scripts/mobiles/tatooine/elite_scyk.py create mode 100644 scripts/mobiles/tatooine/elite_sevorrt.py create mode 100644 scripts/mobiles/tatooine/enraged_mountain_dewback.py create mode 100644 scripts/mobiles/tatooine/enraged_squill.py create mode 100644 scripts/mobiles/tatooine/eoni.py create mode 100644 scripts/mobiles/tatooine/eopie.py create mode 100644 scripts/mobiles/tatooine/eopie_herdmaster.py create mode 100644 scripts/mobiles/tatooine/female_mountain_squill.py create mode 100644 scripts/mobiles/tatooine/feral_bantha.py create mode 100644 scripts/mobiles/tatooine/furios_ronto.py create mode 100644 scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py create mode 100644 scripts/mobiles/tatooine/giant_sand_beetle.py create mode 100644 scripts/mobiles/tatooine/giant_worrt.py create mode 100644 scripts/mobiles/tatooine/gorg.py create mode 100644 scripts/mobiles/tatooine/gorg_glutton.py create mode 100644 scripts/mobiles/tatooine/grand_krayt_dragon.py create mode 100644 scripts/mobiles/tatooine/great_squill.py create mode 100644 scripts/mobiles/tatooine/greater_desert_womprat.py create mode 100644 scripts/mobiles/tatooine/grizzled_dewback.py create mode 100644 scripts/mobiles/tatooine/harmony_worrt.py create mode 100644 scripts/mobiles/tatooine/jundland_eopie.py create mode 100644 scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py create mode 100644 scripts/mobiles/tatooine/kreetle_swarmling.py create mode 100644 scripts/mobiles/tatooine/large_cave_beetle.py create mode 100644 scripts/mobiles/tatooine/large_rock_beetle1.py create mode 100644 scripts/mobiles/tatooine/large_rock_beetle2.py create mode 100644 scripts/mobiles/tatooine/large_rock_beetle3.py create mode 100644 scripts/mobiles/tatooine/large_sand_beetle.py create mode 100644 scripts/mobiles/tatooine/lesser_bocatt.py create mode 100644 scripts/mobiles/tatooine/lesser_desert_womprat.py create mode 100644 scripts/mobiles/tatooine/lesser_dewback.py create mode 100644 scripts/mobiles/tatooine/malignant_squill.py create mode 100644 scripts/mobiles/tatooine/minor_worrt.py create mode 100644 scripts/mobiles/tatooine/mound_mite.py create mode 100644 scripts/mobiles/tatooine/mountain_dewback.py create mode 100644 scripts/mobiles/tatooine/mountain_squill.py create mode 100644 scripts/mobiles/tatooine/mountain_squill_guardian.py create mode 100644 scripts/mobiles/tatooine/mountain_squill_hunter.py create mode 100644 scripts/mobiles/tatooine/mountain_worrt.py create mode 100644 scripts/mobiles/tatooine/mutant_womprat.py create mode 100644 scripts/mobiles/tatooine/overkreetle.py create mode 100644 scripts/mobiles/tatooine/parry_stormtrooper_dewback.py create mode 100644 scripts/mobiles/tatooine/plaque_rat.py create mode 100644 scripts/mobiles/tatooine/razorback_felspur.py create mode 100644 scripts/mobiles/tatooine/razorclaw.py create mode 100644 scripts/mobiles/tatooine/rock_beetle.py create mode 100644 scripts/mobiles/tatooine/rock_beetle1.py create mode 100644 scripts/mobiles/tatooine/rock_beetle_cave.py create mode 100644 scripts/mobiles/tatooine/rockmite.py create mode 100644 scripts/mobiles/tatooine/ronto.py create mode 100644 scripts/mobiles/tatooine/runted_rill.py create mode 100644 scripts/mobiles/tatooine/sand_beetle.py create mode 100644 scripts/mobiles/tatooine/sandreaver.py create mode 100644 scripts/mobiles/tatooine/savage_zucca_boar.py create mode 100644 scripts/mobiles/tatooine/scyk.py create mode 100644 scripts/mobiles/tatooine/sevorrt.py create mode 100644 scripts/mobiles/tatooine/sewer_worrt.py create mode 100644 scripts/mobiles/tatooine/sickly_womprat.py create mode 100644 scripts/mobiles/tatooine/slum_rat.py create mode 100644 scripts/mobiles/tatooine/snarlfang.py create mode 100644 scripts/mobiles/tatooine/squill.py create mode 100644 scripts/mobiles/tatooine/stormtrooper_dewback.py create mode 100644 scripts/mobiles/tatooine/sunstained_dunelizard.py create mode 100644 scripts/mobiles/tatooine/swarming_lesser_dewback.py create mode 100644 scripts/mobiles/tatooine/tame_rill.py create mode 100644 scripts/mobiles/tatooine/tame_womprat.py create mode 100644 scripts/mobiles/tatooine/tame_worrt.py create mode 100644 scripts/mobiles/tatooine/tatooine_mynock.py create mode 100644 scripts/mobiles/tatooine/tempest_till.py create mode 100644 scripts/mobiles/tatooine/tormented_bocatt.py create mode 100644 scripts/mobiles/tatooine/tusken_bantha.py create mode 100644 scripts/mobiles/tatooine/twisted_dewback.py create mode 100644 scripts/mobiles/tatooine/twisted_rill.py create mode 100644 scripts/mobiles/tatooine/twisted_womprat.py create mode 100644 scripts/mobiles/tatooine/variegated_womprat.py create mode 100644 scripts/mobiles/tatooine/vicious_rill.py create mode 100644 scripts/mobiles/tatooine/volatile_scyk.py create mode 100644 scripts/mobiles/tatooine/wasteland_cupa.py create mode 100644 scripts/mobiles/tatooine/wild_bladeback_boar.py create mode 100644 scripts/mobiles/tatooine/wild_dune_boar.py create mode 100644 scripts/mobiles/tatooine/wonderous_cupa.py create mode 100644 scripts/mobiles/tatooine/worrt_gutbuster.py create mode 100644 scripts/mobiles/tatooine/young_mountain_squill.py create mode 100644 scripts/mobiles/tatooine/zucca_boar.py diff --git a/scripts/mobiles/tatooine/adolescent_krayt_dragon.py b/scripts/mobiles/tatooine/adolescent_krayt_dragon.py new file mode 100644 index 00000000..8b42ae15 --- /dev/null +++ b/scripts/mobiles/tatooine/adolescent_krayt_dragon.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('adolescent krayt dragon') + mobileTemplate.setLevel(84) + mobileTemplate.setDifficulty(2) + mobileTemplate.setAttackRange(12) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_krayt_dragon.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('adolescent_krayt_dragon', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/armodragon.py b/scripts/mobiles/tatooine/armodragon.py new file mode 100644 index 00000000..66d16956 --- /dev/null +++ b/scripts/mobiles/tatooine/armodragon.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('armodragon') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dragonet.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('armodragon', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/bantha.py b/scripts/mobiles/tatooine/bantha.py index 4d5ee1e7..19ee591f 100644 --- a/scripts/mobiles/tatooine/bantha.py +++ b/scripts/mobiles/tatooine/bantha.py @@ -1,15 +1,30 @@ import sys from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('bantha') + mobileTemplate.setLevel(14) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + templates = Vector() templates.add('object/mobile/shared_bantha_hue.iff') - mobileTemplate.setCreatureName('bantha') mobileTemplate.setTemplates(templates) - mobileTemplate.setLevel(14) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + attacks = Vector() mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) - core.spawnService.addMobileTemplate('bantha', mobileTemplate) \ No newline at end of file + + core.spawnService.addMobileTemplate('bantha', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/bantha_low.py b/scripts/mobiles/tatooine/bantha_low.py new file mode 100644 index 00000000..0238608e --- /dev/null +++ b/scripts/mobiles/tatooine/bantha_low.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('bantha') + mobileTemplate.setLevel(8) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('bantha_low', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/bantha_matriarch.py b/scripts/mobiles/tatooine/bantha_matriarch.py new file mode 100644 index 00000000..fb944ead --- /dev/null +++ b/scripts/mobiles/tatooine/bantha_matriarch.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('bantha matriarch') + mobileTemplate.setLevel(15) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('bantha_matriarch', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/blight_boar.py b/scripts/mobiles/tatooine/blight_boar.py new file mode 100644 index 00000000..7fc2447e --- /dev/null +++ b/scripts/mobiles/tatooine/blight_boar.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('blight boar') + mobileTemplate.setLevel(9) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('blight_boar', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/bocatt.py b/scripts/mobiles/tatooine/bocatt.py new file mode 100644 index 00000000..f1b6bad8 --- /dev/null +++ b/scripts/mobiles/tatooine/bocatt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('bocatt') + mobileTemplate.setLevel(17) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bocatt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('bocatt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/bonecracker_bantha.py b/scripts/mobiles/tatooine/bonecracker_bantha.py new file mode 100644 index 00000000..b7419a4a --- /dev/null +++ b/scripts/mobiles/tatooine/bonecracker_bantha.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('bonecracker bantha') + mobileTemplate.setLevel(21) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('bonecracker_bantha', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/bull_bantha.py b/scripts/mobiles/tatooine/bull_bantha.py new file mode 100644 index 00000000..687be186 --- /dev/null +++ b/scripts/mobiles/tatooine/bull_bantha.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('bull bantha') + mobileTemplate.setLevel(15) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('bull_bantha', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/bull_ronto.py b/scripts/mobiles/tatooine/bull_ronto.py new file mode 100644 index 00000000..91810d16 --- /dev/null +++ b/scripts/mobiles/tatooine/bull_ronto.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('bull ronto') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_ronto.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('bullronto', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/cannibal_dewback.py b/scripts/mobiles/tatooine/cannibal_dewback.py new file mode 100644 index 00000000..f0baedf8 --- /dev/null +++ b/scripts/mobiles/tatooine/cannibal_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cannibal dewback') + mobileTemplate.setLevel(13) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('cannibal_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/canyon_krayt_dragon.py b/scripts/mobiles/tatooine/canyon_krayt_dragon.py new file mode 100644 index 00000000..d2752ba4 --- /dev/null +++ b/scripts/mobiles/tatooine/canyon_krayt_dragon.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('canyon krayt dragon') + mobileTemplate.setLevel(85) + mobileTemplate.setDifficulty(2) + mobileTemplate.setAttackRange(12) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_krayt_dragon.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('canyon_krayt_dragon', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/carion_kreetle.py b/scripts/mobiles/tatooine/carion_kreetle.py new file mode 100644 index 00000000..1f78ba82 --- /dev/null +++ b/scripts/mobiles/tatooine/carion_kreetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('carrion kreetle') + mobileTemplate.setLevel(2) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_kreetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('carrion_kreetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/cave_beetle.py b/scripts/mobiles/tatooine/cave_beetle.py new file mode 100644 index 00000000..09debbd9 --- /dev/null +++ b/scripts/mobiles/tatooine/cave_beetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cave beetle') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('cave_beetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/city_rockmite.py b/scripts/mobiles/tatooine/city_rockmite.py new file mode 100644 index 00000000..b31914f3 --- /dev/null +++ b/scripts/mobiles/tatooine/city_rockmite.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('city_rockmite') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_mite.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('city_rockmite', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/city_sewer_swamprat.py b/scripts/mobiles/tatooine/city_sewer_swamprat.py new file mode 100644 index 00000000..79393751 --- /dev/null +++ b/scripts/mobiles/tatooine/city_sewer_swamprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('city sewer swamprat') + mobileTemplate.setLevel(3) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('city_sewer_swamprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/cupa.py b/scripts/mobiles/tatooine/cupa.py new file mode 100644 index 00000000..ceef477e --- /dev/null +++ b/scripts/mobiles/tatooine/cupa.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cu pa') + mobileTemplate.setLevel(3) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_cu_pa.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('cu_pa', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/death_kreetle.py b/scripts/mobiles/tatooine/death_kreetle.py new file mode 100644 index 00000000..9da0d1ff --- /dev/null +++ b/scripts/mobiles/tatooine/death_kreetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('death kreetle') + mobileTemplate.setLevel(7) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_kreetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('death_kreetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/desert_eopie.py b/scripts/mobiles/tatooine/desert_eopie.py new file mode 100644 index 00000000..b991692c --- /dev/null +++ b/scripts/mobiles/tatooine/desert_eopie.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('desert eopie') + mobileTemplate.setLevel(16) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_eopie.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('desert_eopie', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/desert_kreetle.py b/scripts/mobiles/tatooine/desert_kreetle.py new file mode 100644 index 00000000..5bb597a7 --- /dev/null +++ b/scripts/mobiles/tatooine/desert_kreetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('desert kreetle') + mobileTemplate.setLevel(3) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_kreetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('desert_kreetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/desert_razorback.py b/scripts/mobiles/tatooine/desert_razorback.py new file mode 100644 index 00000000..04d1e1d0 --- /dev/null +++ b/scripts/mobiles/tatooine/desert_razorback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('desert razorback') + mobileTemplate.setLevel(23) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('desert_razorback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/desert_squill.py b/scripts/mobiles/tatooine/desert_squill.py new file mode 100644 index 00000000..d29ef397 --- /dev/null +++ b/scripts/mobiles/tatooine/desert_squill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('desert squill') + mobileTemplate.setLevel(14) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('desert_squill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dewback.py b/scripts/mobiles/tatooine/dewback.py index f2c2bb79..086b3fee 100644 --- a/scripts/mobiles/tatooine/dewback.py +++ b/scripts/mobiles/tatooine/dewback.py @@ -1,16 +1,30 @@ import sys from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dewback') + mobileTemplate.setLevel(17) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + templates = Vector() templates.add('object/mobile/shared_dewback.iff') - mobileTemplate.setCreatureName('dewback') mobileTemplate.setTemplates(templates) - mobileTemplate.setLevel(17) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + attacks = Vector() mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) + core.spawnService.addMobileTemplate('dewback', mobileTemplate) - \ No newline at end of file + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dimu_bantha.py b/scripts/mobiles/tatooine/dimu_bantha.py new file mode 100644 index 00000000..b7f72d2d --- /dev/null +++ b/scripts/mobiles/tatooine/dimu_bantha.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dim-u bantha') + mobileTemplate.setLevel(3) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dim-u_bantha', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/diseased_bocatt.py b/scripts/mobiles/tatooine/diseased_bocatt.py new file mode 100644 index 00000000..9e747737 --- /dev/null +++ b/scripts/mobiles/tatooine/diseased_bocatt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('diseased bocatt') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bocatt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('diseased_bocatt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/domestic_eopie.py b/scripts/mobiles/tatooine/domestic_eopie.py new file mode 100644 index 00000000..438a34b6 --- /dev/null +++ b/scripts/mobiles/tatooine/domestic_eopie.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('domestic eopie') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_eopie.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('domestic_eopie', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dragonet.py b/scripts/mobiles/tatooine/dragonet.py new file mode 100644 index 00000000..8827e8eb --- /dev/null +++ b/scripts/mobiles/tatooine/dragonet.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dragonet') + mobileTemplate.setLevel(24) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dragonet.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dragonet', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/drooling_nuna.py b/scripts/mobiles/tatooine/drooling_nuna.py new file mode 100644 index 00000000..7a470315 --- /dev/null +++ b/scripts/mobiles/tatooine/drooling_nuna.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('drooling nuna') + mobileTemplate.setLevel(2) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_nuna.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('drooling_nuna', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dune_bantha.py b/scripts/mobiles/tatooine/dune_bantha.py new file mode 100644 index 00000000..a78d0414 --- /dev/null +++ b/scripts/mobiles/tatooine/dune_bantha.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dune bantha') + mobileTemplate.setLevel(20) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dune_bantha', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dune_beetle.py b/scripts/mobiles/tatooine/dune_beetle.py new file mode 100644 index 00000000..77436c23 --- /dev/null +++ b/scripts/mobiles/tatooine/dune_beetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dune beetle') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_giant_sand_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dune_beetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dune_lizard.py b/scripts/mobiles/tatooine/dune_lizard.py new file mode 100644 index 00000000..c2e52567 --- /dev/null +++ b/scripts/mobiles/tatooine/dune_lizard.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dune lizard') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dune_lizard.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dune_lizard', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dwarf_bantha.py b/scripts/mobiles/tatooine/dwarf_bantha.py new file mode 100644 index 00000000..89688300 --- /dev/null +++ b/scripts/mobiles/tatooine/dwarf_bantha.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dwarf bantha') + mobileTemplate.setLevel(10) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dwarf_bantha.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dwarf_bantha', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dwarf_eopie.py b/scripts/mobiles/tatooine/dwarf_eopie.py new file mode 100644 index 00000000..5f11daee --- /dev/null +++ b/scripts/mobiles/tatooine/dwarf_eopie.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dwarf eopie') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dwarf_eopie.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dwarf_eopie', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dwarf_nuna.py b/scripts/mobiles/tatooine/dwarf_nuna.py new file mode 100644 index 00000000..f2ef402b --- /dev/null +++ b/scripts/mobiles/tatooine/dwarf_nuna.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dwarf nuna') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dwarf_nuna.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dwarf_nuna', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elder_zucca_boar.py b/scripts/mobiles/tatooine/elder_zucca_boar.py new file mode 100644 index 00000000..2612b588 --- /dev/null +++ b/scripts/mobiles/tatooine/elder_zucca_boar.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elder zucca boar') + mobileTemplate.setLevel(8) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elder_zucca_boar', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elite_dewback_cannibal.py b/scripts/mobiles/tatooine/elite_dewback_cannibal.py new file mode 100644 index 00000000..fb1fdf08 --- /dev/null +++ b/scripts/mobiles/tatooine/elite_dewback_cannibal.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elite dewback cannibal') + mobileTemplate.setLevel(13) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_dewback_cannibal', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elite_dragonet.py b/scripts/mobiles/tatooine/elite_dragonet.py new file mode 100644 index 00000000..2e3ab506 --- /dev/null +++ b/scripts/mobiles/tatooine/elite_dragonet.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elite dragonet') + mobileTemplate.setLevel(24) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dragonet.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_dragonet', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elite_dune_lizard.py b/scripts/mobiles/tatooine/elite_dune_lizard.py new file mode 100644 index 00000000..c7d36d17 --- /dev/null +++ b/scripts/mobiles/tatooine/elite_dune_lizard.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elite dune lizard') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dune_lizard.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_dune_lizard', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elite_giant_sand_beetle.py b/scripts/mobiles/tatooine/elite_giant_sand_beetle.py new file mode 100644 index 00000000..997a9bbd --- /dev/null +++ b/scripts/mobiles/tatooine/elite_giant_sand_beetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elite giant sand beetle') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_giant_sand_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_giant_sand_beetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elite_mutant_womprat.py b/scripts/mobiles/tatooine/elite_mutant_womprat.py new file mode 100644 index 00000000..abbdb59a --- /dev/null +++ b/scripts/mobiles/tatooine/elite_mutant_womprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elite mutant womprat') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elite_ronto.py b/scripts/mobiles/tatooine/elite_ronto.py new file mode 100644 index 00000000..bfafdec0 --- /dev/null +++ b/scripts/mobiles/tatooine/elite_ronto.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elite ronto') + mobileTemplate.setLevel(17) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_ronto.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_ronto', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elite_scyk.py b/scripts/mobiles/tatooine/elite_scyk.py new file mode 100644 index 00000000..f419ae80 --- /dev/null +++ b/scripts/mobiles/tatooine/elite_scyk.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elite scyk') + mobileTemplate.setLevel(11) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_scyk.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_scyk', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/elite_sevorrt.py b/scripts/mobiles/tatooine/elite_sevorrt.py new file mode 100644 index 00000000..36d701c1 --- /dev/null +++ b/scripts/mobiles/tatooine/elite_sevorrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('elite sevorrt') + mobileTemplate.setLevel(8) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_sevorrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_sevorrt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/enraged_mountain_dewback.py b/scripts/mobiles/tatooine/enraged_mountain_dewback.py new file mode 100644 index 00000000..2dbc8ed5 --- /dev/null +++ b/scripts/mobiles/tatooine/enraged_mountain_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('enraged mountain dewback') + mobileTemplate.setLevel(22) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('enraged_mountain_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/enraged_squill.py b/scripts/mobiles/tatooine/enraged_squill.py new file mode 100644 index 00000000..fb82150e --- /dev/null +++ b/scripts/mobiles/tatooine/enraged_squill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('enraged squill') + mobileTemplate.setLevel(12) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('enraged_squill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/eoni.py b/scripts/mobiles/tatooine/eoni.py new file mode 100644 index 00000000..0db4f825 --- /dev/null +++ b/scripts/mobiles/tatooine/eoni.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('eoni') + mobileTemplate.setLevel(21) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_eopie.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('eoni', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/eopie.py b/scripts/mobiles/tatooine/eopie.py new file mode 100644 index 00000000..8e1f5ae7 --- /dev/null +++ b/scripts/mobiles/tatooine/eopie.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('eopie') + mobileTemplate.setLevel(4) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_eopie.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('eopie', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/eopie_herdmaster.py b/scripts/mobiles/tatooine/eopie_herdmaster.py new file mode 100644 index 00000000..f8abe532 --- /dev/null +++ b/scripts/mobiles/tatooine/eopie_herdmaster.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('eopie_herdmaster') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_eopie.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('eopie_herdmaster', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/female_mountain_squill.py b/scripts/mobiles/tatooine/female_mountain_squill.py new file mode 100644 index 00000000..339904ee --- /dev/null +++ b/scripts/mobiles/tatooine/female_mountain_squill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('female mountain squill') + mobileTemplate.setLevel(17) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('female_mountain_squill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/feral_bantha.py b/scripts/mobiles/tatooine/feral_bantha.py new file mode 100644 index 00000000..8a7f9641 --- /dev/null +++ b/scripts/mobiles/tatooine/feral_bantha.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('feral bantha') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(15) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('feral_bantha', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/furios_ronto.py b/scripts/mobiles/tatooine/furios_ronto.py new file mode 100644 index 00000000..a7df8d48 --- /dev/null +++ b/scripts/mobiles/tatooine/furios_ronto.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('furious ronto') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_ronto.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('furious_ronto', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py b/scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py new file mode 100644 index 00000000..f542de89 --- /dev/null +++ b/scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('giant canyon krayt dragon') + mobileTemplate.setLevel(87) + mobileTemplate.setDifficulty(2) + mobileTemplate.setAttackRange(12) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_krayt_dragon.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('giant_canyon_krayt_dragon', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/giant_sand_beetle.py b/scripts/mobiles/tatooine/giant_sand_beetle.py new file mode 100644 index 00000000..c8516196 --- /dev/null +++ b/scripts/mobiles/tatooine/giant_sand_beetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('giant sand beetle') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_giant_sand_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('giant_sand_beetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/giant_worrt.py b/scripts/mobiles/tatooine/giant_worrt.py new file mode 100644 index 00000000..9db17cbc --- /dev/null +++ b/scripts/mobiles/tatooine/giant_worrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('giant worrt') + mobileTemplate.setLevel(13) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_minor_worrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('giant_worrt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/gorg.py b/scripts/mobiles/tatooine/gorg.py new file mode 100644 index 00000000..731c5d4a --- /dev/null +++ b/scripts/mobiles/tatooine/gorg.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gorg') + mobileTemplate.setLevel(2) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_gorg.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gorg', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/gorg_glutton.py b/scripts/mobiles/tatooine/gorg_glutton.py new file mode 100644 index 00000000..486e7667 --- /dev/null +++ b/scripts/mobiles/tatooine/gorg_glutton.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gorg glutton') + mobileTemplate.setLevel(2) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_gorg.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gorg_glutton', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/grand_krayt_dragon.py b/scripts/mobiles/tatooine/grand_krayt_dragon.py new file mode 100644 index 00000000..a0fdf90f --- /dev/null +++ b/scripts/mobiles/tatooine/grand_krayt_dragon.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('grand krayt dragon') + mobileTemplate.setLevel(88) + mobileTemplate.setDifficulty(2) + mobileTemplate.setAttackRange(12) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_krayt_dragon.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grand_krayt_dragon', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/great_squill.py b/scripts/mobiles/tatooine/great_squill.py new file mode 100644 index 00000000..ec5c6fac --- /dev/null +++ b/scripts/mobiles/tatooine/great_squill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('great squill') + mobileTemplate.setLevel(13) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('great_squill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/greater_desert_womprat.py b/scripts/mobiles/tatooine/greater_desert_womprat.py new file mode 100644 index 00000000..7f473994 --- /dev/null +++ b/scripts/mobiles/tatooine/greater_desert_womprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('greater desert womprat') + mobileTemplate.setLevel(12) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('greater_desert_womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/grizzled_dewback.py b/scripts/mobiles/tatooine/grizzled_dewback.py new file mode 100644 index 00000000..5cae3fec --- /dev/null +++ b/scripts/mobiles/tatooine/grizzled_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('grizzled dewback') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/harmony_worrt.py b/scripts/mobiles/tatooine/harmony_worrt.py new file mode 100644 index 00000000..8036d876 --- /dev/null +++ b/scripts/mobiles/tatooine/harmony_worrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('harmony worrt') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_minor_worrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('harmony_worrt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/jundland_eopie.py b/scripts/mobiles/tatooine/jundland_eopie.py new file mode 100644 index 00000000..a0b1b5c2 --- /dev/null +++ b/scripts/mobiles/tatooine/jundland_eopie.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('jundland eopie') + mobileTemplate.setLevel(21) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_eopie.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('jundland_eopie', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py b/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py new file mode 100644 index 00000000..3d0416c1 --- /dev/null +++ b/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('juvenile canyon krayt dragon') + mobileTemplate.setLevel(82) + mobileTemplate.setDifficulty(2) + mobileTemplate.setAttackRange(12) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_krayt_dragon.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('juvenile_canyon_krayt_dragon', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/krayt_dragon.py b/scripts/mobiles/tatooine/krayt_dragon.py index aded5429..6af77734 100644 --- a/scripts/mobiles/tatooine/krayt_dragon.py +++ b/scripts/mobiles/tatooine/krayt_dragon.py @@ -1,19 +1,30 @@ import sys from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('krayt_dragon') + mobileTemplate.setLevel(10) + mobileTemplate.setDifficulty(2) + mobileTemplate.setAttackRange(12) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + templates = Vector() templates.add('object/mobile/shared_krayt_dragon.iff') mobileTemplate.setTemplates(templates) - mobileTemplate.setLevel(10) - mobileTemplate.setDifficulty(2) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + attacks = Vector() mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) - mobileTemplate.setCreatureName('krayt_dragon') - mobileTemplate.setScale(2) - mobileTemplate.setAttackRange(12) + core.spawnService.addMobileTemplate('krayt_dragon', mobileTemplate) - \ No newline at end of file + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/krayt_dragon_ancient.py b/scripts/mobiles/tatooine/krayt_dragon_ancient.py index a65f6786..2b25488e 100644 --- a/scripts/mobiles/tatooine/krayt_dragon_ancient.py +++ b/scripts/mobiles/tatooine/krayt_dragon_ancient.py @@ -1,19 +1,30 @@ import sys from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('ancient krayt dragon') + mobileTemplate.setLevel(90) + mobileTemplate.setDifficulty(2) + mobileTemplate.setAttackRange(12) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + templates = Vector() templates.add('object/mobile/shared_krayt_dragon.iff') mobileTemplate.setTemplates(templates) - mobileTemplate.setLevel(90) - mobileTemplate.setDifficulty(2) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + attacks = Vector() mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) - mobileTemplate.setCreatureName('krayt_dragon_ancient') - mobileTemplate.setScale(2) - mobileTemplate.setAttackRange(12) + core.spawnService.addMobileTemplate('krayt_dragon_ancient', mobileTemplate) - \ No newline at end of file + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/kreetle.py b/scripts/mobiles/tatooine/kreetle.py index 376add57..a118c107 100644 --- a/scripts/mobiles/tatooine/kreetle.py +++ b/scripts/mobiles/tatooine/kreetle.py @@ -1,18 +1,30 @@ import sys from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('kreetle') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + templates = Vector() templates.add('object/mobile/shared_kreetle.iff') - mobileTemplate.setCreatureName('kreetle') mobileTemplate.setTemplates(templates) - mobileTemplate.setAttackRange(5) - mobileTemplate.setAttackSpeed(5) - mobileTemplate.setLevel(5) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + attacks = Vector() mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) + core.spawnService.addMobileTemplate('kreetle', mobileTemplate) - \ No newline at end of file + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/kreetle_swarmling.py b/scripts/mobiles/tatooine/kreetle_swarmling.py new file mode 100644 index 00000000..844b8f90 --- /dev/null +++ b/scripts/mobiles/tatooine/kreetle_swarmling.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('kreetle swarmling') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_kreetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('kreetle_swarmling', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/large_cave_beetle.py b/scripts/mobiles/tatooine/large_cave_beetle.py new file mode 100644 index 00000000..28604aac --- /dev/null +++ b/scripts/mobiles/tatooine/large_cave_beetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('large cave beetle') + mobileTemplate.setLevel(21) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('large_cave_beetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/large_rock_beetle1.py b/scripts/mobiles/tatooine/large_rock_beetle1.py new file mode 100644 index 00000000..a3ca497f --- /dev/null +++ b/scripts/mobiles/tatooine/large_rock_beetle1.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('large rock beetle') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('large_rock_beetle_1', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/large_rock_beetle2.py b/scripts/mobiles/tatooine/large_rock_beetle2.py new file mode 100644 index 00000000..90eb0540 --- /dev/null +++ b/scripts/mobiles/tatooine/large_rock_beetle2.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('large rock beetle') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('large_rock_beetle_2', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/large_rock_beetle3.py b/scripts/mobiles/tatooine/large_rock_beetle3.py new file mode 100644 index 00000000..dd3f4a5e --- /dev/null +++ b/scripts/mobiles/tatooine/large_rock_beetle3.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('large rock beetle') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('large_rock_beetle_3', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/large_sand_beetle.py b/scripts/mobiles/tatooine/large_sand_beetle.py new file mode 100644 index 00000000..91b17485 --- /dev/null +++ b/scripts/mobiles/tatooine/large_sand_beetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('large sand beetle') + mobileTemplate.setLevel(24) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_giant_sand_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('large_sand_beetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/lesser_bocatt.py b/scripts/mobiles/tatooine/lesser_bocatt.py new file mode 100644 index 00000000..e0e1ec52 --- /dev/null +++ b/scripts/mobiles/tatooine/lesser_bocatt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('lesser bocatt') + mobileTemplate.setLevel(14) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bocatt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('lesser_bocatt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/lesser_desert_womprat.py b/scripts/mobiles/tatooine/lesser_desert_womprat.py new file mode 100644 index 00000000..09a7343c --- /dev/null +++ b/scripts/mobiles/tatooine/lesser_desert_womprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('lesser desert womprat') + mobileTemplate.setLevel(4) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('lesser_deser_womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/lesser_dewback.py b/scripts/mobiles/tatooine/lesser_dewback.py new file mode 100644 index 00000000..d6ebaaed --- /dev/null +++ b/scripts/mobiles/tatooine/lesser_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('lesser dewback') + mobileTemplate.setLevel(4) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('lesser_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/malignant_squill.py b/scripts/mobiles/tatooine/malignant_squill.py new file mode 100644 index 00000000..7eb14d5a --- /dev/null +++ b/scripts/mobiles/tatooine/malignant_squill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('malignant squill') + mobileTemplate.setLevel(50) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('malignant_squill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/minor_worrt.py b/scripts/mobiles/tatooine/minor_worrt.py new file mode 100644 index 00000000..ceb7b57e --- /dev/null +++ b/scripts/mobiles/tatooine/minor_worrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('minor worrt') + mobileTemplate.setLevel(3) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_minor_worrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('minor_worrt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/mound_mite.py b/scripts/mobiles/tatooine/mound_mite.py new file mode 100644 index 00000000..356e926f --- /dev/null +++ b/scripts/mobiles/tatooine/mound_mite.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mound mite') + mobileTemplate.setLevel(4) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_mound_mite.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mound_mite', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/mountain_dewback.py b/scripts/mobiles/tatooine/mountain_dewback.py new file mode 100644 index 00000000..7080ac42 --- /dev/null +++ b/scripts/mobiles/tatooine/mountain_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mountain dewback') + mobileTemplate.setLevel(22) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mountain_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/mountain_squill.py b/scripts/mobiles/tatooine/mountain_squill.py new file mode 100644 index 00000000..8e2471cd --- /dev/null +++ b/scripts/mobiles/tatooine/mountain_squill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mountain squill') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mountain_squill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/mountain_squill_guardian.py b/scripts/mobiles/tatooine/mountain_squill_guardian.py new file mode 100644 index 00000000..548142ff --- /dev/null +++ b/scripts/mobiles/tatooine/mountain_squill_guardian.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mountain squill guardian') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mountain_squill_guardian', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/mountain_squill_hunter.py b/scripts/mobiles/tatooine/mountain_squill_hunter.py new file mode 100644 index 00000000..95b25879 --- /dev/null +++ b/scripts/mobiles/tatooine/mountain_squill_hunter.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mountain squill hunter') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mountain_squill_hunter', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/mountain_worrt.py b/scripts/mobiles/tatooine/mountain_worrt.py new file mode 100644 index 00000000..ad613725 --- /dev/null +++ b/scripts/mobiles/tatooine/mountain_worrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mountain worrt') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_minor_worrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mountain_worrt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/mutant_womprat.py b/scripts/mobiles/tatooine/mutant_womprat.py new file mode 100644 index 00000000..c2ca1a39 --- /dev/null +++ b/scripts/mobiles/tatooine/mutant_womprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mutant womprat') + mobileTemplate.setLevel(12) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/overkreetle.py b/scripts/mobiles/tatooine/overkreetle.py new file mode 100644 index 00000000..9ffa6933 --- /dev/null +++ b/scripts/mobiles/tatooine/overkreetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('overkreetle') + mobileTemplate.setLevel(11) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_kreetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('overkreetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/parry_stormtrooper_dewback.py b/scripts/mobiles/tatooine/parry_stormtrooper_dewback.py new file mode 100644 index 00000000..df5fbd32 --- /dev/null +++ b/scripts/mobiles/tatooine/parry_stormtrooper_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('parry stormtrooper dewback') + mobileTemplate.setLevel(17) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback_armored.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('parry_stormtrooper_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/plaque_rat.py b/scripts/mobiles/tatooine/plaque_rat.py new file mode 100644 index 00000000..60344d10 --- /dev/null +++ b/scripts/mobiles/tatooine/plaque_rat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('plaque womprat') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('plaque_womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/razorback_felspur.py b/scripts/mobiles/tatooine/razorback_felspur.py new file mode 100644 index 00000000..9ff3e68b --- /dev/null +++ b/scripts/mobiles/tatooine/razorback_felspur.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('razorback felspur') + mobileTemplate.setLevel(24) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('razorback_felspur', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/razorclaw.py b/scripts/mobiles/tatooine/razorclaw.py new file mode 100644 index 00000000..d86e1e40 --- /dev/null +++ b/scripts/mobiles/tatooine/razorclaw.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('razorclaw') + mobileTemplate.setLevel(23) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('razorclaw', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/rock_beetle.py b/scripts/mobiles/tatooine/rock_beetle.py new file mode 100644 index 00000000..63ebbdb3 --- /dev/null +++ b/scripts/mobiles/tatooine/rock_beetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rock beetle') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rock_beetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/rock_beetle1.py b/scripts/mobiles/tatooine/rock_beetle1.py new file mode 100644 index 00000000..c3768abb --- /dev/null +++ b/scripts/mobiles/tatooine/rock_beetle1.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rock beetle') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rock_beetle_1', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/rock_beetle_cave.py b/scripts/mobiles/tatooine/rock_beetle_cave.py new file mode 100644 index 00000000..5485043f --- /dev/null +++ b/scripts/mobiles/tatooine/rock_beetle_cave.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rock beetle cave') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rock_beetle_cave', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/rockmite.py b/scripts/mobiles/tatooine/rockmite.py new file mode 100644 index 00000000..bd6f39e5 --- /dev/null +++ b/scripts/mobiles/tatooine/rockmite.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rockmite') + mobileTemplate.setLevel(8) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rock_mite.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rockmite', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/ronto.py b/scripts/mobiles/tatooine/ronto.py new file mode 100644 index 00000000..68e02924 --- /dev/null +++ b/scripts/mobiles/tatooine/ronto.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('ronto') + mobileTemplate.setLevel(17) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_ronto.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('ronto', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/runted_rill.py b/scripts/mobiles/tatooine/runted_rill.py new file mode 100644 index 00000000..99cff0db --- /dev/null +++ b/scripts/mobiles/tatooine/runted_rill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('runted rill') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('runted_rill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/sand_beetle.py b/scripts/mobiles/tatooine/sand_beetle.py new file mode 100644 index 00000000..c94eaeb0 --- /dev/null +++ b/scripts/mobiles/tatooine/sand_beetle.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('sand beetle') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(1) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_giant_sand_beetle.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('sand_beetle', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/sandreaver.py b/scripts/mobiles/tatooine/sandreaver.py new file mode 100644 index 00000000..704c661c --- /dev/null +++ b/scripts/mobiles/tatooine/sandreaver.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('sandreaver') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('sandreaver', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/savage_zucca_boar.py b/scripts/mobiles/tatooine/savage_zucca_boar.py new file mode 100644 index 00000000..e12fb28b --- /dev/null +++ b/scripts/mobiles/tatooine/savage_zucca_boar.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('savage zucca boar') + mobileTemplate.setLevel(8) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('savage_zucca_boar', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/scyk.py b/scripts/mobiles/tatooine/scyk.py new file mode 100644 index 00000000..f3c09a86 --- /dev/null +++ b/scripts/mobiles/tatooine/scyk.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('scyk') + mobileTemplate.setLevel(11) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_scyk.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('scyk', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/sevorrt.py b/scripts/mobiles/tatooine/sevorrt.py new file mode 100644 index 00000000..3bcd9926 --- /dev/null +++ b/scripts/mobiles/tatooine/sevorrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('sevorrt') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_sevorrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('sevorrt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/sewer_worrt.py b/scripts/mobiles/tatooine/sewer_worrt.py new file mode 100644 index 00000000..85729746 --- /dev/null +++ b/scripts/mobiles/tatooine/sewer_worrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('sewer worrt') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_minor_worrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('sewer_worrt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/sickly_womprat.py b/scripts/mobiles/tatooine/sickly_womprat.py new file mode 100644 index 00000000..37a4d028 --- /dev/null +++ b/scripts/mobiles/tatooine/sickly_womprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('sickly womprat') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('sickly_womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/slum_rat.py b/scripts/mobiles/tatooine/slum_rat.py new file mode 100644 index 00000000..d1dcad52 --- /dev/null +++ b/scripts/mobiles/tatooine/slum_rat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('slum rat') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('slum_rat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/snarlfang.py b/scripts/mobiles/tatooine/snarlfang.py new file mode 100644 index 00000000..c0a8824c --- /dev/null +++ b/scripts/mobiles/tatooine/snarlfang.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('snarlfang') + mobileTemplate.setLevel(17) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bocatt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('snarlfang', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/squill.py b/scripts/mobiles/tatooine/squill.py new file mode 100644 index 00000000..61abb0a3 --- /dev/null +++ b/scripts/mobiles/tatooine/squill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('squill') + mobileTemplate.setLevel(12) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('squill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/stormtrooper_dewback.py b/scripts/mobiles/tatooine/stormtrooper_dewback.py new file mode 100644 index 00000000..21a25d5e --- /dev/null +++ b/scripts/mobiles/tatooine/stormtrooper_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('stormtrooper dewback') + mobileTemplate.setLevel(14) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback_armored.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('stormtrooper_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/sunstained_dunelizard.py b/scripts/mobiles/tatooine/sunstained_dunelizard.py new file mode 100644 index 00000000..ca83b06a --- /dev/null +++ b/scripts/mobiles/tatooine/sunstained_dunelizard.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('sunstained dune lizard') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dune_lizard.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('sunstained_dune_lizard', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/swarming_lesser_dewback.py b/scripts/mobiles/tatooine/swarming_lesser_dewback.py new file mode 100644 index 00000000..ce473e54 --- /dev/null +++ b/scripts/mobiles/tatooine/swarming_lesser_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('swarming lesser dewback') + mobileTemplate.setLevel(13) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_swarming_lesser_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('swarming_lesser_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/tame_rill.py b/scripts/mobiles/tatooine/tame_rill.py new file mode 100644 index 00000000..4ec78cae --- /dev/null +++ b/scripts/mobiles/tatooine/tame_rill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tame_rill') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('tame_rill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/tame_womprat.py b/scripts/mobiles/tatooine/tame_womprat.py new file mode 100644 index 00000000..99045672 --- /dev/null +++ b/scripts/mobiles/tatooine/tame_womprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tame womprat') + mobileTemplate.setLevel(2) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('tame_womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/tame_worrt.py b/scripts/mobiles/tatooine/tame_worrt.py new file mode 100644 index 00000000..9ab221c3 --- /dev/null +++ b/scripts/mobiles/tatooine/tame_worrt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tame worrt') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_minor_worrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('tame_worrt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/tatooine_mynock.py b/scripts/mobiles/tatooine/tatooine_mynock.py new file mode 100644 index 00000000..c43ed47d --- /dev/null +++ b/scripts/mobiles/tatooine/tatooine_mynock.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rill') + mobileTemplate.setLevel(2) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_mynock.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('tatooine_mynock', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/tempest_till.py b/scripts/mobiles/tatooine/tempest_till.py new file mode 100644 index 00000000..a97d3f0c --- /dev/null +++ b/scripts/mobiles/tatooine/tempest_till.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tempest rill') + mobileTemplate.setLevel(8) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('tempest_rill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/tormented_bocatt.py b/scripts/mobiles/tatooine/tormented_bocatt.py new file mode 100644 index 00000000..e4685a95 --- /dev/null +++ b/scripts/mobiles/tatooine/tormented_bocatt.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tormented bocatt') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bocatt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('tormented_bocatt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/tusken_bantha.py b/scripts/mobiles/tatooine/tusken_bantha.py new file mode 100644 index 00000000..a194bd6e --- /dev/null +++ b/scripts/mobiles/tatooine/tusken_bantha.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tusken bantha') + mobileTemplate.setLevel(30) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('tusken_bantha', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/tusken_raider.py b/scripts/mobiles/tatooine/tusken_raider.py index f3a3e867..4c2a2277 100644 --- a/scripts/mobiles/tatooine/tusken_raider.py +++ b/scripts/mobiles/tatooine/tusken_raider.py @@ -26,4 +26,4 @@ def addTemplate(core): mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('tusken_raider', mobileTemplate) - \ No newline at end of file + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/twisted_dewback.py b/scripts/mobiles/tatooine/twisted_dewback.py new file mode 100644 index 00000000..750b9733 --- /dev/null +++ b/scripts/mobiles/tatooine/twisted_dewback.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('twisted dewback') + mobileTemplate.setLevel(11) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('twisted_dewback', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/twisted_rill.py b/scripts/mobiles/tatooine/twisted_rill.py new file mode 100644 index 00000000..9b689cb0 --- /dev/null +++ b/scripts/mobiles/tatooine/twisted_rill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('twisted rill') + mobileTemplate.setLevel(11) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('twisted_rill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/twisted_womprat.py b/scripts/mobiles/tatooine/twisted_womprat.py new file mode 100644 index 00000000..6388ed87 --- /dev/null +++ b/scripts/mobiles/tatooine/twisted_womprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('twisted womprat') + mobileTemplate.setLevel(11) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('twisted_womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/variegated_womprat.py b/scripts/mobiles/tatooine/variegated_womprat.py new file mode 100644 index 00000000..e1305820 --- /dev/null +++ b/scripts/mobiles/tatooine/variegated_womprat.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('variegated womprat') + mobileTemplate.setLevel(12) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_womp_rat.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('variegated_womprat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/vicious_rill.py b/scripts/mobiles/tatooine/vicious_rill.py new file mode 100644 index 00000000..55a485e3 --- /dev/null +++ b/scripts/mobiles/tatooine/vicious_rill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('vicious rill') + mobileTemplate.setLevel(3) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_rill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('vicious_rill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/volatile_scyk.py b/scripts/mobiles/tatooine/volatile_scyk.py new file mode 100644 index 00000000..4256fbf1 --- /dev/null +++ b/scripts/mobiles/tatooine/volatile_scyk.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('volatile scyk') + mobileTemplate.setLevel(12) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_scyk.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('volatile_scyk', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/wasteland_cupa.py b/scripts/mobiles/tatooine/wasteland_cupa.py new file mode 100644 index 00000000..38ced582 --- /dev/null +++ b/scripts/mobiles/tatooine/wasteland_cupa.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('wasteland cu pa') + mobileTemplate.setLevel(20) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_cu_pa.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('wasteland_cu_pa', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/wild_bladeback_boar.py b/scripts/mobiles/tatooine/wild_bladeback_boar.py new file mode 100644 index 00000000..a8656878 --- /dev/null +++ b/scripts/mobiles/tatooine/wild_bladeback_boar.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('wild bladeback boar') + mobileTemplate.setLevel(40) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('wild_bladeback_boar', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/wild_dune_boar.py b/scripts/mobiles/tatooine/wild_dune_boar.py new file mode 100644 index 00000000..19db1593 --- /dev/null +++ b/scripts/mobiles/tatooine/wild_dune_boar.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('wild dune boar') + mobileTemplate.setLevel(50) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('wild_dune_boar', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/womprat.py b/scripts/mobiles/tatooine/womprat.py index f4277933..7852829b 100644 --- a/scripts/mobiles/tatooine/womprat.py +++ b/scripts/mobiles/tatooine/womprat.py @@ -1,22 +1,30 @@ import sys from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('womprat') + mobileTemplate.setLevel(5) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + templates = Vector() templates.add('object/mobile/shared_womp_rat.iff') - mobileTemplate.setCreatureName('womprat') mobileTemplate.setTemplates(templates) - mobileTemplate.setAttackRange(5) - mobileTemplate.setAttackSpeed(5) - mobileTemplate.setLevel(5) - mobileTemplate.setAttackRange(3) - mobileTemplate.setAttackSpeed(1.0) - mobileTemplate.setWeaponType(6) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) + core.spawnService.addMobileTemplate('womprat', mobileTemplate) - \ No newline at end of file + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/wonderous_cupa.py b/scripts/mobiles/tatooine/wonderous_cupa.py new file mode 100644 index 00000000..681b73d7 --- /dev/null +++ b/scripts/mobiles/tatooine/wonderous_cupa.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('wonderous cu pa') + mobileTemplate.setLevel(12) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_cu_pa.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('wonderous_cu_pa', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/worrt_gutbuster.py b/scripts/mobiles/tatooine/worrt_gutbuster.py new file mode 100644 index 00000000..585bde58 --- /dev/null +++ b/scripts/mobiles/tatooine/worrt_gutbuster.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('worrt gutbuster') + mobileTemplate.setLevel(13) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_minor_worrt.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('worrt_gutbuster', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/young_mountain_squill.py b/scripts/mobiles/tatooine/young_mountain_squill.py new file mode 100644 index 00000000..c6802f0e --- /dev/null +++ b/scripts/mobiles/tatooine/young_mountain_squill.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('young mountain squill') + mobileTemplate.setLevel(16) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_squill.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('young_mountain_squill', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/zucca_boar.py b/scripts/mobiles/tatooine/zucca_boar.py new file mode 100644 index 00000000..722026b0 --- /dev/null +++ b/scripts/mobiles/tatooine/zucca_boar.py @@ -0,0 +1,30 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('zucca boar') + mobileTemplate.setLevel(8) + mobileTemplate.setDifficulty(0) + mobileTemplate.setAttackRange(5) + mobileTemplate.setWeaponType(6) + mobileTemplate.setAttackSpeed(1.0) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('zucca_boar', mobileTemplate) + return \ No newline at end of file From 355700ae787a99d5be951862bf0039c5ce89999b Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 28 Apr 2014 20:59:35 +0200 Subject: [PATCH 26/29] Updated Creature scripts to have correct Weapontype Also changed template for some creatures --- scripts/mobiles/tatooine/armodragon.py | 2 +- scripts/mobiles/tatooine/bantha_matriarch.py | 2 +- scripts/mobiles/tatooine/bocatt.py | 2 +- scripts/mobiles/tatooine/canyon_krayt_dragon.py | 2 +- scripts/mobiles/tatooine/cave_beetle.py | 2 +- scripts/mobiles/tatooine/dragonet.py | 2 +- scripts/mobiles/tatooine/elite_dragonet.py | 2 +- scripts/mobiles/tatooine/elite_dune_lizard.py | 2 +- scripts/mobiles/tatooine/giant_worrt.py | 2 +- scripts/mobiles/tatooine/greater_desert_womprat.py | 4 ++-- scripts/mobiles/tatooine/harmony_worrt.py | 2 +- scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py | 2 +- scripts/mobiles/tatooine/large_cave_beetle.py | 2 +- scripts/mobiles/tatooine/large_rock_beetle1.py | 2 +- scripts/mobiles/tatooine/lesser_desert_womprat.py | 2 +- scripts/mobiles/tatooine/mountain_dewback.py | 2 +- scripts/mobiles/tatooine/mountain_squill.py | 2 +- scripts/mobiles/tatooine/mountain_squill_guardian.py | 2 +- scripts/mobiles/tatooine/mountain_squill_hunter.py | 2 +- scripts/mobiles/tatooine/mountain_worrt.py | 4 ++-- scripts/mobiles/tatooine/rock_beetle.py | 2 +- scripts/mobiles/tatooine/rock_beetle1.py | 2 +- scripts/mobiles/tatooine/rock_beetle_cave.py | 2 +- scripts/mobiles/tatooine/sewer_worrt.py | 2 +- scripts/mobiles/tatooine/snarlfang.py | 2 +- scripts/mobiles/tatooine/tame_worrt.py | 2 +- scripts/mobiles/tatooine/tormented_bocatt.py | 2 +- scripts/mobiles/tatooine/variegated_womprat.py | 2 +- scripts/mobiles/tatooine/worrt.py | 2 +- scripts/mobiles/tatooine/worrt_gutbuster.py | 2 +- 30 files changed, 32 insertions(+), 32 deletions(-) diff --git a/scripts/mobiles/tatooine/armodragon.py b/scripts/mobiles/tatooine/armodragon.py index 66d16956..da9aa221 100644 --- a/scripts/mobiles/tatooine/armodragon.py +++ b/scripts/mobiles/tatooine/armodragon.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('armodragon', mobileTemplate) diff --git a/scripts/mobiles/tatooine/bantha_matriarch.py b/scripts/mobiles/tatooine/bantha_matriarch.py index fb944ead..a0b5b7c5 100644 --- a/scripts/mobiles/tatooine/bantha_matriarch.py +++ b/scripts/mobiles/tatooine/bantha_matriarch.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_bantha_hue.iff') + templates.add('object/mobile/shared_matriarch_bantha.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/bocatt.py b/scripts/mobiles/tatooine/bocatt.py index f1b6bad8..06bbcce7 100644 --- a/scripts/mobiles/tatooine/bocatt.py +++ b/scripts/mobiles/tatooine/bocatt.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('bocatt', mobileTemplate) diff --git a/scripts/mobiles/tatooine/canyon_krayt_dragon.py b/scripts/mobiles/tatooine/canyon_krayt_dragon.py index d2752ba4..fdd0916b 100644 --- a/scripts/mobiles/tatooine/canyon_krayt_dragon.py +++ b/scripts/mobiles/tatooine/canyon_krayt_dragon.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_krayt_dragon.iff') + templates.add('object/mobile/shared_canyon_krayt_dragon.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/cave_beetle.py b/scripts/mobiles/tatooine/cave_beetle.py index 09debbd9..f4b6c944 100644 --- a/scripts/mobiles/tatooine/cave_beetle.py +++ b/scripts/mobiles/tatooine/cave_beetle.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('cave_beetle', mobileTemplate) diff --git a/scripts/mobiles/tatooine/dragonet.py b/scripts/mobiles/tatooine/dragonet.py index 8827e8eb..4b14d198 100644 --- a/scripts/mobiles/tatooine/dragonet.py +++ b/scripts/mobiles/tatooine/dragonet.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('dragonet', mobileTemplate) diff --git a/scripts/mobiles/tatooine/elite_dragonet.py b/scripts/mobiles/tatooine/elite_dragonet.py index 2e3ab506..c797be9c 100644 --- a/scripts/mobiles/tatooine/elite_dragonet.py +++ b/scripts/mobiles/tatooine/elite_dragonet.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('elite_dragonet', mobileTemplate) diff --git a/scripts/mobiles/tatooine/elite_dune_lizard.py b/scripts/mobiles/tatooine/elite_dune_lizard.py index c7d36d17..eeb7fa91 100644 --- a/scripts/mobiles/tatooine/elite_dune_lizard.py +++ b/scripts/mobiles/tatooine/elite_dune_lizard.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('elite_dune_lizard', mobileTemplate) diff --git a/scripts/mobiles/tatooine/giant_worrt.py b/scripts/mobiles/tatooine/giant_worrt.py index 9db17cbc..cbba4837 100644 --- a/scripts/mobiles/tatooine/giant_worrt.py +++ b/scripts/mobiles/tatooine/giant_worrt.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_minor_worrt.iff') + templates.add('object/mobile/shared_giant_worrt.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/greater_desert_womprat.py b/scripts/mobiles/tatooine/greater_desert_womprat.py index 7f473994..97a56bd7 100644 --- a/scripts/mobiles/tatooine/greater_desert_womprat.py +++ b/scripts/mobiles/tatooine/greater_desert_womprat.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_womp_rat.iff') + templates.add('object/mobile/shared_greater_desert_womp_rat.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('greater_desert_womprat', mobileTemplate) diff --git a/scripts/mobiles/tatooine/harmony_worrt.py b/scripts/mobiles/tatooine/harmony_worrt.py index 8036d876..b5a226ef 100644 --- a/scripts/mobiles/tatooine/harmony_worrt.py +++ b/scripts/mobiles/tatooine/harmony_worrt.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_minor_worrt.iff') + templates.add('object/mobile/shared_worrt.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py b/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py index 3d0416c1..3983feaf 100644 --- a/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py +++ b/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_krayt_dragon.iff') + templates.add('object/mobile/shared_juvenile_canyon_krayt.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/large_cave_beetle.py b/scripts/mobiles/tatooine/large_cave_beetle.py index 28604aac..5b3b6bab 100644 --- a/scripts/mobiles/tatooine/large_cave_beetle.py +++ b/scripts/mobiles/tatooine/large_cave_beetle.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('large_cave_beetle', mobileTemplate) diff --git a/scripts/mobiles/tatooine/large_rock_beetle1.py b/scripts/mobiles/tatooine/large_rock_beetle1.py index a3ca497f..a4dd3d9a 100644 --- a/scripts/mobiles/tatooine/large_rock_beetle1.py +++ b/scripts/mobiles/tatooine/large_rock_beetle1.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('large_rock_beetle_1', mobileTemplate) diff --git a/scripts/mobiles/tatooine/lesser_desert_womprat.py b/scripts/mobiles/tatooine/lesser_desert_womprat.py index 09a7343c..364532c3 100644 --- a/scripts/mobiles/tatooine/lesser_desert_womprat.py +++ b/scripts/mobiles/tatooine/lesser_desert_womprat.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_womp_rat.iff') + templates.add('object/mobile/shared_lesser_desert_womp_rat.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/mountain_dewback.py b/scripts/mobiles/tatooine/mountain_dewback.py index 7080ac42..f8e22413 100644 --- a/scripts/mobiles/tatooine/mountain_dewback.py +++ b/scripts/mobiles/tatooine/mountain_dewback.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_dewback.iff') + templates.add('object/mobile/shared_mountain_dewback.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/mountain_squill.py b/scripts/mobiles/tatooine/mountain_squill.py index 8e2471cd..a185ec67 100644 --- a/scripts/mobiles/tatooine/mountain_squill.py +++ b/scripts/mobiles/tatooine/mountain_squill.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_squill.iff') + templates.add('object/mobile/shared_mountain_squill.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/mountain_squill_guardian.py b/scripts/mobiles/tatooine/mountain_squill_guardian.py index 548142ff..06f0fe03 100644 --- a/scripts/mobiles/tatooine/mountain_squill_guardian.py +++ b/scripts/mobiles/tatooine/mountain_squill_guardian.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_squill.iff') + templates.add('object/mobile/shared_mountain_squill.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/mountain_squill_hunter.py b/scripts/mobiles/tatooine/mountain_squill_hunter.py index 95b25879..eb9de090 100644 --- a/scripts/mobiles/tatooine/mountain_squill_hunter.py +++ b/scripts/mobiles/tatooine/mountain_squill_hunter.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_squill.iff') + templates.add('object/mobile/shared_mountain_squill.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/mountain_worrt.py b/scripts/mobiles/tatooine/mountain_worrt.py index ad613725..86c3f91c 100644 --- a/scripts/mobiles/tatooine/mountain_worrt.py +++ b/scripts/mobiles/tatooine/mountain_worrt.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_minor_worrt.iff') + templates.add('object/mobile/shared_worrt.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('mountain_worrt', mobileTemplate) diff --git a/scripts/mobiles/tatooine/rock_beetle.py b/scripts/mobiles/tatooine/rock_beetle.py index 63ebbdb3..aa7adf30 100644 --- a/scripts/mobiles/tatooine/rock_beetle.py +++ b/scripts/mobiles/tatooine/rock_beetle.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('rock_beetle', mobileTemplate) diff --git a/scripts/mobiles/tatooine/rock_beetle1.py b/scripts/mobiles/tatooine/rock_beetle1.py index c3768abb..2a588043 100644 --- a/scripts/mobiles/tatooine/rock_beetle1.py +++ b/scripts/mobiles/tatooine/rock_beetle1.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('rock_beetle_1', mobileTemplate) diff --git a/scripts/mobiles/tatooine/rock_beetle_cave.py b/scripts/mobiles/tatooine/rock_beetle_cave.py index 5485043f..a7f54c5c 100644 --- a/scripts/mobiles/tatooine/rock_beetle_cave.py +++ b/scripts/mobiles/tatooine/rock_beetle_cave.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('rock_beetle_cave', mobileTemplate) diff --git a/scripts/mobiles/tatooine/sewer_worrt.py b/scripts/mobiles/tatooine/sewer_worrt.py index 85729746..036d0fdf 100644 --- a/scripts/mobiles/tatooine/sewer_worrt.py +++ b/scripts/mobiles/tatooine/sewer_worrt.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_minor_worrt.iff') + templates.add('object/mobile/shared_worrt.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/snarlfang.py b/scripts/mobiles/tatooine/snarlfang.py index c0a8824c..f81bef47 100644 --- a/scripts/mobiles/tatooine/snarlfang.py +++ b/scripts/mobiles/tatooine/snarlfang.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('snarlfang', mobileTemplate) diff --git a/scripts/mobiles/tatooine/tame_worrt.py b/scripts/mobiles/tatooine/tame_worrt.py index 9ab221c3..eab5119b 100644 --- a/scripts/mobiles/tatooine/tame_worrt.py +++ b/scripts/mobiles/tatooine/tame_worrt.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_minor_worrt.iff') + templates.add('object/mobile/shared_worrt.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/tormented_bocatt.py b/scripts/mobiles/tatooine/tormented_bocatt.py index e4685a95..a5d0ae2b 100644 --- a/scripts/mobiles/tatooine/tormented_bocatt.py +++ b/scripts/mobiles/tatooine/tormented_bocatt.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setWeaponTemplateVector(weaponTemplates) attacks = Vector() - mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setDefaultAttack('creatureRangedAttack') mobileTemplate.setAttacks(attacks) core.spawnService.addMobileTemplate('tormented_bocatt', mobileTemplate) diff --git a/scripts/mobiles/tatooine/variegated_womprat.py b/scripts/mobiles/tatooine/variegated_womprat.py index e1305820..df0ef125 100644 --- a/scripts/mobiles/tatooine/variegated_womprat.py +++ b/scripts/mobiles/tatooine/variegated_womprat.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_womp_rat.iff') + templates.add('object/mobile/shared_variegated_womp_rat.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/worrt.py b/scripts/mobiles/tatooine/worrt.py index 1ce16573..9adb3b10 100644 --- a/scripts/mobiles/tatooine/worrt.py +++ b/scripts/mobiles/tatooine/worrt.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_minor_worrt.iff') + templates.add('object/mobile/shared_worrt.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/worrt_gutbuster.py b/scripts/mobiles/tatooine/worrt_gutbuster.py index 585bde58..f09626d9 100644 --- a/scripts/mobiles/tatooine/worrt_gutbuster.py +++ b/scripts/mobiles/tatooine/worrt_gutbuster.py @@ -14,7 +14,7 @@ def addTemplate(core): mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_minor_worrt.iff') + templates.add('object/mobile/shared_worrt.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() From ba0b2476a6f72f39311e1e52813a9e31a5de5be5 Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 28 Apr 2014 21:16:52 +0200 Subject: [PATCH 27/29] Updated Ranged Creatures to play an effect --- scripts/mobiles/tatooine/bocatt.py | 2 +- scripts/mobiles/tatooine/cave_beetle.py | 2 +- scripts/mobiles/tatooine/dragonet.py | 2 +- scripts/mobiles/tatooine/dune_lizard.py | 2 +- scripts/mobiles/tatooine/elite_dragonet.py | 2 +- scripts/mobiles/tatooine/elite_dune_lizard.py | 2 +- scripts/mobiles/tatooine/large_cave_beetle.py | 2 +- scripts/mobiles/tatooine/large_rock_beetle1.py | 2 +- scripts/mobiles/tatooine/mountain_worrt.py | 2 +- scripts/mobiles/tatooine/rock_beetle.py | 2 +- scripts/mobiles/tatooine/rock_beetle1.py | 2 +- scripts/mobiles/tatooine/rock_beetle_cave.py | 2 +- scripts/mobiles/tatooine/snarlfang.py | 2 +- scripts/mobiles/tatooine/tormented_bocatt.py | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/mobiles/tatooine/bocatt.py b/scripts/mobiles/tatooine/bocatt.py index 06bbcce7..128397fc 100644 --- a/scripts/mobiles/tatooine/bocatt.py +++ b/scripts/mobiles/tatooine/bocatt.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/cave_beetle.py b/scripts/mobiles/tatooine/cave_beetle.py index f4b6c944..d25fd350 100644 --- a/scripts/mobiles/tatooine/cave_beetle.py +++ b/scripts/mobiles/tatooine/cave_beetle.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/dragonet.py b/scripts/mobiles/tatooine/dragonet.py index 4b14d198..666daef6 100644 --- a/scripts/mobiles/tatooine/dragonet.py +++ b/scripts/mobiles/tatooine/dragonet.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/dune_lizard.py b/scripts/mobiles/tatooine/dune_lizard.py index c2e52567..1ff830e9 100644 --- a/scripts/mobiles/tatooine/dune_lizard.py +++ b/scripts/mobiles/tatooine/dune_lizard.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/elite_dragonet.py b/scripts/mobiles/tatooine/elite_dragonet.py index c797be9c..3767181e 100644 --- a/scripts/mobiles/tatooine/elite_dragonet.py +++ b/scripts/mobiles/tatooine/elite_dragonet.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_large_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/elite_dune_lizard.py b/scripts/mobiles/tatooine/elite_dune_lizard.py index eeb7fa91..ad9eaf53 100644 --- a/scripts/mobiles/tatooine/elite_dune_lizard.py +++ b/scripts/mobiles/tatooine/elite_dune_lizard.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_large_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/large_cave_beetle.py b/scripts/mobiles/tatooine/large_cave_beetle.py index 5b3b6bab..c62afa0d 100644 --- a/scripts/mobiles/tatooine/large_cave_beetle.py +++ b/scripts/mobiles/tatooine/large_cave_beetle.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/large_rock_beetle1.py b/scripts/mobiles/tatooine/large_rock_beetle1.py index a4dd3d9a..a3a7d249 100644 --- a/scripts/mobiles/tatooine/large_rock_beetle1.py +++ b/scripts/mobiles/tatooine/large_rock_beetle1.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/mountain_worrt.py b/scripts/mobiles/tatooine/mountain_worrt.py index 86c3f91c..6b0119e0 100644 --- a/scripts/mobiles/tatooine/mountain_worrt.py +++ b/scripts/mobiles/tatooine/mountain_worrt.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/rock_beetle.py b/scripts/mobiles/tatooine/rock_beetle.py index aa7adf30..56a14ab5 100644 --- a/scripts/mobiles/tatooine/rock_beetle.py +++ b/scripts/mobiles/tatooine/rock_beetle.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/rock_beetle1.py b/scripts/mobiles/tatooine/rock_beetle1.py index 2a588043..2c2026ff 100644 --- a/scripts/mobiles/tatooine/rock_beetle1.py +++ b/scripts/mobiles/tatooine/rock_beetle1.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/rock_beetle_cave.py b/scripts/mobiles/tatooine/rock_beetle_cave.py index a7f54c5c..adc6c8f9 100644 --- a/scripts/mobiles/tatooine/rock_beetle_cave.py +++ b/scripts/mobiles/tatooine/rock_beetle_cave.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/snarlfang.py b/scripts/mobiles/tatooine/snarlfang.py index f81bef47..cf2ad8bc 100644 --- a/scripts/mobiles/tatooine/snarlfang.py +++ b/scripts/mobiles/tatooine/snarlfang.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) diff --git a/scripts/mobiles/tatooine/tormented_bocatt.py b/scripts/mobiles/tatooine/tormented_bocatt.py index a5d0ae2b..a31e72b5 100644 --- a/scripts/mobiles/tatooine/tormented_bocatt.py +++ b/scripts/mobiles/tatooine/tormented_bocatt.py @@ -18,7 +18,7 @@ def addTemplate(core): mobileTemplate.setTemplates(templates) weaponTemplates = Vector() - weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0) + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', 6, 1.0) weaponTemplates.add(weapontemplate) mobileTemplate.setWeaponTemplateVector(weaponTemplates) From 0adff108a886287a79e4c88de8c776067c180648 Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 28 Apr 2014 22:05:00 +0200 Subject: [PATCH 28/29] Updated Creature scripts again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Ranged creatures now have correct distance - fixed name problems with creatures - dragonet now doesn´t spawn a krayt dragon anymore --- scripts/mobiles/tatooine/adolescent_krayt_dragon.py | 2 +- scripts/mobiles/tatooine/armodragon.py | 4 ++-- scripts/mobiles/tatooine/blight_boar.py | 2 +- scripts/mobiles/tatooine/bocatt.py | 2 +- scripts/mobiles/tatooine/bonecracker_bantha.py | 2 +- scripts/mobiles/tatooine/bull_bantha.py | 2 +- scripts/mobiles/tatooine/bull_ronto.py | 2 +- scripts/mobiles/tatooine/cannibal_dewback.py | 2 +- scripts/mobiles/tatooine/canyon_krayt_dragon.py | 2 +- scripts/mobiles/tatooine/carion_kreetle.py | 2 +- scripts/mobiles/tatooine/cave_beetle.py | 4 ++-- scripts/mobiles/tatooine/city_sewer_swamprat.py | 2 +- scripts/mobiles/tatooine/cupa.py | 2 +- scripts/mobiles/tatooine/death_kreetle.py | 2 +- scripts/mobiles/tatooine/desert_eopie.py | 2 +- scripts/mobiles/tatooine/desert_kreetle.py | 2 +- scripts/mobiles/tatooine/desert_razorback.py | 2 +- scripts/mobiles/tatooine/desert_squill.py | 2 +- scripts/mobiles/tatooine/dimu_bantha.py | 2 +- scripts/mobiles/tatooine/diseased_bocatt.py | 2 +- scripts/mobiles/tatooine/domestic_eopie.py | 2 +- scripts/mobiles/tatooine/dragonet.py | 4 ++-- scripts/mobiles/tatooine/drooling_nuna.py | 2 +- scripts/mobiles/tatooine/dune_bantha.py | 2 +- scripts/mobiles/tatooine/dune_beetle.py | 2 +- scripts/mobiles/tatooine/dune_lizard.py | 2 +- scripts/mobiles/tatooine/dwarf_bantha.py | 2 +- scripts/mobiles/tatooine/dwarf_eopie.py | 2 +- scripts/mobiles/tatooine/dwarf_nuna.py | 2 +- scripts/mobiles/tatooine/elder_zucca_boar.py | 2 +- scripts/mobiles/tatooine/elite_dewback_cannibal.py | 2 +- scripts/mobiles/tatooine/elite_dragonet.py | 4 ++-- scripts/mobiles/tatooine/elite_dune_lizard.py | 4 ++-- scripts/mobiles/tatooine/elite_giant_sand_beetle.py | 2 +- scripts/mobiles/tatooine/elite_mutant_womprat.py | 2 +- scripts/mobiles/tatooine/elite_ronto.py | 2 +- scripts/mobiles/tatooine/elite_scyk.py | 2 +- scripts/mobiles/tatooine/elite_sevorrt.py | 2 +- scripts/mobiles/tatooine/enraged_mountain_dewback.py | 2 +- scripts/mobiles/tatooine/enraged_squill.py | 2 +- scripts/mobiles/tatooine/eoni.py | 2 +- scripts/mobiles/tatooine/female_mountain_squill.py | 2 +- scripts/mobiles/tatooine/feral_bantha.py | 2 +- scripts/mobiles/tatooine/furios_ronto.py | 2 +- scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py | 2 +- scripts/mobiles/tatooine/giant_sand_beetle.py | 2 +- scripts/mobiles/tatooine/giant_worrt.py | 2 +- scripts/mobiles/tatooine/gorg_glutton.py | 2 +- scripts/mobiles/tatooine/grand_krayt_dragon.py | 2 +- scripts/mobiles/tatooine/great_squill.py | 2 +- scripts/mobiles/tatooine/greater_desert_womprat.py | 4 ++-- scripts/mobiles/tatooine/grizzled_dewback.py | 2 +- scripts/mobiles/tatooine/harmony_worrt.py | 2 +- scripts/mobiles/tatooine/jundland_eopie.py | 2 +- scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py | 2 +- scripts/mobiles/tatooine/krayt_dragon_ancient.py | 2 +- scripts/mobiles/tatooine/kreetle_swarmling.py | 2 +- scripts/mobiles/tatooine/large_cave_beetle.py | 4 ++-- scripts/mobiles/tatooine/large_rock_beetle1.py | 4 ++-- scripts/mobiles/tatooine/large_rock_beetle2.py | 2 +- scripts/mobiles/tatooine/large_rock_beetle3.py | 2 +- scripts/mobiles/tatooine/large_sand_beetle.py | 2 +- scripts/mobiles/tatooine/lesser_bocatt.py | 2 +- scripts/mobiles/tatooine/lesser_desert_womprat.py | 2 +- scripts/mobiles/tatooine/lesser_dewback.py | 2 +- scripts/mobiles/tatooine/malignant_squill.py | 2 +- scripts/mobiles/tatooine/minor_worrt.py | 2 +- scripts/mobiles/tatooine/mound_mite.py | 2 +- scripts/mobiles/tatooine/mountain_dewback.py | 2 +- scripts/mobiles/tatooine/mountain_squill.py | 2 +- scripts/mobiles/tatooine/mountain_squill_guardian.py | 2 +- scripts/mobiles/tatooine/mountain_squill_hunter.py | 2 +- scripts/mobiles/tatooine/mountain_worrt.py | 4 ++-- scripts/mobiles/tatooine/mutant_womprat.py | 2 +- scripts/mobiles/tatooine/overkreetle.py | 2 +- scripts/mobiles/tatooine/parry_stormtrooper_dewback.py | 2 +- scripts/mobiles/tatooine/plaque_rat.py | 2 +- scripts/mobiles/tatooine/razorback_felspur.py | 2 +- scripts/mobiles/tatooine/razorclaw.py | 2 +- scripts/mobiles/tatooine/rock_beetle.py | 4 ++-- scripts/mobiles/tatooine/rock_beetle1.py | 4 ++-- scripts/mobiles/tatooine/rock_beetle_cave.py | 4 ++-- scripts/mobiles/tatooine/runted_rill.py | 2 +- scripts/mobiles/tatooine/sand_beetle.py | 2 +- scripts/mobiles/tatooine/sandreaver.py | 2 +- scripts/mobiles/tatooine/savage_zucca_boar.py | 2 +- scripts/mobiles/tatooine/sewer_worrt.py | 2 +- scripts/mobiles/tatooine/sickly_womprat.py | 2 +- scripts/mobiles/tatooine/slum_rat.py | 2 +- scripts/mobiles/tatooine/snarlfang.py | 4 ++-- scripts/mobiles/tatooine/stormtrooper_dewback.py | 2 +- scripts/mobiles/tatooine/sunstained_dunelizard.py | 2 +- scripts/mobiles/tatooine/swarming_lesser_dewback.py | 2 +- scripts/mobiles/tatooine/tame_womprat.py | 2 +- scripts/mobiles/tatooine/tame_worrt.py | 2 +- scripts/mobiles/tatooine/tatooine_mynock.py | 2 +- scripts/mobiles/tatooine/{tempest_till.py => tempest_rill.py} | 2 +- scripts/mobiles/tatooine/tormented_bocatt.py | 4 ++-- scripts/mobiles/tatooine/tusken_bantha.py | 2 +- scripts/mobiles/tatooine/twisted_dewback.py | 2 +- scripts/mobiles/tatooine/twisted_rill.py | 2 +- scripts/mobiles/tatooine/twisted_womprat.py | 2 +- scripts/mobiles/tatooine/variegated_womprat.py | 2 +- scripts/mobiles/tatooine/vicious_rill.py | 2 +- scripts/mobiles/tatooine/volatile_scyk.py | 2 +- scripts/mobiles/tatooine/wasteland_cupa.py | 2 +- scripts/mobiles/tatooine/wild_bladeback_boar.py | 2 +- scripts/mobiles/tatooine/wild_dune_boar.py | 2 +- scripts/mobiles/tatooine/wonderous_cupa.py | 2 +- scripts/mobiles/tatooine/worrt_gutbuster.py | 2 +- scripts/mobiles/tatooine/young_mountain_squill.py | 2 +- scripts/mobiles/tatooine/zucca_boar.py | 2 +- 112 files changed, 126 insertions(+), 126 deletions(-) rename scripts/mobiles/tatooine/{tempest_till.py => tempest_rill.py} (94%) diff --git a/scripts/mobiles/tatooine/adolescent_krayt_dragon.py b/scripts/mobiles/tatooine/adolescent_krayt_dragon.py index 8b42ae15..c1c3fb85 100644 --- a/scripts/mobiles/tatooine/adolescent_krayt_dragon.py +++ b/scripts/mobiles/tatooine/adolescent_krayt_dragon.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('adolescent krayt dragon') + mobileTemplate.setCreatureName('krayt_dragon_adolescent') mobileTemplate.setLevel(84) mobileTemplate.setDifficulty(2) mobileTemplate.setAttackRange(12) diff --git a/scripts/mobiles/tatooine/armodragon.py b/scripts/mobiles/tatooine/armodragon.py index da9aa221..494e4228 100644 --- a/scripts/mobiles/tatooine/armodragon.py +++ b/scripts/mobiles/tatooine/armodragon.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('armodragon') + mobileTemplate.setCreatureName('dragonet_armodragon') mobileTemplate.setLevel(25) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/blight_boar.py b/scripts/mobiles/tatooine/blight_boar.py index 7fc2447e..b25a7441 100644 --- a/scripts/mobiles/tatooine/blight_boar.py +++ b/scripts/mobiles/tatooine/blight_boar.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('blight boar') + mobileTemplate.setCreatureName('zucca_boar_blight') mobileTemplate.setLevel(9) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/bocatt.py b/scripts/mobiles/tatooine/bocatt.py index 128397fc..3cbf9cc1 100644 --- a/scripts/mobiles/tatooine/bocatt.py +++ b/scripts/mobiles/tatooine/bocatt.py @@ -9,7 +9,7 @@ def addTemplate(core): mobileTemplate.setCreatureName('bocatt') mobileTemplate.setLevel(17) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/bonecracker_bantha.py b/scripts/mobiles/tatooine/bonecracker_bantha.py index b7419a4a..42341f23 100644 --- a/scripts/mobiles/tatooine/bonecracker_bantha.py +++ b/scripts/mobiles/tatooine/bonecracker_bantha.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('bonecracker bantha') + mobileTemplate.setCreatureName('bantha_bonecracker') mobileTemplate.setLevel(21) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/bull_bantha.py b/scripts/mobiles/tatooine/bull_bantha.py index 687be186..c4626e21 100644 --- a/scripts/mobiles/tatooine/bull_bantha.py +++ b/scripts/mobiles/tatooine/bull_bantha.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('bull bantha') + mobileTemplate.setCreatureName('bull_bantha') mobileTemplate.setLevel(15) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/bull_ronto.py b/scripts/mobiles/tatooine/bull_ronto.py index 91810d16..d75ca648 100644 --- a/scripts/mobiles/tatooine/bull_ronto.py +++ b/scripts/mobiles/tatooine/bull_ronto.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('bull ronto') + mobileTemplate.setCreatureName('ronto_male') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/cannibal_dewback.py b/scripts/mobiles/tatooine/cannibal_dewback.py index f0baedf8..941c0ebf 100644 --- a/scripts/mobiles/tatooine/cannibal_dewback.py +++ b/scripts/mobiles/tatooine/cannibal_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('cannibal dewback') + mobileTemplate.setCreatureName('dewback_cannibal') mobileTemplate.setLevel(13) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/canyon_krayt_dragon.py b/scripts/mobiles/tatooine/canyon_krayt_dragon.py index fdd0916b..7eb53cc6 100644 --- a/scripts/mobiles/tatooine/canyon_krayt_dragon.py +++ b/scripts/mobiles/tatooine/canyon_krayt_dragon.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('canyon krayt dragon') + mobileTemplate.setCreatureName('canyon_krayt_dragon') mobileTemplate.setLevel(85) mobileTemplate.setDifficulty(2) mobileTemplate.setAttackRange(12) diff --git a/scripts/mobiles/tatooine/carion_kreetle.py b/scripts/mobiles/tatooine/carion_kreetle.py index 1f78ba82..f1a1bf01 100644 --- a/scripts/mobiles/tatooine/carion_kreetle.py +++ b/scripts/mobiles/tatooine/carion_kreetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('carrion kreetle') + mobileTemplate.setCreatureName('fragile_kreetle') mobileTemplate.setLevel(2) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/cave_beetle.py b/scripts/mobiles/tatooine/cave_beetle.py index d25fd350..2a98b7bc 100644 --- a/scripts/mobiles/tatooine/cave_beetle.py +++ b/scripts/mobiles/tatooine/cave_beetle.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('cave beetle') + mobileTemplate.setCreatureName('cave_beetle') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/city_sewer_swamprat.py b/scripts/mobiles/tatooine/city_sewer_swamprat.py index 79393751..ecb72a17 100644 --- a/scripts/mobiles/tatooine/city_sewer_swamprat.py +++ b/scripts/mobiles/tatooine/city_sewer_swamprat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('city sewer swamprat') + mobileTemplate.setCreatureName('city_sewer_swamprat') mobileTemplate.setLevel(3) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/cupa.py b/scripts/mobiles/tatooine/cupa.py index ceef477e..b44cff3a 100644 --- a/scripts/mobiles/tatooine/cupa.py +++ b/scripts/mobiles/tatooine/cupa.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('cu pa') + mobileTemplate.setCreatureName('cu_pa') mobileTemplate.setLevel(3) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/death_kreetle.py b/scripts/mobiles/tatooine/death_kreetle.py index 9da0d1ff..5e39d8ae 100644 --- a/scripts/mobiles/tatooine/death_kreetle.py +++ b/scripts/mobiles/tatooine/death_kreetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('death kreetle') + mobileTemplate.setCreatureName('kreetle_death') mobileTemplate.setLevel(7) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/desert_eopie.py b/scripts/mobiles/tatooine/desert_eopie.py index b991692c..be18b6bb 100644 --- a/scripts/mobiles/tatooine/desert_eopie.py +++ b/scripts/mobiles/tatooine/desert_eopie.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('desert eopie') + mobileTemplate.setCreatureName('desert_eopie') mobileTemplate.setLevel(16) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/desert_kreetle.py b/scripts/mobiles/tatooine/desert_kreetle.py index 5bb597a7..bddbbf1a 100644 --- a/scripts/mobiles/tatooine/desert_kreetle.py +++ b/scripts/mobiles/tatooine/desert_kreetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('desert kreetle') + mobileTemplate.setCreatureName('orphan_kreetle') mobileTemplate.setLevel(3) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/desert_razorback.py b/scripts/mobiles/tatooine/desert_razorback.py index 04d1e1d0..6e07cd81 100644 --- a/scripts/mobiles/tatooine/desert_razorback.py +++ b/scripts/mobiles/tatooine/desert_razorback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('desert razorback') + mobileTemplate.setCreatureName('desert_razorback') mobileTemplate.setLevel(23) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/desert_squill.py b/scripts/mobiles/tatooine/desert_squill.py index d29ef397..2ab4b5ca 100644 --- a/scripts/mobiles/tatooine/desert_squill.py +++ b/scripts/mobiles/tatooine/desert_squill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('desert squill') + mobileTemplate.setCreatureName('desert_squill') mobileTemplate.setLevel(14) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/dimu_bantha.py b/scripts/mobiles/tatooine/dimu_bantha.py index b7f72d2d..5280c721 100644 --- a/scripts/mobiles/tatooine/dimu_bantha.py +++ b/scripts/mobiles/tatooine/dimu_bantha.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('dim-u bantha') + mobileTemplate.setCreatureName('dim_u_bantha') mobileTemplate.setLevel(3) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/diseased_bocatt.py b/scripts/mobiles/tatooine/diseased_bocatt.py index 9e747737..96bb977e 100644 --- a/scripts/mobiles/tatooine/diseased_bocatt.py +++ b/scripts/mobiles/tatooine/diseased_bocatt.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('diseased bocatt') + mobileTemplate.setCreatureName('bocatt_diseased') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/domestic_eopie.py b/scripts/mobiles/tatooine/domestic_eopie.py index 438a34b6..33e8077b 100644 --- a/scripts/mobiles/tatooine/domestic_eopie.py +++ b/scripts/mobiles/tatooine/domestic_eopie.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('domestic eopie') + mobileTemplate.setCreatureName('domestic_eopie') mobileTemplate.setLevel(1) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/dragonet.py b/scripts/mobiles/tatooine/dragonet.py index 666daef6..5d8cb006 100644 --- a/scripts/mobiles/tatooine/dragonet.py +++ b/scripts/mobiles/tatooine/dragonet.py @@ -9,12 +9,12 @@ def addTemplate(core): mobileTemplate.setCreatureName('dragonet') mobileTemplate.setLevel(24) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) templates = Vector() - templates.add('object/mobile/shared_dragonet.iff') + templates.add('object/mobile/shared_dune_lizard.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/drooling_nuna.py b/scripts/mobiles/tatooine/drooling_nuna.py index 7a470315..b729515c 100644 --- a/scripts/mobiles/tatooine/drooling_nuna.py +++ b/scripts/mobiles/tatooine/drooling_nuna.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('drooling nuna') + mobileTemplate.setCreatureName('dwarf_nuna_drooling') mobileTemplate.setLevel(2) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/dune_bantha.py b/scripts/mobiles/tatooine/dune_bantha.py index a78d0414..cb29c496 100644 --- a/scripts/mobiles/tatooine/dune_bantha.py +++ b/scripts/mobiles/tatooine/dune_bantha.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('dune bantha') + mobileTemplate.setCreatureName('dune_bantha') mobileTemplate.setLevel(20) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/dune_beetle.py b/scripts/mobiles/tatooine/dune_beetle.py index 77436c23..9cc34df7 100644 --- a/scripts/mobiles/tatooine/dune_beetle.py +++ b/scripts/mobiles/tatooine/dune_beetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('dune beetle') + mobileTemplate.setCreatureName('dune_beetle') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/dune_lizard.py b/scripts/mobiles/tatooine/dune_lizard.py index 1ff830e9..ec826be0 100644 --- a/scripts/mobiles/tatooine/dune_lizard.py +++ b/scripts/mobiles/tatooine/dune_lizard.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('dune lizard') + mobileTemplate.setCreatureName('dune_lizard') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/dwarf_bantha.py b/scripts/mobiles/tatooine/dwarf_bantha.py index 89688300..6c8449ca 100644 --- a/scripts/mobiles/tatooine/dwarf_bantha.py +++ b/scripts/mobiles/tatooine/dwarf_bantha.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('dwarf bantha') + mobileTemplate.setCreatureName('dwarf_bantha') mobileTemplate.setLevel(10) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/dwarf_eopie.py b/scripts/mobiles/tatooine/dwarf_eopie.py index 5f11daee..cb9a80cc 100644 --- a/scripts/mobiles/tatooine/dwarf_eopie.py +++ b/scripts/mobiles/tatooine/dwarf_eopie.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('dwarf eopie') + mobileTemplate.setCreatureName('dwarf_eopie') mobileTemplate.setLevel(1) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/dwarf_nuna.py b/scripts/mobiles/tatooine/dwarf_nuna.py index f2ef402b..423fb7d9 100644 --- a/scripts/mobiles/tatooine/dwarf_nuna.py +++ b/scripts/mobiles/tatooine/dwarf_nuna.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('dwarf nuna') + mobileTemplate.setCreatureName('dwarf_nuna') mobileTemplate.setLevel(1) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/elder_zucca_boar.py b/scripts/mobiles/tatooine/elder_zucca_boar.py index 2612b588..11e040e2 100644 --- a/scripts/mobiles/tatooine/elder_zucca_boar.py +++ b/scripts/mobiles/tatooine/elder_zucca_boar.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elder zucca boar') + mobileTemplate.setCreatureName('zucca_boar_elder') mobileTemplate.setLevel(8) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/elite_dewback_cannibal.py b/scripts/mobiles/tatooine/elite_dewback_cannibal.py index fb1fdf08..910ba869 100644 --- a/scripts/mobiles/tatooine/elite_dewback_cannibal.py +++ b/scripts/mobiles/tatooine/elite_dewback_cannibal.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elite dewback cannibal') + mobileTemplate.setCreatureName('elite_dewback_canibal') mobileTemplate.setLevel(13) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/elite_dragonet.py b/scripts/mobiles/tatooine/elite_dragonet.py index 3767181e..481b2d64 100644 --- a/scripts/mobiles/tatooine/elite_dragonet.py +++ b/scripts/mobiles/tatooine/elite_dragonet.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elite dragonet') + mobileTemplate.setCreatureName('elite_dragonet') mobileTemplate.setLevel(24) mobileTemplate.setDifficulty(1) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/elite_dune_lizard.py b/scripts/mobiles/tatooine/elite_dune_lizard.py index ad9eaf53..a0adf4e8 100644 --- a/scripts/mobiles/tatooine/elite_dune_lizard.py +++ b/scripts/mobiles/tatooine/elite_dune_lizard.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elite dune lizard') + mobileTemplate.setCreatureName('elite_dune_lizard') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(1) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/elite_giant_sand_beetle.py b/scripts/mobiles/tatooine/elite_giant_sand_beetle.py index 997a9bbd..c21a083c 100644 --- a/scripts/mobiles/tatooine/elite_giant_sand_beetle.py +++ b/scripts/mobiles/tatooine/elite_giant_sand_beetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elite giant sand beetle') + mobileTemplate.setCreatureName('elite_giant_sand_beetle') mobileTemplate.setLevel(25) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/elite_mutant_womprat.py b/scripts/mobiles/tatooine/elite_mutant_womprat.py index abbdb59a..de786778 100644 --- a/scripts/mobiles/tatooine/elite_mutant_womprat.py +++ b/scripts/mobiles/tatooine/elite_mutant_womprat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elite mutant womprat') + mobileTemplate.setCreatureName('elite_mutant_womprat') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/elite_ronto.py b/scripts/mobiles/tatooine/elite_ronto.py index bfafdec0..a5d22cef 100644 --- a/scripts/mobiles/tatooine/elite_ronto.py +++ b/scripts/mobiles/tatooine/elite_ronto.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elite ronto') + mobileTemplate.setCreatureName('elite_ronto_ronto') mobileTemplate.setLevel(17) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/elite_scyk.py b/scripts/mobiles/tatooine/elite_scyk.py index f419ae80..54ad052c 100644 --- a/scripts/mobiles/tatooine/elite_scyk.py +++ b/scripts/mobiles/tatooine/elite_scyk.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elite scyk') + mobileTemplate.setCreatureName('elite_scyk') mobileTemplate.setLevel(11) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/elite_sevorrt.py b/scripts/mobiles/tatooine/elite_sevorrt.py index 36d701c1..190a9e26 100644 --- a/scripts/mobiles/tatooine/elite_sevorrt.py +++ b/scripts/mobiles/tatooine/elite_sevorrt.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('elite sevorrt') + mobileTemplate.setCreatureName('elite_sevorrt') mobileTemplate.setLevel(8) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/enraged_mountain_dewback.py b/scripts/mobiles/tatooine/enraged_mountain_dewback.py index 2dbc8ed5..dfebff92 100644 --- a/scripts/mobiles/tatooine/enraged_mountain_dewback.py +++ b/scripts/mobiles/tatooine/enraged_mountain_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('enraged mountain dewback') + mobileTemplate.setCreatureName('elite_mountain_dewback') mobileTemplate.setLevel(22) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/enraged_squill.py b/scripts/mobiles/tatooine/enraged_squill.py index fb82150e..3fd86349 100644 --- a/scripts/mobiles/tatooine/enraged_squill.py +++ b/scripts/mobiles/tatooine/enraged_squill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('enraged squill') + mobileTemplate.setCreatureName('elite_squill') mobileTemplate.setLevel(12) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/eoni.py b/scripts/mobiles/tatooine/eoni.py index 0db4f825..0dd12e09 100644 --- a/scripts/mobiles/tatooine/eoni.py +++ b/scripts/mobiles/tatooine/eoni.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('eoni') + mobileTemplate.setCreatureName('elite_jundland_eopie') mobileTemplate.setLevel(21) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/female_mountain_squill.py b/scripts/mobiles/tatooine/female_mountain_squill.py index 339904ee..e2da21e4 100644 --- a/scripts/mobiles/tatooine/female_mountain_squill.py +++ b/scripts/mobiles/tatooine/female_mountain_squill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('female mountain squill') + mobileTemplate.setCreatureName('female_mountain_squill') mobileTemplate.setLevel(17) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/feral_bantha.py b/scripts/mobiles/tatooine/feral_bantha.py index 8a7f9641..fcbbbebc 100644 --- a/scripts/mobiles/tatooine/feral_bantha.py +++ b/scripts/mobiles/tatooine/feral_bantha.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('feral bantha') + mobileTemplate.setCreatureName('feral_bantha') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(15) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/furios_ronto.py b/scripts/mobiles/tatooine/furios_ronto.py index a7df8d48..c8c4fe74 100644 --- a/scripts/mobiles/tatooine/furios_ronto.py +++ b/scripts/mobiles/tatooine/furios_ronto.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('furious ronto') + mobileTemplate.setCreatureName('ronto_furious') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py b/scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py index f542de89..2d86f3cd 100644 --- a/scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py +++ b/scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('giant canyon krayt dragon') + mobileTemplate.setCreatureName('giant_canyon_krayt_dragon') mobileTemplate.setLevel(87) mobileTemplate.setDifficulty(2) mobileTemplate.setAttackRange(12) diff --git a/scripts/mobiles/tatooine/giant_sand_beetle.py b/scripts/mobiles/tatooine/giant_sand_beetle.py index c8516196..2f9138d5 100644 --- a/scripts/mobiles/tatooine/giant_sand_beetle.py +++ b/scripts/mobiles/tatooine/giant_sand_beetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('giant sand beetle') + mobileTemplate.setCreatureName('giant_sand_beetle') mobileTemplate.setLevel(25) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/giant_worrt.py b/scripts/mobiles/tatooine/giant_worrt.py index cbba4837..27edbbed 100644 --- a/scripts/mobiles/tatooine/giant_worrt.py +++ b/scripts/mobiles/tatooine/giant_worrt.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('giant worrt') + mobileTemplate.setCreatureName('giant_worrt') mobileTemplate.setLevel(13) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/gorg_glutton.py b/scripts/mobiles/tatooine/gorg_glutton.py index 486e7667..7eaddd81 100644 --- a/scripts/mobiles/tatooine/gorg_glutton.py +++ b/scripts/mobiles/tatooine/gorg_glutton.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('gorg glutton') + mobileTemplate.setCreatureName('gorg_glutton') mobileTemplate.setLevel(2) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/grand_krayt_dragon.py b/scripts/mobiles/tatooine/grand_krayt_dragon.py index a0fdf90f..d149306b 100644 --- a/scripts/mobiles/tatooine/grand_krayt_dragon.py +++ b/scripts/mobiles/tatooine/grand_krayt_dragon.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('grand krayt dragon') + mobileTemplate.setCreatureName('krayt_dragon_grand') mobileTemplate.setLevel(88) mobileTemplate.setDifficulty(2) mobileTemplate.setAttackRange(12) diff --git a/scripts/mobiles/tatooine/great_squill.py b/scripts/mobiles/tatooine/great_squill.py index ec5c6fac..ec27d549 100644 --- a/scripts/mobiles/tatooine/great_squill.py +++ b/scripts/mobiles/tatooine/great_squill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('great squill') + mobileTemplate.setCreatureName('squill_great') mobileTemplate.setLevel(13) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/greater_desert_womprat.py b/scripts/mobiles/tatooine/greater_desert_womprat.py index 97a56bd7..cbf1c39a 100644 --- a/scripts/mobiles/tatooine/greater_desert_womprat.py +++ b/scripts/mobiles/tatooine/greater_desert_womprat.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('greater desert womprat') + mobileTemplate.setCreatureName('greater_desert_womprat') mobileTemplate.setLevel(12) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/grizzled_dewback.py b/scripts/mobiles/tatooine/grizzled_dewback.py index 5cae3fec..416f9a58 100644 --- a/scripts/mobiles/tatooine/grizzled_dewback.py +++ b/scripts/mobiles/tatooine/grizzled_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('grizzled dewback') + mobileTemplate.setCreatureName('grizzled_dewback') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/harmony_worrt.py b/scripts/mobiles/tatooine/harmony_worrt.py index b5a226ef..07f24218 100644 --- a/scripts/mobiles/tatooine/harmony_worrt.py +++ b/scripts/mobiles/tatooine/harmony_worrt.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('harmony worrt') + mobileTemplate.setCreatureName('harmony_worrt') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/jundland_eopie.py b/scripts/mobiles/tatooine/jundland_eopie.py index a0b1b5c2..ee6cf43c 100644 --- a/scripts/mobiles/tatooine/jundland_eopie.py +++ b/scripts/mobiles/tatooine/jundland_eopie.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('jundland eopie') + mobileTemplate.setCreatureName('jundland_eopie') mobileTemplate.setLevel(21) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py b/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py index 3983feaf..d06ec11d 100644 --- a/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py +++ b/scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('juvenile canyon krayt dragon') + mobileTemplate.setCreatureName('juvenile_canyon_krayt') mobileTemplate.setLevel(82) mobileTemplate.setDifficulty(2) mobileTemplate.setAttackRange(12) diff --git a/scripts/mobiles/tatooine/krayt_dragon_ancient.py b/scripts/mobiles/tatooine/krayt_dragon_ancient.py index 2b25488e..b8450ec0 100644 --- a/scripts/mobiles/tatooine/krayt_dragon_ancient.py +++ b/scripts/mobiles/tatooine/krayt_dragon_ancient.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('ancient krayt dragon') + mobileTemplate.setCreatureName('krayt_dragon_ancient') mobileTemplate.setLevel(90) mobileTemplate.setDifficulty(2) mobileTemplate.setAttackRange(12) diff --git a/scripts/mobiles/tatooine/kreetle_swarmling.py b/scripts/mobiles/tatooine/kreetle_swarmling.py index 844b8f90..9f998e07 100644 --- a/scripts/mobiles/tatooine/kreetle_swarmling.py +++ b/scripts/mobiles/tatooine/kreetle_swarmling.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('kreetle swarmling') + mobileTemplate.setCreatureName('kreetle_swarming') mobileTemplate.setLevel(1) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/large_cave_beetle.py b/scripts/mobiles/tatooine/large_cave_beetle.py index c62afa0d..ccfc9a8d 100644 --- a/scripts/mobiles/tatooine/large_cave_beetle.py +++ b/scripts/mobiles/tatooine/large_cave_beetle.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('large cave beetle') + mobileTemplate.setCreatureName('large_cave_beetle') mobileTemplate.setLevel(21) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/large_rock_beetle1.py b/scripts/mobiles/tatooine/large_rock_beetle1.py index a3a7d249..39078fb6 100644 --- a/scripts/mobiles/tatooine/large_rock_beetle1.py +++ b/scripts/mobiles/tatooine/large_rock_beetle1.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('large rock beetle') + mobileTemplate.setCreatureName('large_rock_beetle') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(1) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/large_rock_beetle2.py b/scripts/mobiles/tatooine/large_rock_beetle2.py index 90eb0540..dfadc654 100644 --- a/scripts/mobiles/tatooine/large_rock_beetle2.py +++ b/scripts/mobiles/tatooine/large_rock_beetle2.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('large rock beetle') + mobileTemplate.setCreatureName('large_rock_beetle') mobileTemplate.setLevel(19) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/large_rock_beetle3.py b/scripts/mobiles/tatooine/large_rock_beetle3.py index dd3f4a5e..1cca8d4e 100644 --- a/scripts/mobiles/tatooine/large_rock_beetle3.py +++ b/scripts/mobiles/tatooine/large_rock_beetle3.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('large rock beetle') + mobileTemplate.setCreatureName('large_rock_beetle') mobileTemplate.setLevel(19) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/large_sand_beetle.py b/scripts/mobiles/tatooine/large_sand_beetle.py index 91b17485..2bfc2cb9 100644 --- a/scripts/mobiles/tatooine/large_sand_beetle.py +++ b/scripts/mobiles/tatooine/large_sand_beetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('large sand beetle') + mobileTemplate.setCreatureName('large_sand_beetle') mobileTemplate.setLevel(24) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/lesser_bocatt.py b/scripts/mobiles/tatooine/lesser_bocatt.py index e0e1ec52..d768a79b 100644 --- a/scripts/mobiles/tatooine/lesser_bocatt.py +++ b/scripts/mobiles/tatooine/lesser_bocatt.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('lesser bocatt') + mobileTemplate.setCreatureName('lesser_bocatt') mobileTemplate.setLevel(14) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/lesser_desert_womprat.py b/scripts/mobiles/tatooine/lesser_desert_womprat.py index 364532c3..66ff6a9f 100644 --- a/scripts/mobiles/tatooine/lesser_desert_womprat.py +++ b/scripts/mobiles/tatooine/lesser_desert_womprat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('lesser desert womprat') + mobileTemplate.setCreatureName('lesser_desert_womprat') mobileTemplate.setLevel(4) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/lesser_dewback.py b/scripts/mobiles/tatooine/lesser_dewback.py index d6ebaaed..d6a49360 100644 --- a/scripts/mobiles/tatooine/lesser_dewback.py +++ b/scripts/mobiles/tatooine/lesser_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('lesser dewback') + mobileTemplate.setCreatureName('lesser_dewback') mobileTemplate.setLevel(4) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/malignant_squill.py b/scripts/mobiles/tatooine/malignant_squill.py index 7eb14d5a..2b96c627 100644 --- a/scripts/mobiles/tatooine/malignant_squill.py +++ b/scripts/mobiles/tatooine/malignant_squill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('malignant squill') + mobileTemplate.setCreatureName('malignant_squill') mobileTemplate.setLevel(50) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/minor_worrt.py b/scripts/mobiles/tatooine/minor_worrt.py index ceb7b57e..5ffa7afe 100644 --- a/scripts/mobiles/tatooine/minor_worrt.py +++ b/scripts/mobiles/tatooine/minor_worrt.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('minor worrt') + mobileTemplate.setCreatureName('minor_worrt') mobileTemplate.setLevel(3) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/mound_mite.py b/scripts/mobiles/tatooine/mound_mite.py index 356e926f..c62a5715 100644 --- a/scripts/mobiles/tatooine/mound_mite.py +++ b/scripts/mobiles/tatooine/mound_mite.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mound mite') + mobileTemplate.setCreatureName('mound_mite') mobileTemplate.setLevel(4) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/mountain_dewback.py b/scripts/mobiles/tatooine/mountain_dewback.py index f8e22413..6b73306f 100644 --- a/scripts/mobiles/tatooine/mountain_dewback.py +++ b/scripts/mobiles/tatooine/mountain_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mountain dewback') + mobileTemplate.setCreatureName('mountain_dewback') mobileTemplate.setLevel(22) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/mountain_squill.py b/scripts/mobiles/tatooine/mountain_squill.py index a185ec67..052d4e62 100644 --- a/scripts/mobiles/tatooine/mountain_squill.py +++ b/scripts/mobiles/tatooine/mountain_squill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mountain squill') + mobileTemplate.setCreatureName('mountain_squill') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/mountain_squill_guardian.py b/scripts/mobiles/tatooine/mountain_squill_guardian.py index 06f0fe03..5b402840 100644 --- a/scripts/mobiles/tatooine/mountain_squill_guardian.py +++ b/scripts/mobiles/tatooine/mountain_squill_guardian.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mountain squill guardian') + mobileTemplate.setCreatureName('mountain_squill_guardian') mobileTemplate.setLevel(19) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/mountain_squill_hunter.py b/scripts/mobiles/tatooine/mountain_squill_hunter.py index eb9de090..5393c868 100644 --- a/scripts/mobiles/tatooine/mountain_squill_hunter.py +++ b/scripts/mobiles/tatooine/mountain_squill_hunter.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mountain squill hunter') + mobileTemplate.setCreatureName('mountain_squill_hunter') mobileTemplate.setLevel(19) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/mountain_worrt.py b/scripts/mobiles/tatooine/mountain_worrt.py index 6b0119e0..1790dd65 100644 --- a/scripts/mobiles/tatooine/mountain_worrt.py +++ b/scripts/mobiles/tatooine/mountain_worrt.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mountain worrt') + mobileTemplate.setCreatureName('mountain_worrt') mobileTemplate.setLevel(19) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/mutant_womprat.py b/scripts/mobiles/tatooine/mutant_womprat.py index c2ca1a39..831182ac 100644 --- a/scripts/mobiles/tatooine/mutant_womprat.py +++ b/scripts/mobiles/tatooine/mutant_womprat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('mutant womprat') + mobileTemplate.setCreatureName('mutant_womprat') mobileTemplate.setLevel(12) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/overkreetle.py b/scripts/mobiles/tatooine/overkreetle.py index 9ffa6933..7f6bb056 100644 --- a/scripts/mobiles/tatooine/overkreetle.py +++ b/scripts/mobiles/tatooine/overkreetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('overkreetle') + mobileTemplate.setCreatureName('kreetle_over') mobileTemplate.setLevel(11) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/parry_stormtrooper_dewback.py b/scripts/mobiles/tatooine/parry_stormtrooper_dewback.py index df5fbd32..9c961a1f 100644 --- a/scripts/mobiles/tatooine/parry_stormtrooper_dewback.py +++ b/scripts/mobiles/tatooine/parry_stormtrooper_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('parry stormtrooper dewback') + mobileTemplate.setCreatureName('parry_stormtrooper_dewback') mobileTemplate.setLevel(17) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/plaque_rat.py b/scripts/mobiles/tatooine/plaque_rat.py index 60344d10..53a5a8e1 100644 --- a/scripts/mobiles/tatooine/plaque_rat.py +++ b/scripts/mobiles/tatooine/plaque_rat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('plaque womprat') + mobileTemplate.setCreatureName('womprat_plague') mobileTemplate.setLevel(1) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/razorback_felspur.py b/scripts/mobiles/tatooine/razorback_felspur.py index 9ff3e68b..ca591441 100644 --- a/scripts/mobiles/tatooine/razorback_felspur.py +++ b/scripts/mobiles/tatooine/razorback_felspur.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('razorback felspur') + mobileTemplate.setCreatureName('desert_razorback_felspur') mobileTemplate.setLevel(24) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/razorclaw.py b/scripts/mobiles/tatooine/razorclaw.py index d86e1e40..2434283f 100644 --- a/scripts/mobiles/tatooine/razorclaw.py +++ b/scripts/mobiles/tatooine/razorclaw.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('razorclaw') + mobileTemplate.setCreatureName('elite_desert_razorback') mobileTemplate.setLevel(23) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/rock_beetle.py b/scripts/mobiles/tatooine/rock_beetle.py index 56a14ab5..e5241063 100644 --- a/scripts/mobiles/tatooine/rock_beetle.py +++ b/scripts/mobiles/tatooine/rock_beetle.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('rock beetle') + mobileTemplate.setCreatureName('rock_beetle') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(1) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/rock_beetle1.py b/scripts/mobiles/tatooine/rock_beetle1.py index 2c2026ff..6145a123 100644 --- a/scripts/mobiles/tatooine/rock_beetle1.py +++ b/scripts/mobiles/tatooine/rock_beetle1.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('rock beetle') + mobileTemplate.setCreatureName('rock_beetle') mobileTemplate.setLevel(19) mobileTemplate.setDifficulty(1) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/rock_beetle_cave.py b/scripts/mobiles/tatooine/rock_beetle_cave.py index adc6c8f9..afa926ac 100644 --- a/scripts/mobiles/tatooine/rock_beetle_cave.py +++ b/scripts/mobiles/tatooine/rock_beetle_cave.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('rock beetle cave') + mobileTemplate.setCreatureName('rock_beetle_cave') mobileTemplate.setLevel(19) mobileTemplate.setDifficulty(1) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/runted_rill.py b/scripts/mobiles/tatooine/runted_rill.py index 99cff0db..dd84444f 100644 --- a/scripts/mobiles/tatooine/runted_rill.py +++ b/scripts/mobiles/tatooine/runted_rill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('runted rill') + mobileTemplate.setCreatureName('runted_rill') mobileTemplate.setLevel(1) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/sand_beetle.py b/scripts/mobiles/tatooine/sand_beetle.py index c94eaeb0..072fa787 100644 --- a/scripts/mobiles/tatooine/sand_beetle.py +++ b/scripts/mobiles/tatooine/sand_beetle.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('sand beetle') + mobileTemplate.setCreatureName('sand_beetle') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(1) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/sandreaver.py b/scripts/mobiles/tatooine/sandreaver.py index 704c661c..86af2d0b 100644 --- a/scripts/mobiles/tatooine/sandreaver.py +++ b/scripts/mobiles/tatooine/sandreaver.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('sandreaver') + mobileTemplate.setCreatureName('dewback_sandreaver') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/savage_zucca_boar.py b/scripts/mobiles/tatooine/savage_zucca_boar.py index e12fb28b..646cc819 100644 --- a/scripts/mobiles/tatooine/savage_zucca_boar.py +++ b/scripts/mobiles/tatooine/savage_zucca_boar.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('savage zucca boar') + mobileTemplate.setCreatureName('elite_zucca_boar') mobileTemplate.setLevel(8) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/sewer_worrt.py b/scripts/mobiles/tatooine/sewer_worrt.py index 036d0fdf..ac614b18 100644 --- a/scripts/mobiles/tatooine/sewer_worrt.py +++ b/scripts/mobiles/tatooine/sewer_worrt.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('sewer worrt') + mobileTemplate.setCreatureName('sewer_worrt') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/sickly_womprat.py b/scripts/mobiles/tatooine/sickly_womprat.py index 37a4d028..3961ece7 100644 --- a/scripts/mobiles/tatooine/sickly_womprat.py +++ b/scripts/mobiles/tatooine/sickly_womprat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('sickly womprat') + mobileTemplate.setCreatureName('sickly_womprat') mobileTemplate.setLevel(1) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/slum_rat.py b/scripts/mobiles/tatooine/slum_rat.py index d1dcad52..90eeb0cf 100644 --- a/scripts/mobiles/tatooine/slum_rat.py +++ b/scripts/mobiles/tatooine/slum_rat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('slum rat') + mobileTemplate.setCreatureName('womprat_city') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/snarlfang.py b/scripts/mobiles/tatooine/snarlfang.py index cf2ad8bc..95aa8910 100644 --- a/scripts/mobiles/tatooine/snarlfang.py +++ b/scripts/mobiles/tatooine/snarlfang.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('snarlfang') + mobileTemplate.setCreatureName('elite_bocatt') mobileTemplate.setLevel(17) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/stormtrooper_dewback.py b/scripts/mobiles/tatooine/stormtrooper_dewback.py index 21a25d5e..b6dcea7f 100644 --- a/scripts/mobiles/tatooine/stormtrooper_dewback.py +++ b/scripts/mobiles/tatooine/stormtrooper_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('stormtrooper dewback') + mobileTemplate.setCreatureName('stormtrooper_dewback') mobileTemplate.setLevel(14) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/sunstained_dunelizard.py b/scripts/mobiles/tatooine/sunstained_dunelizard.py index ca83b06a..03737a37 100644 --- a/scripts/mobiles/tatooine/sunstained_dunelizard.py +++ b/scripts/mobiles/tatooine/sunstained_dunelizard.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('sunstained dune lizard') + mobileTemplate.setCreatureName('dune_lizard_sunstained') mobileTemplate.setLevel(19) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/swarming_lesser_dewback.py b/scripts/mobiles/tatooine/swarming_lesser_dewback.py index ce473e54..88fae935 100644 --- a/scripts/mobiles/tatooine/swarming_lesser_dewback.py +++ b/scripts/mobiles/tatooine/swarming_lesser_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('swarming lesser dewback') + mobileTemplate.setCreatureName('swarming_lesser_dewback') mobileTemplate.setLevel(13) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/tame_womprat.py b/scripts/mobiles/tatooine/tame_womprat.py index 99045672..bbc970a1 100644 --- a/scripts/mobiles/tatooine/tame_womprat.py +++ b/scripts/mobiles/tatooine/tame_womprat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('tame womprat') + mobileTemplate.setCreatureName('tame_womprat') mobileTemplate.setLevel(2) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/tame_worrt.py b/scripts/mobiles/tatooine/tame_worrt.py index eab5119b..75bda089 100644 --- a/scripts/mobiles/tatooine/tame_worrt.py +++ b/scripts/mobiles/tatooine/tame_worrt.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('tame worrt') + mobileTemplate.setCreatureName('tame_worrt') mobileTemplate.setLevel(5) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/tatooine_mynock.py b/scripts/mobiles/tatooine/tatooine_mynock.py index c43ed47d..64b3e4f1 100644 --- a/scripts/mobiles/tatooine/tatooine_mynock.py +++ b/scripts/mobiles/tatooine/tatooine_mynock.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('rill') + mobileTemplate.setCreatureName('tatooine_mynock') mobileTemplate.setLevel(2) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/tempest_till.py b/scripts/mobiles/tatooine/tempest_rill.py similarity index 94% rename from scripts/mobiles/tatooine/tempest_till.py rename to scripts/mobiles/tatooine/tempest_rill.py index a97d3f0c..d5df155c 100644 --- a/scripts/mobiles/tatooine/tempest_till.py +++ b/scripts/mobiles/tatooine/tempest_rill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('tempest rill') + mobileTemplate.setCreatureName('rill_tempest') mobileTemplate.setLevel(8) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/tormented_bocatt.py b/scripts/mobiles/tatooine/tormented_bocatt.py index a31e72b5..ed5c4ecd 100644 --- a/scripts/mobiles/tatooine/tormented_bocatt.py +++ b/scripts/mobiles/tatooine/tormented_bocatt.py @@ -6,10 +6,10 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('tormented bocatt') + mobileTemplate.setCreatureName('bocatt_tormented') mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(0) - mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackRange(15) mobileTemplate.setWeaponType(6) mobileTemplate.setAttackSpeed(1.0) diff --git a/scripts/mobiles/tatooine/tusken_bantha.py b/scripts/mobiles/tatooine/tusken_bantha.py index a194bd6e..13943979 100644 --- a/scripts/mobiles/tatooine/tusken_bantha.py +++ b/scripts/mobiles/tatooine/tusken_bantha.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('tusken bantha') + mobileTemplate.setCreatureName('feeder_tusken_bantha') mobileTemplate.setLevel(30) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/twisted_dewback.py b/scripts/mobiles/tatooine/twisted_dewback.py index 750b9733..f88b8020 100644 --- a/scripts/mobiles/tatooine/twisted_dewback.py +++ b/scripts/mobiles/tatooine/twisted_dewback.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('twisted dewback') + mobileTemplate.setCreatureName('twisted_dewback') mobileTemplate.setLevel(11) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/twisted_rill.py b/scripts/mobiles/tatooine/twisted_rill.py index 9b689cb0..977dd020 100644 --- a/scripts/mobiles/tatooine/twisted_rill.py +++ b/scripts/mobiles/tatooine/twisted_rill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('twisted rill') + mobileTemplate.setCreatureName('twisted_rill') mobileTemplate.setLevel(11) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/twisted_womprat.py b/scripts/mobiles/tatooine/twisted_womprat.py index 6388ed87..851ffcda 100644 --- a/scripts/mobiles/tatooine/twisted_womprat.py +++ b/scripts/mobiles/tatooine/twisted_womprat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('twisted womprat') + mobileTemplate.setCreatureName('twisted_womprat') mobileTemplate.setLevel(11) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/variegated_womprat.py b/scripts/mobiles/tatooine/variegated_womprat.py index df0ef125..72cc6401 100644 --- a/scripts/mobiles/tatooine/variegated_womprat.py +++ b/scripts/mobiles/tatooine/variegated_womprat.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('variegated womprat') + mobileTemplate.setCreatureName('variegated_womprat') mobileTemplate.setLevel(12) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/vicious_rill.py b/scripts/mobiles/tatooine/vicious_rill.py index 55a485e3..19262365 100644 --- a/scripts/mobiles/tatooine/vicious_rill.py +++ b/scripts/mobiles/tatooine/vicious_rill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('vicious rill') + mobileTemplate.setCreatureName('vicious_rill') mobileTemplate.setLevel(3) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/volatile_scyk.py b/scripts/mobiles/tatooine/volatile_scyk.py index 4256fbf1..0262572f 100644 --- a/scripts/mobiles/tatooine/volatile_scyk.py +++ b/scripts/mobiles/tatooine/volatile_scyk.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('volatile scyk') + mobileTemplate.setCreatureName('scyk_volatile') mobileTemplate.setLevel(12) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/wasteland_cupa.py b/scripts/mobiles/tatooine/wasteland_cupa.py index 38ced582..e7bcd8b2 100644 --- a/scripts/mobiles/tatooine/wasteland_cupa.py +++ b/scripts/mobiles/tatooine/wasteland_cupa.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('wasteland cu pa') + mobileTemplate.setCreatureName('wasteland_cu_pa') mobileTemplate.setLevel(20) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/wild_bladeback_boar.py b/scripts/mobiles/tatooine/wild_bladeback_boar.py index a8656878..6568f78f 100644 --- a/scripts/mobiles/tatooine/wild_bladeback_boar.py +++ b/scripts/mobiles/tatooine/wild_bladeback_boar.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('wild bladeback boar') + mobileTemplate.setCreatureName('quest_hero_of_tatooine_ferocious_beast') mobileTemplate.setLevel(40) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/wild_dune_boar.py b/scripts/mobiles/tatooine/wild_dune_boar.py index 19db1593..61a673ae 100644 --- a/scripts/mobiles/tatooine/wild_dune_boar.py +++ b/scripts/mobiles/tatooine/wild_dune_boar.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('wild dune boar') + mobileTemplate.setCreatureName('wild_dune_boar') mobileTemplate.setLevel(50) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/wonderous_cupa.py b/scripts/mobiles/tatooine/wonderous_cupa.py index 681b73d7..377aea78 100644 --- a/scripts/mobiles/tatooine/wonderous_cupa.py +++ b/scripts/mobiles/tatooine/wonderous_cupa.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('wonderous cu pa') + mobileTemplate.setCreatureName('cu_pa_wonderous') mobileTemplate.setLevel(12) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/worrt_gutbuster.py b/scripts/mobiles/tatooine/worrt_gutbuster.py index f09626d9..83f03334 100644 --- a/scripts/mobiles/tatooine/worrt_gutbuster.py +++ b/scripts/mobiles/tatooine/worrt_gutbuster.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('worrt gutbuster') + mobileTemplate.setCreatureName('worrt_gutbuster') mobileTemplate.setLevel(13) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/young_mountain_squill.py b/scripts/mobiles/tatooine/young_mountain_squill.py index c6802f0e..934f5c31 100644 --- a/scripts/mobiles/tatooine/young_mountain_squill.py +++ b/scripts/mobiles/tatooine/young_mountain_squill.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('young mountain squill') + mobileTemplate.setCreatureName('young_mountain_squill') mobileTemplate.setLevel(16) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) diff --git a/scripts/mobiles/tatooine/zucca_boar.py b/scripts/mobiles/tatooine/zucca_boar.py index 722026b0..8b278a9c 100644 --- a/scripts/mobiles/tatooine/zucca_boar.py +++ b/scripts/mobiles/tatooine/zucca_boar.py @@ -6,7 +6,7 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('zucca boar') + mobileTemplate.setCreatureName('zucca_boar') mobileTemplate.setLevel(8) mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(5) From b0e2a490f69b127d328297cd7e33dfb40d5176c7 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Mon, 28 Apr 2014 17:34:39 -0400 Subject: [PATCH 29/29] Changes to MissionObjective, started working on player bounties --- .gitignore | 3 +- odb/bounties/placeholder.txt | 0 scripts/commands/setgodmode.py | 8 +- scripts/conversation/missions/deliver.py | 8 +- .../tangible/terminal/terminal_mission.py | 4 +- .../terminal/terminal_mission_bounty.py | 1 + src/main/NGECore.java | 6 + src/resources/common/BountyListItem.java | 105 ++++++++++ .../objectives/BountyMissionObjective.java | 80 ++++++++ .../objectives/DeliveryMissionObjective.java | 26 +-- .../objectives/DestroyMissionObjective.java | 19 +- .../mission/MissionMessageBuilder.java | 14 +- .../objects/mission/MissionObject.java | 26 ++- src/services/CharacterService.java | 2 + src/services/GroupService.java | 10 + src/services/PlayerService.java | 22 ++ src/services/combat/CombatService.java | 2 + src/services/mission/MissionObjective.java | 11 +- src/services/mission/MissionService.java | 194 +++++++++++++++--- 19 files changed, 461 insertions(+), 80 deletions(-) create mode 100644 odb/bounties/placeholder.txt create mode 100644 src/resources/common/BountyListItem.java create mode 100644 src/resources/objectives/BountyMissionObjective.java diff --git a/.gitignore b/.gitignore index 63147709..ab30f143 100644 --- a/.gitignore +++ b/.gitignore @@ -60,7 +60,8 @@ odb/chatRooms/je.info.* odb/resourcehistory/je.info.* odb/resourceroots/je.info.* odb/resources/je.info.* -odb/auction/je.info.* +odb/auction/je.info.* +odb/bounties/je.info.* # External tool builders .externalToolBuilders/ diff --git a/odb/bounties/placeholder.txt b/odb/bounties/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/scripts/commands/setgodmode.py b/scripts/commands/setgodmode.py index e66d7982..65b10b3f 100644 --- a/scripts/commands/setgodmode.py +++ b/scripts/commands/setgodmode.py @@ -99,11 +99,9 @@ def run(core, actor, target, commandString): if (actor.isInStealth()): actor.setInStealth(False) actor.setRadarVisible(True) - actor.sendSystemMessage('You are now visible to other players.', 0) else: actor.setInStealth(True) actor.setRadarVisible(False) - actor.sendSystemMessage('You are now hidden from players. "Stealth Effect" is not implemented, however players still won\'t be able to see you. Type /setgodmode stealth again to be visible.', 0) elif command == 'holoEmote' and arg1: playerObject.setHoloEmote('holoemote_' + arg1) @@ -114,5 +112,9 @@ def run(core, actor, target, commandString): if playerObject.getGodLevel > 0: actor.removeAbility("admin") playerObject.setGodLevel(0) - + + elif command == 'setBounty' and arg1: + core.missionService.createNewBounty(actor, int(arg1)) + return + return diff --git a/scripts/conversation/missions/deliver.py b/scripts/conversation/missions/deliver.py index 5caef3fa..f8ee5667 100644 --- a/scripts/conversation/missions/deliver.py +++ b/scripts/conversation/missions/deliver.py @@ -44,8 +44,8 @@ def handlePickupStage(core, actor, npc, objective, mission): return core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'p') - objective.createDeliveryItem() - objective.update() + objective.createDeliveryItem(core, actor) + objective.update(core, actor) return def handleDeliveryStage(core, actor, npc, objective, mission): @@ -56,7 +56,7 @@ def handleDeliveryStage(core, actor, npc, objective, mission): core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'r') core.objectService.destroyObject(objective.getDeliveryObject()) - objective.update() + objective.update(core, actor) return def handleCompletionStage(core, actor, npc, objective, mission): @@ -66,5 +66,5 @@ def handleCompletionStage(core, actor, npc, objective, mission): return core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 's') - objective.complete() + objective.complete(core, actor) return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_mission.py b/scripts/object/tangible/terminal/terminal_mission.py index ccf684c0..dd9fc3e1 100644 --- a/scripts/object/tangible/terminal/terminal_mission.py +++ b/scripts/object/tangible/terminal/terminal_mission.py @@ -1,9 +1,7 @@ -from resources.common import TerminalType import sys def setup(core, object): - core.mapService.addLocation(object.getPlanet(), 'Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 44, 0) - object.setAttachment("terminalType", TerminalType.MISSION_GENERIC) + object.setAttachment("terminalType", 1) return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_mission_bounty.py b/scripts/object/tangible/terminal/terminal_mission_bounty.py index ccad8904..4103f954 100644 --- a/scripts/object/tangible/terminal/terminal_mission_bounty.py +++ b/scripts/object/tangible/terminal/terminal_mission_bounty.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment("terminalType", 2) return \ No newline at end of file diff --git a/src/main/NGECore.java b/src/main/NGECore.java index c99d4912..5f81be51 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -213,6 +213,7 @@ public class NGECore { private ObjectDatabase resourcesODB; private ObjectDatabase resourceRootsODB; private ObjectDatabase resourceHistoryODB; + private ObjectDatabase bountiesODB; public static boolean PACKET_DEBUG = false; @@ -274,6 +275,7 @@ public class NGECore { resourceRootsODB = new ObjectDatabase("resourceroots", true, false, true); resourceHistoryODB = new ObjectDatabase("resourcehistory", true, false, true); auctionODB = new ObjectDatabase("auction", true, false, true); + bountiesODB = new ObjectDatabase("bounties", true, false, true); // Services loginService = new LoginService(this); @@ -626,6 +628,10 @@ public class NGECore { return chatRoomODB; } + public ObjectDatabase getBountiesODB() { + return bountiesODB; + } + public ObjectDatabase getResourcesODB() { return resourcesODB; } diff --git a/src/resources/common/BountyListItem.java b/src/resources/common/BountyListItem.java new file mode 100644 index 00000000..5581483c --- /dev/null +++ b/src/resources/common/BountyListItem.java @@ -0,0 +1,105 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package resources.common; + +import java.util.ArrayList; +import java.util.List; + +import com.sleepycat.persist.model.Entity; +import com.sleepycat.persist.model.PrimaryKey; + +@Entity +public class BountyListItem { + @PrimaryKey + private long objectId; + private int creditReward; + private String profession; + private String faction; + private String name; + private List assignedHunters; + + public BountyListItem() { } + + public BountyListItem(long objectId, int creditReward, String profession, String faction, String name) { + this.objectId = objectId; + this.creditReward = creditReward; + this.profession = profession; + this.faction = faction; + this.setName(name); + this.setAssignedHunters(new ArrayList(3)); + } + + public long getObjectId() { + return objectId; + } + public void setObjectId(long objectId) { + this.objectId = objectId; + } + public int getCreditReward() { + return creditReward; + } + public void setCreditReward(int creditReward) { + this.creditReward = creditReward; + } + public String getProfession() { + return profession; + } + public void setProfession(String profession) { + this.profession = profession; + } + + public String getFaction() { + return faction; + } + + public void setFaction(String faction) { + this.faction = faction; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public void addBounty(int amountToAdd) { + this.creditReward =+ amountToAdd; + } + + public List getAssignedHunters() { + return assignedHunters; + } + + public void setAssignedHunters(List assignedHunters) { + this.assignedHunters = assignedHunters; + } + + public boolean addBountyHunter(long objectId) { + return assignedHunters.add(objectId); + } + + public boolean removeBountyHunter(long objectId) { + return assignedHunters.remove(objectId); + } +} diff --git a/src/resources/objectives/BountyMissionObjective.java b/src/resources/objectives/BountyMissionObjective.java new file mode 100644 index 00000000..96b90c88 --- /dev/null +++ b/src/resources/objectives/BountyMissionObjective.java @@ -0,0 +1,80 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package resources.objectives; + +import java.util.Random; + +import engine.resources.scene.Point3D; +import main.NGECore; +import resources.common.BountyListItem; +import resources.objects.creature.CreatureObject; +import resources.objects.mission.MissionObject; +import services.mission.MissionObjective; + +public class BountyMissionObjective extends MissionObjective { + + private Point3D lastKnownLocation; + private long markObjId; + + public BountyMissionObjective(MissionObject parent) { + super(parent); + } + + @Override + public void activate(NGECore core, CreatureObject player) { + if (isActivated()) + return; + + BountyListItem bountyTarget = core.missionService.getBountyListItem(getMissionObject().getBountyObjId()); + + setMarkObjId(bountyTarget.getObjectId()); + + // TODO: Change this to a comm message. + player.sendSystemMessage("@mission/mission_bounty_informant:target_hard_" + Integer.toString(new Random().nextInt(5)), (byte) 0); + + + } + + @Override + public void complete(NGECore core, CreatureObject player) { + + } + + @Override + public void abort(NGECore core, CreatureObject player) { + + } + + @Override + public void update(NGECore core, CreatureObject player) { + + } + + public Point3D getLastKnownLocation() { return lastKnownLocation; } + + public void setLastKnownLocation(Point3D lastKnownLocation) { this.lastKnownLocation = lastKnownLocation; } + + public long getMarkObjId() { return markObjId; } + + public void setMarkObjId(long markObjId) { this.markObjId = markObjId; } + +} diff --git a/src/resources/objectives/DeliveryMissionObjective.java b/src/resources/objectives/DeliveryMissionObjective.java index b5802390..6a116a8e 100644 --- a/src/resources/objectives/DeliveryMissionObjective.java +++ b/src/resources/objectives/DeliveryMissionObjective.java @@ -21,7 +21,6 @@ ******************************************************************************/ package resources.objectives; -import engine.resources.objects.SWGObject; import engine.resources.scene.Point3D; import main.NGECore; import resources.common.OutOfBand; @@ -37,14 +36,13 @@ public class DeliveryMissionObjective extends MissionObjective { private TangibleObject deliveryObject; private CreatureObject missionGiver; private CreatureObject dropOffNpc; - private NGECore core = NGECore.getInstance(); public DeliveryMissionObjective(MissionObject parent) { super(parent); } @Override - public void activate() { + public void activate(NGECore core, CreatureObject player) { if (isActivated()) return; @@ -97,25 +95,21 @@ public class DeliveryMissionObjective extends MissionObjective { } @Override - public void complete() { - CreatureObject completer = (CreatureObject) getMissionObject().getGrandparent(); - - if (completer == null) - return; - + public void complete(NGECore core, CreatureObject player) { + int reward = getMissionObject().getCreditReward(); - completer.addBankCredits(reward); + player.addBankCredits(reward); - completer.sendSystemMessage(new OutOfBand(new ProsePackage("@mission/mission_generic:success_w_amount", reward)), (byte) 0); + player.sendSystemMessage(new OutOfBand(new ProsePackage("@mission/mission_generic:success_w_amount", reward)), (byte) 0); - abort(); + abort(core, player); core.objectService.destroyObject(getMissionObject()); } @Override - public void abort() { + public void abort(NGECore core, CreatureObject player) { if (deliveryObject != null) core.objectService.destroyObject(deliveryObject.getObjectId()); @@ -127,7 +121,7 @@ public class DeliveryMissionObjective extends MissionObjective { } @Override - public void update() { + public void update(NGECore core, CreatureObject player) { setObjectivePhase(getObjectivePhase() + 1); @@ -154,10 +148,8 @@ public class DeliveryMissionObjective extends MissionObjective { } } - public boolean createDeliveryItem() { + public boolean createDeliveryItem(NGECore core, CreatureObject player) { - SWGObject player = getMissionObject().getGrandparent(); - if (player == null) return false; diff --git a/src/resources/objectives/DestroyMissionObjective.java b/src/resources/objectives/DestroyMissionObjective.java index e4832756..7437d46f 100644 --- a/src/resources/objectives/DestroyMissionObjective.java +++ b/src/resources/objectives/DestroyMissionObjective.java @@ -21,6 +21,8 @@ ******************************************************************************/ package resources.objectives; +import main.NGECore; +import resources.objects.creature.CreatureObject; import resources.objects.mission.MissionObject; import services.mission.MissionObjective; @@ -31,27 +33,28 @@ public class DestroyMissionObjective extends MissionObjective { } @Override - public void activate() { + public void activate(NGECore core, CreatureObject player) { // TODO Auto-generated method stub - + } @Override - public void complete() { + public void complete(NGECore core, CreatureObject player) { // TODO Auto-generated method stub - + } @Override - public void abort() { + public void abort(NGECore core, CreatureObject player) { // TODO Auto-generated method stub - + } @Override - public void update() { + public void update(NGECore core, CreatureObject player) { // TODO Auto-generated method stub - + } + } diff --git a/src/resources/objects/mission/MissionMessageBuilder.java b/src/resources/objects/mission/MissionMessageBuilder.java index 24c9aa07..071a4f58 100644 --- a/src/resources/objects/mission/MissionMessageBuilder.java +++ b/src/resources/objects/mission/MissionMessageBuilder.java @@ -304,13 +304,13 @@ public class MissionMessageBuilder extends ObjectMessageBuilder { return buffer; } - public IoBuffer buildMissionDescriptionDelta(String desc, int id) { + public IoBuffer buildMissionDescriptionDelta(String desc, int id, String additionalParam) { - IoBuffer buffer = IoBuffer.allocate(12 + desc.length(), false).order(ByteOrder.LITTLE_ENDIAN); + IoBuffer buffer = IoBuffer.allocate(13 + desc.length() + additionalParam.length(), false).order(ByteOrder.LITTLE_ENDIAN); buffer.put(getAsciiString(desc)); buffer.putInt(0); - buffer.put(getAsciiString("m" + id + "d")); + buffer.put(getAsciiString("m" + id + "d" + additionalParam)); int size = buffer.position(); buffer.flip(); @@ -318,14 +318,14 @@ public class MissionMessageBuilder extends ObjectMessageBuilder { return buffer; } - - public IoBuffer buildMissionTitleDelta(String title, int id) { - IoBuffer buffer = IoBuffer.allocate(12 + title.length(), false).order(ByteOrder.LITTLE_ENDIAN); + public IoBuffer buildMissionTitleDelta(String title, int id, String additionalParam) { + + IoBuffer buffer = IoBuffer.allocate(12 + title.length() + additionalParam.length(), false).order(ByteOrder.LITTLE_ENDIAN); buffer.put(getAsciiString(title)); buffer.putInt(0); - buffer.put(getAsciiString("m" + id + "t")); + buffer.put(getAsciiString("m" + id + "t" + additionalParam)); int size = buffer.position(); buffer.flip(); diff --git a/src/resources/objects/mission/MissionObject.java b/src/resources/objects/mission/MissionObject.java index 12ed3fa8..48f573f2 100644 --- a/src/resources/objects/mission/MissionObject.java +++ b/src/resources/objects/mission/MissionObject.java @@ -26,6 +26,7 @@ import com.sleepycat.je.Transaction; import com.sleepycat.persist.model.NotPersistent; import com.sleepycat.persist.model.Persistent; +import resources.common.BountyListItem; import resources.objects.intangible.IntangibleObject; import resources.objects.waypoint.WaypointObject; import services.mission.MissionObjective; @@ -53,8 +54,11 @@ public class MissionObject extends IntangibleObject implements IPersistent { private String type = ""; private int missionTemplateObject = 0; private WaypointObject attachedWaypoint; + + // Server variables private MissionObjective objective; - + private long bountyObjId; + @NotPersistent MissionMessageBuilder messageBuilder = new MissionMessageBuilder(this); @@ -148,11 +152,15 @@ public class MissionObject extends IntangibleObject implements IPersistent { } public void setMissionDescription(String missionDescription) { + setMissionDescription(missionDescription, ""); + } + + public void setMissionDescription(String missionDescription, String additionalParam) { synchronized(objectMutex) { this.description = missionDescription; } if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildMissionDescriptionDelta(missionDescription, missionId)); + getGrandparent().getClient().getSession().write(messageBuilder.buildMissionDescriptionDelta(missionDescription, missionId, additionalParam)); } } @@ -163,11 +171,15 @@ public class MissionObject extends IntangibleObject implements IPersistent { } public void setMissionTitle(String missionTitle) { + setMissionTitle(missionTitle, ""); + } + + public void setMissionTitle(String missionTitle, String additionalParam) { synchronized(objectMutex) { this.title = missionTitle; } if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildMissionTitleDelta(missionTitle, missionId)); + getGrandparent().getClient().getSession().write(messageBuilder.buildMissionTitleDelta(missionTitle, missionId, additionalParam)); } } @@ -286,6 +298,14 @@ public class MissionObject extends IntangibleObject implements IPersistent { this.missionId = missionId; } + public long getBountyObjId() { + return bountyObjId; + } + + public void setBountyObjId(long bountyObjId) { + this.bountyObjId = bountyObjId; + } + public Transaction getTransaction() { return txn; } diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java index b11bd350..7807b9ec 100644 --- a/src/services/CharacterService.java +++ b/src/services/CharacterService.java @@ -323,6 +323,8 @@ public class CharacterService implements INetworkDispatch { object.addAbility("startDance"); object.addAbility("startDance+Basic"); + object.setFaction("neutral"); + object.addObjectToEquipList(datapad); object.addObjectToEquipList(inventory); object.addObjectToEquipList(bank); diff --git a/src/services/GroupService.java b/src/services/GroupService.java index fa4d9d5b..3f063a74 100644 --- a/src/services/GroupService.java +++ b/src/services/GroupService.java @@ -146,6 +146,12 @@ public class GroupService implements INetworkDispatch { group.setGroupLeader(leader); group.getMemberList().add(leader); group.getMemberList().add(invited); + + if (invited.getLevel() > leader.getLevel()) + group.setGroupLevel(invited.getLevel()); + else + group.setGroupLevel(leader.getLevel()); + leader.makeAware(group); leader.setGroupId(group.getObjectID()); invited.makeAware(group); @@ -170,6 +176,10 @@ public class GroupService implements INetworkDispatch { invited.makeAware(group); invited.setGroupId(group.getObjectID()); invited.sendSystemMessage("@group:joined_self", (byte) 0); + + if (group.getGroupLevel() < invited.getLevel()) + group.setGroupLevel(invited.getLevel()); + addGroupBuffsToMember(group, invited); core.chatService.joinChatRoom(invited.getCustomName(), group.getChatRoomId(), true); diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index ea075dc5..564bec61 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -58,6 +58,7 @@ import protocol.swg.ShowHelmet; import protocol.swg.objectControllerObjects.ChangeRoleIconChoice; import protocol.swg.objectControllerObjects.ShowFlyText; import protocol.swg.objectControllerObjects.ShowLootBox; +import resources.common.BountyListItem; import resources.common.FileUtilities; import resources.common.ObjControllerOpcodes; import resources.common.Opcodes; @@ -78,6 +79,7 @@ import resources.objects.player.PlayerMessageBuilder; import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; import resources.objects.waypoint.WaypointObject; +import services.sui.SUIService.InputBoxType; import services.sui.SUIService.ListBoxType; import services.sui.SUIWindow; import services.sui.SUIWindow.Trigger; @@ -1252,6 +1254,26 @@ public class PlayerService implements INetworkDispatch { core.suiService.openSUIWindow(ringWindow); } + public void sendSetBountyWindow(final CreatureObject victim, final CreatureObject attacker) { + final SUIWindow bountyWindow = core.suiService.createInputBox(InputBoxType.INPUT_BOX_OK_CANCEL, "@bounty_hunter:setbounty_title", "@bounty_hunter:setbounty_prompt1 " + attacker.getCustomName() + "?" + "\n@bounty_hunter:setbounty_prompt2 " + victim.getBankCredits() + victim.getCashCredits(), + victim, null, (float) 10, new SUICallback() { + + @Override + public void process(SWGObject owner, int eventType, Vector returnList) { + if (eventType == 0 && returnList.get(0) != null) { + if (core.missionService.getBountyListItem(attacker.getObjectId()) != null) { + BountyListItem currentBounty = core.missionService.getBountyListItem(attacker.getObjectId()); + currentBounty.addBounty(Integer.parseInt(returnList.get(0))); + } else { + core.missionService.createNewBounty(attacker, Integer.parseInt(returnList.get(0))); + } + } + } + + }); + core.suiService.openSUIWindow(bountyWindow); + } + public String getFormalProfessionName(String template) { String formalName = ""; diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 1a265c8c..9dabaf94 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -991,6 +991,8 @@ public class CombatService implements INetworkDispatch { if(target.getDuelList().contains(attacker)) handleEndDuel(target, attacker, false); core.playerService.sendCloningWindow(target, attacker.getSlottedObject("ghost") != null); + //if (attacker.getSlottedObject("ghost") != null) + //core.playerService.sendSetBountyWindow(target, attacker); } public boolean areInDuel(CreatureObject creature1, CreatureObject creature2) { diff --git a/src/services/mission/MissionObjective.java b/src/services/mission/MissionObjective.java index c81fcc0a..8f43fe9f 100644 --- a/src/services/mission/MissionObjective.java +++ b/src/services/mission/MissionObjective.java @@ -21,8 +21,11 @@ ******************************************************************************/ package services.mission; +import main.NGECore; + import com.sleepycat.persist.model.Persistent; +import resources.objects.creature.CreatureObject; import resources.objects.mission.MissionObject; @Persistent(version=0) @@ -42,10 +45,10 @@ public abstract class MissionObjective { this.objectivePhase = 0; } - public abstract void activate(); - public abstract void complete(); - public abstract void abort(); - public abstract void update(); + public abstract void activate(NGECore core, CreatureObject player); + public abstract void complete(NGECore core, CreatureObject player); + public abstract void abort(NGECore core, CreatureObject player); + public abstract void update(NGECore core, CreatureObject player); public long getStartTime() { return startTime; } diff --git a/src/services/mission/MissionService.java b/src/services/mission/MissionService.java index 40b5abf0..d463893a 100644 --- a/src/services/mission/MissionService.java +++ b/src/services/mission/MissionService.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.nio.ByteOrder; import java.util.Map; import java.util.Random; +import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -35,24 +36,29 @@ import main.NGECore; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; +import com.sleepycat.je.Transaction; + import protocol.swg.ObjControllerMessage; import protocol.swg.objectControllerObjects.MissionAbort; import protocol.swg.objectControllerObjects.MissionAcceptRequest; import protocol.swg.objectControllerObjects.MissionAcceptResponse; import protocol.swg.objectControllerObjects.MissionListRequest; +import resources.common.BountyListItem; import resources.common.SpawnPoint; import resources.common.ObjControllerOpcodes; +import resources.objectives.BountyMissionObjective; import resources.objectives.DeliveryMissionObjective; import resources.objectives.DestroyMissionObjective; import resources.objects.creature.CreatureObject; import resources.objects.mission.MissionObject; +import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; -import resources.objects.waypoint.WaypointObject; import engine.clientdata.StfTable; import engine.clients.Client; import engine.resources.common.CRC; import engine.resources.common.NameGen; import engine.resources.container.Traverser; +import engine.resources.database.ObjectDatabase; import engine.resources.objects.SWGObject; import engine.resources.scene.Point3D; import engine.resources.service.INetworkDispatch; @@ -63,7 +69,9 @@ public class MissionService implements INetworkDispatch { private NGECore core; private NameGen nameGenerator; // Use a HashMap for obtaining number of entries so we aren't using a visitor all the time. - private ConcurrentHashMap entryCounts = new ConcurrentHashMap(); + private Map entryCounts = new ConcurrentHashMap(); + private Vector bountyList = new Vector(); + private ObjectDatabase bountiesODB; private Random ran = new Random(); public MissionService(NGECore core) { @@ -73,6 +81,8 @@ public class MissionService implements INetworkDispatch { catch (IOException e) { e.printStackTrace(); } loadMissionEntryCounts(); + + bountiesODB = core.getBountiesODB(); } @Override @@ -118,7 +128,7 @@ public class MissionService implements INetworkDispatch { if(client == null || client.getSession() == null) return; - SWGObject object = client.getParent(); + CreatureObject object = (CreatureObject) client.getParent(); if(object == null) return; @@ -137,8 +147,12 @@ public class MissionService implements INetworkDispatch { if (terminalType == TerminalType.GENERIC) { handleMissionListRequest(core.objectService.getObject(request.getObjectId()), request.getTickCount(), TerminalType.GENERIC); - } else if (terminalType == TerminalType.BOUNTYHUNTER) { - + } else if (terminalType == TerminalType.BOUNTY) { + if (!object.hasSkill("class_bountyhunter_phase1_novice")) { + object.sendSystemMessage("@mission/mission_generic:not_bounty_hunter_terminal", (byte) 0); + } else { + handleMissionListRequest(core.objectService.getObject(request.getObjectId()), request.getTickCount(), TerminalType.BOUNTY); + } } else if (terminalType == TerminalType.ENTERTAINER) { } else if (terminalType == TerminalType.ARTISAN) { @@ -191,7 +205,7 @@ public class MissionService implements INetworkDispatch { MissionObjective objective = mission.getObjective(); if (objective != null) - objective.abort(); + objective.abort(core, creature); core.objectService.destroyObject(mission.getObjectId()); } @@ -267,7 +281,7 @@ public class MissionService implements INetworkDispatch { if (type == TerminalType.GENERIC) randomDeliveryMission(player, mission); - else if (type == TerminalType.BOUNTYHUNTER) + else if (type == TerminalType.BOUNTY) randomBountyMission(player, mission); else if (type == TerminalType.ARTISAN) @@ -282,9 +296,9 @@ public class MissionService implements INetworkDispatch { } else if (typeTwoCount.get() < 4) { if (type == TerminalType.GENERIC) - randomDestroyMission(player, mission); + return; - else if (type == TerminalType.BOUNTYHUNTER) + else if (type == TerminalType.BOUNTY) return; else if (type == TerminalType.ARTISAN) @@ -293,8 +307,8 @@ public class MissionService implements INetworkDispatch { else return; - mission.setRepeatCount(requestCounter); - typeTwoCount.incrementAndGet(); + //mission.setRepeatCount(requestCounter); + //typeTwoCount.incrementAndGet(); } } }); @@ -338,7 +352,11 @@ public class MissionService implements INetworkDispatch { return true; } - private void createMissionObjective(CreatureObject creature, MissionObject mission) { + private MissionObjective createMissionObjective(CreatureObject creature, MissionObject mission) { + return createMissionObjective(creature, mission, false); + } + + private MissionObjective createMissionObjective(CreatureObject creature, MissionObject mission, boolean silent) { switch(mission.getMissionType()) { case "deliver": @@ -346,18 +364,32 @@ public class MissionService implements INetworkDispatch { mission.setObjective(deliveryObjective); - deliveryObjective.activate(); - break; + if (!silent) + deliveryObjective.activate(core, creature); + + return deliveryObjective; case "destroy": DestroyMissionObjective destroyObjective = new DestroyMissionObjective(mission); mission.setObjective(destroyObjective); - destroyObjective.activate(); - break; + if (!silent) + destroyObjective.activate(core, creature); + + return destroyObjective; + + case "bounty": + BountyMissionObjective bountyObjective = new BountyMissionObjective(mission); + + mission.setObjective(bountyObjective); + + if (!silent) + bountyObjective.activate(core, creature); + + return bountyObjective; default: - break; + return null; } } @@ -387,33 +419,135 @@ public class MissionService implements INetworkDispatch { mission.setMissionTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_datadisk.iff")); mission.setMissionTargetName("Datadisk"); - - WaypointObject waypoint = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", player.getPlanet()); - if (waypoint == null) - return; - - waypoint.setColor(WaypointObject.ORANGE); - - } - - private void randomDestroyMission(SWGObject player, MissionObject mission) { - } private void randomBountyMission(SWGObject player, MissionObject mission) { + BountyListItem bountyTarget = null; + if (bountyList.size() > 0) { + boolean gotBounty = false; + while (!gotBounty) { + bountyTarget = getRandomBounty(); + + if (bountyTarget == null || bountyTarget.getAssignedHunters().size() >= 3 || bountyTarget.getCreditReward() < 20000) + continue; + else + gotBounty = true; + } + } + + if (bountyTarget == null) + return; + + mission.setMissionType("bounty"); + + String missionStf = "mission/mission_bounty_jedi"; + + if (!bountyTarget.getProfession().equals("")) { // TODO: Smuggler mission checks. + if (bountyTarget.getFaction().equals("neutral")) { + mission.setMissionTargetName("@mission/mission_bounty_jedi:neutral_jedi"); + mission.setMissionId(3); + } + else if (bountyTarget.getFaction().equals("rebel")) { + mission.setMissionTargetName("@mission/mission_bounty_jedi:rebel_jedi"); + mission.setMissionId(2); + } + else if (bountyTarget.getFaction().equals("imperial")) { + mission.setMissionTargetName("@mission/mission_bounty_jedi:imperial_jedi"); + mission.setMissionId(1); + } + mission.setMissionTitle(missionStf); + mission.setMissionDescription(missionStf); + } else { + // TODO: Dead code, but place-holder for implementation of smuggler missions. + if (bountyTarget.getFaction().equals("neutral")) { + mission.setMissionId(3); + } + else if (bountyTarget.getFaction().equals("rebel")) { + mission.setMissionId(2); + } + else if (bountyTarget.getFaction().equals("imperial")) { + mission.setMissionId(1); + } + mission.setMissionTitle(missionStf, "s"); + mission.setMissionDescription(missionStf, "s"); + } + + mission.setMissionLevel(90); + + mission.setCreditReward(bountyTarget.getCreditReward()); + + mission.setMissionTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_bounty_jedi_target.iff")); + + mission.setBountyObjId(bountyTarget.getObjectId()); } public enum TerminalType {; public static final int GENERIC = 1; - public static final int BOUNTYHUNTER = 2; + public static final int BOUNTY = 2; public static final int ENTERTAINER = 3; public static final int ARTISAN = 4; public static final int EXPLORER = 5; } + public Vector getBountyList() { + return this.bountyList; + } + + public BountyListItem getRandomBounty() { + int bountyListId = ran.nextInt(bountyList.size()); + + return bountyList.get(bountyListId); + } + + public BountyListItem getBountyListItem(long objectId) { + Vector bounties = bountyList; + for (BountyListItem bounty : bounties) { + if (bounty.getObjectId() == objectId) + return bounty; + } + return null; + } + + public BountyListItem createNewBounty(CreatureObject bountyTarget, int reward) { + PlayerObject player = (PlayerObject) bountyTarget.getSlottedObject("ghost"); + if (player == null) + return null; + + if (getBountyListItem(bountyTarget.getObjectId()) != null) + return null; + + BountyListItem bounty = new BountyListItem(bountyTarget.getObjectId(), reward, core.playerService.getFormalProfessionName(player.getProfession()), bountyTarget.getFaction(), bountyTarget.getCustomName()); + + bountyList.add(bounty); + + //Transaction txn = bountiesODB.getEnvironment().beginTransaction(null, null); + //bountiesODB.put(bounty, Long.class, BountyListItem.class, txn); + //txn.commitSync(); + + //System.out.println("Put in bounty for " + bounty.getName() + " with amount " + reward); + + return bounty; + } + + public boolean addToExistingBounty(CreatureObject bountyTarget, int amountToAdd) { + PlayerObject player = (PlayerObject) bountyTarget.getSlottedObject("ghost"); + if (player == null) + return false; + + BountyListItem bounty = getBountyListItem(bountyTarget.getObjectId()); + + if (bounty == null) + return false; + + //Transaction txn = bountiesODB.getEnvironment().beginTransaction(null, null); + //bountiesODB.get(bounty, Long.class, BountyListItem.class); + //txn.commitSync(); + + return true; + } + @Override public void shutdown() { - } }