Make RequireStat script less silly

2 files changed, 11 insertions, 24 deletions

diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index 79bd60f8..aa47af45 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -392,10 +392,10 @@
 874,    LazuriteCrystal,                Lazurite Crystal,                   3,      3000,       200,        5,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 875,    HeartOfLazurite,                Heart of Lazurite,                  3,      10000,      400,        15,         0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 876,    WarlordBoots,                   Warlord Boots,                      5,      19000,      2000,       550,        0,      5,      0,      -22,    0,      2,      64,         0,      0,      0,      {},                                                                     {}
-877,    BullHelmet,                     Bull Helmet,                        5,      90000,      60000,      1300,       0,      19,     0,      -52,    0,      2,      256,        0,      90,     0,      {},                                                                     {set @bStat$, "Str";set @minbStatVal, 70;callfunc "RequireStat"; set @bStat$, "Vit";set @minbStatVal, 50;callfunc "RequireStat"; set @bStat$, "Luk";set @minbStatVal, 50;callfunc "RequireStat"; bonus bAtkRange, -10; bonus bDoubleAddRate, 20; bonus bStr, 10; bonus bCritical, 15; bonus bAspdRate, 10; bonus bDef2Rate, -39; bonus bHit, -15;}
-878,    BansheeBow,                     Banshee Bow,                        4,      101000,     40000,      900,        90,     0,      6,      0,      0,      2,      34,         1,      90,     11,     {},                                                                     {set @bStat$, "Dex";set @minbStatVal, 80;callfunc "RequireStat"; bonus2 bHPDrainRate, 100, -4; bonus bAspdRate, 20; bonus bCritical, 70; bonus bMaxHP, -150; bonus bDefRate, -40; bonus bDef2Rate, -35;}
+877,    BullHelmet,                     Bull Helmet,                        5,      90000,      60000,      1300,       0,      19,     0,      -52,    0,      2,      256,        0,      90,     0,      {},                                                                     {set @bStat, bStr;set @minbStatVal, 70;callfunc "RequireStat"; set @bStat, bVit;set @minbStatVal, 50;callfunc "RequireStat"; set @bStat, bLuk;set @minbStatVal, 50;callfunc "RequireStat"; bonus bAtkRange, -10; bonus bDoubleAddRate, 20; bonus bStr, 10; bonus bCritical, 15; bonus bAspdRate, 10; bonus bDef2Rate, -39; bonus bHit, -15;}
+878,    BansheeBow,                     Banshee Bow,                        4,      101000,     40000,      900,        90,     0,      6,      0,      0,      2,      34,         1,      90,     11,     {},                                                                     {set @bStat, bDex;set @minbStatVal, 80;callfunc "RequireStat"; bonus2 bHPDrainRate, 100, -4; bonus bAspdRate, 20; bonus bCritical, 70; bonus bMaxHP, -150; bonus bDefRate, -40; bonus bDef2Rate, -35;}
 879,    HeartOfIsis,                    Heart of Isis,                      5,      70000,      35000,      40,         0,      0,      0,      0,      0,      2,      8,          0,      85,     0,      {},                                                                     {bonus bMaxHPrate, 15; bonus bHPrecovRate, 65;}
-880,    LazuriteRobe,                   Lazurite Robe,                      5,      92000,      52000,      30,         0,      7,      0,      60,     0,      2,      512,        0,      90,     0,      {},                                                                     {set @bStat$, "Int";set @minbStatVal, 70;callfunc "RequireStat"; set @bStat$, "Vit";set @minbStatVal, 40;callfunc "RequireStat"; bonus bSpeedAddRate, -15; bonus bDef2Rate, -40; bonus bMdef, 60; bonus bVit, -1; bonus bInt, 7; bonus bLuk, -1; bonus bDex, -1; bonus bStr, -1;}
+880,    LazuriteRobe,                   Lazurite Robe,                      5,      92000,      52000,      30,         0,      7,      0,      60,     0,      2,      512,        0,      90,     0,      {},                                                                     {set @bStat, bInt;set @minbStatVal, 70;callfunc "RequireStat"; set @bStat, bVit;set @minbStatVal, 40;callfunc "RequireStat"; bonus bSpeedAddRate, -15; bonus bDef2Rate, -40; bonus bMdef, 60; bonus bVit, -1; bonus bInt, 7; bonus bLuk, -1; bonus bDex, -1; bonus bStr, -1;}
 881,    RaggedShorts,                   Ragged Shorts,                      5,      60,         1,          7,          0,      0,      0,      -2,     0,      2,      1,          0,      1,      0,      {},                                                                     {}
 882,    RedEggshellHat,                 Red Eggshell Hat,                   5,      7000,       5000,       15,         0,      9,      0,      3,      0,      2,      256,        0,      1,      0,      {},                                                                     {}
 883,    BlueEggshellHat,                Blue Eggshell Hat,                  5,      7000,       5000,       15,         0,      9,      0,      3,      0,      2,      256,        0,      1,      0,      {},                                                                     {}
diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt
index 01ca1600..ad975e24 100644
--- a/world/map/npc/items/require_stat.txt
+++ b/world/map/npc/items/require_stat.txt
@@ -1,31 +1,18 @@
 // ------------------------------------------------------------
 // Variables passed to this script:
-//  @slotId   The slot in which the item would have been equipped in. This is passed automagically when called in an equip script.
-//  @bStat$    The stat to check against. Can be Str, Agi, Vit, Int, Dex, Luk.
+//  @slotId   The slot in which the item would have been equipped in.
+//            This is passed automagically when called in an equip script.
+//  @bStat    The stat to check against.
+//            Usually one of: bStr, bAgi, bVit, bInt, bDex, bLuk;
+//            but can be anything that works with readparam().
 //  @minbStatVal The minimum stat value to accept this item.
 // ------------------------------------------------------------
 
 function|script|RequireStat|,
 {
-    if (@bStat$ == "" || @minbStatVal < 0) goto L_Return;
-    set @bStatVal, 0;
-    if (@bStat$ == "Str")
-        set @bStatVal, readparam(bStr);
-    if (@bStat$ == "Agi")
-        set @bStatVal, readparam(bAgi);
-    if (@bStat$ == "Vit")
-        set @bStatVal, readparam(bVit);
-    if (@bStat$ == "Dex")
-        set @bStatVal, readparam(bDex);
-    if (@bStat$ == "Int")
-        set @bStatVal, readparam(bInt);
-    if (@bStat$ == "Luk")
-        set @bStatVal, readparam(bLuk);
-    if (@bStatVal >= @minbStatVal) goto L_Return;
+    set @bStatVal, readparam(@bStat);
     // If the requirement isn't met, then we end the script.
     // Hence, subsequent item modifiers won't be applied.
-    end;
-
-L_Return:
-    return;
+    if (@bStatVal < @minbStatVal)
+        end;
 }