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

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2017-08-18 20:31:56 +02:00
parent 3ea06b23e8 54b5b09e15
commit 21a43b8be9
17 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle.c
View File

@ -55,6 +55,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <attributes/racename.h>
#include <attributes/otherfaction.h>
#include <attributes/moved.h>
#include <spells/buildingcurse.h>
/* util includes */
#include <util/assert.h>
@ -1920,9 +1921,7 @@ int skilldiff(troop at, troop dt, int dist)
skdiff -= beff;
is_protected = 2;
if (b->attribs) {
const curse_type *magicwalls_ct = ct_find("magicwalls");
if (magicwalls_ct
&& curse_active(get_curse(b->attribs, magicwalls_ct))) {
if (curse_active(get_curse(b->attribs, &ct_magicwalls))) {
/* Verdoppelt Burgenbonus */
skdiff -= beff;
}

8
src/battle.test.c
View File

@ -11,6 +11,9 @@
#include <kernel/race.h>
#include <kernel/region.h>
#include <kernel/unit.h>
#include <spells/buildingcurse.h>
#include <util/functions.h>
#include <util/rand.h>
#include <util/rng.h>
@ -468,12 +471,11 @@ static void test_battle_skilldiff_building(CuTest *tc)
unit *ua, *ud;
battle *b = NULL;
building_type *btype;
const curse_type *strongwall_ct, *magicwalls_ct;
const curse_type *strongwall_ct;
test_setup();
btype = setup_castle();
strongwall_ct = ct_find("strongwall");
magicwalls_ct = ct_find("magicwalls");
r = test_create_region(0, 0, 0);
ud = test_create_unit(test_create_faction(0), r);
@ -489,7 +491,7 @@ static void test_battle_skilldiff_building(CuTest *tc)
ud->building->size = 10;
CuAssertIntEquals(tc, -1, skilldiff(ta, td, 0));
create_curse(NULL, &ud->building->attribs, magicwalls_ct, 1, 1, 1, 1);
create_curse(NULL, &ud->building->attribs, &ct_magicwalls, 1, 1, 1, 1);
CuAssertIntEquals(tc, -2, skilldiff(ta, td, 0));
create_curse(NULL, &ud->building->attribs, strongwall_ct, 1, 1, 2, 1);

6
src/items.c
View File

@ -22,6 +22,7 @@
#include <kernel/unit.h>
#include <attributes/fleechance.h>
#include <spells/shipcurse.h>
/* triggers includes */
#include <triggers/changerace.h>
@ -88,7 +89,6 @@ static int
use_speedsail(struct unit *u, const struct item_type *itype, int amount,
struct order *ord)
{
curse *c;
double effect;
ship *sh = u->ship;
if (!sh) {
@ -97,9 +97,7 @@ struct order *ord)
}
effect = SPEEDSAIL_EFFECT;
c = create_curse(u, &sh->attribs, ct_find("shipspeedup"), 20, INT_MAX,
effect, 0);
c_setflag(c, CURSE_NOAGE);
create_curse(u, &sh->attribs, &ct_shipspeedup, 20, INT_MAX, effect, 0);
ADDMSG(&u->faction->msgs, msg_message("use_speedsail", "unit speed", u,
SPEEDSAIL_EFFECT));

25
src/kernel/curse.c
View File

@ -61,14 +61,14 @@ static curse *cursehash[MAXENTITYHASH];
void c_setflag(curse * c, unsigned int flags)
{
assert(c);
c->flags = (c->flags & ~flags) | (flags & (c->type->flags ^ flags));
c->mask = (c->mask & ~flags) | (flags & (c->type->flags ^ flags));
}
/* -------------------------------------------------------------------------- */
void c_clearflag(curse * c, unsigned int flags)
{
assert(c);
c->flags = (c->flags & ~flags) | (c->type->flags & flags);
c->mask = (c->mask & ~flags) | (c->type->flags & flags);
}
void chash(curse * c)
@ -180,14 +180,13 @@ int curse_read(attrib * a, void *owner, gamedata *data)
int ur;
char cursename[64];
int n;
int flags;
float flt;
assert(!c->no);
READ_INT(store, &c->no);
chash(c);
READ_TOK(store, cursename, sizeof(cursename));
READ_INT(store, &flags);
READ_INT(store, &c->mask);
READ_INT(store, &c->duration);
READ_FLT(store, &flt);
c->vigour = flt;
@ -214,7 +213,6 @@ int curse_read(attrib * a, void *owner, gamedata *data)
assert(result == 0);
return AT_READ_FAIL;
}
c->flags = flags;
if (data->version < EXPLICIT_CURSE_ISNEW_VERSION) {
c_clearflag(c, CURSE_ISNEW);
}
@ -239,21 +237,13 @@ int curse_read(attrib * a, void *owner, gamedata *data)
void curse_write(const attrib * a, const void *owner, struct storage *store)
{
unsigned int flags;
curse *c = (curse *)a->data.v;
const curse_type *ct = c->type;
unit *mage = (c->magician && c->magician->number) ? c->magician : NULL;
/* copied from c_clearflag */
#if RELEASE_VERSION < EXPLICIT_CURSE_ISNEW_VERSION
flags = (c->flags & ~CURSE_ISNEW) | (c->type->flags & CURSE_ISNEW);
#else
flags = c->flags | c->type->flags;
#endif
WRITE_INT(store, c->no);
WRITE_TOK(store, ct->cname);
WRITE_INT(store, flags);
WRITE_INT(store, c->mask);
WRITE_INT(store, c->duration);
WRITE_FLT(store, (float)c->vigour);
write_unit_reference(mage, store);
@ -306,6 +296,7 @@ void ct_register(const curse_type * ct)
selist **ctlp = cursetypes + hash;
assert(ct->age==NULL || (ct->flags&CURSE_NOAGE) == 0);
assert((ct->flags&CURSE_ISNEW) == 0);
selist_set_insert(ctlp, (void *)ct, NULL);
++ct_changes;
}
@ -553,7 +544,7 @@ static curse *make_curse(unit * mage, attrib ** ap, const curse_type * ct,
c = (curse *)a->data.v;
c->type = ct;
c->flags = 0;
c->mask = 0;
c->vigour = vigour;
c->duration = duration;
c->effect = effect;
@ -633,7 +624,7 @@ static void do_transfer_curse(curse * c, const unit * u, unit * u2, int n)
bool dogive = false;
const curse_type *ct = c->type;
switch ((ct->flags | c->flags) & CURSE_SPREADMASK) {
switch (c_flags(c) & CURSE_SPREADMASK) {
case CURSE_SPREADALWAYS:
dogive = true;
men = u2->number + n;
@ -666,7 +657,7 @@ static void do_transfer_curse(curse * c, const unit * u, unit * u2, int n)
if (dogive) {
curse *cnew = make_curse(c->magician, &u2->attribs, c->type, c->vigour,
c->duration, c->effect, men);
cnew->flags = c->flags;
cnew->mask = c->mask;
if (ct->typ == CURSETYP_UNIT)
set_cursedmen(cnew, men);

4
src/kernel/curse.h
View File

@ -187,7 +187,7 @@ extern "C" {
/* ------------------------------------------------------------- */
/* Allgemeine Zauberwirkungen */
#define c_flags(c) ((c)->type->flags ^ (c)->flags)
#define c_flags(c) ((c)->type->flags ^ (c)->mask)
/* ------------------------------------------------------------- */
@ -215,7 +215,7 @@ extern "C" {
double vigour; /* Stärke der Verzauberung, Widerstand gegen Antimagie */
double effect;
int no; /* 'Einheitennummer' dieses Curse */
int flags; /* WARNING: these are XORed with type->flags! */
int mask; /* This is XORed with type->flags, see c_flags()! */
int duration; /* Dauer der Verzauberung. Wird jede Runde vermindert */
} curse;

8
src/kernel/curse.test.c
View File

@ -137,11 +137,13 @@ static void test_write_flag(CuTest *tc) {
mstream_init(&data.strm);
gamedata_init(&data, &store, RELEASE_VERSION);
setup_curse(&fix, "gbdream");
setup_curse(&fix, "magicwalls");
c = fix.c;
r = fix.r;
uid = r->uid;
c->flags = CURSE_ISNEW;
c_setflag(c, CURSE_ISNEW);
c_setflag(c, CURSE_IMMUNE);
CuAssertIntEquals(tc, c->type->flags | CURSE_IMMUNE | CURSE_ISNEW, c_flags(c));
write_game(&data);
free_gamedata();
data.strm.api->rewind(data.strm.handle);
@ -150,7 +152,7 @@ static void test_write_flag(CuTest *tc) {
CuAssertPtrNotNull(tc, r);
CuAssertPtrNotNull(tc, r->attribs);
c = (curse *)r->attribs->data.v;
CuAssertIntEquals(tc, CURSE_ISNEW, c->flags);
CuAssertIntEquals(tc, c->type->flags | CURSE_IMMUNE | CURSE_ISNEW, c_flags(c));
mstream_done(&data.strm);
gamedata_done(&data);

8
src/kernel/faction.c
View File

@ -283,12 +283,20 @@ faction *addfaction(const char *email, const char *password,
return f;
}
#define PEASANT_MIN (10 * RECRUITFRACTION)
#define PEASANT_MAX (20 * RECRUITFRACTION)
unit *addplayer(region * r, faction * f)
{
unit *u;
const char * name;
const struct equipment* eq;
assert(r->land);
if (rpeasants(r) < PEASANT_MIN) {
rsetpeasants(r, PEASANT_MIN + rng_int() % (PEASANT_MAX - PEASANT_MIN));
}
assert(f->units == NULL);
faction_setorigin(f, 0, r->x, r->y);
u = create_unit(r, f, 1, f->race, 0, NULL, NULL);

3
src/kernel/ship.c
View File

@ -42,6 +42,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <util/xml.h>
#include <attributes/movement.h>
#include <spells/shipcurse.h>
#include <storage.h>
#include <selist.h>
@ -365,7 +366,7 @@ int shipspeed(const ship * sh, const unit * u)
a = a->next;
}
c = get_curse(sh->attribs, ct_find("shipspeedup"));
c = get_curse(sh->attribs, &ct_shipspeedup);
while (c) {
k += curse_geteffect_int(c);
c = c->nexthash;

2
src/kernel/ship.test.c
View File

@ -462,7 +462,7 @@ static void test_shipspeed_shipspeedup(CuTest *tc) {
register_shipcurse();
assert(sh && cap && crew);
create_curse(0, &sh->attribs, ct_find("shipspeedup"), 1, 1, 3, 0);
create_curse(0, &sh->attribs, &ct_shipspeedup, 1, 1, 3, 0);
CuAssertIntEquals_Msg(tc, "shipspeedup adds effect to range", sh->type->range + 3, shipspeed(sh, cap));
test_cleanup();
}

5
src/laws.c
View File

@ -70,6 +70,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <attributes/racename.h>
#include <attributes/raceprefix.h>
#include <attributes/stealth.h>
#include <spells/buildingcurse.h>
/* util includes */
#include <util/attrib.h>
@ -3872,7 +3873,6 @@ int siege_cmd(unit * u, order * ord)
building *b;
int d, pooled;
int bewaffnete, katapultiere = 0;
const curse_type *magicwalls_ct;
resource_type *rt_catapultammo = NULL;
resource_type *rt_catapult = NULL;
@ -3891,7 +3891,6 @@ int siege_cmd(unit * u, order * ord)
}
/* schaden durch katapulte */
magicwalls_ct = ct_find("magicwalls");
rt_catapultammo = rt_find("catapultammo");
rt_catapult = rt_find("catapult");
@ -3932,7 +3931,7 @@ int siege_cmd(unit * u, order * ord)
d = MIN(d, b->size - 1);
/* meldung, schaden anrichten */
if (d && !curse_active(get_curse(b->attribs, magicwalls_ct))) {
if (d && !curse_active(get_curse(b->attribs, &ct_magicwalls))) {
b->size -= d;
use_pooled(u, rt_catapultammo,
GET_SLACK | GET_RESERVE | GET_POOLED_SLACK, d);

2
src/spells.c
View File

@ -2074,7 +2074,7 @@ static int sp_homestone(castorder * co)
return 0;
}
c = create_curse(mage, &mage->building->attribs, ct_find("magicwalls"),
c = create_curse(mage, &mage->building->attribs, &ct_magicwalls,
force * force, 1, zero_effect, 0);
if (c == NULL) {

2
src/spells/buildingcurse.c
View File

@ -75,7 +75,7 @@ CURSETYP_NORM, 0, M_SUMEFFECT, cinfo_magicrunes
};
/* Heimstein-Zauber */
static struct curse_type ct_magicwalls = { "magicwalls",
const struct curse_type ct_magicwalls = { "magicwalls",
CURSETYP_NORM, CURSE_ONLYONE|CURSE_NOAGE, NO_MERGE, cinfo_building
};

3
src/spells/buildingcurse.h
View File

@ -21,6 +21,9 @@ extern "C" {
struct locale;
struct curse;
struct message;
struct curse_type;
extern const struct curse_type ct_magicwalls;
extern void register_buildingcurse(void);
struct message *cinfo_building(const void *obj, objtype_t typ, const struct curse * c, int self);

8
src/spells/regioncurse.c
View File

@ -54,7 +54,7 @@ static message *cinfo_cursed_by_the_gods(const void *obj, objtype_t typ,
static struct curse_type ct_godcursezone = {
"godcursezone",
CURSETYP_NORM, CURSE_IMMUNE | CURSE_ISNEW, (NO_MERGE),
CURSETYP_NORM, CURSE_IMMUNE, (NO_MERGE),
cinfo_cursed_by_the_gods,
};
@ -80,7 +80,7 @@ static message *cinfo_dreamcurse(const void *obj, objtype_t typ, const curse * c
static struct curse_type ct_gbdream = {
"gbdream",
CURSETYP_NORM, CURSE_ISNEW, (NO_MERGE), cinfo_dreamcurse
CURSETYP_NORM, 0, (NO_MERGE), cinfo_dreamcurse
};
/* --------------------------------------------------------------------- */
@ -193,7 +193,7 @@ static struct curse_type ct_fogtrap = {
static struct curse_type ct_maelstrom = {
"maelstrom",
CURSETYP_NORM, CURSE_ISNEW, (M_DURATION | M_VIGOUR),
CURSETYP_NORM, 0, (M_DURATION | M_VIGOUR),
cinfo_simple
};
@ -227,7 +227,7 @@ static struct curse_type ct_drought = {
static struct curse_type ct_badlearn = {
"badlearn",
CURSETYP_NORM, CURSE_ISNEW, (M_DURATION | M_VIGOUR),
CURSETYP_NORM, 0, (M_DURATION | M_VIGOUR),
cinfo_simple
};

4
src/spells/shipcurse.c
View File

@ -73,14 +73,14 @@ static message *cinfo_shipnodrift(const void *obj, objtype_t typ, const curse *
}
static struct curse_type ct_stormwind = { "stormwind",
CURSETYP_NORM, 0, NO_MERGE, cinfo_ship
CURSETYP_NORM, CURSE_NOAGE, NO_MERGE, cinfo_ship
};
static struct curse_type ct_nodrift = { "nodrift",
CURSETYP_NORM, 0, (M_DURATION | M_VIGOUR), cinfo_shipnodrift
};
static struct curse_type ct_shipspeedup = { "shipspeedup",
const struct curse_type ct_shipspeedup = { "shipspeedup",
CURSETYP_NORM, 0, 0, cinfo_ship
};

2
src/spells/shipcurse.h
View File

@ -22,6 +22,8 @@ extern "C" {
struct message;
struct curse;
extern const struct curse_type ct_shipspeedup;
struct message *cinfo_ship(const void *obj, objtype_t typ,
const struct curse *c, int self);
void register_shipcurse(void);

2
src/spells/unitcurse.c
View File

@ -170,7 +170,7 @@ message *cinfo_unit(const void *obj, objtype_t typ, const curse * c, int self)
static struct curse_type ct_orcish = {
"orcish",
CURSETYP_UNIT, CURSE_SPREADMODULO | CURSE_ISNEW, M_MEN,
CURSETYP_UNIT, CURSE_SPREADMODULO, M_MEN,
cinfo_unit
};