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

Fixing the tunnels and cleaning up a bit.

Browse source
This commit is contained in:
Enno Rehling 2008-06-16 17:29:53 +00:00
parent 615d948021
commit 328bf5a623
17 changed files with 70 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/gamecode/economy.c
View file

@ -468,7 +468,7 @@ recruit(unit * u, struct order * ord, request ** recruitorders)
if (rc == new_race[RC_INSECT]) {
gamedate date;
get_gamedate(turn, &date);
if (date.season == 0 && rterrain(r) != T_DESERT) {
if (date.season == 0 && r->terrain != newterrain(T_DESERT)) {
#ifdef INSECT_POTION
boolean usepotion = false;
unit *u2;
@ -1984,7 +1984,7 @@ buy(unit * u, request ** buyorders, struct order * ord)
if (u->race == new_race[RC_INSECT]) {
/* entweder man ist insekt, oder... */
if (r->terrain != newterrain(T_SWAMP) && rterrain(r) != T_DESERT && !rbuildings(r)) {
if (r->terrain != newterrain(T_SWAMP) && r->terrain != newterrain(T_DESERT) && !rbuildings(r)) {
cmistake(u, ord, 119, MSG_COMMERCE);
return;
}
@ -2113,7 +2113,7 @@ expandselling(region * r, request * sellorders, int limit)
max_products = rpeasants(r) / TRADE_FRACTION;
if (max_products <= 0) return;
if (rterrain(r) == T_DESERT && buildingtype_exists(r, bt_find("caravan"))) {
if (r->terrain == newterrain(T_DESERT) && buildingtype_exists(r, bt_find("caravan"))) {
max_products = rpeasants(r) * 2 / TRADE_FRACTION;
}
/* Verkauf: so programmiert, dass er leicht auf mehrere Gueter pro
@ -2255,7 +2255,7 @@ static boolean
if (findparam(s, u->faction->locale) == P_ANY) {
unlimited = false;
n = rpeasants(r) / TRADE_FRACTION;
if (rterrain(r) == T_DESERT && buildingtype_exists(r, bt_find("caravan")))
if (r->terrain == newterrain(T_DESERT) && buildingtype_exists(r, bt_find("caravan")))
n *= 2;
if (n==0) {
cmistake(u, ord, 303, MSG_COMMERCE);
@ -2278,7 +2278,7 @@ static boolean
/* In der Region muß es eine Burg geben. */
if (u->race == new_race[RC_INSECT]) {
if (r->terrain != newterrain(T_SWAMP) && rterrain(r) != T_DESERT && !rbuildings(r)) {
if (r->terrain != newterrain(T_SWAMP) && r->terrain != newterrain(T_DESERT) && !rbuildings(r)) {
cmistake(u, ord, 119, MSG_COMMERCE);
return false;
}
@ -3269,7 +3269,7 @@ produce(void)
if (sellorders) {
int limit = rpeasants(r) / TRADE_FRACTION;
if (rterrain(r) == T_DESERT && buildingtype_exists(r, bt_find("caravan")))
if (r->terrain == newterrain(T_DESERT) && buildingtype_exists(r, bt_find("caravan")))
limit *= 2;
expandselling(r, sellorders, limited?limit:INT_MAX);
}

2
src/common/gamecode/laws.c
View file

@ -408,7 +408,7 @@ calculate_emigration(region *r)
int rp = rpeasants(r);
int max_immigrants = MAX_IMMIGRATION(maxp-rp);
if (rterrain(r) == T_VOLCANO || rterrain(r) == T_VOLCANO_SMOKING) {
if (r->terrain == newterrain(T_VOLCANO) || r->terrain == newterrain(T_VOLCANO_SMOKING)) {
max_immigrants = max_immigrants/10;
}

2
src/common/gamecode/monster.c
View file

@ -1063,7 +1063,7 @@ spawn_dragons(void)
equip_unit(u, get_equipment("monster_seaserpent"));
}
if ((rterrain(r) == T_GLACIER || r->terrain == newterrain(T_SWAMP) || rterrain(r) == T_DESERT) && rng_int() % 10000 < (5 + 100 * chaosfactor(r)))
if ((r->terrain == newterrain(T_GLACIER) || r->terrain == newterrain(T_SWAMP) || r->terrain == newterrain(T_DESERT)) && rng_int() % 10000 < (5 + 100 * chaosfactor(r)))
{
if (chance(0.80)) {
u = createunit(r, monsters, nrand(60, 20) + 1, new_race[RC_FIREDRAGON]);

10
src/common/gamecode/randenc.c
View file

@ -491,7 +491,7 @@ chaos(region * r)
while (r->buildings) {
remove_building(&r->buildings, r->buildings);
}
terraform(r, T_OCEAN);
terraform_region(r, newterrain(T_OCEAN));
}
} else {
direction_t dir;
@ -778,7 +778,7 @@ melt_iceberg(region *r)
}
/* in Ozean wandeln */
terraform(r, T_OCEAN);
terraform_region(r, newterrain(T_OCEAN));
/* Einheiten, die nicht schwimmen können oder in Schiffen sind,
* ertrinken */
@ -904,7 +904,7 @@ move_icebergs(void)
region *r;
for (r=regions; r; r=r->next) {
if (rterrain(r) == T_ICEBERG && !fval(r, RF_SELECT)) {
if (r->terrain == newterrain(T_ICEBERG) && !fval(r, RF_SELECT)) {
int select = rng_int() % 10;
if (select < 4) {
/* 4% chance */
@ -925,7 +925,7 @@ create_icebergs(void)
region *r;
for (r=regions; r; r=r->next) {
if (rterrain(r) == T_ICEBERG_SLEEP && chance(0.05)) {
if (r->terrain == newterrain(T_ICEBERG_SLEEP) && chance(0.05)) {
boolean has_ocean_neighbour = false;
direction_t dir;
region *rc;
@ -1216,7 +1216,7 @@ randomevents(void)
/* Vulkane qualmen, brechen aus ... */
for (r = regions; r; r = r->next) {
if (rterrain(r)==T_VOLCANO_SMOKING && a_find(r->attribs, &at_reduceproduction)) {
if (r->terrain == newterrain(T_VOLCANO_SMOKING) && a_find(r->attribs, &at_reduceproduction)) {
ADDMSG(&r->msgs, msg_message("volcanostopsmoke", "region", r));
rsetterrain(r, T_VOLCANO);
} else switch(rterrain(r)) {

4
src/common/gamecode/summary.c
View file

@ -348,9 +348,9 @@ make_summary(void)
if (fval(r, RF_ORCIFIED)) {
s->orkifizierte_regionen++;
}
if (rterrain(r) == T_VOLCANO) {
if (r->terrain == newterrain(T_VOLCANO)) {
s->inactive_volcanos++;
} else if(rterrain(r) == T_VOLCANO_SMOKING) {
} else if (r->terrain == newterrain(T_VOLCANO_SMOKING)) {
s->active_volcanos++;
}
}

2
src/common/kernel/battle.c
View file

@ -3523,9 +3523,9 @@ static void
flee(const troop dt)
{
fighter * fig = dt.fighter;
unit * u = fig->unit;
#ifndef SIMPLE_ESCAPE
unit * u = fig->unit;
int carry = personcapacity(u) - u->race->weight;
int money;

6
src/common/kernel/move.c
View file

@ -1783,8 +1783,10 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep)
}
if (sh->damage>=sh->size * DAMAGE_SCALE) {
ADDMSG(&f->msgs, msg_message("shipsink", "ship", sh));
remove_ship(&sh->region->ships, sh);
if (sh->region) {
ADDMSG(&f->msgs, msg_message("shipsink", "ship", sh));
remove_ship(&sh->region->ships, sh);
}
sh = NULL;
}

6
src/common/kernel/region.c
View file

@ -1046,12 +1046,6 @@ setluxuries(region * r, const luxury_type * sale)
}
}
void
terraform(region * r, terrain_t t)
{
terraform_region(r, newterrain(t));
}
void
terraform_region(region * r, const terrain_type * terrain)
{

1
src/common/kernel/region.h
View file

@ -222,7 +222,6 @@ extern const char * write_regionname(const struct region * r, const struct facti
extern struct region * new_region(short x, short y, unsigned int uid);
extern void remove_region(region ** rlist, region * r);
extern void terraform(struct region * r, terrain_t terrain);
extern void terraform_region(struct region * r, const struct terrain_type * terrain);
extern const short delta_x[MAXDIRECTIONS];

2
src/common/kernel/terrain.c
View file

@ -145,8 +145,6 @@ init_terrains(void)
newterrain = get_terrain(terraindata[t]);
if (newterrain!=NULL) {
newterrains[t] = newterrain;
} else {
log_warning(("missing classic terrain %s\n", terraindata[t]));
}
}
}

33
src/common/modules/autoseed.c
View file

@ -291,14 +291,15 @@ read_newfactions(const char * filename)
extern int numnewbies;
static terrain_t
static const terrain_type *
preferred_terrain(const struct race * rc)
{
if (rc==rc_find("dwarf")) return T_MOUNTAIN;
if (rc==rc_find("insect")) return T_DESERT;
if (rc==rc_find("halfling")) return T_SWAMP;
if (rc==rc_find("troll")) return T_MOUNTAIN;
return T_PLAIN;
terrain_t t = T_PLAIN;
if (rc==rc_find("dwarf")) t = T_MOUNTAIN;
if (rc==rc_find("insect")) t = T_DESERT;
if (rc==rc_find("halfling")) t = T_SWAMP;
if (rc==rc_find("troll")) t = T_MOUNTAIN;
return newterrain(t);
}
#define REGIONS_PER_FACTION 2
@ -413,20 +414,20 @@ free_newfaction(newfaction * nf)
* returns the number of players placed on the new island.
*/
static void
frame_regions(int age, terrain_t terrain)
frame_regions(int age, const terrain_type * terrain)
{
region * r = regions;
for (r=regions;r;r=r->next) {
direction_t d;
if (r->age<age) continue;
if (r->planep) continue;
if (rterrain(r)==terrain) continue;
if (r->terrain == terrain) continue;
for (d=0;d!=MAXDIRECTIONS;++d) {
region * rn = rconnect(r, d);
if (rn==NULL) {
rn = new_region(r->x+delta_x[d], r->y+delta_y[d], 0);
terraform(rn, terrain);
terraform_region(rn, terrain);
rn->age=r->age;
}
}
@ -475,7 +476,7 @@ autoseed(newfaction ** players, int nsize, int max_agediff)
int psize = 0; /* players on this island */
const terrain_type * volcano_terrain = get_terrain("volcano");
frame_regions(16, T_FIREWALL);
frame_regions(16, newterrain(T_FIREWALL));
if (listlen(*players)<MINFACTIONS) return 0;
@ -486,7 +487,7 @@ autoseed(newfaction ** players, int nsize, int max_agediff)
*/
for (r=regions;r;r=r->next) {
struct plane * p = r->planep;
if (r->age<=max_agediff && rterrain(r)==T_OCEAN && p==NULL && virgin_region(r)) {
if (r->age<=max_agediff && r->terrain == newterrain(T_OCEAN) && p==NULL && virgin_region(r)) {
direction_t d;
for (d=0;d!=MAXDIRECTIONS;++d) {
region * rn = rconnect(r, d);
@ -533,7 +534,7 @@ autoseed(newfaction ** players, int nsize, int max_agediff)
*/
for (r=regions;r;r=r->next) {
struct plane * p = r->planep;
if (rterrain(r)==T_OCEAN && p==0 && (rmin==NULL || r->age<=max_agediff)) {
if (r->terrain == newterrain(T_OCEAN) && p==0 && (rmin==NULL || r->age<=max_agediff)) {
direction_t d;
for (d=0;d!=MAXDIRECTIONS;++d) {
region * rn = rconnect(r, d);
@ -554,7 +555,7 @@ autoseed(newfaction ** players, int nsize, int max_agediff)
x = rmin->x + delta_x[dmin];
y = rmin->y + delta_y[dmin];
r = new_region(x, y, 0);
terraform(r, T_OCEAN); /* we change the terrain later */
terraform_region(r, newterrain(T_OCEAN));
}
}
if (r!=NULL) {
@ -580,7 +581,7 @@ autoseed(newfaction ** players, int nsize, int max_agediff)
if (rn && fval(rn, RF_MARK)) continue;
if (rn==NULL) {
rn = new_region(r->x + delta_x[d], r->y + delta_y[d], 0);
terraform(rn, T_OCEAN);
terraform_region(rn, newterrain(T_OCEAN));
}
if (virgin_region(rn)) {
add_regionlist(&rlist, rn);
@ -596,7 +597,7 @@ autoseed(newfaction ** players, int nsize, int max_agediff)
unit * u;
isize += REGIONS_PER_FACTION;
terraform(r, preferred_terrain(nextf->race));
terraform_region(r, preferred_terrain(nextf->race));
prepare_starting_region(r);
++tsize;
assert(r->land && r->units==0);
@ -689,7 +690,7 @@ autoseed(newfaction ** players, int nsize, int max_agediff)
if (i!=MAXFILLDIST) {
while (--i) {
region * rn = new_region(r->x + i*delta_x[d], r->y + i*delta_y[d], 0);
terraform(rn, T_OCEAN);
terraform_region(rn, newterrain(T_OCEAN));
}
}
}

12
src/common/modules/gmcmd.c
View file

@ -643,11 +643,11 @@ gm_addquest(const char * email, const char * name, short radius, unsigned int fl
freset(r, RF_ENCOUNTER);
r->planep = p;
if (distance(r, center)==radius) {
terraform(r, T_FIREWALL);
terraform_region(r, newterrain(T_FIREWALL));
} else if (r==center) {
terraform(r, T_PLAIN);
terraform_region(r, newterrain(T_PLAIN));
} else {
terraform(r, T_OCEAN);
terraform_region(r, newterrain(T_OCEAN));
}
}
}
@ -757,11 +757,11 @@ gm_addplane(short radius, unsigned int flags, const char * name)
freset(r, RF_ENCOUNTER);
r->planep = p;
if (distance(r, center)==radius) {
terraform(r, T_FIREWALL);
terraform_region(r, newterrain(T_FIREWALL));
} else if (r==center) {
terraform(r, T_PLAIN);
terraform_region(r, newterrain(T_PLAIN));
} else {
terraform(r, T_OCEAN);
terraform_region(r, newterrain(T_OCEAN));
}
}
}

6
src/common/spells/spells.c
View file

@ -2135,7 +2135,7 @@ sp_ironkeeper(castorder *co)
int cast_level = co->level;
message * msg;
if (rterrain(r) != T_MOUNTAIN && rterrain(r) != T_GLACIER) {
if (r->terrain != newterrain(T_MOUNTAIN) && r->terrain != newterrain(T_GLACIER)) {
report_failure(mage, co->order);
return 0;
}
@ -2547,8 +2547,8 @@ sp_summondragon(castorder *co)
f = get_monsters();
if (r->terrain != newterrain(T_SWAMP) && rterrain(r) != T_DESERT
&& rterrain(r) != T_GLACIER) {
if (r->terrain != newterrain(T_SWAMP) && r->terrain != newterrain(T_DESERT)
&& r->terrain != newterrain(T_GLACIER)) {
report_failure(mage, co->order);
return 0;
}

18
src/eressea/korrektur.c
View file

@ -97,7 +97,7 @@ curse_emptiness(void)
unit * u = r->units;
if (r->land==NULL) continue;
if (fval(r, RF_CHAOTIC)) continue;
if (rterrain(r)==T_GLACIER) continue;
if (r->terrain == newterrain(T_GLACIER)) continue;
if (r->age<=200) continue;
if (get_curse(r->attribs, ct)) continue;
while (u && is_monsters(u->faction)) u=u->next;
@ -440,13 +440,13 @@ road_decay(void)
half = true;
}
}
else if (rterrain(r) == T_DESERT) {
else if (r->terrain == newterrain(T_DESERT)) {
/* wenn keine Karawanserei existiert */
if (!buildingtype_exists(r, bt_caravan)) {
half = true;
}
}
else if (rterrain(r) == T_GLACIER) {
else if (r->terrain == newterrain(T_GLACIER)) {
/* wenn kein Tunnel existiert */
if (!buildingtype_exists(r, bt_tunnel)) {
half = true;
@ -484,7 +484,7 @@ iceberg(region * r)
}
}
if (d==MAXDIRECTIONS) {
terraform(r, T_ICEBERG_SLEEP);
terraform_region(r, newterrain(T_ICEBERG_SLEEP));
}
}
@ -528,9 +528,9 @@ fix_astralplane(void)
while (*rs_p) {
region * rs = *rs_p;
if (rterrain(rs)==T_FIREWALL && rplane(rs)==NULL) {
if (rs->terrain == newterrain(T_FIREWALL) && rplane(rs)==NULL) {
region * ra = r_standard_to_astral(rs);
if (ra && rterrain(ra)!=T_ASTRALB) {
if (ra && ra->terrain != newterrain(T_ASTRALB)) {
unit * u;
++fixes;
for (u=ra->units;u;u=u->next) {
@ -544,7 +544,7 @@ fix_astralplane(void)
remove_unit(&ra->units, ra->units);
}
log_printf("protecting firewall in %s by blocking astral space in %s.\n", regionname(rs, NULL), regionname(ra, NULL));
terraform(ra, T_ASTRALB);
terraform_region(ra, newterrain(T_ASTRALB));
}
}
}
@ -747,8 +747,8 @@ fix_astral_firewalls(void)
{
region * r;
for (r = regions; r; r=r->next) {
if (r->planep==get_astralplane() && rterrain(r)==T_FIREWALL) {
terraform(r, T_ASTRALB);
if (r->planep==get_astralplane() && r->terrain == newterrain(T_FIREWALL)) {
terraform_region(r, newterrain(T_ASTRALB));
}
}
return 0;

2
src/eressea/lua/building.cpp
View file

@ -169,7 +169,7 @@ static eressea::list<unit *, unit *, buildingunit>
building_units(const building& b) {
region * r = b.region;
unit * u = r->units;
while (u!=NULL && u->building!=&b) u=u->next;
while (u!=NULL && (!u->building || u->building->no!=b.no)) u=u->next;
return eressea::list<unit *, unit *, buildingunit>(u);
}

4
src/res/eressea/strings.xml
View file

@ -358,6 +358,10 @@
</string>
<!-- igjarjuk queste end -->
<string name="rm_adamantium">
<text locale="de">Adamantium</text>
<text locale="en">adamantium</text>
</string>
<string name="adamantium">
<text locale="de">Adamantium</text>
<text locale="en">adamantium</text>

15
src/scripts/eressea/tunnels.lua
View file

@ -1,6 +1,9 @@
local function tunnel_travellers(b)
local units = {}
local function tunnel_travelers(b)
local units = nil
for u in b.units do
if units==nil then
units = {}
end
units[u] = u
end
return units
@ -10,6 +13,7 @@ targets = nil
ntargets = 0
local function get_target(param)
-- print("finding targets: " .. param)
if targets == nil then
targets = {}
local r
@ -17,6 +21,7 @@ local function get_target(param)
if r:get_key(param) then
targets[ntargets] = r
ntargets = ntargets + 1
-- print("target: " .. tostring(r))
end
end
end
@ -30,12 +35,12 @@ end
-- export, will be called from lc_age()
function tunnel_action(b, param)
local r = nil
print("Tunnel from " .. tostring(b) .. " [" .. param .. "]")
if tonumber(param)~=nil then
r = get_region_by_id(tonumber(param))
end
if r~=nil then
local units = tunnel_travelers(b)
local units = tunnel_travelers(b)
if units~=nil then
print("Tunnel from " .. tostring(b) .. " [" .. param .. "]")
for key, u in pairs(units) do
local rto = r
if r==nil then