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

- Acht Wochen Schonfrist für Newbiews, Schonfristparteien können nicht

Browse source 
mehr bewachen.
This commit is contained in:
Christian Schlittchen 2001-12-15 16:34:23 +00:00
parent 37a23cb1aa
commit 6428321418
4 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/gamecode/laws.c
View file

@ -2367,6 +2367,10 @@ instant_orders(void)
break; break;
case K_GUARD: case K_GUARD:
if (u->faction->age < IMMUN_GEGEN_ANGRIFF) {
cmistake(u, S->s, 304, MSG_EVENT);
break;
}
if (fval(u, FL_HUNGER)) { if (fval(u, FL_HUNGER)) {
cmistake(u, S->s, 223, MSG_EVENT); cmistake(u, S->s, 223, MSG_EVENT);
break; break;
@ -2447,8 +2451,7 @@ remove_unequipped_guarded(void)
for (r = regions; r; r = r->next) for (r = regions; r; r = r->next)
for (u = r->units; u; u = u->next) { for (u = r->units; u; u = u->next) {
int g = getguard(u); if (getguard(u) && (!armedmen(u) || u->faction->age < IMMUN_GEGEN_ANGRIFF))
if (g && !armedmen(u))
setguard(u, GUARD_NONE); setguard(u, GUARD_NONE);
} }
} }

2
src/common/kernel/eressea.h
View file

@ -206,7 +206,7 @@ extern void read_laen(struct region * r, int laen);
#endif #endif
/* So lange kann die Partei nicht angegriffen werden */ /* So lange kann die Partei nicht angegriffen werden */
#define IMMUN_GEGEN_ANGRIFF 6 #define IMMUN_GEGEN_ANGRIFF 8
#undef STUDY_IF_NOT_WORKING #undef STUDY_IF_NOT_WORKING
/** Attackierende Einheiten können keine langen Befehle ausführen */ /** Attackierende Einheiten können keine langen Befehle ausführen */

2
src/corwin.mk
View file

@ -4,7 +4,7 @@ ifndef ERESSEA
endif endif
# Hier definieren, damit nicht '@gcc' # Hier definieren, damit nicht '@gcc'
CC = gcc-3.0 -D_GNU_SOURCE -DLARGE_CASTLES -DNEW_RESOURCEGROWTH -DGROWING_TREES CC = gcc-3.0 -D_GNU_SOURCE
# CC = gcc -D_GNU_SOURCE # CC = gcc -D_GNU_SOURCE
AR = ar AR = ar
CTAGS = ctags CTAGS = ctags

18
src/res/de/messages.xml
View file

@ -4261,6 +4261,24 @@
</locale> </locale>
</message> </message>
<message name="error304">
<type>
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
<arg name="command" type="string"></arg>
</type>
<locale name="de">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - Einheiten einer Partei, die noch immun gegen Angriffe ist, dürfen nicht bewachen."</text>
</nr>
</locale>
<locale name="en">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - units of a faction that can't be attacked may not guard."</text>
</nr>
</locale>
</message>
<message name="msg_event"> <message name="msg_event">
<type> <type>
<arg name="string" type="string"></arg> <arg name="string" type="string"></arg>