Commit Graph

553 Commits

Author SHA1 Message Date
Oskar Wiksten
dcd8337ff3 Added conversations, monsters, quests for v070. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
53fbe550aa Align mapchange areas roadbeforecrossroads1->roadbeforecrossroads2. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
58a14d3e58 Added tradehouse0a map (basement in Charwood cabin). 2013-06-27 20:45:17 +02:00
Oskar Wiksten
3a67a6af6a Updated lodar* maps with signs needed for the Lodar quest. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
bda06f990b Update roadbeforecrossroads1 to match the description Ogam gives 2013-06-27 20:45:17 +02:00
Oskar Wiksten
c49bedb7fd Updated worldmap.xml according to lodar* maps. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
3df824bfb2 Updated lodar* maps with new tileset. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
df02938766 Spelling correction "Foaming Flask Tavern". 2013-06-27 20:45:16 +02:00
Oskar Wiksten
15cf74359e Moved a lot of tiles to the correct layers and updated tile walkable state on a lot of tiles. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
158d015f1e Updated worldmap.xml 2013-06-27 20:45:16 +02:00
Oskar Wiksten
c87d31ec9c Added worldmap.xml 2013-06-27 20:45:16 +02:00
Oskar Wiksten
6649754e1f Cosmetic mapchanges. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
c1ed9d2ffa Minor changes to lodarhouse map. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
3d8090ad13 Make lodar* maps outdoor maps. Align lodar* and roadbeforecrossroads* maps to worldmap. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
d62d2e6603 Updated lodarcave* maps (thanks Ian Hasse). 2013-06-27 20:45:16 +02:00
Oskar Wiksten
8cdcbdc75d Updated lostmine* maps.
Added tradehouse* maps to loadresources.
Made all tiles of all mapchange areas walkable.
2013-06-27 20:45:16 +02:00
Oskar Wiksten
4aeb88bf9a Added tradehouse* maps for v0.6.12. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
6dc31e42e9 Minor adjustments to maps for v0.6.12 2013-06-27 20:45:16 +02:00
Oskar Wiksten
96ddc508a3 Aligned lodar* and roadbeforecrossroads* maps to fit into worldmap. Updated sizes of mapchange areas.
Updated worldmap with new maps.
2013-06-27 20:45:16 +02:00
Oskar Wiksten
dca9117a3f Corrected misspelled monster ids on new maps for v0.6.12. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
ac42088c03 New maps for v0.6.12 from Ian Haase. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
68de0fc9a9 Added items for v0.7.0 2013-06-27 20:45:15 +02:00
Oskar Wiksten
8a492fed92 Merge branch 'translate_gettext' into v070 2013-06-27 20:44:58 +02:00
Oskar Wiksten
adee44524f Fix Android Lint warnings. 2013-06-27 20:44:46 +02:00
Oskar Wiksten
96bc4ec59c Preparation for placing translation files in "assets/" 2013-06-27 20:44:46 +02:00
Oskar Wiksten
7672827d1f Update visibility of methods used in unit tests. 2013-06-27 20:44:46 +02:00
Oskar Wiksten
a74bef815c Updated translation MO-file parser to read the MO filename from strings.xml. 2013-06-27 20:44:46 +02:00
Oskar Wiksten
48d315300e Parse translations from MO files. 2013-06-27 20:44:46 +02:00
Oskar Wiksten
c33ec5133f Merge branch 'pathfinder' into v070 2013-06-27 20:42:58 +02:00
Oskar Wiksten
87fa73a2a0 Fix merge issues after rebase. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
048ea6b356 Do not wait for combat turns when monsters want to move, but cannot find a path. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
bc52d9b7af Redraw tiles when monsters move in combat. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
9b66c604e6 Make monster aggression a property per monster type (instead of being derived from the monster class)
* Add property movementAggressionType on MonsterType, that gets read when deserializing monster types from json.
* Add dropdown in monster editor in content editor, to set the monster aggression type.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
7476bb3432 POC monsters moving during combat - Fix merge issues from master. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
578c4e55f2 Make monster movement aggression based on monster type. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
d84d6e6c12 First try at a Pathfinder for moving monsters towards the player based on different aggression types. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
93c8a098bd Merge branch 'fightstyles' into v070 2013-06-27 20:42:26 +02:00
Oskar Wiksten
9d1720e19d Change "fighting bare hands" to "fighting unarmed". 2013-06-27 20:40:55 +02:00
Oskar Wiksten
61cbd29878 Fightstyles: Fix merge issues from master. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
8b6aafc5bd Added better descriptions for the new skills. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
dfff586d7d Better descriptions for some of the new skills. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
0c376442bb Armor proficiencies should not affect items with negative stats. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
83af64b4a3 Fixed issue with critical multipliers from main-hand weapons.
Fixed issues with weapon proficiency being applied after dual wielding bonuses (should be before dual-wielding bonuses)
Fixed issues with negative AC in offhand weapons not being taken into account when dual-wielding.
Equipping a regular weapon should replace two-hand weapon.
2013-06-27 20:40:55 +02:00
Oskar Wiksten
1bd20564fd Added weapon proficiency & fighting style skills. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
e560bba808 Bugfix: Store all visited maps in savegame
* Required for keeping the "lastSeenLayoutHash" between savegames.
2013-06-27 20:24:42 +02:00
Oskar Wiksten
98caa3295e Fix some Android Lint warnings. 2013-06-26 22:26:57 +02:00
Oskar Wiksten
8517fa3615 Update list of authors. 2013-06-26 20:17:33 +02:00
Oskar Wiksten
98d2c89fed Minor map fixes. 2013-06-25 01:02:37 +02:00
Oskar Wiksten
4d80f1b41d Minor refactoring: Move code that happens after loading a game into Savegames.onWorldLoaded. 2013-06-24 21:08:29 +02:00
Oskar Wiksten
3688cb0914 Minor fixes to dynamic map tiles. 2013-06-22 17:48:02 +02:00