Merge pull request #700 from ennorehling/master

Version 3.12.2 - regression fixes

scripts/eressea/ponnuki.lua

@@ -10,23 +10,25 @@ local jokes = {
 }
 
 local function ponnuki_brain(u)
-  local i = math.random(#jokes)
-  u:add_notice("Eine Botschaft von " .. tostring(u) .. ": " ..jokes[i])
-  local d = math.random(6)
-  local r = u.region:next(d-1)
-  if r.terrain == 'glacier' then
     u:clear_orders()
-    u:add_order("NACH " .. directions[d])
+    local i = math.random(#jokes)
-  end
+    u:add_order("BOTSCHAFT REGION \"" .. jokes[i] .. "\"")
+    eressea.log.info("Ponnuki is telling jokes in " .. tostring(u.region))
+    local d = math.random(6)
+    local r = u.region:next(d-1)
+    if r.terrain == 'glacier' then
+        u:add_order("NACH " .. directions[d])
+        eressea.log.info("Ponnuki is walking to " .. tostring(r))
+    end
 end
 
 function ponnuki.init()
     -- initialize other scripts
+    local f = get_faction(666)
     local u = get_unit(atoi36("ponn"))
     if not u then
         eressea.log.error("Ponnuki is missing, will re-create")
         local home = get_region(-67, -5)
-        local f = get_faction(666)
         if home and f then
             if home.terrain~="glacier" then
                 home.terrain="glacier"
@@ -44,10 +46,11 @@ function ponnuki.init()
         else
             eressea.log.error("Ponnuki cannot find Magrathea")
         end
+    elseif u.faction==f then
+        eressea.log.info("Ponnuki is in " .. tostring(u.region))
+        u.status = 5 -- FLIEHE
     end
-    if u then
+    ponnuki_brain(u)
-        ponnuki_brain(u)
-    end
 end
 
 return ponnuki

scripts/run-turn.lua

@@ -144,7 +144,6 @@ function process(rules, orders)
 
     turn_begin()
     init_summary()
-    callbacks(rules, 'init')
 
     -- run the turn:
     if eressea.read_orders(orders) ~= 0 then
@@ -152,19 +151,18 @@ function process(rules, orders)
         return -1
     end
 
-    plan_monsters()
-
     if nmr_check(config.maxnmrs or 80)~=0 then
         return -1
     end
-
+    plan_monsters()
-    callbacks(rules, 'update')
+    callbacks(rules, 'init')
     turn_process()
+    callbacks(rules, 'update')
+    turn_end() -- ageing, etc.
 
     write_files(config.locales)
     dbupdate()
 
-    turn_end()
     file = '' .. get_turn() .. '.dat'
     if eressea.write_game(file)~=0 then
         eressea.log.error("could not write game")

src/kernel/curse.c

@@ -107,24 +107,21 @@ void curse_init(attrib * a)
 int curse_age(attrib * a, void *owner)
 {
     curse *c = (curse *)a->data.v;
-    int result = 0;
+    int result = AT_AGE_KEEP;
-
     UNUSED_ARG(owner);
     c_clearflag(c, CURSE_ISNEW);
 
-    if (c_flags(c) & CURSE_NOAGE) {
+    if ((c_flags(c) & CURSE_NOAGE) == 0) {
-        c->duration = INT_MAX;
+        if (c->type->age) {
+            if (c->type->age(c) == 0) {
+                result = AT_AGE_REMOVE;
+            }
+        }
+        if (--c->duration <= 0) {
+            result = AT_AGE_REMOVE;
+        }
     }
-    if (c->type->age) {
+    return result;
-        result = c->type->age(c);
-    }
-    if (result != 0) {
-        c->duration = 0;
-    }
-    else if (c->duration != INT_MAX) {
-        c->duration = MAX(0, c->duration - 1);
-    }
-    return (c->duration > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
 }
 
 void destroy_curse(curse * c)
@@ -308,6 +305,7 @@ void ct_register(const curse_type * ct)
     unsigned int hash = tolower(ct->cname[0]) & 0xFF;
     selist **ctlp = cursetypes + hash;
 
+    assert(ct->age==NULL || (ct->flags&CURSE_NOAGE) == 0);
     selist_set_insert(ctlp, (void *)ct, NULL);
     ++ct_changes;
 }

src/kernel/save.c

@@ -760,7 +760,7 @@ unit *read_unit(struct gamedata *data)
 
     assert(u_race(u));
     for (;;) {
-        int n, level, weeks;
+        int n = NOSKILL, level, weeks;
         skill_t sk;
         READ_INT(data->store, &n);
         sk = (skill_t)n;
@@ -1662,7 +1662,7 @@ int read_game(gamedata *data) {
     if (rmax < 0) {
         rmax = nread;
     }
-    log_debug(" - Einzulesende Regionen: %d/%d\r", rmax, nread);
+    log_debug(" - Einzulesende Regionen: %d/%d", rmax, nread);
 
     while (--nread >= 0) {
         unit **up;
@@ -1716,10 +1716,6 @@ int read_game(gamedata *data) {
 
             update_interval(u->faction, r);
         }
-
-        if ((nread & 0x3FF) == 0) {     /* das spart extrem Zeit */
-            log_debug(" - Einzulesende Regionen: %d/%d * %d,%d    \r", rmax, nread, r->x, r->y);
-        }
         --rmax;
     }
     read_borders(data);

src/monsters.c

@@ -187,25 +187,28 @@ void monsters_desert(struct faction *monsters)
     }
 }
 
-int monster_attacks(unit * monster, bool respect_buildings, bool rich_only)
+int monster_attacks(unit * monster, bool rich_only)
 {
-    region *r = monster->region;
+    if (monster->status < ST_AVOID) {
-    unit *u2;
+        region *r = monster->region;
-    int money = 0;
+        unit *u2;
+        int money = 0;
 
-    for (u2 = r->units; u2; u2 = u2->next) {
+        for (u2 = r->units; u2; u2 = u2->next) {
-        if (u2->faction != monster->faction && cansee(monster->faction, r, u2, 0) && !in_safe_building(u2, monster)) {
+            if (u2->faction != monster->faction && cansee(monster->faction, r, u2, 0) && !in_safe_building(u2, monster)) {
-            int m = get_money(u2);
+                int m = get_money(u2);
-            if (!rich_only || m > 0) {
+                if (!rich_only || m > 0) {
-                order *ord = monster_attack(monster, u2);
+                    order *ord = monster_attack(monster, u2);
-                if (ord) {
+                    if (ord) {
-                    addlist(&monster->orders, ord);
+                        addlist(&monster->orders, ord);
-                    money += m;
+                        money += m;
+                    }
                 }
             }
         }
+        return money;
     }
-    return money;
+    return 0;
 }
 
 static order *get_money_for_dragon(region * r, unit * udragon, int wanted)
@@ -226,7 +229,7 @@ static order *get_money_for_dragon(region * r, unit * udragon, int wanted)
      * und holt sich Silber von Einheiten, vorausgesetzt er bewacht bereits */
     money = 0;
     if (attacks && is_guard(udragon)) {
-        money += monster_attacks(udragon, true, true);
+        money += monster_attacks(udragon, true);
     }
 
     /* falls die einnahmen erreicht werden, bleibt das monster noch eine */
@@ -749,7 +752,7 @@ void plan_monsters(faction * f)
             }
 
             if (attacking && (!r->land || is_guard(u))) {
-                monster_attacks(u, true, false);
+                monster_attacks(u, false);
             }
 
             /* units with a plan to kill get ATTACK orders: */
@@ -773,7 +776,7 @@ void plan_monsters(faction * f)
             }
 
             /* All monsters guard the region: */
-            if (!monster_is_waiting(u) && r->land) {
+            if (u->status < ST_FLEE && !monster_is_waiting(u) && r->land) {
                 addlist(&u->orders, create_order(K_GUARD, u->faction->locale, NULL));
             }
 

src/monsters.test.c

@@ -27,7 +27,7 @@
 #include <string.h>
 
 extern void plan_monsters(struct faction *f);
-extern int monster_attacks(unit * monster, bool respect_buildings, bool rich_only);
+extern int monster_attacks(unit * monster, bool rich_only);
 
 static order *find_order(const char *expected, const unit *unit)
 {
@@ -64,6 +64,7 @@ static void create_monsters(faction **player, faction **monsters, unit **u, unit
     *u = test_create_unit(*player, r);
     unit_setid(*u, 1);
     *m = test_create_unit(*monsters, r);
+    unit_setstatus(*m, ST_FIGHT);
 }
 
 static void test_monsters_attack(CuTest * tc)
@@ -72,7 +73,6 @@ static void test_monsters_attack(CuTest * tc)
     unit *u, *m;
 
     create_monsters(&f, &f2, &u, &m);
-
     setguard(m, true);
 
     config_set("rules.monsters.attack_chance", "1");
@@ -112,7 +112,7 @@ static void test_monsters_waiting(CuTest * tc)
     create_monsters(&f, &f2, &u, &m);
     setguard(m, true);
     fset(m, UFL_ISNEW);
-    monster_attacks(m, false, false);
+    monster_attacks(m, false);
     CuAssertPtrEquals(tc, 0, find_order("attack 1", m));
     test_cleanup();
 }

src/spells.c

@@ -2079,7 +2079,6 @@ static int sp_homestone(castorder * co)
         cmistake(mage, co->order, 206, MSG_MAGIC);
         return 0;
     }
-    c_setflag(c, CURSE_NOAGE | CURSE_ONLYONE);
 
     /* Magieresistenz der Burg erhoeht sich um 50% */
     effect = 50.0F;

src/spells/buildingcurse.c

@@ -76,7 +76,7 @@ CURSETYP_NORM, 0, M_SUMEFFECT, cinfo_magicrunes
 
 /* Heimstein-Zauber */
 static struct curse_type ct_magicwalls = { "magicwalls",
-CURSETYP_NORM, 0, NO_MERGE, cinfo_building
+CURSETYP_NORM, CURSE_ONLYONE|CURSE_NOAGE, NO_MERGE, cinfo_building
 };
 
 /* Feste Mauer - Präkampfzauber, wirkt nur 1 Runde */

src/spells/flyingship.c

@@ -149,10 +149,8 @@ bool flying_ship(const ship * sh)
 static curse *shipcurse_flyingship(ship * sh, unit * mage, double power, int duration)
 {
     curse *c;
-    const curse_type *ct_flyingship = ct_find("flyingship");
-    assert(ct_flyingship);
     if (sh->attribs) {
-        if (curse_active(get_curse(sh->attribs, ct_flyingship))) {
+        if (curse_active(get_curse(sh->attribs, &ct_flyingship))) {
             return NULL;
         }
         if (is_cursed(sh->attribs, C_SHIP_SPEEDUP, 0)) {
@@ -160,7 +158,7 @@ static curse *shipcurse_flyingship(ship * sh, unit * mage, double power, int dur
         }
     }
     /* mit C_SHIP_NODRIFT haben wir kein Problem */
-    c = create_curse(mage, &sh->attribs, ct_flyingship, power, duration, 0.0, 0);
+    c = create_curse(mage, &sh->attribs, &ct_flyingship, power, duration, 0.0, 0);
     if (c) {
         c->data.v = sh;
         if (c->duration > 0) {