fixed minor bugs

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8844 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/events/custom/draculax.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= valaris (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.0a
 //===== Compatible With: =====================================
 //= eAthena RC4+
 //===== Description: =========================================
@@ -15,19 +15,19 @@ mag_dun02.gat,72,182,1	script	Dracula's Coffin::Dracula_Init	-1,{
 
 OnInit:
 	set $dracula_event,0;
-	Break;
+	end;
 
 OnKilled:
 	MapAnnounce "mag_dun02.gat","Dracula's curse has been lifted!",17;
 	set $dracula_event,0;
 	initnpctimer;
-	Break;
+	end;
 
 OnTimer7200000:
 	if($dracula_event==0) 
 	stopnpctimer;
 	enablenpc "Dracula_Event";
-	Break;
+	end;
 }
 
 mag_dun02.gat,72,182,1	script	Dracula's Coffin::Dracula_Event	801,{
@@ -39,92 +39,92 @@ mag_dun02.gat,72,182,1	script	Dracula's Coffin::Dracula_Event	801,{
 	MapAnnounce "mag_dun02.gat","Count Dracula : Who has awakened me from my slumber?",17;
 	npcskilleffect 21,10,66,175;
 	initnpctimer;
-	Break;
+	end;
 
 OnTimer500:
 	npcskilleffect 21,10,74,187;
-	Break;
+	end;
 
 OnTimer1000:
 	npcskilleffect 21,10,80,180;
-	Break;
+	end;
 	
 OnTimer1500:
 	npcskilleffect 21,10,79,183;
-	Break;
+	end;
 
 OnTimer2000:
 	npcskilleffect 21,10,66,175;
-	Break;
+	end;
 
 OnTimer2500:
 	npcskilleffect 21,10,63,186;
-	Break;
+	end;
 
 OnTimer3000:
 	npcskilleffect 21,10,75,186;
-	Break;
+	end;
 
 OnTimer3500:
 	npcskilleffect 21,10,75,173;
-	Break;
+	end;
 
 OnTimer4000:
 	npcskilleffect 21,10,80,170;
-	Break;
+	end;
 
 OnTimer4500:
 	npcskilleffect 21,10,60,179;
-	Break;
+	end;
 
 OnTimer5000:
 	npcskilleffect 21,10,74,187;
-	Break;
+	end;
 
 OnTimer6000:
 	npcskilleffect 21,10,69,182;
-	Break;
+	end;
 
 OnTimer6500:
 	npcskilleffect 21,10,80,180;
-	Break;
+	end;
 
 OnTimer7000:
 	npcskilleffect 21,10,60,179;
-	Break;
+	end;
 
 OnTimer7500:
 	npcskilleffect 21,10,66,175;
-	Break;
+	end;
 
 OnTimer8000:
 	npcskilleffect 21,10,80,187;
-	Break;
+	end;
 
 OnTimer8500:
 	npcskilleffect 21,10,75,186;
-	Break;
+	end;
 
 OnTimer9000:
 	npcskilleffect 21,10,75,173;
-	Break;
+	end;
 
 OnTimer9500:
 	npcskilleffect 21,10,80,170;
-	Break;
+	end;
 
 OnTimer10000:
 	npcskilleffect 21,10,63,186;
-	Break;
+	end;
 
 OnTimer10500:
 	npcskilleffect 21,10,74,187;
-	Break;
+	end;
 
 OnTimer11000:
 	npcskilleffect 21,10,72,182;
 	monster "mag_dun02.gat",72,182,"Count Dracula",1389,1,"Dracula_Init::OnKilled";
 	stopnpctimer;
 	disablenpc "Dracula_Event";
-	Break;
+	end;
 }

npc/events/dumplingfestival.txt

@@ -3,83 +3,80 @@
 //===== By ================================================
 //= Massdriller
 //===== Version ===========================================
-//= 1.0
+//= 1.01
 //===== Compatible With ===================================
 //= eAthena 0.52+
 //===== Description =======================================
 //= A complete redering of the Dumpling Festival.
 //===== Comments ==========================================
 //= Ver 1.0- Duplicate of MRO's Dumpling Event
