From b0394afab20eaee88abc2b42ab415090e5740418 Mon Sep 17 00:00:00 2001 From: euphyy Date: Sat, 1 Sep 2012 00:37:36 +0000 Subject: * Follow-up r16726, more standardization on docs. * Replaced and added dividers in many script files with one standard divider. * Other misc. cleaning... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16727 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/events/christmas_2008.txt | 16 ++++++++-------- npc/events/dumplingfestival.txt | 13 ++++--------- npc/events/halloween_2006.txt | 6 +++++- npc/events/halloween_2008.txt | 31 ++++++++++++++----------------- npc/events/valentinesday_2009.txt | 5 +++++ npc/events/whiteday.txt | 1 - npc/events/xmas.txt | 36 +++++++++++------------------------- 7 files changed, 47 insertions(+), 61 deletions(-) (limited to 'npc/events') diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index b19a1fb29..b3a7de10a 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -18,8 +18,8 @@ //= 1.1 Fixed some issues, revamped the whole script. [Kisuka] //============================================================ -// ============== Caroller - Music Box ================ -// ===================================================== +// Caroller - Music Box +//============================================================ prontera,226,306,4 script Caroller#iROxmas08 79,{ if (iROxmas08carol < 1 || iROxmas08carol == 3) { if (iROxmas08carol == 3) { @@ -434,8 +434,8 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ } } -// ============= Santa Claus - Card Game =============== -// ===================================================== +// Santa Claus - Card Game +//============================================================ - script Santa Claus#iROxmas08::08santa 718,{ mes "[Santa Claus]"; mes "Wow! Were you naughty or nice this year?"; @@ -715,9 +715,8 @@ alberta,117,66,4 duplicate(08santa) Santa Claus#0803 718 geffen,119,70,4 duplicate(08santa) Santa Claus#0804 718 morocc,158,104,4 duplicate(08santa) Santa Claus#0805 718 - -// ============= Louise Kim - Santa Suit =============== -// ===================================================== +// Louise Kim - Santa Suit +//============================================================ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ mes "[Louise Kim]"; mes "I always thought about how boring Santa Claus is wearing a too boring costume."; @@ -856,7 +855,8 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ } } -//XMAS MOBS +// Monsters +//============================================================ prt_fild00,0,0,0,0 monster Christmas Jakk 1244,5,0,0,0 prt_fild00,0,0,0,0 monster Christmas Goblin 1245,5,0,0,0 prt_fild00,0,0,0,0 monster Christmas Cookie 1246,5,0,0,0 diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt index 78d7e9e56..443facc30 100644 --- a/npc/events/dumplingfestival.txt +++ b/npc/events/dumplingfestival.txt @@ -79,11 +79,8 @@ L_NOZENY: close; } -////////////////////////////////////////////// -// Monster Spawning /\Secial only for event.// -////////////////////////////////////////////// - -// ~Dumpling~ +// Monsters +//============================================================ gef_fild00,0,0,0,0 monster Dumpling 1520,20,60000,66000 gef_fild07,0,0,0,0 monster Dumpling 1520,20,60000,66000 gef_fild04,0,0,0,0 monster Dumpling 1520,20,60000,66000 @@ -101,11 +98,9 @@ pay_fild06,0,0,0,0 monster Dumpling 1520,20,60000,66000 pay_fild05,0,0,0,0 monster Dumpling 1520,20,60000,66000 pay_fild02,0,0,0,0 monster Dumpling 1520,20,60000,66000 pay_fild09,0,0,0,0 monster Dumpling 1520,20,60000,66000 - -// ~Bacsojin~ + moc_fild03,0,0,0,0 monster Bacsojin 1518,1,60000,66000 - -// ~Chung E~ + moc_fild03,0,0,0,0 monster Chung E 1519,1,60000,66000 moc_fild13,0,0,0,0 monster Chung E 1519,1,60000,66000 pay_fild01,0,0,0,0 monster Chung E 1519,1,60000,66000 diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 8fd077af8..fce598c73 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -21,6 +21,7 @@ //============================================================ // Pumpkin Mojo quest (Event 1) +//============================================================ prontera,162,69,5 script Gloomy Jack#06_hw 1130,2,2,{ end; @@ -485,6 +486,7 @@ nif_in,19,32,3 script Deviruchi#06_hw 738,{ } // Creation of Pumpkin Pie (Event 2) +//============================================================ nif_fild01,165,115,3 script Chicken Masta#06_hw 794,{ set .@now_weight,MaxWeight-Weight; if (.@now_weight < 2000 || checkweight(1201,1) == 0) { @@ -909,6 +911,7 @@ pay_dun03,157,131,3 duplicate(HwChicken2) Chicken#06_hw_p40 800 pay_dun03,158,131,3 duplicate(HwChicken3) Chicken#06_hw_p41 800 // Payon Field chickens +//============================================================ pay_fild08,1,1,0 script #06_hw_timer02 -1,{ OnInit: disablenpc "Chicken#06_hw_pf01"; @@ -1080,7 +1083,8 @@ morocc,159,143,3 duplicate(HWFamiDup) Familiar#06_hw03 799 geffen,120,188,3 duplicate(HWFamiDup) Familiar#06_hw04 799 alberta,80,171,3 duplicate(HWFamiDup) Familiar#06_hw05 799 -//Event Lude Monster Spawns +// Event Lude Monster Spawns +//============================================================ ra_fild01,0,0,0,0 monster Lude 1812,3,0,0,0 ra_fild02,0,0,0,0 monster Lude 1812,3,0,0,0 ra_fild03,0,0,0,0 monster Lude 1812,3,0,0,0 diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt index a4844da1b..c14dd1656 100644 --- a/npc/events/halloween_2008.txt +++ b/npc/events/halloween_2008.txt @@ -20,17 +20,17 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ if(Hallow08 < 1) { - mes "[Halloween Magician]"; - mes "Kkkkkkkkk!"; - mes "I have a special event this Halloween that tests your luck and agility."; - mes "Are you interested?"; - next; - mes "[Halloween Magician]"; - mes "Come on! Don't be a wuss!"; - mes "If you collect enough tickets you can get good prizes!"; - mes "So what do you say?"; - next; - goto MainMenu; + mes "[Halloween Magician]"; + mes "Kkkkkkkkk!"; + mes "I have a special event this Halloween that tests your luck and agility."; + mes "Are you interested?"; + next; + mes "[Halloween Magician]"; + mes "Come on! Don't be a wuss!"; + mes "If you collect enough tickets you can get good prizes!"; + mes "So what do you say?"; + next; + goto MainMenu; } if (Hallow08Kill == 1) { @@ -237,12 +237,9 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ goto MainMenu; } } - -// --------------- MapFlags --------------- - evt_zombie,16,142,1 script zombiewarp001 45,2,2,{ - OnTouch: +OnTouch: if (@Hallow08Warp == 1) { set Hallow08Kill,2; specialeffect 16; @@ -252,7 +249,7 @@ evt_zombie,16,142,1 script zombiewarp001 45,2,2,{ } evt_zombie,122,27,1 script zombiewarp002 45,2,2,{ - OnTouch: +OnTouch: if (@Hallow08Warp == 2) { set Hallow08Kill,2; specialeffect 16; @@ -262,7 +259,7 @@ evt_zombie,122,27,1 script zombiewarp002 45,2,2,{ } evt_zombie,267,89,1 script zombiewarp003 45,2,2,{ - OnTouch: +OnTouch: if (@Hallow08Warp == 3) { set Hallow08Kill,2; specialeffect 16; diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index db072b401..6ded29242 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -24,6 +24,7 @@ //============================================================ // Marco Bassinio (Chocolate/Chocolate Box maker) +//============================================================ prontera,164,174,4 script Trader#Val09 58,{ mes "[Marco Bassinio]"; mes "Hey, folks! Here's something you don't see everyday!"; @@ -160,6 +161,7 @@ prontera,164,174,4 script Trader#Val09 58,{ } // Packs Trader (Sells Wrapping Paper, Lace, and Box) +//============================================================ prontera,147,171,5 script Packs Trader#Val09 58,{ mes "[Packs Trader]"; mes "Hello."; @@ -303,6 +305,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ } // Event Ring Maker (Makes ring for players) +//============================================================ prontera,154,185,5 script Event Ring Maker#Val09 721,{ if (BaseLevel < 75) { mes "[Event Ring Maker]"; @@ -396,6 +399,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 721,{ } // Valentine Vote Manager (Registers votes) +//============================================================ prontera,157,185,4 script Valentine Vote Manager#v 113,{ mes "[Valentine Vote Manager]"; mes "Hello, I'm the Valentine's Vote Manager."; @@ -516,6 +520,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ } // Charles Orleans (Makes Home-Made Chocolates) +//============================================================ prt_castle,42,35,3 script Dessert Manager#Val09 47,{ if (Sex) { mes "[Charles Orleans]"; diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index 8046bd4c1..932ec1469 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -13,7 +13,6 @@ //= Converted to rAthena format by Dr.Evil //============================================================ - alberta,188,64,4 script Sugar 91,{ set @maplenum,0; set @mapleItemID,0; diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt index 5a211c18d..ecab31491 100644 --- a/npc/events/xmas.txt +++ b/npc/events/xmas.txt @@ -22,12 +22,9 @@ //= 1.4 Added a fix to make Lutie & Bard quests passable during this event [Lupus] //============================================================ - xmas_in,100,96,4 script Father Christmas::Santa2 718,{ mes "[Santa Claus]"; -//For Lutie & Bard quest - if(xmas_npc==0) set xmas_npc, 1; -// + if(xmas_npc==0) set xmas_npc, 1; // For Lutie & Bard quest if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start; mes "Merry Christmas!"; if(Class==0 || #event_xmas>=30 ) close; //anti exploit protection @@ -113,19 +110,14 @@ OnInit: end; } - -//======================================================================================== -// - Xmas Goblin Spawns -//======================================================================================== - +// Xmas Goblin Spawns +//============================================================ prt_fild11,0,0,0,0 monster Christmas Goblin 1245,5,0,0,0 gef_fild11,0,0,0,0 monster Christmas Goblin 1245,5,0,0,0 yuno_fild09,0,0,0,0 monster Christmas Goblin 1245,5,0,0,0 -//======================================================================================== -// - Santa Poring Spawns -//======================================================================================== - +// Santa Poring Spawns +//============================================================ ein_fild03,0,0,0,0 monster Santa Poring 1062,15,0,0,0 ein_fild04,0,0,0,0 monster Santa Poring 1062,15,0,0,0 ein_fild06,0,0,0,0 monster Santa Poring 1062,15,0,0,0 @@ -239,10 +231,8 @@ hu_fild04,0,0,0,0 monster Santa Poring 1062,15,0,0,0 hu_fild05,0,0,0,0 monster Santa Poring 1062,15,0,0,0 hu_fild07,0,0,0,0 monster Santa Poring 1062,15,0,0,0 -//======================================================================================== -// - Antonio Spawns -//======================================================================================== - +// Antonio Spawns +//============================================================ ein_fild03,0,0,0,0 monster Antonio 1247,1,0,0,0 ein_fild04,0,0,0,0 monster Antonio 1247,1,0,0,0 ein_fild06,0,0,0,0 monster Antonio 1247,1,0,0,0 @@ -356,17 +346,13 @@ hu_fild04,0,0,0,0 monster Antonio 1247,1,0,0,0 hu_fild05,0,0,0,0 monster Antonio 1247,1,0,0,0 hu_fild07,0,0,0,0 monster Antonio 1247,1,0,0,0 -//======================================================================================== -// - Xmas Jakk -//======================================================================================== - +// Xmas Jakk Spawns +//============================================================ gef_dun01,0,0,0,0 monster Xmas Jakk 1244,5,0,0,0 //gefenia02,0,0,0,0 monster Xmas Jakk 1244,5,0,0,0 -//======================================================================================== -// - Xmas Orc -//======================================================================================== - +// Xmas Orc Spawns +//============================================================ gef_fild02,0,0,0,0 monster Christmas Orc 1588,5,0,0,0 gef_fild03,0,0,0,0 monster Christmas Orc 1588,5,0,0,0 gef_fild10,0,0,0,0 monster Christmas Orc 1588,5,0,0,0 -- cgit v1.2.3-60-g2f50