Bug 1982: disable the clone spell.

This commit is contained in:
Enno Rehling 2019-04-07 17:55:04 +02:00
parent 21e226b068
commit 3f021b21cd
9 changed files with 29 additions and 18 deletions

View File

@ -25,7 +25,7 @@
<entry spell="cerddor_destroymagic" level="8" />
<entry spell="cerddorfumbleshield" level="5" />
<entry spell="chaosrow" level="8" />
<entry spell="clone" level="9" />
<!-- <entry spell="clone" level="9" /> -->
<entry spell="coldfront" level="8" />
<entry spell="combatrust" level="6" />
<entry spell="combat_speed" level="9" />

View File

@ -27,7 +27,7 @@
<entry spell="readmind" level="7" />
<entry spell="gooddreams" level="8" />
<entry spell="illaundestroymagic" level="8" />
<entry spell="clone" level="9" />
<!-- <entry spell="clone" level="9" /> -->
<entry spell="bad_dreams" level="10" />
<entry spell="mindblast" level="11" />
<entry spell="create_dreameye" level="14" />

View File

@ -79,13 +79,13 @@
<!-- Traumbilder entwirren -->
<resource name="aura" amount="6" cost="level"/>
</spell>
<!-- Seelenkopie, disabled version 3.20, Bug 1982
<spell name="clone" rank="5">
<!-- Seelenkopie -->
<resource name="aura" amount="100" cost="fixed"/>
<resource name="permaura" amount="20" cost="fixed"/>
<resource name="dragonblood" amount="5" cost="fixed"/>
<resource name="silk" amount="20" cost="fixed"/>
</spell>
</spell> -->
<spell name="bad_dreams" rank="5" far="true">
<!-- Schlechte Träume -->
<resource name="aura" amount="90" cost="fixed"/>

View File

@ -30,7 +30,7 @@
<entry spell="cerddorfumbleshield" level="5" />
<entry spell="chaosrow" level="8" />
<entry spell="chaossuction" level="14" />
<entry spell="clone" level="9" />
<!-- <entry spell="clone" level="9" /> -->
<entry spell="coldfront" level="8" />
<entry spell="cold_protection" level="3" />
<entry spell="combatrust" level="6" />

View File

@ -20,7 +20,7 @@
<entry spell="shadowknights" level="1" />
<entry spell="sparkledream" level="1" />
<entry spell="puttorest" level="2" />
<entry spell="clone" level="9" />
<!-- <entry spell="clone" level="9" /> -->
<entry spell="create_roi" level="6" />
<entry spell="earn_silver#illaun" level="1" />
<entry spell="create_aots" level="6" />

View File

@ -446,12 +446,13 @@
<resource name="permaura" amount="10" cost="fixed"/>
<resource name="toadslime" amount="1" cost="fixed"/>
</spell>
<!-- Seelenkopie, disabled version 3.20, Bug 1982
<spell name="clone" rank="5">
<resource name="aura" amount="100" cost="fixed"/>
<resource name="permaura" amount="20" cost="fixed"/>
<resource name="dragonblood" amount="5" cost="fixed"/>
<resource name="lifepotion" amount="5" cost="fixed"/>
</spell>
</spell> -->
<spell name="drain_skills" rank="5" combat="2">
<resource name="aura" amount="4" cost="fixed"/>
</spell>

View File

@ -54,11 +54,12 @@ static int read_seenspells(variant *var, void *owner, struct gamedata *data)
READ_TOK(store, token, sizeof(token));
while (token[0]) {
spell *sp = find_spell(token);
if (!sp) {
log_info("read_seenspells: could not find spell '%s'\n", token);
return AT_READ_FAIL;
}
if (sp) {
selist_push(&ql, sp);
}
else {
log_info("read_seenspells: could not find spell '%s'\n", token);
}
READ_TOK(store, token, sizeof(token));
}
var->v = ql;
@ -70,8 +71,8 @@ static bool cb_write_spell(void *data, void *more) {
storage *store = (storage *)more;
WRITE_TOK(store, sp->sname);
return true;
}
static void
write_seenspells(const variant *var, const void *owner, struct storage *store)
{

View File

@ -108,8 +108,8 @@ struct locale *crtag_locale(void) {
static const char *crtag(const char *key)
{
const char *result;
result = LOC(crtag_locale(), key);
return result;
result = locale_string(crtag_locale(), key, false);
return result ? result : key;
}
/*
* translation table
@ -849,11 +849,17 @@ void cr_output_unit(stream *out, const faction * f,
pzTmp = get_racename(u->attribs);
if (pzTmp) {
const char *pzRace = locale_string(lang, mkname("race", pzTmp), false);
pzTmp = pzRace ? translate(pzRace, LOC(lang, pzRace)) : pzTmp;
stream_printf(out, "\"%s\";Typ\n", pzTmp);
if (pzRace) {
pzTmp = pzRace;
}
pzRace = translate(pzTmp, locale_string(lang, pzTmp, false));
if (!pzRace) {
pzRace = pzTmp;
}
stream_printf(out, "\"%s\";Typ\n", pzRace);
if (u->faction == f && fval(u_race(u), RCF_SHAPESHIFTANY)) {
pzRace = rc_name_s(u_race(u), NAME_PLURAL);
stream_printf(out, "\"%s\";wahrerTyp\n", pzTmp);
stream_printf(out, "\"%s\";wahrerTyp\n", pzRace);
}
}
else {

View File

@ -12,5 +12,8 @@ IF exist build-vs%VSVERSION% goto HAVEDIR
mkdir build-vs%VSVERSION%
:HAVEDIR
cd build-vs%VSVERSION%
IF NOT EXIST CMakeCache.txt GOTO NOCACHE
DEL CMakeCache.txt
:NOCACHE
"%CMAKE_ROOT%\bin\cmake.exe" -G "Visual Studio %VSVERSION%" -DCMAKE_PREFIX_PATH="%LUA_DEV%;%WIN32_DEV%" -DCMAKE_MODULE_PATH="%SRCDIR%/cmake/Modules" -DCMAKE_SUPPRESS_REGENERATION=TRUE ..
PAUSE