swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.1' of https://github.com/SWG-Source/dsrc into 3.1

Browse Source
This commit is contained in:
AconiteX
2021-09-19 08:22:10 -04:00
parent 4ed96e2232 dd39dbddb4
commit 1c97ecd280
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab
View File

@@ -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

28
sku.0/sys.server/compiled/game/script/library/event_perk.java
View File

@@ -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);
}
if (buff.hasBuff(player, "scary_halloween_hand"))
{
static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_BONUS_HIGH);
increaseDailyCoinCounter(player);
sendSystemMessage(player, TWELVE_COINS);
}
else
{
sendSystemMessage(player, TEN_COINS);
increaseDailyCoinCounter(player);
}
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);
}
if (buff.hasBuff(player, "scary_halloween_hand"))
{
static_item.createNewItemFunction("item_event_halloween_coin", pInv, COIN_BONUS_LOW);
increaseDailyCoinCounter(player);
sendSystemMessage(player, SIX_COINS);
}
else
{
sendSystemMessage(player, FIVE_COINS);
increaseDailyCoinCounter(player);
}
playerLaugh(player);
sendSystemMessage(player, FIVE_COINS);
}
if (!hasObjVar(player, event_perk.COUNTER_RESTARTTIME))
{