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

Merge branch 'master' of github.com:eressea/server

This commit is contained in:
Enno Rehling 2020-03-08 10:14:54 +01:00
parent 81a90fc4ae 4ddfc27525
commit 1e6f1f8bd8
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -46,3 +46,5 @@ tests/data/185.dat
/cutest/ /cutest/
/critbit/ /critbit/
*.mo *.mo
/.vs
/CMakeSettings.json

7
scripts/eressea/equipment.lua
View File

@ -6,6 +6,10 @@ local function equip_first(u)
equip_unit(u, name, 255) equip_unit(u, name, 255)
end end
local function equip_demon(u)
u.race_name = 'human'
end
local mysets = { local mysets = {
['first_unit'] = { ['first_unit'] = {
['items'] = { ['items'] = {
@ -77,7 +81,8 @@ local mysets = {
['seed_demon'] = { ['seed_demon'] = {
['skills'] = { ['skills'] = {
['stamina'] = 15 ['stamina'] = 15
} },
['callback'] = equip_demon
}, },
['seed_insect'] = { ['seed_insect'] = {
['items'] = { ['items'] = {

5
src/kernel/faction.c
View File

@ -258,11 +258,14 @@ unit *addplayer(region * r, faction * f)
const char * name; const char * name;
assert(r->land); assert(r->land);
assert(f->units == NULL);
if (rpeasants(r) < PEASANT_MIN) { if (rpeasants(r) < PEASANT_MIN) {
rsetpeasants(r, PEASANT_MIN + rng_int() % (PEASANT_MAX - 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); faction_setorigin(f, 0, r->x, r->y);
u = create_unit(r, f, 1, f->race, 0, NULL, NULL); u = create_unit(r, f, 1, f->race, 0, NULL, NULL);
u->status = ST_FLEE; u->status = ST_FLEE;