some spells fixed

additional testing

CHANGELOG.md

@@ -1,5 +1,13 @@
+# 28.3
+
+  - Zauberkosten sind abhängig von der Zauberstufe, oder Effekt:
+	- Ritual der Aufnahme: Kosten abhängig von der Anzahl betroffener Personen.
+  - Bei Zeitdehnung wird die Dauer aufgerundet, (Zauberstufe+1)/2
+  - Verstärkende Wirkungen von Ring der Macht und Magierturm bei Zaubern repariert, e.g. Zeitdehnung
+  - Sog des Lebens respektiert die Magieresistenz der Zielregion
+
 # 27.1
- 
+
   - Neue Formel zur Vermischung von Talenten bei GIB PERSON und REKRUTIERE
   - Bauern in übervölkerten Regionen vermehren sich nicht
   - Samen wachsen nicht zu Schößlingen heran, wenn sie dadurch Bauern die Felder wegnehmen.

scripts/tests/e2/migration.lua

@@ -101,8 +101,9 @@ function test_migration_with_ring()
     u.aura_max = 9
     process_orders()
     assert_equal(f, u2.faction)
-    assert_equal(6, u.aura)
-    assert_equal(8, u.aura_max)
+     -- cost scales with result:
+    assert_equal(3, u.aura)
+    assert_equal(7, u.aura_max)
 end
 
 function test_migration_insufficient_aura()
@@ -137,7 +138,7 @@ function test_migration_reduced_cost()
     -- spell is cast at level 1:
     assert_equal(f, u2.faction)
     assert_equal(0, u.aura)
