Revert "Unify specialeffect, convert legacy scripts (#1746)"

This reverts commit 19883c583e5e1471c87ae80e67f34882a7e75bc6.

The commit was squashed by accident, my fault. I'm merging the PR again,
this time preserving the indivisual commits.

1 files changed, 41 insertions, 41 deletions

diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 8632e160c..c722f2677 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1698,7 +1698,7 @@ S_AS_1:
 	if (rand(1,3) == 2) {
 		soundeffect "mos_gusli1.wav",0;
 		emotion e_no1;
-		specialeffect(EF_EXIT, AREA, playerattached());
+		specialeffect2 EF_EXIT;
 		mes "[Aged Stranger]";
 		mes "Oh! You are good at playing the";
 		mes "Gusli! In such a short time... you";
@@ -5561,7 +5561,7 @@ moscovia,252,203,5	script	A Little Girl#mos1	4_F_RUSCHILD,{
 			mes "[Yosefina]";
 			mes "Yes, I like it very much~";
 			mes "I never want it to leave. I don't want winter to come.";
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mos_kid = 1;
 			if (mos_middle == 1 && mos_elder == 1) mos_nowinter = 11;
 			close;
@@ -5602,7 +5602,7 @@ moscovia,233,204,3	script	A Young Man#mos2	4_M_RUSMAN2,{
 			mes "No, I don't like the cold winter.";
 			mes "And I get angry when";
 			mes "seeing couples.";
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mos_middle = 1;
 			if (mos_kid == 1 && mos_elder == 1) mos_nowinter = 11;
 			close;
@@ -5643,7 +5643,7 @@ moscovia,219,229,5	script	A Middle-Aged Man#mos3	4_M_RUSBALD,{
 			mes "Everyone will be sad";
 			mes "when it comes again.";
 			mes "I don't want winter to come.";
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mos_elder = 1;
 			if (mos_kid == 1 && mos_middle == 1) mos_nowinter = 11;
 			close;
@@ -5704,7 +5704,7 @@ moscovia,255,203,3	script	A Little Boy#mos4	4_M_RUSCHILD,{
 			mes "a long and heavy sword";
 			mes "some day.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Vasili]";
 			mes "If winter is gone,";
 			mes "it is much easier to go on adventures.";
@@ -5753,7 +5753,7 @@ moscovia,204,188,5	script	A Lady#mos5	4_F_RUSWOMAN1,{
 			mes "The sunflower is the symbol";
 			mes "of this province.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Katya]";
 			mes "I wish that winter never comes back and";
 			mes "I could see sunflowers everyday.";
@@ -5794,7 +5794,7 @@ moscovia,167,97,3	script	A Lady#mos6	4_F_RUSWOMAN3,{
 			mes "Yes, kids like it and";
 			mes "flowers are blooming.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Roza]";
 			mes "Whoever likes the cold and dark winter?";
 			mes "I hope this weather last forever.";
@@ -5851,7 +5851,7 @@ moscovia,202,102,3	script	A Little Boy#mos7	4_M_RUSCHILD,{
 			mes "nobody comes out of their homes.";
 			mes "So it's not very fun.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Feliks]";
 			mes "If winter never comes";
 			mes "I can have";
@@ -5908,7 +5908,7 @@ moscovia,220,172,3	script	A Young Man#mos8	4_M_RUSMAN2,{
 			mes "I feel an impulse to adventure";
 			mes "many times a day.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Ilyav]";
 			mes "But, I don't want to in the cold winter.";
 			mes "Hu, if the weather everday was as good as lately,";
@@ -5948,7 +5948,7 @@ moscovia,253,175,3	script	A Man#mos9	4_M_RUSBALD,{
 			mes "There's so much snow that it makes it hard to go";
 			mes "around here and there.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Orek]";
 			mes "In winter, fishing is more difficult,";
 			mes "anyway, it is bad for us.";
@@ -6005,7 +6005,7 @@ moscovia,168,135,3	script	A Lady#mos10	4_F_RUSWOMAN3,{
 			mes "But, you don't even know how cold it gets here in winter.";
 			mes "You wouldn't even want to go outside.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Kyra]";
 			mes "It is good to stay with my family, but";
 			mes "nobody likes the cold winter.";
@@ -6057,7 +6057,7 @@ moscovia,192,80,3	script	A Lady#mos11	4_F_RUSWOMAN1,{
 			mes "[Sabina]";
 			mes "If the summer continues to last,";
 			mes "I can see them all the time...";
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mos_middle = 1;
 			if (mos_kid == 1 && mos_elder == 1) mos_nowinter = 11;
 			close;
@@ -6108,7 +6108,7 @@ moscovia,211,215,5	script	A Young Man#mos12	4_M_RUSMAN1,{
 			mes "Of course.";
 			mes "From now on, it is my golden age of opportunity!";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Izlof]";
 			mes "If it is the summer all the time,";
 			mes "my life will be in an amorous mood.";
