forked from github/server
"Astraler Ruf findet Einheiten nicht" Kosmetischer Fix. Ausserdem: - Schiffsbeschleunigung auf Englisch - less verbose on the monster spawns
This commit is contained in:
parent
41a9ffb7b3
commit
349f6f9828
4 changed files with 36 additions and 24 deletions
|
@ -1096,8 +1096,10 @@ spawn_dragons(void)
|
|||
set_level(u, SK_OBSERVATION, 1+rng_int()%3);
|
||||
set_level(u, SK_STEALTH, 1);
|
||||
set_level(u, SK_AUSDAUER, 1);
|
||||
if (!quiet) {
|
||||
log_printf("%d %s in %s.\n", u->number,
|
||||
LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
|
||||
}
|
||||
|
||||
name_unit(u);
|
||||
|
||||
|
@ -1170,8 +1172,10 @@ spawn_undead(void)
|
|||
deathcounts(r, -undead);
|
||||
name_unit(u);
|
||||
|
||||
if (!quiet) {
|
||||
log_printf("%d %s in %s.\n", u->number,
|
||||
LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
|
||||
}
|
||||
|
||||
{
|
||||
message * msg = msg_message("undeadrise", "region", r);
|
||||
|
|
|
@ -58,22 +58,15 @@ cinfo_ship(const void * obj, typ_t typ, const curse *c, int self)
|
|||
static message *
|
||||
cinfo_shipnodrift(const void * obj, typ_t typ, const curse *c, int self)
|
||||
{
|
||||
ship * sh;
|
||||
unused(typ);
|
||||
ship * sh = (ship *)obj;
|
||||
|
||||
unused(typ);
|
||||
assert(typ == TYP_SHIP);
|
||||
sh = (ship*)obj;
|
||||
|
||||
if (self != 0) {
|
||||
sprintf(buf, "%s ist mit guten Wind gesegnet", sh->name);
|
||||
if (c->duration <= 2){
|
||||
scat(", doch der Zauber beginnt sich bereits aufzulösen");
|
||||
return msg_message("curseinfo::shipnodrift_1", "ship duration id", sh, c->duration, c->no);
|
||||
}
|
||||
scat(".");
|
||||
} else {
|
||||
sprintf(buf, "Ein silberner Schimmer umgibt das Schiff");
|
||||
}
|
||||
return msg_message("curseinfo::info_str", "text id", buf, c->no);
|
||||
return msg_message("curseinfo::shipnodrift_0", "ship duration id", sh, c->duration, c->no);
|
||||
}
|
||||
|
||||
static struct curse_type ct_stormwind = { "stormwind",
|
||||
|
|
|
@ -5849,16 +5849,12 @@ sp_pullastral(castorder *co)
|
|||
|
||||
if (u->region!=r) {
|
||||
/* Report this as unit not found */
|
||||
char * uid;
|
||||
|
||||
if (spobj->typ == SPP_UNIT) {
|
||||
uid = strdup(itoa36(spobj->data.i));
|
||||
spobj->data.i = u->no;
|
||||
} else {
|
||||
char tbuf[20];
|
||||
sprintf(tbuf, "%s %s", LOC(mage->faction->locale,
|
||||
parameters[P_TEMP]), itoa36(spobj->data.i));
|
||||
uid = strdup(tbuf);
|
||||
spobj->data.i = ualias(u);
|
||||
}
|
||||
spobj->flag = TARGET_NOTFOUND;
|
||||
ADDMSG(&mage->faction->msgs, msg_unitnotfound(mage, co->order, spobj));
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -6879,6 +6879,25 @@
|
|||
<text locale="en">"$unit($unit) in $region($region): $int($amount) $resource($item,$amount) turn to dust."</text>
|
||||
</message>
|
||||
|
||||
<message name="curseinfo::shipnodrift_1" section="magic">
|
||||
<type>
|
||||
<arg name="ship" type="ship"/>
|
||||
<arg name="duration" type="int"/>
|
||||
<arg name="id" type="int"/>
|
||||
</type>
|
||||
<text locale="de">"Die $ship($ship) ist mit gutem Wind gesegnet$if($lt($duration,3),", doch der Zauber beginnt sich bereits aufzulösen",""). ($int36($id))"</text>
|
||||
<text locale="en">"The $ship($ship) is blessed with favourable winds$if($lt($duration,3),", but the spell is starting to wear thin",""). ($int36($id))"</text>
|
||||
</message>
|
||||
|
||||
<message name="curseinfo::shipnodrift_0" section="magic">
|
||||
<type>
|
||||
<arg name="ship" type="ship"/>
|
||||
<arg name="id" type="int"/>
|
||||
</type>
|
||||
<text locale="de">"Ein silberner Schimmer umgibt die $ship($ship). ($int36($id))"</text>
|
||||
<text locale="en">"A silvery shimmer surrounds the $ship($ship). ($int36($id))"</text>
|
||||
</message>
|
||||
|
||||
<message name="curseinfo::magicrunes_building" section="magic">
|
||||
<type>
|
||||
<arg name="building" type="building"/>
|
||||
|
|
Loading…
Reference in a new issue