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

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

Browse source
This commit is contained in:
Enno Rehling 2018-09-10 17:58:22 +02:00
commit b2c2942c60
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
s/release
View file

@ -5,6 +5,6 @@ import sys
def new_version(ver): def new_version(ver):
os.system("git tag -f v%s" % ver) os.system("git tag -f v%s" % ver)
os.system("git push --tags") os.system("git push --tags -f")
new_version(sys.argv[1]) new_version(sys.argv[1])

2
src/monsters.c
View file

@ -876,7 +876,7 @@ void spawn_dragons(void)
region *r; region *r;
faction *monsters = get_or_create_monsters(); faction *monsters = get_or_create_monsters();
int minage = config_get_int("monsters.spawn.min_age", 100); int minage = config_get_int("monsters.spawn.min_age", 100);
int spawn_chance = config_get_int("monsters.spawn.chance", 100); int spawn_chance = config_get_int("monsters.spawn.chance", 100) * 100;
if (spawn_chance <= 0) { if (spawn_chance <= 0) {
/* monster spawning disabled */ /* monster spawning disabled */