diff options
26 files changed, 184 insertions, 8 deletions
diff --git a/client-data b/client-data -Subproject ce5b807ce78b215e86c736820d064e04ed94ac5 +Subproject fc0b820abcaa9dd8bffae609bc3478884b0961a diff --git a/world/map/data/001-2.wlk b/world/map/data/001-2.wlk Binary files differindex 890da08c..0e7d9b3c 100644 --- a/world/map/data/001-2.wlk +++ b/world/map/data/001-2.wlk diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt index 2e73dea6..01a43db9 100644 --- a/world/map/db/item_db.txt +++ b/world/map/db/item_db.txt @@ -423,6 +423,7 @@ // Add new entries above here. For dyed entries,add to the bottom of the 2000s. +1197, SkeletonCharm, Skeleton Charm, 5, 0, 0, 10, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, { callfunc "CheckMunro"; } 1198, JackOSoul, Jack O Soul, 3, 100000, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 1199, Arrow, Arrow, 10, 2, 1, 1, 20, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} 1200, Bow, Bow, 4, 1000, 500, 20, 20, 0, 5, 0, 0, 2, 34, 1, 4, 11, {}, {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} diff --git a/world/map/news.d/09-winter2012.txt b/world/map/news.d/09-winter2012.txt index 7212d700..01a04827 100644 --- a/world/map/news.d/09-winter2012.txt +++ b/world/map/news.d/09-winter2012.txt @@ -1,3 +1,4 @@ +{title:Illia first appearance} {date:December 2012 again} A new peninsula has magically raised from the depths, @@ -8,6 +9,7 @@ Why is she here, and what does she want? Further on the west, Lora Tay is willing to accept new challenges to prove once more her skills. +{title:Christmas 2012} {date:December 2012} Santa and his helpers have returned to Santa's residence @@ -18,6 +20,7 @@ The reinboos are excited this year since there will be a change within their team! But not everything is working out as planned. +{title:Halloween 2012} {date:November 2012} Halloween has passed and several cities celebrated this event. @@ -25,6 +28,7 @@ It seems the farmer Oscar just came back from a long journey in one of these cities. Probably he will have exciting things to tell. +{title:East Expansion} {date:October 2012} The roadblock to the north east in Argaes was finally lifted @@ -36,6 +40,7 @@ Be careful not to disturb him. He is very vicious. The smith's apprentice Peter does good progress in mastering his handcraft and learned some new techniques. +{title:New Dress} {date:September 2012} Agostine is well known for his magnificent winter clothes, diff --git a/world/map/news.d/10-news-news.txt b/world/map/news.d/10-news-news.txt index 9a95824f..b4ab0817 100644 --- a/world/map/news.d/10-news-news.txt +++ b/world/map/news.d/10-news-news.txt @@ -1,3 +1,4 @@ +{title:Updating News generation} {date:2013-01-23} News feed is finally generated from the same diff --git a/world/map/news.d/11-CR-Jan13.txt b/world/map/news.d/11-CR-Jan13.txt index 94bff71f..2e6b177d 100644 --- a/world/map/news.d/11-CR-Jan13.txt +++ b/world/map/news.d/11-CR-Jan13.txt @@ -1,7 +1,6 @@ +{title:Content Release January 2013} {date:2013-01-26} -Content Release January 2013 - This release brings a huge amount of small fixes and changes, including fixes of several spelling and map errors, which were reported by players. diff --git a/world/map/news.d/12-manaplus.txt b/world/map/news.d/12-manaplus.txt index b420cfcf..7c8ef578 100644 --- a/world/map/news.d/12-manaplus.txt +++ b/world/map/news.d/12-manaplus.txt @@ -1,3 +1,4 @@ +{title:ManaPlus - new official Client} {date:2013-01-31} ManaPlus Support diff --git a/world/map/news.d/13-lpc.txt b/world/map/news.d/13-lpc.txt index c68a892d..b4197b10 100644 --- a/world/map/news.d/13-lpc.txt +++ b/world/map/news.d/13-lpc.txt @@ -1,3 +1,4 @@ +{title:Source of Tales won the LPC} {date:2013-02-18} This is a really exciting news entry! diff --git a/world/map/news.d/14-bugfix-killthegmevent.txt b/world/map/news.d/14-bugfix-killthegmevent.txt index 24cb9b90..249d23a3 100644 --- a/world/map/news.d/14-bugfix-killthegmevent.txt +++ b/world/map/news.d/14-bugfix-killthegmevent.txt @@ -1,3 +1,4 @@ +{title:Kill the GM} {date:2013-02-21} Today we'll have a small content release. diff --git a/world/map/news.d/15-servermove.txt b/world/map/news.d/15-servermove.txt index 7c5141c6..deeb91e9 100644 --- a/world/map/news.d/15-servermove.txt +++ b/world/map/news.d/15-servermove.txt @@ -1,3 +1,4 @@ +{title:Server move} {date:2013-03-09} As of this Saturday, March 9, TMW moved to a new host. diff --git a/world/map/news.d/16-servermoveagain.txt b/world/map/news.d/16-servermoveagain.txt index e9f83372..1c368ba7 100644 --- a/world/map/news.d/16-servermoveagain.txt +++ b/world/map/news.d/16-servermoveagain.txt @@ -1,3 +1,4 @@ +{title:Server moved again} {date:2013-03-17} After the initial server move, The Mana World was subjected diff --git a/world/map/news.d/17-beanie-easter.txt b/world/map/news.d/17-beanie-easter.txt index 72de183c..cc99040d 100644 --- a/world/map/news.d/17-beanie-easter.txt +++ b/world/map/news.d/17-beanie-easter.txt @@ -1,3 +1,4 @@ +{title:Easter Event and Miley's Hero} {date:2013-03-21} Today we have a content release. diff --git a/world/map/news.d/18-bugfixes.txt b/world/map/news.d/18-bugfixes.txt index 40f9edf0..67d0a343 100644 --- a/world/map/news.d/18-bugfixes.txt +++ b/world/map/news.d/18-bugfixes.txt @@ -1,3 +1,4 @@ +{title:Small Bugfixes} {date:2013-04-28} We're having a bugfix release today. diff --git a/world/map/news.d/19-rollbackup.txt b/world/map/news.d/19-rollbackup.txt index 16e77ba5..d5dbec51 100644 --- a/world/map/news.d/19-rollbackup.txt +++ b/world/map/news.d/19-rollbackup.txt @@ -1,3 +1,4 @@ +{title:Server Crash and Rollback} {date:2013-06-05} We had a server crash, and had to restore everything from offline backup. diff --git a/world/map/news.d/20-double-exp-drop.txt b/world/map/news.d/20-double-exp-drop.txt index 85140414..f1d84918 100644 --- a/world/map/news.d/20-double-exp-drop.txt +++ b/world/map/news.d/20-double-exp-drop.txt @@ -1,3 +1,4 @@ +{title:Double Exp and Drop Weekend} {date:2013-06-07} This weekend we're temporarily doubling both the diff --git a/world/map/news.d/21-tulimshar-caves.txt b/world/map/news.d/21-tulimshar-caves.txt index 382c3cbe..24efd44f 100644 --- a/world/map/news.d/21-tulimshar-caves.txt +++ b/world/map/news.d/21-tulimshar-caves.txt @@ -1,3 +1,4 @@ +{title:Wushin overhauled caves, Ferry now goes to Nivalis} {date:2013-06-29} This release brings a few new additions to the game: diff --git a/world/map/news.d/22-orum-extension.txt b/world/map/news.d/22-orum-extension.txt index fc41fa77..c2a04543 100644 --- a/world/map/news.d/22-orum-extension.txt +++ b/world/map/news.d/22-orum-extension.txt @@ -1,3 +1,4 @@ +{title:Announcing Code update - Introducing Dark Magic} {date:2013-09-03} {gray}First, a technical announcement. During a future diff --git a/world/map/news.d/23-astral-extension.txt b/world/map/news.d/23-astral-extension.txt index 4989c12f..87d32cfa 100644 --- a/world/map/news.d/23-astral-extension.txt +++ b/world/map/news.d/23-astral-extension.txt @@ -1,3 +1,4 @@ +{title:Astral Magic Extension} {date:2013-09-14} We have a small content release today. diff --git a/world/map/news.d/24-code-release.txt b/world/map/news.d/24-code-release.txt index a70193d6..f6a180e0 100644 --- a/world/map/news.d/24-code-release.txt +++ b/world/map/news.d/24-code-release.txt @@ -1,3 +1,4 @@ +{title:Fixes in Server Code} {date:2013-09-28} As you might have found out we had another restart yesterday. diff --git a/world/map/news.d/25-halloween.txt b/world/map/news.d/25-halloween.txt new file mode 100644 index 00000000..208bb4ec --- /dev/null +++ b/world/map/news.d/25-halloween.txt @@ -0,0 +1,9 @@ +{title:Halloween 2013} +{date:2013-10-30} + +Happy Halloween! + +Also, some minor bugs have been fixed with Waric and Rossy. +Alas poor Waric, Will he ever learn to behave properly? + +{author:MadCamel} diff --git a/world/map/news.html b/world/map/news.html index a834b327..d69db891 100644 --- a/world/map/news.html +++ b/world/map/news.html @@ -1,6 +1,19 @@ <!-- Generated by tools/news.py for index.php --> <div> <p/> +<b>Halloween 2013</b> +<font color="#0000ff">2013-10-30</font> +<p/> +Happy Halloween! +<p/> +Also, some minor bugs have been fixed with Waric and Rossy. +Alas poor Waric, Will he ever learn to behave properly? +<p/> +-<font color="#009000">MadCamel</font> +</div> +<div> +<p/> +<b>Fixes in Server Code</b> <font color="#0000ff">2013-09-28</font> <p/> As you might have found out we had another restart yesterday. @@ -61,6 +74,7 @@ as hard as we can to fix all the issues above. </div> <div> <p/> +<b>Astral Magic Extension</b> <font color="#0000ff">2013-09-14</font> <p/> We have a small content release today. @@ -75,6 +89,7 @@ Waric script, Bluepar sprite and Wicked Mushroom sprite. </div> <div> <p/> +<b>Announcing Code update - Introducing Dark Magic</b> <font color="#0000ff">2013-09-03</font> <p/> <font color="#919191">First, a technical announcement. During a future @@ -118,6 +133,7 @@ like Jenalya did. </div> <div> <p/> +<b>Wushin overhauled caves, Ferry now goes to Nivalis</b> <font color="#0000ff">2013-06-29</font> <p/> This release brings a few new additions to the game: @@ -146,6 +162,7 @@ and helped fix these things! </div> <div> <p/> +<b>Double Exp and Drop Weekend</b> <font color="#0000ff">2013-06-07</font> <p/> This weekend we're temporarily doubling both the @@ -170,6 +187,7 @@ you will no longer be kicked with an invalid packet error. </div> <div> <p/> +<b>Server Crash and Rollback</b> <font color="#0000ff">2013-06-05</font> <p/> We had a server crash, and had to restore everything from offline backup. @@ -182,6 +200,7 @@ We're going to set up hourly offsite backups of game, forum, and wiki data so th </div> <div> <p/> +<b>Small Bugfixes</b> <font color="#0000ff">2013-04-28</font> <p/> We're having a bugfix release today. @@ -200,6 +219,7 @@ testing! </div> <div> <p/> +<b>Easter Event and Miley's Hero</b> <font color="#0000ff">2013-03-21</font> <p/> Today we have a content release. @@ -228,6 +248,7 @@ easier for attracting fighters from all over the world. </div> <div> <p/> +<b>Server moved again</b> <font color="#0000ff">2013-03-17</font> <p/> After the initial server move, The Mana World was subjected @@ -240,6 +261,7 @@ All game related services have been moved and are back to normal. </div> <div> <p/> +<b>Server move</b> <font color="#0000ff">2013-03-09</font> <p/> As of this Saturday, March 9, TMW moved to a new host. @@ -254,6 +276,7 @@ For more information, see <a href="http://forums.themanaworld.org/viewtopic.php? </div> <div> <p/> +<b>Kill the GM</b> <font color="#0000ff">2013-02-21</font> <p/> Today we'll have a small content release. @@ -269,6 +292,7 @@ Also, GMs may have a surprise for you someday. </div> <div> <p/> +<b>Source of Tales won the LPC</b> <font color="#0000ff">2013-02-18</font> <p/> This is a really exciting news entry! @@ -311,6 +335,7 @@ Forums: <a href="http://forums.themanaworld.org/">http://forums.themanaworld.org </div> <div> <p/> +<b>ManaPlus - new official Client</b> <font color="#0000ff">2013-01-31</font> <p/> ManaPlus Support @@ -351,10 +376,9 @@ ManaPlus is available at <a href="http://manaplus.evolonline.org/">http://manapl </div> <div> <p/> +<b>Content Release January 2013</b> <font color="#0000ff">2013-01-26</font> <p/> -Content Release January 2013 -<p/> This release brings a huge amount of small fixes and changes, including fixes of several spelling and map errors, which were reported by players. @@ -370,6 +394,7 @@ lamps in his room wear off after a while. </div> <div> <p/> +<b>Updating News generation</b> <font color="#0000ff">2013-01-23</font> <p/> News feed is finally generated from the same @@ -379,6 +404,7 @@ source for both the game and the website. </div> <div> <p/> +<b>Illia first appearance</b> <font color="#0000ff">December 2012 again</font> <p/> A new peninsula has magically raised from the depths, @@ -389,6 +415,7 @@ Why is she here, and what does she want? Further on the west, Lora Tay is willing to accept new challenges to prove once more her skills. <p/> +<b>Christmas 2012</b> <font color="#0000ff">December 2012</font> <p/> Santa and his helpers have returned to Santa's residence @@ -399,6 +426,7 @@ The reinboos are excited this year since there will be a change within their team! But not everything is working out as planned. <p/> +<b>Halloween 2012</b> <font color="#0000ff">November 2012</font> <p/> Halloween has passed and several cities celebrated this event. @@ -406,6 +434,7 @@ It seems the farmer Oscar just came back from a long journey in one of these cities. Probably he will have exciting things to tell. <p/> +<b>East Expansion</b> <font color="#0000ff">October 2012</font> <p/> The roadblock to the north east in Argaes was finally lifted @@ -417,6 +446,7 @@ Be careful not to disturb him. He is very vicious. The smith's apprentice Peter does good progress in mastering his handcraft and learned some new techniques. <p/> +<b>New Dress</b> <font color="#0000ff">September 2012</font> <p/> Agostine is well known for his magnificent winter clothes, diff --git a/world/map/news.txt b/world/map/news.txt index 5f7b88fe..4c9a2f1c 100644 --- a/world/map/news.txt +++ b/world/map/news.txt @@ -1,3 +1,15 @@ +##7Halloween 2013##0 +##32013-10-30##0 + +Happy Halloween! + +Also, some minor bugs have been fixed with Waric and Rossy. +Alas poor Waric, Will he ever learn to behave properly? + +-##2MadCamel##0 + + +##7Fixes in Server Code##0 ##32013-09-28##0 As you might have found out we had another restart yesterday. @@ -57,6 +69,7 @@ as hard as we can to fix all the issues above. -##2TMW Development Team##0 +##7Astral Magic Extension##0 ##32013-09-14##0 We have a small content release today. @@ -70,6 +83,7 @@ Waric script, Bluepar sprite and Wicked Mushroom sprite. -##2TMW Development Team##0 +##7Announcing Code update - Introducing Dark Magic##0 ##32013-09-03##0 ##8First, a technical announcement. During a future @@ -112,6 +126,7 @@ like Jenalya did. -##2TMW Development Team##0 +##7Wushin overhauled caves, Ferry now goes to Nivalis##0 ##32013-06-29##0 This release brings a few new additions to the game: @@ -139,6 +154,7 @@ and helped fix these things! -##2TMW Development Team##0 +##7Double Exp and Drop Weekend##0 ##32013-06-07##0 This weekend we're temporarily doubling both the @@ -162,6 +178,7 @@ you will no longer be kicked with an invalid packet error. -##2 TMW Development Team##0 +##7Server Crash and Rollback##0 ##32013-06-05##0 We had a server crash, and had to restore everything from offline backup. @@ -173,6 +190,7 @@ We're going to set up hourly offsite backups of game, forum, and wiki data so th -##2Frost##0 +##7Small Bugfixes##0 ##32013-04-28##0 We're having a bugfix release today. @@ -190,6 +208,7 @@ testing! -##2Jenalya##0 +##7Easter Event and Miley's Hero##0 ##32013-03-21##0 Today we have a content release. @@ -217,6 +236,7 @@ easier for attracting fighters from all over the world. -##2Jenalya##0 +##7Server moved again##0 ##32013-03-17##0 After the initial server move, The Mana World was subjected @@ -228,6 +248,7 @@ All game related services have been moved and are back to normal. -##2the TMWC##0 +##7Server move##0 ##32013-03-09##0 As of this Saturday, March 9, TMW moved to a new host. @@ -241,6 +262,7 @@ For more information, see @@http://forums.themanaworld.org/viewtopic.php?f=1&t=1 -##2the TMWC##0 +##7Kill the GM##0 ##32013-02-21##0 Today we'll have a small content release. @@ -255,6 +277,7 @@ Also, GMs may have a surprise for you someday. -##2V0id##0 +##7Source of Tales won the LPC##0 ##32013-02-18##0 This is a really exciting news entry! @@ -296,6 +319,7 @@ Forums: @@http://forums.themanaworld.org/|http://forums.themanaworld.org/@@##0 -##2o11c and Jenalya##0 +##7ManaPlus - new official Client##0 ##32013-01-31##0 ManaPlus Support @@ -335,10 +359,9 @@ ManaPlus is available at @@http://manaplus.evolonline.org/|http://manaplus.evolo -##2o11c##0 +##7Content Release January 2013##0 ##32013-01-26##0 -Content Release January 2013 - This release brings a huge amount of small fixes and changes, including fixes of several spelling and map errors, which were reported by players. @@ -353,6 +376,7 @@ lamps in his room wear off after a while. -##2Jenalya##0 +##7Updating News generation##0 ##32013-01-23##0 News feed is finally generated from the same @@ -361,6 +385,7 @@ source for both the game and the website. -##2o11c##0 +##7Illia first appearance##0 ##3December 2012 again##0 A new peninsula has magically raised from the depths, @@ -371,6 +396,7 @@ Why is she here, and what does she want? Further on the west, Lora Tay is willing to accept new challenges to prove once more her skills. +##7Christmas 2012##0 ##3December 2012##0 Santa and his helpers have returned to Santa's residence @@ -381,6 +407,7 @@ The reinboos are excited this year since there will be a change within their team! But not everything is working out as planned. +##7Halloween 2012##0 ##3November 2012##0 Halloween has passed and several cities celebrated this event. @@ -388,6 +415,7 @@ It seems the farmer Oscar just came back from a long journey in one of these cities. Probably he will have exciting things to tell. +##7East Expansion##0 ##3October 2012##0 The roadblock to the north east in Argaes was finally lifted @@ -399,6 +427,7 @@ Be careful not to disturb him. He is very vicious. The smith's apprentice Peter does good progress in mastering his handcraft and learned some new techniques. +##7New Dress##0 ##3September 2012##0 Agostine is well known for his magnificent winter clothes, diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index e4ed6b1b..a06099a1 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -168,7 +168,7 @@ OnTimer1000: set $@AEASTER_mapcount, 1 + getmapusers("008-1.gat") / 3; set $@isEaster, 0; - if ((gettime(6) == 3 && gettime(5) >= 22) || (gettime(6) == 4 && gettime(5) <= 25) || debug) + if ((gettime(6) == 3 && gettime(5) >= 22) || (gettime(6) == 4 && gettime(5) <= 25)) set $@isEaster, 1; if (!$@wasEaster && $@isEaster) diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt index 544eeaf9..47a7783f 100644 --- a/world/map/npc/024-1/eomie.txt +++ b/world/map/npc/024-1/eomie.txt @@ -96,7 +96,7 @@ L_Mine: // player asked how to get Ice Cubes mes "[Eomie]"; mes "\"Hm, that's a difficult task, indeed. Naturally you will find them on the continent of Kaizei, which is high up in the north and covered with snow most time of the year. But it might be difficult to get there.\""; next; - mes "\"But I heard that Ice Goblins were seen in this underground palace that was discovered in the desert south of the city. Maybe you can find Ice Cubes in there.\""; + mes "\"I heard that Ice Goblins were seen in the caves that are East of Nivalis. Maybe you can find Ice Cubes in there.\""; next; mes "\"Though they don't let in everyone. Miners, Soldiers and sometimes an adventurer. I suggest you talk to Lieutenant Dausen about that.\""; goto L_Close; diff --git a/world/map/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt index ae18387c..38d5f638 100644 --- a/world/map/npc/026-1/_import.txt +++ b/world/map/npc/026-1/_import.txt @@ -3,4 +3,5 @@ map: 026-1.gat npc: npc/026-1/_mobs.txt npc: npc/026-1/_warps.txt +npc: npc/026-1/munro.txt npc: npc/026-1/sign.txt diff --git a/world/map/npc/026-1/munro.txt b/world/map/npc/026-1/munro.txt new file mode 100644 index 00000000..1151e3b8 --- /dev/null +++ b/world/map/npc/026-1/munro.txt @@ -0,0 +1,88 @@ +026-1.gat,24,37,0|script|Munro|183, +{ + mes "[Munro]"; + mes "\"Whoh dude...\""; + next; + mes "[Munro]"; + mes "\"Man.. I don't know how I got here.. freaky..\""; + next; + mes "[Munro]"; + mes "\"Hey dude, what's that on your face? It's creeping me out!\""; + menu + "There is nothing on my face..", L_Nothing, + "What, This skin?",-; + mes "[Munro]"; + mes "\"Skin? Whoh far-out man.. This must be that weirdo place my brother Parua told me about..\""; + next; + mes "Munro stares at you vacantly for a moment"; + next; + mes "Munro's eye-holes suddenly seem more aware"; + next; + mes "[Munro]"; + mes "\"WHOH! SKIN? d.....dude! How can you stand having that stuff all over you? That's gotta suck!\""; + next; + mes "[Munro]"; + mes "\"Here dude.. Take this. It won't get rid of that groady skin but it'll at least make you LOOK normal..\""; + getitem "SkeletonCharm",1; + next; + mes "[Munro]"; + mes "\"I have a lot of these man.. a LOT. Take all you want man.. Just remember they only work when I'm around to power them. Freaky-deaky skull power you know?\""; + close; + goto L_Exit; + +L_Nothing: + mes "[Munro]"; + mes "\"Oh.. ok dude! Whatever you say!\""; + goto L_Exit; + +L_Exit: + close; +} + +026-1.gat,25,37,0|script|#AnnualHalloween|-1, +{ + end; + +OnInit: + initnpctimer; + end; + +OnTimer1000: + set $@isHalloween, 0; + if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5) || debug) + set $@isHalloween, 1; + + if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26) || debug) + set $@isHalloween, 1; + + if ($@isHalloween) + goto L_enablemunro; + + goto L_disablemunro; + + +L_enablemunro: + enablenpc "Munro"; + goto L_End; + +L_disablemunro: + disablenpc "Munro"; + +L_End: + end; +} + + +function|script|CheckMunro|, +{ + if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5)) + goto L_Return; + + if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26)) + goto L_Return; + + // unequipbyid @slotId; + +L_Return: + return; +} |