* Added support for NPC names in the 'specialeffect' script command, go go copy/paste!

* Updated several NPCs to use the updated specialeffect command, updated more NPCs to use the updated emotion command.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14353 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 36 insertions, 108 deletions

diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index 3eb86f9da..e18495620 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1092,10 +1092,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x1,rand(81,95);
 	set .@paper_y1,rand(87,100);
@@ -1121,10 +1117,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x2,rand(96,110);
 	set .@paper_y2,rand(87,100);
@@ -1150,10 +1142,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x3,rand(111,124);
 	set .@paper_y3,rand(87,100);
@@ -1179,10 +1167,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x4,rand(81,95);
 	set .@paper_y4,rand(73,86);
@@ -1208,10 +1192,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x5,rand(96,110);
 	set .@paper_y5,rand(73,86);
@@ -1237,10 +1217,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x6,rand(111,124);
 	set .@paper_y6,rand(73,86);
@@ -1266,10 +1242,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x7,rand(81,95);
 	set .@paper_y7,rand(59,72);
@@ -1295,10 +1267,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x8,rand(96,110);
 	set .@paper_y8,rand(59,72);
@@ -1324,10 +1292,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x9,rand(111,124);
 	set .@paper_y9,rand(59,72);
@@ -1360,33 +1324,33 @@ Onmvp:
 	end;
 
 OnTimer1000:
-	donpcevent "paper_sp_1_a::Onmvp";
-	donpcevent "paper_sp_3_a::Onmvp";
-	donpcevent "paper_sp_5_a::Onmvp";
-	donpcevent "paper_sp_7_a::Onmvp";
-	donpcevent "paper_sp_9_a::Onmvp";
+	specialeffect EF_MVP,AREA,"paper_sp_1_a";
+	specialeffect EF_MVP,AREA,"paper_sp_3_a";
+	specialeffect EF_MVP,AREA,"paper_sp_5_a";
+	specialeffect EF_MVP,AREA,"paper_sp_7_a";
+	specialeffect EF_MVP,AREA,"paper_sp_9_a";
 	end;
 
 OnTimer2000:
-	donpcevent "paper_sp_2_a::Onmvp";
-	donpcevent "paper_sp_4_a::Onmvp";
-	donpcevent "paper_sp_6_a::Onmvp";
-	donpcevent "paper_sp_8_a::Onmvp";
+	specialeffect EF_MVP,AREA,"paper_sp_2_a";
+	specialeffect EF_MVP,AREA,"paper_sp_4_a";
+	specialeffect EF_MVP,AREA,"paper_sp_6_a";
+	specialeffect EF_MVP,AREA,"paper_sp_8_a";
 	end;
 
 OnTimer3000:
-	donpcevent "paper_sp_1_a::Onmvp";
-	donpcevent "paper_sp_3_a::Onmvp";
-	donpcevent "paper_sp_5_a::Onmvp";
-	donpcevent "paper_sp_7_a::Onmvp";
-	donpcevent "paper_sp_9_a::Onmvp";
+	specialeffect EF_MVP,AREA,"paper_sp_1_a";
+	specialeffect EF_MVP,AREA,"paper_sp_3_a";
+	specialeffect EF_MVP,AREA,"paper_sp_5_a";
+	specialeffect EF_MVP,AREA,"paper_sp_7_a";
+	specialeffect EF_MVP,AREA,"paper_sp_9_a";
 	end;
 
 OnTimer4000:
-	donpcevent "paper_sp_2_a::Onmvp";
-	donpcevent "paper_sp_4_a::Onmvp";
-	donpcevent "paper_sp_6_a::Onmvp";
-	donpcevent "paper_sp_8_a::Onmvp";
+	specialeffect EF_MVP,AREA,"paper_sp_2_a";
+	specialeffect EF_MVP,AREA,"paper_sp_4_a";
+	specialeffect EF_MVP,AREA,"paper_sp_6_a";
+	specialeffect EF_MVP,AREA,"paper_sp_8_a";
 	stopnpctimer;
 	end;
 }
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 92d2b7faf..011d0acd7 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1091,10 +1091,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x1,rand(81,95);
 	set .@paper_y1,rand(87,100);
