From 956eaed2f900843e3052096750f5cb2b86afaa90 Mon Sep 17 00:00:00 2001 From: Cekis Date: Thu, 18 Apr 2019 06:47:12 +0100 Subject: [PATCH] Fixed some issues with the Restuss Event --- .../game/script/library/restuss_event.java | 2 +- .../theme_park/restuss_event/pvp_region.java | 1 - .../restuss_event/restuss_event_manager.java | 26 +++++++++---------- .../restuss_event/stage_two_controller.java | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/restuss_event.java b/sku.0/sys.server/compiled/game/script/library/restuss_event.java index 81311c073..e1c8bb6a9 100755 --- a/sku.0/sys.server/compiled/game/script/library/restuss_event.java +++ b/sku.0/sys.server/compiled/game/script/library/restuss_event.java @@ -73,7 +73,7 @@ public class restuss_event extends script.base_script return getIntObjVar(object, "base_builder.current_phase"); } obj_id parent = trial.getParent(object); - if (!isIdValid(parent)) + if (!isIdValid(parent) || parent == object) { return -1; } diff --git a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/pvp_region.java b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/pvp_region.java index 2a3a613eb..d618811f5 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/pvp_region.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/pvp_region.java @@ -29,7 +29,6 @@ public class pvp_region extends script.base_script removeObjVar(self, trial.PARENT); } if(getRegion("rori", restuss_event.PVP_REGION_NAME) == null) { - persistObject(self); createCircleRegion( getLocation(self), 400, diff --git a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/restuss_event_manager.java b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/restuss_event_manager.java index ea452de5c..1261200ed 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/restuss_event_manager.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/restuss_event_manager.java @@ -51,43 +51,43 @@ public class restuss_event_manager extends script.base_script if (name.contains(elementName[IMP_BAR])) { elementList[IMP_BAR] = dungeon_datum; } - if (name.contains(elementName[IMP_HQ])) { + else if (name.contains(elementName[IMP_HQ])) { elementList[IMP_HQ] = dungeon_datum; } - if (name.contains(elementName[IMP_COMM])) { + else if (name.contains(elementName[IMP_COMM])) { elementList[IMP_COMM] = dungeon_datum; } - if (name.contains(elementName[IMP_LOG])) { + else if (name.contains(elementName[IMP_LOG])) { elementList[IMP_LOG] = dungeon_datum; } - if (name.contains(elementName[IMP_MED])) { + else if (name.contains(elementName[IMP_MED])) { elementList[IMP_MED] = dungeon_datum; } - if (name.contains(elementName[IMP_WALL])) { + else if (name.contains(elementName[IMP_WALL])) { elementList[IMP_WALL] = dungeon_datum; } - if (name.contains(elementName[REB_BAR])) { + else if (name.contains(elementName[REB_BAR])) { elementList[REB_BAR] = dungeon_datum; } - if (name.contains(elementName[REB_HQ])) { + else if (name.contains(elementName[REB_HQ])) { elementList[REB_HQ] = dungeon_datum; } - if (name.contains(elementName[REB_COMM])) { + else if (name.contains(elementName[REB_COMM])) { elementList[REB_COMM] = dungeon_datum; } - if (name.contains(elementName[REB_LOG])) { + else if (name.contains(elementName[REB_LOG])) { elementList[REB_LOG] = dungeon_datum; } - if (name.contains(elementName[REB_MED])) { + else if (name.contains(elementName[REB_MED])) { elementList[REB_MED] = dungeon_datum; } - if (name.contains(elementName[REB_WALL])) { + else if (name.contains(elementName[REB_WALL])) { elementList[REB_WALL] = dungeon_datum; } } int sum_imp_phase = 0; int sum_reb_phase = 0; - if ((getStringObjVar(self, "element")).contains("imp")) + if ((getStringObjVar(self, "element")).contains("_imp_")) { int imp_bar_phase = restuss_event.getPhase(elementList[IMP_BAR]); int imp_hq_phase = restuss_event.getPhase(elementList[IMP_HQ]); @@ -137,7 +137,7 @@ public class restuss_event_manager extends script.base_script break; } } - else + else if ((getStringObjVar(self, "element")).contains("_reb_")) { int reb_bar_phase = restuss_event.getPhase(elementList[REB_BAR]); int reb_hq_phase = restuss_event.getPhase(elementList[REB_HQ]); diff --git a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java index 89cf7c679..8fe033e81 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java @@ -43,7 +43,7 @@ public class stage_two_controller extends script.base_script LOG("events", "Restuss Event - Config set to put Restuss into phase " + phaseVal); String progressionOn = getConfigSetting("EventTeam", "restussProgressionOn"); // Check if the user wants to progress through stage one or not. If so, start the cycle. - if(progressionOn != null && !progressionOn.equals("false") || !progressionOn.equals("0")) { + if(progressionOn != null && (!progressionOn.equals("false") || !progressionOn.equals("0"))) { dictionary dict = trial.getSessionDict(self); switch(phase){ case 0: