Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make region:set_resource do the right thing 

also for adamantium
This commit is contained in:
Enno Rehling 2017-03-22 20:37:09 +01:00
parent 10edb1d3e9
commit dcf1c7138b
14 changed files with 205 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
scripts/tests/common.lua
View File

@ -5,6 +5,10 @@ local function _test_create_ship(r)
return s return s
end end
local function create_faction(race)
return faction.create(race .. '@eressea.de', race, "de")
end
local function one_unit(r, f) local function one_unit(r, f)
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("money", u.number * 100) u:add_item("money", u.number * 100)
@ -17,8 +21,8 @@ local function two_units(r, f1, f2)
end end
local function two_factions() local function two_factions()
local f1 = faction.create("one@eressea.de", "human", "de") local f1 = create_faction('human')
local f2 = faction.create("two@eressea.de", "elf", "de") local f2 = create_faction('elf')
return f1, f2 return f1, f2
end end
@ -44,7 +48,7 @@ end
function test_flags() function test_flags()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("flags@eressea.de", "halfling", "de") local f = create_faction('halfling')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
local no = itoa36(f.id) local no = itoa36(f.id)
local flags = 50332673 local flags = 50332673
@ -62,7 +66,7 @@ function test_elvenhorse_requires_riding_5()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
region.create(1, 0, "plain") region.create(1, 0, "plain")
local goal = region.create(2, 0, "plain") local goal = region.create(2, 0, "plain")
local f = faction.create("riding@eressea.de", "halfling", "de") local f = create_faction('halfling')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("elvenhorse", 1) u:add_item("elvenhorse", 1)
u:set_skill("riding", 6)-- halfling has -1 modifier u:set_skill("riding", 6)-- halfling has -1 modifier
@ -76,7 +80,7 @@ function test_cannot_ride_elvenhorse_without_enough_skill()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local goal = region.create(1, 0, "plain") local goal = region.create(1, 0, "plain")
region.create(2, 0, "plain") region.create(2, 0, "plain")
local f = faction.create("elvenhorse@eressea.de", "halfling", "de") local f = create_faction('halfling')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("elvenhorse", 1) u:add_item("elvenhorse", 1)
u:set_skill("riding", 5) -- halfling has -1 modifier u:set_skill("riding", 5) -- halfling has -1 modifier
@ -96,7 +100,7 @@ end
function test_demon_food() function test_demon_food()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("demonfood@eressea.de", "demon", "de") local f = create_faction('demon')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
local p = r:get_resource("peasant") local p = r:get_resource("peasant")
r:set_resource("peasant", 2000) r:set_resource("peasant", 2000)
@ -136,7 +140,7 @@ function test_plane()
local nx, ny = plane.normalize(pl, 4, 4) local nx, ny = plane.normalize(pl, 4, 4)
assert_equal(nx, -3, "normalization failed") assert_equal(nx, -3, "normalization failed")
assert_equal(ny, -3, "normalization failed") assert_equal(ny, -3, "normalization failed")
local f = faction.create("plan@eressea.de", "human", "de") local f = create_faction('human')
f.id = atoi36("tpla") f.id = atoi36("tpla")
local r, x, y local r, x, y
for x = -3, 3 do for y = -3, 3 do for x = -3, 3 do for y = -3, 3 do
@ -155,7 +159,7 @@ end
function test_read_write() function test_read_write()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("readwrite@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r) local u = unit.create(f, r)
u.number = 2 u.number = 2
local fno = f.id local fno = f.id
@ -184,7 +188,7 @@ end
function test_descriptions() function test_descriptions()
local info = "Descriptions can be very long. Bug 1984 behauptet, dass es Probleme gibt mit Beschreibungen die laenger als 120 Zeichen sind. This description is longer than 120 characters." local info = "Descriptions can be very long. Bug 1984 behauptet, dass es Probleme gibt mit Beschreibungen die laenger als 120 Zeichen sind. This description is longer than 120 characters."
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("descriptions@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
local s = _test_create_ship(r) local s = _test_create_ship(r)
local b = building.create(r, "castle") local b = building.create(r, "castle")
@ -236,7 +240,7 @@ end
function test_faction() function test_faction()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("testfaction@eressea.de", "human", "de") local f = create_faction('human')
assert(f) assert(f)
f.info = "Spazz" f.info = "Spazz"
assert(f.info=="Spazz") assert(f.info=="Spazz")
@ -259,7 +263,7 @@ end
function test_unit() function test_unit()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("testunit@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r) local u = unit.create(f, r)
u.number = 20 u.number = 20
u.name = "Enno" u.name = "Enno"
@ -292,7 +296,7 @@ end
function test_building() function test_building()
local u local u
local f = faction.create("testbuilding@eressea.de", "human", "de") local f = create_faction('human')
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local b = building.create(r, "castle") local b = building.create(r, "castle")
u = unit.create(f, r) u = unit.create(f, r)
@ -318,7 +322,7 @@ end
function test_message() function test_message()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("testmessage@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r) local u = unit.create(f, r)
local msg = message.create("item_create_spell") local msg = message.create("item_create_spell")
msg:set_unit("mage", u) msg:set_unit("mage", u)
@ -346,7 +350,7 @@ function test_events()
plain = region.create(0, 0, "plain") plain = region.create(0, 0, "plain")
skill = 8 skill = 8
f = faction.create("noreply2@eressea.de", "elf", "de") f = create_faction('elf')
f.age = 20 f.age = 20
u = unit.create(f, plain) u = unit.create(f, plain)
@ -356,7 +360,7 @@ function test_events()
u:add_order("NUMMER PARTEI test") u:add_order("NUMMER PARTEI test")
u:add_handler("message", msg_handler) u:add_handler("message", msg_handler)
msg = "BOTSCHAFT EINHEIT " .. itoa36(u.id) .. " Du~Elf~stinken" msg = "BOTSCHAFT EINHEIT " .. itoa36(u.id) .. " Du~Elf~stinken"
f = faction.create("noreply3@eressea.de", "elf", "de") f = create_faction('elf')
f.age = 20 f.age = 20
u = unit.create(f, plain) u = unit.create(f, plain)
@ -371,7 +375,7 @@ end
function test_renumber_ship() function test_renumber_ship()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply4@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r) local u = unit.create(f, r)
local s = ship.create(r, config.ships[1]) local s = ship.create(r, config.ships[1])
u.ship = s u.ship = s
@ -386,7 +390,7 @@ end
function test_recruit2() function test_recruit2()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply4@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r) local u = unit.create(f, r)
u.number = 1 u.number = 1
u:add_item("money", 2000) u:add_item("money", 2000)
@ -401,7 +405,7 @@ end
function test_guard() function test_guard()
region.create(1, 0, "plain") region.create(1, 0, "plain")
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f1 = faction.create("noreply5@eressea.de", "human", "de") local f1 = create_faction('human')
f1.age = 20 f1.age = 20
local u1 = unit.create(f1, r, 10) local u1 = unit.create(f1, r, 10)
u1:add_item("sword", 10) u1:add_item("sword", 10)
@ -411,7 +415,7 @@ function test_guard()
u1:add_order("NACH O") u1:add_order("NACH O")
u1.name="Kalle Pimp" u1.name="Kalle Pimp"
local f2 = faction.create("noreply6@eressea.de", "human", "de") local f2 = create_faction('human')
f2.age = 20 f2.age = 20
local u2 = unit.create(f2, r, 1) local u2 = unit.create(f2, r, 1)
local u3 = unit.create(f2, r, 1) local u3 = unit.create(f2, r, 1)
@ -429,7 +433,7 @@ end
function test_recruit() function test_recruit()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply7@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r) local u = unit.create(f, r)
u.number = 1 u.number = 1
local n = 3 local n = 3
@ -445,7 +449,7 @@ end
function test_produce() function test_produce()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply8@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:clear_orders() u:clear_orders()
local sword = config.get_resource('sword') local sword = config.get_resource('sword')
@ -460,7 +464,7 @@ end
function test_work() function test_work()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply9@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("money", u.number * 10) -- humans cost 10 u:add_item("money", u.number * 10) -- humans cost 10
u:set_skill("herbalism", 5) u:set_skill("herbalism", 5)
@ -473,7 +477,7 @@ end
function test_upkeep() function test_upkeep()
eressea.settings.set("rules.food.flags", "0") eressea.settings.set("rules.food.flags", "0")
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply10@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 5) local u = unit.create(f, r, 5)
u:add_item("money", u.number * 11) u:add_item("money", u.number * 11)
u:clear_orders() u:clear_orders()
@ -485,7 +489,7 @@ end
function test_id() function test_id()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply11@eressea.de", "human", "de") local f = create_faction('human')
f.id = atoi36("42") f.id = atoi36("42")
assert_not_equal(f, get_faction(42)) assert_not_equal(f, get_faction(42))
assert_equal(f, get_faction("42")) assert_equal(f, get_faction("42"))
@ -521,7 +525,7 @@ function test_mallorn()
m:set_resource("tree", 100) m:set_resource("tree", 100)
assert_equal(100, m:get_resource("tree")) assert_equal(100, m:get_resource("tree"))
local f = faction.create("noreply13@eressea.de", "human", "de") local f = create_faction('human')
local u1 = unit.create(f, r, 1) local u1 = unit.create(f, r, 1)
u1:add_item("money", u1.number * 100) u1:add_item("money", u1.number * 100)
@ -558,7 +562,7 @@ function test_coordinate_translation()
local pl = plane.create(1, 500, 500, 1001, 1001) -- astralraum local pl = plane.create(1, 500, 500, 1001, 1001) -- astralraum
local pe = plane.create(1, -8761, 3620, 23, 23) -- eternath local pe = plane.create(1, -8761, 3620, 23, 23) -- eternath
local r = region.create(1000, 1000, "plain") local r = region.create(1000, 1000, "plain")
local f = faction.create("noreply14@eressea.de", "human", "de") local f = create_faction('human')
assert_not_equal(nil, r) assert_not_equal(nil, r)
assert_equal(r.x, 1000) assert_equal(r.x, 1000)
assert_equal(r.y, 1000) assert_equal(r.y, 1000)
@ -604,8 +608,8 @@ end
function test_building_other() function test_building_other()
local r = region.create(0,0, "plain") local r = region.create(0,0, "plain")
local f1 = faction.create("noreply17@eressea.de", "human", "de") local f1 = create_faction('human')
local f2 = faction.create("noreply18@eressea.de", "human", "de") local f2 = create_faction('human')
local b = building.create(r, "castle") local b = building.create(r, "castle")
b.size = 10 b.size = 10
local u1 = unit.create(f1, r, 3) local u1 = unit.create(f1, r, 3)
@ -632,7 +636,7 @@ end
local function _test_create_laen() local function _test_create_laen()
eressea.settings.set("rules.terraform.all", "1") eressea.settings.set("rules.terraform.all", "1")
local r = region.create(0,0, "mountain") local r = region.create(0,0, "mountain")
local f1 = faction.create("noreply19@eressea.de", "human", "de") local f1 = create_faction('human')
local u1 = unit.create(f1, r, 1) local u1 = unit.create(f1, r, 1)
r:set_resource("laen", 50) r:set_resource("laen", 50)
return r, u1 return r, u1
@ -671,7 +675,7 @@ end
function test_mine() function test_mine()
local r = region.create(0,0, "mountain") local r = region.create(0,0, "mountain")
local f1 = faction.create("noreply20@eressea.de", "human", "de") local f1 = create_faction('human')
local u1 = unit.create(f1, r, 1) local u1 = unit.create(f1, r, 1)
u1:add_item("money", 1000) u1:add_item("money", 1000)
@ -692,9 +696,9 @@ end
function test_guard_resources() function test_guard_resources()
-- this is not quite http://bugs.eressea.de/view.php?id=1756 -- this is not quite http://bugs.eressea.de/view.php?id=1756
local r = region.create(0,0, "mountain") local r = region.create(0,0, "mountain")
local f1 = faction.create("noreply21@eressea.de", "human", "de") local f1 = create_faction('human')
f1.age=20 f1.age=20
local f2 = faction.create("noreply22@eressea.de", "human", "de") local f2 = create_faction('human')
f2.age=20 f2.age=20
local u1 = unit.create(f1, r, 1) local u1 = unit.create(f1, r, 1)
u1:add_item("money", 100) u1:add_item("money", 100)
@ -722,7 +726,7 @@ end
function test_hero_hero_transfer() function test_hero_hero_transfer()
local r = region.create(0,0, "mountain") local r = region.create(0,0, "mountain")
local f = faction.create("noreply23@eressea.de", "human", "de") local f = create_faction('human')
f.age=20 f.age=20
local UFL_HERO = 128 local UFL_HERO = 128
@ -743,7 +747,7 @@ end
function test_hero_normal_transfer() function test_hero_normal_transfer()
local r = region.create(0,0, "mountain") local r = region.create(0,0, "mountain")
local f = faction.create("noreply24@eressea.de", "human", "de") local f = create_faction('human')
f.age=20 f.age=20
local UFL_HERO = 128 local UFL_HERO = 128
@ -762,7 +766,7 @@ end
function test_expensive_skills_cost_money() function test_expensive_skills_cost_money()
local r = region.create(0,0, "mountain") local r = region.create(0,0, "mountain")
local f = faction.create("noreply25@eressea.de", "elf", "de") local f = create_faction('elf')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("money", 10000) u:add_item("money", 10000)
u:clear_orders() u:clear_orders()
@ -775,7 +779,7 @@ end
function test_food_is_consumed() function test_food_is_consumed()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply26@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("money", 100) u:add_item("money", 100)
u:clear_orders() u:clear_orders()
@ -787,7 +791,7 @@ end
function test_food_can_override() function test_food_can_override()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply27@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("money", 100) u:add_item("money", 100)
u:clear_orders() u:clear_orders()
@ -799,7 +803,7 @@ end
function test_swim_and_survive() function test_swim_and_survive()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply28@eressea.de", "human", "de") local f = create_faction('human')
f.nam = "chaos" f.nam = "chaos"
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
process_orders() process_orders()
@ -813,7 +817,7 @@ end
function test_swim_and_die() function test_swim_and_die()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply29@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
local uid = u.id local uid = u.id
process_orders() process_orders()
@ -828,7 +832,7 @@ function test_ride_with_horse()
region.create(1, 0, "plain") region.create(1, 0, "plain")
region.create(2, 0, "plain") region.create(2, 0, "plain")
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply30@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("horse", 1) u:add_item("horse", 1)
local horse_cfg = config.get_resource("horse") local horse_cfg = config.get_resource("horse")
@ -851,7 +855,7 @@ function test_ride_with_horses_and_cart()
region.create(1, 0, "plain") region.create(1, 0, "plain")
region.create(2, 0, "plain") region.create(2, 0, "plain")
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply31@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
local horse_cfg = config.get_resource("horse") local horse_cfg = config.get_resource("horse")
local cart_cfg = config.get_resource("cart") local cart_cfg = config.get_resource("cart")
@ -904,7 +908,7 @@ function test_walk_and_carry_the_cart()
region.create(1, 0, "plain") region.create(1, 0, "plain")
local r = region.create(2, 0, "plain") local r = region.create(2, 0, "plain")
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply32@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 10) local u = unit.create(f, r, 10)
u:add_item("cart", 1) u:add_item("cart", 1)
@ -925,7 +929,7 @@ end
function test_bug_1795_limit() function test_bug_1795_limit()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply@eressea.de", "human", "de") local f = create_faction('human')
local u1 = one_unit(r,f) local u1 = one_unit(r,f)
u1:add_item("money", 100000000) u1:add_item("money", 100000000)
u1:add_order("REKRUTIEREN 9999") u1:add_order("REKRUTIEREN 9999")
@ -940,7 +944,7 @@ end
function test_bug_1795_demons() function test_bug_1795_demons()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply@eressea.de", "demon", "de") local f = create_faction('demon')
local u1 = one_unit(r,f) local u1 = one_unit(r,f)
r:set_resource("peasant", 2000) r:set_resource("peasant", 2000)
local peasants = r:get_resource("peasant") local peasants = r:get_resource("peasant")
@ -966,7 +970,7 @@ end
function test_parser() function test_parser()
local r = region.create(0, 0, "mountain") local r = region.create(0, 0, "mountain")
local f = faction.create("noreply@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
local filename = "orders.txt" local filename = "orders.txt"
@ -991,7 +995,7 @@ end
function test_prefix() function test_prefix()
local r0 = region.create(0, 0, "plain") local r0 = region.create(0, 0, "plain")
local f1 = faction.create("noreply@eressea.de", "human", "de") local f1 = create_faction('human')
local u1 = unit.create(f1, r0, 1) local u1 = unit.create(f1, r0, 1)
set_order(u1, "PRAEFIX See") set_order(u1, "PRAEFIX See")
@ -1018,7 +1022,7 @@ end
function test_recruit() function test_recruit()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply@eressea.de", "human", "de") local f = create_faction('human')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:add_item("money", 1000) u:add_item("money", 1000)

56
scripts/tests/e2/adamantium.lua Normal file
View File

@ -0,0 +1,56 @@
require "lunit"
module("tests.e2.adamantium", package.seeall, lunit.testcase )
function setup()
eressea.free_game()
eressea.settings.set("nmr.timeout", "0")
eressea.settings.set("rules.food.flags", "4")
eressea.settings.set("rules.ship.storms", "0")
eressea.settings.set("rules.encounters", "0")
end
local function create_faction(race)
return faction.create(race .. '@eressea.de', race, "de")
end
local function _test_create_adamantium()
eressea.settings.set("rules.terraform.all", "1")
local r = region.create(0,0, "mountain")
local f1 = create_faction('human')
local u1 = unit.create(f1, r, 1)
r:set_resource("adamantium", 50)
assert_equal(50, r:get_resource("adamantium"))
return r, u1
end
function test_adamantium1()
local r, u1 = _test_create_adamantium()
u1:add_item("money", 1000)
u1:set_skill("mining", 14)
u1:clear_orders()
u1:add_order("MACHEN Adamantium")
process_orders()
assert_equal(0, u1:get_item("adamantium"))
end
function test_adamantium2()
local r, u1 = _test_create_adamantium()
u1:add_item("money", 1000)
u1:set_skill("mining", 15)
u1:clear_orders()
u1:add_order("MACHEN Adamantium")
local b = building.create(r, "mine")
b.size = 10
u1.building = b
local adamantium = r:get_resource("adamantium")
process_orders()
assert_equal(1, u1:get_item("adamantium"))
assert_equal(adamantium - 1, r:get_resource("adamantium"))
end

1
scripts/tests/e2/init.lua
View File

@ -1,3 +1,4 @@
require 'tests.e2.adamantium'
require 'tests.e2.undead' require 'tests.e2.undead'
require 'tests.e2.shiplanding' require 'tests.e2.shiplanding'
require 'tests.e2.e2features' require 'tests.e2.e2features'

2
src/bind_region.c
View File

@ -330,7 +330,7 @@ static int tolua_region_get_resourcelevel(lua_State * L)
if (rtype != NULL) { if (rtype != NULL) {
const rawmaterial *rm; const rawmaterial *rm;
for (rm = r->resources; rm; rm = rm->next) { for (rm = r->resources; rm; rm = rm->next) {
if (rm->type->rtype == rtype) { if (rm->rtype == rtype) {
lua_pushinteger(L, rm->level); lua_pushinteger(L, rm->level);
return 1; return 1;
} }

8
src/economy.c
View File

@ -1091,7 +1091,7 @@ leveled_allocation(const resource_type * rtype, region * r, allocation * alist)
avail = MIN(avail, nreq); avail = MIN(avail, nreq);
if (need > 0) { if (need > 0) {
int use = 0; int use = 0;
for (al = alist; al; al = al->next) for (al = alist; al; al = al->next) {
if (!fval(al, AFL_DONE)) { if (!fval(al, AFL_DONE)) {
if (avail > 0) { if (avail > 0) {
int want = required(al->want - al->get, al->save); int want = required(al->want - al->get, al->save);
@ -1106,9 +1106,13 @@ leveled_allocation(const resource_type * rtype, region * r, allocation * alist)
al->get = MIN(al->want, al->get + x * al->save.sa[1] / al->save.sa[0]); al->get = MIN(al->want, al->get + x * al->save.sa[1] / al->save.sa[0]);
} }
} }
}
if (use) { if (use) {
rawmaterial_type *raw = rmt_get(rm->rtype);
if (raw && raw->use) {
assert(use <= rm->amount); assert(use <= rm->amount);
rm->type->use(rm, r, use); raw->use(rm, r, use);
}
} }
assert(avail == 0 || nreq == 0); assert(avail == 0 || nreq == 0);
} }

10
src/economy.test.c
View File

@ -382,13 +382,13 @@ static void test_make_item(CuTest *tc) {
rmt_create(rtype); rmt_create(rtype);
rdata = rtype->limit = calloc(1, sizeof(resource_limit)); rdata = rtype->limit = calloc(1, sizeof(resource_limit));
add_resource(u->region, 1, 300, 150, rtype); add_resource(u->region, 1, 300, 150, rtype);
u->region->resources->amount = 300; /* there are 300 stones at level 1 */ CuAssertIntEquals(tc, 300, region_getresource(u->region, rtype));
set_level(u, SK_ALCHEMY, 10); set_level(u, SK_ALCHEMY, 10);
make_item(u, itype, 10); make_item(u, itype, 10);
split_allocations(u->region); split_allocations(u->region);
CuAssertIntEquals(tc, 11, get_item(u, itype)); CuAssertIntEquals(tc, 11, get_item(u, itype));
CuAssertIntEquals(tc, 290, u->region->resources->amount); /* used 10 stones to make 10 stones */ CuAssertIntEquals(tc, 290, region_getresource(u->region, rtype)); /* used 10 stones to make 10 stones */
rdata->modifiers = calloc(2, sizeof(resource_mod)); rdata->modifiers = calloc(2, sizeof(resource_mod));
rdata->modifiers[0].flags = RMF_SAVEMATERIAL; rdata->modifiers[0].flags = RMF_SAVEMATERIAL;
@ -398,18 +398,18 @@ static void test_make_item(CuTest *tc) {
make_item(u, itype, 10); make_item(u, itype, 10);
split_allocations(u->region); split_allocations(u->region);
CuAssertIntEquals(tc, 21, get_item(u, itype)); CuAssertIntEquals(tc, 21, get_item(u, itype));
CuAssertIntEquals(tc, 284, u->region->resources->amount); /* 60% saving = 6 stones make 10 stones */ CuAssertIntEquals(tc, 284, region_getresource(u->region, rtype)); /* 60% saving = 6 stones make 10 stones */
make_item(u, itype, 1); make_item(u, itype, 1);
split_allocations(u->region); split_allocations(u->region);
CuAssertIntEquals(tc, 22, get_item(u, itype)); CuAssertIntEquals(tc, 22, get_item(u, itype));
CuAssertIntEquals(tc, 283, u->region->resources->amount); /* no free lunches */ CuAssertIntEquals(tc, 283, region_getresource(u->region, rtype)); /* no free lunches */
rdata->modifiers[0].value = frac_make(1, 2); rdata->modifiers[0].value = frac_make(1, 2);
make_item(u, itype, 6); make_item(u, itype, 6);
split_allocations(u->region); split_allocations(u->region);
CuAssertIntEquals(tc, 28, get_item(u, itype)); CuAssertIntEquals(tc, 28, get_item(u, itype));
CuAssertIntEquals(tc, 280, u->region->resources->amount); /* 50% saving = 3 stones make 6 stones */ CuAssertIntEquals(tc, 280, region_getresource(u->region, rtype)); /* 50% saving = 3 stones make 6 stones */
rdata->modifiers[0].flags = RMF_REQUIREDBUILDING; rdata->modifiers[0].flags = RMF_REQUIREDBUILDING;
rdata->modifiers[0].race = NULL; rdata->modifiers[0].race = NULL;

23
src/kernel/region.c
View File

@ -823,7 +823,7 @@ void region_setresource(region * r, const resource_type * rtype, int value)
{ {
rawmaterial *rm = r->resources; rawmaterial *rm = r->resources;
while (rm) { while (rm) {
if (rm->type->rtype == rtype) { if (rm->rtype == rtype) {
rm->amount = value; rm->amount = value;
break; break;
} }
@ -837,15 +837,28 @@ void region_setresource(region * r, const resource_type * rtype, int value)
else if (rtype == get_resourcetype(R_HORSE)) else if (rtype == get_resourcetype(R_HORSE))
rsethorses(r, value); rsethorses(r, value);
else { else {
rawmaterial *rm;
if (r->terrain->production) {
int i; int i;
for (i = 0; r->terrain->production[i].type; ++i) { for (i = 0; r->terrain->production[i].type; ++i) {
const terrain_production *production = r->terrain->production + i; const terrain_production *production = r->terrain->production + i;
if (production->type == rtype) { if (production->type == rtype) {
add_resource(r, 1, value, dice_rand(production->divisor), rtype); add_resource(r, 1, value, dice_rand(production->divisor), rtype);
break; return;
} }
} }
} }
/* adamantium etc are not usually terraformed: */
for (rm = r->resources; rm; rm = rm->next) {
if (rm->rtype == rtype) {
rm->amount = value;
return;
}
}
if (!rm) {
add_resource(r, 1, value, 150, rtype);
}
}
} }
} }
@ -853,7 +866,7 @@ int region_getresource(const region * r, const resource_type * rtype)
{ {
const rawmaterial *rm; const rawmaterial *rm;
for (rm = r->resources; rm; rm = rm->next) { for (rm = r->resources; rm; rm = rm->next) {
if (rm->type->rtype == rtype) { if (rm->rtype == rtype) {
return rm->amount; return rm->amount;
} }
} }
@ -1044,8 +1057,8 @@ void terraform_region(region * r, const terrain_type * terrain)
if (terrain->production != NULL) { if (terrain->production != NULL) {
int i; int i;
for (i = 0; terrain->production[i].type; ++i) { for (i = 0; terrain->production[i].type; ++i) {
if (rm->type->rtype == terrain->production[i].type) { if (rm->rtype == terrain->production[i].type) {
rtype = rm->type->rtype; rtype = rm->rtype;
break; break;
} }
} }

27
src/kernel/region.test.c
View File

@ -1,6 +1,7 @@
#include <platform.h> #include <platform.h>
#include "region.h" #include "region.h"
#include "resources.h"
#include "building.h" #include "building.h"
#include "unit.h" #include "unit.h"
#include "terrain.h" #include "terrain.h"
@ -52,10 +53,36 @@ static void test_region_get_owner(CuTest *tc) {
test_cleanup(); test_cleanup();
} }
static void test_region_getset_resource(CuTest *tc) {
region *r;
item_type *itype;
test_setup();
init_resources();
itype = test_create_itemtype("iron");
itype->construction = calloc(1, sizeof(construction));
rmt_create(itype->rtype);
r = test_create_region(0, 0, NULL);
region_setresource(r, itype->rtype, 50);
CuAssertIntEquals(tc, 50, region_getresource(r, itype->rtype));
region_setresource(r, get_resourcetype(R_HORSE), 10);
CuAssertIntEquals(tc, 10, region_getresource(r, get_resourcetype(R_HORSE)));
CuAssertIntEquals(tc, 10, rhorses(r));
region_setresource(r, get_resourcetype(R_PEASANT), 10);
CuAssertIntEquals(tc, 10, region_getresource(r, get_resourcetype(R_PEASANT)));
CuAssertIntEquals(tc, 10, rpeasants(r));
test_cleanup();
}
CuSuite *get_region_suite(void) CuSuite *get_region_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_terraform); SUITE_ADD_TEST(suite, test_terraform);
SUITE_ADD_TEST(suite, test_region_getset_resource);
SUITE_ADD_TEST(suite, test_region_get_owner); SUITE_ADD_TEST(suite, test_region_get_owner);
return suite; return suite;
} }

32
src/kernel/resources.c
View File

@ -36,8 +36,10 @@ void update_resources(region * r)
{ {
struct rawmaterial *res = r->resources; struct rawmaterial *res = r->resources;
while (res) { while (res) {
if (res->type->update) struct rawmaterial_type *raw = rmt_get(res->rtype);
res->type->update(res, r); if (raw && raw->update) {
raw->update(res, r);
}
res = res->next; res = res->next;
} }
} }
@ -55,7 +57,7 @@ static void update_resource(struct rawmaterial *res, double modifier)
assert(res->amount > 0); assert(res->amount > 0);
} }
void struct rawmaterial *
add_resource(region * r, int level, int base, int divisor, add_resource(region * r, int level, int base, int divisor,
const resource_type * rtype) const resource_type * rtype)
{ {
@ -66,11 +68,11 @@ const resource_type * rtype)
rm->level = level; rm->level = level;
rm->startlevel = level; rm->startlevel = level;
rm->base = base; rm->base = base;
rm->amount = base;
rm->divisor = divisor; rm->divisor = divisor;
rm->flags = 0; rm->flags = 0;
rm->type = rmt_get(rtype); rm->rtype = rtype;
update_resource(rm, 1.0); return rm;
rm->type->terraform(rm, r);
} }
void terraform_resources(region * r) void terraform_resources(region * r)
@ -87,7 +89,7 @@ void terraform_resources(region * r)
const resource_type *rtype = production->type; const resource_type *rtype = production->type;
for (rm = r->resources; rm; rm = rm->next) { for (rm = r->resources; rm; rm = rm->next) {
if (rm->type->rtype == rtype) if (rm->rtype == rtype)
break; break;
} }
if (rm) { if (rm) {
@ -95,9 +97,16 @@ void terraform_resources(region * r)
} }
if (terraform_all || chance(production->chance)) { if (terraform_all || chance(production->chance)) {
add_resource(r, dice_rand(production->startlevel), rawmaterial *rm;
rawmaterial_type *raw;
rm = add_resource(r, dice_rand(production->startlevel),
dice_rand(production->base), dice_rand(production->divisor), dice_rand(production->base), dice_rand(production->divisor),
production->type); production->type);
update_resource(rm, 1.0);
raw = rmt_get(rm->rtype);
if (raw && raw->terraform) {
raw->terraform(rm, r);
}
} }
} }
} }
@ -142,7 +151,7 @@ static int visible_default(const rawmaterial * res, int skilllevel)
/* resources are visible, if skill equals minimum skill to mine them /* resources are visible, if skill equals minimum skill to mine them
* plus current level of difficulty */ * plus current level of difficulty */
{ {
const struct item_type *itype = res->type->rtype->itype; const struct item_type *itype = res->rtype->itype;
if (res->level <= 1 if (res->level <= 1
&& res->level + itype->construction->minskill <= skilllevel + 1) { && res->level + itype->construction->minskill <= skilllevel + 1) {
assert(res->amount > 0); assert(res->amount > 0);
@ -166,7 +175,7 @@ static void use_default(rawmaterial * res, const region * r, int amount)
int i; int i;
for (i = 0; r->terrain->production[i].type; ++i) { for (i = 0; r->terrain->production[i].type; ++i) {
if (res->type->rtype == r->terrain->production[i].type) if (res->rtype == r->terrain->production[i].type)
break; break;
} }
@ -178,8 +187,9 @@ static void use_default(rawmaterial * res, const region * r, int amount)
struct rawmaterial *rm_get(region * r, const struct resource_type *rtype) struct rawmaterial *rm_get(region * r, const struct resource_type *rtype)
{ {
struct rawmaterial *rm = r->resources; struct rawmaterial *rm = r->resources;
while (rm && rm->type->rtype != rtype) while (rm && rm->rtype != rtype) {
rm = rm->next; rm = rm->next;
}
return rm; return rm;
} }

6
src/kernel/resources.h
View File

@ -24,7 +24,7 @@ extern "C" {
}; };
typedef struct rawmaterial { typedef struct rawmaterial {
const struct rawmaterial_type *type; const struct resource_type *rtype;
#ifdef LOMEM #ifdef LOMEM
int amount:16; int amount:16;
int level:8; int level:8;
@ -79,8 +79,8 @@ extern "C" {
struct rawmaterial_type *rmt_find(const char *str); struct rawmaterial_type *rmt_find(const char *str);
struct rawmaterial_type *rmt_get(const struct resource_type *); struct rawmaterial_type *rmt_get(const struct resource_type *);
void add_resource(struct region *r, int level, int base, int divisor, struct rawmaterial *add_resource(struct region *r, int level,
const struct resource_type *rtype); int base, int divisor, const struct resource_type *rtype);
struct rawmaterial_type *rmt_create(struct resource_type *rtype); struct rawmaterial_type *rmt_create(struct resource_type *rtype);
#ifdef __cplusplus #ifdef __cplusplus

8
src/kernel/save.c
View File

@ -955,11 +955,11 @@ static region *readregion(struct gamedata *data, int x, int y)
if (strcmp(name, "end") == 0) if (strcmp(name, "end") == 0)
break; break;
res = malloc(sizeof(rawmaterial)); res = malloc(sizeof(rawmaterial));
res->type = rmt_find(name); res->rtype = rt_find(name);
if (res->type == NULL) { if (!res->rtype || !res->rtype->raw) {
log_error("invalid resourcetype %s in data.", name); log_error("invalid resourcetype %s in data.", name);
} }
assert(res->type != NULL); assert(res->rtype);
READ_INT(data->store, &n); READ_INT(data->store, &n);
res->level = n; res->level = n;
READ_INT(data->store, &n); READ_INT(data->store, &n);
@ -1068,7 +1068,7 @@ void writeregion(struct gamedata *data, const region * r)
WRITE_INT(data->store, rhorses(r)); WRITE_INT(data->store, rhorses(r));
while (res) { while (res) {
WRITE_TOK(data->store, res->type->rtype->_name); WRITE_TOK(data->store, res->rtype->_name);
WRITE_INT(data->store, res->level); WRITE_INT(data->store, res->level);
WRITE_INT(data->store, res->amount); WRITE_INT(data->store, res->amount);
WRITE_INT(data->store, res->startlevel); WRITE_INT(data->store, res->startlevel);

14
src/modules/autoseed.c
View File

@ -81,20 +81,6 @@ const terrain_type *random_terrain(const terrain_type * terrains[],
return terrain; return terrain;
} }
int seed_adamantium(region * r, int base)
{
const resource_type *rtype = rt_find("adamantium");
rawmaterial *rm;
for (rm = r->resources; rm; rm = rm->next) {
if (rm->type->rtype == rtype)
break;
}
if (!rm) {
add_resource(r, 1, base, 150, rtype);
}
return 0;
}
static int count_demand(const region * r) static int count_demand(const region * r)
{ {
struct demand *dmd; struct demand *dmd;

3
src/report.test.c
View File

@ -95,8 +95,7 @@ static void test_report_region(CuTest *tc) {
mstream_init(&out); mstream_init(&out);
r = test_create_region(0, 0, 0); r = test_create_region(0, 0, 0);
add_resource(r, 1, 100, 10, rt_stone); add_resource(r, 1, 135, 10, rt_stone);
r->resources->amount = 135;
CuAssertIntEquals(tc, 1, r->resources->level); CuAssertIntEquals(tc, 1, r->resources->level);
r->land->peasants = 5; r->land->peasants = 5;
r->land->horses = 7; r->land->horses = 7;

9
src/reports.c
View File

@ -448,12 +448,13 @@ const faction * viewer, bool see_unit)
rawmaterial *res = r->resources; rawmaterial *res = r->resources;
while (res) { while (res) {
int maxskill = 0; int maxskill = 0;
const item_type *itype = resource2item(res->type->rtype); const item_type *itype = resource2item(res->rtype);
int minskill = itype->construction->minskill; int minskill = itype->construction->minskill;
skill_t skill = itype->construction->skill; skill_t skill = itype->construction->skill;
int level = res->level + minskill - 1; int level = res->level + minskill - 1;
int visible = -1; int visible = -1;
if (res->type->visible == NULL) { rawmaterial_type *raw = rmt_get(res->rtype);
if (raw->visible == NULL) {
visible = res->amount; visible = res->amount;
level = res->level + minskill - 1; level = res->level + minskill - 1;
} }
@ -464,7 +465,7 @@ const faction * viewer, bool see_unit)
int s = effskill(u, skill, 0); int s = effskill(u, skill, 0);
if (s > maxskill) { if (s > maxskill) {
maxskill = s; maxskill = s;
visible = res->type->visible(res, maxskill); visible = raw->visible(res, maxskill);
} }
} }
} }
@ -472,7 +473,7 @@ const faction * viewer, bool see_unit)
if (level >= 0 && visible >= 0) { if (level >= 0 && visible >= 0) {
if (n >= size) if (n >= size)
return -1; return -1;
report_resource(result + n, res->type->rtype, visible, level); report_resource(result + n, res->rtype, visible, level);
n++; n++;
} }
res = res->next; res = res->next;