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

Merge pull request #257 from badgerman/feature/rename-cerddor 

Bug 2115: fix the name of Cerddor everywhere.
This commit is contained in:
Enno Rehling 2015-07-08 18:57:08 +02:00
parent 5d150248dd b8e17839a7
commit 434923ec67
18 changed files with 30 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/core/de/strings.xml
View File

@ -3922,7 +3922,7 @@
<text locale="de">Gesang des Lebens analysieren</text>
<text locale="en">Analyze Song of Life</text>
</string>
<string name="cerrdorfumbleshield">
<string name="cerddorfumbleshield">
<text locale="de">Bannlied</text>
<text locale="en">Countersong</text>
</string>
@ -4324,7 +4324,7 @@
<text locale="de">Kraft der Natur</text>
<text locale="en">force of nature</text>
</string>
<string name="wdwpyramid_cerrdor">
<string name="wdwpyramid_cerddor">
<text locale="de">Gesang der Götter</text>
<text locale="en">Song of the Gods</text>
</string>
@ -5126,7 +5126,7 @@
able to decipher all enchantments or spells, which
aren't disguised beyond your capability.</text>
</string>
<string name="cerrdorfumbleshield">
<string name="cerddorfumbleshield">
<text locale="de">Dieser schrille Gesang hallt über das
ganze Schlachtfeld. Die besonderen Dissonanzen in den
Melodien machen es Magiern fast unmöglich, sich auf ihre

2
res/e3a/spellbooks/common.xml
View File

@ -37,7 +37,7 @@
<entry spell="summon_familiar" level="9" />
<entry spell="draigfumbleshield" level="9" />
<entry spell="gwyrrdfumbleshield" level="5" />
<entry spell="cerrdorfumbleshield" level="5" />
<entry spell="cerddorfumbleshield" level="5" />
<entry spell="tybiedfumbleshield" level="2" />
<entry spell="concealing_aura" level="1" />
<entry spell="shockwave" level="5" />

2
res/e3a/spellbooks/gray.xml
View File

@ -22,7 +22,7 @@
<entry spell="calm_monster" level="6" />
<entry spell="calm_riot" level="14" />
<entry spell="cerddor_destroymagic" level="8" />
<entry spell="cerrdorfumbleshield" level="5" />
<entry spell="cerddorfumbleshield" level="5" />
<entry spell="chaosrow" level="8" />
<entry spell="clone" level="9" />
<entry spell="coldfront" level="8" />

2
res/e3a/spells.xml
View File

@ -619,7 +619,7 @@
<spell name="gwyrrdfumbleshield" rank="2" index="144" variable="true" combat="1">
<resource name="aura" amount="5" cost="level"/>
</spell>
<spell name="cerrdorfumbleshield" rank="2" index="145" variable="true" combat="1">
<spell name="cerddorfumbleshield" rank="2" index="145" variable="true" combat="1">
<resource name="aura" amount="5" cost="level"/>
</spell>
<spell name="tybiedfumbleshield" rank="2" index="146" variable="true" combat="1">

11
res/e3a/strings.xml
View File

@ -207,6 +207,17 @@
</namespace>
<namespace name="spellinfo">
<string name="concealing_aura">
<text locale="de">Dieser Zauber wird die gesamte Ausrüstung der
Zieleinheit für
einige Zeit vor den Blicken anderer verschleiern. Der
Zauber
schützt nicht vor Dieben und Spionen.</text>
<text locale="en">This spell will hide the whole equipment of a target
unit from the
looks of others. It will not protect against thieves or
spies.</text>
</string>
<string name="raindance">
<text locale="de">Durch dieses uralte Tanzritual ruft der Zauberkundige
die Kräfte des Lebens und der Fruchtbarkeit an. Die darauf folgenden

2
res/eressea/spellbooks/cerddor.xml
View File

@ -27,7 +27,7 @@
<entry spell="summon_familiar" level="9" />
<entry spell="song_of_slavery" level="13" />
<entry spell="cerddor_destroymagic" level="8" />
<entry spell="cerrdorfumbleshield" level="5" />
<entry spell="cerddorfumbleshield" level="5" />
<entry spell="big_recruit" level="14" />
<entry spell="raindance" level="3" />
<entry spell="create_roi" level="6" />

2
res/eressea/spellbooks/gray.xml
View File

@ -26,7 +26,7 @@
<entry spell="calm_monster" level="6" />
<entry spell="calm_riot" level="15" />
<entry spell="cerddor_destroymagic" level="8" />
<entry spell="cerrdorfumbleshield" level="5" />
<entry spell="cerddorfumbleshield" level="5" />
<entry spell="chaosrow" level="8" />
<entry spell="chaossuction" level="14" />
<entry spell="clone" level="9" />

2
res/eressea/spells.xml
View File

@ -402,7 +402,7 @@
<spell name="gwyrrdfumbleshield" rank="2" index="144" variable="true" combat="1">
<resource name="aura" amount="5" cost="level"/>
</spell>
<spell name="cerrdorfumbleshield" rank="2" index="145" variable="true" combat="1">
<spell name="cerddorfumbleshield" rank="2" index="145" variable="true" combat="1">
<resource name="aura" amount="5" cost="level"/>
</spell>
<spell name="tybiedfumbleshield" rank="2" index="146" variable="true" combat="1">

11
res/eressea/strings.xml
View File