@@ -6158,7 +6158,7 @@ moscovia,149,112,3	script	A Man#mos13	4_M_RUSBALD,{
 			mes "Yes, under the warm sunlight,";
 			mes "I like to rest.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Lev]";
 			mes "I hope that this warm weather";
 			mes "will last forever.";
@@ -6210,7 +6210,7 @@ moscovia,196,71,3	script	A Young Man#mos14	4_M_RUSMAN2,{
 			mes "sea is frozen, so it";
 			mes "is impossible to sail.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Fredek]";
 			mes "I hope that winter never comes.";
 			mes "It is my dream.";
@@ -6262,7 +6262,7 @@ moscovia,234,168,5	script	A Man#mos15	4_M_RUSBALD,{
 			mes "If you didn't prepare,";
 			mes "it would be hard for you.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Gavrel]";
 			mes "It would be a lot better";
 			mes "if winter never came again.";
@@ -6315,7 +6315,7 @@ moscovia,228,80,3	script	A Little Boy#mos16	4_M_RUSCHILD,{
 			mes "Unless the sunlight is too strong,";
 			mes "it is much better than the cold winter.";
 			next;
-			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Rurik]";
 			mes "By the way, what is this for?";
 			mes "It is natural to like the summer.";
@@ -6729,8 +6729,8 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	HIDDEN_NPC,{
 				next;
 				mes "- !!!!!! -";
 				percentheal -50,-50;
-				specialeffect(EF_DARKBREATH, AREA, playerattached());
-				specialeffect(EF_HIT2, AREA, playerattached());
+				specialeffect2 EF_DARKBREATH;
+				specialeffect2 EF_HIT2;
 				emotion e_omg,1;
 				next;
 				mes "- An unknown force has -";
@@ -6834,7 +6834,7 @@ mosk_dun01,167,160,3	script	Gray Wolf#rus03	4_RUS_DWOLF,{
 		rhea_rus_main = 3;
 		setquest(8136);
 		emotion e_omg,1;
-		specialeffect(EF_HIT2, AREA, playerattached());
+		specialeffect2 EF_HIT2;
 		percentheal -50,0;
 		next;
 		mes "- The Gray Wolf attacks you -";
@@ -7078,7 +7078,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 				mes "- The key begins to glow -";
 				mes "- wind begins to blow -";
 				mes "- from somewhere -";
-				specialeffect(EF_BEGINSPELL, AREA, playerattached());
+				specialeffect2 EF_BEGINSPELL;
 				specialeffect EF_FREEZED;
 				next;
 			} else {
@@ -7096,15 +7096,15 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 			mes "- The wind disappears and -";
 			mes "- a very young girl appears -";
 			donpcevent "Maria Morebna#rus46::OnEnable";
-			specialeffect(EF_FREEZED, AREA, getnpcid(0, "Maria Morebna#rus46"));
+			specialeffect EF_FREEZED,AREA,"Maria Morebna#rus46";
 			next;
 			mes "[Maria Morebna]";
 			mes "Thank you!";
 			mes "I'm finally out of there! Now I can.....................aaaaak!!!....";
 			next;
-			specialeffect(EF_HIT2, AREA, getnpcid(0, "Maria Morebna#rus46"));
-			specialeffect(EF_DARKBREATH, AREA, getnpcid(0, "Maria Morebna#rus46"));
-			specialeffect(EF_DEVIL, AREA, getnpcid(0, "Maria Morebna#rus46"));
+			specialeffect EF_HIT2,AREA,"Maria Morebna#rus46";
+			specialeffect EF_DARKBREATH,AREA,"Maria Morebna#rus46";
+			specialeffect EF_DEVIL,AREA,"Maria Morebna#rus46";
 			mes "- Maria is attacked -";
 			mes "- and falls down!! -";
 			next;
@@ -7133,7 +7133,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 			mes "Gray Wolf...";
 			mes "You think you can fight me?!";
 			next;
-			specialeffect(EF_FIREHIT, AREA, getnpcid(0, "Gray Wolf#rus05"));
+			specialeffect EF_FIREHIT,AREA,"Gray Wolf#rus05";
 			mes "- Staggering from -";
 			mes "- Koshei's flames, -";
 			mes "- Gray Wolf quickly tell me -";
@@ -7261,7 +7261,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 		mes "- The wounds and -";
 		mes "- curses on her body -";
 		mes "- are removed !! -";
-		specialeffect(EF_ABSORBSPIRITS, AREA, getnpcid(0, "Maria Morebna#rus46"));
+		specialeffect EF_ABSORBSPIRITS,AREA,"Maria Morebna#rus46";
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Ok! Next...";
@@ -7291,7 +7291,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 			next;
 		}
 		mes "- !! -";
