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

sprüche angepasst

This commit is contained in:
Katja Zedel 2002-04-21 11:23:58 +00:00
parent c133699453
commit aa29f976af
3 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/gamecode/laws.c
View File

@ -2804,6 +2804,31 @@ reorder(void)
} }
} }
#if 0
static void
evict(void)
{
region *r;
strlist *S;
unit * u;
for (r=regions;r;r=r->next) {
for (u=r->units;u;u=u->next) {
for (S = u->orders; S; S = S->next) if (igetkeyword(S->s, u->faction->locale)==K_EVICT) {
/* Nur der Kapitän bzw Burgherr kann jemanden rausschmeißen */
if(!fval(u, FL_OWNER)) {
cmistake(u,S->s,146,MSG_EVENT);
continue;
}
int id = getid();
unit *u2 = findunit(id);
}
}
}
}
#endif
static void static void
renumber(void) renumber(void)
{ {
@ -3538,6 +3563,10 @@ processorders (void)
puts(" - Einheiten Sortieren"); puts(" - Einheiten Sortieren");
reorder(); reorder();
#if 0
puts(" - Einheiten aus Gebäuden/Schiffen weisen");
evict();
#endif
puts(" - Neue Nummern"); puts(" - Neue Nummern");
renumber(); renumber();

18
src/common/kernel/spell.c
View File

@ -3257,7 +3257,7 @@ sp_unholypower(castorder *co)
* Kategorie: Region, negativ * Kategorie: Region, negativ
* *
* Wirkung: * Wirkung:
* alle Personen in der Region verlieren 8 HP * Magieresistenz * alle Personen in der Region verlieren 18 HP * Magieresistenz
* Wirkt gegen MR * Wirkt gegen MR
* Rüstung wirkt nicht * Rüstung wirkt nicht
* Patzer: * Patzer:
@ -3295,8 +3295,8 @@ sp_deathcloud(castorder *co)
if (target_resists_magic(mage, u, TYP_UNIT, 0)){ if (target_resists_magic(mage, u, TYP_UNIT, 0)){
continue; continue;
} }
/* Jede Person verliert 8 HP */ /* Jede Person verliert 18 HP */
damage = 8 * u->number; damage = 18 * u->number;
/* Reduziert durch Magieresistenz */ /* Reduziert durch Magieresistenz */
damage *= (100.0 - magic_resistance(u))/100.0; damage *= (100.0 - magic_resistance(u))/100.0;
change_hitpoints(u, -(int)damage); change_hitpoints(u, -(int)damage);
@ -8122,7 +8122,7 @@ spell spelldaten[] =
NULL, NULL,
M_CHAOS, (ONSHIPCAST), 1, 4, M_CHAOS, (ONSHIPCAST), 1, 4,
{ {
{R_HITPOINTS, 4, SPC_FIX}, {R_HITPOINTS, 12, SPC_FIX},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}, {0, 0, 0},
@ -8277,7 +8277,7 @@ spell spelldaten[] =
5, 7, 5, 7,
{ {
{R_AURA, 30, SPC_FIX}, {R_AURA, 30, SPC_FIX},
{R_PEASANTS, 250, SPC_FIX}, {R_PEASANTS, 50, SPC_FIX},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}}, {0, 0, 0}},
@ -8440,8 +8440,8 @@ spell spelldaten[] =
"u+", "u+",
M_CHAOS, (UNITSPELL | SPELLLEVEL | TESTCANSEE), 5, 10, M_CHAOS, (UNITSPELL | SPELLLEVEL | TESTCANSEE), 5, 10,
{ {
{R_AURA, 8, SPC_LEVEL}, {R_AURA, 10, SPC_LEVEL},
{R_PEASANTS, 50, SPC_LEVEL}, {R_PEASANTS, 5, SPC_LEVEL},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}}, {0, 0, 0}},
@ -8459,7 +8459,7 @@ spell spelldaten[] =
M_CHAOS, (FARCASTING | REGIONSPELL | TESTRESISTANCE), 5, 11, M_CHAOS, (FARCASTING | REGIONSPELL | TESTRESISTANCE), 5, 11,
{ {
{R_AURA, 40, SPC_FIX}, {R_AURA, 40, SPC_FIX},
{R_HITPOINTS, 4, SPC_FIX}, {R_HITPOINTS, 15, SPC_FIX},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}}, {0, 0, 0}},
@ -8546,7 +8546,7 @@ spell spelldaten[] =
M_CHAOS, (0), 5, 14, M_CHAOS, (0), 5, 14,
{ {
{R_AURA, 150, SPC_FIX}, {R_AURA, 150, SPC_FIX},
{R_PEASANTS, 500, SPC_FIX}, {R_PEASANTS, 200, SPC_FIX},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}, {0, 0, 0},
{0, 0, 0}}, {0, 0, 0}},

6
src/eressea/korrektur.c
View File

@ -578,6 +578,12 @@ show_newspells(void)
* terminieren */ * terminieren */
spellid_t newspellids[] = { spellid_t newspellids[] = {
SPL_BLOODSACRIFICE,
SPL_DEATHCLOUD,
SPL_PLAGUE,
SPL_UNHOLYPOWER,
SPL_CHAOSSUCTION,
SPL_CHAOSROW,
SPL_NOSPELL }; SPL_NOSPELL };
/* die id's der neuen oder veränderten Sprüche werden in newspellids[] /* die id's der neuen oder veränderten Sprüche werden in newspellids[]