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

http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000005 

- Wurmloch-Meldung

http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000007
- Änderung bei Flucht
This commit is contained in:
Enno Rehling 2004-03-05 22:31:37 +00:00
parent 6d7b83a310
commit ec400f9680
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/kernel/battle.c
View File

@ -3679,12 +3679,12 @@ do_battle(void)
/* Versuche zu fliehen, wenn /* Versuche zu fliehen, wenn
* - Kampfstatus fliehe * - Kampfstatus fliehe
* - schwer verwundet * - schwer verwundet und nicht erste kampfrunde
* - in panik (Zauber) * - in panik (Zauber)
* aber nicht, wenn der Zaubereffekt Held auf dir liegt! * aber nicht, wenn der Zaubereffekt Held auf dir liegt!
*/ */
if ((u->status == ST_FLEE if ((u->status == ST_FLEE
|| fig->person[dt.index].hp <= runhp || (b->turn>1 && fig->person[dt.index].hp <= runhp)
|| (fig->person[dt.index].flags & FL_PANICED)) || (fig->person[dt.index].flags & FL_PANICED))
&& !(fig->person[dt.index].flags & FL_HERO)) && !(fig->person[dt.index].flags & FL_HERO))
{ {

2
src/common/kernel/combatspells.c
View File

@ -972,7 +972,7 @@ sp_chaosrow(fighter * fi, int level, double power, spell * sp)
if (df->unit->race->battle_flags & BF_NOBLOCK) { if (df->unit->race->battle_flags & BF_NOBLOCK) {
df->side->nonblockers[row] += df->alive; df->side->nonblockers[row] += df->alive;
} }
k++; k+=df->alive;
} }
power = max(0, power-n); power = max(0, power-n);
} }

1
src/common/modules/wormhole.c
View File

@ -95,6 +95,7 @@ wormhole_age(struct attrib * a)
/* it's important that destroy_building doesn't change b->region, because /* it's important that destroy_building doesn't change b->region, because
* otherwise the tunnel would no longer be bi-directional after this */ * otherwise the tunnel would no longer be bi-directional after this */
destroy_building(data->entry); destroy_building(data->entry);
ADDMSG(&r->msgs, msg_message("wormhole_dissolve", "region", r));
assert(data->entry->region==r); assert(data->entry->region==r);
/* age returns 0 if the attribute needs to be removed, !=0 otherwise */ /* age returns 0 if the attribute needs to be removed, !=0 otherwise */

4
src/res/de/strings.xml
View File

@ -553,6 +553,10 @@
<string name="lighthouse"> <string name="lighthouse">
<text locale="de">Leuchtturm</text> <text locale="de">Leuchtturm</text>
</string> </string>
<string name="wormhole">
<text locale="de">Wurmloch</text>
<text locale="en">wormhole</text>
</string>
<string name="mine"> <string name="mine">
<text locale="de">Bergwerk</text> <text locale="de">Bergwerk</text>
</string> </string>

14
src/res/messages.xml
View File

@ -1181,7 +1181,7 @@
<arg name="region" type="region"></arg> <arg name="region" type="region"></arg>
<arg name="command" type="string"></arg> <arg name="command" type="string"></arg>
</type> </type>
<text locale="de">"$unit($unit) in $region($region): '$command' - Die Region konnte nicht verzaubert werden."</text> <text locale="de">"$unit($unit) in $region($region): '$command' - Die Region widersteht der Verzauberung."</text>
<text locale="fr">"$unit($unit) in $region($region): '$command' - The region could not be charmed."</text> <text locale="fr">"$unit($unit) in $region($region): '$command' - The region could not be charmed."</text>
<text locale="en">"$unit($unit) in $region($region): '$command' - The region could not be charmed."</text> <text locale="en">"$unit($unit) in $region($region): '$command' - The region could not be charmed."</text>
</message> </message>
@ -1192,7 +1192,7 @@
<arg name="command" type="string"></arg> <arg name="command" type="string"></arg>
<arg name="id" type="int"></arg> <arg name="id" type="int"></arg>
</type> </type>
<text locale="de">"$unit($unit) in $region($region): '$command' - Schiff $int36($id) konnte nicht verzaubert werden."</text> <text locale="de">"$unit($unit) in $region($region): '$command' - Schiff $int36($id) widersteht der Verzauberung."</text>
<text locale="fr">"$unit($unit) in $region($region): '$command' - Ship $int36($id) could not be charmed."</text> <text locale="fr">"$unit($unit) in $region($region): '$command' - Ship $int36($id) could not be charmed."</text>
<text locale="en">"$unit($unit) in $region($region): '$command' - Ship $int36($id) could not be charmed."</text> <text locale="en">"$unit($unit) in $region($region): '$command' - Ship $int36($id) could not be charmed."</text>
</message> </message>
@ -1203,7 +1203,7 @@
<arg name="command" type="string"></arg> <arg name="command" type="string"></arg>
<arg name="id" type="int"></arg> <arg name="id" type="int"></arg>
</type> </type>
<text locale="de">"$unit($unit) in $region($region): '$command' - Gebäude $int36($id) konnte nicht verzaubert werden."</text> <text locale="de">"$unit($unit) in $region($region): '$command' - Gebäude $int36($id) widersteht der Verzauberung."</text>
<text locale="fr">"$unit($unit) in $region($region): '$command' - Building $int36($id) could not be charmed."</text> <text locale="fr">"$unit($unit) in $region($region): '$command' - Building $int36($id) could not be charmed."</text>
<text locale="en">"$unit($unit) in $region($region): '$command' - Building $int36($id) could not be charmed."</text> <text locale="en">"$unit($unit) in $region($region): '$command' - Building $int36($id) could not be charmed."</text>
</message> </message>
@ -5673,4 +5673,12 @@
<text locale="fr">"A wormhole appears in $region($region)."</text> <text locale="fr">"A wormhole appears in $region($region)."</text>
<text locale="en">"A wormhole appears in $region($region)."</text> <text locale="en">"A wormhole appears in $region($region)."</text>
</message> </message>
<message name="wormhole_dissolve" section="events">
<type>
<arg name="region" type="region"></arg>
</type>
<text locale="de">"Das Wurmloch in $region($region) schließt sich."</text>
<text locale="fr">"The wormhole in $region($region) disappears."</text>
<text locale="en">"The wormhole in $region($region) disappears."</text>
</message>
</messages> </messages>