From d435c13bfc18b8f93a289e4146a36a1639b30118 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 26 Aug 2014 20:06:28 +0200 Subject: [PATCH] adding more tests. test for build() test for scale_number() update submodules --- critbit | 2 +- iniparser | 2 +- src/kernel/CMakeLists.txt | 1 + src/kernel/build.c | 4 +- src/kernel/build.test.c | 175 ++- src/kernel/unit.c | 2107 +++++++++++++++++++------------------ src/kernel/unit.test.c | 41 + src/modules/autoseed.c | 1 + src/test_eressea.c | 1 + 9 files changed, 1265 insertions(+), 1069 deletions(-) create mode 100644 src/kernel/unit.test.c diff --git a/critbit b/critbit index 2a7af5e23..4ab2cfe0a 160000 --- a/critbit +++ b/critbit @@ -1 +1 @@ -Subproject commit 2a7af5e2347217ea4efcf7fb3f0bc9c2681d1a17 +Subproject commit 4ab2cfe0a6dd6d57ebb460f9b824f68dba50b7de diff --git a/iniparser b/iniparser index f84066fb7..fe5338298 160000 --- a/iniparser +++ b/iniparser @@ -1 +1 @@ -Subproject commit f84066fb7d3254bdd9e89694acc4c1c20d001eed +Subproject commit fe53382982d0f417b6f7ad0fe08e32393cb07c21 diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index b2bdece72..450253927 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -4,6 +4,7 @@ SET(_TEST_FILES build.test.c config.test.c faction.test.c +unit.test.c save.test.c ship.test.c spell.test.c diff --git a/src/kernel/build.c b/src/kernel/build.c index 8e977fc91..44352e2c3 100644 --- a/src/kernel/build.c +++ b/src/kernel/build.c @@ -521,9 +521,7 @@ int build(unit * u, const construction * ctype, int completed, int want) } } - if (want > 0) { - n = _min(want, n); - } + if (want < n) n = want; if (type->maxsize > 0) { n = _min(type->maxsize - completed, n); diff --git a/src/kernel/build.test.c b/src/kernel/build.test.c index efac217ae..92d7ceaed 100644 --- a/src/kernel/build.test.c +++ b/src/kernel/build.test.c @@ -1,5 +1,6 @@ #include #include +#include #include "types.h" #include "build.h" #include "order.h" @@ -21,6 +22,7 @@ typedef struct build_fixture { unit *u; region *r; race *rc; + construction cons; } build_fixture; static unit * setup_build(build_fixture *bf) { @@ -32,37 +34,159 @@ static unit * setup_build(build_fixture *bf) { assert(bf->rc && bf->f && bf->r); bf->u = test_create_unit(bf->f, bf->r); assert(bf->u); + + bf->cons.materials = calloc(2, sizeof(requirement)); + bf->cons.materials[0].number = 1; + bf->cons.materials[0].rtype = get_resourcetype(R_SILVER); + bf->cons.skill = SK_ARMORER; + bf->cons.minskill = 2; + bf->cons.maxsize = -1; + bf->cons.reqsize = 1; return bf->u; } -static void test_build(CuTest *tc) { - build_fixture bf; +static void test_build_requires_materials(CuTest *tc) { + build_fixture bf = { 0 }; + unit *u; + const struct item_type *itype; + + u = setup_build(&bf); + set_level(u, SK_ARMORER, 2); + CuAssertIntEquals(tc, ENOMATERIALS, build(u, &bf.cons, 0, 1)); + itype = bf.cons.materials[0].rtype->itype; + i_change(&u->items, itype, 2); + CuAssertIntEquals(tc, 1, build(u, &bf.cons, 0, 1)); + CuAssertIntEquals(tc, 1, i_get(u->items, itype)); +} + +static void test_build_requires_building(CuTest *tc) { + build_fixture bf = { 0 }; + unit *u; + const struct resource_type *rtype; + building_type *btype; + + u = setup_build(&bf); + rtype = bf.cons.materials[0].rtype; + i_change(&u->items, rtype->itype, 1); + set_level(u, SK_ARMORER, 2); + bf.cons.btype = btype = bt_get_or_create("hodor"); + btype->maxcapacity = 1; + btype->capacity = 1; + CuAssertIntEquals_Msg(tc, "must be inside a production building", EBUILDINGREQ, build(u, &bf.cons, 0, 1)); + u->building = test_create_building(u->region, btype); + fset(u->building, BLD_WORKING); + CuAssertIntEquals(tc, 1, build(u, &bf.cons, 0, 1)); + btype->maxcapacity = 0; + CuAssertIntEquals_Msg(tc, "cannot build when production building capacity exceeded", EBUILDINGREQ, build(u, &bf.cons, 0, 1)); +} + +static void test_build_failure_missing_skill(CuTest *tc) { + build_fixture bf = { 0 }; unit *u; - construction cons = { 0 }; const struct resource_type *rtype; u = setup_build(&bf); - rtype = get_resourcetype(R_SILVER); - assert(rtype); - - cons.materials = calloc(2, sizeof(requirement)); - cons.materials[0].number = 1; - cons.materials[0].rtype = rtype; - cons.skill = SK_ARMORER; - cons.minskill = 2; - cons.reqsize = 1; - CuAssertIntEquals(tc, ENEEDSKILL, build(u, &cons, 1, 1)); - set_level(u, SK_ARMORER, 1); - CuAssertIntEquals(tc, ELOWSKILL, build(u, &cons, 1, 1)); - set_level(u, SK_ARMORER, 2); - CuAssertIntEquals(tc, ENOMATERIALS, build(u, &cons, 1, 1)); + rtype = bf.cons.materials[0].rtype; i_change(&u->items, rtype->itype, 1); - CuAssertIntEquals(tc, 1, build(u, &cons, 1, 1)); + CuAssertIntEquals(tc, ENEEDSKILL, build(u, &bf.cons, 1, 1)); +} + +static void test_build_failure_low_skill(CuTest *tc) { + build_fixture bf = { 0 }; + unit *u; + const struct resource_type *rtype; + + u = setup_build(&bf); + rtype = bf.cons.materials[0].rtype; + i_change(&u->items, rtype->itype, 1); + set_level(u, SK_ARMORER, bf.cons.minskill-1); + CuAssertIntEquals(tc, ELOWSKILL, build(u, &bf.cons, 0, 10)); +} + +static void test_build_failure_completed(CuTest *tc) { + build_fixture bf = { 0 }; + unit *u; + const struct resource_type *rtype; + + u = setup_build(&bf); + rtype = bf.cons.materials[0].rtype; + i_change(&u->items, rtype->itype, 1); + set_level(u, SK_ARMORER, bf.cons.minskill); + bf.cons.maxsize = 1; + CuAssertIntEquals(tc, ECOMPLETE, build(u, &bf.cons, bf.cons.maxsize, 10)); + CuAssertIntEquals(tc, 1, i_get(u->items, rtype->itype)); +} + +static void test_build_limits(CuTest *tc) { + build_fixture bf = { 0 }; + unit *u; + const struct resource_type *rtype; + + u = setup_build(&bf); + rtype = bf.cons.materials[0].rtype; + i_change(&u->items, rtype->itype, 1); + set_level(u, SK_ARMORER, bf.cons.minskill); + CuAssertIntEquals(tc, 1, build(u, &bf.cons, 0, 10)); CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype)); + scale_number(u, 2); + set_level(u, SK_ARMORER, bf.cons.minskill); i_change(&u->items, rtype->itype, 2); - CuAssertIntEquals(tc, 2, build(u, &cons, 2, 2)); + CuAssertIntEquals(tc, 2, build(u, &bf.cons, 0, 10)); CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype)); + + scale_number(u, 2); + set_level(u, SK_ARMORER, bf.cons.minskill * 2); + i_change(&u->items, rtype->itype, 4); + CuAssertIntEquals(tc, 4, build(u, &bf.cons, 0, 10)); + CuAssertIntEquals(tc, 0, i_get(u->items, rtype->itype)); + test_cleanup(); +} + +static void test_build_with_ring(CuTest *tc) { + build_fixture bf = { 0 }; + unit *u; + item_type *ring; + const struct resource_type *rtype; + + u = setup_build(&bf); + rtype = bf.cons.materials[0].rtype; + ring = it_get_or_create(rt_get_or_create("roqf")); + assert(rtype && ring); + + set_level(u, SK_ARMORER, bf.cons.minskill); + i_change(&u->items, rtype->itype, 20); + i_change(&u->items, ring, 1); + CuAssertIntEquals(tc, 10, build(u, &bf.cons, 0, 20)); + CuAssertIntEquals(tc, 10, i_get(u->items, rtype->itype)); + test_cleanup(); +} + +static void test_build_with_potion(CuTest *tc) { + build_fixture bf = { 0 }; + unit *u; + const potion_type *ptype; + const struct resource_type *rtype; + + u = setup_build(&bf); + rtype = bf.cons.materials[0].rtype; + oldpotiontype[P_DOMORE] = ptype = new_potiontype(it_get_or_create(rt_get_or_create("hodor")), 1); + assert(rtype && ptype); + + i_change(&u->items, rtype->itype, 20); + change_effect(u, ptype, 4); + set_level(u, SK_ARMORER, bf.cons.minskill); + CuAssertIntEquals(tc, 2, build(u, &bf.cons, 0, 20)); + CuAssertIntEquals(tc, 18, i_get(u->items, rtype->itype)); + CuAssertIntEquals(tc, 3, get_effect(u, ptype)); + set_level(u, SK_ARMORER, bf.cons.minskill*2); + CuAssertIntEquals(tc, 4, build(u, &bf.cons, 0, 20)); + CuAssertIntEquals(tc, 2, get_effect(u, ptype)); + set_level(u, SK_ARMORER, bf.cons.minskill); + scale_number(u, 2); // OBS: this scales the effects, too: + CuAssertIntEquals(tc, 4, get_effect(u, ptype)); + CuAssertIntEquals(tc, 4, build(u, &bf.cons, 0, 20)); + CuAssertIntEquals(tc, 2, get_effect(u, ptype)); test_cleanup(); } @@ -82,7 +206,7 @@ static void test_build_building_no_materials(CuTest *tc) { static void test_build_building_with_golem(CuTest *tc) { unit *u; - build_fixture bf; + build_fixture bf = { 0 }; const building_type *btype; u = setup_build(&bf); @@ -92,7 +216,7 @@ static void test_build_building_with_golem(CuTest *tc) { assert(btype->construction); set_level(bf.u, SK_BUILDING, 1); - CuAssertIntEquals(tc, 1, build_building(u, btype, 0, 4, 0)); + CuAssertIntEquals(tc, 1, build_building(u, btype, 0, 1, 0)); CuAssertPtrNotNull(tc, u->region->buildings); CuAssertIntEquals(tc, 1, u->region->buildings->size); CuAssertIntEquals(tc, 0, u->number); @@ -124,7 +248,14 @@ static void test_build_building_success(CuTest *tc) { CuSuite *get_build_suite(void) { CuSuite *suite = CuSuiteNew(); - SUITE_ADD_TEST(suite, test_build); + SUITE_ADD_TEST(suite, test_build_limits); + SUITE_ADD_TEST(suite, test_build_failure_low_skill); + SUITE_ADD_TEST(suite, test_build_failure_missing_skill); + SUITE_ADD_TEST(suite, test_build_requires_materials); + SUITE_ADD_TEST(suite, test_build_requires_building); + SUITE_ADD_TEST(suite, test_build_failure_completed); + SUITE_ADD_TEST(suite, test_build_with_ring); + SUITE_ADD_TEST(suite, test_build_with_potion); SUITE_ADD_TEST(suite, test_build_building_success); SUITE_ADD_TEST(suite, test_build_building_with_golem); SUITE_ADD_TEST(suite, test_build_building_no_materials); diff --git a/src/kernel/unit.c b/src/kernel/unit.c index 967ff5db5..7e640d020 100644 --- a/src/kernel/unit.c +++ b/src/kernel/unit.c @@ -1,7 +1,7 @@ /* Copyright (c) 1998-2010, Enno Rehling - Katja Zedel +Katja Zedel Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -68,13 +68,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define FIND_FOREIGN_TEMP attrib_type at_creator = { - "creator" + "creator" /* Rest ist NULL; temporaeres, nicht alterndes Attribut */ }; #define UMAXHASH MAXUNITS static unit *unithash[UMAXHASH]; -static unit *delmarker = (unit *) unithash; /* a funny hack */ +static unit *delmarker = (unit *)unithash; /* a funny hack */ #define HASH_STATISTICS 1 #if HASH_STATISTICS @@ -84,134 +84,136 @@ static int hash_misses; void uhash(unit * u) { - int key = HASH1(u->no, UMAXHASH), gk = HASH2(u->no, UMAXHASH); - while (unithash[key] != NULL && unithash[key] != delmarker - && unithash[key] != u) { - key = (key + gk) % UMAXHASH; - } - assert(unithash[key] != u || !"trying to add the same unit twice"); - unithash[key] = u; + int key = HASH1(u->no, UMAXHASH), gk = HASH2(u->no, UMAXHASH); + while (unithash[key] != NULL && unithash[key] != delmarker + && unithash[key] != u) { + key = (key + gk) % UMAXHASH; + } + assert(unithash[key] != u || !"trying to add the same unit twice"); + unithash[key] = u; } void uunhash(unit * u) { - int key = HASH1(u->no, UMAXHASH), gk = HASH2(u->no, UMAXHASH); - while (unithash[key] != NULL && unithash[key] != u) { - key = (key + gk) % UMAXHASH; - } - assert(unithash[key] == u || !"trying to remove a unit that is not hashed"); - unithash[key] = delmarker; + int key = HASH1(u->no, UMAXHASH), gk = HASH2(u->no, UMAXHASH); + while (unithash[key] != NULL && unithash[key] != u) { + key = (key + gk) % UMAXHASH; + } + assert(unithash[key] == u || !"trying to remove a unit that is not hashed"); + unithash[key] = delmarker; } unit *ufindhash(int uid) { - assert(uid >= 0); + assert(uid >= 0); #if HASH_STATISTICS - ++hash_requests; + ++hash_requests; #endif - if (uid >= 0) { - int key = HASH1(uid, UMAXHASH), gk = HASH2(uid, UMAXHASH); - while (unithash[key] != NULL && (unithash[key] == delmarker - || unithash[key]->no != uid)) { - key = (key + gk) % UMAXHASH; + if (uid >= 0) { + int key = HASH1(uid, UMAXHASH), gk = HASH2(uid, UMAXHASH); + while (unithash[key] != NULL && (unithash[key] == delmarker + || unithash[key]->no != uid)) { + key = (key + gk) % UMAXHASH; #if HASH_STATISTICS - ++hash_misses; + ++hash_misses; #endif + } + return unithash[key]; } - return unithash[key]; - } - return NULL; + return NULL; } #define DMAXHASH 7919 typedef struct dead { - struct dead *nexthash; - faction *f; - int no; + struct dead *nexthash; + faction *f; + int no; } dead; static dead *deadhash[DMAXHASH]; static void dhash(int no, faction * f) { - dead *hash = (dead *) calloc(1, sizeof(dead)); - dead *old = deadhash[no % DMAXHASH]; - hash->no = no; - hash->f = f; - deadhash[no % DMAXHASH] = hash; - hash->nexthash = old; + dead *hash = (dead *)calloc(1, sizeof(dead)); + dead *old = deadhash[no % DMAXHASH]; + hash->no = no; + hash->f = f; + deadhash[no % DMAXHASH] = hash; + hash->nexthash = old; } faction *dfindhash(int no) { - dead *old; + dead *old; - if (no < 0) - return 0; + if (no < 0) + return 0; - for (old = deadhash[no % DMAXHASH]; old; old = old->nexthash) { - if (old->no == no) { - return old->f; + for (old = deadhash[no % DMAXHASH]; old; old = old->nexthash) { + if (old->no == no) { + return old->f; + } } - } - return 0; + return 0; } typedef struct buddy { - struct buddy *next; - int number; - faction *faction; - unit *unit; + struct buddy *next; + int number; + faction *faction; + unit *unit; } buddy; static buddy *get_friends(const unit * u, int *numfriends) { - buddy *friends = 0; - faction *f = u->faction; - region *r = u->region; - int number = 0; - unit *u2; + buddy *friends = 0; + faction *f = u->faction; + region *r = u->region; + int number = 0; + unit *u2; - for (u2 = r->units; u2; u2 = u2->next) { - if (u2->faction != f && u2->number > 0) { - int allied = 0; - if (get_param_int(global.parameters, "rules.alliances", 0) != 0) { - allied = (f->alliance && f->alliance == u2->faction->alliance); - } else if (alliedunit(u, u2->faction, HELP_MONEY) - && alliedunit(u2, f, HELP_GIVE)) { - allied = 1; - } - if (allied) { - buddy *nf, **fr = &friends; - - /* some units won't take stuff: */ - if (u_race(u2)->ec_flags & GETITEM) { - while (*fr && (*fr)->faction->no < u2->faction->no) - fr = &(*fr)->next; - nf = *fr; - if (nf == NULL || nf->faction != u2->faction) { - nf = malloc(sizeof(buddy)); - nf->next = *fr; - nf->faction = u2->faction; - nf->unit = u2; - nf->number = 0; - *fr = nf; - } else if (nf->faction == u2->faction - && (u_race(u2)->ec_flags & GIVEITEM)) { - /* we don't like to gift it to units that won't give it back */ - if ((u_race(nf->unit)->ec_flags & GIVEITEM) == 0) { - nf->unit = u2; + for (u2 = r->units; u2; u2 = u2->next) { + if (u2->faction != f && u2->number > 0) { + int allied = 0; + if (get_param_int(global.parameters, "rules.alliances", 0) != 0) { + allied = (f->alliance && f->alliance == u2->faction->alliance); + } + else if (alliedunit(u, u2->faction, HELP_MONEY) + && alliedunit(u2, f, HELP_GIVE)) { + allied = 1; + } + if (allied) { + buddy *nf, **fr = &friends; + + /* some units won't take stuff: */ + if (u_race(u2)->ec_flags & GETITEM) { + while (*fr && (*fr)->faction->no < u2->faction->no) + fr = &(*fr)->next; + nf = *fr; + if (nf == NULL || nf->faction != u2->faction) { + nf = malloc(sizeof(buddy)); + nf->next = *fr; + nf->faction = u2->faction; + nf->unit = u2; + nf->number = 0; + *fr = nf; + } + else if (nf->faction == u2->faction + && (u_race(u2)->ec_flags & GIVEITEM)) { + /* we don't like to gift it to units that won't give it back */ + if ((u_race(nf->unit)->ec_flags & GIVEITEM) == 0) { + nf->unit = u2; + } + } + nf->number += u2->number; + number += u2->number; + } } - } - nf->number += u2->number; - number += u2->number; } - } } - } - if (numfriends) - *numfriends = number; - return friends; + if (numfriends) + *numfriends = number; + return friends; } /** give all items to friends or peasants. @@ -226,7 +228,7 @@ int gift_items(unit * u, int flags) item **itm_p = &u->items; int retval = 0; int rule = rule_give(); - + assert(u->region); assert(u->faction); @@ -243,100 +245,102 @@ int gift_items(unit * u, int flags) return 0; if ((u_race(u)->ec_flags & GIVEITEM) == 0) return 0; - - /* at first, I should try giving my crap to my own units in this region */ - if (u->faction && (u->faction->flags & FFL_QUIT) == 0 && (flags & GIFT_SELF)) { - unit *u2, *u3 = NULL; - for (u2 = r->units; u2; u2 = u2->next) { - if (u2 != u && u2->faction == u->faction && u2->number > 0) { - /* some units won't take stuff: */ - if (u_race(u2)->ec_flags & GETITEM) { - /* we don't like to gift it to units that won't give it back */ - if (u_race(u2)->ec_flags & GIVEITEM) { - i_merge(&u2->items, &u->items); + + /* at first, I should try giving my crap to my own units in this region */ + if (u->faction && (u->faction->flags & FFL_QUIT) == 0 && (flags & GIFT_SELF)) { + unit *u2, *u3 = NULL; + for (u2 = r->units; u2; u2 = u2->next) { + if (u2 != u && u2->faction == u->faction && u2->number > 0) { + /* some units won't take stuff: */ + if (u_race(u2)->ec_flags & GETITEM) { + /* we don't like to gift it to units that won't give it back */ + if (u_race(u2)->ec_flags & GIVEITEM) { + i_merge(&u2->items, &u->items); + u->items = NULL; + break; + } + else { + u3 = u2; + } + } + } + } + if (u->items && u3) { + /* if nobody else takes it, we give it to a unit that has issues */ + i_merge(&u3->items, &u->items); u->items = NULL; - break; - } else { - u3 = u2; - } } - } + if (u->items == NULL) + return 0; } - if (u->items && u3) { - /* if nobody else takes it, we give it to a unit that has issues */ - i_merge(&u3->items, &u->items); - u->items = NULL; - } - if (u->items == NULL) - return 0; - } - /* if I have friends, I'll try to give my stuff to them */ - if (u->faction && (flags & GIFT_FRIENDS)) { - int number = 0; - buddy *friends = get_friends(u, &number); + /* if I have friends, I'll try to give my stuff to them */ + if (u->faction && (flags & GIFT_FRIENDS)) { + int number = 0; + buddy *friends = get_friends(u, &number); - while (friends) { - struct buddy *nf = friends; - unit *u2 = nf->unit; - item *itm = u->items; - while (itm != NULL) { - const item_type *itype = itm->type; - item *itn = itm->next; - int n = itm->number; - n = n * nf->number / number; - if (n > 0) { - i_change(&u->items, itype, -n); - i_change(&u2->items, itype, n); + while (friends) { + struct buddy *nf = friends; + unit *u2 = nf->unit; + item *itm = u->items; + while (itm != NULL) { + const item_type *itype = itm->type; + item *itn = itm->next; + int n = itm->number; + n = n * nf->number / number; + if (n > 0) { + i_change(&u->items, itype, -n); + i_change(&u2->items, itype, n); + } + itm = itn; + } + number -= nf->number; + friends = nf->next; + free(nf); } - itm = itn; - } - number -= nf->number; - friends = nf->next; - free(nf); + if (u->items == NULL) + return 0; } - if (u->items == NULL) - return 0; - } - /* last, but not least, give money and horses to peasants */ - while (*itm_p) { - item *itm = *itm_p; + /* last, but not least, give money and horses to peasants */ + while (*itm_p) { + item *itm = *itm_p; - if (flags & GIFT_PEASANTS) { - if (!fval(u->region->terrain, SEA_REGION)) { - if (itm->type->rtype == rsilver) { - rsetmoney(r, rmoney(r) + itm->number); - itm->number = 0; + if (flags & GIFT_PEASANTS) { + if (!fval(u->region->terrain, SEA_REGION)) { + if (itm->type->rtype == rsilver) { + rsetmoney(r, rmoney(r) + itm->number); + itm->number = 0; + } + else if (itm->type->rtype == rhorse) { + rsethorses(r, rhorses(r) + itm->number); + itm->number = 0; + } + } } - else if (itm->type->rtype == rhorse) { - rsethorses(r, rhorses(r) + itm->number); - itm->number = 0; + if (itm->number > 0 && (itm->type->flags & ITF_NOTLOST)) { + itm_p = &itm->next; + retval = -1; + } + else { + i_remove(itm_p, itm); + i_free(itm); } - } } - if (itm->number > 0 && (itm->type->flags & ITF_NOTLOST)) { - itm_p = &itm->next; - retval = -1; - } else { - i_remove(itm_p, itm); - i_free(itm); - } - } - return retval; + return retval; } void make_zombie(unit * u) { - u_setfaction(u, get_monsters()); - scale_number(u, 1); - u_setrace(u, get_race(RC_ZOMBIE)); - u->irace = NULL; + u_setfaction(u, get_monsters()); + scale_number(u, 1); + u_setrace(u, get_race(RC_ZOMBIE)); + u->irace = NULL; } /** remove the unit from the list of active units. * the unit is not actually freed, because there may still be references - * dangling to it (from messages, for example). To free all removed units, + * dangling to it (from messages, for example). To free all removed units, * call free_units(). * returns 0 on success, or -1 if unit could not be removed. */ @@ -345,57 +349,57 @@ static unit *deleted_units = NULL; int remove_unit(unit ** ulist, unit * u) { - int result; + int result; - assert(ufindhash(u->no)); - handle_event(u->attribs, "destroy", u); + assert(ufindhash(u->no)); + handle_event(u->attribs, "destroy", u); - result = gift_items(u, GIFT_SELF | GIFT_FRIENDS | GIFT_PEASANTS); - if (result != 0) { - make_zombie(u); - return -1; - } - - if (u->number) - set_number(u, 0); - leave(u, true); - u->region = NULL; - - uunhash(u); - if (ulist) { - while (*ulist != u) { - ulist = &(*ulist)->next; + result = gift_items(u, GIFT_SELF | GIFT_FRIENDS | GIFT_PEASANTS); + if (result != 0) { + make_zombie(u); + return -1; } - assert(*ulist == u); - *ulist = u->next; - } - u->next = deleted_units; - deleted_units = u; - dhash(u->no, u->faction); + if (u->number) + set_number(u, 0); + leave(u, true); + u->region = NULL; - u_setfaction(u, NULL); - u->region = NULL; + uunhash(u); + if (ulist) { + while (*ulist != u) { + ulist = &(*ulist)->next; + } + assert(*ulist == u); + *ulist = u->next; + } - return 0; + u->next = deleted_units; + deleted_units = u; + dhash(u->no, u->faction); + + u_setfaction(u, NULL); + u->region = NULL; + + return 0; } unit *findnewunit(const region * r, const faction * f, int n) { - unit *u2; + unit *u2; - if (n == 0) - return 0; + if (n == 0) + return 0; - for (u2 = r->units; u2; u2 = u2->next) - if (u2->faction == f && ualias(u2) == n) - return u2; + for (u2 = r->units; u2; u2 = u2->next) + if (u2->faction == f && ualias(u2) == n) + return u2; #ifdef FIND_FOREIGN_TEMP - for (u2 = r->units; u2; u2 = u2->next) - if (ualias(u2) == n) - return u2; + for (u2 = r->units; u2; u2 = u2->next) + if (ualias(u2) == n) + return u2; #endif - return 0; + return 0; } /* ------------------------------------------------------------- */ @@ -404,74 +408,75 @@ unit *findnewunit(const region * r, const faction * f, int n) /* at_alias */ /*********************/ attrib_type at_alias = { - "alias", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - NO_WRITE, - NO_READ + "alias", + DEFAULT_INIT, + DEFAULT_FINALIZE, + DEFAULT_AGE, + NO_WRITE, + NO_READ }; int ualias(const unit * u) { - attrib *a = a_find(u->attribs, &at_alias); - if (!a) - return 0; - return a->data.i; + attrib *a = a_find(u->attribs, &at_alias); + if (!a) + return 0; + return a->data.i; } int a_readprivate(attrib * a, void *owner, struct storage *store) { - char lbuf[DISPLAYSIZE]; - READ_STR(store, lbuf, sizeof(lbuf)); - a->data.v = _strdup(lbuf); - return (a->data.v) ? AT_READ_OK : AT_READ_FAIL; + char lbuf[DISPLAYSIZE]; + READ_STR(store, lbuf, sizeof(lbuf)); + a->data.v = _strdup(lbuf); + return (a->data.v) ? AT_READ_OK : AT_READ_FAIL; } /*********************/ /* at_private */ /*********************/ attrib_type at_private = { - "private", - DEFAULT_INIT, - a_finalizestring, - DEFAULT_AGE, - a_writestring, - a_readprivate + "private", + DEFAULT_INIT, + a_finalizestring, + DEFAULT_AGE, + a_writestring, + a_readprivate }; const char *u_description(const unit * u, const struct locale *lang) { - if (u->display && u->display[0]) { - return u->display; - } else if (u_race(u)->describe) { - return u_race(u)->describe(u, lang); - } - return NULL; + if (u->display && u->display[0]) { + return u->display; + } + else if (u_race(u)->describe) { + return u_race(u)->describe(u, lang); + } + return NULL; } const char *uprivate(const unit * u) { - attrib *a = a_find(u->attribs, &at_private); - if (!a) - return NULL; - return a->data.v; + attrib *a = a_find(u->attribs, &at_private); + if (!a) + return NULL; + return a->data.v; } void usetprivate(unit * u, const char *str) { - attrib *a = a_find(u->attribs, &at_private); + attrib *a = a_find(u->attribs, &at_private); - if (str == NULL) { - if (a) - a_remove(&u->attribs, a); - return; - } - if (!a) - a = a_add(&u->attribs, a_new(&at_private)); - if (a->data.v) - free(a->data.v); - a->data.v = _strdup((const char *)str); + if (str == NULL) { + if (a) + a_remove(&u->attribs, a); + return; + } + if (!a) + a = a_add(&u->attribs, a_new(&at_private)); + if (a->data.v) + free(a->data.v); + a->data.v = _strdup((const char *)str); } /*********************/ @@ -479,66 +484,67 @@ void usetprivate(unit * u, const char *str) /*********************/ /* Einheit BENUTZT einen Trank */ attrib_type at_potionuser = { - "potionuser", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - NO_WRITE, - NO_READ + "potionuser", + DEFAULT_INIT, + DEFAULT_FINALIZE, + DEFAULT_AGE, + NO_WRITE, + NO_READ }; void usetpotionuse(unit * u, const potion_type * ptype) { - attrib *a = a_find(u->attribs, &at_potionuser); - if (!a) - a = a_add(&u->attribs, a_new(&at_potionuser)); - a->data.v = (void *)ptype; + attrib *a = a_find(u->attribs, &at_potionuser); + if (!a) + a = a_add(&u->attribs, a_new(&at_potionuser)); + a->data.v = (void *)ptype; } const potion_type *ugetpotionuse(const unit * u) { - attrib *a = a_find(u->attribs, &at_potionuser); - if (!a) - return NULL; - return (const potion_type *)a->data.v; + attrib *a = a_find(u->attribs, &at_potionuser); + if (!a) + return NULL; + return (const potion_type *)a->data.v; } /*********************/ /* at_target */ /*********************/ attrib_type at_target = { - "target", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - NO_WRITE, - NO_READ + "target", + DEFAULT_INIT, + DEFAULT_FINALIZE, + DEFAULT_AGE, + NO_WRITE, + NO_READ }; unit *utarget(const unit * u) { - attrib *a; - if (!fval(u, UFL_TARGET)) - return NULL; - a = a_find(u->attribs, &at_target); - assert(a || !"flag set, but no target found"); - return (unit *) a->data.v; + attrib *a; + if (!fval(u, UFL_TARGET)) + return NULL; + a = a_find(u->attribs, &at_target); + assert(a || !"flag set, but no target found"); + return (unit *)a->data.v; } void usettarget(unit * u, const unit * t) { - attrib *a = a_find(u->attribs, &at_target); - if (!a && t) - a = a_add(&u->attribs, a_new(&at_target)); - if (a) { - if (!t) { - a_remove(&u->attribs, a); - freset(u, UFL_TARGET); - } else { - a->data.v = (void *)t; - fset(u, UFL_TARGET); + attrib *a = a_find(u->attribs, &at_target); + if (!a && t) + a = a_add(&u->attribs, a_new(&at_target)); + if (a) { + if (!t) { + a_remove(&u->attribs, a); + freset(u, UFL_TARGET); + } + else { + a->data.v = (void *)t; + fset(u, UFL_TARGET); + } } - } } /*********************/ @@ -547,93 +553,94 @@ void usettarget(unit * u, const unit * t) void a_writesiege(const attrib * a, const void *owner, struct storage *store) { - struct building *b = (struct building *)a->data.v; - write_building_reference(b, store); + struct building *b = (struct building *)a->data.v; + write_building_reference(b, store); } int a_readsiege(attrib * a, void *owner, struct storage *store) { - int result = read_reference(&a->data.v, store, read_building_reference, - resolve_building); - if (result == 0 && !a->data.v) { - return AT_READ_FAIL; - } - return AT_READ_OK; + int result = read_reference(&a->data.v, store, read_building_reference, + resolve_building); + if (result == 0 && !a->data.v) { + return AT_READ_FAIL; + } + return AT_READ_OK; } attrib_type at_siege = { - "siege", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - a_writesiege, - a_readsiege + "siege", + DEFAULT_INIT, + DEFAULT_FINALIZE, + DEFAULT_AGE, + a_writesiege, + a_readsiege }; struct building *usiege(const unit * u) { - attrib *a; - if (!fval(u, UFL_SIEGE)) - return NULL; - a = a_find(u->attribs, &at_siege); - assert(a || !"flag set, but no siege found"); - return (struct building *)a->data.v; + attrib *a; + if (!fval(u, UFL_SIEGE)) + return NULL; + a = a_find(u->attribs, &at_siege); + assert(a || !"flag set, but no siege found"); + return (struct building *)a->data.v; } void usetsiege(unit * u, const struct building *t) { - attrib *a = a_find(u->attribs, &at_siege); - if (!a && t) - a = a_add(&u->attribs, a_new(&at_siege)); - if (a) { - if (!t) { - a_remove(&u->attribs, a); - freset(u, UFL_SIEGE); - } else { - a->data.v = (void *)t; - fset(u, UFL_SIEGE); + attrib *a = a_find(u->attribs, &at_siege); + if (!a && t) + a = a_add(&u->attribs, a_new(&at_siege)); + if (a) { + if (!t) { + a_remove(&u->attribs, a); + freset(u, UFL_SIEGE); + } + else { + a->data.v = (void *)t; + fset(u, UFL_SIEGE); + } } - } } /*********************/ /* at_contact */ /*********************/ attrib_type at_contact = { - "contact", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - NO_WRITE, - NO_READ + "contact", + DEFAULT_INIT, + DEFAULT_FINALIZE, + DEFAULT_AGE, + NO_WRITE, + NO_READ }; void usetcontact(unit * u, const unit * u2) { - attrib *a = a_find(u->attribs, &at_contact); - while (a && a->type == &at_contact && a->data.v != u2) - a = a->next; - if (a && a->type == &at_contact) - return; - a_add(&u->attribs, a_new(&at_contact))->data.v = (void *)u2; + attrib *a = a_find(u->attribs, &at_contact); + while (a && a->type == &at_contact && a->data.v != u2) + a = a->next; + if (a && a->type == &at_contact) + return; + a_add(&u->attribs, a_new(&at_contact))->data.v = (void *)u2; } bool ucontact(const unit * u, const unit * u2) /* Prueft, ob u den Kontaktiere-Befehl zu u2 gesetzt hat. */ { - attrib *ru; - if (u->faction == u2->faction) - return true; + attrib *ru; + if (u->faction == u2->faction) + return true; - /* Explizites KONTAKTIERE */ - for (ru = a_find(u->attribs, &at_contact); ru && ru->type == &at_contact; - ru = ru->next) { - if (((unit *) ru->data.v) == u2) { - return true; + /* Explizites KONTAKTIERE */ + for (ru = a_find(u->attribs, &at_contact); ru && ru->type == &at_contact; + ru = ru->next) { + if (((unit *)ru->data.v) == u2) { + return true; + } } - } - return false; + return false; } /*** @@ -642,280 +649,282 @@ bool ucontact(const unit * u, const unit * u2) void free_units(void) { - while (deleted_units) { - unit *u = deleted_units; - deleted_units = deleted_units->next; - free_unit(u); - free(u); - } + while (deleted_units) { + unit *u = deleted_units; + deleted_units = deleted_units->next; + free_unit(u); + free(u); + } } void write_unit_reference(const unit * u, struct storage *store) { - WRITE_INT(store, (u && u->region) ? u->no : 0); + WRITE_INT(store, (u && u->region) ? u->no : 0); } int resolve_unit(variant id, void *address) { - unit *u = NULL; - if (id.i != 0) { - u = findunit(id.i); - if (u == NULL) { - *(unit **) address = NULL; - return -1; + unit *u = NULL; + if (id.i != 0) { + u = findunit(id.i); + if (u == NULL) { + *(unit **)address = NULL; + return -1; + } } - } - *(unit **) address = u; - return 0; + *(unit **)address = u; + return 0; } variant read_unit_reference(struct storage * store) { - variant var; - READ_INT(store, &var.i); - return var; + variant var; + READ_INT(store, &var.i); + return var; } attrib_type at_stealth = { - "stealth", NULL, NULL, NULL, a_writeint, a_readint + "stealth", NULL, NULL, NULL, a_writeint, a_readint }; void u_seteffstealth(unit * u, int value) { - if (skill_enabled(SK_STEALTH)) { - attrib *a = NULL; - if (fval(u, UFL_STEALTH)) { - a = a_find(u->attribs, &at_stealth); + if (skill_enabled(SK_STEALTH)) { + attrib *a = NULL; + if (fval(u, UFL_STEALTH)) { + a = a_find(u->attribs, &at_stealth); + } + if (value < 0) { + if (a != NULL) { + freset(u, UFL_STEALTH); + a_remove(&u->attribs, a); + } + return; + } + if (a == NULL) { + a = a_add(&u->attribs, a_new(&at_stealth)); + fset(u, UFL_STEALTH); + } + a->data.i = value; } - if (value < 0) { - if (a != NULL) { - freset(u, UFL_STEALTH); - a_remove(&u->attribs, a); - } - return; - } - if (a == NULL) { - a = a_add(&u->attribs, a_new(&at_stealth)); - fset(u, UFL_STEALTH); - } - a->data.i = value; - } } int u_geteffstealth(const struct unit *u) { - if (skill_enabled(SK_STEALTH)) { - if (fval(u, UFL_STEALTH)) { - attrib *a = a_find(u->attribs, &at_stealth); - if (a != NULL) - return a->data.i; + if (skill_enabled(SK_STEALTH)) { + if (fval(u, UFL_STEALTH)) { + attrib *a = a_find(u->attribs, &at_stealth); + if (a != NULL) + return a->data.i; + } } - } - return -1; + return -1; } int get_level(const unit * u, skill_t id) { - if (skill_enabled(id)) { - skill *sv = u->skills; - while (sv != u->skills + u->skill_size) { - if (sv->id == id) { - return sv->level; - } - ++sv; + if (skill_enabled(id)) { + skill *sv = u->skills; + while (sv != u->skills + u->skill_size) { + if (sv->id == id) { + return sv->level; + } + ++sv; + } } - } - return 0; + return 0; } void set_level(unit * u, skill_t sk, int value) { - skill *sv = u->skills; + skill *sv = u->skills; - if (!skill_enabled(sk)) - return; + if (!skill_enabled(sk)) + return; - if (value == 0) { - remove_skill(u, sk); - return; - } - while (sv != u->skills + u->skill_size) { - if (sv->id == sk) { - sk_set(sv, value); - return; + if (value == 0) { + remove_skill(u, sk); + return; } - ++sv; - } - sk_set(add_skill(u, sk), value); + while (sv != u->skills + u->skill_size) { + if (sv->id == sk) { + sk_set(sv, value); + return; + } + ++sv; + } + sk_set(add_skill(u, sk), value); } static int leftship_age(struct attrib *a) { - /* must be aged, so it doesn't affect report generation (cansee) */ - unused_arg(a); - return AT_AGE_REMOVE; /* remove me */ + /* must be aged, so it doesn't affect report generation (cansee) */ + unused_arg(a); + return AT_AGE_REMOVE; /* remove me */ } static attrib_type at_leftship = { - "leftship", NULL, NULL, leftship_age + "leftship", NULL, NULL, leftship_age }; static attrib *make_leftship(struct ship *leftship) { - attrib *a = a_new(&at_leftship); - a->data.v = leftship; - return a; + attrib *a = a_new(&at_leftship); + a->data.v = leftship; + return a; } void set_leftship(unit * u, ship * sh) { - a_add(&u->attribs, make_leftship(sh)); + a_add(&u->attribs, make_leftship(sh)); } ship *leftship(const unit * u) { - attrib *a = a_find(u->attribs, &at_leftship); + attrib *a = a_find(u->attribs, &at_leftship); - /* Achtung: Es ist nicht garantiert, dass der Rueckgabewert zu jedem - * Zeitpunkt noch auf ein existierendes Schiff zeigt! */ + /* Achtung: Es ist nicht garantiert, dass der Rueckgabewert zu jedem + * Zeitpunkt noch auf ein existierendes Schiff zeigt! */ - if (a) - return (ship *) (a->data.v); + if (a) + return (ship *)(a->data.v); - return NULL; + return NULL; } void u_set_building(unit * u, building * b) { - assert(!u->building); /* you must leave first */ - u->building = b; - if (b && (!b->_owner || b->_owner->number <= 0)) { - building_set_owner(u); - } + assert(!u->building); /* you must leave first */ + u->building = b; + if (b && (!b->_owner || b->_owner->number <= 0)) { + building_set_owner(u); + } } void u_set_ship(unit * u, ship * sh) { - assert(!u->ship); /* you must leave_ship */ - u->ship = sh; - if (sh && (!sh->_owner || sh->_owner->number <= 0)) { - ship_set_owner(u); - } + assert(!u->ship); /* you must leave_ship */ + u->ship = sh; + if (sh && (!sh->_owner || sh->_owner->number <= 0)) { + ship_set_owner(u); + } } void leave_ship(unit * u) { - struct ship *sh = u->ship; + struct ship *sh = u->ship; - u->ship = 0; - if (sh->_owner==u) { - ship_update_owner(sh); - sh->_owner = ship_owner(sh); - } - set_leftship(u, sh); + u->ship = 0; + if (sh->_owner == u) { + ship_update_owner(sh); + sh->_owner = ship_owner(sh); + } + set_leftship(u, sh); } void leave_building(unit * u) { - building * b = u->building; + building * b = u->building; - u->building = 0; - if (b->_owner==u) { - building_update_owner(b); - assert(b->_owner!=u); - } + u->building = 0; + if (b->_owner == u) { + building_update_owner(b); + assert(b->_owner != u); + } } bool can_leave(unit * u) { - static int gamecookie = -1; - static int rule_leave = -1; + static int gamecookie = -1; + static int rule_leave = -1; - if (!u->building) { + if (!u->building) { + return true; + } + + if (rule_leave < 0 || gamecookie != global.cookie) { + gamecookie = global.cookie; + rule_leave = get_param_int(global.parameters, "rules.move.owner_leave", 0); + } + + if (rule_leave && u->building && u == building_owner(u->building)) { + return false; + } return true; - } - - if (rule_leave < 0 || gamecookie != global.cookie) { - gamecookie = global.cookie; - rule_leave = get_param_int(global.parameters, "rules.move.owner_leave", 0); - } - - if (rule_leave && u->building && u == building_owner(u->building)) { - return false; - } - return true; } bool leave(unit * u, bool force) { - if (!force) { - if (!can_leave(u)) { - return false; + if (!force) { + if (!can_leave(u)) { + return false; + } } - } - if (u->building) { - leave_building(u); - } else if (u->ship) { - leave_ship(u); - } - return true; + if (u->building) { + leave_building(u); + } + else if (u->ship) { + leave_ship(u); + } + return true; } const struct race *urace(const struct unit *u) { - return u->race_; + return u->race_; } bool can_survive(const unit * u, const region * r) { - if ((fval(r->terrain, WALK_INTO) && (u_race(u)->flags & RCF_WALK)) - || (fval(r->terrain, SWIM_INTO) && (u_race(u)->flags & RCF_SWIM)) - || (fval(r->terrain, FLY_INTO) && (u_race(u)->flags & RCF_FLY))) { - static const curse_type *ctype = NULL; + if ((fval(r->terrain, WALK_INTO) && (u_race(u)->flags & RCF_WALK)) + || (fval(r->terrain, SWIM_INTO) && (u_race(u)->flags & RCF_SWIM)) + || (fval(r->terrain, FLY_INTO) && (u_race(u)->flags & RCF_FLY))) { + static const curse_type *ctype = NULL; - if (has_horses(u) && !fval(r->terrain, WALK_INTO)) - return false; + if (has_horses(u) && !fval(r->terrain, WALK_INTO)) + return false; - if (!ctype) - ctype = ct_find("holyground"); - if (fval(u_race(u), RCF_UNDEAD) && curse_active(get_curse(r->attribs, ctype))) - return false; + if (!ctype) + ctype = ct_find("holyground"); + if (fval(u_race(u), RCF_UNDEAD) && curse_active(get_curse(r->attribs, ctype))) + return false; - return true; - } - return false; + return true; + } + return false; } void move_unit(unit * u, region * r, unit ** ulist) { - assert(u && r); + assert(u && r); - assert(u->faction || !"this unit is dead"); - if (u->region == r) - return; - if (!ulist) - ulist = (&r->units); - if (u->region) { - setguard(u, GUARD_NONE); - fset(u, UFL_MOVED); - if (u->ship || u->building) { - /* can_leave must be checked in travel_i */ + assert(u->faction || !"this unit is dead"); + if (u->region == r) + return; + if (!ulist) + ulist = (&r->units); + if (u->region) { + setguard(u, GUARD_NONE); + fset(u, UFL_MOVED); + if (u->ship || u->building) { + /* can_leave must be checked in travel_i */ #ifndef NDEBUG - bool result = leave(u, false); - assert(result); + bool result = leave(u, false); + assert(result); #else - leave(u, false); + leave(u, false); #endif + } + translist(&u->region->units, ulist, u); + } + else { + addlist(ulist, u); } - translist(&u->region->units, ulist, u); - } else { - addlist(ulist, u); - } #ifdef SMART_INTERVALS - update_interval(u->faction, r); + update_interval(u->faction, r); #endif - u->region = r; + u->region = r; } /* ist mist, aber wegen nicht skalierender attribute notwendig: */ @@ -923,152 +932,159 @@ void move_unit(unit * u, region * r, unit ** ulist) void transfermen(unit * u, unit * u2, int n) { - const attrib *a; - int hp = u->hp; - region *r = u->region; + const attrib *a; + int hp = u->hp; + region *r = u->region; - if (n == 0) - return; - assert(n > 0); - /* "hat attackiert"-status wird uebergeben */ + if (n == 0) + return; + assert(n > 0); + /* "hat attackiert"-status wird uebergeben */ - if (u2) { - skill *sv, *sn; - skill_t sk; - ship *sh; + if (u2) { + skill *sv, *sn; + skill_t sk; + ship *sh; - assert(u2->number + n > 0); + assert(u2->number + n > 0); - for (sk = 0; sk != MAXSKILLS; ++sk) { - int weeks, level = 0; + for (sk = 0; sk != MAXSKILLS; ++sk) { + int weeks, level = 0; - sv = unit_skill(u, sk); - sn = unit_skill(u2, sk); + sv = unit_skill(u, sk); + sn = unit_skill(u2, sk); - if (sv == NULL && sn == NULL) - continue; - if (sn == NULL && u2->number == 0) { - /* new unit, easy to solve */ - level = sv->level; - weeks = sv->weeks; - } else { - double dlevel = 0.0; + if (sv == NULL && sn == NULL) + continue; + if (sn == NULL && u2->number == 0) { + /* new unit, easy to solve */ + level = sv->level; + weeks = sv->weeks; + } + else { + double dlevel = 0.0; - if (sv && sv->level) { - dlevel += (sv->level + 1 - sv->weeks / (sv->level + 1.0)) * n; - level += sv->level * n; + if (sv && sv->level) { + dlevel += (sv->level + 1 - sv->weeks / (sv->level + 1.0)) * n; + level += sv->level * n; + } + if (sn && sn->level) { + dlevel += + (sn->level + 1 - sn->weeks / (sn->level + 1.0)) * u2->number; + level += sn->level * u2->number; + } + + dlevel = dlevel / (n + u2->number); + level = level / (n + u2->number); + if (level <= dlevel) { + /* apply the remaining fraction to the number of weeks to go. + * subtract the according number of weeks, getting closer to the + * next level */ + level = (int)dlevel; + weeks = (level + 1) - (int)((dlevel - level) * (level + 1)); + } + else { + /* make it harder to reach the next level. + * weeks+level is the max difficulty, 1 - the fraction between + * level and dlevel applied to the number of weeks between this + * and the previous level is the added difficutly */ + level = (int)dlevel + 1; + weeks = 1 + 2 * level - (int)((1 + dlevel - level) * level); + } + } + if (level) { + if (sn == NULL) + sn = add_skill(u2, sk); + sn->level = (unsigned char)level; + sn->weeks = (unsigned char)weeks; + assert(sn->weeks > 0 && sn->weeks <= sn->level * 2 + 1); + assert(u2->number != 0 || (sn->level == sv->level + && sn->weeks == sv->weeks)); + } + else if (sn) { + remove_skill(u2, sk); + sn = NULL; + } } - if (sn && sn->level) { - dlevel += - (sn->level + 1 - sn->weeks / (sn->level + 1.0)) * u2->number; - level += sn->level * u2->number; + a = a_find(u->attribs, &at_effect); + while (a && a->type == &at_effect) { + effect_data *olde = (effect_data *)a->data.v; + if (olde->value) + change_effect(u2, olde->type, olde->value); + a = a->next; } - - dlevel = dlevel / (n + u2->number); - level = level / (n + u2->number); - if (level <= dlevel) { - /* apply the remaining fraction to the number of weeks to go. - * subtract the according number of weeks, getting closer to the - * next level */ - level = (int)dlevel; - weeks = (level + 1) - (int)((dlevel - level) * (level + 1)); - } else { - /* make it harder to reach the next level. - * weeks+level is the max difficulty, 1 - the fraction between - * level and dlevel applied to the number of weeks between this - * and the previous level is the added difficutly */ - level = (int)dlevel + 1; - weeks = 1 + 2 * level - (int)((1 + dlevel - level) * level); + sh = leftship(u); + if (sh != NULL) + set_leftship(u2, sh); + u2->flags |= + u->flags & (UFL_LONGACTION | UFL_NOTMOVING | UFL_HUNGER | UFL_MOVED | + UFL_ENTER); + if (u->attribs) { + transfer_curse(u, u2, n); } - } - if (level) { - if (sn == NULL) - sn = add_skill(u2, sk); - sn->level = (unsigned char)level; - sn->weeks = (unsigned char)weeks; - assert(sn->weeks > 0 && sn->weeks <= sn->level * 2 + 1); - assert(u2->number != 0 || (sn->level == sv->level - && sn->weeks == sv->weeks)); - } else if (sn) { - remove_skill(u2, sk); - sn = NULL; - } } - a = a_find(u->attribs, &at_effect); - while (a && a->type == &at_effect) { - effect_data *olde = (effect_data *) a->data.v; - if (olde->value) - change_effect(u2, olde->type, olde->value); - a = a->next; + scale_number(u, u->number - n); + if (u2) { + set_number(u2, u2->number + n); + hp -= u->hp; + u2->hp += hp; + /* TODO: Das ist schnarchlahm! und gehoert nicht hierhin */ + a = a_find(u2->attribs, &at_effect); + while (a && a->type == &at_effect) { + attrib *an = a->next; + effect_data *olde = (effect_data *)a->data.v; + int e = get_effect(u, olde->type); + if (e != 0) + change_effect(u2, olde->type, -e); + a = an; + } } - sh = leftship(u); - if (sh != NULL) - set_leftship(u2, sh); - u2->flags |= - u->flags & (UFL_LONGACTION | UFL_NOTMOVING | UFL_HUNGER | UFL_MOVED | - UFL_ENTER); - if (u->attribs) { - transfer_curse(u, u2, n); + else if (r->land) { + if ((u_race(u)->ec_flags & ECF_REC_ETHEREAL) == 0) { + const race *rc = u_race(u); + if (rc->ec_flags & ECF_REC_HORSES) { /* Zentauren an die Pferde */ + int h = rhorses(r) + n; + rsethorses(r, h); + } + else { + int p = rpeasants(r); + p += (int)(n * rc->recruit_multi); + rsetpeasants(r, p); + } + } } - } - scale_number(u, u->number - n); - if (u2) { - set_number(u2, u2->number + n); - hp -= u->hp; - u2->hp += hp; - /* TODO: Das ist schnarchlahm! und gehoert nicht hierhin */ - a = a_find(u2->attribs, &at_effect); - while (a && a->type == &at_effect) { - attrib *an = a->next; - effect_data *olde = (effect_data *) a->data.v; - int e = get_effect(u, olde->type); - if (e != 0) - change_effect(u2, olde->type, -e); - a = an; - } - } else if (r->land) { - if ((u_race(u)->ec_flags & ECF_REC_ETHEREAL) == 0) { - const race *rc = u_race(u); - if (rc->ec_flags & ECF_REC_HORSES) { /* Zentauren an die Pferde */ - int h = rhorses(r) + n; - rsethorses(r, h); - } else { - int p = rpeasants(r); - p += (int)(n * rc->recruit_multi); - rsetpeasants(r, p); - } - } - } } struct building *inside_building(const struct unit *u) { - if (u->building == NULL) - return NULL; + if (u->building == NULL) + return NULL; - if (!fval(u->building, BLD_WORKING)) { - /* Unterhalt nicht bezahlt */ - return NULL; - } else if (u->building->size < u->building->type->maxsize) { - /* Gebaeude noch nicht fertig */ - return NULL; - } else { - int p = 0, cap = buildingcapacity(u->building); - const unit *u2; - for (u2 = u->region->units; u2; u2 = u2->next) { - if (u2->building == u->building) { - p += u2->number; - if (u2 == u) { - if (p <= cap) - return u->building; - return NULL; - } - if (p > cap) - return NULL; - } + if (!fval(u->building, BLD_WORKING)) { + /* Unterhalt nicht bezahlt */ + return NULL; } - } - return NULL; + else if (u->building->size < u->building->type->maxsize) { + /* Gebaeude noch nicht fertig */ + return NULL; + } + else { + int p = 0, cap = buildingcapacity(u->building); + const unit *u2; + for (u2 = u->region->units; u2; u2 = u2->next) { + if (u2->building == u->building) { + p += u2->number; + if (u2 == u) { + if (p <= cap) + return u->building; + return NULL; + } + if (p > cap) + return NULL; + } + } + } + return NULL; } void u_setfaction(unit * u, faction * f) @@ -1088,7 +1104,7 @@ void u_setfaction(unit * u, faction * f) } if (u->prevF) { u->prevF->nextF = u->nextF; - } + } else { u->faction->units = u->nextF; } @@ -1121,101 +1137,102 @@ void u_setfaction(unit * u, faction * f) /* vorsicht Sprueche koennen u->number == RS_FARVISION haben! */ void set_number(unit * u, int count) { - assert(count >= 0); - assert(count <= UNIT_MAXSIZE); + assert(count >= 0); + assert(count <= UNIT_MAXSIZE); - if (count == 0) { - u->flags &= ~(UFL_HERO); - } - if (u->faction) { - u->faction->num_people += count - u->number; - } - u->number = (unsigned short)count; + if (count == 0) { + u->flags &= ~(UFL_HERO); + } + if (u->faction) { + u->faction->num_people += count - u->number; + } + u->number = (unsigned short)count; } bool learn_skill(unit * u, skill_t sk, double chance) { - skill *sv = u->skills; - if (chance < 1.0 && rng_int() % 10000 >= chance * 10000) - return false; - while (sv != u->skills + u->skill_size) { - assert(sv->weeks > 0); - if (sv->id == sk) { - if (sv->weeks <= 1) { - sk_set(sv, sv->level + 1); - } else { - sv->weeks--; - } - return true; + skill *sv = u->skills; + if (chance < 1.0 && rng_int() % 10000 >= chance * 10000) + return false; + while (sv != u->skills + u->skill_size) { + assert(sv->weeks > 0); + if (sv->id == sk) { + if (sv->weeks <= 1) { + sk_set(sv, sv->level + 1); + } + else { + sv->weeks--; + } + return true; + } + ++sv; } - ++sv; - } - sv = add_skill(u, sk); - sk_set(sv, 1); - return true; + sv = add_skill(u, sk); + sk_set(sv, 1); + return true; } void remove_skill(unit * u, skill_t sk) { - skill *sv = u->skills; - for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) { - if (sv->id == sk) { - skill *sl = u->skills + u->skill_size - 1; - if (sl != sv) { - *sv = *sl; - } - --u->skill_size; - return; + skill *sv = u->skills; + for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) { + if (sv->id == sk) { + skill *sl = u->skills + u->skill_size - 1; + if (sl != sv) { + *sv = *sl; + } + --u->skill_size; + return; + } } - } } skill *add_skill(unit * u, skill_t id) { - skill *sv = u->skills; + skill *sv = u->skills; #ifndef NDEBUG - for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) { - assert(sv->id != id); - } + for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) { + assert(sv->id != id); + } #endif - ++u->skill_size; - u->skills = realloc(u->skills, u->skill_size * sizeof(skill)); - sv = (u->skills + u->skill_size - 1); - sv->level = (unsigned char)0; - sv->weeks = (unsigned char)1; - sv->old = (unsigned char)0; - sv->id = (unsigned char)id; - return sv; + ++u->skill_size; + u->skills = realloc(u->skills, u->skill_size * sizeof(skill)); + sv = (u->skills + u->skill_size - 1); + sv->level = (unsigned char)0; + sv->weeks = (unsigned char)1; + sv->old = (unsigned char)0; + sv->id = (unsigned char)id; + return sv; } skill *unit_skill(const unit * u, skill_t sk) { - skill *sv = u->skills; - while (sv != u->skills + u->skill_size) { - if (sv->id == sk) - return sv; - ++sv; - } - return NULL; + skill *sv = u->skills; + while (sv != u->skills + u->skill_size) { + if (sv->id == sk) + return sv; + ++sv; + } + return NULL; } bool has_skill(const unit * u, skill_t sk) { - skill *sv = u->skills; - while (sv != u->skills + u->skill_size) { - if (sv->id == sk) { - return (sv->level > 0); + skill *sv = u->skills; + while (sv != u->skills + u->skill_size) { + if (sv->id == sk) { + return (sv->level > 0); + } + ++sv; } - ++sv; - } - return false; + return false; } static int item_invis(const unit *u) { const struct resource_type *rring = get_resourcetype(R_RING_OF_INVISIBILITY); const struct resource_type *rsphere = get_resourcetype(R_SPHERE_OF_INVISIBILITY); return (rring ? i_get(u->items, rring->itype) : 0) - + (rsphere ? i_get(u->items, rsphere->itype) * 100 : 0); + + (rsphere ? i_get(u->items, rsphere->itype) * 100 : 0); } static int item_modification(const unit * u, skill_t sk, int val) @@ -1240,123 +1257,124 @@ static int item_modification(const unit * u, skill_t sk, int val) static int att_modification(const unit * u, skill_t sk) { - double result = 0; - static bool init = false; - static const curse_type *skillmod_ct, *gbdream_ct, *worse_ct; - curse *c; + double result = 0; + static bool init = false; + static const curse_type *skillmod_ct, *gbdream_ct, *worse_ct; + curse *c; - if (!init) { - init = true; - skillmod_ct = ct_find("skillmod"); - gbdream_ct = ct_find("gbdream"); - worse_ct = ct_find("worse"); - } + if (!init) { + init = true; + skillmod_ct = ct_find("skillmod"); + gbdream_ct = ct_find("gbdream"); + worse_ct = ct_find("worse"); + } - c = get_curse(u->attribs, worse_ct); - if (c != NULL) - result += curse_geteffect(c); - if (skillmod_ct) { - attrib *a = a_find(u->attribs, &at_curse); - while (a && a->type == &at_curse) { - curse *c = (curse *) a->data.v; - if (c->type == skillmod_ct && c->data.i == sk) { + c = get_curse(u->attribs, worse_ct); + if (c != NULL) result += curse_geteffect(c); - break; - } - a = a->next; - } - } - - /* TODO hier kann nicht mit get/iscursed gearbeitet werden, da nur der - * jeweils erste vom Typ C_GBDREAM zurueckgegen wird, wir aber alle - * durchsuchen und aufaddieren muessen */ - if (u->region) { - double bonus = 0, malus = 0; - attrib *a = a_find(u->region->attribs, &at_curse); - while (a && a->type == &at_curse) { - curse *c = (curse *) a->data.v; - if (curse_active(c) && c->type == gbdream_ct) { - double mod = curse_geteffect(c); - unit *mage = c->magician; - /* wir suchen jeweils den groesten Bonus und den groesten Malus */ - if (mod > bonus) { - if (mage == NULL || mage->number == 0 - || alliedunit(mage, u->faction, HELP_GUARD)) { - bonus = mod; - } - } else if (mod < malus) { - if (mage == NULL || !alliedunit(mage, u->faction, HELP_GUARD)) { - malus = mod; - } + if (skillmod_ct) { + attrib *a = a_find(u->attribs, &at_curse); + while (a && a->type == &at_curse) { + curse *c = (curse *)a->data.v; + if (c->type == skillmod_ct && c->data.i == sk) { + result += curse_geteffect(c); + break; + } + a = a->next; } - } - a = a->next; } - result = result + bonus + malus; - } - return (int)result; + /* TODO hier kann nicht mit get/iscursed gearbeitet werden, da nur der + * jeweils erste vom Typ C_GBDREAM zurueckgegen wird, wir aber alle + * durchsuchen und aufaddieren muessen */ + if (u->region) { + double bonus = 0, malus = 0; + attrib *a = a_find(u->region->attribs, &at_curse); + while (a && a->type == &at_curse) { + curse *c = (curse *)a->data.v; + if (curse_active(c) && c->type == gbdream_ct) { + double mod = curse_geteffect(c); + unit *mage = c->magician; + /* wir suchen jeweils den groesten Bonus und den groesten Malus */ + if (mod > bonus) { + if (mage == NULL || mage->number == 0 + || alliedunit(mage, u->faction, HELP_GUARD)) { + bonus = mod; + } + } + else if (mod < malus) { + if (mage == NULL || !alliedunit(mage, u->faction, HELP_GUARD)) { + malus = mod; + } + } + } + a = a->next; + } + result = result + bonus + malus; + } + + return (int)result; } int get_modifier(const unit * u, skill_t sk, int level, const region * r, - bool noitem) +bool noitem) { - int bskill = level; - int skill = bskill; + int bskill = level; + int skill = bskill; - if (r && sk == SK_STEALTH) { - plane *pl = rplane(r); - if (pl && fval(pl, PFL_NOSTEALTH)) { - return 0; + if (r && sk == SK_STEALTH) { + plane *pl = rplane(r); + if (pl && fval(pl, PFL_NOSTEALTH)) { + return 0; + } } - } - skill += rc_skillmod(u_race(u), r, sk); - skill += att_modification(u, sk); + skill += rc_skillmod(u_race(u), r, sk); + skill += att_modification(u, sk); - if (!noitem) { - skill = item_modification(u, sk, skill); - } - skill = skillmod(u->attribs, u, r, sk, skill, SMF_ALWAYS); + if (!noitem) { + skill = item_modification(u, sk, skill); + } + skill = skillmod(u->attribs, u, r, sk, skill, SMF_ALWAYS); #ifdef HUNGER_REDUCES_SKILL - if (fval(u, UFL_HUNGER)) { - skill = skill / 2; - } + if (fval(u, UFL_HUNGER)) { + skill = skill / 2; + } #endif - return skill - bskill; + return skill - bskill; } int eff_skill(const unit * u, skill_t sk, const region * r) { - if (skill_enabled(sk)) { - int level = get_level(u, sk); - if (level > 0) { - int mlevel = level + get_modifier(u, sk, level, r, false); + if (skill_enabled(sk)) { + int level = get_level(u, sk); + if (level > 0) { + int mlevel = level + get_modifier(u, sk, level, r, false); - if (mlevel > 0) { - int skillcap = SkillCap(sk); - if (skillcap && mlevel > skillcap) { - return skillcap; + if (mlevel > 0) { + int skillcap = SkillCap(sk); + if (skillcap && mlevel > skillcap) { + return skillcap; + } + return mlevel; + } } - return mlevel; - } } - } - return 0; + return 0; } int eff_skill_study(const unit * u, skill_t sk, const region * r) { - int level = get_level(u, sk); - if (level > 0) { - int mlevel = level + get_modifier(u, sk, level, r, true); + int level = get_level(u, sk); + if (level > 0) { + int mlevel = level + get_modifier(u, sk, level, r, true); - if (mlevel > 0) - return mlevel; - } - return 0; + if (mlevel > 0) + return mlevel; + } + return 0; } int invisible(const unit * target, const unit * viewer) @@ -1387,68 +1405,71 @@ int invisible(const unit * target, const unit * viewer) */ void free_unit(unit * u) { - free(u->name); - free(u->display); - free_order(u->thisorder); - free_orders(&u->orders); - if (u->skills) - free(u->skills); - while (u->items) { - item *it = u->items->next; - u->items->next = NULL; - i_free(u->items); - u->items = it; - } - while (u->attribs) - a_remove(&u->attribs, u->attribs); - while (u->reservations) { - struct reservation *res = u->reservations; - u->reservations = res->next; - free(res); - } + free(u->name); + free(u->display); + free_order(u->thisorder); + free_orders(&u->orders); + if (u->skills) + free(u->skills); + while (u->items) { + item *it = u->items->next; + u->items->next = NULL; + i_free(u->items); + u->items = it; + } + while (u->attribs) + a_remove(&u->attribs, u->attribs); + while (u->reservations) { + struct reservation *res = u->reservations; + u->reservations = res->next; + free(res); + } } static void createunitid(unit * u, int id) { - if (id <= 0 || id > MAX_UNIT_NR || ufindhash(id) || dfindhash(id) - || forbiddenid(id)) - u->no = newunitid(); - else - u->no = id; - uhash(u); + if (id <= 0 || id > MAX_UNIT_NR || ufindhash(id) || dfindhash(id) + || forbiddenid(id)) + u->no = newunitid(); + else + u->no = id; + uhash(u); } void name_unit(unit * u) { - if (u_race(u)->generate_name) { - const char *gen_name = u_race(u)->generate_name(u); - if (gen_name) { - unit_setname(u, gen_name); - } else { - unit_setname(u, racename(u->faction->locale, u, u_race(u))); - } - } else { - char name[32]; - const char * result; - const struct locale * lang = u->faction ? u->faction->locale : default_locale; - if (lang) { - static const char * prefix[MAXLOCALES]; - int i = locale_index(lang); - if (!prefix[i]) { - prefix[i] = LOC(lang, "unitdefault"); - if (!prefix[i]) { - prefix[i] = parameters[P_UNIT]; + if (u_race(u)->generate_name) { + const char *gen_name = u_race(u)->generate_name(u); + if (gen_name) { + unit_setname(u, gen_name); + } + else { + unit_setname(u, racename(u->faction->locale, u, u_race(u))); } - } - result = prefix[i]; - } else { - result = parameters[P_UNIT]; } - strlcpy(name, result, sizeof(name)); - strlcat(name, " ", sizeof(name)); - strlcat(name, itoa36(u->no), sizeof(name)); - unit_setname(u, name); - } + else { + char name[32]; + const char * result; + const struct locale * lang = u->faction ? u->faction->locale : default_locale; + if (lang) { + static const char * prefix[MAXLOCALES]; + int i = locale_index(lang); + if (!prefix[i]) { + prefix[i] = LOC(lang, "unitdefault"); + if (!prefix[i]) { + prefix[i] = parameters[P_UNIT]; + } + } + result = prefix[i]; + } + else { + result = parameters[P_UNIT]; + } + strlcpy(name, result, sizeof(name)); + strlcat(name, " ", sizeof(name)); + strlcat(name, itoa36(u->no), sizeof(name)); + unit_setname(u, name); + } } /** creates a new unit. @@ -1457,340 +1478,342 @@ void name_unit(unit * u) * @param creator: unit to inherit stealth, group, building, ship, etc. from */ unit *create_unit(region * r, faction * f, int number, const struct race *urace, - int id, const char *dname, unit * creator) + int id, const char *dname, unit * creator) { - unit *u = (unit *)calloc(1, sizeof(unit)); + unit *u = (unit *)calloc(1, sizeof(unit)); - assert(urace); - if (f) { - assert(f->alive); - u_setfaction(u, f); + assert(urace); + if (f) { + assert(f->alive); + u_setfaction(u, f); - if (f->locale) { - order *deford = default_order(f->locale); - if (deford) { - set_order(&u->thisorder, NULL); - addlist(&u->orders, deford); - } + if (f->locale) { + order *deford = default_order(f->locale); + if (deford) { + set_order(&u->thisorder, NULL); + addlist(&u->orders, deford); + } + } } - } - u_seteffstealth(u, -1); - u_setrace(u, urace); - u->irace = NULL; + u_seteffstealth(u, -1); + u_setrace(u, urace); + u->irace = NULL; - set_number(u, number); + set_number(u, number); - /* die nummer der neuen einheit muss vor name_unit generiert werden, - * da der default name immer noch 'Nummer u->no' ist */ - createunitid(u, id); + /* die nummer der neuen einheit muss vor name_unit generiert werden, + * da der default name immer noch 'Nummer u->no' ist */ + createunitid(u, id); - /* zuerst in die Region setzen, da zb Drachennamen den Regionsnamen - * enthalten */ - if (r) - move_unit(u, r, NULL); + /* zuerst in die Region setzen, da zb Drachennamen den Regionsnamen + * enthalten */ + if (r) + move_unit(u, r, NULL); - /* u->race muss bereits gesetzt sein, wird fuer default-hp gebraucht */ - /* u->region auch */ - u->hp = unit_max_hp(u) * number; + /* u->race muss bereits gesetzt sein, wird fuer default-hp gebraucht */ + /* u->region auch */ + u->hp = unit_max_hp(u) * number; - if (!dname) { - name_unit(u); - } else { - u->name = _strdup(dname); - } - - if (creator) { - attrib *a; - - /* erbt Kampfstatus */ - setstatus(u, creator->status); - - /* erbt Gebaeude/Schiff */ - if (creator->region == r) { - if (creator->building) { - u_set_building(u, creator->building); - } - if (creator->ship && fval(u_race(u), RCF_CANSAIL)) { - u_set_ship(u, creator->ship); - } + if (!dname) { + name_unit(u); + } + else { + u->name = _strdup(dname); } - /* Tarnlimit wird vererbt */ - if (fval(creator, UFL_STEALTH)) { - attrib *a = a_find(creator->attribs, &at_stealth); - if (a) { - int stealth = a->data.i; - a = a_add(&u->attribs, a_new(&at_stealth)); - a->data.i = stealth; - } + if (creator) { + attrib *a; + + /* erbt Kampfstatus */ + setstatus(u, creator->status); + + /* erbt Gebaeude/Schiff */ + if (creator->region == r) { + if (creator->building) { + u_set_building(u, creator->building); + } + if (creator->ship && fval(u_race(u), RCF_CANSAIL)) { + u_set_ship(u, creator->ship); + } + } + + /* Tarnlimit wird vererbt */ + if (fval(creator, UFL_STEALTH)) { + attrib *a = a_find(creator->attribs, &at_stealth); + if (a) { + int stealth = a->data.i; + a = a_add(&u->attribs, a_new(&at_stealth)); + a->data.i = stealth; + } + } + + /* Temps von parteigetarnten Einheiten sind wieder parteigetarnt */ + if (fval(creator, UFL_ANON_FACTION)) { + fset(u, UFL_ANON_FACTION); + } + /* Daemonentarnung */ + set_racename(&u->attribs, get_racename(creator->attribs)); + if (fval(u_race(u), RCF_SHAPESHIFT) && fval(u_race(creator), RCF_SHAPESHIFT)) { + u->irace = creator->irace; + } + + /* Gruppen */ + if (creator->faction == f && fval(creator, UFL_GROUP)) { + a = a_find(creator->attribs, &at_group); + if (a) { + group *g = (group *)a->data.v; + set_group(u, g); + } + } + a = a_find(creator->attribs, &at_otherfaction); + if (a) { + a_add(&u->attribs, make_otherfaction(get_otherfaction(a))); + } + + a = a_add(&u->attribs, a_new(&at_creator)); + a->data.v = creator; } - /* Temps von parteigetarnten Einheiten sind wieder parteigetarnt */ - if (fval(creator, UFL_ANON_FACTION)) { - fset(u, UFL_ANON_FACTION); - } - /* Daemonentarnung */ - set_racename(&u->attribs, get_racename(creator->attribs)); - if (fval(u_race(u), RCF_SHAPESHIFT) && fval(u_race(creator), RCF_SHAPESHIFT)) { - u->irace = creator->irace; - } - - /* Gruppen */ - if (creator->faction == f && fval(creator, UFL_GROUP)) { - a = a_find(creator->attribs, &at_group); - if (a) { - group *g = (group *) a->data.v; - set_group(u, g); - } - } - a = a_find(creator->attribs, &at_otherfaction); - if (a) { - a_add(&u->attribs, make_otherfaction(get_otherfaction(a))); - } - - a = a_add(&u->attribs, a_new(&at_creator)); - a->data.v = creator; - } - - return u; + return u; } int maxheroes(const struct faction *f) { - int nsize = count_all(f); - if (nsize == 0) - return 0; - else { - int nmax = (int)(log10(nsize / 50.0) * 20); - return (nmax < 0) ? 0 : nmax; - } + int nsize = count_all(f); + if (nsize == 0) + return 0; + else { + int nmax = (int)(log10(nsize / 50.0) * 20); + return (nmax < 0) ? 0 : nmax; + } } int countheroes(const struct faction *f) { - const unit *u = f->units; - int n = 0; + const unit *u = f->units; + int n = 0; - while (u) { - if (fval(u, UFL_HERO)) - n += u->number; - u = u->nextF; - } + while (u) { + if (fval(u, UFL_HERO)) + n += u->number; + u = u->nextF; + } #ifdef DEBUG_MAXHEROES - int m = maxheroes(f); - if (n > m) { - log_warning("%s has %d of %d heroes\n", factionname(f), n, m); - } + int m = maxheroes(f); + if (n > m) { + log_warning("%s has %d of %d heroes\n", factionname(f), n, m); + } #endif - return n; + return n; } const char *unit_getname(const unit * u) { - return (const char *)u->name; + return (const char *)u->name; } void unit_setname(unit * u, const char *name) { - free(u->name); - if (name) - u->name = _strdup(name); - else - u->name = NULL; + free(u->name); + if (name) + u->name = _strdup(name); + else + u->name = NULL; } const char *unit_getinfo(const unit * u) { - return (const char *)u->display; + return (const char *)u->display; } void unit_setinfo(unit * u, const char *info) { - free(u->display); - if (info) - u->display = _strdup(info); - else - u->display = NULL; + free(u->display); + if (info) + u->display = _strdup(info); + else + u->display = NULL; } int unit_getid(const unit * u) { - return u->no; + return u->no; } void unit_setid(unit * u, int id) { - unit *nu = findunit(id); - if (nu == NULL) { - uunhash(u); - u->no = id; - uhash(u); - } + unit *nu = findunit(id); + if (nu == NULL) { + uunhash(u); + u->no = id; + uhash(u); + } } int unit_gethp(const unit * u) { - return u->hp; + return u->hp; } void unit_sethp(unit * u, int hp) { - u->hp = hp; + u->hp = hp; } status_t unit_getstatus(const unit * u) { - return u->status; + return u->status; } void unit_setstatus(unit * u, status_t status) { - u->status = status; + u->status = status; } int unit_getweight(const unit * u) { - return weight(u); + return weight(u); } int unit_getcapacity(const unit * u) { - return walkingcapacity(u); + return walkingcapacity(u); } void unit_addorder(unit * u, order * ord) { - order **ordp = &u->orders; - while (*ordp) - ordp = &(*ordp)->next; - *ordp = ord; - u->faction->lastorders = turn; + order **ordp = &u->orders; + while (*ordp) + ordp = &(*ordp)->next; + *ordp = ord; + u->faction->lastorders = turn; } int unit_max_hp(const unit * u) { - static int rules_stamina = -1; - int h; - double p; - static const curse_type *heal_ct = NULL; + static int rules_stamina = -1; + int h; + double p; + static const curse_type *heal_ct = NULL; - if (rules_stamina < 0) { - rules_stamina = - get_param_int(global.parameters, "rules.stamina", STAMINA_AFFECTS_HP); - } - h = u_race(u)->hitpoints; - if (heal_ct == NULL) - heal_ct = ct_find("healingzone"); - - if (rules_stamina & 1) { - p = pow(effskill(u, SK_STAMINA) / 2.0, 1.5) * 0.2; - h += (int)(h * p + 0.5); - } - /* der healing curse veraendert die maximalen hp */ - if (heal_ct) { - curse *c = get_curse(u->region->attribs, heal_ct); - if (c) { - h = (int)(h * (1.0 + (curse_geteffect(c) / 100))); + if (rules_stamina < 0) { + rules_stamina = + get_param_int(global.parameters, "rules.stamina", STAMINA_AFFECTS_HP); } - } + h = u_race(u)->hitpoints; + if (heal_ct == NULL) + heal_ct = ct_find("healingzone"); - return h; + if (rules_stamina & 1) { + p = pow(effskill(u, SK_STAMINA) / 2.0, 1.5) * 0.2; + h += (int)(h * p + 0.5); + } + /* der healing curse veraendert die maximalen hp */ + if (heal_ct) { + curse *c = get_curse(u->region->attribs, heal_ct); + if (c) { + h = (int)(h * (1.0 + (curse_geteffect(c) / 100))); + } + } + + return h; } void scale_number(unit * u, int n) { - skill_t sk; - const attrib *a; - int remain; + const attrib *a; + int remain; - if (n == u->number) - return; - if (n && u->number > 0) { - int full; - remain = ((u->hp % u->number) * (n % u->number)) % u->number; + if (n == u->number) + return; + if (n && u->number > 0) { + int full; + remain = ((u->hp % u->number) * (n % u->number)) % u->number; - full = u->hp / u->number; /* wieviel kriegt jede person mindestens */ - u->hp = full * n + (u->hp - full * u->number) * n / u->number; - assert(u->hp >= 0); - if ((rng_int() % u->number) < remain) - ++u->hp; /* Nachkommastellen */ - } else { - remain = 0; - u->hp = 0; - } - if (u->number > 0) { - for (a = a_find(u->attribs, &at_effect); a && a->type == &at_effect; - a = a->next) { - effect_data *data = (effect_data *) a->data.v; - int snew = data->value / u->number * n; - if (n) { - remain = data->value - snew / n * u->number; - snew += remain * n / u->number; - remain = (remain * n) % u->number; + full = u->hp / u->number; /* wieviel kriegt jede person mindestens */ + u->hp = full * n + (u->hp - full * u->number) * n / u->number; + assert(u->hp >= 0); if ((rng_int() % u->number) < remain) - ++snew; /* Nachkommastellen */ - } - data->value = snew; + ++u->hp; /* Nachkommastellen */ } - } - if (u->number == 0 || n == 0) { - for (sk = 0; sk < MAXSKILLS; sk++) { - remove_skill(u, sk); + else { + remain = 0; + u->hp = 0; + } + if (u->number > 0) { + for (a = a_find(u->attribs, &at_effect); a && a->type == &at_effect; + a = a->next) { + effect_data *data = (effect_data *)a->data.v; + int snew = data->value / u->number * n; + if (n) { + remain = data->value - snew / n * u->number; + snew += remain * n / u->number; + remain = (remain * n) % u->number; + if ((rng_int() % u->number) < remain) + ++snew; /* Nachkommastellen */ + } + data->value = snew; + } + } + if (u->number == 0 || n == 0) { + skill_t sk; + for (sk = 0; sk < MAXSKILLS; sk++) { + remove_skill(u, sk); + } } - } - set_number(u, n); + set_number(u, n); } const struct race *u_irace(const struct unit *u) { - if (u->irace && skill_enabled(SK_STEALTH)) { - return u->irace; - } - return u->race_; + if (u->irace && skill_enabled(SK_STEALTH)) { + return u->irace; + } + return u->race_; } const struct race *u_race(const struct unit *u) { - return u->race_; + return u->race_; } void u_setrace(struct unit *u, const struct race *rc) { - assert(rc); - u->race_ = rc; + assert(rc); + u->race_ = rc; } void unit_add_spell(unit * u, sc_mage * m, struct spell * sp, int level) { - sc_mage *mage = m ? m : get_mage(u); + sc_mage *mage = m ? m : get_mage(u); - if (!mage) { - log_debug("adding new spell %s to a previously non-mage unit %s\n", sp->sname, unitname(u)); - mage = create_mage(u, u->faction?u->faction->magiegebiet:M_GRAY); - } - if (!mage->spellbook) { - mage->spellbook = create_spellbook(0); - } - spellbook_add(mage->spellbook, sp, level); + if (!mage) { + log_debug("adding new spell %s to a previously non-mage unit %s\n", sp->sname, unitname(u)); + mage = create_mage(u, u->faction ? u->faction->magiegebiet : M_GRAY); + } + if (!mage->spellbook) { + mage->spellbook = create_spellbook(0); + } + spellbook_add(mage->spellbook, sp, level); } struct spellbook * unit_get_spellbook(const struct unit * u) { - sc_mage * mage = get_mage(u); - if (mage) { - if (mage->spellbook) { - return mage->spellbook; + sc_mage * mage = get_mage(u); + if (mage) { + if (mage->spellbook) { + return mage->spellbook; + } + if (mage->magietyp != M_GRAY) { + return faction_get_spellbook(u->faction); + } } - if (mage->magietyp!=M_GRAY) { - return faction_get_spellbook(u->faction); - } - } - return 0; + return 0; } int effskill(const unit * u, skill_t sk) { - return eff_skill(u, sk, u->region); + return eff_skill(u, sk, u->region); } diff --git a/src/kernel/unit.test.c b/src/kernel/unit.test.c new file mode 100644 index 000000000..6f3618e73 --- /dev/null +++ b/src/kernel/unit.test.c @@ -0,0 +1,41 @@ +#include +#include +#include "alchemy.h" +#include "unit.h" +#include "item.h" +#include "region.h" + +#include +#include + +#include +#include + +static void test_scale_number(CuTest *tc) { + unit *u; + const struct potion_type *ptype; + + test_cleanup(); + test_create_world(); + ptype = new_potiontype(it_get_or_create(rt_get_or_create("hodor")), 1); + u = test_create_unit(test_create_faction(test_create_race("human")), findregion(0, 0)); + change_effect(u, ptype, 1); + CuAssertIntEquals(tc, 1, u->number); + CuAssertIntEquals(tc, 1, u->hp); + CuAssertIntEquals(tc, 1, get_effect(u, ptype)); + scale_number(u, 2); + CuAssertIntEquals(tc, 2, u->number); + CuAssertIntEquals(tc, 2, u->hp); + CuAssertIntEquals(tc, 2, get_effect(u, ptype)); + set_level(u, SK_ALCHEMY, 1); + scale_number(u, 0); + CuAssertIntEquals(tc, 0, get_level(u, SK_ALCHEMY)); + test_cleanup(); +} + +CuSuite *get_unit_suite(void) +{ + CuSuite *suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_scale_number); + return suite; +} diff --git a/src/modules/autoseed.c b/src/modules/autoseed.c index d06863cd4..fbf4f32ac 100644 --- a/src/modules/autoseed.c +++ b/src/modules/autoseed.c @@ -515,6 +515,7 @@ int autoseed(newfaction ** players, int nsize, int max_agediff) static const terrain_type **terrainarr = 0; static int *distribution; + assert(players); if (nterrains < 0) { int n = 0; const terrain_type *terrain = terrains(); diff --git a/src/test_eressea.c b/src/test_eressea.c index 8bc2f0dd4..0f69edd03 100644 --- a/src/test_eressea.c +++ b/src/test_eressea.c @@ -36,6 +36,7 @@ int RunAllTests(void) ADD_TESTS(suite, umlaut); ADD_TESTS(suite, strings); /* kernel */ + ADD_TESTS(suite, unit); ADD_TESTS(suite, faction); ADD_TESTS(suite, build); ADD_TESTS(suite, pool);