From 762332f031dc5f125755726d175d3537bf9326b3 Mon Sep 17 00:00:00 2001
From: gumi <mekolat@users.noreply.github.com>
Date: Mon, 5 Jun 2017 11:49:25 -0400
Subject: remove specialeffect2 usage from scripts

---
 npc/001-1/flyingpiou.txt    | 6 +++---
 npc/functions/fishing.txt   | 8 ++++----
 npc/functions/savepoint.txt | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/npc/001-1/flyingpiou.txt b/npc/001-1/flyingpiou.txt
index 49abe4b8..4dae92a3 100644
--- a/npc/001-1/flyingpiou.txt
+++ b/npc/001-1/flyingpiou.txt
@@ -60,7 +60,7 @@ function	script	ArtisFlyingPiouLogic	{
     {
         message strcharinfo(0), l("Dang, I scared it! More patience, @@, more patience.", strcharinfo(0));
         .LastTimeTouched = .@tick;
-        specialeffect2 33, SELF;
+        specialeffect(33, SELF);
         end;
     }
 
@@ -81,7 +81,7 @@ function	script	ArtisFlyingPiouLogic	{
         set getvariableofnpc(.LastPiouHunterID, .@trader$), .@charid;
         set getvariableofnpc(.PiouCaught, .@trader$), 1;
         donpcevent .@trader$ + "::OnPiouFlee";
-        specialeffect2 26, SELF;
+        specialeffect(26, SELF);
         close2;
         disablenpc strnpcinfo(3);
         close;
@@ -93,7 +93,7 @@ function	script	ArtisFlyingPiouLogic	{
         message strcharinfo(0), .RandomFailureMessages$[.@r];
         .speed = max(140, 200 - 10 * (@ArtisQuests_CatchPiouTries +
                      ArtisQuests_CatchPiou_Difficulcy));
-        specialeffect2 33, SELF;
+        specialeffect(33, SELF);
     }
     end;
 
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 44c620a2..88fef427 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -43,7 +43,7 @@ OnBite:
 
 OnCleanUp:
     dispbottom l("You waited too long and lost the bait...");
-    specialeffect2 getvariableofnpc(.failure_fx, @fishing_spot$), SELF; // event fail
+    specialeffect(getvariableofnpc(.failure_fx, @fishing_spot$), SELF, playerattached()); // event fail
 OnPCLogoutEvent:
     fishing_cleanup @fishing_spot$;
     @fishing_spot$ = ""; // unbind fishing npc
@@ -157,7 +157,7 @@ function	script	fishing	{
     {
         deltimer "global fishing handler::OnCleanUp"; // cancel auto cleanup
         deltimer "global fishing handler::OnBite";
-        specialeffect2 .@failure_fx, SELF;  // event fail
+        specialeffect(.@failure_fx, SELF, playerattached());  // event fail
         fishing_cleanup .@npc$; // do it manually instead
         dispbottom l("You pulled too soon and lost the bait.");
         return -3;
@@ -190,7 +190,7 @@ function	script	fishing	{
         // RNG to obtain a fish
         if (rand(gettimetick(0) - @fishing_tick) <= .@pull_rand_max)
         {
-            specialeffect2 .@success_fx, SELF; // event success
+            specialeffect(.@success_fx, SELF, playerattached()); // event success
 
             if(!checkweight(.@fish_id, 1))
             {
@@ -205,7 +205,7 @@ function	script	fishing	{
         else
         {
             dispbottom l("You pulled too late and lost the bait...");
-            specialeffect2 .@failure_fx, SELF;  // event fail
+            specialeffect(.@failure_fx, SELF, playerattached());  // event fail
             .@fish_id = 0;
         }
 
diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt
index 28bab131..0e0b6f90 100644
--- a/npc/functions/savepoint.txt
+++ b/npc/functions/savepoint.txt
@@ -41,7 +41,7 @@ function	script	savepointparticle	{
         INN_REGISTER = NO_INN;
     }
     savepoint .@mapname$, .@mapx, .@mapy;
-    misceffect 4, getcharid(3);
+    specialeffect(4, SELF, getcharid(3));
     @lastSave = gettimetick(2);
 
     return;
-- 
cgit v1.2.3-60-g2f50