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

more astral spell magic resist fixes

This commit is contained in:
Enno Rehling 2021-02-13 11:53:49 +01:00
parent 31a3f10e8f
commit 117edad7e4
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/tests/e2/astral.lua
View File

@ -13,6 +13,7 @@ function setup()
eressea.settings.set("NewbieImmunity", "0")
eressea.settings.set("rules.food.flags", "4")
eressea.settings.set("rules.peasants.growth.factor", "0")
eressea.settings.set("magic.resist.enable", "0")
eressea.settings.set("magic.fumble.enable", "0")
eressea.settings.set("magic.regeneration.enable", "0")
end

14
src/spells.c
View File

@ -5135,7 +5135,7 @@ int sp_pullastral(castorder * co)
/* fuer jede Einheit in der Kommandozeile */
for (n = 1; n < pa->length; n++) {
spllprm *spobj = pa->param[n];
if (spobj->flag == TARGET_NOTFOUND)
if (spobj->flag)
continue;
u = spobj->data.u;
@ -5262,7 +5262,7 @@ int sp_leaveastral(castorder * co)
/* fuer jede Einheit in der Kommandozeile */
for (n = 1; n < pa->length; n++) {
if (pa->param[n]->flag == TARGET_NOTFOUND)
if (pa->param[n]->flag)
continue;
u = pa->param[n]->data.u;
@ -5659,7 +5659,7 @@ static int sp_eternizewall(castorder * co)
message *msg;
/* wenn kein Ziel gefunden, Zauber abbrechen */
if (pa->param[0]->flag == TARGET_NOTFOUND)
if (pa->param[0]->flag)
return 0;
b = pa->param[0]->data.b;
@ -5782,7 +5782,7 @@ int sp_movecastle(castorder * co)
message *msg;
/* wenn kein Ziel gefunden, Zauber abbrechen */
if (pa->param[0]->flag == TARGET_NOTFOUND)
if (pa->param[0]->flag)
return 0;
b = pa->param[0]->data.b;
@ -5867,7 +5867,7 @@ int sp_stealaura(castorder * co)
struct sc_mage *scm;
/* wenn kein Ziel gefunden, Zauber abbrechen */
if (pa->param[0]->flag == TARGET_NOTFOUND)
if (pa->param[0]->flag)
return 0;
/* Zieleinheit */
@ -6271,7 +6271,7 @@ static int sp_babbler(castorder * co)
message *msg;
/* wenn kein Ziel gefunden, Zauber abbrechen */
if (pa->param[0]->flag == TARGET_NOTFOUND)
if (pa->param[0]->flag)
return 0;
target = pa->param[0]->data.u;
@ -6317,7 +6317,7 @@ static int sp_readmind(castorder * co)
spellparameter *pa = co->par;
/* wenn kein Ziel gefunden, Zauber abbrechen */
if (pa->param[0]->flag == TARGET_NOTFOUND)
if (pa->param[0]->flag)
return 0;
target = pa->param[0]->data.u;

2
src/spells/flyingship.c
View File

@ -53,7 +53,7 @@ int sp_flying_ship(castorder * co)
pa = co->par;
/* wenn kein Ziel gefunden, Zauber abbrechen */
if (pa->param[0]->flag == TARGET_NOTFOUND)
if (pa->param[0]->flag)
return 0;
sh = pa->param[0]->data.sh;
if (sh->number > 1 || sh->type->construction->maxsize > 50) {