@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<strings>
<namespace name="spellinfo">
<string name="concealing_aura">
<text locale="de">Dieser Zauber wird die gesamte Ausrüstung der
Zieleinheit für
einige Zeit vor den Blicken anderer verschleiern. Der
Zauber
schützt nicht vor Dieben und Spionen.</text>
<text locale="en">This spell will hide the whole equipment of a target
unit from the
looks of others. It will not protect against thieves or
spies.</text>
</string>
<string name="headache">
<text locale="de">
Aufzeichung des Vortrags von Selen Ard'Ragorn in Bar'Glingal:

6
src/kernel/messages.c
View File

@ -205,12 +205,6 @@ caddmessage(region * r, faction * f, const char *s, msg_t mtype, int level)
{
message *m = NULL;
#define LOG_ENGLISH
#ifdef LOG_ENGLISH
if (f && f->locale != default_locale) {
log_warning("message for locale \"%s\": %s\n", locale_name(f->locale), s);
}
#endif
unused_arg(level);
switch (mtype) {
case MSG_INCOME:

3
src/kernel/pool.c
View File

@ -78,9 +78,6 @@ int change_resource(unit * u, const resource_type * rtype, int change)
assert(!"undefined resource detected. rtype->uchange not initialized.");
assert(i == get_resource(u, rtype));
assert(i >= 0);
if (i >= 100000000) {
log_warning("%s has %d %s\n", unitname(u), i, rtype->_name);
}
return i;
}

1
src/kernel/spell.c
View File

@ -78,6 +78,7 @@ static const char *sp_aliases[][2] = {
{ "illaunfamiliar", "summon_familiar" },
{ "draigfamiliar", "summon_familiar" },
{ "commonfamiliar", "summon_familiar" },
{ "cerrdorfumbleshield", "cerddorfumbleshield" },
{ NULL, NULL },
};

2
src/kernel/spellid.h
View File

@ -136,7 +136,7 @@ enum {
SPL_GWYRRD_ARMORSHIELD,
SPL_DRAIG_FUMBLESHIELD,
SPL_GWYRRD_FUMBLESHIELD,
SPL_CERRDOR_FUMBLESHIELD,
SPL_CERDDOR_FUMBLESHIELD,
SPL_TYBIED_FUMBLESHIELD,
SPL_SHADOWKNIGHTS = 147,
SPL_ITEMCLOAK = 150,

20
src/report.c
View File

@ -1374,41 +1374,27 @@ static void durchreisende(stream *out, const region * r, const faction * f)
if (cansee_durchgezogen(f, r, u, 0)) {
++counter;
if (u->ship != NULL) {
#ifdef GERMAN_FLUFF_ENABLED
if (strcmp("de", f->locale->name)==0) {
if (counter == 1) {
bytes = (int)strlcpy(bufp, "Die ", size);
}
else {
bytes = (int)strlcpy(bufp, "die ", size);
}
if (wrptr(&bufp, &size, bytes) != 0) {
WARN_STATIC_BUFFER();
break;
}
}
#endif
bytes = (int)strlcpy(bufp, shipname(u->ship), size);
}
else {
bytes = (int)strlcpy(bufp, unitname(u), size);
}
if (wrptr(&bufp, &size, bytes) != 0) {
WARN_STATIC_BUFFER();
INFO_STATIC_BUFFER();
break;
}
if (counter + 1 < maxtravel) {
bytes = (int)strlcpy(bufp, ", ", size);
if (wrptr(&bufp, &size, bytes) != 0) {
WARN_STATIC_BUFFER();
INFO_STATIC_BUFFER();
break;
}
}
else if (counter + 1 == maxtravel) {
bytes = (int)strlcpy(bufp, LOC(f->locale, "list_and"), size);
if (wrptr(&bufp, &size, bytes) != 0) {
WARN_STATIC_BUFFER();
INFO_STATIC_BUFFER();
break;
}
}

2
src/spells.c
View File

@ -6583,7 +6583,7 @@ static spelldata spell_functions[] = {
{ "heroic_song", sp_hero, 0 },
{ "transfer_aura_song", sp_transferaura, 0 },
{ "analysesong_unit", sp_analysesong_unit, 0 },
{ "cerrdorfumbleshield", sp_fumbleshield, 0 },
{ "cerddorfumbleshield", sp_fumbleshield, 0 },
{ "calm_monster", sp_calm_monster, 0 },
{ "seduction", sp_seduce, 0 },
{ "headache", sp_headache, 0 },

2
src/spells/combatspells.c
View File

@ -1504,7 +1504,7 @@ int sp_fumbleshield(struct castorder * co)
switch (sp->id) {
case SPL_DRAIG_FUMBLESHIELD:
case SPL_GWYRRD_FUMBLESHIELD:
case SPL_CERRDOR_FUMBLESHIELD:
case SPL_CERDDOR_FUMBLESHIELD:
case SPL_TYBIED_FUMBLESHIELD:
duration = 100;
effect = _max(1, 25 - level);

2
src/study.h
View File

@ -32,7 +32,7 @@ extern "C" {
extern bool is_migrant(struct unit *u);
extern int study_cost(struct unit *u, skill_t talent);
#define MAXTEACHERS 8
#define MAXTEACHERS 16
typedef struct teaching_info {
struct unit *teachers[MAXTEACHERS];
int value;

1
src/util/bsdstring.h
View File

@ -17,5 +17,6 @@ extern size_t slprintf(char * dst, size_t size, const char * format, ...);
#endif
#define WARN_STATIC_BUFFER() log_warning("static buffer too small in %s:%d\n", __FILE__, __LINE__)
#define INFO_STATIC_BUFFER() log_info("static buffer too small in %s:%d\n", __FILE__, __LINE__)
#endif