Enno Rehling
dd4bdca72b
do not use the shiptypes list for searches, use a cbtrie.
2017-05-06 15:05:36 +02:00
Enno Rehling
db07cbed6b
use correct type for PI (double).
...
promote defines to platform-header.
2017-05-06 09:44:06 +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
11bcfc2867
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
2017-04-30 17:26:02 +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
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
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
091a8de6b6
Merge branch 'master' into develop
...
Conflicts:
src/kernel/race.c
src/spy.c
2017-04-22 18:38:34 +02:00
Enno Rehling
e530543022
demon stealth: cloak as other race.
...
added a Lua test.
get_race oob fix (potential crash).
2017-04-22 18:33:47 +02:00
Enno Rehling
055fdceff9
fix gcc build
2017-04-17 20:45:01 +02:00
Enno Rehling
9fcab4ccb8
do not hard-code list of allowed races for demons.
2017-04-17 20:18:37 +02:00
Enno Rehling
635ec6d6c6
Fix a crash in TARNE <race>
...
this was complicated to test, and I had to rewrite how races and their names are registered by test_create_locale.
2017-04-17 20:11:44 +02:00
Enno Rehling
b06e93db7a
BUG 2317: wyrms in E2 didn't move
2017-04-17 16:50:15 +02:00
Enno Rehling
153ef2056e
Merge remote-tracking branch 'upstream/develop' into develop
2017-04-16 16:04:01 +02:00
Enno Rehling
51c2df62ca
fixing new coverity scan defects
...
167039 Dereference after null check
167038 Unchecked return value
2017-04-16 15:52:34 +02:00
Enno Rehling
742fa423b3
do not log an ERROR when a familiar as no equipment
2017-04-16 12:36:59 +02:00
Enno Rehling
0b226ba75e
fix farsi names containing nzwj symbol.
2017-04-10 17:32:32 +02:00
Enno Rehling
aebc7d4cac
BUG 2138: Ponnuki is dead, long live Ponnuki
...
https://bugs.eressea.de/view.php?id=2318
2017-04-09 13:40:42 +02:00
Enno Rehling
aeeb13bb53
BUG 2318: Go, Ponnuki, Go!
...
https://bugs.eressea.de/view.php?id=2318
2017-04-09 13:35:55 +02:00
Enno Rehling
c6a8a76e31
strip skillmod down to the essentials.
2017-04-02 20:17:39 +02:00
Enno Rehling
7dd79a1e79
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
2017-04-02 19:21:44 +02:00
Enno Rehling
d7f69dfa27
enum type clarification
2017-04-02 19:21:37 +02:00
Enno Rehling
50eb35edf6
unused variable
2017-04-02 15:50:29 +02:00
Enno Rehling
e72155a563
WIP: reimplemented production modifiers.
...
The system itself seems to work, but some Lua tests are still failing.
2017-04-02 14:43:53 +02:00
Enno Rehling
4aa26343f6
the LOMEM define has never been used, kill it.
2017-04-01 20:08:04 +02:00
Enno Rehling
0ff9f1601c
de-clutter header file.
2017-04-01 11:39:50 +02:00
Enno Rehling
967e70a4e1
SMF_RIDING is unused.
2017-04-01 11:39:41 +02:00
Enno Rehling
ed99f60186
decluttering settings.h
2017-03-31 21:37:30 +02:00
Enno Rehling
d99090ac67
remove additional unused macro constants
2017-03-31 21:29:37 +02:00
Enno Rehling
57ae21a823
remove an obsolete always-true constant
2017-03-31 21:26:07 +02:00
Enno Rehling
c49786d713
fix some memory leaks
2017-03-30 23:13:55 +02:00
Enno Rehling
d959fe657c
make --version exit immediately after (short) version info
2017-03-28 16:01:10 +02:00
Enno Rehling
75049d3bbc
unit.has_attrib should not require the attribute to be registered.
2017-03-27 22:07:18 +02:00
Enno Rehling
a59f321b44
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
2017-03-27 22:00:50 +02:00
Enno Rehling
c4e15fd5ba
fix find_package call for Lua
2017-03-27 21:59:56 +02:00
Enno Rehling
03653a7338
fix two live warnings (unicode trim and fleechance registration)
2017-03-27 18:07:44 +02:00
Enno Rehling
7ee5a3624e
allow game.start in ini file
2017-03-27 08:57:35 +02:00
Enno Rehling
f2bb51b3ab
Merge branch 'master' into develop
...
Conflicts:
res/adamantium.xml
res/core/resources/laen.xml
scripts/tests/common.lua
scripts/tests/e2/adamantium.lua
scripts/tests/e2/e2features.lua
scripts/tests/e2/items.lua
scripts/tests/items.lua
src/bind_unit.c
src/economy.test.c
src/kernel/resources.c
src/util/attrib.c
2017-03-26 21:01:21 +02:00
Enno Rehling
c835c119ca
BUG 2315: always use plural for resources
2017-03-26 20:32:46 +02:00
Enno Rehling
89a20824e3
backwards compat for old rm_iron etc. tokens in save
2017-03-26 17:46:55 +02:00
Enno Rehling
588914bc36
fix duplicate _LP64 define
2017-03-26 17:41:53 +02:00
Enno Rehling
dcf1c7138b
make region:set_resource do the right thing
...
also for adamantium
2017-03-26 14:33:14 +02:00
Enno Rehling
10edb1d3e9
enable process_orders to be done in steps.
...
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
2017-03-26 13:10:23 +02:00
Enno Rehling
8b87eb608f
pdcurses version 3.4 warning suppression.
2017-03-26 12:39:14 +02:00
Enno Rehling
d238e18191
fix duplicate definition
2017-03-25 18:36:27 +01:00
Enno Rehling
ce0c6a0d32
pdcurses version 3.4 warning suppression.
2017-03-25 18:35:00 +01:00
Enno Rehling
733c754e0f
rename some configuration options.
...
add them to the valid keys for eressea.ini, too.
2017-03-25 14:15:01 +01:00
Enno Rehling
868f4e6cef
also apply noerror rules to msg_feedback.
2017-03-25 11:36:29 +01:00
Enno Rehling
b44c5e54bf
Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern.
2017-03-25 11:18:48 +01:00
Enno Rehling
f941c5552f
remove RF_SELECT code from split_allocations.
...
the flag was only ever written, never read.
2017-03-23 19:32:17 +01:00
Enno Rehling
485e8f0ce4
Revert "add failing test for skill bonus from mine, start work"
...
This reverts commit ab87b1da85
.
2017-03-23 19:28:56 +01:00
Enno Rehling
ab87b1da85
add failing test for skill bonus from mine, start work
2017-03-23 18:51:30 +01:00
Enno Rehling
0c8a9354db
rmt_find no longer used.
...
handle old data files with rm_iron, etc.
2017-03-22 20:46:29 +01:00
Enno Rehling
17145eaf10
make region:set_resource do the right thing
...
also for adamantium
2017-03-22 20:37:09 +01:00
Enno Rehling
4c67e0603b
remove attribs from rtype (it's only in rtype->construction that we use it?)
...
test to verify that mine bonus for iron works as advertised.
change the oder of arguments for faction.create (race is the only thing not optional).
2017-03-17 22:46:10 +01:00
Enno Rehling
beb498d70c
remove leftover code/data for artrewards.
2017-03-16 19:40:51 +01:00
Enno Rehling
ac12cb966d
implement fixed wage functions, select by constant value
2017-03-16 16:07:52 +01:00
Enno Rehling
67a566d728
remove CRTAG_LOCLE define and lookups
2017-03-16 08:13:36 +01:00
Enno Rehling
e68510a07e
use report locae, not default, for EFFECTS and GRENZE
2017-03-15 21:30:53 +01:00
Enno Rehling
8d8173def3
remove the functions struct from settings (next: remove wage, too)
2017-03-13 09:30:20 +01:00
Enno Rehling
8cfcffc4aa
remove data_turn and gamename from global settings.
...
make run-turn.sh work without valgrind
2017-03-13 09:19:37 +01:00
Enno Rehling
ba3f3a17d3
require that main.c declare any ini variables that we might expect.
2017-03-12 21:03:38 +01:00
Enno Rehling
4b88a5abc7
BUG 2301: validate [game] section in eressea.ini
...
load_inifile is old stuff, should use config_get instead.
2017-03-12 19:48:44 +01:00
Enno Rehling
7b4550b9d6
kill faction.nregions, it is calculated but never read.
2017-03-12 14:20:34 +01:00
Enno Rehling
627f5ba2d1
BUG 2313: summary should not reset num_people.
...
it did not count spells correctly.
2017-03-12 14:18:42 +01:00
Enno Rehling
a93dc5459b
BUG 2313: spells must not be counted.
...
https://bugs.eressea.de/view.php?id=2313
2017-03-12 13:39:25 +01:00
Enno Rehling
d8e5feac61
additional test for bug 2313.
...
do not count spells toward num_unit or num_people.
2017-03-12 13:24:32 +01:00
Enno Rehling
decc38a056
BUG 2313: proper accounting in remove_unit.
...
https://bugs.eressea.de/view.php?id=2313
2017-03-12 13:02:55 +01:00
Enno Rehling
720c41c1bf
reproduce bug 2313.
...
recruiting breaks f->num_units.
2017-03-12 12:53:10 +01:00
Enno Rehling
39ec03b2af
coverity CID 164473
...
remove logically dead code.
2017-03-12 12:02:29 +01:00
Enno Rehling
ae41cafcb4
fix double free in new lighthouse code
2017-03-12 11:19:40 +01:00
Enno Rehling
4c21ff5d63
BUG 2311: enforce all unit limits.
2017-03-11 20:30:17 +01:00
Enno Rehling
21e260907c
BUG 2311: unit limits were not enforced by GIVE.
2017-03-11 20:03:49 +01:00
Enno Rehling
d633c2a9fb
BUG 2310: counting units and people.
...
reduce number of count_all loops made,
make f->num_units and f->num_people be correct.
2017-03-11 19:36:26 +01:00
Enno Rehling
0f2744fcf3
BUG 2285: remove factions' wealthfrom statistics.
2017-03-11 18:10:23 +01:00
Enno Rehling
a31de0da4f
BUG 2306: TRANSLATIONS Plural/Singular mixup.
...
https://bugs.eressea.de/view.php?id=2306
2017-03-11 17:22:40 +01:00
Enno Rehling
f7ca4627d1
Merge branch 'develop' of https://github.com/ennorehling/eressea into develop
2017-03-11 16:55:29 +01:00
Enno Rehling
858074501e
additional comments
2017-03-11 16:37:54 +01:00
Enno Rehling
66a0bc83e5
Merge pull request #673 from ennorehling/profile-hashstring
...
speed up some code based on profiling
2017-03-11 16:28:25 +01:00
Enno Rehling
783bba0467
Merge pull request #672 from ennorehling/lighthouse-speedup
...
lighthouses speedup
2017-03-11 16:17:37 +01:00
Enno Rehling
496c57cb3d
Merge branch 'develop' into profile-hashstring
2017-03-11 16:14:31 +01:00
Enno Rehling
3f562e7fc9
Merge branch 'develop' into lighthouse-speedup
...
Conflicts:
src/reports.c
src/reports.test.c
2017-03-11 16:08:14 +01:00
Enno Rehling
0bfd1feee6
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
src/kernel/item.c
2017-03-11 14:49:31 +01:00
Enno Rehling
51ec560f72
Merge branch 'master' into develop
...
Conflicts:
scripts/tests/e2/init.lua
scripts/tests/e3/init.lua
src/economy.c
src/economy.test.c
src/kernel/item.c
src/modules/arena.c
2017-03-11 14:41:25 +01:00
Enno Rehling
cdf13c9fec
stop using test_create_world, use test_setup.
2017-03-11 14:22:21 +01:00
Enno Rehling
41c6793964
matching test_setup and test_cleanup calls.
2017-03-11 12:57:02 +01:00
Enno Rehling
de0a697ddb
Merge branch 'master' of https://github.com/ennorehling/eressea.git
2017-03-11 12:25:56 +01:00
Enno Rehling
b3e929891d
Merge branch 'master' into develop
2017-03-11 07:22:49 +01:00
Enno Rehling
8b9f0f0894
BUG 2307: report mallorn trees as Mallorn in the CR.
...
for legacy compatibility, we cannot call them Mallornbaeume.
2017-03-10 23:18:09 +01:00
Enno Rehling
fe95ddafa1
reduce "translation not found" warnings in tests.
2017-03-10 21:43:36 +01:00
Enno Rehling
be0b54494e
clean up some tests.
...
the test locale gets some extra strings.
test_create_world is bad, stop using it. unfinished.
2017-03-10 21:29:37 +01:00
Enno Rehling
f54165d4f1
BUG 2309: show true faction to allies.
...
https://bugs.eressea.de/view.php?id=2309
2017-03-08 20:30:32 +01:00
Enno Rehling
77abd703bd
backfill test that demonstrates bug 2305.
2017-03-08 20:16:01 +01:00
Enno Rehling
4bda1a34e0
made a mistake in this test.
...
creport was reporting to wrong faction (that sees the same output, so it didn't fail).
2017-03-08 18:29:04 +01:00
Enno Rehling
517da2dff1
breaking test for bug 2309
2017-03-08 18:15:31 +01:00
Enno Rehling
29a8342b4e
BUG 2305: show the correct Parteitarnung in the CR.
...
We didn't have the required tests, so of course I broke it.
2017-03-07 19:30:52 +01:00
Enno Rehling
ce9e2ce314
fix invalid arguments for give/receive messages.
2017-03-06 22:24:15 +01:00
Enno Rehling
40e0a9a65f
merge bugs
2017-03-06 22:21:27 +01:00
Enno Rehling
7022ae05bd
Merge branch 'master' into develop
...
Conflicts:
src/kernel/item.c
src/modules/arena.c
2017-03-06 22:20:22 +01:00
Enno Rehling
ba8f51b7d4
Merge pull request #667 from ennorehling/hotfix/config-2301
...
fix bugs 2301, 2302, 2303
2017-03-06 21:57:23 +01:00
Enno Rehling
e3a969ce9b
add a test to see that frac_make can handle large integers.
2017-03-06 21:43:31 +01:00
Enno Rehling
05bb109a09
BUG 2303: allied units are not traitors.
...
had to rewrite the creport code for this, it is probably less efficient now than ever, but at least it works.
2017-03-06 21:35:48 +01:00
Enno Rehling
4b246863c0
bug 2303: correct the test.
...
we cannot reuse the memstream.
need to recreate it for each test.
need to rewrite the code in creport.c, it is crazy.
2017-03-06 21:01:50 +01:00
Enno Rehling
1c72b0f297
warn about missing game.mailcmd setting
2017-03-06 20:52:06 +01:00
Enno Rehling
f4eda9f59e
prefer dice to dice_rand
2017-03-06 06:28:12 +01:00
Enno Rehling
4d07782e7d
Merge branch 'master' into develop
...
Conflicts:
scripts/tests/e2/init.lua
scripts/tests/e3/init.lua
src/economy.c
src/economy.test.c
2017-03-06 06:27:31 +01:00
Enno Rehling
33b98b59ec
when make_frac cannot find a gcd, cheat.
2017-03-05 22:28:08 +01:00
Enno Rehling
e233ed4344
eliminate source of randomness from test
2017-03-05 19:23:47 +01:00
Enno Rehling
5c1fb83c47
Merge branch 'hotfix/names' of https://github.com/ennorehling/eressea.git
2017-03-05 18:57:35 +01:00
Enno Rehling
cdb65dfd36
Turns out: We did not have a singular form of sapling.
2017-03-05 18:57:28 +01:00
Enno Rehling
dbe5980577
CR is missing saplings?
2017-03-05 18:47:49 +01:00
Enno Rehling
f699c32f0e
BUG 2298: fix NR display.
...
always use correct singular or plural form.
2017-03-05 18:25:15 +01:00
Enno Rehling
8d7f966391
BUG 2298: fix CR output.
...
always use the plural form.
2017-03-05 18:23:24 +01:00
Enno Rehling
0379a17350
make report_resource return an rtype, not a name.
2017-03-05 17:42:57 +01:00
Enno Rehling
d6ce1d9cfe
Add a test for singular resources.
2017-03-05 17:26:00 +01:00
Enno Rehling
52dd11a28f
create a failing test for stones in the NR.
2017-03-05 17:18:17 +01:00
Enno Rehling
45862a06d0
Add a good test for the NR.
...
TODO: make it fail.
2017-03-05 16:55:11 +01:00
Enno Rehling
83f170541b
short unit-test for resources in the CR.
...
now complains because Bauern!=Bauer.
TODO: crtag is shit.
2017-03-05 15:51:04 +01:00
Enno Rehling
6a87625409
refactor cr_output_resources for easy testing.
...
Write a (failing) test that checks first resource is silver.
2017-03-05 15:26:04 +01:00
Enno Rehling
aa662e65d2
eliminate R_PERSON hack.
2017-03-05 13:58:11 +01:00
Enno Rehling
5675ef6091
clean and extend the enum of resources.
2017-03-05 11:10:59 +01:00
Enno Rehling
caa8159428
eliminate duplicate string definition
2017-03-05 09:52:17 +01:00
Enno Rehling
acfb666539
remove rtype->uget funpointer, and lua callbacks.
...
fix a missing lua_pop that trashed the heap.
2017-03-04 20:59:43 +01:00
Enno Rehling
50bdc71c1b
kill lua_canuse_item and itype->canuse
2017-03-04 17:27:13 +01:00
Enno Rehling
d9d542cfee
we only call these when target is 0, anyway.
2017-03-03 19:19:33 +01:00
Enno Rehling
d976ee6f67
special cases, not callbacks, for money and horses.
2017-03-03 19:17:20 +01:00
Enno Rehling
a265bc9cdb
test giving stuff to 0.
2017-03-03 18:03:34 +01:00
Enno Rehling
5b1e786fb2
fix bad strtok call
2017-03-03 10:35:34 +01:00
Enno Rehling
6e8e163099
make item allow/deny XML easier to read, fix code
2017-03-03 09:56:27 +01:00
Enno Rehling
b0baba4405
bug 2290: sawmill bonus was broken.
...
not pleased with the test, which is in lua only.
https://bugs.eressea.de/view.php?id=2290
2017-03-02 19:21:11 +01:00
Enno Rehling
4502141c5b
bug 2292: set mailcmd from eressea.ini
...
this fixes https://bugs.eressea.de/view.php?id=2292
2017-03-02 18:28:00 +01:00
Enno Rehling
45854851ae
bug 2292: allow packice to be guarded again.
...
https://bugs.eressea.de/view.php?id=2292
2017-03-02 18:08:58 +01:00
Enno Rehling
326f543ece
gcc reports unused variable.
...
and for once, that points to a bug!
2017-03-02 13:01:27 +01:00
Enno Rehling
3cb24299fa
bug 2292: only land regions can be guarded.
...
https://bugs.eressea.de/view.php?id=2292
Also adding tests for every other failure reason.
2017-03-02 12:39:21 +01:00
Enno Rehling
912a8b5412
bug 2291: json settings must not override eressea.ini.
...
https://bugs.eressea.de/view.php?id=2291
2017-03-01 21:17:37 +01:00
Enno Rehling
7f03417c37
bug 2286: fix missing addresses.
...
was using cansee_unit wrong, mixed up traveler (ut) and target (u).
2017-03-01 21:10:50 +01:00
Enno Rehling
98447668ca
fix bad tests, upgrade clibs.
2017-03-01 20:37:49 +01:00
Enno Rehling
83a862d557
add a failing test for bug 2286
2017-03-01 19:54:52 +01:00
Enno Rehling
e0085eac0c
write a test for get_addresses before modifying it.
2017-03-01 19:52:23 +01:00
Enno Rehling
295614643a
more factionstealth testing.
2017-03-01 19:18:00 +01:00
Enno Rehling
6d9387f6c2
warn about unused variables, back on
2017-03-01 18:16:07 +01:00
Enno Rehling
fc8e6dc6de
TARNE PARTEI creport test
2017-03-01 18:11:46 +01:00
Enno Rehling
e2e602e7ba
fix off-by-one calendar, bug 2288
2017-03-01 08:28:15 +01:00
Enno Rehling
2eb88c472c
have I bollocksed up the deny/allow rules? looks like it
2017-02-28 14:22:59 +01:00
Enno Rehling
c276b5a43c
generate error, not crash.
...
todo: fix items
2017-02-28 14:22:59 +01:00
Enno Rehling
5a01eae522
make item_use function crash if new and old rules do not agree
...
add a 'test' function to E3 that exercises all those items
2017-02-28 14:22:59 +01:00
Enno Rehling
69e28034b4
Kill unused "magicboost" function.
...
I have no idea why this exists.
2017-02-27 21:00:15 +01:00
Enno Rehling
49d8a03eca
remote the item_type.use funpointer.
2017-02-27 20:41:05 +01:00
Enno Rehling
9e239c88f4
testing insect warmth potion
2017-02-27 20:26:48 +01:00
Enno Rehling
462d0118e3
better testing for some items.
2017-02-27 20:16:50 +01:00
Enno Rehling
9d09574d5e
enable process_orders to be done in steps.
...
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
2017-02-27 19:35:14 +01:00
Enno Rehling
1b93c14806
Test E2 items in E2 only.
...
Remove eye of demon (broken item).
2017-02-27 18:50:48 +01:00
Enno Rehling
1a0992e37b
remove remainders of the arena.
...
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
2017-02-27 18:21:41 +01:00
Enno Rehling
108501e398
tests for more items
2017-02-27 15:14:52 +01:00
Enno Rehling
3d4860c033
remove more of the artrewards
2017-02-27 14:19:25 +01:00
Enno Rehling
db0cbf34c7
test for aurapotion
2017-02-27 14:17:38 +01:00
Enno Rehling
5ffe60193b
move items with tests to items.c
2017-02-27 14:10:12 +01:00
Enno Rehling
60c2f1e807
test the birthday amulet
2017-02-27 14:01:41 +01:00
Enno Rehling
604b574d0f
fix potion-use? need more testing
2017-02-27 11:39:55 +01:00
Enno Rehling
715c8569ba
hacked the item-use function,
...
XML needs cleaning up, funpointer needs to die
2017-02-27 09:48:28 +01:00
Enno Rehling
44c3838d79
WIP: itype->use elimination.
2017-02-27 04:22:28 +01:00
Enno Rehling
132ac0a38a
Merge remote-tracking branch 'upstream/develop' into develop
2017-02-26 20:23:25 +01:00
Enno Rehling
b8d9fae4e4
begin version 3.12
2017-02-26 20:16:22 +01:00
Enno Rehling
b8ffc20d87
remove item_useonother callbacks (use is fine).
...
add a test for foolpotion.
2017-02-26 19:54:58 +01:00
Enno Rehling
3c60f863a5
remove the special_resources trie.
...
memory leak, bad performance.
2017-02-26 18:17:58 +01:00
Enno Rehling
56eb1b753c
fix header missing a struct
2017-02-26 15:52:58 +01:00
Enno Rehling
71e5d101a8
converter compiles fine, does nothing
2017-02-26 15:33:32 +01:00
Enno Rehling
f406c47657
use converter frm noxml branch
2017-02-26 15:30:58 +01:00
Enno Rehling
67252e2924
add conversion program
2017-02-26 15:03:47 +01:00
Enno Rehling
6e27adb892
remove pointless <resourcelimit/> wrapper from XML.
2017-02-26 14:00:20 +01:00
Enno Rehling
d4b973fea4
remove resource_limit struct indirection.
2017-02-26 13:55:19 +01:00
Enno Rehling
c3b0b9e8b3
fix missing limit-flags.
2017-02-26 13:47:22 +01:00
Enno Rehling
0738090f28
no more funpointers in resource_limit.
...
change how resource limits in lua are called.
2017-02-26 13:19:47 +01:00
Enno Rehling
84c6a4b7b5
remove last vestiges of the rm_* material names
2017-02-25 21:25:55 +01:00
Enno Rehling
6031dff685
resource_limit.value is always zero, never initialized. kill it.
2017-02-25 19:50:32 +01:00
Enno Rehling
3a985108a6
change all magic resistance to use fractions.
2017-02-24 20:47:47 +01:00
Enno Rehling
e557140ad1
more fractions functionality.
2017-02-24 20:47:31 +01:00
Enno Rehling
e0229be500
also implement subtraction.
2017-02-24 17:56:39 +01:00
Enno Rehling
234eb62226
short and sweet math with fractions.
...
goinf to use this for magres.
2017-02-24 17:51:35 +01:00
Enno Rehling
158e0646e1
implement fractions
2017-02-24 15:48:49 +01:00
Enno Rehling
25d3aacffa
remove artrewards, they predate my backups
2017-02-24 14:38:08 +01:00
Enno Rehling
794dae11cf
remove artsculpture and genericbuilding.
...
deal with buildings having an unknown type.
2017-02-24 14:29:14 +01:00
Enno Rehling
f06d86007c
seed normalization (broken)
2017-02-23 22:08:16 +01:00
Enno Rehling
9cbd5b88e6
rm_tree is not actually a thing
2017-02-23 08:07:47 +01:00
Enno Rehling
be42137833
fix rmt_find for trees
2017-02-23 08:02:24 +01:00
Enno Rehling
f4dc88c3be
strip rawmaterial_type to just the funpointers
2017-02-23 07:53:28 +01:00
Enno Rehling
1498f2e1d7
refactor rawmaterial_type.
...
still have to decide if we need it at all.
2017-02-22 21:10:22 +01:00
Enno Rehling
ce2ea95880
begin refactoring limited resources.
2017-02-22 20:28:34 +01:00
Enno Rehling
67831ad708
we like test_setup.
2017-02-22 20:16:51 +01:00
Enno Rehling
82e4d75429
unused function
2017-02-22 19:43:17 +01:00
Enno Rehling
807fe607e7
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
2017-02-22 19:38:56 +01:00
Enno Rehling
3274065004
reduce complexity of building_protection.
2017-02-22 19:38:46 +01:00
Enno Rehling
deb39f6b8f
test building_effsize does what it does
2017-02-22 14:27:13 +01:00
Enno Rehling
bfb5a9b692
set age_unit and name_unit funpointers in rc_create.
...
no more <function/> in XML races.
rename juju-zombie => juju.
2017-02-20 22:07:36 +01:00
Enno Rehling
a1dc3dc8e4
remove race.age from XML data (set in rc_create)
2017-02-20 21:19:58 +01:00
Enno Rehling
44f6336e1f
do not register unused functions.
2017-02-20 21:04:50 +01:00
Enno Rehling
4bd295e3b2
remove the nearly unused illusion race
2017-02-20 20:42:31 +01:00
Enno Rehling
5ba3d76efb
remove race.init_familiar funpointer
2017-02-20 09:32:03 +01:00
Enno Rehling
04154628e6
remove funpointer for spoils
2017-02-20 09:18:04 +01:00
Enno Rehling
59f87edbb1
remove unused race.move_allowed method
2017-02-20 09:00:48 +01:00
Enno Rehling
ba1fdcce59
remove race.describe funpointer
2017-02-20 07:47:36 +01:00
Enno Rehling
27f9490ec1
Merge pull request #661 from ennorehling/develop
...
pedantic gcc compilation
2017-02-18 22:07:12 +01:00
Enno Rehling
b8302b1f15
Merge branch 'develop' of github.com:eressea/server into develop
2017-02-18 22:03:34 +01:00
Enno Rehling
b744b6d601
Merge branch 'master' into develop
2017-02-18 22:02:58 +01:00
Enno Rehling
5796f60f16
spells will always resist magic
2017-02-18 22:00:48 +01:00
Enno Rehling
9e14bf5cf9
clang complains about -ansi?
2017-02-18 21:26:38 +01:00
Enno Rehling
12b1dcaa38
remove platform-cruft
2017-02-18 21:23:24 +01:00
Enno Rehling
4e5f1d05ce
Be very strict about C standards.
...
Compile with -std=c89 in gcc.
remove all // comments (they are nice, but unnecessary).
variables only declared at start of block.
various pedantery.
backwards compatible va_copy for pre-C99 gcc.
2017-02-18 21:15:14 +01:00
Enno Rehling
5b52451d9d
remove unused ai.aggression atribute
2017-02-18 19:21:54 +01:00
Enno Rehling
a553b2258a
remove code for shadowcall, too
2017-02-18 18:25:58 +01:00
Enno Rehling
daa7554361
remove race.precombatspell
2017-02-18 18:14:18 +01:00
Enno Rehling
a754975ef9
fix loading data where embassy uses floats.
2017-02-18 17:52:25 +01:00