Commit Graph

10539 Commits

Author SHA1 Message Date
Enno Rehling dd32c456f4 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2017-05-06 06:11:57 +02:00
Enno Rehling 7ad5c4b3f2 define PI, because M_PI is not to be depended on 2017-05-04 08:22:20 +02:00
Enno Rehling 692c9a1dac M_PI is not defined in standard C, needs __USE_BSD 2017-05-04 08:14:19 +02:00
Enno Rehling 138035dfda Merge branch 'develop' of github.com:ennorehling/eressea into develop 2017-05-04 06:51:28 +02:00
Enno Rehling ccf90413e6 start cleaning up random bindings 2017-05-04 06:44:33 +02:00
Enno Rehling 26795ae717 guassian distribution has no endless loops. 2017-05-03 21:02:30 +02:00
Enno Rehling cb0cd87f23 fix callbacks linkage for clang/mac 2017-05-02 15:10:43 +02:00
Enno Rehling 5778bc2c93 no more than 4 critical hits 2017-05-02 09:59:04 +02:00
Enno Rehling 83d40962d2 disable randomness that causes some tests to become intermittent.
fix normalvariante and chance so they work better with constant
rng always returning zero
2017-05-02 08:45:18 +02:00
Enno Rehling 5d710fa79f merge spell callback changes. 2017-05-01 19:13:40 +02:00
Enno Rehling 8e9866f0ce additional tests for spells.
also some support functionality for lua tests.
2017-05-01 19:09:00 +02:00
Enno Rehling 03cd63a05a Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-05-01 17:04:37 +02:00
Enno Rehling fa7a3e246b eliminate spell->id.
clean up some spell functions used by more than one spell.
2017-05-01 17:04:28 +02:00
Enno Rehling 7b9305f005 missing include 2017-05-01 15:25:46 +02:00
Enno Rehling 3b11067825 add a test for illusion buildings. 2017-05-01 15:07:54 +02:00
Enno Rehling 22c05963fd fix illusioncastle reporting. 2017-05-01 14:49:06 +02:00
Enno Rehling 79de2ba2ed compatibility code for old data that contains a caldera. 2017-05-01 14:24:05 +02:00
Enno Rehling c281a1e5c9 compatibility code for old data that contains a caldera. 2017-05-01 13:26:17 +02:00
Enno Rehling 773e8c79d0 some code normalization. 2017-04-30 22:49:26 +02:00
Enno Rehling 51a991413f use at_deprecate, as is intended. 2017-04-30 22:46:35 +02:00
Enno Rehling 80d696d02a remove the funcpointer from struct spell. 2017-04-30 22:15:18 +02:00
Enno Rehling 976b23be72 refactor E3 to use the same raindance/harvest spells as E2.
only indirect effects are different.
2017-04-30 21:39:08 +02:00
Enno Rehling 724a41ac85 refactor: pass function name to callback, calculate it in call_spell instead. 2017-04-30 21:38:44 +02:00
Enno Rehling bd9968c266 set the callback, remove lua_callspell from XML.
WIP: some spells cannot find their lua callback.
2017-04-30 21:38:44 +02:00
Enno Rehling edd3b36a9f add a callbacks module.
make last-chance spell function in lua for spells with none.
2017-04-30 21:38:44 +02:00
Enno Rehling 74673f172f test for raindance/harvest spells, both games 2017-04-30 21:38:30 +02:00
Enno Rehling fb8f63e73b also fix the test 2017-04-30 17:48:08 +02:00
Enno Rehling 6da21dbbe9 Zaubertests in Ebenen sind unstabil.
In E3 bekommen Elfen eien Bonus im Wald.
2017-04-30 17:42:16 +02:00
Enno Rehling 11bcfc2867 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-30 17:26:02 +02:00
Enno Rehling df96589ea6 add tests for earn_silver.
this is an odd one, don't want to break it.
2017-04-30 17:25:24 +02:00
Enno Rehling 294b7bf01e route all casting through a single cast_spell function. 2017-04-30 10:00:29 +02:00
Enno Rehling 3052628251 broaden the fumbe-lookup tests a bit, make sure prefixes don't match. 2017-04-30 04:28:07 +02:00
Enno Rehling 33aa46674f Merge pull request #688 from ennorehling/develop
fix a crash, refactor fumbles
2017-04-30 03:51:49 +02:00
Enno Rehling 1885831204 remove handle_events for unused events. 2017-04-30 03:48:50 +02:00
Enno Rehling 80e6ed0863 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-30 03:42:50 +02:00
Enno Rehling e5f898ce87 bugfix: portals crash buildingtype().
only type that has no construction.
2017-04-30 03:42:39 +02:00
Enno Rehling e6f8c943fa refactor the special fumble functions for spells.
removed from struct spell.
funpointers in structs are bad, mkay.
2017-04-30 03:27:28 +02:00
Enno Rehling 3d13cb8968 Merge pull request #687 from ennorehling/develop
refactor buildings: taxes, names, tests
2017-04-29 21:58:32 +02:00
Enno Rehling 6f4a8b5df1 header cleanup 2017-04-29 21:50:17 +02:00
Enno Rehling 931e705b05 delete unused functions 2017-04-29 20:37:02 +02:00
Enno Rehling 7a289ceb86 simplify building_taxes, eliminate dead lua callbacks. 2017-04-29 19:21:48 +02:00
Enno Rehling 3b9a6e45a1 turns out: btype->age is never used. 2017-04-29 13:53:28 +02:00
Enno Rehling 8928c9d3cf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-29 13:37:45 +02:00
Enno Rehling 3f8de76b9d fix largestbuilding, broken in prev commit. 2017-04-29 13:37:34 +02:00
Enno Rehling dee10e8d0d remove suspicious disabled code 2017-04-28 21:58:27 +02:00
Enno Rehling bdc7457a08 additional testing for largestbuilding and comparisons. 2017-04-28 21:30:05 +02:00
Enno Rehling 1112890293 use building_taxes everywhere.
make it return an integer, not double.
2017-04-28 20:10:20 +02:00
Enno Rehling 16267c447e extract taxes into separate function (WIP) 2017-04-27 19:08:10 +02:00
Enno Rehling a313e78de5 move building names from function to construction data. 2017-04-26 21:44:24 +02:00
Enno Rehling f2d8392206 add tests for correct castle stage names. 2017-04-25 16:47:26 +02:00