Commit Graph

743 Commits

Author SHA1 Message Date
Oskar Wiksten
660504ca72 Content editor: allow reordering quest stages & droplist content 2013-11-24 11:35:28 +01:00
Oskar Wiksten
f5df781fc9 Content editor: enable dragdrop sorting of resources 2013-11-24 11:29:53 +01:00
Oskar Wiksten
50751390a3 Updated Russian translation (thanks dromoz) 2013-11-23 22:28:38 +01:00
Oskar Wiksten
a24672a3f1 Slight border to monsters_rltiles3.png 2013-11-14 23:36:20 +01:00
Oskar Wiksten
b06c5b9b15 Unblur and add border for monsters_men.png 2013-11-14 23:24:21 +01:00
Oskar Wiksten
7cc2d303ef Add border to monsters_men2.png monsters_snakes.png 2013-11-14 23:05:57 +01:00
Oskar Wiksten
106203d85b Read fewer fields from TMX files
* Do not read "tilewidth" and "tileheight" from <map>, always assume 32.
* Do not read "tilewidth" and "tileheight" from <tileset>, always assume 32.
* Do not read "width" and "height" from <layer>, always assume same size as map.
* Do not read "width" and "height" from <objectgroup>, always assume same size as map.
* Do not read <image> inside <tileset>. Always assume tileset name is same as image resource name from ResourceLoader.
2013-11-10 23:40:01 +01:00
Oskar Wiksten
8b3ac992ce Remove obsoleted "width" and "height" on <objectgroup> in TMX files 2013-11-10 21:10:48 +01:00
Oskar Wiksten
1fabb499a9 Spelling corrections Elwyl: both our sakes -> both our sake 2013-11-10 13:50:37 +01:00
Oskar Wiksten
51e63167a0 Bump version to 0.7.1a1 (versiocode 41) 2013-11-10 12:49:50 +01:00
Oskar Wiksten
37ef73d9e2 Add xhdpi and xxhdpi icons. Update to SDK 19. 2013-11-10 12:09:36 +01:00
Oskar Wiksten
b950993852 Update French and Russian translations (thanks Marwane K and dromoz!) 2013-11-10 11:27:08 +01:00
Oskar Wiksten
4a2aa90373 Update PO with clarification of Lodar's def pots 2013-11-10 11:16:39 +01:00
Oskar Wiksten
161f516a98 Clarify monster locations in quest & conversation for Lodar def pot (thanks dromoz!) 2013-11-10 11:14:14 +01:00
Oskar Wiksten
c002405008 Updated translations (thanks Marwane K. & Andrej Znidarsic) 2013-11-03 16:24:38 +01:00
Oskar Wiksten
d4ff63d456 Merge branch 'reduce-warnings' 2013-11-03 15:07:13 +01:00
Oskar Wiksten
e8d0162ceb Refactor: Reduce warnings / reduce scope 2013-11-03 15:05:27 +01:00
Oskar Wiksten
eba387159e Refactor: Use enum instead of int for result of loading a savegame 2013-11-03 15:05:21 +01:00
Oskar Wiksten
6006fe1eb5 Refactor: Don't use hardcoded text for placeholders 2013-11-03 14:57:07 +01:00
Oskar Wiksten
f6559cac31 Refactor: remove unused resources 2013-11-03 14:55:59 +01:00
Oskar Wiksten
9405ad323a Bugfix: do not hardcode map names when upgrading savegame 2013-11-03 12:40:13 +01:00
Oskar Wiksten
b0f9ba9abe Bugfix: Do not assume that all saved maps are visited
* Maps that have deactivated spawn areas should be saved, but does not neccessarily have to be visited.
2013-11-03 10:22:05 +01:00
Oskar Wiksten
086fb199cf Remove Fallhaven prisoner when reaching quest farrik:70 2013-11-03 09:35:21 +01:00
Oskar Wiksten
b898cf7f7c Rename TMX property "outside" to "outdoors".
* Outdoors is a better name for this, because that's what we actually mean by it. Outside is ambiguous in this context. Outside is what it's called in Swedish :)
2013-11-03 08:20:00 +01:00
Oskar Wiksten
aacf97e274 Add requirement type: "hasActorCondition"
* Enables scripts and conversations to choose options based on whether the player has a certain actor condition or not.
2013-11-02 10:24:07 +01:00
Oskar Wiksten
d58db6efc4 Merge branch 'activate-spawnareas' 2013-11-02 09:27:11 +01:00
Oskar Wiksten
4a1c6779cf Enable scripts to activate/deactivate spawn areas & mapobjects
Renames "isActive" on spawnareas to "isSpawning" - so that a spawn area can be non-spawning but still have monsters left in it.
Adds new scripteffect types:
* "spawnAll" = sets  spawn area to spawning and spawns all monsters
* "removeSpawnArea" = sets a spawn area to non-spawning and removes all mobs
* "deactivateSpawnArea" = sets a spawn area to non-spawning
* "activateMapChangeArea" = sets a mapchange area to non-active
* "deactivateMapChangeArea" = sets a mapchange area to non-active (so that it does not teleport the player)
Adds new property "active" to spawn- and mapchange areas in tmx files, that determines whether the areas are active when starting a new game.
2013-11-02 09:26:04 +01:00
Oskar Wiksten
a2caea0a83 Refactor: Flatten some forward-arrow-pattern ifs to vertical code 2013-10-27 15:29:27 +01:00
Oskar Wiksten
4209f91d00 Bugfix: also save maps that use non-default values
* For example, maps that have had some spawn area deactivated should be saved in the savegame.
2013-10-27 14:17:40 +01:00
Oskar Wiksten
88f15b9099 Merge pull request #10 from oskarwiksten/persist-isactive-on-mapobjects-in-savegames
Save 'isActive' for MapObjects & SpawnArea in savegames
2013-10-27 05:55:42 -07:00
Oskar Wiksten
20ed608523 Save 'isActive' for MapObjects & SpawnArea in savegames
* Stores the "isActive" boolean in savegames for map objects and spawn areas
* Adds functions in MapController to activate and deactivate MapObject areas
* Adds functions in MonsterSpawnController to activate and deactivate MonsterSpawnAreas
* When a spawn area is deactivated, all monsters should be removed, since the spawn area is considered to be non-existant.
* Adds boolean "isActiveForNewGame" to map objects and spawn areas, that specify what "isActive" should be set to when starting a game. (Initially, all of these are true)
* This commit does not add any way to actually activate or deactive areas. That can come as a later commit (possibly using script effects to do that).
2013-10-27 13:04:09 +01:00
Oskar Wiksten
c001532106 Merge branch 'rename-phrase-reward-to-script-effect' 2013-10-27 10:59:56 +01:00
Oskar Wiksten
a8ad00c21c Refactor: Rename PhraseReward -> ScriptEffect
* This commit does not contain changes to json field names when parsing phrases though.
2013-10-27 10:59:21 +01:00
Oskar Wiksten
079511a30c Rename file Reward.java -> ScriptEffect.java 2013-10-27 10:52:11 +01:00
Oskar Wiksten
6fce649cbb Always deny monster movement on mapchange,keyarea,rest - regardless of isActive 2013-10-27 10:12:27 +01:00
Oskar Wiksten
d2c3eb9106 Refactor: rename functions for saving PredefinedMap data 2013-10-27 09:33:24 +01:00
Oskar Wiksten
53331aef1b Code reformat: Ctor arguments should be one arg per line
* Vertical list makes it easier to version control additions and removals of single parameters
2013-10-27 09:09:09 +01:00
Oskar Wiksten
0570589ecc Refactor: Rename reset() -> resetForNewGame() on map data classes 2013-10-27 08:38:27 +01:00
Oskar Wiksten
9af062e36e Updated PO translations from launchpad 2013-10-26 11:39:19 +02:00
Oskar Wiksten
9fc23ca1fc Add "translator-credits" to english POT file
* Used by Launchpad translations for maintaining list of translators.
2013-10-26 10:23:12 +02:00
Oskar Wiksten
e509b1d75f Update english.pot, reformat all PO files (sort by source location) 2013-10-26 09:50:18 +02:00
Oskar Wiksten
339c3ee7b2 Renamed Brazilian Portuguese translation file: pt-rBR.po -> pt_BR.po 2013-10-26 09:44:40 +02:00
Oskar Wiksten
0c3b4bded9 Merge pull request #9 from Zukero/requirements_negation
Added requirement negation capability :
2013-10-23 09:22:22 -07:00
Zukero
c06dba6b7d Factorized the checkbox definition in content editor. 2013-10-23 18:08:09 +02:00
Zukero
707940aa14 Added requirement negation capability :
- Use "requireNegation" property in Tiled map object
- Checkbox for require.negate added in Content Editor
2013-10-22 23:10:24 +02:00
Oskar Wiksten
bdde9cefba Merge branch 'activable_map_objects' 2013-10-22 18:06:23 +02:00
Zukero
26c412f7f1 MapObject & MonsterSpawnArea can be activated/deactivated using theisActive boolean.
No handle exist yet to deactivate these areas.
Deactivated areas are never returned by PredefinedMap API.
Inactive container areas' Loot are not created on
createAllContainerLoot() calls. Think of creating it on area activation
when implemented (TODO label placed in the code to never forget :p)
Updated comment; fixed old, one-object processing to better match the
List type.
2013-10-22 18:05:51 +02:00
Oskar Wiksten
159d977187 Merge pull request #7 from Zukero/debug_resources_bugfix
Fixed deprecated use of "consumedMore" instead of "spentGold" in
2013-10-22 06:38:27 -07:00
Zukero
e33ac42c1c Fixed deprecated use of "consumedMore" instead of "spentGold" in
conversationlist_debug.json
2013-10-22 15:18:44 +02:00
Oskar Wiksten
76720094c1 Merge pull request #6 from Zukero/map_object_group_data_kept
MapObject & MonsterSpawnArea now keep track of their Tiled group's name.
2013-10-20 23:39:38 -07:00