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

Weihnachten 2001, Teil 2.

This commit is contained in:
Enno Rehling 2001-12-30 08:24:05 +00:00
parent 43f0d37ca8
commit f7b4b6f004
3 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/modules/xmas2000.c
View File

@ -27,6 +27,9 @@
#include <faction.h> #include <faction.h>
#include <race.h> #include <race.h>
/* gamecode includes */
#include <xmas.h>
/* util includes */ /* util includes */
#include <goodies.h> #include <goodies.h>
#include <resolve.h> #include <resolve.h>
@ -134,29 +137,6 @@ make_gates(region * r)
add_trigger(&b->attribs, "timer", trigger_xmasgate(b)); add_trigger(&b->attribs, "timer", trigger_xmasgate(b));
} }
static void
santa_comes_to_town(region * r)
{
unit * santa = make_santa(r);
faction * f;
fset(santa, FL_TRAVELTHRU);
for (f = factions;f;f=f->next) {
unit * u;
unit * senior = f->units;
if (!playerrace(f->race)) continue;
for (u = f->units; u; u=u->nextF) {
if (senior->age < u->age) senior = u;
}
if (!senior) continue;
sprintf(buf, "von %s: 'Ho ho ho. Frohe Weihnachten, und alles Gute für dein Volk, %s.'", unitname(santa), unitname(senior));
addmessage(senior->region, 0, buf, MSG_MESSAGE, ML_IMPORTANT);
travelthru(santa, senior->region);
}
}
void void
init_xmas2000(void) init_xmas2000(void)
{ {

12
src/eressea/korrektur.c
View File

@ -24,6 +24,7 @@
/* misc includes */ /* misc includes */
#include <attributes/key.h> #include <attributes/key.h>
#include <modules/xmas2000.h> #include <modules/xmas2000.h>
#include <modules/xmas2001.h>
#include <modules/museum.h> #include <modules/museum.h>
/* gamecode includes */ /* gamecode includes */
@ -73,6 +74,10 @@
#include <attributes/targetregion.h> #include <attributes/targetregion.h>
#include <attributes/key.h> #include <attributes/key.h>
#undef XMAS1999
#undef XMAS2000
#define XMAS2001
#if 0 #if 0
static int static int
skillmodifieslearning(void) skillmodifieslearning(void)
@ -317,7 +322,7 @@ add_magrathea(void)
} }
#endif #endif
#ifdef XMAS #ifdef XMAS1999
#include "race.h" #include "race.h"
#include "movement.h" #include "movement.h"
@ -2822,7 +2827,7 @@ korrektur(void)
create_teleport_plane(); create_teleport_plane();
if (global.data_version<TYPES_VERSION) fix_icastles(); if (global.data_version<TYPES_VERSION) fix_icastles();
#ifdef XMAS #ifdef XMAS2000
santa_comes_to_town(); santa_comes_to_town();
#endif #endif
#ifdef FUZZY_BASE36 #ifdef FUZZY_BASE36
@ -2838,6 +2843,9 @@ korrektur_end(void)
#ifdef SKILLMODIFIESLEARNING #ifdef SKILLMODIFIESLEARNING
do_once("smle", skillmodifieslearning()); do_once("smle", skillmodifieslearning());
#endif #endif
#ifdef XMAS2001
do_once("2001", xmas2001());
#endif
} }
void void

17
src/res/resources.xml
View File

@ -1,3 +1,20 @@
<resource name="mistletoe">
<comment>Sets the chance of escape in a fight to 100 percent</comment>
<item notlost weight="0">
<function name="use" value="usemistletoe"></function>
</item>
</resource>
<strings>
<string name="mistletoe">
<text locale="de">Mistelzweig</text>
<text locale="en">mistletoe</text>
</string>
<string name="mistletoe_p">
<text locale="de">Mistelzweige</text>
<text locale="en">mistletoes</text>
</string>
</strings>
<resource name="magicbox"> <resource name="magicbox">
<comment>A magic box that increases the user's capacity by 10 WU</comment> <comment>A magic box that increases the user's capacity by 10 WU</comment>
<item cursed weight="0" capacity="1000"> <item cursed weight="0" capacity="1000">