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

dumpfbackenbrot: 

- bugfix abzug nach anwendung
This commit is contained in:
Enno Rehling 2004-02-22 16:08:39 +00:00
parent 66c4a520d3
commit 14d49937fc
5 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/gamecode/laws.c
View File

@ -306,6 +306,7 @@ live(region * r)
ADDMSG(&u->faction->msgs, msg_message("dumbeffect",
"unit weeks skill", u, weeks, (skill_t)sb->id));
} /* sonst Glück gehabt: wer nix weiß, kann nix vergessen... */
change_effect(u, oldpotiontype[P_FOOL], -effect);
}
}
age_unit(r, u);

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

@ -2831,6 +2831,7 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
/* Effekte von Alchemie */
berserk = get_effect(u, oldpotiontype[P_BERSERK]);
/* change_effect wird in ageing gemacht */
/* Effekte von Artefakten */
strongmen = min(fig->unit->number, get_item(u, I_TROLLBELT));

7
src/common/kernel/magic.c
View File

@ -1779,10 +1779,9 @@ verify_targets(castorder *co)
spobj->data.i = u->no;
spobj->flag = TARGET_RESISTS;
resists++;
add_message(&mage->faction->msgs, new_message(mage->faction,
"spellunitresists%u:unit%r:region%s:command%d:id",
mage, mage->region, strdup(co->order),
spobj->data.i));
ADDMSG(&mage->faction->msgs, msg_message("spellunitresists",
"unit region command target",
mage, mage->region, strdup(co->order), u));
break;
}

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

@ -254,6 +254,7 @@ walkingcapacity(unit * u)
n += personen * personcapacity(u);
/* Goliathwasser */
n += get_effect(u, oldpotiontype[P_STRONG]) * personcapacity(u);
/* change_effect wird in ageing gemacht */
n += min(get_item(u, I_TROLLBELT), u->number) * STRENGTHCAPACITY;
return n;
@ -606,21 +607,6 @@ drifting_ships(region * r)
}
}
char *
coords_or_direction(region *r, faction *f, int dir)
{
static char lbuf[32];
plane *pl = getplane(r);
if(fval(pl, PFL_NOCOORDS)) {
strcpy(lbuf, locale_string(f->locale, directions[dir]));
} else {
sprintf(lbuf, "(%d,%d)",region_x(r,f), region_y(r,f));
}
return lbuf;
}
static void
ship_in_storm(unit *cap, region *next_point)
{
@ -2055,7 +2041,9 @@ destroy_damaged_ships(void)
}
}
boolean
#ifdef TODO /* Wenn Feature ausgearbeitet */
static boolean
is_disorientated(unit *u)
{
static boolean init = false;
@ -2074,7 +2062,6 @@ is_disorientated(unit *u)
return false;
}
#ifdef TODO /* Wenn Feature ausgearbeitet */
void
regain_orientation(region * r)
{

8
src/res/messages.xml
View File

@ -1212,11 +1212,11 @@
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
<arg name="command" type="string"></arg>
<arg name="id" type="int"></arg>
<arg name="target" type="unit"></arg>
</type>
<text locale="de">"$unit($unit) in $region($region): '$command' - Einheit $int36($id) widersteht dem Zauber."</text>
<text locale="fr">"$unit($unit) in $region($region): '$command' - unit $int36($id) resists the spell."</text>
<text locale="en">"$unit($unit) in $region($region): '$command' - unit $int36($id) resists the spell."</text>
<text locale="de">"$unit($unit) in $region($region): '$command' - $unit($target) widersteht dem Zauber."</text>
<text locale="fr">"$unit($unit) in $region($region): '$command' - $unit($target) resists the spell."</text>
<text locale="en">"$unit($unit) in $region($region): '$command' - $unit($target) resists the spell."</text>
</message>
<message name="spellshipnotfound" section="magic">
<type>