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

Merge pull request #427 from stm2/fiery_breath

Browse source 
Oh, ich sehe es. Letzten Kommentar von mir ignorieren, Danke!
This commit is contained in:
Enno Rehling 2015-12-05 23:58:48 +01:00
commit 6fb9d9d396
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/core/de/strings.xml
View file

@ -3851,8 +3851,8 @@
<text locale="en">Icy Dragonbreath</text>
</string>
<string name="fiery_dragonbreath">
<text locale="de">Eisiger Drachenodem</text>
<text locale="en">Icy Dragonbreath</text>
<text locale="de">Feuriger Drachenodem</text>
<text locale="en">Fiery Dragonbreath</text>
</string>
<string name="create_runesword">
<text locale="de">Erschaffe ein Runenschwert</text>

1
src/battle.c
View file

@ -1218,6 +1218,7 @@ terminate(troop dt, troop at, int type, const char *damage, bool missile)
return false;
}
/* TODO not sure if res could be > 1 here */
if (magic) {
da = (int)(_max(da * res, 0));
}