add new consts for the params

13 files changed, 73 insertions, 71 deletions

diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 37788571..af5cc476 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -26,16 +26,22 @@ Weight      24   1
 MaxWeight   25   1
 //JobLevel    55   1
 //Upper       56   1
+Str        13   1
+Agi        14   1
+Vit        15   1
+Int        16   1
+Dex        17   1
+Luk        18   1
 
 // BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
-bMaxHP      6   1
-bMaxSP      8   1
-bStr        13   1
-bAgi        14   1
-bVit        15   1
-bInt        16   1
-bDex        17   1
-bLuk        18   1
+bMaxHP      6
+bMaxSP      8
+bStr        13
+bAgi        14
+bVit        15
+bInt        16
+bDex        17
+bLuk        18
 //bAtk        41
 //bAtk2       42
 //bMatk1      43
diff --git a/world/map/db/item_db_chest.txt b/world/map/db/item_db_chest.txt
index 3351257f..892b4082 100644
--- a/world/map/db/item_db_chest.txt
+++ b/world/map/db/item_db_chest.txt
@@ -27,7 +27,7 @@
 793,    BromenalChest,                  Bromenal Chest,                     5,      100000,     3000,       2000,       0,      25,     0,      -170,   0,      2,      512,        0,      0,      0,      {},                                                                     {}
 798,    SorcererRed,                    Sorcerer Robe Red,                  5,      8000,       4000,       5,          0,      5,      0,      20,     0,      2,      512,        0,      0,      0,      {},                                                                     {bonus bAgi, 1;}
 870,    FineDress,                      Fine Dress,                         5,      10000,      5000,       35,         0,      8,      0,      3,      0,      2,      512,        0,      0,      0,      {},                                                                     {}
-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;}
+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;}
 1178,   Contributor,                    ContributorShirt,                   5,      0,          0,          20,         0,      5,      0,      5,      0,      2,      512,        0,      0,      0,      {},                                                                     {}
 1183,   AmberChristmasSweater,          Amber Christmas Sweater,            5,      2000,       1000,       35,         0,      6,      0,      -12,    0,      2,      512,        0,      0,      0,      {},                                                                     {}
 1184,   FunkyChristmasSweater,          Funky Christmas Sweater,            5,      2000,       1000,       35,         0,      6,      0,      -12,    0,      2,      512,        0,      0,      0,      {},                                                                     {}
diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt
index 91dcfb2c..a467397c 100644
--- a/world/map/db/item_db_head.txt
+++ b/world/map/db/item_db_head.txt
@@ -56,7 +56,7 @@
 855,    Sunglasses,                     Sunglasses,                         5,      1000,       500,        10,         0,      2,      0,      6,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 856,    KnitCap,                        KnitCap,                            5,      1000,       500,        50,         0,      3,      0,      0,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 //ID,   Name___________________,        Label__________________,            Type,   Price,      Sell,       Weight,     ATK,    DEF,    Range,  Mbonus, Slot,   Gender, Loc,        wLV,    eLV,    View,   {UseScript},                                                            {EquipScript}
-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;}
+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;}
 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,      {},                                                                     {}
 884,    YellowEggshellHat,              Yellow Eggshell Hat,                5,      7000,       5000,       15,         0,      9,      0,      3,      0,      2,      256,        0,      1,      0,      {},                                                                     {}
@@ -178,6 +178,6 @@
 4032,   PanHat,                         Pan Hat,                            5,      1000,       500,        400,        0,      13,     0,      -20,    0,      2,      256,        0,      0,      0,      {},                                                                     {}
 4033,   ChefHat,                        Chef Hat,                           5,      1000,       500,        30,         0,      2,      0,      2,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 4042,   RedNose,                        Red Nose,                           5,      4000,       1000,       4,          0,      2,      0,      7,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
