diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | conf-tmpl/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/Changelog.txt | 3 | ||||
| -rw-r--r-- | db/const.txt | 3 | ||||
| -rw-r--r-- | db/item_db.txt | 6 | ||||
| -rw-r--r-- | db/item_misc.txt | 17 | ||||
| -rw-r--r-- | npc/Changelog.txt | 1 | ||||
| -rw-r--r-- | npc/quests/quests_prontera.txt | 7 | ||||
| -rw-r--r-- | src/map/itemdb.h | 2 |
9 files changed, 37 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 53c5c148a..eee25d271 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2007/06/10 + * Rev. 10745 Updated itemdb.h with the two new item group values. (38 and 39) Why are they static anyway? [L0ne_W0lf] 2007/06/09 * Added 'nosave' mapflag to que_bingo for Bingo system purposes. [SinSloth] 2007/06/04 diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt index 6bc5f3068..a5263da0b 100644 --- a/conf-tmpl/Changelog.txt +++ b/conf-tmpl/Changelog.txt @@ -1,7 +1,7 @@ Date Added 2007/06/10 - * Rev. 10743 Fixed nopvp mapflag entry for mosk_in. [L0ne_W0lf] + * Rev. 10744 Fixed nopvp mapflag entry for mosk_in. [L0ne_W0lf] 2007/06/08 * Added Moscovia maps into mapflags [Lupus] 2007/06/06 diff --git a/db/Changelog.txt b/db/Changelog.txt index efb061489..78cf80c28 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -49,6 +49,9 @@ ---- ======================== 06/09 + * Rev. 10745 Added Old_Bleu_Box and added corrisponding item group entries. [L0ne_W0lf] + * Updated Red_Box_ and added corrisponding item group entries. + * Updated constants to include IG_BleuBox and IG_Red_Box_2. * Rev. 10736 Updated (and added) item_trade entries. (Converted from Aegis.) [L0ne_W0lf] * Added some official Thor Volcano mob stats [Playtester] - also updated sql files diff --git a/db/const.txt b/db/const.txt index b439e75d5..1243fe73f 100644 --- a/db/const.txt +++ b/db/const.txt @@ -486,6 +486,9 @@ IG_GiftBoxChina 34 IG_LottoBox 35 IG_FoodBag 36 IG_Potion 37 +IG_RedBox_2 38 +IG_BleuBox 39 + SC_ALL -1 SC_STONE 0 diff --git a/db/item_db.txt b/db/item_db.txt index 931b8589d..4f4c4f685 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -2840,7 +2840,7 @@ 12186,Red_Box,Old Red Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12187,Green_Box,Old Green Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12188,Moon_Snack,Fantastic Moon Snack,2,,10,300,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; },{},{} -12189,Red_Box_,Old Red Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} +12189,Red_Box_,Old Red Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_RedBox_2),1; },{},{} 12190,Moon_Cake,Moon Cake,2,,1,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12191,Special_Moon_Cake,Special Moon Cake,2,,1,500,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12192,Pumpkin_Pie,Pumpkin Pie,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} @@ -2872,7 +2872,7 @@ 12218,Level_5_Assumptio_Scroll,Level_5_Assumptio_Scroll,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 361,5; },{},{} 12219,Level_10_Wind_Walk_Scroll,Level_10_Wind_Walk_Scroll,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 383,10; },{},{} 12220,Level_5_Adrenaline_Rush_Scroll,Level_5_Adrenaline_Rush_Scroll,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 111,5; },{},{} -12221,Megaphone_,Megaphone,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ input @Megaphone$; announce strcharinfo(0) + " shouts '" + @megaphone$ + "'",bc_all,0xFF0000; end; },{},{} +12221,Megaphone_,Megaphone,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ input @Megaphone$; announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000; end; },{},{} //Valentine's Day Event (2007) 12234,Cacao99,Fierce Cacao 99%,0,,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 25,0; },{},{} 12235,Strawberry_Choco,Strawberry Chocolate,11,,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,5; itemskill 34,5; },{},{} @@ -2880,6 +2880,8 @@ 12237,Choco_Lump,Dollop of Chocolate,2,,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,5; sc_start SC_Poison,18000,0; sc_start SC_Bleeding,18000,0; },{},{} //St patrick's day Event (2007) 12245,Green_Ale_,Green Ale,0,,10,500,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 100,0; },{},{} +//April Fools Day Event (2007) +12702,Old_Bleu_Box,Old Bleu Box,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_BleuBox),1; getitem groupranditem(IG_BleuBox),1; },{},{} //Cash Shop Box Items 12900,Field_Manual_Box,Field_Manual_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} 12901,Life_Insurrance_Box,Life_Insurrance_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{} diff --git a/db/item_misc.txt b/db/item_misc.txt index 5449c5d32..4c8524bd0 100644 --- a/db/item_misc.txt +++ b/db/item_misc.txt @@ -330,3 +330,20 @@ 37,502,1 //Orange Potion 37,503,1 //Yellow Potion 37,504,1 //White Potion +// Red_Box_ +38,5137,1 //Alice Doll +38,5138,9 //Magic Eyes +38,5139,10 //Lotus +38,5140,10 //Kawaii Ribbon +// Old_Bleu_Box +39,687,1 //Level 5 Earth Spike +39,689,1 //Level 5 Cold Bolt +39,691,1 //Level 5 Fire Bolt +39,693,1 //Level 5 Lightening Bolt +39,697,1 //Level 5 Fire Ball +39,699,1 //Level 5 Fire Wall +39,12002,1 //Level 5 Heal +39,12000,1 //Level 5 Frost Diver +39,644,1 //Gift Box +39,519,1 //Milk +39,538,1 //Well-baked Cookie diff --git a/npc/Changelog.txt b/npc/Changelog.txt index b98769f26..fa3cb21b9 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,7 @@ Date Added ====== 2007/06/10 + * Fixed some small typos in the Gaebolg family curse quest. [L0ne_W0lf] * Small fix to Kiel Quest [Playtester] * Fixed exploit and optimized Rachel donations [Playtester] 2007/06/09 diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index a448f22bb..07aa12b05 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -27,6 +27,7 @@ //= 1.4 Moved Culvert from cities/prontera.txt [Evera] //= 1.5 Culvert has been rescripted from the ground up. [L0ne_W0lf] //= 1.6 Added Gaebolg Family Curse quest. [L0ne_W0lf] +//= 1.6a Fixed a couple spelling mistakes. [L0ne_W0lf] //============================================================ // Prontera Culvert @@ -411,8 +412,8 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "[Busy-Looking Boy]"; mes "Ack! Would you leave"; mes "me alone and let me work?"; - mes "I've got somehing important"; - mes "to do! When Ifinish arranging"; + mes "I've got something important"; + mes "to do! When I finish arranging"; mes "these books, need to... I need to make some preparations!"; close; } diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 425df63de..68c4d9ed0 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -65,6 +65,8 @@ enum item_group_list { IG_LOTTOBOX, //35 IG_FOODBAG, //36 IG_POTION, //37 + IG_REDBOX_2, //38 + IG_BLEUBOX, //39 MAX_ITEMGROUP, }; |