+//= 1.01 fixed bugs [Lupus]
 //=========================================================
   
 payon.gat,93,81,4	script	Exorcist Master Fahae	834,{
 
-mes "[Exorcist Master Fahae]";
-mes "Greetings young warrior, I'm the Exorcist Master Fahae.";
-mes "I have been tracking the elusive Bacsojin for some time.";
-next;
-mes "[Exorcist Master Fahae]";
-mes "I feel it is time I let another warrior try to complete";
-mes "my quest. I have some items to assist you in my quest.";
-next;
-menu "I wish to buy",menu_1, "No thanks",finish;
+	mes "[Exorcist Master Fahae]";
+	mes "Greetings young warrior, I'm the Exorcist Master Fahae.";
+	mes "I have been tracking the elusive Bacsojin for some time.";
+	next;
+	mes "[Exorcist Master Fahae]";
+	mes "I feel it is time I let another warrior try to complete";
+	mes "my quest. I have some items to assist you in my quest.";
+	next;
+	menu "I wish to buy",-, "No thanks",M_FIN;
   
-menu_1:
-mes "[Exorcist Master Fahae]";
-mes "I have 2 items which might become useful to you.";
-next;
-menu "Realgar Wine",wine, "Exorcize Herb",herb;
+	mes "[Exorcist Master Fahae]";
+	mes "I have 2 items which might become useful to you.";
+	next;
+	menu "Realgar Wine",-, "Exorcize Herb",M_HERB;
   
-wine:
-mes "[Exorcist Master Fahae]";
-mes "How many do you require?";
-mes "You may only buy 5 at one time.";
-mes "Each costs 20000z.";
-mes "(Type in 0 to cancel)";
-next;
-input @input;
-if(@input<0) goto end;
-if(@input>5) goto sorry;
-if(Zeny< @input*20000) goto no_money;
-getitem 682,@input;
-set Zeny,Zeny-20000*@input;
-mes "[Exorcist Master Fahae]";
-mes "Here you go, I hope you may succeed in my quest.";
-close;
+	mes "[Exorcist Master Fahae]";
+	mes "How many do you require?";
+	mes "You may only buy 5 at one time.";
+	mes "Each costs 20000z.";
+	mes "(Type in 0 to cancel)";
+	next;
+	input @input;
+	if(@input==0) close;
+	if(@input>5) goto L_SORRY;
+	if(Zeny< @input*20000) goto L_NOZENY;
+	set Zeny,Zeny-20000*@input;
+	getitem 682,@input;
+	mes "[Exorcist Master Fahae]";
+	mes "Here you go, I hope you may succeed in my quest.";
+	close;
   
-sorry:
-mes "[Exorcist Master Fahae]";
-mes "You must not be stingy, it is the path of God to be honest.";
-close;
+L_SORRY:
+	mes "[Exorcist Master Fahae]";
+	mes "You must not be stingy, it is the path of God to be honest.";
+	close;
   
-finish:
-mes "[Exorcist Master Fahae]";
-mes "The path of fully venquishing evil is far, help me in the way of God.";
-close;
+M_FIN:
+	mes "[Exorcist Master Fahae]";
+	mes "The path of fully venquishing evil is far, help me in the way of God.";
+	close;
   
-herb:
-mes "[Exorcist Master Fahae]";
-mes "How many do you require?";
-mes "You may only buy 5 at one time.";
-mes "Each costs 10000z.";
-mes "(Type in 0 to cancel)";
-next;
-input @input;
-if(@input<0) goto end;
-if(@input>5) goto sorry;
-if(Zeny< @input*10000) goto no_money;
-getitem 683,@input;
-set Zeny,Zeny-10000*@input;
-mes "[Exorcist Master Fahae]";
-mes "Here you go, I hope you may succeed in my quest.";
-close;
-
-no_money:
-mes "[Exorcist Master Fahae]";
-mes "Money doesn't bring joy to everyone, but we need it to support the temple and myself. Please, try to kill some monsters and take their drops.";
-close;
-
+M_HERB:
+	mes "[Exorcist Master Fahae]";
+	mes "How many do you require?";
+	mes "You may only buy 5 at one time.";
+	mes "Each costs 10000z.";
+	mes "(Type in 0 to cancel)";
+	next;
+	input @input;
+	if(@input==0) close;
+	if(@input>5) goto L_SORRY;
+	if(Zeny< @input*10000) goto L_NOZENY;
+	set Zeny,Zeny-10000*@input;
+	getitem 683,@input;
+	mes "[Exorcist Master Fahae]";
+	mes "Here you go, I hope you may succeed in my quest.";
+	close;
 
+L_NOZENY:
+	mes "[Exorcist Master Fahae]";
+	mes "Money doesn't bring joy to everyone, but we need it to support the temple and myself. Please, try to kill some monsters and take their drops.";
+	close;
 }
   
 //////////////////////////////////////////////

npc/events/zondaman.txt

@@ -1,50 +0,0 @@
-//===== Athena Script ========================================
-//= Zondaman Employees
-//===== By: ==================================================
-//= [Muad_Dib] 1.0a
-//===== Current Version: =====================================
-//= 1.0a
-//===== Compatible With: =====================================
-//= eAthena 1.0+
-//===== Description: =========================================
-//= Advanced Dungeon Warper
-//===== Additional Comments: =================================
-//= 08/06/05 : Added 1st Version. [Muad_Dib]
-//= Converted to eAthena format by Dr.Evil
-//============================================================
-
-
-prontera.gat,147,124,5	script	Zondaman Employee	874,{
-	cutin "zonda_01",2;
-	mes "[Zondaman Employee]";
-	mes "Welcome to Zondaman Services.";
-	mes "Where can I send you today?";
-	next;
-	menu "Bibilan Dungeon 3F -> 4000 z",-,"Clocktower 3F -> 4000 z",L1,"Glastheim Entrance -> 4000 z",L2,"Cancel",M_END;
-
-	if (Zeny < 4000) goto L_Zeny;
-	set Zeny,Zeny-4000;
-	warp "iz_dun02.gat",235,210;
-	end;
-
-L1:
-	if (Zeny < 4000) goto L_Zeny;
-	set Zeny,Zeny-4000;
-	warp "c_tower3.gat",65,145;
-	end;
-
-L2:
-	if (Zeny < 4000) goto L_Zeny;
-	set Zeny,Zeny-4000;
-	warp "glast_01.gat",370,305;
-	end;
-
-L_Zeny:
-	mes "[Zondaman Employee]";
-	mes "You don't have enough money.";
-	mes "Please verify the amount of money you have.";
-M_END:
-	close2;
-	cutin "",255;
-	close;
-}