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

anti-'drachen sind wimps' änderung

This commit is contained in:
Katja Zedel 2002-04-28 12:47:29 +00:00
parent d3c670a7c2
commit 5d661e47d8
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2808,7 +2808,7 @@ reorder(void)
} }
#if 0 #if 0
/* Aus Gebäude weisen, VERBANNE */
static void static void
evict(void) evict(void)
{ {
@ -2821,11 +2821,38 @@ evict(void)
for (S = u->orders; S; S = S->next) if (igetkeyword(S->s, u->faction->locale)==K_EVICT) { 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 */ /* Nur der Kapitän bzw Burgherr kann jemanden rausschmeißen */
if(!fval(u, FL_OWNER)) { if(!fval(u, FL_OWNER)) {
cmistake(u,S->s,146,MSG_EVENT); /* Die Einheit ist nicht der Eigentümer */
cmistake(u,S->s,49,MSG_EVENT);
continue; continue;
} }
int id = getid(); int id = getid();
unit *u2 = findunit(id); unit *u2 = findunit(id);
if (!u2){
/* Einheit nicht gefunden */
cmistake(u,S->s,63,MSG_EVENT);
continue;
}
if (u->building){
/* in der selben Burg? */
if (u->building != u2->building){
/* nicht in Burg */
cmistake(u,S->s,33,MSG_EVENT);
continue;
}
leave_building(u2);
/* meldung an beide */
}
if (u->ship){
if (u->ship != u2->ship){
/* nicht an Bord */
cmistake(u,S->s,32,MSG_EVENT);
continue;
}
leave_ship(u2);
/* meldung an beide */
}
} }
} }
} }

10
src/res/races.xml
View File

@ -187,7 +187,7 @@
<ai splitsize="20000" moverandom></ai> <ai splitsize="20000" moverandom></ai>
<attack type="1" damage="1d1"></attack> <attack type="1" damage="1d1"></attack>
</race> </race>
<race name="sea serpent" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="5000" maintenance="0" weight="20000" capacity="5000" speed="1.000000" hp="600" ac="3" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants swim noteach getitem canguard> <race name="sea serpent" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="5000" maintenance="0" weight="20000" capacity="5000" speed="1.000000" hp="600" ac="3" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants swim noteach getitem canguard resistbash>
<ai splitsize="6" killpeasants attackrandom moverandom learn></ai> <ai splitsize="6" killpeasants attackrandom moverandom learn></ai>
<function name="name" value="namedragon"></function> <function name="name" value="namedragon"></function>
<function name="move" value="moveswimming"></function> <function name="move" value="moveswimming"></function>
@ -866,7 +866,7 @@
<attack type="4" damage="2d12"></attack> <attack type="4" damage="2d12"></attack>
<attack type="4" damage="2d12"></attack> <attack type="4" damage="2d12"></attack>
</race> </race>
<race name="wyrm" magres="0.900000" maxaura="1.000000" regaura="3.000000" recruitcost="250000" maintenance="0" weight="180000" capacity="100000" speed="1.000000" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants fly walk noteach getitem canguard> <race name="wyrm" magres="0.900000" maxaura="1.000000" regaura="3.000000" recruitcost="250000" maintenance="0" weight="180000" capacity="100000" speed="1.000000" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants fly walk noteach getitem canguard resistbash>
<ai splitsize="1" killpeasants attackrandom learn></ai> <ai splitsize="1" killpeasants attackrandom learn></ai>
<function name="name" value="namedragon"></function> <function name="name" value="namedragon"></function>
<function name="move" value="movedragon"></function> <function name="move" value="movedragon"></function>
@ -879,7 +879,7 @@
<attack type="4" damage="5d30"></attack> <attack type="4" damage="5d30"></attack>
<attack type="6" spell="83"></attack> <attack type="6" spell="83"></attack>
</race> </race>
<race name="dragon" magres="0.700000" maxaura="1.000000" regaura="2.000000" recruitcost="50000" maintenance="0" weight="60000" capacity="30000" speed="1.500000" hp="900" ac="6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants fly walk noteach getitem canguard> <race name="dragon" magres="0.700000" maxaura="1.000000" regaura="2.000000" recruitcost="50000" maintenance="0" weight="60000" capacity="30000" speed="1.500000" hp="900" ac="6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants fly walk noteach getitem canguard resistbash>
<ai splitsize="2" killpeasants attackrandom learn></ai> <ai splitsize="2" killpeasants attackrandom learn></ai>
<function name="name" value="namedragon"></function> <function name="name" value="namedragon"></function>
<function name="age" value="agedragon"></function> <function name="age" value="agedragon"></function>
@ -893,7 +893,7 @@
<attack type="4" damage="3d30"></attack> <attack type="4" damage="3d30"></attack>
<attack type="6" spell="82"></attack> <attack type="6" spell="82"></attack>
</race> </race>
<race name="young dragon" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="10000" maintenance="0" weight="20000" capacity="10000" speed="1.000000" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants fly walk noteach getitem canguard> <race name="young dragon" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="10000" maintenance="0" weight="20000" capacity="10000" speed="1.000000" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants fly walk noteach getitem canguard resistbash>
<ai splitsize="6" killpeasants attackrandom learn></ai> <ai splitsize="6" killpeasants attackrandom learn></ai>
<function name="name" value="namedragon"></function> <function name="name" value="namedragon"></function>
<function name="age" value="agefiredragon"></function> <function name="age" value="agefiredragon"></function>
@ -1268,7 +1268,7 @@
<familiar race="wolf"></familiar> <familiar race="wolf"></familiar>
<familiar race="demon"></familiar> <familiar race="demon"></familiar>
</race> </race>
<race name="shadowdragon" magres="0.950000" maxaura="1.000000" regaura="3.000000" recruitcost="2500000" maintenance="0" weight="100" capacity="100000" speed="1.000000" hp="2700" ac="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="12" scarepeasants fly walk noteach getitem canguard> <race name="shadowdragon" magres="0.950000" maxaura="1.000000" regaura="3.000000" recruitcost="2500000" maintenance="0" weight="100" capacity="100000" speed="1.000000" hp="2700" ac="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="12" scarepeasants fly walk noteach getitem canguard resistbash>
<ai splitsize="1" killpeasants attackrandom learn></ai> <ai splitsize="1" killpeasants attackrandom learn></ai>
<function name="name" value="namedragon"></function> <function name="name" value="namedragon"></function>
<function name="move" value="movedragon"></function> <function name="move" value="movedragon"></function>