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

Merge pull request #881 from ennorehling/develop 

More bugfixes for ships
This commit is contained in:
Enno Rehling 2019-10-27 11:04:59 +01:00 committed by GitHub
parent bec38f544b 7f57aa2a18
commit c3ad20a569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 188 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/e3a/races.xml
View File

@ -703,8 +703,8 @@
<race name="undead" maxaura="1" regaura="1" weight="1000" <race name="undead" maxaura="1" regaura="1" weight="1000"
capacity="540" speed="1.0" hp="20" damage="1d7" unarmedattack="0" capacity="540" speed="1.0" hp="20" damage="1d7" unarmedattack="0"
unarmeddefense="0" attackmodifier="1" defensemodifier="1" unarmeddefense="0" attackmodifier="1" defensemodifier="1"
walk="yes" learn="no" teach="no" noheal="yes" walk="yes" learn="no" teach="no" noheal="yes" desert="yes"
undead="yes" equipment="yes" giveperson="yes"> undead="yes" equipment="yes" giveperson="yes" unarmedguard="yes">
<ai splitsize="20000" moverandom="yes" scarepeasants="yes"/> <ai splitsize="20000" moverandom="yes" scarepeasants="yes"/>
<attack type="4" damage="1d7"/> <attack type="4" damage="1d7"/>
<attack type="5"/> <attack type="5"/>
@ -801,7 +801,7 @@
<attack type="1" damage="1d7"/> <attack type="1" damage="1d7"/>
</race> </race>
<race name="skeletonlord" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes"> <race name="skeletonlord" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" walk="yes" learn="no" teach="no" noheal="yes" desert="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes" unarmedguard="yes">
<ai splitsize="2000" killpeasants="yes" scarepeasants="yes" moverandom="yes" absorbpeasants="yes"/> <ai splitsize="2000" killpeasants="yes" scarepeasants="yes" moverandom="yes" absorbpeasants="yes"/>
<skill name="crossbow" modifier="1"/> <skill name="crossbow" modifier="1"/>
<skill name="bow" modifier="1"/> <skill name="bow" modifier="1"/>
@ -816,7 +816,7 @@
<attack type="1" damage="1d7"/> <attack type="1" damage="1d7"/>
</race> </race>
<race name="skeleton" magres="10" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes"> <race name="skeleton" magres="10" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes" unarmedguard="yes">
<ai splitsize="10000" killpeasants="yes" scarepeasants="yes" moverandom="yes"/> <ai splitsize="10000" killpeasants="yes" scarepeasants="yes" moverandom="yes"/>
<skill name="crossbow" modifier="1"/> <skill name="crossbow" modifier="1"/>
<skill name="bow" modifier="1"/> <skill name="bow" modifier="1"/>

6
res/eressea/races.xml
View File

@ -732,7 +732,7 @@
<attack type="4" damage="1d30"/> <attack type="4" damage="1d30"/>
<attack type="6" spell="fiery_dragonbreath" level="3" /> <attack type="6" spell="fiery_dragonbreath" level="3" />
</race> </race>
<race name="undead" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d7" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" giveperson="yes"> <race name="undead" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d7" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" walk="yes" learn="no" teach="no" noheal="yes" desert="yes" undead="yes" equipment="yes" giveperson="yes" unarmedguard="yes">
<ai splitsize="20000" moverandom="yes" scarepeasants="yes"/> <ai splitsize="20000" moverandom="yes" scarepeasants="yes"/>
<attack type="4" damage="1d7"/> <attack type="4" damage="1d7"/>
<attack type="5"/> <attack type="5"/>
@ -1044,7 +1044,7 @@
<skill name="unarmed" modifier="1"/> <skill name="unarmed" modifier="1"/>
<attack type="1" damage="1d7"/> <attack type="1" damage="1d7"/>
</race> </race>
<race name="skeletonlord" magres="30" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes"> <race name="skeletonlord" magres="30" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes" unarmedguard="yes">
<ai splitsize="2000" absorbpeasants="yes" killpeasants="yes" moverandom="yes" scarepeasants="yes"/> <ai splitsize="2000" absorbpeasants="yes" killpeasants="yes" moverandom="yes" scarepeasants="yes"/>
<skill name="crossbow" modifier="1"/> <skill name="crossbow" modifier="1"/>
<skill name="bow" modifier="1"/> <skill name="bow" modifier="1"/>
@ -1058,7 +1058,7 @@
<attack type="1" damage="1d7"/> <attack type="1" damage="1d7"/>
<attack type="1" damage="1d7"/> <attack type="1" damage="1d7"/>
</race> </race>
<race name="skeleton" magres="10" maxaura="1.000000" regaura="1.000000" weight="500" capacity="540" speed="1.000000" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes"> <race name="skeleton" magres="10" maxaura="1.000000" regaura="1.000000" weight="500" capacity="540" speed="1.000000" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" desert="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes" unarmedguard="yes">
<ai splitsize="10000" killpeasants="yes" moverandom="yes" scarepeasants="yes"/> <ai splitsize="10000" killpeasants="yes" moverandom="yes" scarepeasants="yes"/>
<skill name="crossbow" modifier="1"/> <skill name="crossbow" modifier="1"/>
<skill name="bow" modifier="1"/> <skill name="bow" modifier="1"/>

