limit charming to units of max size force * force

Author: ennorehling

src/spells/charming.c

@@ -220,6 +220,7 @@ int sp_charmingsong(castorder *co)
     spellparameter *param = co->a_params;
     int duration, resist_bonus = 0;
     int tb = 0;
+    bool resists = false;
 
     /* wenn Ziel gefunden, dieses aber Magieresistent war, Zauber
      * abbrechen aber kosten lassen */
@@ -249,39 +250,47 @@ int sp_charmingsong(castorder *co)
     if (target->number > force) {
         resist_bonus += (int)((target->number - force) * 10);
     }
-    /* Magieresistensbonus fuer hoehere Talentwerte */
-    for (i = 0; i < MAXSKILLS; i++) {
-        int sk = effskill(target, i, NULL);
-        if (tb < sk)
-            tb = sk;
+    if (target->number > force * force) {
+        resists = true;
     }
-    if (tb > 0) {
-        tb -= effskill(mage, SK_MAGIC, NULL);
+    else {
+        /* Magieresistensbonus fuer hoehere Talentwerte */
+        for (i = 0; i < MAXSKILLS; i++) {
+            int sk = effskill(target, i, NULL);
+            if (tb < sk)
+                tb = sk;
+        }
         if (tb > 0) {
-            resist_bonus += tb * 15;
+            tb -= effskill(mage, SK_MAGIC, NULL);
+            if (tb > 0) {
+                resist_bonus += tb * 15;
+            }
         }
-    }
-    /* Increased chance for magical resistence */
-    if (resist_bonus > 0) {
-        variant p_regular = resist_chance(mage, target, TYP_UNIT, 0);
-        variant p_modified = resist_chance(mage, target, TYP_UNIT, resist_bonus);
-        variant prob = frac_div(p_regular, p_modified);
-        if (prob.sa[0] > 0) {
-            /**
-            * given a failure chance of A/B, we roll a
-            * B-sided die, and if the result is less than B - A,
-            * the spell fails.
-            * This formula is a bit odd, because we want it to fail
-            * on low dice rolls, to simplify testing.
-            */
-            if (rng_int() % prob.sa[1] < prob.sa[1] - prob.sa[0]) {
-                /* target resists after all, because of bonus */
-                ADDMSG(&mage->faction->msgs, msg_message("spellunitresists",
-                    "unit region command target", mage, mage->region, co->order, target));
-                return cast_level;
+        /* Increased chance for magical resistence */
+        if (resist_bonus > 0) {
+            variant p_regular = resist_chance(mage, target, TYP_UNIT, 0);
+            variant p_modified = resist_chance(mage, target, TYP_UNIT, resist_bonus);
+            variant prob = frac_div(p_regular, p_modified);
+            if (prob.sa[0] > 0) {
+                /**
+                * given a failure chance of A/B, we roll a
+                * B-sided die, and if the result is less than B - A,
+                * the spell fails.
+                * This formula is a bit odd, because we want it to fail
+                * on low dice rolls, to simplify testing.
+                */
+                if (rng_int() % prob.sa[1] < prob.sa[1] - prob.sa[0]) {
+                    resists = true;
+                }
             }
         }
     }
+    if (resists) {
+        /* target resists after all, because of bonus */
+        ADDMSG(&mage->faction->msgs, msg_message("spellunitresists",
+            "unit region command target", mage, mage->region, co->order, target));
+        return cast_level;
+    }
 
     duration = 3 + rng_int() % (int)force;
     charm_unit(target, mage, force, duration);

src/spells/charming.test.c

@@ -155,6 +155,13 @@ static void test_charmingsong(CuTest *tc) {
     scale_number(u2, (int)co.force);
     test_clear_messages(f);
 
+    // very big unit, cannot be charmed:
+    scale_number(u2, 1 + (int)(co.force * co.force));
+    CuAssertIntEquals(tc, co.level, sp_charmingsong(&co));
+    CuAssertPtrNotNull(tc, test_find_faction_message(f, "spellunitresists"));
+    scale_number(u2, (int)co.force);
+    test_clear_messages(f);
+
     // success:
     CuAssertIntEquals(tc, co.level, sp_charmingsong(&co));
     CuAssertPtrEquals(tc, u->faction, u2->faction);