Enno Rehling
|
12fd6435c5
|
eliminate apparently dead code, and coverity warning.
|
2018-09-10 18:17:34 +02:00 |
|
Enno Rehling
|
b2c2942c60
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-09-10 17:58:22 +02:00 |
|
Enno Rehling
|
d32689bac8
|
experiments with clang-tidy
|
2018-09-10 17:58:14 +02:00 |
|
Enno Rehling
|
418d6b1f6c
|
Bug 2486: spawn_chance für Drachen und Seeschlangen war zu hoch.
|
2018-09-10 17:52:23 +02:00 |
|
Enno Rehling
|
2e5e8347ac
|
Bug 2489: Kill the SIEGE command, forever.
|
2018-09-09 21:01:10 +02:00 |
|
Enno Rehling
|
062abe8102
|
refactor siege property w. getter/setter
|
2018-09-09 17:10:18 +02:00 |
|
Enno Rehling
|
67089aeb8c
|
Bug 2487: Fix LERNE AUTO translations
Also disallow autolearning expensive skills.
|
2018-09-09 15:13:20 +02:00 |
|
Enno Rehling
|
41f9d32923
|
Merge branch 'master' into develop
|
2018-09-09 07:50:25 +02:00 |
|
Enno Rehling
|
3c99677723
|
Merge pull request #802 from ennorehling/master
Fix E2 crashing 2018-09-08
|
2018-09-09 07:48:29 +02:00 |
|
Enno Rehling
|
6f5f1651c7
|
fix crashes when trying to trade on ocean.
fix missing message sections.
|
2018-09-09 07:41:30 +02:00 |
|
Steffen Mecke
|
aed7432bb2
|
fix magic resistance (bug 2480)
|
2018-09-04 16:41:46 +02:00 |
|
Enno Rehling
|
7544565237
|
start work on 3.18 release
|
2018-09-04 15:28:05 +02:00 |
|
Enno Rehling
|
876113d991
|
fix multiple coverity defects in parsers.
|
2018-09-03 20:43:17 +02:00 |
|
Enno Rehling
|
af445e5ca1
|
BUG 2477 Null-Personen Meldungen sind unnötig.
|
2018-08-21 22:25:04 +02:00 |
|
Enno Rehling
|
22d0fe5693
|
missing include, do not use fset
|
2018-08-05 06:43:11 +02:00 |
|
Enno Rehling
|
36b7104ce3
|
extract long_order_allowed for use in autostudy.
|
2018-08-05 06:43:11 +02:00 |
|
Enno Rehling
|
2bb3e7601d
|
merge conflict
|
2018-08-05 06:42:31 +02:00 |
|
Enno Rehling
|
b0fb1e5032
|
actually do the learning.
|
2018-08-05 06:41:04 +02:00 |
|
Enno Rehling
|
b4cb1dfe8d
|
finished autostudy
|
2018-08-05 06:41:04 +02:00 |
|
Enno Rehling
|
c8ebde3990
|
autostudy continued (WIP)
|
2018-08-05 06:41:04 +02:00 |
|
Enno Rehling
|
0e754a31ac
|
Test, sorting units by skill and level
|
2018-08-05 06:41:03 +02:00 |
|
Enno Rehling
|
f6b6904ced
|
finish parser for K_AUTOSTUDY and P_AUTO.
|
2018-08-05 06:41:03 +02:00 |
|
Enno Rehling
|
ee8a02c425
|
autostudy framework
|
2018-08-05 06:41:03 +02:00 |
|
Enno Rehling
|
4978e95b9a
|
delete leftover npc callbacks.
|
2018-08-03 06:52:37 +02:00 |
|
Enno Rehling
|
fc0616ed1e
|
kill lua triggers for npc logic, never used.
|
2018-08-03 06:47:29 +02:00 |
|
Enno Rehling
|
116ff7247d
|
Remove unused "message" events (old NPC sh*t).
|
2018-08-02 16:41:23 +02:00 |
|
Enno Rehling
|
8d88579570
|
Refactor: extract can_recruit, write tests for insects.
|
2018-08-02 14:31:00 +02:00 |
|
Enno Rehling
|
3880960acf
|
BUG 2458: fix insect recruit warnings.
|
2018-08-02 13:53:41 +02:00 |
|
Enno Rehling
|
2697d78c07
|
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
|
2018-08-01 11:56:08 +02:00 |
|
Enno Rehling
|
e89fe69d58
|
simplicate the sink_ship function, do not rescue units.
|
2018-08-01 11:55:57 +02:00 |
|
Enno Rehling
|
ad0464ab50
|
BUG 2168: call sink_ship for ships that take too much damage.
|
2018-08-01 10:04:12 +02:00 |
|
Enno Rehling
|
d9ba7be884
|
Merge branch 'master' into develop
|
2018-07-31 10:42:53 +02:00 |
|
Enno Rehling
|
e9bded4a87
|
BUG 2469 wrong default quantity for construction reqs
|
2018-07-31 10:13:00 +02:00 |
|
Enno Rehling
|
5309c84224
|
BUG 2465 Kein Item-Teleport bei Lied der Verfuehrung.
|
2018-07-25 19:42:48 +02:00 |
|
Enno Rehling
|
cd6154cae6
|
fix the lighthouse crash in preview.
|
2018-07-22 10:55:09 +02:00 |
|
Enno Rehling
|
2282160916
|
separate lighthouse_view_distance from lighthouse_range.
|
2018-07-18 20:49:17 +02:00 |
|
Enno Rehling
|
7b7d3cb759
|
test: lighhouse size reduction reduces effectiveness
|
2018-07-17 21:34:22 +02:00 |
|
Enno Rehling
|
fc80e4b83e
|
BUG 2462: Leuchtturm meldet keine Landregionen, beschützt Schiffe erst ab Größe 10.
|
2018-07-17 20:53:34 +02:00 |
|
Enno Rehling
|
820264aa82
|
BUG 2461: Liste der Angreifer zeigt nicht alle Parteien.
|
2018-07-15 13:39:23 +02:00 |
|
Enno Rehling
|
ced21cc336
|
BUG 2459 Regionen recycling macht ein Reset der Rohstoffe.
|
2018-07-13 23:37:45 +02:00 |
|
Enno Rehling
|
de7248fb5a
|
BUG 2457: Einheiten werden bei Durchreise nicht angezeigt.
|
2018-07-13 22:45:17 +02:00 |
|
Enno Rehling
|
6403c75c85
|
monsters should not be anonymous.
|
2018-07-02 19:58:26 +02:00 |
|
Enno Rehling
|
e8ef5be7f6
|
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
|
2018-06-28 22:49:05 +02:00 |
|
Enno Rehling
|
5018308170
|
remove at_chaoscount, update storage module.
|
2018-06-28 22:48:57 +02:00 |
|
Enno Rehling
|
38cb6297bb
|
Merge branch 'master'
|
2018-06-24 20:36:32 +02:00 |
|
Enno Rehling
|
6d10ee8fa5
|
BUG 2453: Erstausstattung und Default-Befehle für neue Parteien.
|
2018-06-24 18:08:19 +02:00 |
|
Enno Rehling
|
2b0b7cd0f8
|
BUG 2447: PArtei fehlt im Kampfreport.
replace strcpy with strcat
|
2018-06-18 20:33:28 +02:00 |
|
Enno Rehling
|
ecdf03138f
|
Merge branch 'master' into develop
|
2018-06-11 21:38:55 +02:00 |
|
Enno Rehling
|
34d0b56c68
|
BUG 2448: Default-Attacken respektieren!
|
2018-06-11 21:36:59 +02:00 |
|
Enno Rehling
|
a62541a17e
|
BUG 2443: Straßen ohne komplizierte String-Bastelei.
|
2018-06-11 21:00:33 +02:00 |
|
Enno Rehling
|
13090fd27c
|
BUG 2446: trade prices not getting read from XML.
|
2018-06-10 10:58:39 +02:00 |
|
Enno Rehling
|
ade7b2ef43
|
BUG 2446: trade prices not getting read from XML.
|
2018-06-10 09:58:26 +02:00 |
|
Enno Rehling
|
5b0f3f9ea7
|
more sbstring upgrades
|
2018-06-09 21:22:02 +02:00 |
|
Enno Rehling
|
4b5bd11f29
|
spell_syntax without bsdstring, better tests.
|
2018-06-03 13:29:54 +02:00 |
|
Enno Rehling
|
f96c9c5bf9
|
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
|
2018-06-03 11:04:20 +02:00 |
|
Enno Rehling
|
3208164b13
|
update version
|
2018-06-03 11:01:08 +02:00 |
|
Enno Rehling
|
cb5d15fee3
|
eliminate bsdstring.h usage
|
2018-06-03 05:42:09 +02:00 |
|
Enno Rehling
|
6abf054b42
|
replace bsdstring functions in cycle_route.
|
2018-05-27 20:31:36 +02:00 |
|
Enno Rehling
|
034872c44e
|
respect the input length when copying in str_escape_ex.
|
2018-05-27 15:15:31 +02:00 |
|
Enno Rehling
|
5af3ac1b40
|
reproduce buffer overflow in str_escape_ex
|
2018-05-27 15:11:03 +02:00 |
|
Enno Rehling
|
95c5c86303
|
Bug 2444: set default scores
|
2018-05-24 16:40:50 +02:00 |
|
Enno Rehling
|
9b3b376579
|
BUG 2443: Fehlende Leerzeile im Kampfreport.
|
2018-05-24 16:31:01 +02:00 |
|
Enno Rehling
|
49178d8fc7
|
unused variable
|
2018-05-21 16:38:32 +02:00 |
|
Enno Rehling
|
e53a1caa08
|
cleanup unused conde
|
2018-05-21 16:24:08 +02:00 |
|
Enno Rehling
|
60a86e7b2f
|
escaping a string for use in CR needs to only replace quotes and backslashes.
|
2018-05-21 13:27:02 +02:00 |
|
Enno Rehling
|
226fa2ba08
|
fix crash in region messages.
|
2018-05-20 17:11:29 +02:00 |
|
Enno Rehling
|
b3b19e7c83
|
suppress those null-reference bugs in another way, maybe?
|
2018-05-19 21:01:10 +02:00 |
|
Enno Rehling
|
dfa0ff09d1
|
Suppress some false positive coverity results.
It apparently does not understand CuTest code well?
Add a check for Lua eff_skill binding.
|
2018-05-19 20:53:51 +02:00 |
|
Enno Rehling
|
4154b1c3d9
|
remove additional whitespace in some strings.
|
2018-05-19 13:34:00 +02:00 |
|
Enno Rehling
|
6699e8940e
|
some cleanup is good.
|
2018-05-18 21:44:03 +02:00 |
|
Enno Rehling
|
33a6d7fa0e
|
free sections memory.
|
2018-05-18 21:43:02 +02:00 |
|
Enno Rehling
|
22f6d4feed
|
fix sections handling, remove it from nrmessage.
|
2018-05-18 21:36:10 +02:00 |
|
Enno Rehling
|
c11a020846
|
remove the text from messages.xml
|
2018-05-18 21:24:08 +02:00 |
|
Enno Rehling
|
bbae56633b
|
rules was part of convert, and we do never finished that branch.
|
2018-05-18 21:19:01 +02:00 |
|
Enno Rehling
|
ce37fd1bb7
|
remove libxml2 from dependencies
remove the converter, that isn't a way we're going.
|
2018-05-18 21:14:22 +02:00 |
|
Enno Rehling
|
6b0f75339f
|
message parsing from exparse is working, but allocates too much.
|
2018-05-18 20:42:22 +02:00 |
|
Enno Rehling
|
19b3b5b35a
|
change how message types are created (more prep work for expat)
|
2018-05-18 19:58:49 +02:00 |
|
Enno Rehling
|
f8b8a5284c
|
begin expat message parsing
|
2018-05-18 18:50:13 +02:00 |
|
Enno Rehling
|
6608f1b1ab
|
Merge branch 'develop'
|
2018-05-18 15:34:50 +02:00 |
|
Enno Rehling
|
3cd51fe384
|
cppcheck niggles.
|
2018-05-18 15:34:21 +02:00 |
|
Enno Rehling
|
26dc593ddb
|
shrink nrmessage
|
2018-05-18 08:34:00 +02:00 |
|
Enno Rehling
|
810bf3b40a
|
fix some cppcheck warnings
|
2018-05-18 02:55:33 +02:00 |
|
Enno Rehling
|
9e64f66409
|
gates are never created, probably dead code
|
2018-05-18 02:55:03 +02:00 |
|
Enno Rehling
|
ef74b8e759
|
reduce the footprint of nrmessage
|
2018-05-18 02:46:34 +02:00 |
|
Enno Rehling
|
3867388834
|
iwyu
|
2018-05-18 02:35:11 +02:00 |
|
Enno Rehling
|
42f59fbd9e
|
I think pofile.c belongs in the util directory.
|
2018-05-18 00:08:30 +02:00 |
|
Enno Rehling
|
7fa568da09
|
eliminate dead code, fix compile
|
2018-05-17 23:53:44 +02:00 |
|
Enno Rehling
|
409f5df9a9
|
po export code removed.
|
2018-05-17 23:29:12 +02:00 |
|
Enno Rehling
|
87914a7b5b
|
delete XML Strings.
|
2018-05-17 23:27:29 +02:00 |
|
Enno Rehling
|
4d09f00f03
|
remove string parsing from XML. E3 tests failing!
|
2018-05-17 22:58:01 +02:00 |
|
Enno Rehling
|
0d6abd3811
|
Merge branch 'develop'
|
2018-05-17 22:49:03 +02:00 |
|
Enno Rehling
|
615dfe7ec5
|
Get the NR message text from locale.
|
2018-05-17 22:47:16 +02:00 |
|
Enno Rehling
|
c0ed53b679
|
last of the duplicate names. battles have lost their separators, though.
|
2018-05-17 22:15:24 +02:00 |
|
Enno Rehling
|
7a10a58605
|
1. nrmessage is locale-independent, uses locale_getstring
2. unique strings:
rename aurapotion50 message.
delete unused bithday_firework definitions.
|
2018-05-17 19:04:25 +02:00 |
|
Enno Rehling
|
c596402e4a
|
load strings from po file, not xml.
|
2018-05-17 16:54:59 +02:00 |
|
Enno Rehling
|
9ca945cb2c
|
add a string escaping function.
start some work on nrmessage.c.
|
2018-05-17 16:53:56 +02:00 |
|
Enno Rehling
|
35c3d4cda0
|
export messages and strings into separate .po files
commit the exported files.
|
2018-05-17 10:43:23 +02:00 |
|
Enno Rehling
|
0f3e3c9e38
|
po file exporter, also for messages.
|
2018-05-16 21:58:02 +02:00 |
|
Enno Rehling
|
0a9f8bf662
|
merge from develop
|
2018-05-15 21:59:01 +02:00 |
|
Enno Rehling
|
269030082c
|
remove struct equipment from the code entirely.
|
2018-05-15 21:51:47 +02:00 |
|
Enno Rehling
|
40a2a6735a
|
mac build fix, dragon spoils equipment in Lua
|
2018-05-14 04:42:59 +02:00 |
|
Enno Rehling
|
c223542ced
|
kill an unused macro.
|
2018-05-13 16:17:03 +02:00 |
|
Enno Rehling
|
4240e142a5
|
BUG 2440: the random encounters code was completely unused.
|
2018-05-13 16:15:22 +02:00 |
|
Enno Rehling
|
79bc22b617
|
fatal error my a$$ . the gamedat check is killing tests for no discernible reason.
|
2018-05-12 22:12:14 +02:00 |
|
Enno Rehling
|
40125bb75e
|
translate seed_%race% equipment from xml to lua.
|
2018-05-12 20:52:10 +02:00 |
|
Enno Rehling
|
271352d0ba
|
create a lua module that can handle simple euipments.
lua test for equip_unit, with callbacks.
|
2018-05-12 19:10:40 +02:00 |
|
Enno Rehling
|
b12050ac2a
|
lua callback for equip_unit
|
2018-05-12 18:25:44 +02:00 |
|
Enno Rehling
|
7e6688552b
|
create a callback mechanism for equipment.
|
2018-05-11 21:30:26 +02:00 |
|
Enno Rehling
|
5c26155f2f
|
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
|
2018-05-11 20:55:38 +02:00 |
|
Enno Rehling
|
7b1038b0b1
|
this equipment callback is never used in our lua scripts, and we want to use equipment less.
|
2018-05-11 06:06:31 +02:00 |
|
Enno Rehling
|
ac73052dc1
|
autoseed code is never used in lua scripts (they have their own autoseed implementation).
|
2018-05-11 06:05:28 +02:00 |
|
Enno Rehling
|
84bc08a381
|
all races can be on a boat by default.
but now MAKETEMP is broken.
prefer assert_(not_)nil over assert_(not_)equal
|
2018-05-10 22:10:26 +02:00 |
|
Enno Rehling
|
9e16ebc01a
|
all kinds of race flag breakage repaired.
but now, humans suddenly can't build a ship in E2?
|
2018-05-10 22:00:23 +02:00 |
|
Enno Rehling
|
5de2a9e2ae
|
fix ec_flags parsing (irongolem, etc)
|
2018-05-10 21:05:51 +02:00 |
|
Enno Rehling
|
85cf8da383
|
rename canteach/canlearn to teach/learn
race/function is never used (and there is no namedragon function).
|
2018-05-10 20:37:37 +02:00 |
|
Enno Rehling
|
94769a66f8
|
teach vs canteach mixup
|
2018-05-10 20:18:56 +02:00 |
|
Enno Rehling
|
ad0491cecb
|
Merge branch 'develop'
|
2018-05-10 20:03:16 +02:00 |
|
Enno Rehling
|
b0012eeae0
|
familiars do not need the default value in XML (bad XML).
|
2018-05-10 20:02:53 +02:00 |
|
Enno Rehling
|
48a4de0768
|
parse race/attack data
|
2018-05-10 07:01:46 +02:00 |
|
Enno Rehling
|
fc052034ac
|
Merge branch 'exparse' of https://github.com/ennorehling/eressea.git
|
2018-05-09 22:23:40 +02:00 |
|
Enno Rehling
|
907348adfc
|
merge race xml changes (teach, migrants, floating point)
|
2018-05-09 22:21:50 +02:00 |
|
Enno Rehling
|
c05a65b881
|
expat parses (most of) races.
fix canteach flag in XML.
|
2018-05-09 22:16:30 +02:00 |
|
Enno Rehling
|
8c7b890f3e
|
set the default unarmed modifiers for races.
|
2018-05-09 20:56:38 +02:00 |
|
Enno Rehling
|
9e6ae0edc1
|
make str_strdup more forgiving
|
2018-05-09 07:14:56 +02:00 |
|
Enno Rehling
|
c9b9bac2ac
|
Merge branch 'develop'
|
2018-05-08 23:11:14 +02:00 |
|
Enno Rehling
|
ae3c0b099f
|
spells do not have a function element in XML
|
2018-05-08 23:10:51 +02:00 |
|
Enno Rehling
|
b197bb395d
|
parse spell components.
|
2018-05-08 23:06:33 +02:00 |
|
Enno Rehling
|
371335ab95
|
spell flag merge conflicts
|
2018-05-08 21:45:21 +02:00 |
|
Enno Rehling
|
ccf09770e3
|
rename global target flag, invert logic
|
2018-05-08 21:43:13 +02:00 |
|
Enno Rehling
|
d45c32f1ac
|
Merge branch 'develop'
|
2018-05-08 21:32:45 +02:00 |
|
Enno Rehling
|
6746401330
|
BUG 2437: fetch_astral should have no aura cost when given bad units.
|
2018-05-07 20:22:02 +02:00 |
|
Enno Rehling
|
68de367a98
|
print an error instead of asserting.
|
2018-05-06 19:27:22 +02:00 |
|
Enno Rehling
|
cfe21e7e1d
|
re-enable tests, allow more spell arguments.
a list of ships, units, etc can be long!
|
2018-05-06 19:07:20 +02:00 |
|
Enno Rehling
|
d0d366485e
|
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
|
2018-05-06 19:02:55 +02:00 |
|
Enno Rehling
|
14f59e4bfe
|
functional tests for pull_astral spell.
|
2018-05-06 19:02:47 +02:00 |
|
Enno Rehling
|
4d3718bab9
|
find out why t<=0 assert happens sometimes
|
2018-05-06 18:05:35 +02:00 |
|
Enno Rehling
|
5af775ba87
|
prevent out-of-bounds read.
|
2018-05-06 16:35:23 +02:00 |
|
Enno Rehling
|
088747ea81
|
code style
|
2018-05-06 15:50:44 +02:00 |
|
Enno Rehling
|
cd2624de8a
|
stop reallocation spell parameters.
fix involuntary tree growth in test, message check.
|
2018-05-06 15:49:34 +02:00 |
|
Enno Rehling
|
adbf1098b9
|
we fail tests when not reading spell components.
|
2018-05-06 14:02:44 +02:00 |
|
Enno Rehling
|
a44085de7a
|
spell flags, rearranged
|
2018-05-06 13:59:00 +02:00 |
|
Enno Rehling
|
17ea7a224a
|
spell ranks cannot be negative
|
2018-05-06 09:02:27 +02:00 |
|
Enno Rehling
|
cd2435dbb0
|
spell xml does not define an index attribute
|
2018-05-06 09:00:11 +02:00 |
|
Enno Rehling
|
dc3918f4a6
|
read spellbook (expat)
|
2018-05-05 07:48:38 +02:00 |
|
Enno Rehling
|
0e3170a0cb
|
merge
|
2018-05-05 07:39:25 +02:00 |
|
Enno Rehling
|
d568e79490
|
spellbooks contain spellref, not spell *.
for order-independent load from XML.
|
2018-05-05 07:38:11 +02:00 |
|
Enno Rehling
|
3e2aa5b1a8
|
start ingesting spellbooks.
|
2018-05-05 06:05:50 +02:00 |
|
Enno Rehling
|
dca99ec79d
|
negative, sir!
|
2018-05-04 18:53:35 +02:00 |
|
Enno Rehling
|
53f8b39e6e
|
gcc and clang complain about unused function.
|
2018-05-04 18:50:44 +02:00 |
|
Enno Rehling
|
ad0f83dcca
|
some xmlreader code still required that resources get loaded first.
|
2018-05-04 18:48:14 +02:00 |
|
Enno Rehling
|
85509cdf65
|
fix some bugs in reading weapons.
|
2018-05-04 18:41:59 +02:00 |
|
Enno Rehling
|
4e2171ace9
|
fix finding resources if xml is not processed in predetermined order.
|
2018-05-04 17:58:26 +02:00 |
|
Enno Rehling
|
82ba0e62d4
|
fix reading weapon damage.
|
2018-05-04 17:57:10 +02:00 |
|
Enno Rehling
|
704148e4bd
|
more object types I haven't handled yet.
|
2018-05-03 23:04:32 +02:00 |
|
Enno Rehling
|
75aff73e9a
|
Merge branch 'develop'
|
2018-05-03 23:01:42 +02:00 |
|
Enno Rehling
|
b31a1f798c
|
BUG 2346: extract a test for ship tactics bonus.
|
2018-05-03 23:00:28 +02:00 |
|
Enno Rehling
|
34c6222b8f
|
BUG 2436: Fix the E3 tactics bonus for ships.
|
2018-05-03 22:44:01 +02:00 |
|
Enno Rehling
|
5bcd8369af
|
ignore sqlite setting errno
|
2018-05-03 22:40:54 +02:00 |
|
Enno Rehling
|
069047d0ac
|
uninitialized variable crash, seenspells.
|
2018-05-03 22:32:11 +02:00 |
|
Enno Rehling
|
cb27895b81
|
parsing ships, done!
|
2018-05-03 22:27:28 +02:00 |
|
Enno Rehling
|
6d9ecd1879
|
finish loading buildings with expat.
|
2018-05-02 21:37:57 +02:00 |
|
Enno Rehling
|
50839068e5
|
Merge branch 'exparse' of https://github.com/ennorehling/eressea.git
|
2018-05-01 20:58:34 +02:00 |
|
Enno Rehling
|
59f74d0a98
|
parse building stages, too.
|
2018-05-01 20:58:30 +02:00 |
|
Enno Rehling
|
7128e1fb5c
|
extract modifier parsing so it can be used for buildings.
|
2018-05-01 20:05:46 +02:00 |
|
Enno Rehling
|
d2eccd56b9
|
defaults
|
2018-05-01 19:39:41 +02:00 |
|
Enno Rehling
|
e5d3d77c06
|
begin parsing buildings.
|
2018-05-01 18:52:48 +02:00 |
|
Enno Rehling
|
3db9d5d878
|
merge from develop. luxuty price conflict resolved.
|
2018-05-01 17:23:46 +02:00 |
|
Enno Rehling
|
b5b9611a16
|
eliminate construction.improvement,
create building_type.stages instead.
|
2018-05-01 15:40:11 +02:00 |
|
Enno Rehling
|
8a21b42b65
|
start extracting building-only construction stuff.
|
2018-05-01 11:22:47 +02:00 |
|
Enno Rehling
|
0b097371a1
|
items: less xpath, more child iteration.
|
2018-05-01 11:20:13 +02:00 |
|
Enno Rehling
|
dddbf5287a
|
refactor construction list.
|
2018-05-01 10:53:12 +02:00 |
|
Enno Rehling
|
bddf4bff39
|
unnecessary xpath wrangling
|
2018-05-01 10:47:17 +02:00 |
|
Enno Rehling
|
c7ae070fa7
|
nobody needs the construct_t enum.
|
2018-05-01 07:02:55 +02:00 |
|
Enno Rehling
|
969c28692f
|
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
|
2018-04-30 23:24:02 +02:00 |
|
Enno Rehling
|
b44e4e747d
|
ships and items never have multi-stage builds.
we are going to make sure of this soon.
|
2018-04-30 23:23:48 +02:00 |
|
Enno Rehling
|
e0cae602dd
|
add a test for building items.
|
2018-04-30 23:18:39 +02:00 |
|
Enno Rehling
|
e0e873044d
|
fix stone golems (assert).
remove improvement logic from build().
|
2018-04-30 23:11:13 +02:00 |
|
Enno Rehling
|
22734a4ae4
|
refactor building stages into build_stages().
TODO: remove them from build().
|
2018-04-30 22:52:38 +02:00 |
|
Enno Rehling
|
6b38fdf4e6
|
fix build
|
2018-04-30 20:25:58 +02:00 |
|
Enno Rehling
|
a8f6f1a40c
|
there is no require element for weapons. oops.
|
2018-04-29 20:23:41 +02:00 |
|
Enno Rehling
|
2579bf71b5
|
fix test_troll_quarrying_bonus
|
2018-04-29 19:33:39 +02:00 |
|
Enno Rehling
|
12416e8b0d
|
fix reading skill modifiers.
|
2018-04-29 18:44:17 +02:00 |
|
Enno Rehling
|
177e0159c4
|
init construction defaults.
|
2018-04-29 18:23:23 +02:00 |
|
Enno Rehling
|
ec9038a5ea
|
fix copy/paste errors, remove armor element handlers.
|
2018-04-29 17:27:12 +02:00 |
|
Enno Rehling
|
10884c825e
|
fix compile, invalid use of rc_mask.
|
2018-04-29 16:11:35 +02:00 |
|
Enno Rehling
|
f6735049d8
|
add a few tests for fighters equipping the right weapons and armor.
|
2018-04-29 15:25:46 +02:00 |
|
Enno Rehling
|
c01e9b24ad
|
unit tests for racial weapon permissions.
|
2018-04-29 15:09:07 +02:00 |
|
Enno Rehling
|
1ef57ef4f0
|
merge conflicts, race masking.
|
2018-04-29 13:50:56 +02:00 |
|
Enno Rehling
|
837ab325f9
|
XML simplificatio: unified system for masking races on modifiers.
|
2018-04-29 13:46:17 +02:00 |
|
Enno Rehling
|
ac786e034c
|
extract rc_mask, add it to exparse code.
|
2018-04-29 13:16:07 +02:00 |
|
Enno Rehling
|
3cb1d1a071
|
simplify race masking for weapon modifiers.
|
2018-04-29 13:13:10 +02:00 |
|
Enno Rehling
|
dc891a94b4
|
armor and weapon are harder to read than other items.
modifier handling for weapons seems ok, except races.
|
2018-04-29 10:32:10 +02:00 |
|
Enno Rehling
|
e86f3e7589
|
read callback fucntions for resources and weapons.
|
2018-04-28 21:46:01 +02:00 |
|
Enno Rehling
|
46f5fa0211
|
item does not have funtions.
resourcelimit is gone.
|
2018-04-28 21:27:34 +02:00 |
|
Enno Rehling
|
4812fa1c41
|
unnecessary xpath searches.
1. item does not have functions.
2. resourcelimit is gone.
|
2018-04-28 21:25:26 +02:00 |
|
Enno Rehling
|
9dbfaea708
|
parse construction requirements for items.
|
2018-04-28 21:12:28 +02:00 |
|
Enno Rehling
|
9d3385de97
|
still cannot read potions, requirements, functions.
|
2018-04-28 18:49:13 +02:00 |
|
Enno Rehling
|
e4a2b6cb35
|
loading armor with expat.
|
2018-04-28 18:47:17 +02:00 |
|
Enno Rehling
|
16cebed013
|
implement weapons loading with expat.
|
2018-04-28 18:40:14 +02:00 |
|
Enno Rehling
|
ce50b888c9
|
finish loading luxury items.
|
2018-04-28 18:10:04 +02:00 |
|