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

Bug 1890: monsters do not respect the rules when giving excess weight to peasants. 

https://bugs.eressea.de/view.php?id=1890
fixed by creating a give order instead of calling give_item directly.
This commit is contained in:
Enno Rehling 2015-07-02 11:08:38 +02:00
parent 258f3c37c0
commit b53d01eb18
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/eressea/ents.lua
View File

@ -16,7 +16,7 @@ end
local function repair_ents(r) local function repair_ents(r)
for u in r.units do for u in r.units do
if u.faction.id==666 and u.race == "undead" and u.name == "Wütende Ents" then if u.faction.id==666 and u.race == "undead" and u.name == "Wütende Ents" then
print("ent repair", u) eressea.log.info("ent repair: " .. tostring(u))
u.race = "ent" u.race = "ent"
end end
end end

29
src/monsters.c
View File

@ -74,6 +74,16 @@
#define DRAGON_RANGE 20 /* Max. Distanz zum nächsten Drachenziel */ #define DRAGON_RANGE 20 /* Max. Distanz zum nächsten Drachenziel */
#define MAXILLUSION_TEXTS 3 #define MAXILLUSION_TEXTS 3
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 float monster_attack_chance(void) {
return get_param_flt(global.parameters, "rules.monsters.attack_chance", 0.4f);
}
static void reduce_weight(unit * u) static void reduce_weight(unit * u)
{ {
int capacity, weight = 0; int capacity, weight = 0;
@ -89,9 +99,11 @@ static void reduce_weight(unit * u)
while (*itmp != NULL) { while (*itmp != NULL) {
item *itm = *itmp; item *itm = *itmp;
const item_type *itype = itm->type; const item_type *itype = itm->type;
weight += itm->number * itype->weight;
if (itype->flags & ITF_VEHICLE) { if (itype->flags & ITF_VEHICLE) {
give_item(itm->number, itm->type, u, NULL, NULL); give_peasants(u, itm->type, itm->number);
}
else {
weight += itm->number * itype->weight;
} }
if (*itmp == itm) if (*itmp == itm)
itmp = &itm->next; itmp = &itm->next;
@ -109,7 +121,7 @@ static void reduce_weight(unit * u)
&& itype->rtype->atype == 0) { && itype->rtype->atype == 0) {
if (itype->capacity < itype->weight) { if (itype->capacity < itype->weight) {
int reduce = _min(itm->number, -((capacity - weight) / itype->weight)); int reduce = _min(itm->number, -((capacity - weight) / itype->weight));
give_item(reduce, itm->type, u, NULL, NULL); give_peasants(u, itm->type, reduce);
weight -= reduce * itype->weight; weight -= reduce * itype->weight;
} }
} }
@ -124,7 +136,7 @@ static void reduce_weight(unit * u)
weight += itm->number * itype->weight; weight += itm->number * itype->weight;
if (itype->capacity < itype->weight) { if (itype->capacity < itype->weight) {
int reduce = _min(itm->number, -((capacity - weight) / itype->weight)); int reduce = _min(itm->number, -((capacity - weight) / itype->weight));
give_item(reduce, itm->type, u, NULL, NULL); give_peasants(u, itm->type, reduce);
weight -= reduce * itype->weight; weight -= reduce * itype->weight;
} }
if (*itmp == itm) if (*itmp == itm)
@ -132,10 +144,6 @@ static void reduce_weight(unit * u)
} }
} }
static float monster_attack_chance(void) {
return get_param_flt(global.parameters, "rules.monsters.attack_chance", 0.4f);
}
static order *monster_attack(unit * u, const unit * target) static order *monster_attack(unit * u, const unit * target)
{ {
if (u->region != target->region) if (u->region != target->region)
@ -665,8 +673,6 @@ static order *plan_dragon(unit * u)
bool move = false; bool move = false;
order *long_order = NULL; order *long_order = NULL;
reduce_weight(u);
if (ta == NULL) { if (ta == NULL) {
move |= (r->land == 0 || r->land->peasants == 0); /* when no peasants, move */ move |= (r->land == 0 || r->land->peasants == 0); /* when no peasants, move */
move |= (r->land == 0 || r->land->money == 0); /* when no money, move */ move |= (r->land == 0 || r->land->money == 0); /* when no money, move */
@ -717,6 +723,9 @@ static order *plan_dragon(unit * u)
default: default:
break; break;
} }
if (long_order) {
reduce_weight(u);
}
if (rng_int() % 100 < 15) { if (rng_int() % 100 < 15) {
const struct locale *lang = u->faction->locale; const struct locale *lang = u->faction->locale;
/* do a growl */ /* do a growl */