-		specialeffect(EF_RESURRECTION, AREA, getnpcid(0, "Maria Morebna#rus46"));
+		specialeffect EF_RESURRECTION,AREA,"Maria Morebna#rus46";
 		next;
 		mes "[Gray Wolf]";
 		mes "Success!!";
@@ -7644,7 +7644,7 @@ moscovia,178,127,0	script	The Blacksmith#rus06	1_M_SMITH,{
 				next;
 				mes "[The Blacksmith]";
 				mes "'^ff0000Spellshield Protection^000000.";
-				specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
+				specialeffect2 EF_ABSORBSPIRITS;
 				next;
 				mes "[The Blacksmith]";
 				mes "This spell protects you from any curse the keymaker might try to use. Remember the words of the spell. It won't last very long because I am just a blacksmith.";
@@ -8538,7 +8538,7 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	1_F_04,{
 				close;
 			}
 			mes "- My hand is pricked by thorns! -";
-			specialeffect(EF_HIT2, AREA, playerattached());
+			specialeffect2 EF_HIT2;
 			percentheal -5,0;
 			close;
 		}
@@ -8705,7 +8705,7 @@ OnTouch:
 			mes "- something gleaming -";
 			mes "- seems to stare at you!! -";
 			close2;
-			specialeffect(EF_FLASHER, AREA, playerattached());
+			specialeffect2 EF_FLASHER;
 			unitkill getcharid(CHAR_ID_ACCOUNT);
 			end;
 		}
@@ -8727,7 +8727,7 @@ OnTouch:
 			}
 			mes "-You seem to hear the splash but something gleaming raids on you!!-";
 			close2;
-			specialeffect(EF_FLASHER, AREA, playerattached());
+			specialeffect2 EF_FLASHER;
 			unitkill getcharid(CHAR_ID_ACCOUNT);
 			end;
 		}
