From 4477785da0ca1760c2246a0d29b4271e68c14b54 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 9 Nov 2015 17:08:41 +0100 Subject: [PATCH 1/2] first release candidate --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index 5fadb0042..ecfc833e6 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 7 -#define VERSION_BUILD 0 +#define VERSION_BUILD 1 From 4eb4ff40acd7b09a14dbe91582f94a0860f99659 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 11 Nov 2015 14:36:56 +0100 Subject: [PATCH 2/2] https://bugs.eressea.de/view.php?id=2155 monsters do not attack units inside a castle or watch dragons do not attack guards --- res/buildings/castle-2.xml | 2 +- res/buildings/castle.xml | 2 +- res/e3a/buildings.xml | 2 +- src/kernel/building.h | 1 + src/kernel/jsonconf.c | 2 +- src/kernel/xmlreader.c | 2 + src/monsters.c | 77 ++++++++++++++++++++------------------ 7 files changed, 47 insertions(+), 41 deletions(-) diff --git a/res/buildings/castle-2.xml b/res/buildings/castle-2.xml index 76c908572..f32b5f480 100644 --- a/res/buildings/castle-2.xml +++ b/res/buildings/castle-2.xml @@ -1,5 +1,5 @@ - + diff --git a/res/buildings/castle.xml b/res/buildings/castle.xml index 49d1ca5a8..e4e295a71 100644 --- a/res/buildings/castle.xml +++ b/res/buildings/castle.xml @@ -1,5 +1,5 @@ - + diff --git a/res/e3a/buildings.xml b/res/e3a/buildings.xml index d95f5ce86..ef4ef4199 100644 --- a/res/e3a/buildings.xml +++ b/res/e3a/buildings.xml @@ -3,7 +3,7 @@ - + diff --git a/src/kernel/building.h b/src/kernel/building.h index c0796b352..936c8ade4 100644 --- a/src/kernel/building.h +++ b/src/kernel/building.h @@ -47,6 +47,7 @@ extern "C" { #define BTF_MAGIC 0x40 /* magical effect */ #define BTF_ONEPERTURN 0x80 /* one one sizepoint can be added per turn */ #define BTF_NAMECHANGE 0x100 /* name and description can be changed more than once */ +#define BTF_FORTIFICATION 0x200 /* safe from monsters */ typedef enum { DEFENSE_BONUS, diff --git a/src/kernel/jsonconf.c b/src/kernel/jsonconf.c index 5fc3eea34..9efbc0250 100644 --- a/src/kernel/jsonconf.c +++ b/src/kernel/jsonconf.c @@ -305,7 +305,7 @@ static void json_terrain(cJSON *json, terrain_type *ter) { static void json_building(cJSON *json, building_type *bt) { cJSON *child; const char *flags[] = { - "nodestroy", "nobuild", "unique", "decay", "dynamic", "magic", "oneperturn", "namechange", 0 + "nodestroy", "nobuild", "unique", "decay", "dynamic", "magic", "oneperturn", "namechange", "fort", 0 }; if (json->type != cJSON_Object) { log_error("building %s is not a json object: %d", json->string, json->type); diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c index fdaad4b51..28a351a72 100644 --- a/src/kernel/xmlreader.c +++ b/src/kernel/xmlreader.c @@ -270,6 +270,8 @@ static int parse_buildings(xmlDocPtr doc) btype->flags |= BTF_DECAY; if (xml_bvalue(node, "magic", false)) btype->flags |= BTF_MAGIC; + if (xml_bvalue(node, "fort", false)) + btype->flags |= BTF_FORTIFICATION; /* reading eressea/buildings/building/construction */ xpath->node = node; diff --git a/src/monsters.c b/src/monsters.c index bc195174c..4da2d0076 100644 --- a/src/monsters.c +++ b/src/monsters.c @@ -36,6 +36,7 @@ /* kernel includes */ #include +#include #include #include #include @@ -156,45 +157,47 @@ 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) -{ - unit *u2; - int n; - double attack_chance = monster_attack_chance(); - - if (attack_chance > 0.0 && is_guard(u, GUARD_TAX)) { - /* attackiere bewachende Einheiten nur wenn wir selbst schon bewachen */ - for (u2 = r->units; u2; u2 = u2->next) { - if (u2 != u && is_guard(u2, GUARD_TAX) && u->faction!=u2->faction) { - /*In E3 + E4 etwas problematisch, da der Regionsbesitzer immer bewacht. Der Drache greift also immer die Burg an!*/ - order *ord = monster_attack(u, u2); - if (ord) - addlist(&u->orders, ord); - } +static bool in_safe_building(unit *u1, unit *u2) { + if (u1->building && u2->building == u1->building) { + building * b = inside_building(u1); + if (u2->building) { + if (b != inside_building(u2)) return true; + } + if (b->type->flags & BTF_FORTIFICATION) { + return true; } } + return false; +} + +static order *get_money_for_dragon(region * r, unit * u, int wanted) +{ + int n; + bool attacks = monster_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 (attack_chance <= 0.0 || chance(1.0 - u_race(u)->aggression)) { + if (!attacks || chance(1.0 - u_race(u)->aggression)) { /* Drachen haben in E3 und E4 keine Einnahmen. Neuer Befehl Pluendern erstmal nur fuer Monster?*/ return create_order(K_LOOT, default_locale, NULL); } } - /* falls der drache launisch ist, oder das regionssilber knapp, greift er alle an */ + /* 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; - for (u2 = r->units; u2; u2 = u2->next) { - if (inside_building(u2) != u->building && is_guard(u, GUARD_TAX) && u2->faction != u->faction && cansee(u->faction, r, u2, 0)) { - int m = get_money(u2); - if (m == 0 || is_guard(u2, GUARD_TAX) || attack_chance <= 0.0) - continue; - else { - order *ord = monster_attack(u, u2); - if (ord) { - addlist(&u->orders, ord); - n += m; + 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 (m != 0) { + order *ord = monster_attack(u, u2); + if (ord) { + addlist(&u->orders, ord); + n += m; + } } } } @@ -203,8 +206,7 @@ static order *get_money_for_dragon(region * r, unit * u, int wanted) /* falls die einnahmen erreicht werden, bleibt das monster noch eine */ /* runde hier. */ if (n + rmoney(r) >= wanted) { - keyword_t kwd = keyword_disabled(K_TAX) ? K_LOOT : K_TAX; - return create_order(kwd, default_locale, NULL); + return create_order(K_LOOT, default_locale, NULL); } /* wenn wir NULL zurueckliefern, macht der drache was anderes, z.b. weggehen */ @@ -549,16 +551,17 @@ static order *monster_seeks_target(region * r, unit * u) } #endif -static void monster_attacks(unit * u) +static void monster_attacks(unit * monster) { - region *r = u->region; - unit *u2; + region *r = monster->region; + unit *u; - for (u2 = r->units; u2; u2 = u2->next) { - if (u2->faction != u->faction && cansee(u->faction, r, u2, 0) && !inside_building(u2)) { - order *ord = monster_attack(u, u2); - if (ord) - addlist(&u->orders, ord); + for (u = r->units; u; u = u->next) { + if (u->faction != monster->faction && cansee(monster->faction, r, u, 0) && !in_safe_building(u, monster)) { + order *ord = monster_attack(monster, u); + if (ord) { + addlist(&monster->orders, ord); + } } } }