Enno Rehling
|
acb2aed30f
|
add message for igjarjuk effect
|
2015-08-30 11:01:53 +02:00 |
Enno Rehling
|
7bb882b15b
|
add a spell for igjarjuk (WIP)
|
2015-08-30 10:57:08 +02:00 |
Enno Rehling
|
9586d970e8
|
fix bad castorder creation for combat spell (some unions are the WORST)
|
2015-08-22 18:51:10 +02:00 |
Enno Rehling
|
dd667aa752
|
cursed factions get to fight a wolfhowl if they attack (WIP)
|
2015-08-22 17:56:36 +02:00 |
Enno Rehling
|
89bc83c4ab
|
Merge branch 'master' into develop
Conflicts:
src/bind_region.c
src/buildno.h
src/kernel/item.c
|
2015-08-20 16:58:07 +02:00 |
Enno Rehling
|
d69bf18e23
|
suspect some submodule shenanigans
|
2015-08-20 16:26:32 +02:00 |
Enno Rehling
|
853290413f
|
fix segfault, disable intermittent test
|
2015-08-20 16:18:15 +02:00 |
Enno Rehling
|
f12454870f
|
fix segfault, disable intermittent test
|
2015-08-20 16:17:19 +02:00 |
Enno Rehling
|
dfb0bcaccf
|
Merge branch 'master' into develop
Conflicts:
src/buildno.h
src/kernel/save.c
src/laws.c
|
2015-08-20 15:49:36 +02:00 |
Enno Rehling
|
1641e6ef89
|
remove spellbook repair code, we are done
|
2015-08-20 15:09:38 +02:00 |
Enno Rehling
|
469701a6ff
|
fix linux build
|
2015-08-20 12:56:33 +02:00 |
Enno Rehling
|
8716e5fdc5
|
repair spellbooks that broke in E3 and E4 (temporary measure, remember to remove this code).
|
2015-08-20 12:13:09 +02:00 |
Enno Rehling
|
ff38d8bf4c
|
I don't think it's good to call update_spells before the turn.
one should only have the spells that are in the previous week's report.
a few comments wouldn't hurt.
|
2015-08-20 12:12:17 +02:00 |
Enno Rehling
|
e6eb53c864
|
save the faction.max_spelllevel in the data file, do not recalculate it each time.
when recalculating it, include spellbook to determine max-level (dead mages may have pushed the level up).
|
2015-08-19 19:43:47 +02:00 |
Enno Rehling
|
fc308940b5
|
fix linux build
|
2015-08-19 14:50:24 +02:00 |
Enno Rehling
|
a9ecd1f55e
|
replace all at_travelunit code with travelthru_map calls.
welcome to callback hell.
this should stop the buffer for travelthru from running over.
tests for this should be hell, and I still owe writing them.
|
2015-08-19 14:37:51 +02:00 |
Enno Rehling
|
ebe365fd6e
|
move travelthru logic to a separate module. todo: split off the report writing from the collection of units.
|
2015-08-18 18:57:04 +02:00 |
Enno Rehling
|
1f4c8d5858
|
fix linux build, missing include
|
2015-08-18 17:28:07 +02:00 |
Enno Rehling
|
5bc4f7f144
|
add some simple tests for writing travelthru information to the report, fix test that sets errno as a side effect (thanks, Microsoft!)
|
2015-08-18 17:08:02 +02:00 |
Enno Rehling
|
c8cbeea660
|
STRLCPY macro redefinition and fixes for gcc. work for monkeys.
|
2015-08-17 22:48:21 +02:00 |
Enno Rehling
|
681697fd47
|
gcc still more picky than clang.
|
2015-08-17 20:32:02 +02:00 |
Enno Rehling
|
e621b97465
|
Easy pratfall: Visual Studio includes limits.h through stdlib.h, but gcc/clang do not.
|
2015-08-17 20:22:02 +02:00 |
Enno Rehling
|
1042c94fd9
|
quickly fix gcc conversion warnings. lots of DRY.
|
2015-08-17 20:17:02 +02:00 |
Enno Rehling
|
b999e3c963
|
replace strlcpy/wrptr pairs with new STRLCPY macro.
|
2015-08-17 19:37:02 +02:00 |
Enno Rehling
|
7e64f3177d
|
refactoring: rewrite tests to use test_find_messagetype instead of assert_messages.
tests: add cleanup of message_types to reduce global state.
|
2015-08-17 19:36:28 +02:00 |
Enno Rehling
|
1806030baa
|
new all-in-one strlcpy and wrptr function
|
2015-08-17 19:28:05 +02:00 |
Enno Rehling
|
dcececf4fa
|
Debug: move errno testing closer to the report-writing, so we know which report caused the error.
Fix: wrptr gets the result from _snprintf, which is int, not size_t.
|
2015-08-17 16:17:08 +02:00 |
Enno Rehling
|
df5eaa6ef2
|
eliminate warning (unused variable)
|
2015-08-16 19:55:11 +02:00 |
Enno Rehling
|
3fe0e62105
|
do not remove battles from dead faction before writing the report.
|
2015-08-16 12:06:05 +02:00 |
Enno Rehling
|
27b5588e8f
|
Merge region messages and individual messages before writing them into the report.
This fixes https://bugs.eressea.de/view.php?id=2073
|
2015-08-16 11:30:44 +02:00 |
Enno Rehling
|
47dccc667b
|
Add a message that contains the password in the first report, so Magellan can pick it up.
Fix a bad type conversion when setting skills.
|
2015-08-15 20:25:36 +02:00 |
Enno Rehling
|
0af5df470b
|
managed to commit some broken tests, and travis let them pass. something is wrong with the CI tests.
|
2015-08-07 18:30:02 +02:00 |
Enno Rehling
|
398579c293
|
remove duplication, fix a stray blank space in the NR.
|
2015-08-07 16:17:11 +02:00 |
Enno Rehling
|
816243d2d7
|
magicians can always identify their own curse-effects.
magic-resistance on a building is always visible to anybody, just like it is on units.
|
2015-08-07 15:52:10 +02:00 |
Enno Rehling
|
00423a746b
|
clarify the good/bad dreams tests
|
2015-08-07 13:26:41 +02:00 |
Enno Rehling
|
12a2a1f412
|
get_captain is wrong, the rules say the captain is the FIRST unit in the ship, which I believe means ship_owner, not best skill.
clean up shipspeed tests a little (WIP, missing edge cases).
ignore some temporary files.
|
2015-08-07 13:07:45 +02:00 |
Enno Rehling
|
3bfc05c3b0
|
test bonus for new ship-speed rules (WIP).
|
2015-08-07 13:03:19 +02:00 |
Enno Rehling
|
b72f48c044
|
enhanced ship speed for selected ships (currently none).
|
2015-08-07 12:51:20 +02:00 |
Enno Rehling
|
c322fbffd5
|
rename ship_sailors to crew_skill, it's more descriptive
|
2015-08-07 12:46:32 +02:00 |
Enno Rehling
|
afbc4c816b
|
refactoring ship speed, extract total skills of sailors into a function.
|
2015-08-07 12:43:18 +02:00 |
Enno Rehling
|
bfdef37808
|
fix the test and the formula for damaged ships' speeds.
|
2015-08-07 12:03:33 +02:00 |
Enno Rehling
|
8636aabe8a
|
tests for existing shipspeed features, failing ship for ship-damage.
|
2015-08-07 11:50:49 +02:00 |
Enno Rehling
|
b3a8a95a24
|
cherry-picking ship tests from range_max code
|
2015-08-07 11:48:46 +02:00 |
Enno Rehling
|
04db291c8b
|
disable random study in test to make it not intermittent
|
2015-08-06 20:48:14 +02:00 |
Enno Rehling
|
c0a760a645
|
Merge branch 'develop' of github.com:eressea/server into develop
|
2015-08-06 19:54:51 +02:00 |
Enno Rehling
|
6c8300a47e
|
Merge branch 'feature/bug-1588-magicpower-limit' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-1588-magicpower-limit
Conflicts:
scripts/tests/e2/init.lua
src/battle.c
src/bind_unit.c
src/kernel/spellid.h
src/magic.c
src/magic.h
|
2015-08-06 19:53:24 +02:00 |
Enno Rehling
|
4c877288d3
|
remove spellid.h, it represents an outdated way of doing things.
merge the enum into combatspells, and reduce it to the spells actually used here.
|
2015-08-06 17:57:51 +02:00 |
Enno Rehling
|
01649ce682
|
Merge pull request #266 from ennorehling/feature/bug-2101-study-teach-testing
bug 2101: increase max printed length of orders
|
2015-08-06 17:12:41 +02:00 |
Enno Rehling
|
1e6a83f357
|
resize buffer in eval_command, it was too small for many commands.
increase MAXTEACHERS.
eliminate oldterrain warning in json_report.
|
2015-08-06 16:52:24 +02:00 |
Enno Rehling
|
0f5567b7f8
|
fix missing include (gcc)
|
2015-08-05 16:02:15 +02:00 |