From 371db803633dcc4185e147f5ddff08c7bd5aa613 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Thu, 8 Apr 2010 15:56:50 +1200 Subject: Easter 2010 --- db/const.txt | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ db/item_db.txt | 40 +++++++++++++--------- 2 files changed, 126 insertions(+), 16 deletions(-) (limited to 'db') diff --git a/db/const.txt b/db/const.txt index 7e28f040..8a2ddd04 100644 --- a/db/const.txt +++ b/db/const.txt @@ -237,3 +237,105 @@ MFLAG_ELANORE_OMAR 32768 // Told Omar about Elanore's involvement DOCK_tulimshar 1 DOCK_hurnscald 2 + +// ----------------- +// -- Easter 2010 -- +// ----------------- + +// Dealing with the Old Woman's token quest +E10_STATE_EGG_MASK 3 +E10_STATE_EGGS_COLLECTED_MASK 31 +E10_STATE_EGGS_COLLECTED_SHIFT 2 +E10_STATE_EGG_COLLECTING 1 +E10_STATE_EGG_COLLECTED 2 +E10_STATE_EGG_REWARDED 3 +E10_STATE_ROSE_MASK 3 +E10_STATE_ROSE_SHIFT 7 +E10_STATE_ROSE_ROSE_USED 1 +E10_STATE_ROSE_ROSE_COMPLETE 2 +E10_STATE_ROSE_RETURNED 3 + + +// Dealing with $Easter_2010_Npc_State1 +E10_TIMER_STATE_EGGS_MASK 31 +E10_TIMER_STATE_TREES_MASK 31 +E10_TIMER_STATE_TREES_SHIFT 5 +E10_TIMER_STATE_DOCTOR_MASK 31 +E10_TIMER_STATE_DOCTOR_SHIFT 10 +E10_EGGS_TIMER_OVERTICK_MASK 31 +E10_EGGS_TIMER_OVERTICK_SHIFT 15 +E10_TREES_OVERTICK_MASK 31 +E10_TREES_OVERTICK_SHIFT 20 +E10_DOCTOR_TIMER_OVERTICK_MASK 31 +E10_DOCTOR_TIMER_OVERTICK_SHIFT 25 + + +// Dealing with $Easter_2010_Npc_State2 +E10_DOCTOR_POSITION_MASK 7 +E10_DOCTOR_POSITION_SHIFT 0 +E10_DOCTOR_POSITION_NULL 0 +E10_DOCTOR_POSITION_BIGTREE 1 +E10_DOCTOR_POSITION_ISLAND 2 +E10_DOCTOR_POSITION_STONES 3 +E10_DOCTOR_POSITION_FRUIT 4 +E10_DOCTOR_POSITION_CAVE 5 +E10_BARRIER_MASK 1 +E10_BARRIER_SHIFT 4 +E10_BARRIER_OPEN 0 +E10_BARRIER_ACTIVE 1 + +// Dealing with the doctor +E10_DOCTOR_HELP_STATES_MASK 15 +E10_DOCTOR_HELP_STATES_SHIFT 11 +E10_FLAG_KNOWS_DOCTOR_MASK 1 +E10_FLAG_KNOWS_DOCTOR_SHIFT 10 +E10_FLAG_KNOWS_DOCTOR 1 +E10_FLAG_HELPED_DOCTOR_TREE_MASK 1 +E10_FLAG_HELPED_DOCTOR_TREE_SHIFT 11 +E10_FLAG_HELPED_DOCTOR_TREE 1 +E10_FLAG_HELPED_DOCTOR_ISLAND_MASK 1 +E10_FLAG_HELPED_DOCTOR_ISLAND_SHIFT 12 +E10_FLAG_HELPED_DOCTOR_ISLAND 1 +E10_FLAG_HELPED_DOCTOR_STONES_MASK 1 +E10_FLAG_HELPED_DOCTOR_STONES_SHIFT 13 +E10_FLAG_HELPED_DOCTOR_STONES 1 +E10_FLAG_HELPED_DOCTOR_FRUIT_MASK 1 +E10_FLAG_HELPED_DOCTOR_FRUIT_SHIFT 14 +E10_FLAG_HELPED_DOCTOR_FRUIT 1 +E10_HELPED_DOCTOR_SHIFT 11 +E10_HELPED_DOCTOR_MASK 15 +E10_FLAG_MID_REWARD 1 +E10_FLAG_MID_REWARD_SHIFT 15 +E10_FLAG_MID_REWARD_MASK 1 +E10_FLAG_RETURN_READY 1 +E10_FLAG_RETURN_READY_SHIFT 16 +E10_FLAG_RETURN_READY_MASK 1 +E10_FLAG_USED_FREE_WARP_SHIFT 17 +E10_STATE_REWARDS_SHIFT 18 +E10_STATE_REWARDS_MASK 3 +E10_STATE_REWARD_RABBIT_EARS 1 +E10_STATE_REWARD_EGGSHELL 2 + +// Menus +E10_STONES_WISP 0 +E10_STONES_SPECTRE 1 +E10_STONES_POLTERGEIST 2 +E10_STONES_SOUL 3 +E10_STONES_HEART 4 +E10_STONES_EAR 5 +E10_STONES_EYE 6 +E10_STONES_BONE 7 +E10_STONES_SKULL 8 +E10_STONES_CRYSTAL 9 +E10_STONES_RAGS 10 +E10_STONES_PETAL 11 +E10_ISLAND_MENU_DEATH_AWE 12 +E10_ISLAND_MENU_SCARED 13 +E10_ISLAND_MENU_WISPS 14 +E10_ISLAND_MENU_OFFER_LIFESTONE 15 + + +// Miscellaneous +E10_COLLECT_EGGS_ID 1246 +E10_TOKEN_ID 666 +E10_MIDREWARD_ID 1247 // Valentine's Glasses (as described) diff --git a/db/item_db.txt b/db/item_db.txt index f5ddd67a..b9f37a46 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -330,20 +330,20 @@ 1241, SnowmanSnowGlobe, Snowman Snow Globe, 3, 7500, 5000, 1, , , , , , 2, , , 0, , {}, {} 1242, SnowGoggles, Snow Goggles, 5, 7500, 5000, 10, , 5, , -2, 0, 2, 256, , 0, 0, {}, {} 1243, PaperHat, Paper Party Hat, 5, 10, 5, 1, , 1, , 0, 0, 2, 256, , 0, 0, {}, {} -//1244 -//1245 -//1246 -//1247 -//1248 -//1249 -//1250 -//1251 -//1252 -//1253 -//1254 -//1255 -//1256 -//1257 +1244, DarkTalisman, Dark Talisman, 5, 0, 0, 0, , 30, , 100, 0, 2, 512, , 0, 0, {}, { set @minLvl, 1; callfunc "RestrictedItem"; set @val, getopt2; if (!(@val & 1024)) setopt2 getopt2 | 1024; bonus bMaxHp, 30000; bonus bFlee, -100; } +1245, BentNeedle, Bent Needle, 3, 700, 500, 1, , , , , , 2, , , 0, 0, {}, {} +1246, DarkEasterEgg, Dark Easter Egg, 3, 700, 500, 10, , , , , , 2, , , 0, 0, {}, {} +1247, HeartGlasses, Heart Glasses, 5, 7500, 5000, 10, , 4, , 5, 0, 2, 256, , 0, 0, {}, {} +1248, Blueberries, Blueberries, 0, 1000, 500, 120, , , , , , 2, , , 0, , { itemheal 800, 0; }, {} +1249, StrangeCoin, Strange Coin, 3, 7000, 5000, 180, , , , , , 2, , , 0, 0, {}, {} +1250, Pear, Pear, 0, 1000, 500, 48, , , , , , 2, , , 0, , { itemheal 200, 0; }, {} +1251, Plum, Plum, 0, 1000, 500, 48, , , , , , 2, , , 0, , { itemheal 300, 0; }, {} +1252, Cherry, Cherry, 0, 1000, 500, 48, , , , , , 2, , , 0, , { itemheal 250, 0; }, {} +1253, GoldenDeliciousApple, GoldenDeliciousApple, 0, 1000, 500, 48, , , , , , 2, , , 0, , { itemheal 200, 0; }, {} +1254, DarkPetal, Dark Petal, 3, 15000, 8000, 250, , , , , , 2, , , 0, , {}, {} +1255, WhiteRabbitEars, White Rabbit Ears, 5, 10, 5, 1, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +1256, EggshellHat, Eggshell Hat, 5, 10, 5, 1, , 12, , 0, 0, 2, 256, , 1, 0, { bonus bAgi, -1; }, {} +1257, FlawedLens, Flawed Lens, 3, 10000, 5000, 112, , , , , , 2, , , 0, 0, {}, {} 1258, Honey, Honey, 0, 100, 80, 2, , , , , , 2, , , , , { itemheal 45, 0; }, {} //1259, BeeEgg @@ -364,7 +364,6 @@ //1274, SmallClub //1275, LoinCloth - 2050, RedCottonShirt, Red Cotton Shirt, 5, 10, 5, 10, , 2, , -4, 0, 2, 512, , 0, 0, {}, {} 2051, GreenCottonShirt, Green Cotton Shirt, 5, 10, 5, 10, , 2, , -4, 0, 2, 512, , 0, 0, {}, {} 2052, DarkBlueCottonShirt, Dark Blue Cotton Shirt, 5, 10, 5, 10, , 2, , -4, 0, 2, 512, , 0, 0, {}, {} @@ -505,4 +504,13 @@ 2187, OrangePaperhat, Orange Paper Party Hat, 5, 10, 5, 1, , 1, , 0, 0, 2, 1, , 1, 0, {}, {} 2188, PurplePaperhat, Purple Paper Party Hat, 5, 10, 5, 1, , 1, , 0, 0, 2, 1, , 1, 0, {}, {} 2189, DarkGreenPaperhat, Dark Green Paper Party Hat, 5, 10, 5, 1, , 1, , 0, 0, 2, 1, , 1, 0, {}, {} - +2190, RedRabbitEars, Red Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2191, GreenRabbitEars, Green Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2192, DarkBlueRabbitEars, Dark Blue Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2193, YellowRabbitEars, Yellow Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2194, LightBlueRabbitEars, Light Blue Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2195, PinkRabbitEars, Pink Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2196, BlackRabbitEars, Black Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2197, OrangeRabbitEars, Orange Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2198, PurpleRabbitEars, Purple Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} +2199, DarkGreenRabbitEars, Dark Green Rabbit Ears, 5, 10, 5, 5, , 5, , 4, 0, 2, 256, , 1, 0, {}, {} -- cgit v1.2.3-60-g2f50