From e5d4577a4bcb2631167206731eb421a53e0dd699 Mon Sep 17 00:00:00 2001 From: Treeku Date: Fri, 16 May 2014 09:05:53 +0100 Subject: [PATCH] Changed option to options to avoid confusion To avoid confusion over why setOptionsBitmask produces "no such attribute" error. --- scripts/mobiles/tatooine/desert_swooper.py | 2 +- scripts/mobiles/tatooine/desert_swooper_leader.py | 2 +- scripts/mobiles/tatooine/error_prone_battle_droids.py | 2 +- scripts/mobiles/tatooine/escaped_criminal.py | 2 +- scripts/mobiles/tatooine/gunrunner.py | 2 +- scripts/mobiles/tatooine/gunrunner_sentry.py | 2 +- scripts/mobiles/tatooine/scavenger.py | 2 +- scripts/mobiles/tatooine/shinn_guard.py | 2 +- scripts/mobiles/tatooine/shinn_mugger.py | 2 +- scripts/mobiles/tatooine/swoop_gang_enforcer.py | 2 +- scripts/mobiles/tatooine/swoop_gang_punk.py | 2 +- scripts/mobiles/tatooine/swoop_gang_rogue.py | 2 +- scripts/mobiles/tatooine/swoop_gang_thug.py | 2 +- scripts/mobiles/tatooine/vaigonn_shinn.py | 2 +- scripts/mobiles/tatooine/water_thief.py | 2 +- src/services/spawn/MobileTemplate.java | 10 +++++----- src/services/spawn/SpawnService.java | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/mobiles/tatooine/desert_swooper.py b/scripts/mobiles/tatooine/desert_swooper.py index 351028c2..93521b04 100644 --- a/scripts/mobiles/tatooine/desert_swooper.py +++ b/scripts/mobiles/tatooine/desert_swooper.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("swoop") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_desert_swooper.iff') diff --git a/scripts/mobiles/tatooine/desert_swooper_leader.py b/scripts/mobiles/tatooine/desert_swooper_leader.py index e2351383..989da38c 100644 --- a/scripts/mobiles/tatooine/desert_swooper_leader.py +++ b/scripts/mobiles/tatooine/desert_swooper_leader.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("swoop") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_desert_swooper_leader.iff') diff --git a/scripts/mobiles/tatooine/error_prone_battle_droids.py b/scripts/mobiles/tatooine/error_prone_battle_droids.py index ee429906..ecf70d51 100644 --- a/scripts/mobiles/tatooine/error_prone_battle_droids.py +++ b/scripts/mobiles/tatooine/error_prone_battle_droids.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("error-prone battle droid") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_battle_droid.iff') diff --git a/scripts/mobiles/tatooine/escaped_criminal.py b/scripts/mobiles/tatooine/escaped_criminal.py index cd3ad316..f4c1a118 100644 --- a/scripts/mobiles/tatooine/escaped_criminal.py +++ b/scripts/mobiles/tatooine/escaped_criminal.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("desert demon") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() diff --git a/scripts/mobiles/tatooine/gunrunner.py b/scripts/mobiles/tatooine/gunrunner.py index 3ecdbd26..109b312d 100644 --- a/scripts/mobiles/tatooine/gunrunner.py +++ b/scripts/mobiles/tatooine/gunrunner.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("gunrunner") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_gunrunner.iff') diff --git a/scripts/mobiles/tatooine/gunrunner_sentry.py b/scripts/mobiles/tatooine/gunrunner_sentry.py index 58a8aeb8..e157f5ec 100644 --- a/scripts/mobiles/tatooine/gunrunner_sentry.py +++ b/scripts/mobiles/tatooine/gunrunner_sentry.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("gunrunner") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_gunrunner.iff') diff --git a/scripts/mobiles/tatooine/scavenger.py b/scripts/mobiles/tatooine/scavenger.py index 0851dff3..4c71b7f9 100644 --- a/scripts/mobiles/tatooine/scavenger.py +++ b/scripts/mobiles/tatooine/scavenger.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("thug") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() diff --git a/scripts/mobiles/tatooine/shinn_guard.py b/scripts/mobiles/tatooine/shinn_guard.py index b6882e9b..030b499f 100644 --- a/scripts/mobiles/tatooine/shinn_guard.py +++ b/scripts/mobiles/tatooine/shinn_guard.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("shinn mugger") mobileTemplate.setAssistRange(5) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_mugger.iff') diff --git a/scripts/mobiles/tatooine/shinn_mugger.py b/scripts/mobiles/tatooine/shinn_mugger.py index 2175de27..b4757037 100644 --- a/scripts/mobiles/tatooine/shinn_mugger.py +++ b/scripts/mobiles/tatooine/shinn_mugger.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("shinn mugger") mobileTemplate.setAssistRange(5) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_mugger.iff') diff --git a/scripts/mobiles/tatooine/swoop_gang_enforcer.py b/scripts/mobiles/tatooine/swoop_gang_enforcer.py index 3674fc0f..a4b8f9c6 100644 --- a/scripts/mobiles/tatooine/swoop_gang_enforcer.py +++ b/scripts/mobiles/tatooine/swoop_gang_enforcer.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("niko thug") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() diff --git a/scripts/mobiles/tatooine/swoop_gang_punk.py b/scripts/mobiles/tatooine/swoop_gang_punk.py index 8db1af6f..35546ea0 100644 --- a/scripts/mobiles/tatooine/swoop_gang_punk.py +++ b/scripts/mobiles/tatooine/swoop_gang_punk.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("niko thug") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_criminal_swooper_human_female_01.iff') diff --git a/scripts/mobiles/tatooine/swoop_gang_rogue.py b/scripts/mobiles/tatooine/swoop_gang_rogue.py index cb9de955..cb15bbb8 100644 --- a/scripts/mobiles/tatooine/swoop_gang_rogue.py +++ b/scripts/mobiles/tatooine/swoop_gang_rogue.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("niko thug") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_criminal_swooper_human_female_01.iff') diff --git a/scripts/mobiles/tatooine/swoop_gang_thug.py b/scripts/mobiles/tatooine/swoop_gang_thug.py index 9824abef..eb0fff4b 100644 --- a/scripts/mobiles/tatooine/swoop_gang_thug.py +++ b/scripts/mobiles/tatooine/swoop_gang_thug.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("niko thug") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_criminal_swooper_human_female_01.iff') diff --git a/scripts/mobiles/tatooine/vaigonn_shinn.py b/scripts/mobiles/tatooine/vaigonn_shinn.py index c2ee9da2..d1cbf3f1 100644 --- a/scripts/mobiles/tatooine/vaigonn_shinn.py +++ b/scripts/mobiles/tatooine/vaigonn_shinn.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("shinn mugger") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_commoner_tatooine_nikto_male_01.iff') diff --git a/scripts/mobiles/tatooine/water_thief.py b/scripts/mobiles/tatooine/water_thief.py index 2fd8e203..4e372bf0 100644 --- a/scripts/mobiles/tatooine/water_thief.py +++ b/scripts/mobiles/tatooine/water_thief.py @@ -19,7 +19,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("thug") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(True) - mobileTemplate.setOptionBitmask(192) + mobileTemplate.setOptionsBitmask(192) templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_moisture_thief.iff') diff --git a/src/services/spawn/MobileTemplate.java b/src/services/spawn/MobileTemplate.java index 18505f7d..1d31bb5a 100644 --- a/src/services/spawn/MobileTemplate.java +++ b/src/services/spawn/MobileTemplate.java @@ -31,7 +31,7 @@ import resources.loot.LootGroup; public class MobileTemplate implements Cloneable { private Vector templates; - private int optionBitmask = Options.ATTACKABLE; + private int optionsBitmask = Options.ATTACKABLE; private int pvpBitmask = PvpStatus.Attackable; private short level; private short minLevel; @@ -70,12 +70,12 @@ public class MobileTemplate implements Cloneable { this.templates = templates; } - public int getOptionBitmask() { - return optionBitmask; + public int getOptionsBitmask() { + return optionsBitmask; } - public void setOptionBitmask(int optionBitmask) { - this.optionBitmask = optionBitmask; + public void setOptionsBitmask(int optionsBitmask) { + this.optionsBitmask = optionsBitmask; } public int getPvpBitmask() { diff --git a/src/services/spawn/SpawnService.java b/src/services/spawn/SpawnService.java index 96645cbb..18d66938 100644 --- a/src/services/spawn/SpawnService.java +++ b/src/services/spawn/SpawnService.java @@ -103,7 +103,7 @@ public class SpawnService { if(mobileTemplate.getLootGroups() != null) creature.setLootGroups(mobileTemplate.getLootGroups()); - creature.setOptionsBitmask(mobileTemplate.getOptionBitmask()); + creature.setOptionsBitmask(mobileTemplate.getOptionsBitmask()); creature.setPvpBitmask(mobileTemplate.getPvpBitmask()); creature.setStfFilename("mob/creature_names"); // TODO: set other STFs for NPCs other than creatures creature.setStfName(mobileTemplate.getCreatureName());