Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
6668 commits 10 branches 0 tags 41 MiB
Commit graph

11 commits

Author SHA1 Message Date
Steffen Mecke
e3d7d23d00 re-enable sea serpent piracy 2015-12-01 22:30:51 +01:00
Enno Rehling
70354a355b disable piracy for sea serpents, piracy_cmd cannot handle it (issue #418) 2015-12-01 12:22:03 +01:00
Enno Rehling
6c2f4be4af fix sea serpents using piracy (by re-ordering the decision making process) 2015-11-25 15:29:26 +01:00
Enno Rehling
90b0bdd44e re-enable all monster tests except piracy for seaserpents, which is red. 2015-11-25 14:53:29 +01:00
Enno Rehling
1cf805649e Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	src/monsters.c
	src/monsters.test.c
 2015-11-25 14:38:26 +01:00
Enno Rehling
c85e489f4f Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers 
Conflicts:
	src/kernel/unit.c
	src/laws.test.c
	src/monsters.c
 2015-11-25 14:25:42 +01:00
Enno Rehling
b6bb5dee85 fix last merge to work with new config code 2015-11-25 13:27:44 +01:00
Enno Rehling
bdc5372537 disable test for seaserpent piracy (planned for 3.8) 2015-11-24 16:12:33 +01:00
Enno Rehling
1b3c8ea466 import monsters tests from PR #404 
Monsters (i.e. sea serpents) can attack on oceans, when not guarding
 2015-11-24 14:57:50 +01:00
Steffen Mecke
2a569635df seaserpent test 2015-11-17 12:13:23 +01:00
Steffen Mecke
a366cd4b17 tests for plan_monster 2015-11-17 12:12:06 +01:00