Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,308 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

9308 Commits

Author SHA1 Message Date
Enno Rehling cb27895b81 parsing ships, done! 2018-05-03 22:27:28 +02:00
Enno Rehling 20b82fee51 old spellbooks no longer used anywhere 2018-05-02 21:55:17 +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 962b8082b7 fix test for lifepotion (tree growth was fuxxing it up) 2018-05-01 19:05:04 +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
Enno Rehling ff4bae4da1 delete unused static functions. 2018-04-28 17:52:48 +02:00
Enno Rehling 03cff6d595 extract rc_mask, add it to exparse code. 2018-04-28 16:14:32 +02:00
Enno Rehling edadf2cbab exparse: parse (most of) the resource data. 2018-04-28 15:58:14 +02:00
Enno Rehling 08663b6eb5 fix last commit. refactoring with the MSVC IDE is prone to errors. 2018-04-28 15:57:51 +02:00
Enno Rehling 0b22b50013 the presspass is cursed, attribute needs to be on item, not resource. 2018-04-28 11:38:11 +02:00
Enno Rehling c3b25328d3 don't exist with a leak, fix MSVC compilation. 2018-04-24 21:16:56 +01:00
Enno Rehling b28cbd606d minimal expat parsing code 2018-04-24 22:04:23 +02:00