-5128,    DarkHelm,                      DarkHelm,                           5,      50000,      10000,      800,        0,      19,     0,      -80,    0,      2,      256,        0,      0,      0,      {},                                                                     {callfunc "UnreleasedItem"; bonus bMaxHPrate, 10; bonus bAtkRange, -((bAtkRange/2)); bonus bInt, -(bInt);}
-5129,    UnderworldMask,                UnderworldMask,                     5,      50000,      10000,      100,        0,      9,      0,      -40,    0,      2,      256,        0,      0,      0,      {},                                                                     {callfunc "UnreleasedItem"; bonus bAtkRange, 1;  bonus bInt, -(bInt);}
-5130,    Phylactery,                    Phylactery,                         5,      50000,      10000,      20,         0,      1,      0,      5,      0,      2,      256,        0,      0,      0,      {},                                                                     {callfunc "UnreleasedItem"; bonus bAspdRate, 10; bonus bDex, -(bDex/2);}
+5128,    DarkHelm,                      DarkHelm,                           5,      50000,      10000,      800,        0,      19,     0,      -80,    0,      2,      256,        0,      0,      0,      {},                                                                     {callfunc "UnreleasedItem"; bonus bMaxHPrate, 10; bonus bAtkRange, -((bAtkRange/2)); bonus bInt, -Int;}
+5129,    UnderworldMask,                UnderworldMask,                     5,      50000,      10000,      100,        0,      9,      0,      -40,    0,      2,      256,        0,      0,      0,      {},                                                                     {callfunc "UnreleasedItem"; bonus bAtkRange, 1;  bonus bInt, -Int;}
+5130,    Phylactery,                    Phylactery,                         5,      50000,      10000,      20,         0,      1,      0,      5,      0,      2,      256,        0,      0,      0,      {},                                                                     {callfunc "UnreleasedItem"; bonus bAspdRate, 10; bonus bDex, -(Dex/2);}
diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt
index 0a36f27d..bf8c1899 100644
--- a/world/map/db/item_db_weapon.txt
+++ b/world/map/db/item_db_weapon.txt
@@ -47,12 +47,12 @@
 //608,  RESERVED,                       BladeShield,                        0,      0,          0,          0,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 //609,  RESERVED,                       Club,                               0,      0,          0,          0,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 623,    Scythe,                         Scythe,                             4,      100,        50,         1200,       75,     0,      1,      0,      0,      2,      34,         1,      1,      3,      {},                                                                     {}
-758,    WoodenStaff,                    Wooden Staff,                       4,      4000,       2000,       1000,       50,     0,      1,      10,     0,      2,      34,         1,      1,      10,     {},                                                                     {set @bStat, bInt;set @minbStatVal, 60;callfunc "RequireStat";}
+758,    WoodenStaff,                    Wooden Staff,                       4,      4000,       2000,       1000,       50,     0,      1,      10,     0,      2,      34,         1,      1,      10,     {},                                                                     {set @bStat, Int;set @minbStatVal, 60;callfunc "RequireStat";}
 //ID,   Name___________________,        Label__________________,            Type,   Price,      Sell,       Weight,     ATK,    DEF,    Range,  Mbonus, Slot,   Gender, Loc,        wLV,    eLV,    View,   {UseScript},                                                            {EquipScript}