@@ -1120,10 +1116,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x2,rand(96,110);
 	set .@paper_y2,rand(87,100);
@@ -1149,10 +1141,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x3,rand(111,124);
 	set .@paper_y3,rand(87,100);
@@ -1178,10 +1166,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x4,rand(81,95);
 	set .@paper_y4,rand(73,86);
@@ -1207,10 +1191,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x5,rand(96,110);
 	set .@paper_y5,rand(73,86);
@@ -1236,10 +1216,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x6,rand(111,124);
 	set .@paper_y6,rand(73,86);
@@ -1265,10 +1241,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x7,rand(81,95);
 	set .@paper_y7,rand(59,72);
@@ -1294,10 +1266,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x8,rand(96,110);
 	set .@paper_y8,rand(59,72);
@@ -1323,10 +1291,6 @@ OnEnable:
 	}
 	end;
 
-Onmvp:
-	specialeffect EF_MVP;
-	end;
-
 Onbingo:
 	set .@paper_x9,rand(111,124);
 	set .@paper_y9,rand(59,72);
@@ -1359,33 +1323,33 @@ Onmvp:
 	end;
 
 OnTimer1000:
-	donpcevent "paper_sp_1_s::Onmvp";
-	donpcevent "paper_sp_3_s::Onmvp";
-	donpcevent "paper_sp_5_s::Onmvp";
-	donpcevent "paper_sp_7_s::Onmvp";
-	donpcevent "paper_sp_9_s::Onmvp";
+	specialeffect EF_MVP,AREA,"paper_sp_1_s";
+	specialeffect EF_MVP,AREA,"paper_sp_3_s";
+	specialeffect EF_MVP,AREA,"paper_sp_5_s";
+	specialeffect EF_MVP,AREA,"paper_sp_7_s";
+	specialeffect EF_MVP,AREA,"paper_sp_9_s";
 	end;
 
 OnTimer2000:
-	donpcevent "paper_sp_2_s::Onmvp";
-	donpcevent "paper_sp_4_s::Onmvp";
-	donpcevent "paper_sp_6_s::Onmvp";
-	donpcevent "paper_sp_8_s::Onmvp";
+	specialeffect EF_MVP,AREA,"paper_sp_2_s";
+	specialeffect EF_MVP,AREA,"paper_sp_4_s";
+	specialeffect EF_MVP,AREA,"paper_sp_6_s";
+	specialeffect EF_MVP,AREA,"paper_sp_8_s";
 	end;
 
 OnTimer3000:
-	donpcevent "paper_sp_1_s::Onmvp";
-	donpcevent "paper_sp_3_s::Onmvp";
-	donpcevent "paper_sp_5_s::Onmvp";
-	donpcevent "paper_sp_7_s::Onmvp";
-	donpcevent "paper_sp_9_s::Onmvp";
+	specialeffect EF_MVP,AREA,"paper_sp_1_s";
+	specialeffect EF_MVP,AREA,"paper_sp_3_s";
+	specialeffect EF_MVP,AREA,"paper_sp_5_s";
+	specialeffect EF_MVP,AREA,"paper_sp_7_s";
+	specialeffect EF_MVP,AREA,"paper_sp_9_s";
 	end;
 
 OnTimer4000:
-	donpcevent "paper_sp_2_s::Onmvp";
-	donpcevent "paper_sp_4_s::Onmvp";
-	donpcevent "paper_sp_6_s::Onmvp";
-	donpcevent "paper_sp_8_s::Onmvp";
+	specialeffect EF_MVP,AREA,"paper_sp_2_s";
+	specialeffect EF_MVP,AREA,"paper_sp_4_s";
+	specialeffect EF_MVP,AREA,"paper_sp_6_s";
+	specialeffect EF_MVP,AREA,"paper_sp_8_s";
 	stopnpctimer;
 	end;
 }