forked from github/server
#define GIVERESTRICTION in den settings-header
This commit is contained in:
parent
10bb716d52
commit
92941d03e1
|
@ -524,7 +524,6 @@ give_item(int want, const item_type * itype, unit * src, unit * dest, const char
|
||||||
assert(itype!=NULL);
|
assert(itype!=NULL);
|
||||||
n = new_get_pooled(src, item2resource(itype), GET_DEFAULT);
|
n = new_get_pooled(src, item2resource(itype), GET_DEFAULT);
|
||||||
n = min(want, n);
|
n = min(want, n);
|
||||||
#define GIVERESTRICTION 3
|
|
||||||
if (dest && src->faction != dest->faction && src->faction->age < GIVERESTRICTION) {
|
if (dest && src->faction != dest->faction && src->faction->age < GIVERESTRICTION) {
|
||||||
ADDMSG(&src->faction->msgs, msg_error(src, cmd, "giverestriction",
|
ADDMSG(&src->faction->msgs, msg_error(src, cmd, "giverestriction",
|
||||||
"turns", GIVERESTRICTION));
|
"turns", GIVERESTRICTION));
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
#define RESOURCE_CONVERSION 1
|
#define RESOURCE_CONVERSION 1
|
||||||
#define RESOURCE_QUANTITY 0.5
|
#define RESOURCE_QUANTITY 0.5
|
||||||
#define TEACHDIFFERENCE 2
|
#define TEACHDIFFERENCE 2
|
||||||
|
#define GIVERESTRICTION 3
|
||||||
|
|
||||||
#define MUSEUM_MODULE
|
#define MUSEUM_MODULE
|
||||||
#define ARENA_MODULE
|
#define ARENA_MODULE
|
||||||
|
|
|
@ -40,5 +40,6 @@
|
||||||
#define RESOURCE_QUANTITY 0.5
|
#define RESOURCE_QUANTITY 0.5
|
||||||
#define TEACHDIFFERENCE 2
|
#define TEACHDIFFERENCE 2
|
||||||
#define MAXAGE 8
|
#define MAXAGE 8
|
||||||
|
#define GIVERESTRICTION 3
|
||||||
|
|
||||||
#define MAILITPATH "/usr/sbin:$HOME/tutorial/bin:/bin:/usr/bin:/usr/local/bin"
|
#define MAILITPATH "/usr/sbin:$HOME/tutorial/bin:/bin:/usr/bin:/usr/local/bin"
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
#define RESOURCE_CONVERSION 1
|
#define RESOURCE_CONVERSION 1
|
||||||
#define RESOURCE_QUANTITY 0.5
|
#define RESOURCE_QUANTITY 0.5
|
||||||
#define TEACHDIFFERENCE 2
|
#define TEACHDIFFERENCE 2
|
||||||
|
#define GIVERESTRICTION 0
|
||||||
|
|
||||||
#define ALLIANCES
|
#define ALLIANCES
|
||||||
#undef ALLIANCEJOIN
|
#undef ALLIANCEJOIN
|
||||||
|
|
Loading…
Reference in New Issue