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

passengers on drifting ships receive a message.

This commit is contained in:
Enno Rehling 2006-04-17 18:48:24 +00:00
parent 4c3e912a30
commit 7db317b2e0
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/kernel/movement.c
View File

@ -698,8 +698,9 @@ drifting_ships(region * r)
ship * sh = *shp; ship * sh = *shp;
region * rnext = NULL; region * rnext = NULL;
region_list * route = NULL; region_list * route = NULL;
unit * captain; unit *firstu = NULL, *captain;
int d_offset; int d_offset;
direction_t dir = 0;
/* Schiff schon abgetrieben oder durch Zauber geschützt? */ /* Schiff schon abgetrieben oder durch Zauber geschützt? */
if (fval(sh, SF_DRIFTED) || is_cursed(sh->attribs, C_SHIP_NODRIFT, 0)) { if (fval(sh, SF_DRIFTED) || is_cursed(sh->attribs, C_SHIP_NODRIFT, 0)) {
@ -710,6 +711,7 @@ drifting_ships(region * r)
/* Kapitän bestimmen */ /* Kapitän bestimmen */
for (captain = r->units; captain; captain = captain->next) { for (captain = r->units; captain; captain = captain->next) {
if (captain->ship != sh) continue; if (captain->ship != sh) continue;
if (firstu==NULL) firstu = captain;
if (eff_skill(captain, SK_SAILING, r) >= sh->type->cptskill) { if (eff_skill(captain, SK_SAILING, r) >= sh->type->cptskill) {
break; break;
} }
@ -727,7 +729,9 @@ drifting_ships(region * r)
* zufällig. Falls unmögliches Resultat: vergiß es. */ * zufällig. Falls unmögliches Resultat: vergiß es. */
d_offset = rng_int() % MAXDIRECTIONS; d_offset = rng_int() % MAXDIRECTIONS;
for (d = 0; d != MAXDIRECTIONS; ++d) { for (d = 0; d != MAXDIRECTIONS; ++d) {
region * rn = rconnect(r, (direction_t)((d + d_offset) % MAXDIRECTIONS)); region * rn;
dir = (direction_t)((d + d_offset) % MAXDIRECTIONS);
rn = rconnect(r, dir);
if (rn!=NULL && fval(rn->terrain, SAIL_INTO) && ship_allowed(sh, rn)) { if (rn!=NULL && fval(rn->terrain, SAIL_INTO) && ship_allowed(sh, rn)) {
rnext = rn; rnext = rn;
if (!fval(rnext->terrain, SEA_REGION)) break; if (!fval(rnext->terrain, SEA_REGION)) break;
@ -747,12 +751,26 @@ drifting_ships(region * r)
sh = move_ship(sh, r, rnext, route); sh = move_ship(sh, r, rnext, route);
free_regionlist(route); free_regionlist(route);
if (sh!=NULL) { if (firstu!=NULL) {
unit *u, *lastu = NULL;
message * msg = msg_message("ship_drift", "ship dir", sh, dir);
for (u=firstu;u;u=u->next) {
if (u->ship==sh && !fval(u->faction, FL_MARK)) {
fset(u->faction, FL_MARK);
add_message(&u->faction->msgs, msg);
lastu = u->next;
}
}
for (u=firstu;u!=lastu;u=u->next) {
freset(u->faction, FL_MARK);
}
msg_release(msg);
}
if (sh!=NULL) {
fset(sh, SF_DRIFTED); fset(sh, SF_DRIFTED);
damage_ship(sh, 0.02); damage_ship(sh, 0.02);
if (sh->damage>=sh->size * DAMAGE_SCALE) { if (sh->damage>=sh->size * DAMAGE_SCALE) {
destroy_ship(sh); destroy_ship(sh);
} }

9
src/res/messages.xml
View File

@ -763,6 +763,15 @@
<text locale="fr">"The $ship($ship) has been damaged by a collision with an iceberg."</text> <text locale="fr">"The $ship($ship) has been damaged by a collision with an iceberg."</text>
<text locale="en">"The $ship($ship) has been damaged by a collision with an iceberg."</text> <text locale="en">"The $ship($ship) has been damaged by a collision with an iceberg."</text>
</message> </message>
<message name="ship_drift" section="events">
<type>
<arg name="ship" type="ship"/>
<arg name="dir" type="direction"/>
</type>
<text locale="de">"Die $region($ship) treibt nach $direction($dir)."</text>
<text locale="fr">"The ship $ship($ship) drifts to the $direction($dir)."</text>
<text locale="en">"The ship $ship($ship) drifts to the $direction($dir)."</text>
</message>
<message name="iceberg_drift" section="events"> <message name="iceberg_drift" section="events">
<type> <type>
<arg name="region" type="region"/> <arg name="region" type="region"/>