More retail-like resists/profs (l2world)

Index: Formulas.java
===================================================================
--- Formulas.java   (revision 86)
+++ Formulas.java   (working copy)
@@ -2461,15 +2461,48 @@
        return multiplier;
    }

+   /**
+    * This method is used as <b>divider</b> for the skill's base power.
+    * @return statBonus value for this skill's saveVs
+    */
    public static double calcSkillStatModifier(L2Skill skill, L2Character target)
    {
        final BaseStats saveVs = skill.getSaveVs();
        if (saveVs == null)
            return 1;

-       return 1 / saveVs.calcBonus(target);
+       return saveVs.calcBonus(target);
    }

+   /**
+    * This method is used as <b>divider</b> for the skill's base power.
+    * @return skill stat modifier changed by the attacker's skill prof and target's skill resist.
+    */
+   public static double calcSkillLandRateModifier(L2Skill skill, L2Character attacker, L2Character target)
+   {
+       double retval = calcSkillStatModifier(skill, target);
+
+       //          "-" if resistant, "+" if vulnerable         "-" for negative proficiency, "+" for positive proficiency
+       double vuln = calcSkillTraitVulnerability(0, target, skill) + calcSkillTraitProficiency(0, attacker, target, skill);
+
+       if (vuln == 0)
+           return retval;
+
+       vuln /= 100; // divide by 100 in order to get percent value.
+       vuln += 1; // Since we work with percents, always add +1 to prevent 0.x values.
+
+       if (vuln < 0) // If negative vulnerability (target has resist), multiply base resist with that resist.
+       {
+           vuln *= -1; // Make this variable positive, because its negative. We dont want to return negative double.
+           retval *= vuln;
+       }
+       else // If positive vulnerability (target has vulnerability), divide base resist with that resist.
+           retval /= vuln;
+
+       return retval;
+
+   }
+
    public static int calcLvlDependModifier(L2Character attacker, L2Character target, L2Skill skill)
    {
        if (skill.getLevelDepend() == 0)
@@ -2539,11 +2572,10 @@
        if (target.isDebuffInvul())
            return false;

-       double statModifier = calcSkillStatModifier(skill, target);
+       double skillLandRateModifier = calcSkillLandRateModifier(skill, attacker, target);
+       // Calculate BaseRate influenced by base stats and resists/vulnerabilities.
+       int rate = (int) (value / skillLandRateModifier);

-       // Calculate BaseRate.
-       int rate = (int) (value * statModifier);
-
        // Add Matk/Mdef Bonus
        double mAtkModifier = 0;
        int ssModifier = 0;
@@ -2570,28 +2602,6 @@
            rate = (int) (rate * mAtkModifier);
        }

-       // Resists
-       double vulnModifier = calcSkillTraitVulnerability(0, target, skill);
-       double profModifier = calcSkillTraitProficiency(0, attacker, target, skill);
-       double res = vulnModifier + profModifier;
-       double resMod = 1;
-       if (res != 0)
-       {
-           if (res < 0)
-           {
-               //resMod = 1 - 0.02 * res;
-               //resMod = 1 / resMod;
-               resMod += Math.max(res, -95) * 0.01;
-           }
-           else
-               //resMod = 1 + 0.02 * res;
-               resMod += Math.min(res, 95) * 0.01;
-
-           rate *= resMod;
-       }
-       else if (target.calcStat(Stats.DEBUFF_IMMUNITY, 0, null, skill) > 0 && skill.isDebuff())
-           return false;
-
        int elementModifier = calcElementModifier(attacker, target, skill);
        rate += elementModifier;

@@ -2611,11 +2621,7 @@
                    skill.getName(),
                    " eff.type:", type.toString(),
                    " power:", String.valueOf(value),
-                   " stat:", String.format("%1.2f", statModifier),
-                   " res:", String.format("%1.2f", resMod), "(",
-                   String.format("%1.2f", profModifier), "/",
-                   String.format("%1.2f", vulnModifier),
-                   ") elem:", String.valueOf(elementModifier),
+                   " landRateModif:", String.format("%1.2f", skillLandRateModifier),
                    " mAtk:", String.format("%1.2f", mAtkModifier),
                    " ss:", String.valueOf(ssModifier),
                    " lvl:", String.valueOf(deltamod),
