Commit Graph

87 Commits

Author SHA1 Message Date
Oskar Wiksten
98d2c89fed Minor map fixes. 2013-06-25 01:02:37 +02:00
Oskar Wiksten
6c03b40262 Updated template.tmx - added "Replace" layer. 2013-06-22 16:21:25 +02:00
Oskar Wiksten
0a9da53930 Revamped looks of crossglen.tmx 2013-06-18 19:59:35 +02:00
Oskar Wiksten
25fe0441c6 Minor map fixes 2013-06-15 20:18:41 +02:00
Oskar Wiksten
4148ff46be Moved spawn areas away from map edges and mapchange areas. 2013-06-15 11:26:53 +02:00
Oskar Wiksten
fac19a1561 Remove "respawn: false" from all tmx files (it's replaced by a property on the monstertype instead). 2013-06-15 11:25:44 +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
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
fbe7312e1c Updated maps from master. 2013-02-03 10:34:17 +01:00
Oskar Wiksten
91fc3a7745 Updated tmx files with new tileset files. 2013-02-03 10:34:16 +01:00
Oskar Wiksten
2ecd64c003 Updated map tileset image files. Updated template.tmx . 2013-02-03 10:31:50 +01:00
Oskar Wiksten
939a406b88 Realign waterway2 & waterway4 on worldmap. 2013-02-03 10:00:01 +01:00
Oskar Wiksten
32be42531b Provide setting to disable confirmation dialog box when overwriting a savegame slot. 2012-10-21 18:26:43 +02:00
Oskar Wiksten
2d8e4eefbf Added sign areas to all graves, with a short message describing each tombstone/cross. 2012-10-13 21:39:04 +02:00
Oskar Wiksten
7aedeae7ba Merge branch 'worldmap'
Conflicts:
	AndorsTrail/res/values/strings.xml
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
2012-10-07 18:17:53 +02:00
Oskar Wiksten
a358fdf344 Provide setting to disable UI animations, such as the combat bar. 2012-10-07 17:25:14 +02:00
Oskar Wiksten
1b2bdfa4e0 Merge fixes from branch v0612maps. 2012-10-07 16:41:23 +02:00
Oskar Wiksten
8be01002eb Added named areas (towns, taverns) to worldmap. 2012-10-07 16:41:23 +02:00
Oskar Wiksten
99cf22814d Separate the worldmap into segments, so that only one segment at a time is displayed. This way, even dungeon maps can be displayed. 2012-10-07 16:41:17 +02:00
Oskar Wiksten
51883dbdf5 WIP on displaying an actual worldmap in-game. 2012-10-07 16:40:43 +02:00
Oskar Wiksten
b9bba7c91b Merge updated maps from branch v0612maps. 2012-08-27 19:42:45 +02:00
Oskar Wiksten
4e472783b2 Several conversation spelling corrections (thanks Mino, Elyon, fiernaq). 2012-07-01 17:58:27 +02:00
Oskar Wiksten
0e047aaa8b Minor map and spelling corrections. 2012-06-14 21:49:05 +02:00
oskar.wiksten
b6f307a774 Minor bugfix for r245.
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@246 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-05-14 19:04:11 +00:00
oskar.wiksten
d11f4b565c Implemented Kaverin's quest in Remgard, continuation on the Vacor/Unzel story (thanks Nyktos, sdevaney!)
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@245 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-05-14 18:49:14 +00:00
oskar.wiksten
cdd944c4ed Updated lots of conversations errors (thanks ctnbeh13!).
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@239 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-05-02 20:29:56 +00:00
oskar.wiksten
e843cc9669 Added droplists to new monsters for v0.6.11.
Added unique monsters that drop Oegyth crystals.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@231 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-04-25 16:18:16 +00:00
oskar.wiksten
47bf498bba Finished major Remgard quest.
Added NPCs to all Remgard maps.
Added conversations to villagers in Remgard.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@230 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-04-25 14:38:05 +00:00
oskar.wiksten
f883abf632 Updated quest text for "Feygard errands" (thanks fiernaq)
Fixed unresolvable quest "Missing pieces" (thanks chaosrunner87)
Adjusted descriptions of "Dark blessing of the Shadow" so that it is more apparent that it can not be upgraded more than 1 level.
Added property to maps that are considered outdoors (will be used for worldmap).
Adjusted tile-loding code so that all available graphics are actually loaded.
Changed colors of "mountain brute" (thanks ctnbeh13)
Added journal fragment in BWM cabin that gives a hint on how to get out of there.
Added sign text to woodcave that hints at a future quest (thanks ctnbeh13)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@228 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-04-17 20:42:42 +00:00
oskar.wiksten
2e11468e9d Corrected some quest texts (thanks fiernaq).
Completed quest "A difference in opinion" for v0.6.11.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@226 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-03-25 14:34:22 +00:00
oskar.wiksten
f498de517c Bugfix for spawning NPCs on top of sign areas (such as for Ulirfendor for the "Dark protector" quest).
Minor conversations in Remgard.
Disable Android Lint errors for building with incomplete translations.
Renamed start of Remgard questline (thanks ctnbeh13).

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@221 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-03-06 20:49:22 +00:00
oskar.wiksten
4551b8b443 English conversation corrections, do not use "patron" to mean "owner" (thanks Grävling)
Some map fixes from issue 177 (thanks Samuel)
Cleanup of misplaced tiles on lots of maps.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@219 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-02-13 21:32:12 +00:00
oskar.wiksten
44d9edb261 Completed the "the dark protector" questline with 500 new lines of conversation, consisting of 3 new quests and a new skill.
Fixed FC issues when returning to the app from another app.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@218 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-02-12 19:45:28 +00:00
oskar.wiksten
441ed05e21 Wider walkways in northern Fallhaven.
Minor cleanup in pwcave* and waytobrimhavencave* maps.
Bugfix: Do not remove other lingering actor conditions when changing equipment (for example, if the player has a condition caused by something else with duration="forever", that condition would be removed when equipping or unequipping an item).

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@217 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-01-15 10:30:08 +00:00
oskar.wiksten
c6599a9009 Updated German translation (thanks Samuel and cngunners14)
Updated Russian translation (thanks e.solodookhin and shell.andor)
Fixed bug with Fallhaven tavern bed (issue 287) (Thanks to Grävling for finding it!)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@213 08aca716-68be-ccc6-4d58-36f5abd142ac
2012-01-06 20:44:17 +00:00
oskar.wiksten
46baf81d8f 215 new lines of dialogue for v0.6.11
37 new items for v0.6.11
Start of 3 new quests for v0.6.11
Tile fixes for waytolake* and mountaincave* maps.
Allow scripted conversation text to contain the player's name (using $playername as placeholder in the text).

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@209 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-12-07 22:10:56 +00:00
oskar.wiksten
9818eb0351 Tweaks to monster spawn rates for v0.6.11.
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@208 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-11-21 22:10:09 +00:00
oskar.wiksten
fb2015f999 Populated monsters on all mountainlake maps for v0.6.11.
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@207 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-11-21 21:40:28 +00:00
oskar.wiksten
53d8f93a71 Added 78 new monsters for v0.6.11.
Populated monsters on 33 new maps.
Started adding new actor conditions for v0.6.11.
Combine visual effect values for effects that are caused every turn, such as poison (issue 268)


git-svn-id: https://andors-trail.googlecode.com/svn/trunk@206 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-11-20 20:20:40 +00:00
oskar.wiksten
2df645b477 Added 54 maps for Remgard, thanks to the excellent work of Ian Haase.
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@205 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-11-16 00:29:57 +00:00
oskar.wiksten
cdb5d97b13 Added waterway- and waytobrimhaven maps for v0.6.11.
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@204 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-11-15 20:25:26 +00:00
oskar.wiksten@gmail.com
58c89023de Update monster HP before running the attack animation.
Spelling corrections to conversations.
Prevent FC when running maploader on maps that have exits that do not specify a destination map (such as south of Prim).
Reuse loaded graphics tiles in shopactivity.
Do not use android.util.Pair (since it's not available in Android v1.6)
Updated German translation (thanks Samuel)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@186 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-10-18 18:02:21 +00:00
oskar.wiksten
5c6d69b895 Added setting "Optimized drawing" to change the behaviour of how the map is redrawn (redraw everything vs. redraw only changed tiles).
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@180 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-10-14 17:24:24 +00:00
oskar.wiksten@gmail.com
8cab1ecdda Fixed tileset naming on waterway- and pwcave maps.
Applied patch from issue 246. (Thanks Samuel)
Added start of Hebrew translation. (Thanks eitanbm)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@168 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-10-07 20:52:12 +00:00
oskar.wiksten@gmail.com
1a9c903ad2 Added additional monster icons.
Populated waterway- and pwcave maps with monsters.
Added selftests to verify that all defined monsters are being used.
Disabled manual saving while in combat (issue 241).

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@165 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-10-05 22:08:54 +00:00
oskar.wiksten
ba2cd2a8b4 275 new lines of dialogue for the new Loneford quest. The Loneford quest is now completable.
Populated most of the quest droplists (shop droplists still left to do).
Fixed issues with the Prim and Blackwater quests, that were never marked as completed under some circumstances in v0.6.9.
Moved tiles on a lot of maps to their correct layer (from "Objects" to "Above" for example)
Added deterministic sort order to quest list.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@164 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-10-02 19:27:46 +00:00
oskar.wiksten@gmail.com
a31a359c3e 500 more lines of dialogue for v0.6.10.
Contents of 3 new quests.
Updated monsters for v0.6.10.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@163 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-09-25 19:31:54 +00:00
oskar.wiksten
dd3f53bbaa Start of 3 new quests for Crossroads and Loneford.
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@162 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-09-19 22:42:16 +00:00
oskar.wiksten
8fdc8b41df Bugfixes to the 4 new quests in crossroads- and fields maps.
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@161 08aca716-68be-ccc6-4d58-36f5abd142ac
2011-09-19 17:52:06 +00:00