@@ -8925,7 +8925,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	4_F_RUSGREEN,{
 				mes "Here, my hair...?!";
 				mes "Aaaaaaaah!??!?!";
 				sc_start SC_CURSE,60000,0;
-				specialeffect(EF_LORD, AREA, playerattached());
+				specialeffect2 EF_LORD;
 				emotion e_omg,1;
 				percentheal -30,0;
 				next;
@@ -8968,7 +8968,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	4_F_RUSGREEN,{
 	}
 	mes "-When Lusalka watches you, you are blacked out-";
 	close2;
-	specialeffect(EF_FLASHER, AREA, playerattached());
+	specialeffect2 EF_FLASHER;
 	unitkill getcharid(CHAR_ID_ACCOUNT);
 	donpcevent "Lusalka#rus23::OnDisable";
 	end;
@@ -9415,7 +9415,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	HIDDEN_NPC,{
 				next;
 				mes "["+ strcharinfo(PC_NAME) +"]";
 				mes "Oops, it's hot, hot!!!";
-				specialeffect(EF_FIREHIT, AREA, playerattached());
+				specialeffect2 EF_FIREHIT;
 				emotion e_omg,1;
 				percentheal -5,0;
 				close;
@@ -9679,7 +9679,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	4_F_BABAYAGA,{
 		mes "[Baba Yaga]";
 		mes "'Presto Change-o!!'";
 		mes "'Turn into a pig!!'";
-		specialeffect(EF_BARRIER, AREA, playerattached());
+		specialeffect2 EF_BARRIER;
 		emotion e_omg;
 		next;
 		mes "[Baba Yaga]";
@@ -9697,7 +9697,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	4_F_BABAYAGA,{
 			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Eh, eh.. I mean.. I say.. spell...";
 			mes ""+ .@input$ +" !!!";
-			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
+			specialeffect2 EF_ABSORBSPIRITS;
 			next;
 		} else {
 			mes "["+ strcharinfo(PC_NAME) +"]";
@@ -9889,7 +9889,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	4_F_BABAYAGA,{
 		next;
 		mes "[Baba Yaga]";
 		mes "'There is an order for you to open your eyes!!!'";
-		specialeffect(EF_BEGINSPELL3, AREA, playerattached());
+		specialeffect2 EF_BEGINSPELL3;
 		rhea_rus_main = 29;
 		monster "mosk_dun02",52,210,"Alarm to 5 minutes",1193,1,"Baba Yaga#rus32::OnMyMobDead";
 		monster "mosk_dun02",53,210,"Alarm on time",1193,1,"Baba Yaga#rus32::OnMyMobDead";
@@ -11006,7 +11006,7 @@ treasure01,24,39,0	script	Old Bed#rus38	HIDDEN_NPC,{
 				next;
 				mes "["+ strcharinfo(PC_NAME) +"]";
 				mes "Ouch?!";
-				specialeffect(EF_HIT2, AREA, playerattached());
+				specialeffect2 EF_HIT2;
 				percentheal -5,0;
 				next;
 				mes "- Something unidentified bites your hand !! -";
@@ -11059,7 +11059,7 @@ treasure01,24,39,0	script	Old Bed#rus38	HIDDEN_NPC,{
 				next;
 				mes "["+ strcharinfo(PC_NAME) +"]";
 				mes "Ouch?!";
-				specialeffect(EF_HIT2, AREA, playerattached());
+				specialeffect2 EF_HIT2;
 				percentheal -5,0;
 				next;
 				mes "- Something unidentified bites your hand !! -";
@@ -11828,7 +11828,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	HIDDEN_NPC,{
 			mes "Ok, it is my turn?";
 			next;
 			mes "-You cast a dice. The dice falls down, rotates and stops there-";
-			specialeffect(EF_STUNATTACK, AREA, playerattached());
+			specialeffect2 EF_STUNATTACK;
 			next;
 			.@rus_dice01 = rand(1,6);
 			mes "["+ strcharinfo(PC_NAME) +"]";