Merge branch 'equipment_stats_use' into 'master'

Equipment stats use

See merge request legacy/serverdata!682

15 files changed, 30 insertions, 30 deletions

diff --git a/world/map/npc/001-2/heathin.txt b/world/map/npc/001-2/heathin.txt
index 53cc8b68..6a10c053 100644
--- a/world/map/npc/001-2/heathin.txt
+++ b/world/map/npc/001-2/heathin.txt
@@ -294,7 +294,7 @@ L_Arrows_Trade_Yes:
     delitem "Coal", @TARROW_REQ_COAL;
     delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
     set Zeny, Zeny - @TARROW_REQ_GP;
-    set @lucky, 5 * rand(Luk);
+    set @lucky, 5 * rand((Luk+Luk2));
     set @lucky$, "";
     getitem "TerraniteArrow", 1000 + @lucky;
     mes "[Heathin]";
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index 8b6cb37d..e7f5547a 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, Str;
-    set @PC_AGI, Agi;
-    set @PC_MAX_STAMINA, Vit + 20;
+    set @PC_STR, (Str+Str2);
+    set @PC_AGI, (Agi+Agi2);
+    set @PC_MAX_STAMINA, (Vit+Vit2) + 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 a257e905..b224443d 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*Dex + Agi))
+    if( rand(500) > (2*(Dex+Dex2) + (Agi+Agi2)))
         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 4709cfc9..f01c6a9c 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(Int);
+    set @throw, rand((Int+Int2));
     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(Int + 100) > 60)
