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

Merge remote-tracking branch 'origin/Bug-1857'

This commit is contained in:
CTD 2014-08-13 23:57:43 +02:00
parent 0e8126f538 906dd457fc
commit 13e544a233
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/config.c
View File

@ -1577,7 +1577,7 @@ bool check_leuchtturm(region * r, faction * f)
if (fval(b, BLD_WORKING) && b->size >= 10) { if (fval(b, BLD_WORKING) && b->size >= 10) {
int maxd = (int)log10(b->size) + 1; int maxd = (int)log10(b->size) + 1;
if (skill_enabled(SK_PERCEPTION)) { if (skill_enabled(SK_PERCEPTION) && f) {
region *r2 = b->region; region *r2 = b->region;
unit *u; unit *u;
int c = 0; int c = 0;

12
src/kernel/move.c
View File

@ -1763,9 +1763,15 @@ sail(unit * u, order * ord, bool move_on_land, region_list ** routep)
/* storms should be the first thing we do. */ /* storms should be the first thing we do. */
stormchance = stormyness / shipspeed(sh, u); stormchance = stormyness / shipspeed(sh, u);
if (check_leuchtturm(next_point, NULL)) if (check_leuchtturm(next_point, NULL)) {
stormchance /= 3; int param = get_param_int(global.parameters, "rules.lighthous.stormchancedevisor", 0);
if (param > 0) {
stormchance /= param;
}
else {
stormchance = 0;
}
}
if (rng_int() % 10000 < stormchance * sh->type->storm if (rng_int() % 10000 < stormchance * sh->type->storm
&& fval(current_point->terrain, SEA_REGION)) { && fval(current_point->terrain, SEA_REGION)) {
if (!is_cursed(sh->attribs, C_SHIP_NODRIFT, 0)) { if (!is_cursed(sh->attribs, C_SHIP_NODRIFT, 0)) {