forked from github/server
Merge remote-tracking branch 'origin/Feature-1865'
This commit is contained in:
commit
a1225a1269
|
@ -1017,8 +1017,7 @@ static bool maintain(building * b, bool first)
|
||||||
bool paid = true, work = first;
|
bool paid = true, work = first;
|
||||||
unit *u;
|
unit *u;
|
||||||
|
|
||||||
if (fval(b, BLD_MAINTAINED) || b->type == NULL || b->type->maintenance == NULL
|
if (fval(b, BLD_MAINTAINED) || b->type == NULL || b->type->maintenance == NULL || is_cursed(b->attribs, C_NOCOST, 0)) {
|
||||||
|| is_cursed(b->attribs, C_NOCOST, 0)) {
|
|
||||||
fset(b, BLD_MAINTAINED);
|
fset(b, BLD_MAINTAINED);
|
||||||
fset(b, BLD_WORKING);
|
fset(b, BLD_WORKING);
|
||||||
return true;
|
return true;
|
||||||
|
@ -1029,6 +1028,14 @@ static bool maintain(building * b, bool first)
|
||||||
u = building_owner(b);
|
u = building_owner(b);
|
||||||
if (u == NULL)
|
if (u == NULL)
|
||||||
return false;
|
return false;
|
||||||
|
/* If the owner is the region owner, check if biggest castle has the dontpay flag */
|
||||||
|
if (check_param(global.parameters, "rules.region_owner_pay_building", b->type->_name)) {
|
||||||
|
if (u == building_owner(largestbuilding(r, &cmp_taxes, false))) {
|
||||||
|
if (fval(u->building, BLD_DONTPAY)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
for (c = 0; b->type->maintenance[c].number; ++c) {
|
for (c = 0; b->type->maintenance[c].number; ++c) {
|
||||||
const maintenance *m = b->type->maintenance + c;
|
const maintenance *m = b->type->maintenance + c;
|
||||||
int need = m->number;
|
int need = m->number;
|
||||||
|
|
|
@ -654,7 +654,6 @@ void building_set_owner(struct unit * owner)
|
||||||
static unit *building_owner_ex(const building * bld, const struct faction * last_owner)
|
static unit *building_owner_ex(const building * bld, const struct faction * last_owner)
|
||||||
{
|
{
|
||||||
unit *u, *heir = 0;
|
unit *u, *heir = 0;
|
||||||
|
|
||||||
/* Eigentümer tot oder kein Eigentümer vorhanden. Erste lebende Einheit
|
/* Eigentümer tot oder kein Eigentümer vorhanden. Erste lebende Einheit
|
||||||
* nehmen. */
|
* nehmen. */
|
||||||
for (u = bld->region->units; u; u = u->next) {
|
for (u = bld->region->units; u; u = u->next) {
|
||||||
|
@ -669,12 +668,26 @@ static unit *building_owner_ex(const building * bld, const struct faction * last
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if (!heir && check_param(global.parameters, "rules.region_owner_pay_building", bld->type->_name)) {
|
||||||
|
if (rule_region_owners()) {
|
||||||
|
u = building_owner(largestbuilding(bld->region, &cmp_taxes, false));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
u = building_owner(largestbuilding(bld->region, &cmp_wage, false));
|
||||||
|
}
|
||||||
|
if (u) {
|
||||||
|
heir = u;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return heir;
|
return heir;
|
||||||
}
|
}
|
||||||
|
|
||||||
unit *building_owner(const building * bld)
|
unit *building_owner(const building * bld)
|
||||||
{
|
{
|
||||||
|
if (!bld) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
unit *owner = bld->_owner;
|
unit *owner = bld->_owner;
|
||||||
if (!owner || (owner->building!=bld || owner->number<=0)) {
|
if (!owner || (owner->building!=bld || owner->number<=0)) {
|
||||||
unit * heir = building_owner_ex(bld, owner?owner->faction:0);
|
unit * heir = building_owner_ex(bld, owner?owner->faction:0);
|
||||||
|
|
|
@ -1538,8 +1538,10 @@ int lighthouse_range(const building * b, const faction * f)
|
||||||
int c = 0;
|
int c = 0;
|
||||||
unit *u;
|
unit *u;
|
||||||
for (u = r->units; u; u = u->next) {
|
for (u = r->units; u; u = u->next) {
|
||||||
|
if (u->building == b || u == building_owner(b)) {
|
||||||
if (u->building == b) {
|
if (u->building == b) {
|
||||||
c += u->number;
|
c += u->number;
|
||||||
|
}
|
||||||
if (c > buildingcapacity(b))
|
if (c > buildingcapacity(b))
|
||||||
break;
|
break;
|
||||||
if (f == NULL || u->faction == f) {
|
if (f == NULL || u->faction == f) {
|
||||||
|
@ -1882,6 +1884,27 @@ int get_param_int(const struct param *p, const char *key, int def)
|
||||||
return str ? atoi(str) : def;
|
return str ? atoi(str) : def;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int check_param(const struct param *p, const char *key, const char *searchvalue)
|
||||||
|
{
|
||||||
|
const char *value = get_param(p, key);
|
||||||
|
if (!value) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
char *p_value = malloc(sizeof(char)* (strlen(value) + 1));
|
||||||
|
strcpy(p_value, value);
|
||||||
|
const char *delimiter = " ,;";
|
||||||
|
char *v = strtok(p_value, delimiter);
|
||||||
|
|
||||||
|
while (v != NULL) {
|
||||||
|
if (strcmp(v, searchvalue) == 0)
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
v = strtok(NULL, delimiter);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static const char *g_datadir;
|
static const char *g_datadir;
|
||||||
const char *datapath(void)
|
const char *datapath(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -390,10 +390,11 @@ extern "C" {
|
||||||
|
|
||||||
const char *dbrace(const struct race *rc);
|
const char *dbrace(const struct race *rc);
|
||||||
|
|
||||||
void set_param(struct param **p, const char *name, const char *data);
|
void set_param(struct param **p, const char *key, const char *data);
|
||||||
const char *get_param(const struct param *p, const char *name);
|
const char *get_param(const struct param *p, const char *key);
|
||||||
int get_param_int(const struct param *p, const char *name, int def);
|
int get_param_int(const struct param *p, const char *key, int def);
|
||||||
float get_param_flt(const struct param *p, const char *name, float def);
|
int check_param(const struct param *p, const char *key, const char *searchvalue);
|
||||||
|
float get_param_flt(const struct param *p, const char *key, float def);
|
||||||
|
|
||||||
bool ExpensiveMigrants(void);
|
bool ExpensiveMigrants(void);
|
||||||
int NMRTimeout(void);
|
int NMRTimeout(void);
|
||||||
|
|
|
@ -1497,6 +1497,7 @@ static void prepare_reports(void)
|
||||||
{
|
{
|
||||||
region *r;
|
region *r;
|
||||||
faction *f;
|
faction *f;
|
||||||
|
building *b;
|
||||||
const struct building_type *bt_lighthouse = bt_find("lighthouse");
|
const struct building_type *bt_lighthouse = bt_find("lighthouse");
|
||||||
|
|
||||||
for (f = factions; f; f = f->next) {
|
for (f = factions; f; f = f->next) {
|
||||||
|
@ -1521,6 +1522,26 @@ static void prepare_reports(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Region owner get always the Lighthouse report */
|
||||||
|
if (check_param(global.parameters, "rules.region_owner_pay_building", bt_lighthouse->_name)) {
|
||||||
|
for (b = rbuildings(r); b; b = b->next) {
|
||||||
|
if (b && b->type == bt_lighthouse) {
|
||||||
|
u = building_owner(b);
|
||||||
|
if (u) {
|
||||||
|
prepare_lighthouse(b, u->faction);
|
||||||
|
if (u_race(u) != get_race(RC_SPELL) || u->number == RS_FARVISION) {
|
||||||
|
if (fval(u, UFL_DISBELIEVES)) {
|
||||||
|
add_seen(u->faction->seen, r, see_unit, true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
add_seen(u->faction->seen, r, see_unit, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (u = r->units; u; u = u->next) {
|
for (u = r->units; u; u = u->next) {
|
||||||
if (u->building && u->building->type == bt_lighthouse) {
|
if (u->building && u->building->type == bt_lighthouse) {
|
||||||
/* we are in a lighthouse. add the regions we can see from here! */
|
/* we are in a lighthouse. add the regions we can see from here! */
|
||||||
|
@ -1530,12 +1551,14 @@ static void prepare_reports(void)
|
||||||
if (u_race(u) != get_race(RC_SPELL) || u->number == RS_FARVISION) {
|
if (u_race(u) != get_race(RC_SPELL) || u->number == RS_FARVISION) {
|
||||||
if (fval(u, UFL_DISBELIEVES)) {
|
if (fval(u, UFL_DISBELIEVES)) {
|
||||||
add_seen(u->faction->seen, r, see_unit, true);
|
add_seen(u->faction->seen, r, see_unit, true);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
add_seen(u->faction->seen, r, see_unit, false);
|
add_seen(u->faction->seen, r, see_unit, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (fval(r, RF_TRAVELUNIT)) {
|
if (fval(r, RF_TRAVELUNIT)) {
|
||||||
for (ru = a_find(r->attribs, &at_travelunit);
|
for (ru = a_find(r->attribs, &at_travelunit);
|
||||||
ru && ru->type == &at_travelunit; ru = ru->next) {
|
ru && ru->type == &at_travelunit; ru = ru->next) {
|
||||||
|
|
Loading…
Reference in New Issue