From 534d1c132c661c394173a984506f7dcb902f99f4 Mon Sep 17 00:00:00 2001 From: BloodCommando <49352765+BloodCommando@users.noreply.github.com> Date: Fri, 17 Sep 2021 19:13:13 -0400 Subject: [PATCH 1/3] GMF Spooky Hand Adjustments Adjusts Ponda Baba's arm in the master item list to reflect how it was on live, this removes the autostack and 1 time use it previously had. Implemented script side for the spooky hand buff so it correctly gives bonus tokens as it did on live (+1 token per successful horrified scare and +2 tokens per successful terrified scare). --- .../item/master_item/master_item.tab | 2 +- .../game/script/library/event_perk.java | 32 ++++++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab b/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab index d4495b2fb..cf266b68b 100755 --- a/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab +++ b/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab @@ -8484,7 +8484,7 @@ item_schematic_spider_pheromone object/tangible/loot/loot_schematic/generic_limi item_schematic_bat_pheromone object/tangible/loot/loot_schematic/generic_limited_use.iff 1 item.loot_schematic.loot_schematic Bat Pheremone Schematic A schematic for an Imperial Gunner Helmet. Gunner Helmet Schematic st_pr_kash_imprv_streetlamp_s01 object/tangible/storyteller/story_token_prop.iff storyteller 1 1 Scarecrow Kashyyyk Style I This item will create a Scarecrow Kashyyyk Style I. halloween item st_pr_kash_imprv_streetlamp_s02 object/tangible/storyteller/story_token_prop.iff storyteller 1 1 Scarecrow Kashyyyk Style II This item will create a Scarecrow Kashyyyk Style II. halloween item -item_ponda_halloween_hand object/tangible/tcg/series6/consumable_ponda_baba_arm.iff 1 4 item.special.nomove,item.buff_click_item,object.autostack Ponda Baba's Arm The preserved remnant of Ponda Baba's arm after it was severed by Obi Wan Kenodi on Tatooine. Perhaps you can learn from Ponda Baba's painful experience. You will gain a 20% increase on all experience points earned for one hour. If you are level 90, this loot will grant you one random collection item. This item is consumable. +item_ponda_halloween_hand object/tangible/tcg/series6/consumable_ponda_baba_arm.iff 4 item.special.nomove,item.buff_click_item Ponda Baba's Arm The preserved remnant of Ponda Baba's arm after it was severed by Obi Wan Kenodi on Tatooine. Perhaps you can learn from Ponda Baba's painful experience. You will gain a 20% increase on all experience points earned for one hour. If you are level 90, this loot will grant you one random collection item. This item is consumable. item_empire_day_2011_furniture_stand object/tangible/furniture/all/frn_all_stand_s01.iff Decorative Stand Decorative Stand item_empire_day_model_havoc object/tangible/furniture/all/frn_all_gcw2_havoc.iff Havoc Starfighter Havoc Starfighter item_empire_day_model_twing object/tangible/furniture/all/frn_all_gcw2_twing.iff T-Wing Interceptor T-Wing Interceptor diff --git a/sku.0/sys.server/compiled/game/script/library/event_perk.java b/sku.0/sys.server/compiled/game/script/library/event_perk.java index 9298548eb..f24905359 100755 --- a/sku.0/sys.server/compiled/game/script/library/event_perk.java +++ b/sku.0/sys.server/compiled/game/script/library/event_perk.java @@ -13,7 +13,9 @@ public class event_perk extends script.base_script public static final String HALLOWEEN = new String("event/halloween"); public static final string_id STEALTHED = new string_id(HALLOWEEN, "stealthed"); public static final string_id TEN_COINS = new string_id(HALLOWEEN, "ten_coins"); + public static final string_id TWELVE_COINS = new string_id(HALLOWEEN, "twelve_coins"); public static final string_id FIVE_COINS = new string_id(HALLOWEEN, "five_coins"); + public static final string_id SIX_COINS = new string_id(HALLOWEEN, "six_coins"); public static final string_id STATIC_NPC = new string_id(HALLOWEEN, "static_npc"); public static final string_id REACHED_LIMIT = new string_id(HALLOWEEN, "reached_limit"); public static final string_id ZOZ = new string_id(HALLOWEEN, "zozpheratu"); @@ -23,6 +25,8 @@ public class event_perk extends script.base_script public static final int COIN_LIMIT = 599; public static final int COIN_AMOUNT_LOW = 5; public static final int COIN_AMOUNT_HIGH = 10; + public static final int COIN_BONUS_LOW = 1; + public static final int COIN_BONUS_HIGH = 2; public static final int LOCKOUT_LENGTH = 240; public static final String LIST_VAR = new String("galacticMoonNpcList"); public static final string_id TOO_SOON = new string_id(HALLOWEEN, "too_soon"); @@ -206,8 +210,18 @@ public class event_perk extends script.base_script obj_id coins = static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_AMOUNT_HIGH); increaseDailyCoinCounter(player); } - playerLaugh(player); - sendSystemMessage(player, TEN_COINS); + if (buff.hasBuff(player, "scary_halloween_hand")) + { + obj_id coins = static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_BONUS_HIGH); + increaseDailyCoinCounter(player); + playerLaugh(player); + sendSystemMessage(player, TWELVE_COINS); + } + if (!buff.hasBuff(player, "scary_halloween_hand")) + { + playerLaugh(player); + sendSystemMessage(player, TEN_COINS); + } } if (quality == 1) { @@ -222,8 +236,18 @@ public class event_perk extends script.base_script obj_id coins = static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_AMOUNT_LOW); increaseDailyCoinCounter(player); } - playerLaugh(player); - sendSystemMessage(player, FIVE_COINS); + if (buff.hasBuff(player, "scary_halloween_hand")) + { + obj_id coins = static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_BONUS_LOW); + increaseDailyCoinCounter(player); + playerLaugh(player); + sendSystemMessage(player, SIX_COINS); + } + if (!buff.hasBuff(player, "scary_halloween_hand")) + { + playerLaugh(player); + sendSystemMessage(player, FIVE_COINS); + } } if (!hasObjVar(player, event_perk.COUNTER_RESTARTTIME)) { From 1de8ba1ce4b9ac40b077ced386be255b13da6e2e Mon Sep 17 00:00:00 2001 From: BloodCommando <49352765+BloodCommando@users.noreply.github.com> Date: Sat, 18 Sep 2021 18:43:09 -0400 Subject: [PATCH 2/3] Refinements to GMF Spooky Hand Adjustments Removed variable declaration, duplicate playerLaugh and unneeded check if the player doesn't have the buff. Moved playerLaugh to play regardless as its what is intended. Thanks to Aconite for helping me spot these. --- .../compiled/game/script/library/event_perk.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/event_perk.java b/sku.0/sys.server/compiled/game/script/library/event_perk.java index f24905359..202cb8313 100755 --- a/sku.0/sys.server/compiled/game/script/library/event_perk.java +++ b/sku.0/sys.server/compiled/game/script/library/event_perk.java @@ -212,16 +212,15 @@ public class event_perk extends script.base_script } if (buff.hasBuff(player, "scary_halloween_hand")) { - obj_id coins = static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_BONUS_HIGH); + static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_BONUS_HIGH); increaseDailyCoinCounter(player); - playerLaugh(player); sendSystemMessage(player, TWELVE_COINS); } - if (!buff.hasBuff(player, "scary_halloween_hand")) + else { - playerLaugh(player); sendSystemMessage(player, TEN_COINS); } + playerLaugh(player); } if (quality == 1) { From d39f0b6d961451f362adafd351bbb1a34dda59e3 Mon Sep 17 00:00:00 2001 From: BloodCommando <49352765+BloodCommando@users.noreply.github.com> Date: Sat, 18 Sep 2021 18:52:20 -0400 Subject: [PATCH 3/3] GMF Spooky Hand Script Adjustments Third time is the charm. --- .../compiled/game/script/library/event_perk.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/event_perk.java b/sku.0/sys.server/compiled/game/script/library/event_perk.java index 202cb8313..3b5bd3f77 100755 --- a/sku.0/sys.server/compiled/game/script/library/event_perk.java +++ b/sku.0/sys.server/compiled/game/script/library/event_perk.java @@ -219,6 +219,7 @@ public class event_perk extends script.base_script else { sendSystemMessage(player, TEN_COINS); + increaseDailyCoinCounter(player); } playerLaugh(player); } @@ -237,16 +238,16 @@ public class event_perk extends script.base_script } if (buff.hasBuff(player, "scary_halloween_hand")) { - obj_id coins = static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_BONUS_LOW); + static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_BONUS_LOW); increaseDailyCoinCounter(player); - playerLaugh(player); sendSystemMessage(player, SIX_COINS); } - if (!buff.hasBuff(player, "scary_halloween_hand")) + else { - playerLaugh(player); sendSystemMessage(player, FIVE_COINS); + increaseDailyCoinCounter(player); } + playerLaugh(player); } if (!hasObjVar(player, event_perk.COUNTER_RESTARTTIME)) {