@@ -2665,10 +2671,10 @@
        }

        int value = (int) skill.getPower(isPvP, isPvE);
-       double statModifier = calcSkillStatModifier(skill, target);

-       // Calculate BaseRate.
-       int rate = (int) (value * statModifier);
+       double skillLandRateModifier = calcSkillLandRateModifier(skill, attacker, target);
+       // Calculate BaseRate influenced by base stats and resists/vulnerabilities.
+       int rate = (int) (value / skillLandRateModifier);

        // Add Matk/Mdef Bonus
        double mAtkModifier = 0;
@@ -2696,26 +2702,6 @@
            rate = (int) (rate * mAtkModifier);
        }

-       // Resists
-       double vulnModifier = calcSkillVulnerability(attacker, target, skill);
-       double profModifier = calcSkillProficiency(skill, attacker, target);
-       double res = vulnModifier + profModifier;
-       double resMod = 1;
-       if (res != 0)
-       {
-           if (res < 0)
-           {
-               //resMod = 1 - 0.02 * res;
-               //resMod = 1 / resMod;
-               resMod += Math.max(res, -95) * 0.01;
-           }
-           else
-               //resMod = 1 + 0.02 * res;
-               resMod += Math.min(res, 95) * 0.01;
-
-           rate *= resMod;
-       }
-
        int elementModifier = calcElementModifier(attacker, target, skill);
        rate += elementModifier;

@@ -2735,10 +2721,7 @@
                    skill.getName(),
                    " type:", skill.getSkillType().toString(),
                    " power:", String.valueOf(value),
-                   " stat:", String.format("%1.2f", statModifier),
-                   " res:", String.format("%1.2f", resMod), "(",
-                   String.format("%1.2f", profModifier), "/",
-                   String.format("%1.2f", vulnModifier),
+                   " landRateModif:", String.format("%1.2f", skillLandRateModifier),
                    ") elem:", String.valueOf(elementModifier),
                    " mAtk:", String.format("%1.2f", mAtkModifier),
                    " ss:", String.valueOf(ssModifier),
@@ -2775,9 +2758,11 @@
            return false;

        int value = (int) skill.getPower(isPvP, isPvE);
-       double statModifier = calcSkillStatModifier(skill, target);
-       int rate = (int) (value * statModifier);

+       double skillLandRateModifier = calcSkillLandRateModifier(skill, attacker.getOwner(), target);
+       // Calculate BaseRate influenced by base stats and resists/vulnerabilities.
+       int rate = (int) (value / skillLandRateModifier);
+
        // Add Matk/Mdef Bonus
        double mAtkModifier = 0;
        if (skill.isMagic())
@@ -2791,26 +2776,6 @@
            rate += (int) (mAtkModifier * 100) - 100;
        }

-       // Resists
-       double vulnModifier = calcSkillVulnerability(attacker.getOwner(), target, skill);
-       double profModifier = calcSkillProficiency(skill, attacker.getOwner(), target);
-       double res = vulnModifier + profModifier;
-       double resMod = 1;
-       if (res != 0)
-       {
-           if (res < 0)
-           {
-               //resMod = 1 - 0.02 * res;
-               //resMod = 1 / resMod;
-               resMod += Math.max(res, -95) * 0.01;
-           }
-           else
-               //resMod = 1 + 0.02 * res;
-               resMod += Math.min(res, 95) * 0.01;
-
-           rate *= resMod;
-       }
-
        int elementModifier = calcElementModifier(attacker.getOwner(), target, skill);
        rate += elementModifier;

@@ -2830,10 +2795,7 @@
                    skill.getName(),
                    " type:", skill.getSkillType().toString(),
                    " power:", String.valueOf(value),
-                   " stat:", String.format("%1.2f", statModifier),
-                   " res:", String.format("%1.2f", resMod), "(",
-                   String.format("%1.2f", profModifier), "/",
-                   String.format("%1.2f", vulnModifier),
+                   " landRateModif:", String.format("%1.2f", skillLandRateModifier),
                    ") elem:", String.valueOf(elementModifier),
                    " mAtk:", String.format("%1.2f", mAtkModifier),
                    " lvl:", String.valueOf(deltamod),