64
scripts/tests/e2/ships.lua
View File

@ -312,7 +312,6 @@ function test_give_ship_compatible_coasts()
assert_equal(1, u1.ship.number) assert_equal(1, u1.ship.number)
assert_equal(4, u2.ship.number) assert_equal(4, u2.ship.number)
assert_equal(2, u2.ship.coast) assert_equal(2, u2.ship.coast)
end end
function test_give_ship_only_from_captain() function test_give_ship_only_from_captain()
@ -453,3 +452,66 @@ function test_no_speedsail_on_convoy()
process_orders() process_orders()
assert_equal(nil, sh:get_curse('shipspeedup')) assert_equal(nil, sh:get_curse('shipspeedup'))
end end
function test_build_ship()
local r = region.create(1, 0, 'plain')
local f = faction.create("insect")
local u = unit.create(f, r, 25)
local sh = ship.create(r, 'longboat')
u.ship = sh
sh.size = 25
u:set_skill('shipcraft', 1)
u:add_item("log", 50)
u:add_order("MACHE SCHIFF " .. itoa36(sh.id))
process_orders()
assert_equal(50, sh.size)
assert_equal(25, u:get_item('log'))
end
function test_build_convoy()
local r = region.create(1, 0, 'plain')
local f = faction.create("insect")
local u = unit.create(f, r, 50)
local sh = ship.create(r, 'longboat')
u.ship = sh
sh.number = 2
sh.size = 25
u:set_skill('shipcraft', 1)
u:add_item("log", 100)
u:add_order("MACHE SCHIFF " .. itoa36(sh.id))
process_orders()
assert_equal(75, sh.size)
assert_equal(50, u:get_item('log'))
end
function test_repair_convoy()
local r = region.create(1, 0, 'plain')
local f = faction.create("insect")
local u = unit.create(f, r, 50)
local sh = ship.create(r, 'longboat')
u.ship = sh
sh.number = 2
sh.damage = 7500 -- 75 Holz
u:set_skill('shipcraft', 1)
u:add_item("log", 100)
u:add_order("MACHE SCHIFF " .. itoa36(sh.id))
process_orders()
assert_equal(2500, sh.damage)
assert_equal(50, u:get_item('log'))
end
function test_build_convoy_max()
local r = region.create(1, 0, 'plain')
local f = faction.create("insect")
local u = unit.create(f, r, 100)
local sh = ship.create(r, 'longboat')
u.ship = sh
sh.number = 2
sh.size = 25
u:set_skill('shipcraft', 1)
u:add_item("log", 100)
u:add_order("MACHE SCHIFF " .. itoa36(sh.id))
process_orders()
assert_equal(100, sh.size)
assert_equal(25, u:get_item('log'))
end

3
src/creport.c
View File

