OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-24 04:16:01 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
6,636 Commits 44 Branches 0 Tags
1165cf3f989b810067687b94de010f0fbf528381
Commit Graph

6636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Wiksten
01e42134e2 Content editor: Do not default items to type "other". 2013-06-05 23:25:04 +02:00
Oskar Wiksten
21fe350280 Better error messages when reading malformed conversations. 2013-06-05 22:12:39 +02:00
Oskar Wiksten
a8b0d5dc49 Add monsters_demon2 to resourceloader. 2013-06-05 22:12:02 +02:00
Oskar Wiksten
82d8ee6280 Content editor: Fix missing reward type when importing conversations. 2013-06-04 20:11:25 +02:00
Oskar Wiksten
3069ab4819 Add bash script for starting editor locally. 2013-06-02 19:59:08 +02:00
Oskar Wiksten
bb953f9512 Minor fixes for reading slightly borked resource files. 2013-05-29 22:04:39 +02:00
Oskar Wiksten
fa8c31e695 Store list of maps in savegames as map<string> instead of indexed list. 
* Do not store maps that have been visited or that have been reset.
* Reduces savegame filesize from ~83k to ~30k.
* Removes dependency on loading maps in a certain order (better for future refactorings).
 2013-05-26 13:40:57 +02:00
Oskar Wiksten
cb6f84d2df Bugfix: Allow conversation options for "Feygard errands" in Vilegard even when the Vilegard quest has not been completed. 2013-05-19 18:16:23 +02:00
Oskar Wiksten
1df5d183dc Bugfix: Apply checks for whether the player can select replies on single "next" replies as well. 2013-05-12 13:14:08 +02:00
Oskar Wiksten
348b74ad7b Added worldmap alignment maps (thanks to Tomcat!) 2013-05-06 23:34:53 +02:00
Oskar Wiksten
53e10680fa Teleports in Throdna's throne room are only accessible by one way. 
* Force the player to step on the sign tile before accessing the teleporters in the BWM throne room.
 2013-04-21 21:05:34 +02:00
Oskar Wiksten
52c7cc5acc Content editor: Add hierarcical view of conversation phrases and replies. 2013-04-06 12:30:07 +02:00
Oskar Wiksten
729a2c98b7 Content editor minor fixes. 2013-04-01 14:50:45 +02:00
Oskar Wiksten
50cd3c20af Content editor: add column to monster table editor to view hit effects. 2013-03-31 18:07:16 +02:00
Oskar Wiksten
a29ebb466b Bugfix: change combat selection when a monster dies from a condition in combat. (thanks to Fala from the forums for finding it!) 2013-03-29 22:55:53 +01:00
Oskar Wiksten
bb314eea66 Raise taunt chance to 75%. 2013-03-29 22:44:27 +01:00
Oskar Wiksten
c8de0c8f77 Minor bugfixes to resource loaders 
* Fail harder when TileManager hasn't allocated enough tiles for the preloaded icons.
* Minor tweak to misplaced tile on hauntedhouse3
* Weaken "strength" condition (prefer to control effect through magnitude instead)
* Load icons for "items_weapons_2".
* Do not require items to have "base market cost" (for example, when they are automatically priced)
 2013-03-29 20:03:33 +01:00
Oskar Wiksten
84d01e1aed Content editor: Add "previous"/"next" buttons in editors for items, monsters and actor conditions. 2013-03-27 20:15:02 +01:00
Oskar Wiksten
dd51f5de6c Updates to content editor 
* Do not reset store prices on items when changing between manual and automatic pricing.
* Correct urls on import/export pages to where the files are placed.
* Show indications in item table editor on effects that cause actor conditions.
 2013-03-27 19:35:56 +01:00