-1171,   Wand,                           Wand,                               4,      400,        200,        100,        1,      0,      1,      5,      0,      2,      2,          1,      1,      1,      {},                                                                     {set @bStat, bInt;set @minbStatVal, 5;callfunc "RequireStat";}
+1171,   Wand,                           Wand,                               4,      400,        200,        100,        1,      0,      1,      5,      0,      2,      2,          1,      1,      1,      {},                                                                     {set @bStat, Int;set @minbStatVal, 5;callfunc "RequireStat";}
 762,    TerraniteArrow,                 Terranite Arrow,                    10,     80,         20,         1,          50,     0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {bonus bCritical, 10;set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";}
 867,    IceGladius,                     Ice Gladius,                        4,      2000,       1000,       1000,       110,    0,      1,      0,      0,      2,      2,          1,      1,      1,      {},                                                                     {bonus bLuk, 1;}
-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;set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";}
+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;set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";}
 903,    SlingShot,                      Sling Shot,                         4,      500,        50,         10,         5,      0,      3,      0,      0,      2,      34,         1,      1,      11,     {},                                                                     {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";}
 904,    SlingBullet,                    Sling Bullet,                       10,     1,          0,          1,          3,      0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {set @AmmoType, AMMO_SLING; callfunc "CheckAmmo";}
 906,    KidBook,                        Kid Book,                           4,      10000,      5000,       100,        1,      0,      3,      0,      0,      2,      34,         1,      1,      1,      {},                                                                     {}
diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index a0f95288..7ebf41c6 100644
--- a/world/map/npc/006-1/miriam.txt
+++ b/world/map/npc/006-1/miriam.txt
@@ -161,12 +161,11 @@ L_teach:
         "I am already fast.", L_notfast;
 
 L_Prepared:
-    set @agi, bAgi;
     set @torso$, getitemlink(getequipid(equip_torso));
     set @weight, MaxWeight/Weight;
     if (@weight < 3)
         goto L_heavyweight;
-    if (@agi < 60)
+    if (Agi < 60)
         goto L_slow;
     if (BaseLevel < 60)
         goto L_lowlevel;
@@ -197,7 +196,7 @@ L_heavymetal:
 
 L_slow:
     mes "[Miriam]";
-    mes "Oh, wait, wait... " +@agi+ " Agility? Are you serious? What do you do with all your Character points? Put them all to 'Strength'? Really... I don't even want to know... Come back here when you have a decent character points distribution!\"";
+    mes "Oh, wait, wait... " +Agi+ " Agility? Are you serious? What do you do with all your Character points? Put them all to 'Strength'? Really... I don't even want to know... Come back here when you have a decent character points distribution!\"";
     close;
 
 L_lowlevel:
@@ -216,7 +215,7 @@ L_offer:
 
 L_TorsoNext:
     mes "[Miriam]";
-    mes "\"I see. I like the way you distributed your Character Points too... " +@agi+ " points to Agility! You really know how to prepare yourself for a good fight!\"";
+    mes "\"I see. I like the way you distributed your Character Points too... " +Agi+ " points to Agility! You really know how to prepare yourself for a good fight!\"";
     next;
     mes "\"Well... Even if you have a potential to be a good fighter, moving the way you do will not help. You need to be fast to avoid the monsters. \"";
     next;
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index 7274a708..8b6cb37d 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -920,9 +920,9 @@ L_gs_wrestle:
     set @KFAHR_AGI, 60 - @beer_count * 5;
     set @kfahr_stamina, 120;
 
-    set @PC_STR, bStr;
-    set @PC_AGI, bAgi;
-    set @PC_MAX_STAMINA, bVit + 20;
+    set @PC_STR, Str;
+    set @PC_AGI, Agi;
+    set @PC_MAX_STAMINA, Vit + 20;
     set @pc_stamina, @PC_MAX_STAMINA;
 
     setarray @positions$,
diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt
index f8831d82..8276de08 100644
--- a/world/map/npc/016-1/gwendolyn.txt
+++ b/world/map/npc/016-1/gwendolyn.txt
@@ -442,7 +442,7 @@ L_target_hit:
     next;
     mes "\"Let me inspect it...\" She walks to the target.";
     next;
-    if( rand(500) > (2*bDex + bAgi))
+    if( rand(500) > (2*Dex + Agi))
         goto L_target_nohit;
     set @Q_hawkseye, 6;
     callsub S_Update_Var;
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index 2c0da73b..4709cfc9 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -138,7 +138,7 @@ L_brew:
     goto L_CraftLoop;
 
 L_CraftLoop:
-    set @throw, rand(bInt);
+    set @throw, rand(Int);
     set @result, 1;
     if (@throw >= 5) set @result, 2;
     if (@throw >= 15) set @result, 3;
@@ -426,7 +426,7 @@ L_mo_random_1: // mode 1: remove colour
     return;
 
 L_mo_pc_bad:
-    if (rand(bInt + 100) > 60)
+    if (rand(Int + 100) > 60)
         goto L_mo_pc_bad_ok;
     if (@bubble_mode)
         mes "As your leaf dissolves, the intensity of the bubbling increases.";
@@ -446,7 +446,7 @@ L_mo_pc_bad_ok:
 L_mo_auto_bad:
     if (rand(3) == 0)
         goto L_Return;
-    if (rand(bInt + 100) > 70)
+    if (rand(Int + 100) > 70)
         goto L_Return;
     mes "The brew begins to bubble more violently.";
     set @bubble_mode, @bubble_mode + 1;
@@ -459,11 +459,11 @@ L_mo_auto_bad:
 L_mo_explode:
     mes "[Exploding monster oil]";
     mes "Your brew explodes!";
-    if (rand(bAgi) > 40)
+    if (rand(Agi) > 40)
         goto L_mo_explode_dodge;
     mes "The burst of boiling monster brew hits you.";
     next;
-    heal (15 * rand(bVit)) - 1500, 0, 1;
+    heal (15 * rand(Vit)) - 1500, 0, 1;
     close;
 
 L_mo_explode_dodge:
@@ -713,7 +713,7 @@ L_mopox_failed_hard:
     mes "Suddenly, the thick mass bends outwards, a huge bubble bursting open right in your face!";
     next;
 
-    if (rand(bVit) < 40)
+    if (rand(Vit) < 40)
         sc_start sc_poison, 1, 20;
 
     mes "[Brewing Mopox Cure]";
diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index 9f5d2668..cb3608d4 100644
--- a/world/map/npc/029-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -31,7 +31,7 @@ OnInit:
     if (@npc_check)
         goto L_Close;
     callfunc "MorganState";
-    if (bInt >= 5)
+    if (Int >= 5)
         goto L_Learn;
     goto L_NotMagic;
 
diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index 414e1bf3..01364b41 100644
--- a/world/map/npc/052-1/channelling.txt
+++ b/world/map/npc/052-1/channelling.txt
@@ -101,7 +101,7 @@ function|script|StartChannelling
     set $@illia_level_4_progress, 1;
     set $@illia_char_channelling$, strcharinfo(0);
 
-    set @bonus, (bInt+1) / 25;
+    set @bonus, (Int+1) / 25;
     // Lazurite Stones power, will also depend on the Int of the channelling character
     setarray $@illia_lazurites_power,
         12 + @bonus, // small
@@ -114,11 +114,11 @@ function|script|StartChannelling
     setarray $@illia_large_lazurites, 21,40, 34,25;
 
     // amount of initial magic power
-    set $@illia_magic_power, 1811 + bInt*2;
+    set $@illia_magic_power, 1811 + Int*2;
     // Channelling required power depends on the base Int of the character
-    set $@illia_magic_power_required, 5707 - 2*bInt;
+    set $@illia_magic_power_required, 5707 - 2*Int;
     // magic power loss depends also on Int
-    set $@illia_magic_power_loss, 53 - ((bInt+1)*2)/10;
+    set $@illia_magic_power_loss, 53 - ((Int+1)*2)/10;
 
     // register the power status to display hints to the players
     // Statuses: 0=critical(below 300), 1=neutral, 2=almost there (max-300)
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index 45b4b71f..517ac084 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -130,7 +130,7 @@ L_SetRewardBonus:
         set @xmas_reward_lower_bound, 2 * @xmas_reward_tally - rand(5);
     if (@xmas_reward_tally <= 5)
         set @xmas_reward_lower_bound, @xmas_reward_tally;
-    set @xmas_reward_upper_bound, @xmas_reward_lower_bound + ((bLuk) / 5);
+    set @xmas_reward_upper_bound, @xmas_reward_lower_bound + ((Luk) / 5);
     set @xmas_reward, (rand(@xmas_reward_lower_bound, @xmas_reward_upper_bound));
     set @xmas_reward_lower_bound, 0;
     set @xmas_reward_upper_bound, 0;
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index 4c118dbd..5affb8f0 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -59,12 +59,12 @@ L_Status:
         "Close.", L_Close;
 
 L_ChangeAllStats:
-    set bStr, 99;
-    set bAgi, 99;
-    set bVit, 99;
-    set bInt, 99;
-    set bDex, 99;
-    set bLuk, 99;
+    set Str, 99;
+    set Agi, 99;
+    set Vit, 99;
+    set Int, 99;
+    set Dex, 99;
+    set Luk, 99;
     mes "You now have 99 in all stats.";
     next;
     goto L_Begin;
@@ -76,7 +76,7 @@ L_ChangeStrength:
         goto L_StatTooLow;
     if (@str > 99)
         goto L_StatTooHigh;
-    set bStr, @str;
+    set Str, @str;
     goto L_ChangeAgility;
 
 L_ChangeAgility:
@@ -86,7 +86,7 @@ L_ChangeAgility:
         goto L_StatTooLow;
     if (@agi > 99)
         goto L_StatTooHigh;
-    set bAgi, @agi;
+    set Agi, @agi;
     goto L_ChangeVitality;
 
 L_ChangeVitality:
@@ -96,7 +96,7 @@ L_ChangeVitality:
         goto L_StatTooLow;
     if (@vit > 99)
         goto L_StatTooHigh;
-    set bVit, @vit;
+    set Vit, @vit;
     goto L_ChangeIntelligence;
 
 L_ChangeIntelligence:
@@ -106,7 +106,7 @@ L_ChangeIntelligence:
         goto L_StatTooLow;
     if (@int > 99)
         goto L_StatTooHigh;
-    set bInt, @int;
+    set Int, @int;
     goto L_ChangeDexterity;
 
 L_ChangeDexterity:
@@ -116,7 +116,7 @@ L_ChangeDexterity:
         goto L_StatTooLow;
     if (@dex > 99)
         goto L_StatTooHigh;
-    set bDex, @dex;
+    set Dex, @dex;
     goto L_ChangeLuck;
 
 L_ChangeLuck:
@@ -126,13 +126,13 @@ L_ChangeLuck:
         goto L_StatTooLow;
     if (@luk > 99)
         goto L_StatTooHigh;
-    set bLuk, @luk;
-    mes "You now have " + bStr + " in strength.";
-    mes "You now have " + bAgi + " in agility.";
-    mes "You now have " + bVit + " in vitality.";
-    mes "You now have " + bInt + " in intelligence.";
-    mes "You now have " + bDex + " in dexterity.";
-    mes "You now have " + bLuk + " in luck.";
+    set Luk, @luk;
+    mes "You now have " + Str + " in strength.";
+    mes "You now have " + Agi + " in agility.";
+    mes "You now have " + Vit + " in vitality.";
+    mes "You now have " + Int + " in intelligence.";
+    mes "You now have " + Dex + " in dexterity.";
+    mes "You now have " + Luk + " in luck.";
     next;
     goto L_Begin;
 
@@ -165,8 +165,8 @@ L_ChangeStrengthSingle:
         goto L_StatTooLow;
     if (@str > 99)
         goto L_StatTooHigh;
-    set bStr, @str;
-    mes "You now have " + bStr + " in strength.";
+    set Str, @str;
+    mes "You now have " + Str + " in strength.";
     next;
     goto L_Begin;
 
@@ -177,8 +177,8 @@ L_ChangeAgilitySingle:
         goto L_StatTooLow;
     if (@agi > 99)
         goto L_StatTooHigh;
-    set bAgi, @agi;
-    mes "You now have " + bAgi + " in agility.";
+    set Agi, @agi;
+    mes "You now have " + Agi + " in agility.";
     next;
     goto L_Begin;
 
@@ -189,8 +189,8 @@ L_ChangeVitalitySingle:
         goto L_StatTooLow;
     if (@vit > 99)
         goto L_StatTooHigh;
-    set bVit, @vit;
-    mes "You now have " + bVit + " in vitality.";
+    set Vit, @vit;
+    mes "You now have " + Vit + " in vitality.";
     next;
     goto L_Begin;
 
@@ -201,8 +201,8 @@ L_ChangeIntelligenceSingle:
         goto L_StatTooLow;
     if (@int > 99)
         goto L_StatTooHigh;
-    set bInt, @int;
-    mes "You now have " + bInt + " in intelligence.";
+    set Int, @int;
+    mes "You now have " + Int + " in intelligence.";
     next;
     goto L_Begin;
 
@@ -213,8 +213,8 @@ L_ChangeDexteritySingle:
         goto L_StatTooLow;
     if (@dex > 99)
         goto L_StatTooHigh;
-    set bDex, @dex;
-    mes "You now have " + bDex + " in dexterity.";
+    set Dex, @dex;
+    mes "You now have " + Dex + " in dexterity.";
     next;
     goto L_Begin;
 
@@ -225,8 +225,8 @@ L_ChangeLuckSingle:
         goto L_StatTooLow;
     if (@luk > 99)
         goto L_StatTooHigh;
-    set bLuk, @luk;
-    mes "You now have " + bLuk + " in luck.";
+    set Luk, @luk;
+    mes "You now have " + Luk + " in luck.";
     next;
     goto L_Begin;
 
diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt
index 27d215f9..87ecf22a 100644
--- a/world/map/npc/items/require_stat.txt
+++ b/world/map/npc/items/require_stat.txt
@@ -13,14 +13,11 @@ function|script|RequireStat
     set @bStatVal, @bStat;
     // If the requirement isn't met, we set an unequip trigger.
     // The item is now removed.
-    if (@bStatVal < @minbStatVal)
+    if (@bStat < @minbStatVal)
         goto L_Unequip;
-    goto L_Return;
+    return;
 
 L_Unequip:
     callfunc "UnequipLater";
-    goto L_Return;
-
-L_Return:
     return;
 }