testing spells in the example server also

WIP: create_roi is broken until mages have spellbooks

scripts/tests/spells.lua

@@ -14,8 +14,6 @@ function test_roi()
     u.race = "elf"
     u:set_skill("magic", 10)
     u:add_item("money", 3010)
-    u:add_item("roi", 1)
-    assert_equal(1, u:get_item("roi"))
     u.magic = "tybied"
     u.aura = 200
     u.ship = s1
@@ -25,46 +23,5 @@ function test_roi()
     u:add_order("ZAUBERE 'Erschaffe einen Ring der Unsichtbarkeit' ")
     process_orders()
     write_reports()
-    assert_equal(2, u:get_item("roi"))
+    assert_equal(1, u:get_item("roi"))
-end
-
-function test_blessedharvest_lasts_n_turn()
-    free_game()
-    local r = region.create(0, 0, "plain")
-    local f = faction.create("noreply@eressea.de", "halfling", "de")
-    local u = unit.create(f, r)
-    local err = 0
-    r:set_resource("peasant", 100)
-    r:set_resource("money", 0)
-    u:add_item("money", 1000)
-    u.magic = "gwyrrd"
-    u.race = "dwarf"
-    u:set_skill("magic", 20)
-    u.aura = 200
-    err = err + u:add_spell("raindance")
-    err = err + u:add_spell("blessedharvest")
-    assert_equal(0, err)
-    
-    u:clear_orders()
-    local level = 5
-    u:add_order("ZAUBERE STUFE " .. level .. " Regentanz")
-    assert_equal(0, r:get_resource("money"), 0)
-    
-    local m = 0
-    local p = 100
-    for i=1,level+2 do
-        process_orders()
-        local income = p * 12
-        p = r:get_resource("peasant")
-        income = income - p * 10
-        m = m + income
-        -- print(i, m, p, r:get_resource("money"))
-        if (i>level+1) then
-            assert_not_equal(m, r:get_resource("money"))
-        else
-            assert_equal(m, r:get_resource("money"))
-        end
-        u:clear_orders()
-        u:add_order("ARBEITEN")
-    end
 end

src/kernel/magic.c

@@ -897,9 +897,15 @@ int eff_spelllevel(unit * u, const spell * sp, int cast_level, int range)
   /* Ein Spruch mit Fixkosten wird immer mit der Stufe des Spruchs und
    * nicht auf der Stufe des Magiers gezaubert */
   if (costtyp == SPC_FIX) {
-    cast_level = MIN(cast_level, sp->level);
+    spellbook * spells = unit_get_spellbook(u);
+    if (spells) {
+      spellbook_entry * sbe = spellbook_get(spells, sp); 
+      if (sbe) {
+        return MIN(cast_level, sbe->level);
+      }
+    }
+    log_error("spell %s is not in the spellbook for %s\n", sp->sname, unitname(u));
   }
-
   return cast_level;
 }
 

src/kernel/spellbook.c

@@ -54,7 +54,7 @@ int spellbook_foreach(spellbook *sb, int (*callback)(spellbook_entry *, void *),
   return 0;
 }
 
-spellbook_entry * spellbook_get(spellbook *sb, struct spell * sp)
+spellbook_entry * spellbook_get(spellbook *sb, const struct spell * sp)
 {
   quicklist *ql;
   int qi;

src/kernel/spellbook.h

@@ -42,7 +42,7 @@ spellbook * create_spellbook(const char * name);
 void spellbook_add(spellbook *sbp, struct spell * sp, int level);
 int spellbook_foreach(spellbook *sb, int (*callback)(spellbook_entry *, void *), void * data);
 void spellbook_clear(spellbook *sb);
-spellbook_entry * spellbook_get(spellbook *sb, struct spell * sp);
+spellbook_entry * spellbook_get(spellbook *sb, const struct spell * sp);
 
 #ifdef __cplusplus
 }

src/kernel/unit.c

@@ -1737,3 +1737,14 @@ void unit_add_spell(unit * u, sc_mage * m, struct spell * sp)
   add_spell(&mage->spells, sp);
   add_spellname(mage, sp);
 }
+
+struct spellbook * unit_get_spellbook(struct unit * u)
+{
+  sc_mage * mage = get_mage(u);
+  if (mage) {
+    if (u->faction->spellbook) {
+      return u->faction->spellbook;
+    }
+  }
+  return 0;
+}

src/kernel/unit.h

@@ -233,6 +233,7 @@ extern "C" {
   int unit_max_hp(const struct unit *u);
   void scale_number(struct unit *u, int n);
 
+  struct spellbook * unit_get_spellbook(struct unit * u);
   void unit_add_spell(struct unit * u, struct sc_mage * m, struct spell * sp);
 
   extern struct attrib_type at_creator;