forked from github/server
Bug 2633: implement combined trade limits.
This commit is contained in:
Enno Rehling
parent
e02c1e9d00
commit
6626cfe297
|
|
@ -1052,6 +1052,36 @@ const attrib_type at_luxuries = {
|
|||
"luxuries", NULL, free_luxuries, NULL, NULL, NULL
|
||||
};
|
||||
|
||||
static const attrib_type at_trades = {
|
||||
"trades",
|
||||
DEFAULT_INIT,
|
||||
DEFAULT_FINALIZE,
|
||||
DEFAULT_AGE,
|
||||
NO_WRITE,
|
||||
NO_READ
|
||||
};
|
||||
|
||||
static int trade_add(unit *u, int n) {
|
||||
/* Ein Haendler kann nur 10 Gueter pro Talentpunkt handeln. */
|
||||
int k = u->number * 10 * effskill(u, SK_TRADE, NULL);
|
||||
|
||||
attrib *a = a_find(u->attribs, &at_trades);
|
||||
/* hat der Haendler bereits gehandelt, muss die Menge der bereits
|
||||
* verkauften/gekauften Gueter abgezogen werden */
|
||||
if (!a) {
|
||||
a = a_add(&u->attribs, a_new(&at_trades));
|
||||
}
|
||||
else {
|
||||
k -= a->data.i;
|
||||
}
|
||||
|
||||
if (n > k) n = k;
|
||||
|
||||
/* die Menge der verkauften Gueter merken */
|
||||
a->data.i += n;
|
||||
return n;
|
||||
}
|
||||
|
||||
static void expandbuying(region * r, econ_request * buyorders)
|
||||
{
|
||||
const resource_type *rsilver = get_resourcetype(R_SILVER);
|
||||
|
|
@ -1120,8 +1150,9 @@ static void expandbuying(region * r, econ_request * buyorders)
|
|||
a->data.v = items;
|
||||
i_change(&g_requests[j]->unit->items, ltype->itype, 1);
|
||||
use_pooled(u, rsilver, GET_DEFAULT, price);
|
||||
if (u->n < 0)
|
||||
if (u->n < 0) {
|
||||
u->n = 0;
|
||||
}
|
||||
u->n += price;
|
||||
|
||||
rsetmoney(r, rmoney(r) + price);
|
||||
|
|
@ -1158,15 +1189,6 @@ static void expandbuying(region * r, econ_request * buyorders)
|
|||
}
|
||||
}
|
||||
|
||||
attrib_type at_trades = {
|
||||
"trades",
|
||||
DEFAULT_INIT,
|
||||
DEFAULT_FINALIZE,
|
||||
DEFAULT_AGE,
|
||||
NO_WRITE,
|
||||
NO_READ
|
||||
};
|
||||
|
||||
bool trade_needs_castle(const terrain_type *terrain, const race *rc)
|
||||
{
|
||||
static int rc_change, terrain_change;
|
||||
|
|
@ -1198,9 +1220,8 @@ static void buy(unit * u, econ_request ** buyorders, struct order *ord)
|
|||
{
|
||||
char token[128];
|
||||
region *r = u->region;
|
||||
int n, k;
|
||||
int n;
|
||||
econ_request *o;
|
||||
attrib *a;
|
||||
const item_type *itype = NULL;
|
||||
const luxury_type *ltype = NULL;
|
||||
keyword_t kwd;
|
||||
|
|
@ -1239,30 +1260,12 @@ static void buy(unit * u, econ_request ** buyorders, struct order *ord)
|
|||
}
|
||||
}
|
||||
|
||||
/* Ein Haendler kann nur 10 Gueter pro Talentpunkt handeln. */
|
||||
k = u->number * 10 * effskill(u, SK_TRADE, NULL);
|
||||
|
||||
/* hat der Haendler bereits gehandelt, muss die Menge der bereits
|
||||
* verkauften/gekauften Gueter abgezogen werden */
|
||||
a = a_find(u->attribs, &at_trades);
|
||||
if (!a) {
|
||||
a = a_add(&u->attribs, a_new(&at_trades));
|
||||
}
|
||||
else {
|
||||
k -= a->data.i;
|
||||
}
|
||||
|
||||
if (n > k) n = k;
|
||||
|
||||
if (!n) {
|
||||
n = trade_add(u, n);
|
||||
if (n <= 0) {
|
||||
cmistake(u, ord, 102, MSG_COMMERCE);
|
||||
return;
|
||||
}
|
||||
|
||||
assert(n >= 0);
|
||||
/* die Menge der verkauften Gueter merken */
|
||||
a->data.i += n;
|
||||
|
||||
s = gettoken(token, sizeof(token));
|
||||
itype = s ? finditemtype(s, u->faction->locale) : 0;
|
||||
if (itype != NULL) {
|
||||
|
|
@ -1309,8 +1312,7 @@ static void expandselling(region * r, econ_request * sellorders, int limit)
|
|||
unit *maxowner = (unit *)NULL;
|
||||
building *maxb = (building *)NULL;
|
||||
building *b;
|
||||
unit *u;
|
||||
unit *hafenowner;
|
||||
unit *hafenowner, *u;
|
||||
static int counter[MAXLUXURIES];
|
||||
static int ncounter = 0;
|
||||
static int bt_cache;
|
||||
|
|
@ -1386,6 +1388,8 @@ static void expandselling(region * r, econ_request * sellorders, int limit)
|
|||
int multi = r_demand(r, ltype);
|
||||
int i, price;
|
||||
int use = 0;
|
||||
|
||||
u = g_requests[j]->unit;
|
||||
for (i = 0, search = luxurytypes; search != ltype; search = search->next) {
|
||||
/* TODO: this is slow and lame! */
|
||||
++i;
|
||||
|
|
@ -1397,9 +1401,12 @@ static void expandselling(region * r, econ_request * sellorders, int limit)
|
|||
price = ltype->price * multi;
|
||||
|
||||
if (money >= price) {
|
||||
if (trade_add(u, 1) != 1) {
|
||||
break;
|
||||
}
|
||||
else {
|
||||
item *itm;
|
||||
attrib *a;
|
||||
u = g_requests[j]->unit;
|
||||
a = a_find(u->attribs, &at_luxuries);
|
||||
if (!a) {
|
||||
a = a_add(&u->attribs, a_new(&at_luxuries));
|
||||
|
|
@ -1447,8 +1454,9 @@ static void expandselling(region * r, econ_request * sellorders, int limit)
|
|||
counter[i] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (use > 0) {
|
||||
use_pooled(g_requests[j]->unit, ltype->itype->rtype, GET_DEFAULT, use);
|
||||
use_pooled(u, ltype->itype->rtype, GET_DEFAULT, use);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1561,7 +1569,6 @@ static bool sell(unit * u, econ_request ** sellorders, struct order *ord)
|
|||
return false;
|
||||
}
|
||||
else {
|
||||
attrib *a;
|
||||
econ_request *o;
|
||||
int k, available;
|
||||
|
||||
|
|
@ -1597,20 +1604,9 @@ static bool sell(unit * u, econ_request ** sellorders, struct order *ord)
|
|||
/* Ein Haendler kann nur 10 Gueter pro Talentpunkt handeln. */
|
||||
k = u->number * 10 * effskill(u, SK_TRADE, NULL);
|
||||
|
||||
/* hat der Haendler bereits gehandelt, muss die Menge der bereits
|
||||
* verkauften/gekauften Gueter abgezogen werden */
|
||||
a = a_find(u->attribs, &at_trades);
|
||||
if (!a) {
|
||||
a = a_add(&u->attribs, a_new(&at_trades));
|
||||
}
|
||||
else {
|
||||
k -= a->data.i;
|
||||
}
|
||||
|
||||
if (n > k) n = k;
|
||||
assert(n >= 0);
|
||||
/* die Menge der verkauften Gueter merken */
|
||||
a->data.i += n;
|
||||
o = (econ_request *)calloc(1, sizeof(econ_request));
|
||||
if (!o) abort();
|
||||
o->unit = u;
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ static void setup_terrains(CuTest *tc) {
|
|||
static region *setup_trade_region(CuTest *tc, const struct terrain_type *terrain) {
|
||||
region *r;
|
||||
item_type *it_luxury;
|
||||
struct locale * lang = default_locale;
|
||||
struct locale * lang = test_create_locale();
|
||||
|
||||
new_luxurytype(it_luxury = test_create_itemtype("balm"), 5);
|
||||
locale_setstring(lang, it_luxury->rtype->_name, it_luxury->rtype->_name);
|
||||
|
|
@ -233,6 +233,36 @@ static unit *setup_trade_unit(CuTest *tc, region *r, const struct race *rc) {
|
|||
return u;
|
||||
}
|
||||
|
||||
static void test_trade_limits(CuTest *tc) {
|
||||
region *r;
|
||||
unit *u;
|
||||
building *b;
|
||||
const item_type *it_jewel, *it_balm;
|
||||
|
||||
test_setup();
|
||||
setup_production();
|
||||
setup_terrains(tc);
|
||||
init_terrains();
|
||||
r = setup_trade_region(tc, NULL);
|
||||
b = test_create_building(r, test_create_buildingtype("castle"));
|
||||
b->size = 2;
|
||||
rsetpeasants(r, TRADE_FRACTION * 20);
|
||||
it_jewel = it_find("jewel");
|
||||
u = test_create_unit(test_create_faction(NULL), r);
|
||||
set_level(u, SK_TRADE, 1);
|
||||
i_change(&u->items, it_find("money"), 500);
|
||||
unit_addorder(u, create_order(K_BUY, u->faction->locale, "5 %s",
|
||||
LOC(u->faction->locale, resourcename(it_jewel->rtype, 0))));
|
||||
it_balm = it_find("balm");
|
||||
i_change(&u->items, it_balm, 10);
|
||||
unit_addorder(u, create_order(K_SELL, u->faction->locale, "10 %s",
|
||||
LOC(u->faction->locale, resourcename(it_balm->rtype, 0))));
|
||||
produce(r);
|
||||
CuAssertIntEquals(tc, 5, i_get(u->items, it_jewel));
|
||||
CuAssertIntEquals(tc, 5, i_get(u->items, it_balm));
|
||||
test_teardown();
|
||||
}
|
||||
|
||||
static void test_trade_needs_castle(CuTest *tc) {
|
||||
/* Handeln ist nur in Regionen mit Burgen möglich. */
|
||||
race *rc;
|
||||
|
|
@ -837,6 +867,7 @@ CuSuite *get_economy_suite(void)
|
|||
SUITE_ADD_TEST(suite, test_heroes_dont_recruit);
|
||||
SUITE_ADD_TEST(suite, test_tax_cmd);
|
||||
SUITE_ADD_TEST(suite, test_buy_cmd);
|
||||
SUITE_ADD_TEST(suite, test_trade_limits);
|
||||
SUITE_ADD_TEST(suite, test_trade_needs_castle);
|
||||
SUITE_ADD_TEST(suite, test_trade_insect);
|
||||
SUITE_ADD_TEST(suite, test_maintain_buildings);
|
||||
|
|
|
|||
Loading…
Reference in New Issue