From 0908cb3f1ac01bb5433c3084551339adadbfd12d Mon Sep 17 00:00:00 2001
From: aleos <aleos89@users.noreply.github.com>
Date: Tue, 17 May 2022 16:21:57 -0400
Subject: [PATCH] Minor cleanups from reversions

---
 db/pre-re/item_db_equip.yml | 24 +++++++-----------------
 db/pre-re/item_db_etc.yml   |  4 +---
 db/re/item_db_etc.yml       |  2 +-
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/db/pre-re/item_db_equip.yml b/db/pre-re/item_db_equip.yml
index d5aa7afba3..c40ac564f9 100644
--- a/db/pre-re/item_db_equip.yml
+++ b/db/pre-re/item_db_equip.yml
@@ -5360,9 +5360,7 @@ Body:
     Refineable: true
     Script: |
       bonus bStr,10;
-      sc_start SC_MOVEHASTE_INFINITY,INFINITE_TICK,25;
-    UnEquipScript: |
-      sc_end SC_MOVEHASTE_INFINITY;
+      bonus2 bSpeedRate,25;
   - Id: 1364
     AegisName: Great_Axe
     Name: Great Axe
@@ -5437,9 +5435,7 @@ Body:
       bonus bAtkEle,Ele_Holy;
       skill "AL_HEAL",3;
       bonus2 bAddRace,RC_Demon,3;
-      sc_start SC_MOVEHASTE_INFINITY,INFINITE_TICK,25;
-    UnEquipScript: |
-      sc_end SC_MOVEHASTE_INFINITY;
+      bonus2 bSpeedRate,25;
   - Id: 1367
     AegisName: Slaughter
     Name: Slaughter
@@ -18922,10 +18918,8 @@ Body:
       bonus bMaxHPrate,20;
       bonus bMaxSPrate,20;
       bonus bSPrecovRate,15;
-      sc_start SC_MOVEHASTE_INFINITY,INFINITE_TICK,25;
+      bonus2 bSpeedRate,25;
       bonus bInt,25;
-    UnEquipScript: |
-      sc_end SC_MOVEHASTE_INFINITY;
   - Id: 2411
     AegisName: Grave
     Name: Greaves
@@ -29584,11 +29578,10 @@ Body:
     Refineable: true
     View: 305
     Script: |
-      sc_start SC_MOVEHASTE_INFINITY,INFINITE_TICK,25;
+      bonus2 bSpeedRate,25;
       bonus bDef,4;
       skill "TF_HIDING",1;
     UnEquipScript: |
-      sc_end SC_MOVEHASTE_INFINITY;
       sc_end SC_HIDING;
   - Id: 5274
     AegisName: Shiny_Wig
@@ -29604,11 +29597,10 @@ Body:
     Refineable: true
     View: 306
     Script: |
-      sc_start SC_MOVEHASTE_INFINITY,INFINITE_TICK,25;
+      bonus2 bSpeedRate,25;
       bonus bDef,4;
       skill "TF_HIDING",1;
     UnEquipScript: |
-      sc_end SC_MOVEHASTE_INFINITY;
       sc_end SC_HIDING;
   - Id: 5275
     AegisName: Marvelous_Wig
@@ -29624,11 +29616,10 @@ Body:
     Refineable: true
     View: 307
     Script: |
-      sc_start SC_MOVEHASTE_INFINITY,INFINITE_TICK,25;
+      bonus2 bSpeedRate,25;
       bonus bDef,4;
       skill "TF_HIDING",1;
     UnEquipScript: |
-      sc_end SC_MOVEHASTE_INFINITY;
       sc_end SC_HIDING;
   - Id: 5276
     AegisName: Fantastic_Wig
@@ -29644,11 +29635,10 @@ Body:
     Refineable: true
     View: 308
     Script: |
-      sc_start SC_MOVEHASTE_INFINITY,INFINITE_TICK,25;
+      bonus2 bSpeedRate,25;
       bonus bDef,4;
       skill "TF_HIDING",1;
     UnEquipScript: |
-      sc_end SC_MOVEHASTE_INFINITY;
       sc_end SC_HIDING;
   - Id: 5277
     AegisName: Yellow_Bandana
diff --git a/db/pre-re/item_db_etc.yml b/db/pre-re/item_db_etc.yml
index 9a526b3276..78cbc0939b 100644
--- a/db/pre-re/item_db_etc.yml
+++ b/db/pre-re/item_db_etc.yml
@@ -4210,9 +4210,7 @@ Body:
     Flags:
       BuyingStore: true
     Script: |
-      sc_start SC_MOVEHASTE_INFINITY,INFINITE_TICK,25;
-    UnEquipScript: |
-      sc_end SC_MOVEHASTE_INFINITY;
+      bonus2 bSpeedRate,25;
   - Id: 4132
     AegisName: Mistress_Card
     Name: Mistress Card
diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml
index 87ebaa69e9..686f5c643d 100644
--- a/db/re/item_db_etc.yml
+++ b/db/re/item_db_etc.yml
@@ -11025,7 +11025,7 @@ Body:
       BuyingStore: true
       DropEffect: CLIENT
     Script: |
-      autobonus "{ bonus bAgi,44; bonus2 bSpeedRate,25; heal 0,-40; }",500,3000,0,"{ specialeffect2 EF_POTION_BERSERK; showscript \"I got the signal!!!!\"; }";
+      autobonus2 "{ bonus bAgi,44; bonus bNoWalkDelay; bonus2 bSpeedRate,25; heal 0,-40; }",500,3000,0,"{ specialeffect2 EF_POTION_BERSERK; showscript \"I got the signal!!!!\"; }";
   - Id: 4582
     AegisName: Bungisngis_Card
     Name: Bungisngis Card