713 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Zukero	c4896aaab3	Tiled group name also in ReplaceableMapSection	2013-10-20 22:18:42 +02:00
Zukero	bddb3e2a8c	MapObject & MonsterSpawnArea now keep track of their Tiled group's name.	2013-10-20 22:14:35 +02:00
Oskar Wiksten	7f2388904b	Minor gfx update to tiling pine trees	2013-10-20 10:30:01 +02:00
Oskar Wiksten	73e8851f27	Bugfix: Redraw whole screen if double-buffer is not pre-filled ... * Fixes issue where the screen was only partially drawn after having entered heroinfoactivity before starting combat. * lockCanvas() changes the supplied Rect object occasionally, to indicate that the double buffer has not been filled. In those cases, you need to redraw the whole rect.	2013-10-20 10:00:20 +02:00
Oskar Wiksten	a0f943994f	Bugfix: Continue combat after having seen the combat log ... * Previously, combat was stopped when entering the combat log. This commit makes the combat continue after having been stopped.	2013-10-20 09:03:53 +02:00
Oskar Wiksten	518934751b	Merge branch 'new_tilesets_20131005'	2013-10-05 17:56:12 +02:00
Ian Haase	36da967dbe	updated tilesets + template.tmx and authors.xml	2013-10-05 17:55:57 +02:00
Oskar Wiksten	9812dc6344	Merge pull request #5 from Zukero/master ... Egocentric commit. Added my name in the authors...	2013-10-03 13:32:43 -07:00
Zukero	5daf70e739	Egocentric commit. Added my name in the authors...	2013-10-03 22:27:11 +02:00
Oskar Wiksten	0a8859b304	Add explicit quest stages to existing key areas	2013-10-03 08:27:11 +02:00
Oskar Wiksten	3cee7e95d2	Merge branch 'key_area_use_requirements'	2013-10-03 08:26:26 +02:00
Zukero	140dd16408	Key Area now use Requirement, instead of QuestProgress ... * Requirement class moved from model.conversation to model.script * Added requirement questLatestProgress : quest stage must be reached, but no stage with superior ID must be reached. * New key requirements conditions type (item/gold/bonemeals) consumption (more or less than value, never strict checking, either <= or >=).	2013-10-02 18:21:14 +02:00
Oskar Wiksten	9af294932f	Remove unused code	2013-09-25 22:30:10 +02:00
Oskar Wiksten	5136a7cab0	Merge branch 'headless-scripts'	2013-09-25 17:55:25 +02:00
Oskar Wiksten	b41fffee44	Content editor: Add support for giveItem,createTimer and timerElapsed in convs	2013-09-25 17:54:08 +02:00
Oskar Wiksten	0212dd6bbc	Add world timers and world time (counted in number of rounds) ... * Increase world time each round. * Add script reward "createTimer" * Add script requirement "timerElapsed"	2013-09-25 17:54:08 +02:00
Oskar Wiksten	d6583a4e33	Add reward type "giveItem", for quest rewards that do not need full droplists.	2013-09-25 17:54:08 +02:00
Oskar Wiksten	02bfeb5625	Enable map scripts to run on every round or tick	2013-09-25 17:54:08 +02:00
Oskar Wiksten	dc278fb5da	First attempt at scripted map areas	2013-09-25 17:54:08 +02:00
Ian Haase	8d91c7375d	recolored dirt transitions	2013-09-25 17:47:10 +02:00
Oskar Wiksten	d13cd4c02a	Add preference "use localization", to allow disabling partial translations	2013-09-08 16:56:03 +02:00
Oskar Wiksten	787fcc0a65	Rearrange worldmap.xml (sort by name)	2013-09-02 20:45:53 +02:00
Oskar Wiksten	d29218c7c3	Prepare data placeholder "worldData".	2013-08-31 19:28:09 +02:00
Oskar Wiksten	9c78b6a2ec	Refactor player combat round methods	2013-08-31 19:21:37 +02:00
Oskar Wiksten	96d451ffbe	Worldmap tile alignment (awesome work by Tomcat!)	2013-08-30 21:04:08 +02:00
Oskar Wiksten	2dfed6847c	Content editor: Display phrase rewards and replies as divs instead of table	2013-08-27 22:54:23 +02:00
Oskar Wiksten	0992053a72	Bugfix: Realign tiles in Fallhaven (thanks Mayweed & Tomcat)	2013-08-24 17:05:38 +02:00
Oskar Wiksten	a1da45ce3f	Refactor: Changed namespaces, reorganized imports.	2013-08-24 13:51:59 +02:00
Oskar Wiksten	89a64bbdea	Content editor: Add support for switching active NPC in dialogue	2013-08-20 20:42:12 +02:00
Oskar Wiksten	06feff98c1	Update Elwyl/Elwel conversation to switch active NPC	2013-08-20 20:42:12 +02:00