+    if (rand((Int+Int2) + 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(Int + 100) > 70)
+    if (rand((Int+Int2) + 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(Agi) > 40)
+    if (rand((Agi+Agi2)) > 40)
         goto L_mo_explode_dodge;
     mes "The burst of boiling monster brew hits you.";
     next;
-    heal (15 * rand(Vit)) - 1500, 0, 1;
+    heal (15 * rand((Vit+Vit2))) - 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(Vit) < 40)
+    if (rand((Vit+Vit2)) < 40)
         sc_start sc_poison, 1, 20;
 
     mes "[Brewing Mopox Cure]";
diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index 59628d0b..cbe04067 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, (Int+1) / 25;
+    set @bonus, ((Int+Int2)+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 + Int*2;
+    set $@illia_magic_power, 1811 + (Int+Int2)*2;
     // Channelling required power depends on the base Int of the character
     set $@illia_magic_power_required, 5707 - 2*Int;
     // magic power loss depends also on Int
-    set $@illia_magic_power_loss, 53 - ((Int+1)*2)/10;
+    set $@illia_magic_power_loss, 53 - (((Int+Int2)+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 4e628bb4..a23e01db 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 + ((Luk) / 5);
+    set @xmas_reward_upper_bound, @xmas_reward_lower_bound + (((Luk+Luk2)) / 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/commands/debug.txt b/world/map/npc/commands/debug.txt
index 19ac4114..c966c051 100644
--- a/world/map/npc/commands/debug.txt
+++ b/world/map/npc/commands/debug.txt
@@ -25,11 +25,11 @@ L_Begin:
         "Close.", L_Close;
 
 L_Level:
-    mes "What level do you want to be (min: 1 - max: 99)?";
+    mes "What level do you want to be (min: 1 - max: 140)?";
     input @lvl;
     if (@lvl < 1)
         goto L_LevelTooLow;
-    if (@lvl > 99)
+    if (@lvl > 140)
         goto L_LevelTooHigh;
     if (BaseLevel == @lvl)
         goto L_SameLevel;
diff --git a/world/map/npc/magic/_procedures.txt b/world/map/npc/magic/_procedures.txt
index 66f356c7..eaacd774 100644
--- a/world/map/npc/magic/_procedures.txt
+++ b/world/map/npc/magic/_procedures.txt
@@ -127,7 +127,7 @@ function|script|magic_create_item
     set @create_params[2], 1; // success flag
     if (.@score >= @create_params[1]) goto L_Perfect;
     set @create_params[2], 0; // success flag
-    set .@score, .@score + rand(Luk) + rand(Luk);
+    set .@score, .@score + rand((Luk+Luk2)) + rand((Luk+Luk2));
     if (.@score < (@create_params[1] / 3)) goto L_Backfire;
     if (.@score < ((@create_params[1] * 2) / 3)) goto L_Iten;
     message strcharinfo(0), "Magic : ##3##BYour spell takes on a mind of its own!";
@@ -146,7 +146,7 @@ L_Escape:
 
 L_Backfire:
     message strcharinfo(0), "Magic : ##3##BYour spell backfires!";
-    if (rand(110) < Luk) heal 0 - ((BaseLevel+1)*(BaseLevel+2)*(rand(28)+3)), 0;
+    if (rand(110) < (Luk+Luk2)) heal 0 - ((BaseLevel+1)*(BaseLevel+2)*(rand(28)+3)), 0;
     else                 heal 0 - (BaseLevel + 1), 0;
     return;
 
diff --git a/world/map/npc/magic/level0-wand.txt b/world/map/npc/magic/level0-wand.txt
index b12bc649..7a0f6c25 100644
--- a/world/map/npc/magic/level0-wand.txt
+++ b/world/map/npc/magic/level0-wand.txt
@@ -55,7 +55,7 @@ S_SetWand:
         .WandsAnim[.@wand_loop], // wand anim/id
         ((.@pwr * BaseLevel * 2 / 3) / 15 + 2), // wand cost
         (.@pwr * (@spellpower * (11-.@pwr) / 30)), // wand dmg
-        (((200 - Agi) * 1200) / 200), //delay
+        (((200 - (Agi+Agi2)) * 1200) / 200), //delay
         (.@pwr + (@spellpower / 10)); // charges
     return;
 
diff --git a/world/map/npc/magic/level1-flare-dart.txt b/world/map/npc/magic/level1-flare-dart.txt
index 1f23ec4f..d7d387cd 100644
--- a/world/map/npc/magic/level1-flare-dart.txt
+++ b/world/map/npc/magic/level1-flare-dart.txt
@@ -16,7 +16,7 @@
         sqrt(@spellpower) * 5, //dmg
         (BaseLevel/3) + 5, // dmg bonus
         (@spellpower/50) + 3, // charges
-        (((200 - Agi) * 1200) / 200); // delay
+        (((200 - (Agi+Agi2)) * 1200) / 200); // delay
     callfunc "magic_exp";
     goto L_FreeRecast;
 
diff --git a/world/map/npc/magic/level1-magic-blade.txt b/world/map/npc/magic/level1-magic-blade.txt
index 377cdd2d..91ff5967 100644
--- a/world/map/npc/magic/level1-magic-blade.txt
+++ b/world/map/npc/magic/level1-magic-blade.txt
@@ -18,7 +18,7 @@
         if_then_else(.@component$ == "Knife", 40, 60), // dmg
         Str, // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str
         (@spellpower/15) + 10, // charges
-        (((200 - Agi) * 1200) / 200), // delay
+        (((200 - (Agi+Agi2)) * 1200) / 200), // delay
         @spellpower;
 
     callfunc "magic_exp";
diff --git a/world/map/npc/magic/level2-lay-on-hands.txt b/world/map/npc/magic/level2-lay-on-hands.txt
index 744d145e..8feb9107 100644
--- a/world/map/npc/magic/level2-lay-on-hands.txt
+++ b/world/map/npc/magic/level2-lay-on-hands.txt
@@ -29,7 +29,7 @@ L_Pay:
 
     if (get(Hp, @target_id) < 1) end;
 
-    set .@fraction, max(80, 200 - (Vit + (@spellpower/10))); // pay at least 40%
+    set .@fraction, max(80, 200 - ((Vit+Vit2) + (@spellpower/10))); // pay at least 40%
     set .@payment, (@needed * .@fraction) / 200;
     set .@available, Hp - (MaxHp / 20);
     set @heal_value, if_then_else(.@payment < .@available, @needed+1-1, (.@available * 200) / .@fraction); // FIXME / XXX why the f do I need to do +1-1 ?
diff --git a/world/map/npc/magic/level2-lightning-strike.txt b/world/map/npc/magic/level2-lightning-strike.txt
index 19083dfa..ce89652c 100644
--- a/world/map/npc/magic/level2-lightning-strike.txt
+++ b/world/map/npc/magic/level2-lightning-strike.txt
@@ -15,9 +15,9 @@
     misceffect FX_MAGIC_BOLT_CAST, strcharinfo(0);
     setarray @ingravspell[0],
         @spellpower,
-        Luk,
+        (Luk+Luk2),
         ((@spellpower/90)+1), // charges
-        (((200 - Agi) * 3000) / 200), // delay
+        (((200 - (Agi+Agi2)) * 3000) / 200), // delay
         0, // in_rain
         0; // target id (tmp)
     if (getequipid(equip_misc1) == 5253 || getequipid(equip_misc2) == 5253)
diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index 1dd5d792..c16485bb 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -17,10 +17,10 @@
     set .caster, getcharid(3);
     misceffect FX_MAGIC_KNUCKLE_CAST, strcharinfo(0);
     setarray @upmarmuspell[0],
-        max(1, BASE_ATK - 100 + min(100, Int)), // dmg
-        ((@spellpower/10) + ((Dex * 8)/(sqrt(BaseLevel + 34)) + 20)), // charges (you get more at lower levels)
-        (sqrt(190) * 25 / 20), // delay - see conf/battle_athena.conf @ max_aspd
-        ((Agi + Int) * 2 / 5), // dmg bonus
+        max(1, BASE_ATK - 100 + min(100, (Int+Int2))), // dmg
+        ((@spellpower/10) + (((Dex+Dex2) * 8)/(sqrt(BaseLevel + 34)) + 20)), // charges (you get more at lower levels)
+        (sqrt(300 - ((Agi+Agi2) * 2)) + (5/2)), // delay
+        (((Agi+Agi2) + (Int+Int2)) * 2 / 5), // dmg bonus
         (((BaseLevel/5) + Str) * 2); // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str
     callfunc "magic_exp";
     goto L_FreeRecast;
diff --git a/world/map/npc/magic/level2-toxic-dart.txt b/world/map/npc/magic/level2-toxic-dart.txt
index 6f5e6da9..6fde4545 100644
--- a/world/map/npc/magic/level2-toxic-dart.txt
+++ b/world/map/npc/magic/level2-toxic-dart.txt
@@ -16,7 +16,7 @@
     setarray @phlexspell[0],
         (sqrt(@spellpower) * 5), // elt damage
         ((BaseLevel/3) + 5), // elt damage bonus
-        (((200 - Agi) * 1200) / 200), // delay
+        (((200 - (Agi+Agi2)) * 1200) / 200), // delay
         ((@spellpower/75) + 3), // charges
         (5000+(@spellpower*1200)), // poison duration
         (max(15,@spellpower/15)+5); // poison strength