diff --git a/.gitignore b/.gitignore index 98b1e8e0a..1edc125c6 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ tests/data/185.dat /cutest/ /critbit/ *.mo +/.vs +/CMakeSettings.json diff --git a/scripts/eressea/equipment.lua b/scripts/eressea/equipment.lua index 71fe78727..7d92d43c9 100644 --- a/scripts/eressea/equipment.lua +++ b/scripts/eressea/equipment.lua @@ -6,6 +6,10 @@ local function equip_first(u) equip_unit(u, name, 255) end +local function equip_demon(u) + u.race_name = 'human' +end + local mysets = { ['first_unit'] = { ['items'] = { @@ -77,7 +81,8 @@ local mysets = { ['seed_demon'] = { ['skills'] = { ['stamina'] = 15 - } + }, + ['callback'] = equip_demon }, ['seed_insect'] = { ['items'] = { diff --git a/src/kernel/faction.c b/src/kernel/faction.c index 81f2d42b1..7c46ab798 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -258,11 +258,14 @@ unit *addplayer(region * r, faction * f) const char * name; assert(r->land); + assert(f->units == NULL); if (rpeasants(r) < PEASANT_MIN) { rsetpeasants(r, PEASANT_MIN + rng_int() % (PEASANT_MAX - PEASANT_MIN)); } + if (rtrees(r, TREE_TREE) < 50) { + rsettrees(r, TREE_TREE, 50); + } - assert(f->units == NULL); faction_setorigin(f, 0, r->x, r->y); u = create_unit(r, f, 1, f->race, 0, NULL, NULL); u->status = ST_FLEE;