Oskar Wiksten
5cb762113d Added more monster icons from the TomeTik set. 2013-03-17 14:28:16 +01:00
Oskar Wiksten
993ec1d194 Conste editor: Add "Add" button at the bottom of the table editor. 2013-03-16 13:13:13 +01:00
Oskar Wiksten
11c301a24c Content editor: Remember displayed columns in table editors when changing pages. 2013-03-16 12:29:53 +01:00
Oskar Wiksten
9a5cf33108 Add automatic cost calculations for items that have hit- or kill-stats that affect HP or AP. 2013-03-16 10:38:19 +01:00
Oskar Wiksten
c2de054cf5 Add automatic cost calculations for items that have "increase use item cost" or "increase reequip cost"-stats. 2013-03-16 10:00:28 +01:00
Oskar Wiksten
bea69f06bf Content editor: Only enable item's "has equip effects" if the item category is wearable. 2013-03-16 09:45:15 +01:00
Oskar Wiksten
626c558335 Content editor: Move reusable logic functions for calculating item cost & monster exp to separate js file. 2013-03-16 09:45:14 +01:00
Oskar Wiksten
73efe5e62b Content editor: Change name of js libraries folder "inc"->"lib". Add favicon image. Close icon selector dialog by pressing escape button. 2013-03-16 09:45:13 +01:00
Oskar Wiksten
7d09202329 Bugfix content editor: treat number fields as numbers (and not strings) when calculating monster experience. 2013-03-10 13:40:42 +01:00
Oskar Wiksten
24c15a798a Bugfix: Read critical multiplier for weapons as float instead of int. 2013-03-10 13:18:18 +01:00
Oskar Wiksten
eb3f3f989d Bugfix: When exporting strings that start with a number (such as "2hsword"), only do integer conversion in the resulting JSON if the whole value is a number. 2013-03-09 23:45:38 +01:00
Oskar Wiksten
1cc20839ff Added some tiles for crates and stairs, from opengameart.org. 2013-02-24 18:18:37 +01:00
Oskar Wiksten
07bbe7dd9e Added lots of new tiles for monsters, items and effects from opengameart.org. 2013-02-24 17:25:23 +01:00
Oskar Wiksten
cc4827b1bd Refactor conversations to state machine - Move responsibility for starting combat & removing npcs from map from MainActivity into the ConversationController. 2013-02-22 14:10:05 +01:00
Oskar Wiksten
9fd5508070 Refactor conversations to state machine - minor bugfixes for "next" button disabling. 2013-02-22 14:09:31 +01:00
Oskar Wiksten
2da410118e Only notify rewards in conversation if there actually are any. 2013-02-22 12:14:59 +01:00
Oskar Wiksten
e965afc699 WIP move conversation logic to ConversationStatemachine - bugfix for selecting replies with requirements. 2013-02-21 14:29:25 +00:00
Oskar Wiksten
37ae3b6c69 WIP moving conversation flow logic from Activity to testable state machine. 2013-02-20 16:07:01 +00:00
Oskar Wiksten
6261c499ff Renamed "ViewContext" -> "ControllerContext" to better reflect its responsibility. 2013-02-20 15:30:53 +00:00
Oskar Wiksten
f5ff29a0fe Refactored results of phrase rewards, in preparation of displaying more results when gaining rewards. 2013-02-18 07:43:38 +00:00
Oskar Wiksten
24ab3b95f0 Updated IntelliJ Idea project file to work with any Android API version. 2013-02-15 15:14:49 +00:00
Oskar Wiksten
8575e89dee Update R.layout.inventoryitemview to a single TextView instead of a combined ImageView & TextView. 2013-02-15 12:04:05 +00:00
Oskar Wiksten
9bb1e73f07 Reduce compilation warnings from code inspection rules. 
(Reduce visibilities to private, add final where applicable)
 2013-02-15 09:59:57 +00:00
Oskar Wiksten
59df54f1bb Remove compilation warnings about showDialog() and removeDialog() being deprecated. 2013-02-15 07:50:45 +00:00
Oskar Wiksten
a8b21461de Minor refactoring CombatController. 2013-02-14 14:57:40 +00:00
Oskar Wiksten
f16cfa3ab0 Remove compilation warnings about "new BitmapDrawable(Bitmap)" being deprecated. 2013-02-14 14:57:00 +00:00
Oskar Wiksten
d2428ad36c Add IntelliJ Idea project file. 
Add Android v4 support library.
 2013-02-14 14:47:46 +00:00
Oskar Wiksten
91015e5ea7 Rearrange .gitignore. 2013-02-14 14:47:09 +00:00
Oskar Wiksten
668993c01b Add clear() method to event listener queues. 2013-02-13 15:31:11 +00:00
Oskar Wiksten
2bc06041ad Remove trailing spaces in some conversation phrase texts. 2013-02-12 13:58:46 +00:00
Oskar Wiksten
fb45d7e372 Add support for "description" field on items, for lore/background text that should be displayed on the item. 2013-02-11 11:10:00 +00:00