From ac94b5185e33f525bb26f02cafbd3d877d0a2f60 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 5 Nov 2014 11:06:39 -0600
Subject: Fix Items For AST

---
 world/map/npc/items/check_wand.txt          | 4 ++--
 world/map/npc/items/launcher_ammo.txt       | 4 ++--
 world/map/npc/items/magic_gm_top_hat.txt    | 2 +-
 world/map/npc/items/mirror.txt              | 2 +-
 world/map/npc/items/purification_potion.txt | 6 ++----
 world/map/npc/items/require_stat.txt        | 2 +-
 world/map/npc/items/restricted_item.txt     | 2 +-
 world/map/npc/items/scissors.txt            | 2 +-
 world/map/npc/items/shock_sweet.txt         | 2 +-
 world/map/npc/items/unequipcb.txt           | 4 ++--
 world/map/npc/items/unreleased_item.txt     | 2 +-
 world/map/npc/items/warpTowels.txt          | 4 ++--
 12 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'world/map/npc')

diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt
index 29129eab..8c81f94e 100644
--- a/world/map/npc/items/check_wand.txt
+++ b/world/map/npc/items/check_wand.txt
@@ -1,6 +1,6 @@
 // Wands
 // Author: Wushin
-function|script|WandMana|,
+function|script|WandMana
 {
     if(isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) && ((@Duel_Fighter != 1) || ($@Duel_NoMagic == 1)))
         goto L_Return;
@@ -31,7 +31,7 @@ L_LowSp:
 L_Return:
     return;
 }