@ -700,8 +700,7 @@ static void cr_output_ship(struct stream *out, const ship *sh, const unit *u,
stream_printf(out, "%d;Anzahl\n", sh->number); stream_printf(out, "%d;Anzahl\n", sh->number);
stream_printf(out, "%d;Groesse\n", sh->size); stream_printf(out, "%d;Groesse\n", sh->size);
if (sh->damage) { if (sh->damage) {
int percent = int percent = ship_damage_percent(sh);
(sh->damage * 100 + DAMAGE_SCALE - 1) / (sh->size * DAMAGE_SCALE);
stream_printf(out, "%d;Schaden\n", percent); stream_printf(out, "%d;Schaden\n", percent);
} }
if (u) { if (u) {

9
src/economy.c
View File

@ -509,7 +509,7 @@ static void manufacture(unit * u, const item_type * itype, int want)
if (want == 0) { if (want == 0) {
want = maxbuild(u, itype->construction); want = maxbuild(u, itype->construction);
} }
n = build(u, itype->construction, 0, want, skill_mod); n = build(u, 1, itype->construction, 0, want, skill_mod);
switch (n) { switch (n) {
case ENEEDSKILL: case ENEEDSKILL:
ADDMSG(&u->faction->msgs, ADDMSG(&u->faction->msgs,
@ -607,9 +607,8 @@ static void allocate_resource(unit * u, const resource_type * rtype, int want)
if (itype->rtype && (itype->rtype == get_resourcetype(R_IRON) || itype->rtype == rt_find("laen"))) { if (itype->rtype && (itype->rtype == get_resourcetype(R_IRON) || itype->rtype == rt_find("laen"))) {
unit *u2; unit *u2;
for (u2 = r->units; u2; u2 = u2->next) { for (u2 = r->units; u2; u2 = u2->next) {
if (is_guard(u) if (!fval(u2, UFL_ISNEW) && u2->number
&& !fval(u2, UFL_ISNEW) && is_guard(u2) && !alliedunit(u2, u->faction, HELP_GUARD)) {
&& u2->number && !alliedunit(u2, u->faction, HELP_GUARD)) {
ADDMSG(&u->faction->msgs, ADDMSG(&u->faction->msgs,
msg_feedback(u, u->thisorder, "region_guarded", "guard", u2)); msg_feedback(u, u->thisorder, "region_guarded", "guard", u2));
return; return;
@ -851,7 +850,7 @@ static void create_potion(unit * u, const item_type * itype, int want)
if (want == 0) { if (want == 0) {
want = maxbuild(u, itype->construction); want = maxbuild(u, itype->construction);
} }
built = build(u, itype->construction, 0, want, 0); built = build(u, 1, itype->construction, 0, want, 0);
switch (built) { switch (built) {
case ELOWSKILL: case ELOWSKILL:
case ENEEDSKILL: case ENEEDSKILL:

34
src/kernel/build.c
View File

@ -224,7 +224,7 @@ int destroy_cmd(unit * u, struct order *ord)
return 14; return 14;
} }
if (n >= (sh->size * 100) / sh->type->construction->maxsize) { if (n >= (sh->size * 100) / ship_maxsize(sh)) {
/* destroy completly */ /* destroy completly */
/* all units leave the ship */ /* all units leave the ship */
for (u2 = r->units; u2; u2 = u2->next) { for (u2 = r->units; u2; u2 = u2->next) {
@ -239,7 +239,7 @@ int destroy_cmd(unit * u, struct order *ord)
} }
else { else {
/* partial destroy */ /* partial destroy */
sh->size -= (sh->type->construction->maxsize * n) / 100; sh->size -= (ship_maxsize(sh) * n) / 100;
ADDMSG(&u->faction->msgs, msg_message("shipdestroy_partial", ADDMSG(&u->faction->msgs, msg_message("shipdestroy_partial",
"unit region ship", u, r, sh)); "unit region ship", u, r, sh));
} }
@ -509,9 +509,9 @@ int build_skill(unit *u, int basesk, int skill_mod) {
* of the first object have already been finished. return the * of the first object have already been finished. return the
* actual size that could be built. * actual size that could be built.
*/ */
static int build_limited(unit * u, const construction * con, int completed, int want, int basesk, int *skill_total) { static int build_limited(unit * u, const construction * con, int completed, int number, int want, int basesk, int *skill_total) {
int skills = *skill_total; int skills = *skill_total;
int made = 0; int made = 0, maxsize = con->maxsize * number;
if (want <= 0) { if (want <= 0) {
return 0; return 0;
@ -519,7 +519,7 @@ static int build_limited(unit * u, const construction * con, int completed, int
if (con == NULL) { if (con == NULL) {
return ENOMATERIALS; return ENOMATERIALS;
} }
if (completed == con->maxsize) { if (completed == maxsize) {
return ECOMPLETE; return ECOMPLETE;
} }
for (; want > 0 && skills > 0;) { for (; want > 0 && skills > 0;) {
@ -530,8 +530,8 @@ static int build_limited(unit * u, const construction * con, int completed, int
* (enno): Nein, das ist fuer Dinge, bei denen die naechste Ausbaustufe * (enno): Nein, das ist fuer Dinge, bei denen die naechste Ausbaustufe
* die gleiche wie die vorherige ist. z.b. Gegenstaende. * die gleiche wie die vorherige ist. z.b. Gegenstaende.
*/ */
if (con->maxsize > 0) { if (maxsize > 0) {
completed = completed % con->maxsize; completed = completed % (maxsize);
} }
else { else {
completed = 0; completed = 0;
@ -566,8 +566,8 @@ static int build_limited(unit * u, const construction * con, int completed, int
if (want < n) n = want; if (want < n) n = want;
if (con->maxsize > 0) { if (maxsize > 0) {
int req = con->maxsize - completed; int req = maxsize - completed;
if (req < n) n = req; if (req < n) n = req;
want = n; want = n;
} }
@ -592,11 +592,12 @@ static int build_limited(unit * u, const construction * con, int completed, int
return made; return made;
} }
int build(unit * u, const construction * con, int completed, int want, int skill_mod) int build(unit * u, int number, const construction * con, int completed, int want, int skill_mod)
{ {
int skills = INT_MAX; /* number of skill points remainig */ int skills = INT_MAX; /* number of skill points remainig */
int made, basesk = 0; int made, basesk = 0;
assert(number >= 1);
assert(con->skill != NOSKILL); assert(con->skill != NOSKILL);
basesk = effskill(u, con->skill, NULL); basesk = effskill(u, con->skill, NULL);
if (basesk == 0) { if (basesk == 0) {
@ -604,7 +605,7 @@ int build(unit * u, const construction * con, int completed, int want, int skill
} }
skills = build_skill(u, basesk, skill_mod); skills = build_skill(u, basesk, skill_mod);
made = build_limited(u, con, completed, want, basesk, &skills); made = build_limited(u, con, completed, number, want, basesk, &skills);
/* Nur soviel PRODUCEEXP wie auch tatsaechlich gemacht wurde */ /* Nur soviel PRODUCEEXP wie auch tatsaechlich gemacht wurde */
if (made > 0) { if (made > 0) {
produceexp(u, con->skill, (made < u->number) ? made : u->number); produceexp(u, con->skill, (made < u->number) ? made : u->number);
@ -698,7 +699,7 @@ static int build_stages(unit *u, const building_type *btype, int built, int n, i
want = todo; want = todo;
} }
} }
err = build_limited(u, con, built, want, basesk, skill_total); err = build_limited(u, con, 1, built, want, basesk, skill_total);
if (err < 0) { if (err < 0) {
if (made == 0) { if (made == 0) {
/* could not make any part at all */ /* could not make any part at all */
@ -904,9 +905,9 @@ static void build_ship(unit * u, ship * sh, int want)
const construction *construction = sh->type->construction; const construction *construction = sh->type->construction;
int size = (sh->size * DAMAGE_SCALE - sh->damage) / DAMAGE_SCALE; int size = (sh->size * DAMAGE_SCALE - sh->damage) / DAMAGE_SCALE;
int n; int n;
int can = build(u, construction, size, want, 0); int can = build(u, sh->number, construction, size, want, 0);
if ((n = construction->maxsize - sh->size) > 0 && can > 0) { if ((n = ship_maxsize(sh) - sh->size) > 0 && can > 0) {
if (can >= n) { if (can >= n) {
sh->size += n; sh->size += n;
can -= n; can -= n;
@ -1000,11 +1001,12 @@ void continue_ship(unit * u, int want)
cmistake(u, u->thisorder, 20, MSG_PRODUCE); cmistake(u, u->thisorder, 20, MSG_PRODUCE);
return; return;
} }
cons = sh->type->construction; msize = ship_maxsize(sh);
if (sh->size == cons->maxsize && !sh->damage) { if (sh->size >= msize && !sh->damage) {
cmistake(u, u->thisorder, 16, MSG_PRODUCE); cmistake(u, u->thisorder, 16, MSG_PRODUCE);
return; return;
} }
cons = sh->type->construction;
if (effskill(u, cons->skill, NULL) < cons->minskill) { if (effskill(u, cons->skill, NULL) < cons->minskill) {
ADDMSG(&u->faction->msgs, msg_feedback(u, u->thisorder, ADDMSG(&u->faction->msgs, msg_feedback(u, u->thisorder,
"error_build_skill_low", "value", cons->minskill)); "error_build_skill_low", "value", cons->minskill));

2
src/kernel/build.h
View File

@ -44,7 +44,7 @@ extern "C" {
void sunhash(struct ship *sh); void sunhash(struct ship *sh);
int roqf_factor(void); int roqf_factor(void);
int build(struct unit *u, const construction * ctype, int completed, int want, int skill_mod); int build(struct unit *u, int number, const construction * ctype, int completed, int want, int skill_mod);
int maxbuild(const struct unit *u, const construction * cons); int maxbuild(const struct unit *u, const construction * cons);
struct message *msg_materials_required(struct unit *u, struct order *ord, struct message *msg_materials_required(struct unit *u, struct order *ord,
const struct construction *ctype, int multi); const struct construction *ctype, int multi);

24
src/kernel/build.test.c
View File

@ -145,10 +145,10 @@ static void test_build_requires_materials(CuTest *tc) {
u = setup_build(&bf); u = setup_build(&bf);
set_level(u, SK_ARMORER, 2); set_level(u, SK_ARMORER, 2);
CuAssertIntEquals(tc, ENOMATERIALS, build(u, &bf.cons, 0, 1, 0)); CuAssertIntEquals(tc, ENOMATERIALS, build(u, 1, &bf.cons, 0, 1, 0));
itype = bf.cons.materials[0].rtype->itype; itype = bf.cons.materials[0].rtype->itype;
i_change(&u->items, itype, 2); i_change(&u->items, itype, 2);
CuAssertIntEquals(tc, 1, build(u, &bf.cons, 0, 1, 0)); CuAssertIntEquals(tc, 1, build(u, 1, &bf.cons, 0, 1, 0));
CuAssertIntEquals(tc, 1, i_get(u->items, itype)); CuAssertIntEquals(tc, 1, i_get(u->items, itype));
teardown_build(&bf); teardown_build(&bf);
} }
@ -161,7 +161,7 @@ static void test_build_failure_missing_skill(CuTest *tc) {
u = setup_build(&bf); u = setup_build(&bf);
rtype = bf.cons.materials[0].rtype; rtype = bf.cons.materials[0].rtype;
i_change(&u->items, rtype->itype, 1); i_change(&u->items, rtype->itype, 1);
CuAssertIntEquals(tc, ENEEDSKILL, build(u, &bf.cons, 1, 1, 0)); CuAssertIntEquals(tc, ENEEDSKILL, build(u, 1, &bf.cons, 1, 1, 0));
teardown_build(&bf); teardown_build(&bf);
} }
@ -174,7 +174,7 @@ static void test_build_failure_low_skill(CuTest *tc) {
rtype = bf.cons.materials[0].rtype; rtype = bf.cons.materials[0].rtype;
i_change(&u->items, rtype->itype, 1); i_change(&u->items, rtype->itype, 1);
set_level(u, SK_ARMORER, bf.cons.minskill - 1); set_level(u, SK_ARMORER, bf.cons.minskill - 1);
CuAssertIntEquals(tc, ELOWSKILL, build(u, &bf.cons, 0, 10, 0)); CuAssertIntEquals(tc, ELOWSKILL, build(u, 1, &bf.cons, 0, 10, 0));
teardown_build(&bf); teardown_build(&bf);
} }
@ -188,7 +188,7 @@ static void test_build_failure_completed(CuTest *tc) {
i_change(&u->items, rtype->itype, 1); i_change(&u->items, rtype->itype, 1);
set_level(u, SK_ARMORER, bf.cons.minskill); set_level(u, SK_ARMORER, bf.cons.minskill);
bf.cons.maxsize = 1; bf.cons.maxsize = 1;
CuAssertIntEquals(tc, ECOMPLETE, build(u, &bf.cons, bf.cons.maxsize, 10, 0)); CuAssertIntEquals(tc, ECOMPLETE, build(u, 1, &bf.cons, bf.cons.maxsize, 10, 0));
CuAssertIntEquals(tc, 1, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 1, i_get(u->items, rtype->itype));
teardown_build(&bf); teardown_build(&bf);
} }
@ -203,19 +203,19 @@ static void test_build_limits(CuTest *tc) {
assert(rtype); assert(rtype);
i_change(&u->items, rtype->itype, 1); i_change(&u->items, rtype->itype, 1);
set_level(u, SK_ARMORER, bf.cons.minskill); set_level(u, SK_ARMORER, bf.cons.minskill);
CuAssertIntEquals(tc, 1, build(u, &bf.cons, 0, 10, 0)); CuAssertIntEquals(tc, 1, build(u, 1, &bf.cons, 0, 10, 0));
CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype));
scale_number(u, 2); scale_number(u, 2);
set_level(u, SK_ARMORER, bf.cons.minskill); set_level(u, SK_ARMORER, bf.cons.minskill);
i_change(&u->items, rtype->itype, 2); i_change(&u->items, rtype->itype, 2);
CuAssertIntEquals(tc, 2, build(u, &bf.cons, 0, 10, 0)); CuAssertIntEquals(tc, 2, build(u, 1, &bf.cons, 0, 10, 0));
CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype));
scale_number(u, 2); scale_number(u, 2);
set_level(u, SK_ARMORER, bf.cons.minskill * 2); set_level(u, SK_ARMORER, bf.cons.minskill * 2);
i_change(&u->items, rtype->itype, 4); i_change(&u->items, rtype->itype, 4);
CuAssertIntEquals(tc, 4, build(u, &bf.cons, 0, 10, 0)); CuAssertIntEquals(tc, 4, build(u, 1, &bf.cons, 0, 10, 0));
CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype));
teardown_build(&bf); teardown_build(&bf);
} }
@ -234,7 +234,7 @@ static void test_build_with_ring(CuTest *tc) {
set_level(u, SK_ARMORER, bf.cons.minskill); set_level(u, SK_ARMORER, bf.cons.minskill);
i_change(&u->items, rtype->itype, 20); i_change(&u->items, rtype->itype, 20);
i_change(&u->items, ring, 1); i_change(&u->items, ring, 1);
CuAssertIntEquals(tc, 10, build(u, &bf.cons, 0, 20, 0)); CuAssertIntEquals(tc, 10, build(u, 1, &bf.cons, 0, 20, 0));
CuAssertIntEquals(tc, 10, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 10, i_get(u->items, rtype->itype));
teardown_build(&bf); teardown_build(&bf);
} }
@ -253,16 +253,16 @@ static void test_build_with_potion(CuTest *tc) {
i_change(&u->items, rtype->itype, 20); i_change(&u->items, rtype->itype, 20);
change_effect(u, ptype, 4); change_effect(u, ptype, 4);
set_level(u, SK_ARMORER, bf.cons.minskill); set_level(u, SK_ARMORER, bf.cons.minskill);
CuAssertIntEquals(tc, 2, build(u, &bf.cons, 0, 20, 0)); CuAssertIntEquals(tc, 2, build(u, 1, &bf.cons, 0, 20, 0));
CuAssertIntEquals(tc, 18, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 18, i_get(u->items, rtype->itype));
CuAssertIntEquals(tc, 3, get_effect(u, ptype)); CuAssertIntEquals(tc, 3, get_effect(u, ptype));
set_level(u, SK_ARMORER, bf.cons.minskill * 2); set_level(u, SK_ARMORER, bf.cons.minskill * 2);
CuAssertIntEquals(tc, 4, build(u, &bf.cons, 0, 20, 0)); CuAssertIntEquals(tc, 4, build(u, 1, &bf.cons, 0, 20, 0));
CuAssertIntEquals(tc, 2, get_effect(u, ptype)); CuAssertIntEquals(tc, 2, get_effect(u, ptype));
set_level(u, SK_ARMORER, bf.cons.minskill); set_level(u, SK_ARMORER, bf.cons.minskill);
scale_number(u, 2); /* OBS: this scales the effects, too: */ scale_number(u, 2); /* OBS: this scales the effects, too: */
CuAssertIntEquals(tc, 4, get_effect(u, ptype)); CuAssertIntEquals(tc, 4, get_effect(u, ptype));
CuAssertIntEquals(tc, 4, build(u, &bf.cons, 0, 20, 0)); CuAssertIntEquals(tc, 4, build(u, 1, &bf.cons, 0, 20, 0));
CuAssertIntEquals(tc, 2, get_effect(u, ptype)); CuAssertIntEquals(tc, 2, get_effect(u, ptype));
teardown_build(&bf); teardown_build(&bf);
} }

25
src/kernel/ship.c
View File

@ -373,10 +373,15 @@ const char *shipname(const ship * sh)
return write_shipname(sh, ibuf, sizeof(idbuf[0])); return write_shipname(sh, ibuf, sizeof(idbuf[0]));
} }
int ship_maxsize(const ship *sh)
{
return sh->number * sh->type->construction->maxsize;
}
bool ship_finished(const ship *sh) bool ship_finished(const ship *sh)
{ {
if (sh->type->construction) { if (sh->type->construction) {
return (sh->size >= sh->number * sh->type->construction->maxsize); return (sh->size >= ship_maxsize(sh));
} }
return true; return true;
} }
@ -402,22 +407,19 @@ int crew_skill(const ship *sh) {
} }
bool ship_crewed(const ship *sh) { bool ship_crewed(const ship *sh) {
unit *u; unit *u, *cap = ship_owner(sh);
int capskill = -1, sumskill = 0; int capskill = -1, sumskill = 0;
for (u = sh->region->units; u; u = u->next) { for (u = sh->region->units; u; u = u->next) {
if (u->ship == sh) { if (u->ship == sh) {
int es = effskill(u, SK_SAILING, NULL); int es = effskill(u, SK_SAILING, NULL);
if (capskill < 0) { if (es > 0) {
if (u->number >= sh->number) { if (u == cap && u->number >= sh->number) {
capskill = es; capskill = es;
} }
else { if (es >= sh->type->minskill) {
capskill = 0; sumskill += es * u->number;
} }
} }
if (es >= sh->type->minskill) {
sumskill += es * u->number;
}
} }
} }
return (capskill >= ship_captain_minskill(sh)) && (sumskill >= sh->type->sumskill * sh->number); return (capskill >= ship_captain_minskill(sh)) && (sumskill >= sh->type->sumskill * sh->number);
@ -533,5 +535,8 @@ const char *ship_getname(const ship * sh)
} }
int ship_damage_percent(const ship *sh) { int ship_damage_percent(const ship *sh) {
return (sh->damage * 100 + DAMAGE_SCALE - 1) / (sh->size * DAMAGE_SCALE); /* Schaden muss granularer sein als Größe, deshalb ist er skaliert
* DAMAGE_SCALE ist der Faktor zwischen 1 Schadenspunkt und 1 Größenpunkt.
*/
return ((DAMAGE_SCALE - 1) + sh->damage * 100) / (sh->size * DAMAGE_SCALE);
} }

14
src/kernel/ship.h
View File

@ -93,20 +93,20 @@ extern "C" {
const char *shipname(const struct ship *self); const char *shipname(const struct ship *self);
int ship_capacity(const struct ship *sh); int ship_capacity(const struct ship *sh);
int ship_cabins(const struct ship *sh); int ship_cabins(const struct ship *sh);
int ship_maxsize(const struct ship *sh);
bool ship_finished(const struct ship *sh); bool ship_finished(const struct ship *sh);
extern void getshipweight(const struct ship *sh, int *weight, int *cabins); void getshipweight(const struct ship *sh, int *weight, int *cabins);
extern ship *new_ship(const struct ship_type *stype, struct region *r, ship *new_ship(const struct ship_type *stype, struct region *r,
const struct locale *lang); const struct locale *lang);
extern const char *write_shipname(const struct ship *sh, char *buffer, const char *write_shipname(const struct ship *sh, char *buffer,
size_t size); size_t size);
extern struct ship *findship(int n); struct ship *findship(int n);
extern struct ship *findshipr(const struct region *r, int n);
extern const struct ship_type *findshiptype(const char *s, const struct ship_type *findshiptype(const char *s,
const struct locale *lang); const struct locale *lang);
extern void write_ship_reference(const struct ship *sh, void write_ship_reference(const struct ship *sh,
struct storage *store); struct storage *store);
void remove_ship(struct ship **slist, struct ship *s); void remove_ship(struct ship **slist, struct ship *s);

53
src/kernel/ship.test.c
View File

@ -30,6 +30,58 @@ static void test_register_ship(CuTest * tc)
test_teardown(); test_teardown();
} }
static void test_ship_crewed(CuTest * tc)
{
struct region *r;
struct faction *f;
struct ship *sh;
struct unit *u1, *u2;
struct ship_type *stype;
test_setup();
f = test_create_faction(NULL);
r = test_create_ocean(0, 0);
stype = test_create_shiptype("longboat");
stype->cptskill = 2;
stype->sumskill = 4;
sh = test_create_ship(r, stype);
CuAssertTrue(tc, !ship_crewed(sh));
u1 = test_create_unit(f, r);
set_level(u1, SK_SAILING, 4);
u_set_ship(u1, sh);
CuAssertTrue(tc, ship_crewed(sh));
u2 = test_create_unit(f, r);
set_level(u1, SK_SAILING, 2);
set_level(u2, SK_SAILING, 2);
u_set_ship(u2, sh);
CuAssertTrue(tc, ship_crewed(sh));
set_level(u1, SK_SAILING, 1);
set_level(u2, SK_SAILING, 2);
CuAssertTrue(tc, !ship_crewed(sh));
set_level(u1, SK_SAILING, 2);
set_level(u2, SK_SAILING, 1);
CuAssertTrue(tc, !ship_crewed(sh));
set_level(u1, SK_SAILING, 3);
set_level(u2, SK_SAILING, 1);
CuAssertTrue(tc, ship_crewed(sh));
stype->minskill = 2;
CuAssertTrue(tc, !ship_crewed(sh));
set_level(u1, SK_SAILING, 2);
set_level(u2, SK_SAILING, 2);
CuAssertTrue(tc, ship_crewed(sh));
sh->number = 2;
CuAssertTrue(tc, !ship_crewed(sh));
set_level(u1, SK_SAILING, 4);
set_level(u2, SK_SAILING, 4);
CuAssertTrue(tc, !ship_crewed(sh));
u1->number = 2;
set_level(u1, SK_SAILING, 2);
set_level(u2, SK_SAILING, 4);
CuAssertTrue(tc, ship_crewed(sh));
test_teardown();
}
static void test_ship_set_owner(CuTest * tc) static void test_ship_set_owner(CuTest * tc)
{ {
struct region *r; struct region *r;
@ -665,6 +717,7 @@ CuSuite *get_ship_suite(void)
SUITE_ADD_TEST(suite, test_register_ship); SUITE_ADD_TEST(suite, test_register_ship);
SUITE_ADD_TEST(suite, test_stype_defaults); SUITE_ADD_TEST(suite, test_stype_defaults);
SUITE_ADD_TEST(suite, test_ship_set_owner); SUITE_ADD_TEST(suite, test_ship_set_owner);
SUITE_ADD_TEST(suite, test_ship_crewed);
SUITE_ADD_TEST(suite, test_shipowner_resets_when_empty); SUITE_ADD_TEST(suite, test_shipowner_resets_when_empty);
SUITE_ADD_TEST(suite, test_shipowner_goes_to_next_when_empty); SUITE_ADD_TEST(suite, test_shipowner_goes_to_next_when_empty);
SUITE_ADD_TEST(suite, test_shipowner_goes_to_other_when_empty); SUITE_ADD_TEST(suite, test_shipowner_goes_to_other_when_empty);

4
src/modules/autoseed.c
View File

@ -874,10 +874,10 @@ int build_island(int x, int y, int minsize, newfaction ** players, int numfactio
fset(r, RF_MARK); fset(r, RF_MARK);
if (r->land) { if (r->land) {
if (nsize < minsize) { if (nsize < minsize) {
nsize += random_neighbours(r, &rlist, &random_terrain, minsize - nsize); nsize += random_neighbours(r, &rlist, random_terrain, minsize - nsize);
} }
else { else {
nsize += random_neighbours(r, &rlist, &get_ocean, minsize - nsize); nsize += random_neighbours(r, &rlist, get_ocean, minsize - nsize);
} }
} }
regionqueue_push(&island, r); regionqueue_push(&island, r);

5
src/move.c
View File

@ -2227,6 +2227,7 @@ int follow_ship(unit * u, order * ord)
int moves, id, speed; int moves, id, speed;
char command[256]; char command[256];
direction_t dir; direction_t dir;
ship *sh;
if (fval(u, UFL_NOTMOVING)) { if (fval(u, UFL_NOTMOVING)) {
return 0; return 0;
@ -2251,10 +2252,10 @@ int follow_ship(unit * u, order * ord)
return 0; return 0;
} }
sh = findship(id);
dir = hunted_dir(rc->attribs, id); dir = hunted_dir(rc->attribs, id);
if (dir == NODIRECTION) { if (dir == NODIRECTION) {
ship *sh = findship(id);
if (sh == NULL || sh->region != rc) { if (sh == NULL || sh->region != rc) {
cmistake(u, ord, 20, MSG_MOVE); cmistake(u, ord, 20, MSG_MOVE);
} }
@ -2278,7 +2279,7 @@ int follow_ship(unit * u, order * ord)
speed = maxspeed; speed = maxspeed;
} }
rc = rconnect(rc, dir); rc = rconnect(rc, dir);
while (rc && moves < speed && (dir = hunted_dir(rc->attribs, id)) != NODIRECTION) { while (rc && (!sh || rc != sh->region) && moves < speed && (dir = hunted_dir(rc->attribs, id)) != NODIRECTION) {
const char *loc = LOC(u->faction->locale, directions[dir]); const char *loc = LOC(u->faction->locale, directions[dir]);
sbs_strcat(&sbcmd, " "); sbs_strcat(&sbcmd, " ");
sbs_strcat(&sbcmd, loc); sbs_strcat(&sbcmd, loc);

4
src/report.c
View File

@ -1737,10 +1737,10 @@ nr_ship(struct stream *out, const region *r, const ship * sh, const faction * f,
sbs_printf(&sbs, "%s, %s", shipname(sh), LOC(f->locale, sh->type->_name)); sbs_printf(&sbs, "%s, %s", shipname(sh), LOC(f->locale, sh->type->_name));
} }
if (sh->size != sh->type->construction->maxsize) { if (!ship_finished(sh)) {
sbs_printf(&sbs, ", %s (%d/%d)", sbs_printf(&sbs, ", %s (%d/%d)",
LOC(f->locale, "nr_undercons"), sh->size, LOC(f->locale, "nr_undercons"), sh->size,
sh->type->construction->maxsize); ship_maxsize(sh));
} }
if (sh->damage) { if (sh->damage) {
int percent = ship_damage_percent(sh); int percent = ship_damage_percent(sh);