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

Merge pull request #695 from ennorehling/feature/refactor-rcspell 

refactor observers, lighthouses
This commit is contained in:
Enno Rehling 2017-05-28 12:50:05 +02:00 committed by GitHub
parent 383866c44b 153039fdef
commit 3306488641
28 changed files with 442 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/attributes/attributes.c
View File

@ -56,9 +56,98 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <util/attrib.h>
#include <util/event.h>
#include <util/gamedata.h>
#include <util/resolve.h>
#include <storage.h>
#include <stdlib.h>
typedef struct obs_data {
faction *f;
int skill;
int timer;
} obs_data;
static void obs_init(struct attrib *a)
{
a->data.v = malloc(sizeof(obs_data));
}
static void obs_done(struct attrib *a)
{
free(a->data.v);
}
static int obs_age(struct attrib *a, void *owner)
{
obs_data *od = (obs_data *)a->data.v;
update_interval(od->f, (region *)owner);
return --od->timer;
}
static void obs_write(const struct attrib *a, const void *owner, struct storage *store)
{
obs_data *od = (obs_data *)a->data.v;
write_faction_reference(od->f, store);
WRITE_INT(store, od->skill);
WRITE_INT(store, od->timer);
}
static int obs_read(struct attrib *a, void *owner, struct gamedata *data)
{
obs_data *od = (obs_data *)a->data.v;
read_reference(&od->f, data, read_faction_reference, resolve_faction);
READ_INT(data->store, &od->skill);
READ_INT(data->store, &od->timer);
return AT_READ_OK;
}
attrib_type at_observer = { "observer", obs_init, obs_done, obs_age, obs_write, obs_read };
static attrib *make_observer(faction *f, int perception)
{
attrib * a = a_new(&at_observer);
obs_data *od = (obs_data *)a->data.v;
od->f = f;
od->skill = perception;
od->timer = 2;
return a;
}
int get_observer(region *r, faction *f) {
if (fval(r, RF_OBSERVER)) {
attrib *a = a_find(r->attribs, &at_observer);
while (a && a->type == &at_observer) {
obs_data *od = (obs_data *)a->data.v;
if (od->f == f) {
return od->skill;
}
a = a->next;
}
}
return -1;
}
void set_observer(region *r, faction *f, int skill, int turns)
{
update_interval(f, r);
if (fval(r, RF_OBSERVER)) {
attrib *a = a_find(r->attribs, &at_observer);
while (a && a->type == &at_observer) {
obs_data *od = (obs_data *)a->data.v;
if (od->f == f && od->skill < skill) {
od->skill = skill;
od->timer = turns;
return;
}
a = a->nexttype;
}
}
else {
fset(r, RF_OBSERVER);
}
a_add(&r->attribs, make_observer(f, skill));
}
attrib_type at_unitdissolve = {
"unitdissolve", NULL, NULL, NULL, a_writechars, a_readchars
@ -123,6 +212,7 @@ void register_attributes(void)
at_register(&at_stealth);
at_register(&at_dict);
at_register(&at_unitdissolve);
at_register(&at_observer);
at_register(&at_overrideroads);
at_register(&at_raceprefix);
at_register(&at_iceberg);

6
src/attributes/attributes.h
View File

@ -23,8 +23,14 @@ extern "C" {
#endif
struct attrib_type;
struct region;
struct faction;
extern void register_attributes(void);
void set_observer(struct region *r, struct faction *f, int perception, int turns);
int get_observer(struct region *r, struct faction *f);
#ifdef __cplusplus
}
#endif

31
src/battle.c
View File

@ -1654,18 +1654,11 @@ static castorder * create_castorder_combat(castorder *co, fighter *fig, const sp
return co;
}
void do_combatmagic(battle * b, combatmagic_t was)
{
side *s;
region *r = b->region;
castorder *co;
int level, rank, sl;
spellrank spellranks[MAX_SPELLRANK];
memset(spellranks, 0, sizeof(spellranks));
#ifdef FFL_CURSED
if (was == DO_PRECOMBATSPELL) {
static void summon_igjarjuk(battle *b, spellrank spellranks[]) {
side *s;
castorder *co;
for (s = b->sides; s != b->sides + b->nsides; ++s) {
fighter *fig = 0;
if (s->bf->attacker && fval(s->faction, FFL_CURSED)) {
@ -1698,6 +1691,22 @@ void do_combatmagic(battle * b, combatmagic_t was)
}
}
}
}
#endif
void do_combatmagic(battle * b, combatmagic_t was)
{
side *s;
castorder *co;
region *r = b->region;
int level, rank, sl;
spellrank spellranks[MAX_SPELLRANK];
memset(spellranks, 0, sizeof(spellranks));
#ifdef FFL_CURSED
if (was == DO_PRECOMBATSPELL) {
summon_igjarjuk(b, spellranks);
}
#endif
for (s = b->sides; s != b->sides + b->nsides; ++s) {

6
src/chaos.c
View File

@ -112,10 +112,8 @@ static unit *random_unit(const region * r)
unit *u;
for (u = r->units; u; u = u->next) {
if (u_race(u) != get_race(RC_SPELL)) {
c += u->number;
}
}
if (c == 0) {
return NULL;
@ -125,9 +123,7 @@ static unit *random_unit(const region * r)
u = r->units;
while (u && c < n) {
if (u_race(u) != get_race(RC_SPELL)) {
c += u->number;
}
u = u->next;
}
@ -203,7 +199,7 @@ static void chaos(region * r)
for (up = &r->units; *up;) {
unit *u = *up;
if (u_race(u) != get_race(RC_SPELL) && u->ship == 0 && !canfly(u)) {
if (u->ship == 0 && !canfly(u)) {
ADDMSG(&u->faction->msgs, msg_message("tidalwave_kill",
"region unit", r, u));
remove_unit(up, u);

4
src/creport.c
View File

@ -1418,7 +1418,7 @@ static void cr_output_region(FILE * F, report_context * ctx, region * r)
}
cr_output_curses_compat(F, f, r, TYP_REGION);
cr_borders(r, f, r->seen.mode, F);
if (r->seen.mode == seen_unit && is_astral(r)
if (r->seen.mode >= seen_unit && is_astral(r)
&& !is_cursed(r->attribs, C_ASTRALBLOCK, 0)) {
/* Sonderbehandlung Teleport-Ebene */
region_list *rl = astralregions(r, inhabitable);
@ -1441,7 +1441,7 @@ static void cr_output_region(FILE * F, report_context * ctx, region * r)
}
cr_output_travelthru(F, r, f);
if (r->seen.mode == seen_unit || r->seen.mode == seen_travel) {
if (r->seen.mode >= seen_travel) {
message_list *mlist = r_getmessages(r, f);
cr_output_messages(F, r->msgs, f);
if (mlist) {

5
src/economy.c
View File

@ -2978,13 +2978,12 @@ void produce(struct region *r)
static int bt_cache;
static const struct building_type *caravan_bt;
static int rc_cache;
static const race *rc_spell, *rc_insect, *rc_aquarian;
static const race *rc_insect, *rc_aquarian;
if (bt_changed(&bt_cache)) {
caravan_bt = bt_find("caravan");
}
if (rc_changed(&rc_cache)) {
rc_spell = get_race(RC_SPELL);
rc_insect = get_race(RC_INSECT);
rc_aquarian = get_race(RC_AQUARIAN);
}
@ -3022,7 +3021,7 @@ void produce(struct region *r)
bool trader = false;
keyword_t todo;
if (u_race(u) == rc_spell || fval(u, UFL_LONGACTION))
if (fval(u, UFL_LONGACTION))
continue;
if (u_race(u) == rc_insect && r_insectstalled(r) &&

7
src/give.c
View File

@ -667,12 +667,7 @@ void give_cmd(unit * u, order * ord)
return;
}
if (u2 && u_race(u2) == get_race(RC_SPELL)) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord,
"feedback_unit_not_found", ""));
return;
}
else if (u2 && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) {
if (u2 && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) {
cmistake(u, ord, 40, MSG_COMMERCE);
return;
}

2
src/kernel/race.c
View File

@ -69,7 +69,7 @@ const char *racenames[MAXRACES] = {
"dwarf", "elf", NULL, "goblin", "human", "troll", "demon", "insect",
"halfling", "cat", "aquarian", "orc", "snotling", "undead", NULL,
"youngdragon", "dragon", "wyrm", "ent", "catdragon", "dracoid",
NULL, "spell", "irongolem", "stonegolem", "shadowdemon",
NULL, NULL, "irongolem", "stonegolem", "shadowdemon",
"shadowmaster", "mountainguard", "alp", "toad", "braineater", "peasant",
"wolf", NULL, NULL, NULL, NULL, "songdragon", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,

3
src/kernel/race.h
View File

@ -72,8 +72,7 @@ extern "C" {
RC_BIRTHDAYDRAGON,
RC_DRACOID,
RC_SPELL = 22,
RC_IRONGOLEM,
RC_IRONGOLEM = 23,
RC_STONEGOLEM,
RC_SHADOW,
RC_SHADOWLORD,

2
src/kernel/region.h
View File

@ -35,7 +35,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define RF_MALLORN (1<<1) /* persistent */
#define RF_BLOCKED (1<<2) /* persistent */
#define RF_UNUSED_3 (1<<3)
#define RF_OBSERVER (1<<3) /* persistent */
#define RF_UNUSED_4 (1<<4)
#define RF_UNUSED_5 (1<<5)
#define RF_UNUSED_6 (1<<6)

13
src/kernel/save.c
View File

@ -48,6 +48,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "lighthouse.h"
/* attributes includes */
#include <attributes/attributes.h>
#include <attributes/key.h>
#include <triggers/timeout.h>
@ -131,8 +132,6 @@ static unit *unitorders(FILE * F, int enc, struct faction *f)
i = getid();
u = findunitg(i, NULL);
if (u && u_race(u) == get_race(RC_SPELL))
return NULL;
if (u && u->faction == f) {
order **ordp;
@ -851,7 +850,7 @@ void write_unit(struct gamedata *data, const unit * u)
WRITE_SECTION(data->store);
write_items(data->store, u->items);
WRITE_SECTION(data->store);
if (u->hp == 0 && u_race(u)!= get_race(RC_SPELL)) {
if (u->hp == 0 && data->version < NORCSPELL_VERSION) {
log_error("unit %s has 0 hitpoints, adjusting.", itoa36(u->no));
((unit *)u)->hp = u->number;
}
@ -1621,6 +1620,7 @@ int read_game(gamedata *data) {
int rmax = maxregions;
storage * store = data->store;
const struct building_type *bt_lighthouse = bt_find("lighthouse");
const struct race *rc_spell = rc_find("spell");
if (data->version >= SAVEGAMEID_VERSION) {
int gameid;
@ -1705,6 +1705,11 @@ int read_game(gamedata *data) {
while (--p >= 0) {
unit *u = read_unit(data);
if (data->version < NORCSPELL_VERSION && u_race(u) == rc_spell) {
set_observer(r, u->faction, get_level(u, SK_PERCEPTION), u->age);
free_unit(u);
}
else {
if (data->version < JSON_REPORT_VERSION) {
if (u->_name && fval(u->faction, FFL_NPC)) {
if (!u->_name[0] || unit_name_equals_race(u)) {
@ -1716,9 +1721,9 @@ int read_game(gamedata *data) {
u->region = r;
*up = u;
up = &u->next;
update_interval(u->faction, r);
}
}
if ((nread & 0x3FF) == 0) { /* das spart extrem Zeit */
log_debug(" - Einzulesende Regionen: %d/%d * %d,%d \r", rmax, nread, r->x, r->y);

2
src/kernel/types.h
View File

@ -71,8 +71,8 @@ typedef enum {
seen_neighbour,
seen_lighthouse,
seen_travel,
seen_far,
seen_unit,
seen_spell,
seen_battle
} seen_mode;

3
src/kernel/unit.c
View File

@ -1896,8 +1896,7 @@ void remove_empty_units_in_region(region * r)
set_number(u, 0);
}
}
if ((u->number == 0 && u_race(u) != get_race(RC_SPELL)) || (u->age <= 0
&& u_race(u) == get_race(RC_SPELL))) {
if (u->number == 0) {
remove_unit(up, u);
}
if (*up == u)

21
src/kernel/unit.test.c
View File

@ -97,26 +97,6 @@ static void test_remove_units_with_dead_faction(CuTest *tc) {
test_cleanup();
}
static void test_remove_units_ignores_spells(CuTest *tc) {
unit *u;
int uid;
test_cleanup();
test_create_world();
u = create_unit(findregion(0, 0), test_create_faction(test_create_race("human")), 1, test_create_race("spell"), 0, 0, 0);
uid = u->no;
u->number = 0;
u->age = 1;
remove_empty_units_in_region(u->region);
CuAssertPtrNotNull(tc, findunit(uid));
CuAssertPtrNotNull(tc, u->region);
u->age = 0;
remove_empty_units_in_region(u->region);
CuAssertPtrEquals(tc, 0, findunit(uid));
test_cleanup();
}
static void test_scale_number(CuTest *tc) {
unit *u;
const struct potion_type *ptype;
@ -555,7 +535,6 @@ CuSuite *get_unit_suite(void)
SUITE_ADD_TEST(suite, test_update_monster_name);
SUITE_ADD_TEST(suite, test_remove_unit);
SUITE_ADD_TEST(suite, test_remove_empty_units);
SUITE_ADD_TEST(suite, test_remove_units_ignores_spells);
SUITE_ADD_TEST(suite, test_remove_units_without_faction);
SUITE_ADD_TEST(suite, test_remove_units_with_dead_faction);
SUITE_ADD_TEST(suite, test_remove_empty_units_in_region);

17
src/laws.c
View File

@ -153,24 +153,12 @@ static bool RemoveNMRNewbie(void)
static void age_unit(region * r, unit * u)
{
static int rc_cache;
static const race *rc_spell;
if (rc_changed(&rc_cache)) {
rc_spell = get_race(RC_SPELL);
}
if (u_race(u) == rc_spell) {
if (--u->age <= 0) {
remove_unit(&r->units, u);
}
}
else {
const race *rc = u_race(u);
++u->age;
if (u->number > 0 && rc->age_unit) {
rc->age_unit(u);
}
}
if (u->region && is_astral(u->region)) {
item **itemp = &u->items;
while (*itemp) {
@ -2676,8 +2664,7 @@ int guard_on_cmd(unit * u, struct order *ord)
if (fval(u, UFL_MOVED)) {
cmistake(u, ord, 187, MSG_EVENT);
}
else if (fval(u_race(u), RCF_ILLUSIONARY)
|| u_race(u) == get_race(RC_SPELL)) {
else if (fval(u_race(u), RCF_ILLUSIONARY)) {
cmistake(u, ord, 95, MSG_EVENT);
}
else {

33
src/lighthouse.c
View File

@ -63,42 +63,21 @@ void update_lighthouse(building * lh)
}
}
int lighthouse_range(const building * b, const faction * f)
int lighthouse_range(const building * b, const faction * f, const unit *u)
{
int d = 0;
if (fval(b, BLD_MAINTAINED) && b->size >= 10) {
int maxd = (int)log10(b->size) + 1;
if (skill_enabled(SK_PERCEPTION)) {
region *r = b->region;
int c = 0;
int cap = buildingcapacity(b);
unit *u, *uown = building_owner(b);
for (u = r->units; u; u = u->next) {
if (u->building == b || u == uown) {
c += u->number;
if (c > cap) {
break;
}
else if (f == NULL || u->faction == f) {
if (u && skill_enabled(SK_PERCEPTION)) {
int sk = effskill(u, SK_PERCEPTION, 0) / 3;
d = MAX(d, sk);
d = MIN(maxd, d);
if (d == maxd)
break;
assert(u->building == b);
assert(u->faction == f);
maxd = MIN(maxd, sk);
}
}
else if (c)
break; /* first unit that's no longer in the house ends the search */
}
}
else {
/* E3A rule: no perception req'd */
return maxd;
}
}
return d;
return 0;
}
bool check_leuchtturm(region * r, faction * f)

7
src/lighthouse.h
View File

@ -29,14 +29,15 @@ extern "C" {
struct faction;
struct region;
struct building;
struct unit;
struct attrib;
extern struct attrib_type at_lighthouse;
/* leuchtturm */
bool check_leuchtturm(struct region *r, struct faction *f);
void update_lighthouse(struct building *lh);
int lighthouse_range(const struct building *b,
const struct faction *f);
void update_lighthouse(struct building *b);
int lighthouse_range(const struct building *b, const struct faction *f,
const struct unit *u);
#ifdef __cplusplus

24
src/lighthouse.test.c
View File

@ -26,29 +26,29 @@ static void test_lighthouse_range(CuTest * tc)
u1 = test_create_unit(test_create_faction(0), r);
u2 = test_create_unit(test_create_faction(0), r);
b = test_create_building(r, test_create_buildingtype("lighthouse"));
CuAssertIntEquals(tc, 0, lighthouse_range(b, NULL));
CuAssertIntEquals(tc, 0, lighthouse_range(b, u1->faction));
CuAssertIntEquals(tc, 0, lighthouse_range(b, NULL, NULL));
CuAssertIntEquals(tc, 0, lighthouse_range(b, u1->faction, NULL));
b->size = 10;
CuAssertIntEquals(tc, 0, lighthouse_range(b, NULL));
CuAssertIntEquals(tc, 0, lighthouse_range(b, NULL, NULL));
u1->building = b;
u2->building = b;
u1->number = 10;
set_level(u1, SK_PERCEPTION, 3);
set_level(u2, SK_PERCEPTION, 3);
CuAssertIntEquals(tc, 0, lighthouse_range(b, NULL));
CuAssertIntEquals(tc, 0, lighthouse_range(b, NULL, NULL));
b->flags |= BLD_MAINTAINED;
CuAssertIntEquals(tc, 1, lighthouse_range(b, NULL));
CuAssertIntEquals(tc, 1, lighthouse_range(b, u1->faction, u1));
set_level(u1, SK_PERCEPTION, 6);
CuAssertIntEquals(tc, 2, lighthouse_range(b, u1->faction));
CuAssertIntEquals(tc, 0, lighthouse_range(b, u2->faction));
CuAssertIntEquals(tc, 2, lighthouse_range(b, u1->faction, u1));
/* lighthouse_range does not check inside_building */
CuAssertIntEquals(tc, 1, lighthouse_range(b, u2->faction, u2));
b->size = 100;
update_lighthouse(b);
CuAssertIntEquals(tc, 2, lighthouse_range(b, NULL));
CuAssertIntEquals(tc, 3, lighthouse_range(b, NULL, NULL));
CuAssertIntEquals(tc, 2, lighthouse_range(b, u1->faction, u1));
set_level(u1, SK_PERCEPTION, 9);
CuAssertIntEquals(tc, 3, lighthouse_range(b, NULL));
CuAssertIntEquals(tc, 3, lighthouse_range(b, u1->faction));
CuAssertIntEquals(tc, 1, lighthouse_range(b, u2->faction));
CuAssertIntEquals(tc, 0, lighthouse_range(b, test_create_faction(0)));
CuAssertIntEquals(tc, 3, lighthouse_range(b, u1->faction, u1));
CuAssertIntEquals(tc, 1, lighthouse_range(b, u2->faction, u2));
test_cleanup();
}

6
src/magic.c
View File

@ -1209,9 +1209,6 @@ target_resists_magic(unit * magician, void *obj, int objtyp, int t_bonus)
skill *sv;
unit *u = (unit *)obj;
if (u_race(u)==get_race(RC_SPELL)) {
return true;
}
at = effskill(magician, SK_MAGIC, 0);
for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) {
@ -2780,7 +2777,6 @@ void magic(void)
int rank;
castorder *co;
spellrank spellranks[MAX_SPELLRANK];
const race *rc_spell = get_race(RC_SPELL);
const race *rc_insect = get_race(RC_INSECT);
memset(spellranks, 0, sizeof(spellranks));
@ -2790,7 +2786,7 @@ void magic(void)
for (u = r->units; u; u = u->next) {
order *ord;
if (u->number <= 0 || u_race(u) == rc_spell)
if (u->number <= 0)
continue;
if (u_race(u) == rc_insect && r_insectstalled(r) &&

2
src/randenc.c
View File

@ -418,7 +418,7 @@ void drown(region * r)
while (*up) {
unit *u = *up;
if (!(u->ship || u_race(u) == get_race(RC_SPELL) || u->number == 0 || canswim(u) || canfly(u))) {
if (!(u->ship || u->number == 0 || canswim(u) || canfly(u))) {
scale_number(u, 0);
ADDMSG(&u->faction->msgs, msg_message("drown", "unit region", u, r));
}

19
src/report.c
View File

@ -997,7 +997,7 @@ void report_region(struct stream *out, const region * r, faction * f)
}
/* iron & stone */
if (r->seen.mode == seen_unit) {
if (r->seen.mode >= seen_unit) {
resource_report result[MAX_RAWMATERIALS];
int n, numresults = report_resources(r, result, MAX_RAWMATERIALS, f, true);
@ -1184,7 +1184,7 @@ void report_region(struct stream *out, const region * r, faction * f)
*bufp = 0;
paragraph(out, buf, 0, 0, 0);
if (r->seen.mode == seen_unit && is_astral(r) &&
if (r->seen.mode >= seen_unit && is_astral(r) &&
!is_cursed(r->attribs, C_ASTRALBLOCK, 0)) {
/* Sonderbehandlung Teleport-Ebene */
region_list *rl = astralregions(r, inhabitable);
@ -2272,7 +2272,7 @@ report_plaintext(const char *filename, report_context * ctx,
continue;
/* Beschreibung */
if (r->seen.mode == seen_unit) {
if (r->seen.mode >= seen_unit) {
anyunits = 1;
newline(out);
report_region(out, r, f);
@ -2305,24 +2305,13 @@ report_plaintext(const char *filename, report_context * ctx,
report_travelthru(out, r, f);
}
else {
if (r->seen.mode == seen_far) {
newline(out);
report_region(out, r, f);
newline(out);
guards(out, r, f);
newline(out);
report_travelthru(out, r, f);
}
else {
newline(out);
report_region(out, r, f);
newline(out);
report_travelthru(out, r, f);
}
}
/* Statistik */
if (wants_stats && r->seen.mode == seen_unit)
if (wants_stats && r->seen.mode >= seen_unit)
statistics(out, r, f);
/* Nachrichten an REGION in der Region */

58
src/reports.c
View File

@ -21,6 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "reports.h"
#include "guard.h"
#include "laws.h"
#include "spells.h"
#include "travelthru.h"
#include "lighthouse.h"
#include "donations.h"
@ -69,6 +70,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <time.h>
/* attributes includes */
#include <attributes/attributes.h>
#include <attributes/follow.h>
#include <attributes/otherfaction.h>
#include <attributes/racename.h>
@ -93,6 +95,7 @@ const char *visibility[] = {
"travel",
"far",
"unit",
"spell",
"battle"
};
@ -966,9 +969,9 @@ const struct unit *ucansee(const struct faction *f, const struct unit *u,
int stealth_modifier(seen_mode mode)
{
switch (mode) {
case seen_spell:
case seen_unit:
return 0;
case seen_far:
case seen_lighthouse:
return -2;
case seen_travel:
@ -1422,28 +1425,57 @@ void prepare_report(report_context *ctx, faction *f)
ctx->last = lastregion(f);
for (r = ctx->first; r!=ctx->last; r = r->next) {
int range = 0;
unit *u;
if (fval(r, RF_LIGHTHOUSE) && bt_lighthouse) {
if (rule_region_owners && f == region_get_owner(r)) {
/* region owners get the report from lighthouses */
building *b;
for (b = r->buildings; b; b = b->next) {
if (b->type == bt_lighthouse) {
int br = lighthouse_range(b, NULL);
int br = 0, c = 0, range = 0;
if (fval(r, RF_OBSERVER)) {
int skill = get_observer(r, f);
if (skill >= 0) {
add_seen_nb(f, r, seen_spell);
}
}
if (fval(r, RF_LIGHTHOUSE)) {
/* region owners get the report from lighthouses */
if (rule_region_owners && f == region_get_owner(r)) {
for (b = rbuildings(r); b; b = b->next) {
if (b && b->type == bt_lighthouse) {
/* region owners get maximm range */
int br = lighthouse_range(b, NULL, NULL);
if (br > range) range = br;
}
}
}
}
b = NULL;
for (u = r->units; u; u = u->next) {
/* if we have any unit in this region, then we get seen_unit access */
if (u->faction == f) {
add_seen_nb(f, r, seen_unit);
if (fval(r, RF_LIGHTHOUSE) && bt_lighthouse) {
if (u->building && u->building->type == bt_lighthouse && inside_building(u)) {
int br = lighthouse_range(u->building, f);
if (br > range) range = br;
/* units inside the lighthouse get range based on their perception
* or the size, if perception is not a skill
*/
if (!fval(r, RF_LIGHTHOUSE)) {
/* it's enough to add the region once, and if there are
* no lighthouses, there is no need to look at more units */
break;
}
}
if (range == 0 && u->building && u->building->type == bt_lighthouse) {
if (u->building && b != u->building) {
b = u->building;
c = buildingcapacity(b);
br = 0;
}
c -= u->number;
if (u->faction == f && c >= 0) {
/* unit is one of ours, and inside the current lighthouse */
if (br == 0) {
/* lazy-calculate the range */
br = lighthouse_range(u->building, f, u);
}
if (br > range) {
range = br;
}
}
}

38
src/reports.test.c
View File

@ -6,6 +6,7 @@
#include "lighthouse.h"
#include "travelthru.h"
#include "keyword.h"
#include "spells.h"
#include <kernel/ally.h>
#include <kernel/config.h>
@ -26,6 +27,7 @@
#include <util/lists.h>
#include <util/message.h>
#include <attributes/attributes.h>
#include <attributes/key.h>
#include <attributes/otherfaction.h>
@ -474,12 +476,11 @@ void test_prepare_lighthouse_capacity(CuTest *tc) {
u1->number = 4;
u1->building = b;
set_level(u1, SK_PERCEPTION, 3);
CuAssertIntEquals(tc, 1, lighthouse_range(b, u1->faction));
CuAssertIntEquals(tc, 1, lighthouse_range(b, u1->faction, u1));
CuAssertPtrEquals(tc, b, inside_building(u1));
u2 = test_create_unit(f, r1);
u2->building = b;
set_level(u2, SK_PERCEPTION, 3);
CuAssertIntEquals(tc, 0, lighthouse_range(b, u2->faction));
CuAssertPtrEquals(tc, NULL, inside_building(u2));
prepare_report(&ctx, u1->faction);
CuAssertPtrEquals(tc, r1, ctx.first);
@ -532,7 +533,12 @@ static void test_prepare_lighthouse(CuTest *tc) {
test_cleanup();
}
static void test_prepare_lighthouse_owners(CuTest *tc) {
/**
* In E3, region owners get the view range benefit of
* any lighthouse in the region.
*/
static void test_prepare_lighthouse_owners(CuTest *tc)
{
report_context ctx;
faction *f;
region *r1, *r2, *r3;
@ -542,6 +548,7 @@ static void test_prepare_lighthouse_owners(CuTest *tc) {
const struct terrain_type *t_ocean, *t_plain;
test_setup();
enable_skill(SK_PERCEPTION, false);
config_set("rules.region_owner_pay_building", "lighthouse");
config_set("rules.region_owners", "1");
t_ocean = test_create_terrain("ocean", SEA_REGION);
@ -550,6 +557,7 @@ static void test_prepare_lighthouse_owners(CuTest *tc) {
r1 = test_create_region(0, 0, t_plain);
r2 = test_create_region(1, 0, t_ocean);
r3 = test_create_region(2, 0, t_ocean);
r3 = test_create_region(3, 0, t_ocean);
btype = test_create_buildingtype("lighthouse");
b = test_create_building(r1, btype);
b->flags |= BLD_MAINTAINED;
@ -558,8 +566,8 @@ static void test_prepare_lighthouse_owners(CuTest *tc) {
u = test_create_unit(f, r1);
u = test_create_unit(test_create_faction(0), r1);
u->building = b;
set_level(u, SK_PERCEPTION, 3);
region_set_owner(b->region, f, 0);
CuAssertIntEquals(tc, 2, lighthouse_range(b, NULL, NULL));
prepare_report(&ctx, f);
CuAssertPtrEquals(tc, r1, ctx.first);
CuAssertPtrEquals(tc, NULL, ctx.last);
@ -707,6 +715,27 @@ static void test_region_distance_ql(CuTest *tc) {
test_cleanup();
}
static void test_report_far_vision(CuTest *tc) {
faction *f;
region *r1, *r2;
test_setup();
f = test_create_faction(0);
r1 = test_create_region(0, 0, 0);
test_create_unit(f, r1);
r2 = test_create_region(10, 0, 0);
set_observer(r2, f, 10, 2);
CuAssertPtrEquals(tc, r1, f->first);
CuAssertPtrEquals(tc, r2, f->last);
report_context ctx;
prepare_report(&ctx, f);
CuAssertPtrEquals(tc, r1, ctx.first);
CuAssertPtrEquals(tc, 0, ctx.last);
CuAssertIntEquals(tc, seen_unit, r1->seen.mode);
CuAssertIntEquals(tc, seen_spell, r2->seen.mode);
finish_reports(&ctx);
test_cleanup();
}
CuSuite *get_reports_suite(void)
{
CuSuite *suite = CuSuiteNew();
@ -724,6 +753,7 @@ CuSuite *get_reports_suite(void)
SUITE_ADD_TEST(suite, test_get_addresses);
SUITE_ADD_TEST(suite, test_get_addresses_fstealth);
SUITE_ADD_TEST(suite, test_get_addresses_travelthru);
SUITE_ADD_TEST(suite, test_report_far_vision);
SUITE_ADD_TEST(suite, test_reorder_units);
SUITE_ADD_TEST(suite, test_seen_faction);
SUITE_ADD_TEST(suite, test_regionid);

62
src/spells.c
View File

@ -25,6 +25,8 @@
#include "monsters.h"
#include "teleport.h"
#include <attributes/attributes.h>
#include <spells/borders.h>
#include <spells/buildingcurse.h>
#include <spells/regioncurse.h>
@ -437,8 +439,8 @@ report_effect(region * r, unit * mage, message * seen, message * unseen)
*
*/
/* ------------------------------------------------------------- */
/* Name: Vertrauter
/* ------------------------------------------------------------- */
/* Name: Vertrauter
* Stufe: 10
*
* Wirkung:
@ -447,7 +449,7 @@ report_effect(region * r, unit * mage, message * seen, message * unseen)
* Vertrauten sehen, und durch den Vertrauten zaubern, allerdings nur
* mit seiner halben Stufe. Je nach Vertrautem erhaelt der Magier
* evtl diverse Skillmodifikationen. Der Typ des Vertrauten ist
* zufaellig bestimmt, wird aber durch Magiegebiet und Rasse beeinflu<EFBFBD>t.
* zufaellig bestimmt, wird aber durch Magiegebiet und Rasse beeinflußt.
* "Tierische" Vertraute brauchen keinen Unterhalt.
*
* Ein paar Moeglichkeiten:
@ -1249,7 +1251,7 @@ static void fumble_ents(const castorder * co)
* Flag:
* (FARCASTING | SPELLLEVEL | UNITSPELL | TESTCANSEE | TESTRESISTANCE)
*/
/* Syntax: ZAUBER [REGION x y] [STUFE 2] "Rosthauch" 1111 2222 3333 */
/* Syntax: ZAUBER [REGION x y] [STUFE 2] "Rosthauch" 1111 2222 3333 */
typedef struct iron_weapon {
const struct item_type *type;
@ -1262,7 +1264,7 @@ static iron_weapon *ironweapons = NULL;
void
add_ironweapon(const struct item_type *type, const struct item_type *rusty,
float chance)
float chance)
{
iron_weapon *iweapon = malloc(sizeof(iron_weapon));
assert_alloc(iweapon);
@ -1369,7 +1371,7 @@ static int sp_rosthauch(castorder * co)
* Flag:
* (UNITSPELL | SPELLLEVEL | ONSHIPCAST | TESTCANSEE)
*/
/* Syntax: ZAUBER [STUFE n] "Kaelteschutz" eh1 [eh2 [eh3 [...]]] */
/* Syntax: ZAUBER [STUFE n] "Kaelteschutz" eh1 [eh2 [eh3 [...]]] */
static int sp_kaelteschutz(castorder * co)
{
@ -1433,7 +1435,7 @@ static int sp_kaelteschutz(castorder * co)
* Flag:
* (UNITSPELL | TESTCANSEE | SPELLLEVEL)
*/
/* Syntax: ZAUBER "Funkenregen" eh1 */
/* Syntax: ZAUBER "Funkenregen" eh1 */
static int sp_sparkle(castorder * co)
{
@ -1692,7 +1694,7 @@ static int sp_great_drought(castorder * co)
rsetterrain(r, T_OCEAN);
/* Einheiten duerfen hier auf keinen Fall geloescht werden! */
for (u = r->units; u; u = u->next) {
if (u_race(u) != get_race(RC_SPELL) && u->ship == 0) {
if (!u->ship) {
set_number(u, 0);
}
}
@ -2866,7 +2868,7 @@ static int dc_age(struct curse *c)
damage /= dmg.sa[1];
hp = change_hitpoints(u, -(int)damage);
ADDMSG(&u->faction->msgs, msg_message((hp>0)?"poison_damage":"poison_death", "region unit", r, u));
ADDMSG(&u->faction->msgs, msg_message((hp > 0) ? "poison_damage" : "poison_death", "region unit", r, u));
if (*up == u)
up = &u->next;
}
@ -4128,7 +4130,7 @@ static int sp_bigrecruit(castorder * co)
* (UNITSPELL | TESTCANSEE)
*/
/* restistenz der einheit pruefen */
/* restistenz der einheit pruefen */
static int sp_pump(castorder * co)
{
unit *u, *target;
@ -4171,12 +4173,7 @@ static int sp_pump(castorder * co)
return cast_level / 2;
}
u =
create_unit(rt, mage->faction, 1, get_race(RC_SPELL), 0,
"spell/pump", NULL);
u->age = 2;
set_level(u, SK_PERCEPTION, effskill(target, SK_PERCEPTION, 0));
set_observer(rt, mage->faction, effskill(target, SK_PERCEPTION, 0), 2);
return cast_level;
}
@ -4527,7 +4524,7 @@ int sp_icastle(castorder * co)
if (type == bt_illusion) {
b->size = (rng_int() % (int)((power * power) + 1) * 10);
}
else if (type->maxsize >0) {
else if (type->maxsize > 0) {
b->size = type->maxsize;
}
else {
@ -4776,7 +4773,7 @@ int sp_clonecopy(castorder * co)
/* ------------------------------------------------------------- */
int sp_dreamreading(castorder * co)
{
unit *u, *u2;
unit *u;
region *r = co_get_region(co);
unit *mage = co->magician.u;
int cast_level = co->level;
@ -4809,12 +4806,7 @@ int sp_dreamreading(castorder * co)
return 0;
}
u2 =
create_unit(u->region, mage->faction, 1, get_race(RC_SPELL), 0,
"spell/dreamreading", NULL);
set_number(u2, 1);
u2->age = 2; /* Nur fuer diese Runde. */
set_level(u2, SK_PERCEPTION, effskill(u, SK_PERCEPTION, u2->region));
set_observer(u->region, mage->faction, effskill(u, SK_PERCEPTION, u->region), 2);
msg =
msg_message("sp_dreamreading_effect", "mage unit region", mage, u,
@ -5609,7 +5601,6 @@ int sp_showastral(castorder * co)
region *r2 = rl2->data;
if (!is_cursed(r2->attribs, C_ASTRALBLOCK, 0)) {
for (u = r2->units; u; u = u->next) {
if (u_race(u) != get_race(RC_SPECIAL) && u_race(u) != get_race(RC_SPELL))
n++;
}
}
@ -5619,7 +5610,8 @@ int sp_showastral(castorder * co)
/* sprintf(buf, "%s kann niemanden im astralen Nebel entdecken.",
unitname(mage)); */
cmistake(mage, co->order, 220, MSG_MAGIC);
} else {
}
else {
/* Ausgeben */
@ -5629,7 +5621,6 @@ int sp_showastral(castorder * co)
for (rl2 = rl; rl2; rl2 = rl2->next) {
if (!is_cursed(rl2->data->attribs, C_ASTRALBLOCK, 0)) {
for (u = rl2->data->units; u; u = u->next) {
if (u_race(u) != get_race(RC_SPECIAL) && u_race(u) != get_race(RC_SPELL)) {
c++;
scat(unitname(u));
scat(" (");
@ -5639,15 +5630,15 @@ int sp_showastral(castorder * co)
}
icat(u->number);
scat(" ");
scat(LOC(mage->faction->locale, rc_name_s(u_race(u), (u->number==1) ? NAME_SINGULAR:NAME_PLURAL)));
scat(LOC(mage->faction->locale, rc_name_s(u_race(u), (u->number == 1) ? NAME_SINGULAR : NAME_PLURAL)));
scat(", Entfernung ");
icat(distance(rl2->data, rt));
scat(")");
if (c == n - 1) {
scat(" und ");
} else if (c < n - 1) {
scat(", ");
}
else if (c < n - 1) {
scat(", ");
}
}
}
@ -5667,7 +5658,6 @@ int sp_showastral(castorder * co)
int sp_viewreality(castorder * co)
{
region_list *rl, *rl2;
unit *u;
region *r = co_get_region(co);
unit *mage = co->magician.u;
int cast_level = co->level;
@ -5686,11 +5676,7 @@ int sp_viewreality(castorder * co)
for (rl2 = rl; rl2; rl2 = rl2->next) {
region *rt = rl2->data;
if (!is_cursed(rt->attribs, C_ASTRALBLOCK, 0)) {
u =
create_unit(rt, mage->faction, 1, get_race(RC_SPELL), 0,
"spell/viewreality", NULL);
set_level(u, SK_PERCEPTION, co->level / 2);
u->age = 2;
set_observer(rt, mage->faction, co->level / 2, 2);
}
}
@ -5769,7 +5755,6 @@ int sp_disruptastral(castorder * co)
if (trl != NULL) {
for (u = r2->units; u; u = u->next) {
if (u_race(u) != get_race(RC_SPELL)) {
region_list *trl2 = trl;
region *tr;
int c = rng_int() % inhab_regions;
@ -5788,7 +5773,6 @@ int sp_disruptastral(castorder * co)
move_unit(u, tr, NULL);
}
}
}
free_regionlist(trl);
}
@ -6264,7 +6248,7 @@ int sp_speed2(castorder * co)
* Flags:
* (FARCASTING | SPELLLEVEL | ONSHIPCAST | TESTCANSEE)
*/
/* Jeder gebrochene Zauber verbraucht c->vigour an Zauberkraft
/* Jeder gebrochene Zauber verbraucht c->vigour an Zauberkraft
* (force) */
int sp_q_antimagie(castorder * co)
{

3
src/spells.h
View File

@ -25,11 +25,12 @@ extern "C" {
struct ship;
struct curse;
struct unit;
struct faction;
struct region;
struct message;
void register_magicresistance(void);
void register_spells(void);
void set_spelldata(struct spell *sp);
int sp_baddreams(castorder * co);
int sp_gooddreams(castorder * co);

24
src/spells.test.c
View File

@ -1,15 +1,20 @@
#include <platform.h>
#include "spells.h"
#include <kernel/config.h>
#include <kernel/curse.h>
#include <kernel/faction.h>
#include <kernel/order.h>
#include <kernel/race.h>
#include <kernel/region.h>
#include <kernel/spell.h>
#include <kernel/unit.h>
#include <util/language.h>
#include <util/attrib.h>
#include <spells/regioncurse.h>
#include "spells.h"
#include <attributes/attributes.h>
#include <CuTest.h>
#include <tests.h>
@ -108,9 +113,26 @@ static void test_bad_dreams(CuTest *tc) {
test_cleanup();
}
static void test_watch_region(CuTest *tc) {
region *r;
faction *f;
test_setup();
r = test_create_region(0, 0, 0);
f = test_create_faction(0);
CuAssertIntEquals(tc, -1, get_observer(r, f));
set_observer(r, f, 0, 2);
CuAssertIntEquals(tc, 0, get_observer(r, f));
set_observer(r, f, 10, 2);
CuAssertIntEquals(tc, 10, get_observer(r, f));
CuAssertIntEquals(tc, RF_OBSERVER, fval(r, RF_OBSERVER));
CuAssertPtrNotNull(tc, r->attribs);
test_cleanup();
}
CuSuite *get_spells_suite(void)
{
CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_watch_region);
SUITE_ADD_TEST(suite, test_good_dreams);
SUITE_ADD_TEST(suite, test_bad_dreams);
SUITE_ADD_TEST(suite, test_dreams);

3
src/util/gamedata.h
View File

@ -34,10 +34,11 @@
#define NOWATCH_VERSION 354 /* plane->watchers is gone */
#define KEYVAL_VERSION 355 /* at_keys has values */
#define NOLANDITEM_VERSION 356 /* land_region has no items */
#define NORCSPELL_VERSION 357 /* data contains no RC_SPELL units */
/* unfinished: */
#define CRYPT_VERSION 400 /* passwords are encrypted */
#define RELEASE_VERSION NOLANDITEM_VERSION /* current datafile */
#define RELEASE_VERSION NORCSPELL_VERSION /* current datafile */
#define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */
#define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */

2
src/volcano.c
View File

@ -82,7 +82,7 @@ damage_unit(unit * u, const char *dam, bool physical, bool magic)
int i, dead = 0, hp_rem = 0, heiltrank;
assert(u->number);
if (fval(u_race(u), RCF_ILLUSIONARY) || u_race(u) == get_race(RC_SPELL)) {
if (fval(u_race(u), RCF_ILLUSIONARY)) {
return 0;
}