-function|script|CheckWand|,
+function|script|CheckWand
 {
     setarray $@Wands, 758, 1171;
     setarray $@WandsPwr, 2, 1;
diff --git a/world/map/npc/items/launcher_ammo.txt b/world/map/npc/items/launcher_ammo.txt
index 25f4df9b..1582f8a4 100644
--- a/world/map/npc/items/launcher_ammo.txt
+++ b/world/map/npc/items/launcher_ammo.txt
@@ -11,14 +11,14 @@
 //
 // ------------------------------------------------------------
 
-function|script|CheckLauncher|,
+function|script|CheckLauncher
 {
     if (getequipid(equip_arrow) == -1)
         set @LauncherType, 0;
     return;
 }
 
-function|script|CheckAmmo|,
+function|script|CheckAmmo
 {
     if ((@LauncherType == @AmmoType) || (!@LauncherType))
         goto L_Return;
diff --git a/world/map/npc/items/magic_gm_top_hat.txt b/world/map/npc/items/magic_gm_top_hat.txt
index 35b5fbd7..f4f6b078 100644
--- a/world/map/npc/items/magic_gm_top_hat.txt
+++ b/world/map/npc/items/magic_gm_top_hat.txt
@@ -1,4 +1,4 @@
-function|script|ActivateMagicGMTophat|,
+function|script|ActivateMagicGMTophat
 {
     if (getgmlevel() < 60) goto L_Return;
     getinventorylist;
diff --git a/world/map/npc/items/mirror.txt b/world/map/npc/items/mirror.txt
index 82aeb7a7..dcca9398 100644
--- a/world/map/npc/items/mirror.txt
+++ b/world/map/npc/items/mirror.txt
@@ -1,4 +1,4 @@
-function|script|useMirror|,
+function|script|useMirror
 {
   callfunc "getHeadStyles";
   goto L_Rand;
diff --git a/world/map/npc/items/purification_potion.txt b/world/map/npc/items/purification_potion.txt
index 9ff5494c..9a7bdcc7 100644
--- a/world/map/npc/items/purification_potion.txt
+++ b/world/map/npc/items/purification_potion.txt
@@ -1,6 +1,6 @@
 // This is the function to use the PurificationPotion
 
-function|script|usePurificationPotion|,
+function|script|usePurificationPotion
 {
     if (isat("011-1.gat", 88,67))
         goto L_Wyara_Pond;
@@ -23,8 +23,6 @@ L_Wyara_Pond:
 
     message strcharinfo(0), "You pour the potion into the pond.";
 
-    set QUEST_MAGIC2,
-        (QUEST_MAGIC2 & ~(@Q_MASK)
-        | (@Q_status << @Q_SHIFT));
+    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
     return;
 }
diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt
index f9734a1c..40200ea9 100644
--- a/world/map/npc/items/require_stat.txt
+++ b/world/map/npc/items/require_stat.txt
@@ -8,7 +8,7 @@
 //  @minbStatVal The minimum stat value to accept this item.
 // ------------------------------------------------------------
 
-function|script|RequireStat|,
+function|script|RequireStat
 {
     set @bStatVal, readparam(@bStat);
     // If the requirement isn't met, we set an unequip trigger.
diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt
index 5873ce45..c0084408 100644
--- a/world/map/npc/items/restricted_item.txt
+++ b/world/map/npc/items/restricted_item.txt
@@ -6,7 +6,7 @@
 //  @minLvl The minimum required GM level to equip this item. When not set or set to 0, it is set to 60 as a default.
 // ------------------------------------------------------------
 
-function|script|RestrictedItem|,
+function|script|RestrictedItem
 {
     if (!@minLvl) set @minLvl, 60;
     if (debug || getgmlevel() >= @minLvl) goto L_Return; // If the active character is staff, do nothing.
diff --git a/world/map/npc/items/scissors.txt b/world/map/npc/items/scissors.txt
index 71e1f52c..7e58ae98 100644
--- a/world/map/npc/items/scissors.txt
+++ b/world/map/npc/items/scissors.txt
@@ -1,4 +1,4 @@
-function|script|useScissors|,
+function|script|useScissors
 {
     if (rand(3))
         goto L_Change;
diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt
index 9bcfc875..e8ff6003 100644
--- a/world/map/npc/items/shock_sweet.txt
+++ b/world/map/npc/items/shock_sweet.txt
@@ -1,4 +1,4 @@
-function|script|useShockSweet|,
+function|script|useShockSweet
 {
     if (rand(5))
         goto L_Change;
diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt
index 83a74f20..c033c80f 100644
--- a/world/map/npc/items/unequipcb.txt
+++ b/world/map/npc/items/unequipcb.txt
@@ -2,7 +2,7 @@
 // on any map because of the -1 at the end.
 // Note: the client (I think) has a display bug if this is called
 // during the intial connection's equip hook
-017-9.gat,0,0,0|script|UnequipCB|-1,
+017-9.gat,0,0,0|script|UnequipCB|-1
 {
     end;
 
@@ -13,7 +13,7 @@ OnUnequip:
 }
 
 // Paired with unequipcb
-function|script|UnequipLater|,
+function|script|UnequipLater
 {
     // if there are multiple items that want to be removed,
     // only schedule one timer - scripts will be called again
diff --git a/world/map/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt
index 68fbc468..d8bb9e07 100644
--- a/world/map/npc/items/unreleased_item.txt
+++ b/world/map/npc/items/unreleased_item.txt
@@ -3,7 +3,7 @@
 //  @slotId The slot in which the item would have been equipped in. This is passed automagically when called in an equip script.
 // ------------------------------------------------------------
 
-function|script|UnreleasedItem|,
+function|script|UnreleasedItem
 {
     // If the server allows equipping unreleased items or if the active character is staff, do nothing.
     if (debug || getgmlevel())
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index 23c5e611..ac82c92b 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -1,5 +1,5 @@
 // See #TravelConfig
-function|script|WarpTowel|,
+function|script|WarpTowel
 {
     if (TowelLastUsed > (gettimetick(2) - 1800))
         goto L_DontPanic;
@@ -146,7 +146,7 @@ L_End:
     end;
 }
 
-function|script|MultiWarpTowel|,
+function|script|MultiWarpTowel
 {
     setarray $@warpTowels$, "HitchhikersTowel", "WhiteHitchhikersTowel", "RedHitchhikersTowel", "GreenHitchhikersTowel", "BlueHitchhikersTowel", "YellowHitchhikersTowel", "PurpleHitchhikersTowel", "OrangeHitchhikersTowel", "PinkHitchhikersTowel", "TealHitchhikersTowel", "LimeHitchhikersTowel";
     set @towel_count, 0;
-- 
cgit v1.2.3-60-g2f50