forked from github/server
Änderungen für das tutorial
This commit is contained in:
parent
4cbab2ffa6
commit
72f9ac4c3e
|
@ -242,7 +242,7 @@ restart(unit *u, const race * rc)
|
||||||
|
|
||||||
fset(f, FFL_RESTART);
|
fset(f, FFL_RESTART);
|
||||||
fprintf(sqlstream, "UPDATE subscriptions set faction='%s' where faction"
|
fprintf(sqlstream, "UPDATE subscriptions set faction='%s' where faction"
|
||||||
"='%s' and game=%d;", itoa36(u->faction->no), itoa36(f->no), GAME_ID);
|
"='%s' and game=%d;\n", itoa36(u->faction->no), itoa36(f->no), GAME_ID);
|
||||||
f->magiegebiet = u->faction->magiegebiet;
|
f->magiegebiet = u->faction->magiegebiet;
|
||||||
f->options = u->faction->options;
|
f->options = u->faction->options;
|
||||||
freestrlist(nu->orders);
|
freestrlist(nu->orders);
|
||||||
|
@ -2734,7 +2734,7 @@ renumber_factions(void)
|
||||||
a_remove(&rp->faction->attribs, rp->attrib);
|
a_remove(&rp->faction->attribs, rp->attrib);
|
||||||
if (updatelog) fprintf(updatelog, "renum %s %s\n", itoa36(rp->faction->no), itoa36(rp->want));
|
if (updatelog) fprintf(updatelog, "renum %s %s\n", itoa36(rp->faction->no), itoa36(rp->want));
|
||||||
fprintf(sqlstream, "UPDATE subscriptions set faction='%s' where "
|
fprintf(sqlstream, "UPDATE subscriptions set faction='%s' where "
|
||||||
"faction='%s' and game=%d;", itoa36(rp->want),
|
"faction='%s' and game=%d;\n", itoa36(rp->want),
|
||||||
itoa36(rp->faction->no), GAME_ID);
|
itoa36(rp->faction->no), GAME_ID);
|
||||||
rp->faction->no = rp->want;
|
rp->faction->no = rp->want;
|
||||||
register_faction_id(rp->want);
|
register_faction_id(rp->want);
|
||||||
|
|
|
@ -2365,7 +2365,7 @@ remove_empty_factions(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fprintf(sqlstream, "UPDATE subscriptions set status='DEAD' where "
|
fprintf(sqlstream, "UPDATE subscriptions set status='DEAD' where "
|
||||||
"faction='%s' and game=%d;", itoa36(f->no), GAME_ID);
|
"faction='%s' and game=%d\n;", itoa36(f->no), GAME_ID);
|
||||||
|
|
||||||
*fp = f->next;
|
*fp = f->next;
|
||||||
/* stripfaction(f);
|
/* stripfaction(f);
|
||||||
|
|
|
@ -200,7 +200,6 @@ 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 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 */
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
* Include this file from settings.h to make eressea work.
|
* Include this file from settings.h to make eressea work.
|
||||||
*/
|
*/
|
||||||
#define GAME_ID 0
|
#define GAME_ID 0
|
||||||
|
#define IMMUN_GEGEN_ANGRIFF 8
|
||||||
#define RESOURCE_CONVERSION 1
|
#define RESOURCE_CONVERSION 1
|
||||||
#define NEW_RESOURCEGROWTH 1
|
#define NEW_RESOURCEGROWTH 1
|
||||||
#define LARGE_CASTLES 1
|
#define LARGE_CASTLES 1
|
||||||
|
|
|
@ -15,12 +15,13 @@
|
||||||
* Include this file from settings.h to make eressea work.
|
* Include this file from settings.h to make eressea work.
|
||||||
*/
|
*/
|
||||||
#define GAME_ID 1
|
#define GAME_ID 1
|
||||||
|
#define IMMUN_GEGEN_ANGRIFF 3
|
||||||
#define RESOURCE_CONVERSION 1
|
#define RESOURCE_CONVERSION 1
|
||||||
#define NEW_RESOURCEGROWTH 1
|
#define NEW_RESOURCEGROWTH 1
|
||||||
#define LARGE_CASTLES 1
|
#define LARGE_CASTLES 1
|
||||||
#define GROWING_TREES 1
|
#define GROWING_TREES 1
|
||||||
#define REMOVENMRNEWBIE 1
|
#define REMOVENMRNEWBIE 1
|
||||||
#define NMRTIMEOUT 4
|
#define NMRTIMEOUT 2
|
||||||
#define HUNGER_DISABLES_LONGORDERS 1
|
#define HUNGER_DISABLES_LONGORDERS 1
|
||||||
#define REDUCED_PEASANTGROWTH 1
|
#define REDUCED_PEASANTGROWTH 1
|
||||||
#define RACE_ADJUSTMENTS 1
|
#define RACE_ADJUSTMENTS 1
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
* Include this file from settings.h to make eressea work.
|
* Include this file from settings.h to make eressea work.
|
||||||
*/
|
*/
|
||||||
#define GAME_ID 1
|
#define GAME_ID 1
|
||||||
|
#define IMMUN_GEGEN_ANGRIFF 8
|
||||||
#define RESOURCE_CONVERSION 0
|
#define RESOURCE_CONVERSION 0
|
||||||
#define NEW_RESOURCEGROWTH 0
|
#define NEW_RESOURCEGROWTH 0
|
||||||
#define LARGE_CASTLES 0
|
#define LARGE_CASTLES 0
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
* Include this file from settings.h to make eressea work.
|
* Include this file from settings.h to make eressea work.
|
||||||
*/
|
*/
|
||||||
#define GAME_ID 0
|
#define GAME_ID 0
|
||||||
|
#define IMMUN_GEGEN_ANGRIFF 8
|
||||||
#define RESOURCE_CONVERSION 1
|
#define RESOURCE_CONVERSION 1
|
||||||
#define NEW_RESOURCEGROWTH 1
|
#define NEW_RESOURCEGROWTH 1
|
||||||
#define LARGE_CASTLES 1
|
#define LARGE_CASTLES 1
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
* Include this file from settings.h to make eressea work.
|
* Include this file from settings.h to make eressea work.
|
||||||
*/
|
*/
|
||||||
#define GAME_ID 2
|
#define GAME_ID 2
|
||||||
|
#define IMMUN_GEGEN_ANGRIFF 8
|
||||||
#define RESOURCE_CONVERSION 1
|
#define RESOURCE_CONVERSION 1
|
||||||
#define NEW_RESOURCEGROWTH 1
|
#define NEW_RESOURCEGROWTH 1
|
||||||
#define LARGE_CASTLES 1
|
#define LARGE_CASTLES 1
|
||||||
|
|
Loading…
Reference in New Issue