diff --git a/conf/e2/config.json b/conf/e2/config.json index 6b11dceff..1ae7f77e5 100644 --- a/conf/e2/config.json +++ b/conf/e2/config.json @@ -23,7 +23,6 @@ "world.era": 2, "seed.population.min": 8, "seed.population.max": 8, - "rules.ship.damage_drift": 0.00, "rules.reserve.twophase": true, "rules.give.max_men": -1, "rules.check_overload": false, diff --git a/conf/e3/config.json b/conf/e3/config.json index a6685a06f..9e360de77 100644 --- a/conf/e3/config.json +++ b/conf/e3/config.json @@ -61,7 +61,6 @@ "rules.stealth.anon_battle": false, "rules.check_overload": false, "rules.combat.goblinbonus": 3, - "rules.ship.damage_drift": 0.00, "rules.alliances": true, "rules.combat.herospeed": 3, "rules.combat.demon_vampire": 5, diff --git a/conf/e4/config.json b/conf/e4/config.json index 90c60d72b..3b4bff30d 100644 --- a/conf/e4/config.json +++ b/conf/e4/config.json @@ -59,7 +59,6 @@ "rules.stealth.anon_battle": false, "rules.check_overload": false, "rules.combat.goblinbonus": 3, - "rules.ship.damage_drift": 0.00, "rules.alliances": true, "rules.combat.herospeed": 3, "rules.combat.demon_vampire": 5, diff --git a/src/laws.c b/src/laws.c index 15c5404b4..f508c4b69 100755 --- a/src/laws.c +++ b/src/laws.c @@ -2673,13 +2673,12 @@ int combatspell_cmd(unit * u, struct order *ord) return 0; } -/* Beachten: einige Monster sollen auch unbewaffent die Region bewachen -* können */ guard_t can_start_guarding(const unit * u) { if (u->status >= ST_FLEE || fval(u, UFL_FLEEING)) return E_GUARD_FLEEING; - if (fval(u_race(u), RCF_UNARMEDGUARD)) + /* Monster der Monsterpartei dürfen immer bewachen */ + if (is_monsters(u->faction) || fval(u_race(u), RCF_UNARMEDGUARD)) return E_GUARD_OK; if (!armedmen(u, true)) return E_GUARD_UNARMED; @@ -2713,24 +2712,18 @@ int guard_on_cmd(unit * u, struct order *ord) cmistake(u, ord, 95, MSG_EVENT); } else { - /* Monster der Monsterpartei dürfen immer bewachen */ - if (is_monsters(u->faction)) { + int err = can_start_guarding(u); + if (err == E_GUARD_OK) { guard(u, GUARD_ALL); } - else { - int err = can_start_guarding(u); - if (err == E_GUARD_OK) { - guard(u, GUARD_ALL); - } - else if (err == E_GUARD_UNARMED) { - ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "unit_unarmed", "")); - } - else if (err == E_GUARD_FLEEING) { - cmistake(u, ord, 320, MSG_EVENT); - } - else if (err == E_GUARD_NEWBIE) { - cmistake(u, ord, 304, MSG_EVENT); - } + else if (err == E_GUARD_UNARMED) { + ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "unit_unarmed", "")); + } + else if (err == E_GUARD_FLEEING) { + cmistake(u, ord, 320, MSG_EVENT); + } + else if (err == E_GUARD_NEWBIE) { + cmistake(u, ord, 304, MSG_EVENT); } } } diff --git a/src/laws.test.c b/src/laws.test.c index e829eff27..daa67eb86 100644 --- a/src/laws.test.c +++ b/src/laws.test.c @@ -635,6 +635,7 @@ static void test_newbie_cannot_guard(CuTest *tc) { setup_guard(&fix, true); set_param(&global.parameters, "NewbieImmunity", "4"); CuAssertTrue(tc, IsImmune(fix.u->faction)); + CuAssertIntEquals(tc, E_GUARD_NEWBIE, can_start_guarding(fix.u)); update_guards(); CuAssertTrue(tc, !fval(fix.u, UFL_GUARD)); test_cleanup(); @@ -644,6 +645,7 @@ static void test_unarmed_cannot_guard(CuTest *tc) { guard_fixture fix; setup_guard(&fix, false); + CuAssertIntEquals(tc, E_GUARD_UNARMED, can_start_guarding(fix.u)); update_guards(); CuAssertTrue(tc, !fval(fix.u, UFL_GUARD)); test_cleanup(); @@ -656,6 +658,18 @@ static void test_unarmed_races_can_guard(CuTest *tc) { setup_guard(&fix, false); rc = rc_get_or_create(fix.u->_race->_name); rc->flags |= RCF_UNARMEDGUARD; + CuAssertIntEquals(tc, E_GUARD_OK, can_start_guarding(fix.u)); + update_guards(); + CuAssertTrue(tc, fval(fix.u, UFL_GUARD)); + test_cleanup(); +} + +static void test_monsters_can_guard(CuTest *tc) { + guard_fixture fix; + + setup_guard(&fix, false); + u_setfaction(fix.u, get_or_create_monsters()); + CuAssertIntEquals(tc, E_GUARD_OK, can_start_guarding(fix.u)); update_guards(); CuAssertTrue(tc, fval(fix.u, UFL_GUARD)); test_cleanup(); @@ -666,7 +680,7 @@ static void test_low_skill_cannot_guard(CuTest *tc) { setup_guard(&fix, true); set_level(fix.u, SK_MELEE, 1); - fix.u->status = ST_FLEE; + CuAssertIntEquals(tc, E_GUARD_UNARMED, can_start_guarding(fix.u)); update_guards(); CuAssertTrue(tc, !fval(fix.u, UFL_GUARD)); test_cleanup(); @@ -677,6 +691,7 @@ static void test_fleeing_cannot_guard(CuTest *tc) { setup_guard(&fix, true); fix.u->status = ST_FLEE; + CuAssertIntEquals(tc, E_GUARD_FLEEING, can_start_guarding(fix.u)); update_guards(); CuAssertTrue(tc, !fval(fix.u, UFL_GUARD)); test_cleanup(); @@ -1269,6 +1284,7 @@ CuSuite *get_laws_suite(void) SUITE_ADD_TEST(suite, test_newbie_cannot_guard); SUITE_ADD_TEST(suite, test_unarmed_cannot_guard); SUITE_ADD_TEST(suite, test_unarmed_races_can_guard); + SUITE_ADD_TEST(suite, test_monsters_can_guard); SUITE_ADD_TEST(suite, test_fleeing_cannot_guard); SUITE_ADD_TEST(suite, test_low_skill_cannot_guard); SUITE_ADD_TEST(suite, test_reserve_self); diff --git a/src/monsters.c b/src/monsters.c index 0ab88fa61..3474c6b45 100644 --- a/src/monsters.c +++ b/src/monsters.c @@ -75,16 +75,14 @@ #define DRAGON_RANGE 20 /* Max. Distanz zum nächsten Drachenziel */ #define MAXILLUSION_TEXTS 3 +static double attack_chance; /* rules.monsters.attack_chance, or default 0.4 */ + static void give_peasants(unit *u, const item_type *itype, int reduce) { char buf[64]; slprintf(buf, sizeof(buf), "%s 0 %d %s", LOC(u->faction->locale, keyword(K_GIVE)), reduce, LOC(u->faction->locale, itype->rtype->_name)); unit_addorder(u, parse_order(buf, u->faction->locale)); } -static double monster_attack_chance(void) { - return get_param_flt(global.parameters, "rules.monsters.attack_chance", 0.4f); -} - static void reduce_weight(unit * u) { int capacity, weight = 0; @@ -157,15 +155,15 @@ static order *monster_attack(unit * u, const unit * target) return create_order(K_ATTACK, u->faction->locale, "%i", target->no); } -static order *get_money_for_dragon(region * r, unit * u, int wanted) +static order *get_money_for_dragon(region * r, unit * udragon, int wanted) { int n; - bool attacks = monster_attack_chance() > 0.0; + bool attacks = attack_chance > 0.0; /* falls genug geld in der region ist, treiben wir steuern ein. */ if (rmoney(r) >= wanted) { /* 5% chance, dass der drache aus einer laune raus attackiert */ - if (!attacks || chance(1.0 - u_race(u)->aggression)) { + if (!attacks || chance(1.0 - u_race(udragon)->aggression)) { /* Drachen haben in E3 und E4 keine Einnahmen. Neuer Befehl Pluendern erstmal nur fuer Monster?*/ return create_order(K_LOOT, default_locale, NULL); } @@ -174,15 +172,15 @@ static order *get_money_for_dragon(region * r, unit * u, int wanted) /* falls der drache launisch ist, oder das regionssilber knapp, greift er alle an * und holt sich Silber von Einheiten, vorausgesetzt er bewacht bereits */ n = 0; - if (attacks && is_guard(u, GUARD_TAX)) { - unit *u2; - for (u2 = r->units; u2; u2 = u2->next) { - if (u2->faction != u->faction && cansee(u->faction, r, u2, 0) && !in_safe_building(u, u2)) { - int m = get_money(u2); + if (attacks && is_guard(udragon, GUARD_TAX)) { + unit *u; + for (u = r->units; u; u = u->next) { + if (u->faction != udragon->faction && cansee(udragon->faction, r, u, 0) && !in_safe_building(u, udragon)) { + int m = get_money(u); if (m != 0) { - order *ord = monster_attack(u, u2); + order *ord = monster_attack(udragon, u); if (ord) { - addlist(&u->orders, ord); + addlist(&udragon->orders, ord); n += m; } } @@ -759,14 +757,13 @@ static order *plan_dragon(unit * u) void plan_monsters(faction * f) { region *r; - double attack_chance = monster_attack_chance(); - + assert(f); + attack_chance = get_param_flt(global.parameters, "rules.monsters.attack_chance", 0.4); f->lastorders = turn; for (r = regions; r; r = r->next) { unit *u; - double rchance = attack_chance; bool attacking = false; for (u = r->units; u; u = u->next) { @@ -785,10 +782,8 @@ void plan_monsters(faction * f) produceexp(u, SK_PERCEPTION, u->number); } - if (rchance > 0.0) { - if (chance(rchance)) - attacking = true; - rchance = 0.0; + if (!attacking) { + if (chance(attack_chance)) attacking = true; } if (u->status > ST_BEHIND) { setstatus(u, ST_FIGHT); @@ -802,8 +797,10 @@ void plan_monsters(faction * f) if (ta && !monster_is_waiting(u)) { unit *tu = (unit *)ta->data.v; if (tu && tu->region == r) { - addlist(&u->orders, - create_order(K_ATTACK, u->faction->locale, "%i", tu->no)); + order * ord = monster_attack(u, tu); + if (ord) { + addlist(&u->orders, ord); + } } else if (tu) { tu = findunitg(ta->data.i, NULL);