-    assert_equal(7, u.aura_max)
+    assert_equal(8, u.aura_max)
 end
 
 --[[

scripts/tests/e2/spells.lua

@@ -392,3 +392,26 @@ function test_courting()
     assert_not_nil(u3)
     assert_not_nil(string.find(u3:show(), "Goblin"))
 end
+
+function test_cast_summonent()
+    local r = region.create(0, 0, "plain")
+    local f = faction.create("demon")
+    local u = unit.create(f, r)
+    u.magic = "cerddor"
+    u.aura = 200
+    u:add_spell("summonent")
+    u:set_skill("magic", 20)
+    r:set_resource("tree", 1)
+    u:add_order('ZAUBERE STUFE 2 "Erwecke Ents"')
+    process_orders()
+    assert_equal(188, u.aura)
+    local u3 = nil
+    for u2 in r.units do
+        if u2 ~= u then
+            u3 = u2
+            break
+        end
+    end
+    assert_not_nil(u3)
+    assert_equal(1, u3.number)
+end

scripts/tests/e3/spells.lua

@@ -14,7 +14,7 @@ end
 
 function test_raindance()
     local r = region.create(0, 0, "plain")
-    local f = faction.create("halfling", "noreply@eressea.de", "de")
+    local f = faction.create("halfling")
     local u = unit.create(f, r)
     r:set_resource("peasant", 100)
     r:set_resource("money", 0)
@@ -26,7 +26,7 @@ function test_raindance()
     assert_equal(0, err)
 
     u:clear_orders()
-    u:add_order("ZAUBERE STUFE 3 Regentanz")
+    u:add_order("ZAUBERE STUFE 1 Regentanz")
     assert_equal(0, r:get_resource("money"), 0)
 
     process_orders()
@@ -42,7 +42,7 @@ end
 
 function test_magic()
     local r = region.create(0, 0, "plain")
-    local f = faction.create("halfling", "noreply@eressea.de", "de")
+    local f = faction.create("halfling")
     local u = unit.create(f, r)
     local b = building.create(r, "castle")
 

src/kernel/version.c

@@ -8,7 +8,7 @@
 
 #ifndef ERESSEA_VERSION
 /* the version number, if it was not passed to make with -D */
-#define ERESSEA_VERSION "28.2.0"
+#define ERESSEA_VERSION "28.3.0"
 #endif
 
 const char *eressea_version(void) {

src/magic.c

@@ -2498,6 +2498,7 @@ static castorder *cast_cmd(unit * u, order * ord)
     unit * mage = NULL;
     param_t param;
 
+    assert(u);
     if (LongHunger(u)) {
         cmistake(u, ord, 224, MSG_MAGIC);
         return 0;
@@ -2856,7 +2857,7 @@ void magic(void)
             }
             /* erst bezahlen, dann Kostenzaehler erhoehen */
             if (co->level > 0) {
-                pay_spell(mage, caster, sp, cast_level, co->distance);
+                pay_spell(mage, caster, sp, co->level, co->distance);
             }
             if (fumbled) {
                 do_fumble(co);

src/spells.c

@@ -1150,7 +1150,11 @@ int sp_blessedharvest(castorder * co)
 
     if (create_curse(caster, &r->attribs, &ct_blessedharvest, co->force,
         co->level + 1, 1.0, 0)) {
-        const char * effect = co->sp->sname[0] == 'b' ? "harvest_effect" : "raindance_effect";
+        const char* effect = "harvest_effect";
+        // HACK: same function for harvest and raindance, different message:
+        if (co->sp && co->sp->sname && co->sp->sname[0] != 'b') {
+            effect = "raindance_effect";
+        }
         message *seen = msg_message(effect, "mage", caster);
         message *unseen = msg_message(effect, "mage", (unit *)NULL);
         report_effect(r, caster, seen, unseen);
@@ -1433,27 +1437,30 @@ int sp_kaelteschutz(castorder * co)
         if (force < 1)
             break;
 
-        if (pa->param[n]->flag)
+        if (pa->param[n]->flag == TARGET_NOTFOUND)
             continue;
 
-        u = pa->param[n]->data.u;
+        if (pa->param[n]->flag == 0)
+        {
+            u = pa->param[n]->data.u;
 
-        if (force < u->number) {
-            men = (int)force;
-        }
-        else {
-            men = u->number;
-        }
+            if (force < u->number) {
+                men = (int)force;
+            }
+            else {
+                men = u->number;
+            }
 
-        create_curse(caster, &u->attribs, &ct_insectfur, co->force,
-            co->level + 1, zero_effect, men);
+            create_curse(caster, &u->attribs, &ct_insectfur, co->force,
+                co->level + 1, zero_effect, men);
 
-        force -= u->number;
-        ADDMSG(&caster->faction->msgs, msg_message("heat_effect", "mage target", caster,
-            u));
-        if (u->faction != caster->faction)
-            ADDMSG(&u->faction->msgs, msg_message("heat_effect", "mage target",
-                cansee(u->faction, r, caster, 0) ? caster : NULL, u));
+            force -= u->number;
+            ADDMSG(&caster->faction->msgs, msg_message("heat_effect", "mage target", caster,
+                u));
+            if (u->faction != caster->faction)
+                ADDMSG(&u->faction->msgs, msg_message("heat_effect", "mage target",
+                    cansee(u->faction, r, caster, 0) ? caster : NULL, u));
+        }
         cost = co->level;
     }
     /* Erstattung? */
@@ -1886,7 +1893,7 @@ int sp_treewalkexit(castorder * co)
     unit *u;
     int remaining_cap;
     int n;
-    int erfolg = 0;
+    int cost = 0;
     region *r = co_get_region(co);
     unit *caster = co_get_caster(co);
     spellparameter *pa = co->par;
@@ -1923,21 +1930,30 @@ int sp_treewalkexit(castorder * co)
         return 0;
     }
 
+    if (pa->param[0]->flag == TARGET_RESISTS) {
+        /* target region resists the magical invasion */
+        return co->level;
+    }
+
     /* fuer jede Einheit in der Kommandozeile */
     for (n = 1; n < pa->length; n++) {
-        if (pa->param[n]->flag)
+        if (pa->param[n]->flag == TARGET_NOTFOUND) {
             continue;
-
+        }
         u = pa->param[n]->data.u;
 
-        if (!ucontact(u, caster)) {
-            ADDMSG(&caster->faction->msgs, msg_feedback(caster, co->order,
-                "feedback_no_contact", "target", u));
+        if (!can_survive(u, rt)) {
+            cmistake(caster, co->order, 231, MSG_MAGIC);
         }
         else {
             int w = weight(u);
-            if (!can_survive(u, rt)) {
-                cmistake(caster, co->order, 231, MSG_MAGIC);
+
+            if (pa->param[n]->flag == TARGET_RESISTS) {
+                cost = cast_level;
+            }
+            else if (!ucontact(u, caster)) {
+                ADDMSG(&caster->faction->msgs, msg_feedback(caster, co->order,
+                    "feedback_no_contact", "target", u));
             }
             else if (remaining_cap - w < 0) {
                 ADDMSG(&caster->faction->msgs, msg_feedback(caster, co->order,
@@ -1946,7 +1962,7 @@ int sp_treewalkexit(castorder * co)
             else {
                 remaining_cap = remaining_cap - w;
                 move_unit(u, rt, NULL);
-                erfolg = cast_level;
+                cost = cast_level;
 
                 /* Meldungen in der Ausgangsregion */
                 astral_disappear(r, u);
@@ -1956,7 +1972,7 @@ int sp_treewalkexit(castorder * co)
             }
         }
     }
-    return erfolg;
+    return cost;
 }
 
 /* ------------------------------------------------------------- */
@@ -2073,7 +2089,6 @@ int sp_drought(castorder * co)
         return 0;
     }
 
-    /* melden, 1x pro Partei */
     msg = msg_message("sp_drought_effect", "mage region", caster, r);
     report_spell(caster, r, msg);
     msg_release(msg);
@@ -2188,17 +2203,18 @@ int sp_stormwinds(castorder * co)
     region *r = co_get_region(co);
     unit *caster = co_get_caster(co);
     spellparameter *pa = co->par;
-    int n, force = (int)co->force;
+    int n, max_targets = (int)co->force;
     message *m = NULL;
 
     /* melden vorbereiten */
     freset(caster->faction, FFL_SELECT);
     for (u = r->units; u; u = u->next)
         freset(u->faction, FFL_SELECT);
 
-    for (n = 0; n < pa->length && force > 0; n++) {
-        if (pa->param[n]->flag)
+    for (n = 0; n < pa->length && max_targets > 0; n++) {
+        if (pa->param[n]->flag == TARGET_NOTFOUND) {
             continue;
+        }
 
         sh = pa->param[n]->data.sh;
 
@@ -2223,7 +2239,7 @@ int sp_stormwinds(castorder * co)
         /* Da der Spruch nur diese Runde wirkt wird er nie im Report
          * erscheinen */
         erfolg++;
-        force--;
+        max_targets--;
 
         /* melden vorbereiten: */
         for (u = r->units; u; u = u->next) {
@@ -2252,7 +2268,7 @@ int sp_stormwinds(castorder * co)
     }
     if (m)
         msg_release(m);
-    return erfolg;
+    return erfolg ? co->level : 0;
 }
 
 /* ------------------------------------------------------------- */
@@ -3705,7 +3721,7 @@ static int sp_raisepeasantmob(castorder * co)
  * Flag:
  *  (UNITSPELL | SPELLLEVEL | TESTCANSEE)
  */
-static int sp_migranten(castorder * co)
+int sp_migranten(castorder * co)
 {
     unit *target;
     region *r = co_get_region(co);

src/spells.h

@@ -32,6 +32,7 @@ extern "C" {
     int sp_fumblecurse(struct castorder* co);
     int sp_deathcloud(struct castorder* co);
     int sp_magicboost(struct castorder* co);
+    int sp_migranten(struct castorder* co);
 
 #define ACTION_RESET      0x01  /* reset the one-time-flag FFL_SELECT (on first pass) */
 #define ACTION_CANSEE     0x02  /* to people who can see the actor */