diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/holiday/figrin_dan_lifeday.tab b/sku.0/sys.server/compiled/game/datatables/spawning/holiday/figrin_dan_lifeday.tab index 086865801..b95c7e35e 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/holiday/figrin_dan_lifeday.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/holiday/figrin_dan_lifeday.tab @@ -7,3 +7,4 @@ lifeday_bith_musician Doikk Na'ts 6 0 14 0 themepark_music_3 object/tangible/ins lifeday_bith_musician Nalan Cheel -2 0 14 0 themepark_music_1 object/tangible/instrument/bandfill.iff 1 lifeday_bith_musician Ickabel G'ont 2 0 14 0 themepark_music_2 object/tangible/storyteller/event_props/pr_nalargon.iff -0.021 0.15 lifeday_saun_dann Saun Dann -5.2 0 15.8 45 entertained +lifeday_wookiee_vendor -3.8 0 14.2 45 entertained diff --git a/sku.0/sys.server/compiled/game/script/event/lifeday/lifeday_tree.java b/sku.0/sys.server/compiled/game/script/event/lifeday/lifeday_tree.java index 2bb88914d..3acf2af00 100755 --- a/sku.0/sys.server/compiled/game/script/event/lifeday/lifeday_tree.java +++ b/sku.0/sys.server/compiled/game/script/event/lifeday/lifeday_tree.java @@ -16,8 +16,8 @@ public class lifeday_tree extends script.base_script private static final string_id TREE_USE = new string_id("spam", "tree_use"); private static final string_id NOT_OLD_ENOUGH = new string_id("spam", "not_old_enough"); private static final string_id GIFT_GRANTED = new string_id("spam", "gift_granted"); - private static final String GIFT_SELF = "item_lifeday_gift_self_01_06"; - private static final String GIFT_OTHER = "item_lifeday_gift_other_01_06"; + private static final String GIFT_SELF = "item_lifeday_gift_self_01_0"; + private static final String GIFT_OTHER = "item_lifeday_gift_other_01_0"; private static final String LIFEDAY_BADGE = "lifeday_badge_11"; private static final string_id TREE_BADGE = new string_id("spam", "tree_badge"); @@ -75,8 +75,9 @@ public class lifeday_tree extends script.base_script return false; } obj_id inv = utils.getInventoryContainer(player); - static_item.createNewItemFunction(GIFT_SELF, inv); - obj_id giftOther = static_item.createNewItemFunction(GIFT_OTHER, inv); + int year = rand(1, 6); + static_item.createNewItemFunction(GIFT_SELF + year, inv); + obj_id giftOther = static_item.createNewItemFunction(GIFT_OTHER + year, inv); setObjVar(giftOther, utils.LIFEDAY_OWNER, player); utils.sendMail(utils.GIFT_GRANTED_SUB, utils.GIFT_GRANTED, player, "System"); setObjVar(player, currentYearObjVar(), 1);