diff options
Diffstat (limited to 'npc/events')
| -rw-r--r-- | npc/events/custom/draculax.txt | 2 | ||||
| -rw-r--r-- | npc/events/custom/uneasy_cemetery.txt | 8 | ||||
| -rw-r--r-- | npc/events/easter.txt | 3 | ||||
| -rw-r--r-- | npc/events/twintowers.txt | 2 | ||||
| -rw-r--r-- | npc/events/valentinesday.txt | 2 | ||||
| -rw-r--r-- | npc/events/xmas.txt | 24 |
6 files changed, 22 insertions, 19 deletions
diff --git a/npc/events/custom/draculax.txt b/npc/events/custom/draculax.txt index 907580554..b47e29972 100644 --- a/npc/events/custom/draculax.txt +++ b/npc/events/custom/draculax.txt @@ -127,4 +127,4 @@ OnTimer11000: stopnpctimer; disablenpc "Dracula_Event"; Break; -}
\ No newline at end of file +} diff --git a/npc/events/custom/uneasy_cemetery.txt b/npc/events/custom/uneasy_cemetery.txt index 13300b828..39bd9d762 100644 --- a/npc/events/custom/uneasy_cemetery.txt +++ b/npc/events/custom/uneasy_cemetery.txt @@ -19,8 +19,7 @@ //============================================================ -prontera.gat,3,3,3 script Uneasy_Check -1, -{ +prontera.gat,3,3,3 script Uneasy_Check -1,{ end; OnHour00: @@ -67,8 +66,7 @@ L_Start_Undead: mapannounce "prontera.gat","[Mother Mathana]: The cememtery has became restless! In the name of Odin, hurry to the Sanctuary! Save the city of Prontera!",0; } -prontera.gat,257,313,5 script Mother Mathana 79, -{ +prontera.gat,257,313,5 script Mother Mathana 79,{ mes "[Mother Mathana]"; if ($UNEASY_DL <= 0) goto L_Undead_Walk; mes "I'm afraid there's something wrong with our old cemetery..."; @@ -132,4 +130,4 @@ M_DONT_HAVE: mes "The old cemetery is going out of control soon..."; mes "Please, in the name of Odin, help Prontera city."; close; -}
\ No newline at end of file +} diff --git a/npc/events/easter.txt b/npc/events/easter.txt index 867565005..ab24c2c9b 100644 --- a/npc/events/easter.txt +++ b/npc/events/easter.txt @@ -15,8 +15,7 @@ //============================================================ -geffen.gat,95,201,3 script Shilo 50, -{ +geffen.gat,95,201,3 script Shilo 50,{ mes "[Shilo]"; if(easter_Q == 1) goto L_Check; mes "*Sigh*...... Where is my sister!?"; diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt index 5b7db213a..6e79add1c 100644 --- a/npc/events/twintowers.txt +++ b/npc/events/twintowers.txt @@ -90,4 +90,4 @@ izlude.gat,134,92,4 duplicate(Twin-Towers) Twin Towers#tt4 812 alberta.gat,25,238,4 duplicate(Twin-Towers) Twin Towers#tt5 812 geffen.gat,120,60,4 duplicate(Twin-Towers) Twin Towers#tt6 812 aldebaran.gat,145,118,4 duplicate(Twin-Towers) Twin Towers#tt7 812 -comodo.gat,194,158,4 duplicate(Twin-Towers) Twin Towers#tt7 812
\ No newline at end of file +comodo.gat,194,158,4 duplicate(Twin-Towers) Twin Towers#tt7 812 diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index d9669ca94..a44f2ddca 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -269,4 +269,4 @@ LStartMan: mes "このシャルル=オルレアンを煩わせる"; mes "なんて。オゥ〜、ノンノンノン。"; close; -}
\ No newline at end of file +} diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt index bf7aec27d..fb445dac8 100644 --- a/npc/events/xmas.txt +++ b/npc/events/xmas.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena Dev Team //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any version of eAthena //===== Description: ========================================= @@ -13,15 +13,18 @@ //= This npc will disable, the current Santa Claus npc. //===== Additional Comments: ================================= //= Fixed the spawns [shadowlady] +//= 1.1 Added Xmas Jakk, fixed 2 exploits, fixed reward Box ID [Lupus] //============================================================ xmas_in.gat,100,96,4 script Father Christmas::Santa2 718,{ mes "[Santa Claus]"; - if(event_xmas == 1) goto L_Start; - mes "Merry Christmas! I have a gift for you! Ho Ho Ho!"; - getitem 664,1; - set event_xmas,1; + if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start; + mes "Merry Christmas!"; + if(Class==0 || #event_xmas>=30 ) close; //anti exploit protection + mes "I have a gift for you! Ho Ho Ho!"; + getitem rand(664,667),1; //gives one of 4 gift boxes + set #event_xmas,#event_xmas+1; close; L_Start: @@ -72,12 +75,13 @@ L_Start: M_1: mes "[Santa Claus]"; if(countitem(7034) < 3) goto L_NotEnuf; + delitem 7034,3; mes "Seems you've been doing a"; mes "good job of taking down those"; mes "fake Santas. Keep it up!"; next; - delitem 7034,3; - getitem 664,1; + getitem 644,1; //Gift Box Prototype + set #event_xmas,#event_xmas+1; mes "[Santa Claus]"; mes "There's your reward."; mes "If you get 3 more, I'll give you another."; @@ -87,8 +91,7 @@ L_Start: L_NotEnuf: mes "You don't have enough socks as proof."; mes "Go take down those evil Santas"; - mes "and get more for me and I'll"; - mes "reward you."; + mes "and get more for me and I'll reward you."; close; M_End: mes "[Santa Claus]"; @@ -256,3 +259,6 @@ cmd_fild06.gat,0,0,0,0 monster Antonio 1247,1,0,0,0 cmd_fild07.gat,0,0,0,0 monster Antonio 1247,1,0,0,0 cmd_fild08.gat,0,0,0,0 monster Antonio 1247,1,0,0,0 cmd_fild09.gat,0,0,0,0 monster Antonio 1247,1,0,0,0 + +gef_dun01.gat,0,0,0,0 monster Xmas Jakk 1244,5,0,0,0 +gefenia02.gat,0,0,0,0 monster Xmas Jakk 1244,5,0,0,0 |