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

http://bugs.eressea.de/view.php?id=1460

Browse source 
"Mahlstrom (grösstenteils) harmlos"
reduced the effect of sailing skill a little bit
Issue: 1460
This commit is contained in:
Enno Rehling 2008-09-01 16:01:01 +00:00
parent e4720c53e8
commit 500d0a212c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/kernel/move.c
View file

@ -483,7 +483,7 @@ do_maelstrom(region *r, unit *u)
int damage; int damage;
ship * sh = u->ship; ship * sh = u->ship;
damage = rng_int()%150 - eff_skill(u, SK_SAILING, r)*5; damage = rng_int()%75 + rng_int()%75 - eff_skill(u, SK_SAILING, r)*4;
if (damage <= 0) { if (damage <= 0) {
return sh; return sh;
@ -1745,7 +1745,8 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep)
break; break;
} }
if (is_cursed(next_point->attribs, C_MAELSTROM, 0)) {
if (curse_active(get_curse(next_point->attribs, ct_find("maelstrom")))) {
if (do_maelstrom(next_point, u) == NULL) break; if (do_maelstrom(next_point, u) == NULL) break;
} }

2
src/common/kernel/terrain.c
View file

@ -127,7 +127,7 @@ terrain_name(const struct region * r)
if (r->terrain->name!=NULL) { if (r->terrain->name!=NULL) {
return r->terrain->name(r); return r->terrain->name(r);
} else if (fval(r->terrain, SEA_REGION)) { } else if (fval(r->terrain, SEA_REGION)) {
if (is_cursed(r->attribs, C_MAELSTROM, 0)) { if (curse_active(get_curse(next_point->attribs, ct_find("maelstrom")))) {
return "maelstrom"; return "maelstrom";
} }
} }