From 97dafdf4cf7e4c4ca0ded314d1c4b1d2531686c3 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Fri, 12 Jun 2020 08:51:35 -0500 Subject: [PATCH 1/3] roadmap fix: no dearic city invasion if lifeday is on --- sku.0/sys.server/compiled/game/script/library/gcw.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sku.0/sys.server/compiled/game/script/library/gcw.java b/sku.0/sys.server/compiled/game/script/library/gcw.java index e7b7796b5..001985edf 100755 --- a/sku.0/sys.server/compiled/game/script/library/gcw.java +++ b/sku.0/sys.server/compiled/game/script/library/gcw.java @@ -2691,6 +2691,10 @@ public class gcw extends script.base_script CustomerServiceLog("gcw_city_invasion", "gcw.gcwIsInvasionCityOn: GCW City: " + city + " is not configured to run a city invasion. Function returning False."); return false; } + if (city == "dearic" && Boolean.parseBoolean(getConfigSetting("GameServer", "lifeday")) == true) { + CustomerServiceLog("gcw_city_invasion", "gcw.gcwIsInvasionCityOn: GCW City: " + city + " is not running because life day is turned on."); + return false; + } return true; } public static int gcwGetNextInvasionHour(String cityName) throws InterruptedException From b4b98f0ca04a8af78781191209d790bc65c92f2b Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Fri, 12 Jun 2020 08:53:05 -0500 Subject: [PATCH 2/3] roadmap fix: you can now dance while in costume --- .../compiled/game/script/library/performance.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/performance.java b/sku.0/sys.server/compiled/game/script/library/performance.java index d1020dd0f..31de789ff 100755 --- a/sku.0/sys.server/compiled/game/script/library/performance.java +++ b/sku.0/sys.server/compiled/game/script/library/performance.java @@ -1424,10 +1424,6 @@ public class performance extends script.base_script performanceMessageToSelf(actor, null, SID_DANCE_UNKNOWN_SELF); return; } - if (!notShapechanged(actor)) - { - return; - } if (!canPerformDance(actor, performanceIndex)) { performanceMessageToSelf(actor, null, SID_DANCE_LACK_SKILL_SELF); @@ -1561,10 +1557,6 @@ public class performance extends script.base_script performanceMessageToSelf(actor, null, SID_DANCE_UNKNOWN_SELF); return; } - if (!notShapechanged(actor)) - { - return; - } if (!canPerformDance(actor, performanceIndex)) { performanceMessageToSelf(actor, null, SID_DANCE_LACK_SKILL_SELF); @@ -2876,10 +2868,6 @@ public class performance extends script.base_script { return false; } - if (!notShapechanged(actor)) - { - return false; - } Vector available_dances = new Vector(); available_dances.setSize(0); int num_items = dataTableGetNumRows(DATATABLE_PERFORMANCE); From c4190aa9a500e56de05f6f8e6864478ec3893b6d Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Sat, 20 Jun 2020 13:39:06 -0500 Subject: [PATCH 3/3] this way probably makes more sense per Ios's suggestion --- sku.0/sys.server/compiled/game/script/library/gcw.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/library/gcw.java b/sku.0/sys.server/compiled/game/script/library/gcw.java index 001985edf..d31f84c5a 100755 --- a/sku.0/sys.server/compiled/game/script/library/gcw.java +++ b/sku.0/sys.server/compiled/game/script/library/gcw.java @@ -2691,7 +2691,7 @@ public class gcw extends script.base_script CustomerServiceLog("gcw_city_invasion", "gcw.gcwIsInvasionCityOn: GCW City: " + city + " is not configured to run a city invasion. Function returning False."); return false; } - if (city == "dearic" && Boolean.parseBoolean(getConfigSetting("GameServer", "lifeday")) == true) { + if (city.equalsIgnoreCase("dearic") && utils.checkConfigFlag("GameServer", "lifeday")) { CustomerServiceLog("gcw_city_invasion", "gcw.gcwIsInvasionCityOn: GCW City: " + city + " is not running because life day is turned on."); return false; }