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

summonundead spell will once again tell you where they got summoned

Browse source
This commit is contained in:
Enno Rehling 2007-09-15 13:08:16 +00:00
parent 05f56041c4
commit f1e82cc6ff
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/kernel/version.h
View file

@ -42,6 +42,7 @@
#define SAVEXMLNAME_VERSION 316 #define SAVEXMLNAME_VERSION 316
#define SAVEALLIANCE_VERSION 317 #define SAVEALLIANCE_VERSION 317
#define CLAIM_VERSION 318 #define CLAIM_VERSION 318
/* 319 is the HSE4 data version */
#define BACTION_VERSION 319 /* building action gets a param string */ #define BACTION_VERSION 319 /* building action gets a param string */
#define NOLASTORDER_VERSION 320 /* do not use lastorder */ #define NOLASTORDER_VERSION 320 /* do not use lastorder */
#define SPELLNAME_VERSION 321 /* reference spells by name */ #define SPELLNAME_VERSION 321 /* reference spells by name */

4
src/common/spells/combatspells.c
View file

@ -1603,9 +1603,9 @@ sp_undeadhero(fighter * fi, int level, double power, spell * sp)
level = min(level, undead); level = min(level, undead);
if (undead == 0) { if (undead == 0) {
msg = msg_message("summonundead_effect_0", "mage", mage); msg = msg_message("summonundead_effect_0", "mage region", mage, mage->region);
} else { } else {
msg = msg_message("summonundead_effect_1", "mage", mage); msg = msg_message("summonundead_effect_1", "mage region amount", mage, mage->region, undead);
} }
message_all(b, msg); message_all(b, msg);

4
src/common/spells/spells.c
View file

@ -3631,8 +3631,8 @@ sp_summonundead(castorder *co)
u = create_unit(r, mage->faction, undead, race, 0, NULL, mage); u = create_unit(r, mage->faction, undead, race, 0, NULL, mage);
make_undead_unit(u); make_undead_unit(u);
ADDMSG(&mage->faction->msgs, msg_message("summonundead_effect_1", "mage amount", mage, undead)); ADDMSG(&mage->faction->msgs, msg_message("summonundead_effect_1", "mage region amount", mage, r, undead));
ADDMSG(&r->msgs, msg_message("summonundead_effect_2", "mage", mage)); ADDMSG(&r->msgs, msg_message("summonundead_effect_2", "mage region", mage, r));
return cast_level; return cast_level;
} }

14
src/res/messages.xml
View file

@ -1446,26 +1446,28 @@
<message name="summonundead_effect_0" section="magic"> <message name="summonundead_effect_0" section="magic">
<type> <type>
<arg name="mage" type="unit"/> <arg name="mage" type="unit"/>
<arg name="region" type="region"/>
</type> </type>
<text locale="de">"$unit($mage) kann keine Unjtoten rufen."</text> <text locale="de">"$unit($mage) kann in $region($region) keine Untoten rufen."</text>
<text locale="en">"$unit($mage) cannot summon any undead."</text> <text locale="en">"$unit($mage) cannot summon any undead in $region($region)."</text>
</message> </message>
<message name="summonundead_effect_1" section="magic"> <message name="summonundead_effect_1" section="magic">
<type> <type>
<arg name="mage" type="unit"/> <arg name="mage" type="unit"/>
<arg name="region" type="region"/>
<arg name="amount" type="int"/> <arg name="amount" type="int"/>
</type> </type>
<text locale="de">"$unit($mage) erweckt $int($amount) Untote aus ihren Gräbern."</text> <text locale="de">"$unit($mage) erweckt in $region($region) $int($amount) Untote aus ihren Gräbern."</text>
<text locale="en">"$unit($mage) calls $int($amount) undead from their graves."</text> <text locale="en">"$unit($mage) calls $int($amount) undead from their graves in $region($region)."</text>
</message> </message>
<message name="summonundead_effect_2" section="magic"> <message name="summonundead_effect_2" section="magic">
<type> <type>
<arg name="mage" type="unit"/> <arg name="mage" type="unit"/>
</type> </type>
<text locale="de">"$unit($mage) stört die Ruhe der Toten."</text> <text locale="de">"$unit($mage) stört in $region($region) die Ruhe der Toten."</text>
<text locale="en">"$unit($mage) communicates with the dead."</text> <text locale="en">"$unit($mage) communicates with the dead in $region($region)."</text>
</message> </message>
<message name="viewreality_effect" section="magic"> <message name="viewreality_effect" section="magic">