From 195b8eb5f97d092e14427185d8c5fd2c5babc492 Mon Sep 17 00:00:00 2001 From: Carceris Magister Date: Wed, 16 Aug 2017 21:00:20 -0400 Subject: [PATCH 02/96] Improved Mikhail's initial dialog with more context and to avoid repeating opening monologue (info still available when character asks.) --- .../res/raw/conversationlist_mikhail.json | 106 +++++++++++++++++- 1 file changed, 104 insertions(+), 2 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_mikhail.json b/AndorsTrail/res/raw/conversationlist_mikhail.json index 1359ac8fe..c9597772f 100644 --- a/AndorsTrail/res/raw/conversationlist_mikhail.json +++ b/AndorsTrail/res/raw/conversationlist_mikhail.json @@ -59,7 +59,7 @@ "id":"mikhail_start_select_default", "replies":[ { - "nextPhraseID":"mikhail_visited", + "nextPhraseID":"mikhail_default", "requires":[ { "requireType":"questProgress", @@ -114,9 +114,73 @@ "id":"mikhail_default", "message":"Anything else I can help you with?", "replies":[ + { + "text":"Do you have any more tasks for me?", + "nextPhraseID":"mikhail_all_tasks_done", + "requires":[ + { + "requireType":"questProgress", + "requireID":"mikhail_bread", + "value":100 + }, + { + "requireType":"questProgress", + "requireID":"mikhail_rats", + "value":100 + } + ] + }, + { + "text":"Do you have any more tasks for me?", + "nextPhraseID":"mikhail_bread_done", + "requires":[ + { + "requireType":"questProgress", + "requireID":"mikhail_bread", + "value":100 + }, + { + "requireType":"questProgress", + "requireID":"mikhail_rats", + "value":100, + "negate":"true" + } + ] + }, + { + "text":"Do you have any more tasks for me?", + "nextPhraseID":"mikhail_rats_done", + "requires":[ + { + "requireType":"questProgress", + "requireID":"mikhail_bread", + "value":100, + "negate":"true" + }, + { + "requireType":"questProgress", + "requireID":"mikhail_rats", + "value":100 + } + ] + }, { "text":"Do you have any tasks for me?", - "nextPhraseID":"mikhail_tasks" + "nextPhraseID":"mikhail_tasks", + "requires":[ + { + "requireType":"questProgress", + "requireID":"mikhail_bread", + "value":100, + "negate":"true" + }, + { + "requireType":"questProgress", + "requireID":"mikhail_rats", + "value":100, + "negate":"true" + } + ] }, { "text":"Is there anything else you can tell me about Andor?", @@ -142,6 +206,44 @@ } ] }, + { + "id":"mikhail_bread_done", + "message":"Thanks for getting me the bread. There are still the rats.", + "replies":[ + { + "text":"What about the rats?", + "nextPhraseID":"mikhail_rats_select" + }, + { + "text":"Never mind, let's talk about the other things.", + "nextPhraseID":"mikhail_default" + } + ] + }, + { + "id":"mikhail_rats_done", + "message":"Thanks for taking care of the rats. I'd still love some bread.", + "replies":[ + { + "text":"What about the bread?", + "nextPhraseID":"mikhail_bread_select" + }, + { + "text":"Never mind, let's talk about the other things.", + "nextPhraseID":"mikhail_default" + } + ] + }, + { + "id":"mikhail_all_tasks_done", + "message":"Not for now. Thanks for taking care of the bread and rats.", + "replies":[ + { + "text":"Never mind, let's talk about the other things.", + "nextPhraseID":"mikhail_default" + } + ] + }, { "id":"mikhail_andor1", "message":"As I said, Andor went out yesterday and hasn't been back since. I'm starting to worry about him. Please go look for your brother, he said he would only be out a short while.", From 8f8bcf8a6c097c073e7cc180b64948febce5067f Mon Sep 17 00:00:00 2001 From: Carceris Magister Date: Fri, 18 Aug 2017 22:47:49 -0400 Subject: [PATCH 03/96] Use proper JSON boolean for negate statements --- AndorsTrail/res/raw/conversationlist_mikhail.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_mikhail.json b/AndorsTrail/res/raw/conversationlist_mikhail.json index c9597772f..37e7471c6 100644 --- a/AndorsTrail/res/raw/conversationlist_mikhail.json +++ b/AndorsTrail/res/raw/conversationlist_mikhail.json @@ -143,7 +143,7 @@ "requireType":"questProgress", "requireID":"mikhail_rats", "value":100, - "negate":"true" + "negate":true } ] }, @@ -155,7 +155,7 @@ "requireType":"questProgress", "requireID":"mikhail_bread", "value":100, - "negate":"true" + "negate":true }, { "requireType":"questProgress", @@ -172,13 +172,13 @@ "requireType":"questProgress", "requireID":"mikhail_bread", "value":100, - "negate":"true" + "negate":true }, { "requireType":"questProgress", "requireID":"mikhail_rats", "value":100, - "negate":"true" + "negate":true } ] }, From d4e82b4e683b26f666a456b6ef97617382fead63 Mon Sep 17 00:00:00 2001 From: Scott Devaney Date: Thu, 28 Sep 2017 14:14:40 -0400 Subject: [PATCH 04/96] First readme for AT Readme v0.1 --- readme.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 readme.md diff --git a/readme.md b/readme.md new file mode 100644 index 000000000..63fc14619 --- /dev/null +++ b/readme.md @@ -0,0 +1,61 @@ +# Andor's Trail + +Andor's Trail is a single-player quest-driven roguelike fantasy dungeon crawler RPG with a powerful story. + +Uncover the truths about your home village and the disappearance of your brother. Battle fierce monsters, gain experience and levels. Solve quests, find hidden treasures and improve your equipment. + +## News/Updates + +[Latest project status](https://andorstrail.com/viewtopic.php?f=5&t=5506) + +## Contributing + +Please read [here](https://andorstrail.com/viewtopic.php?f=6&t=4560) for details on how to contribute, and the process for submitting any content. + +### Andor's Trail Content Studio +A Win/Mac/Linux content creator/editor available [here](https://andorstrail.com/viewtopic.php?f=6&t=4806). + +## APK Downloads + +Latest version of APK available from: + +[Google Play Store](https://play.google.com/store/apps/details?id=com.gpl.rpg.AndorsTrail) + +[F-Droid](https://f-droid.org/packages/com.gpl.rpg.AndorsTrail/) + +[Our Server](https://andorstrail.com/static/AndorsTrail_v0.7.1.apk) + +## Authors + +* **Oksar Wiksten** - *Creator* [Github Profile](https://github.com/oskarwiksten/) + +* **Kevin (Zukero)** - *Lead Developer* [Github Profile](https://github.com/Zukero/) + + + +## License + +### Code +Andor's Trail code is released under GNU GPL v2. +### Content +Andor's Trail gameplay content is copyright by their respective authors and has only been licensed for use in Andor's Trail. +### Graphics +Most of the graphical resources are licensed under some kind of CC sharealike license, as stated on their corresponding pages that we link to (see below). Some are CC or GPL in their original form, but some are not, and Andor's Trail has gotten explicit written approval from the author(s) to use them to this project. If you would like to use some of these resources you will be required to get your own explicit written approval. + +Item tilesets graphics by [Ails](http://ails.deviantart.com/art/420-Pixel-Art-Icons-for-RPG-129892453). + +Some hero graphics by [RedKnight91](http://redknight91.deviantart.com/art/Arena-Game-Sprites-154661559). + +Additional monster graphics by [nacred](http://nacred.deviantart.com/art/Sprite-Sheet-171751308). + +Monster tileset graphics by [RL Tiles](http://rltiles.sourceforge.net/) Part of (or All) the graphic tiles used in this program is the public domain roguelike tileset “RLTiles”. Some of the tiles have been modified by Oskar Wiksten. You can find the original tileset at the link above. + +Some of the graphic data in this software are free game resources distributed by [REFMAP](http://www.tekepon.net/fsm) You must not use the graphic data which is in this software, for the purpose except playing this game. When you want to get these resources, go to the website above. + +Map tilesets graphics partly by [telles0808](http://telles0808.deviantart.com/art/RPG-Maker-VX-RTP-Tileset-159218223). + +## Wiki +Here is our slightly out of date [Wiki](https://www.andorstrail.com/wiki/doku.php?id=andors_trail_wiki). +## Acknowledgments + + From 6052788322519f2b9229cb36ac63390ca47ede50 Mon Sep 17 00:00:00 2001 From: Scott Devaney Date: Thu, 28 Sep 2017 16:41:25 -0400 Subject: [PATCH 05/96] Contributors lists added contributors lists and broke out graphics to another file since it is so long --- contributors.md | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ gfxcontrib.md | 52 ++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 contributors.md create mode 100644 gfxcontrib.md diff --git a/contributors.md b/contributors.md new file mode 100644 index 000000000..a40d38824 --- /dev/null +++ b/contributors.md @@ -0,0 +1,86 @@ +## Andor's Trail Contribution List +**(In alphabetical order)** + +Additional maps by: + - Michael Schmid + - Pete Wheeler +---------- +Additional programming by: + - Ethan Wessel + - Florian Doublet + - Lucas Delvallet + - M.H. Alkotob + - Olivier Dragon + - Olivier Samyn + - Samuel Plentz + - Scott Lund + - Uwe Jugel +---------- +Russian translation by: +- Aleksey Kabanov +- Alexander Zubok +- Dreamer... +- dromoz +- e.solodookhin +- konstmih +- istasman +- Paul Sulemenkov +- shell.andor +---------- +Italian translation by: +- Andrea Luciano Damico +- Joker +- k6blue +- liogiu +---------- + French translation by: +- LeSanglier +- Marwane K. +- Misty Soul +- olivier +- zorun.42 +---------- +German translation by: +- Bomber +- Samuel Plentz +- cngunners14 +- Phoenixor +- Tutar +- Mütze +---------- +English proofreading by: +- taws34 +- Elyon +---------- +English proofreading and testing by: +- Stephen Stalnaker +---------- +Hebrew translation by: +- eitanbm +---------- +Portuguese(PT) translation by: +- mira +---------- +Portuguese(BR) translation by: +- Mauro Carvalho Chehab +---------- +Japanese translation by: +- surgecurrent +---------- +Polish translation by: + - DanielS + - Piotr Wieczorek +- siemens +- tobik9090 +---------- +Forum moderated by: +- Brent May +- Josh Kloos +- Matthew B. White (Nyktos) +- Tim Davis +- Travis Miller +---------- +Additional ideas and content by: +- Nicholas Franks (Taledus) +- Tom Jobes +- Stan Meirerion diff --git a/gfxcontrib.md b/gfxcontrib.md new file mode 100644 index 000000000..f39582517 --- /dev/null +++ b/gfxcontrib.md @@ -0,0 +1,52 @@ +## Graphics Contributors +Most of the graphical resources are licensed under some kind of CC sharealike license, as stated on their corresponding pages that we link to (see below). Some are CC or GPL in their original form, but some are not, and Andor's Trail has gotten explicit written approval from the author(s) to use them to this project. If you would like to use some of these resources you will be required to get your own explicit written approval. + +Item tilesets graphics by [Ails](http://ails.deviantart.com/art/420-Pixel-Art-Icons-for-RPG-129892453). + +Some hero graphics by [RedKnight91](http://redknight91.deviantart.com/art/Arena-Game-Sprites-154661559). + +Additional monster graphics by [nacred](http://nacred.deviantart.com/art/Sprite-Sheet-171751308). + +Monster tileset graphics by [RL Tiles](http://rltiles.sourceforge.net/) Part of (or All) the graphic tiles used in this program is the public domain roguelike tileset “RLTiles”. Some of the tiles have been modified by Oskar Wiksten. You can find the original tileset at the link above. + +Some of the graphic data in this software are free game resources distributed by [REFMAP](http://www.tekepon.net/fsm) You must not use the graphic data which is in this software, for the purpose except playing this game. When you want to get these resources, go to the website above. + +Map tilesets graphics partly by [telles0808](http://telles0808.deviantart.com/art/RPG-Maker-VX-RTP-Tileset-159218223). + +Meway, Len Pabin, Auran, Silviyius [Item Icons](https://opengameart.org/content/whispers-of-avalon-item-icons) + +Stephen Challener (Redshrike) [Enemies](https://opengameart.org/content/10-basic-rpg-enemies) and [more](https://opengameart.org/content/more-rpg-enemies) + +Jorge.Avila [Skull](https://opengameart.org/content/skull) + +Gwes [Items](https://opengameart.org/content/dark-fantasy-item-sprites) + +David Gervais [Additional Graphics](http://pousse.rapiere.free.fr/tome/) + +turin [Additional Graphics](http://forums.wesnoth.org/viewtopic.php?f=19&t=12207&start=75) + +artisticdude [Zombie Skeletons](https://opengameart.org/content/zombies-skeletons) + +Mindflayer/Necroleachate [Additional Graphics](http://pixelhack.blogspot.com/) + +Artur Reterski [Item Set](https://opengameart.org/content/items-set) + +Daniel Eddeland [Tileset](https://opengameart.org/content/farming-tilesets-magic-animations-and-ui-elements) + +Lanea Zimmerman (AKA Sharm) [Tileset](https://opengameart.org/content/liberated-pixel-cup-base-assets-sprites-map-tiles) + +Gnome icon artists [Additional Graphics](http://art.gnome.org/themes/icon) + +Paladin-Cleric of Awesome [Additional Graphics](http://forums.rpgmakerweb.com/index.php?/topic/5434-its-a-mad-mad-mad-mad-world-maddies-edits-and-clumping/) + +Ayene-chan [Tileset](https://ayene-chan.deviantart.com/gallery/32324562/RPG-Maker) + +Mack [Tileset](https://vxresource.wordpress.com/2010/03/17/the-real-macks-tileset/) + +Avery, Gits [Tileset](https://forums.rpgmakerweb.com/index.php?threads/amazing-avys-awesome-arrrpg-maker-stuff.9178/) + +DeBray Bailey + +Karvis + +vxresource [Tileset](https://vxresource.wordpress.com/category/resources/tilesets/) (This website shares tiles with the general public for free with the agreement of their original creators.) From 3841e00c3aaef61842d34135c57244a26d332e35 Mon Sep 17 00:00:00 2001 From: Scott Devaney Date: Thu, 28 Sep 2017 16:53:30 -0400 Subject: [PATCH 06/96] Updated readme v0.2 Broke out gfx and additional contribs to their own file. Added additional Authors --- readme.md | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/readme.md b/readme.md index 63fc14619..730e01880 100644 --- a/readme.md +++ b/readme.md @@ -28,31 +28,21 @@ Latest version of APK available from: ## Authors * **Oksar Wiksten** - *Creator* [Github Profile](https://github.com/oskarwiksten/) - * **Kevin (Zukero)** - *Lead Developer* [Github Profile](https://github.com/Zukero/) +* **Scott Devaney** - *Community Advocate* [Game Forums](https://andorstrail.com) +* **Richard Jackson** - *Lead Content Wrangler* +* **Ian Hasse** - *Lead Cartographer* - - -## License +### Contributors List +Additional contributors to the project are listed [here](andors-trail-1/contributors.md). +## Licenses ### Code Andor's Trail code is released under GNU GPL v2. ### Content Andor's Trail gameplay content is copyright by their respective authors and has only been licensed for use in Andor's Trail. ### Graphics -Most of the graphical resources are licensed under some kind of CC sharealike license, as stated on their corresponding pages that we link to (see below). Some are CC or GPL in their original form, but some are not, and Andor's Trail has gotten explicit written approval from the author(s) to use them to this project. If you would like to use some of these resources you will be required to get your own explicit written approval. - -Item tilesets graphics by [Ails](http://ails.deviantart.com/art/420-Pixel-Art-Icons-for-RPG-129892453). - -Some hero graphics by [RedKnight91](http://redknight91.deviantart.com/art/Arena-Game-Sprites-154661559). - -Additional monster graphics by [nacred](http://nacred.deviantart.com/art/Sprite-Sheet-171751308). - -Monster tileset graphics by [RL Tiles](http://rltiles.sourceforge.net/) Part of (or All) the graphic tiles used in this program is the public domain roguelike tileset “RLTiles”. Some of the tiles have been modified by Oskar Wiksten. You can find the original tileset at the link above. - -Some of the graphic data in this software are free game resources distributed by [REFMAP](http://www.tekepon.net/fsm) You must not use the graphic data which is in this software, for the purpose except playing this game. When you want to get these resources, go to the website above. - -Map tilesets graphics partly by [telles0808](http://telles0808.deviantart.com/art/RPG-Maker-VX-RTP-Tileset-159218223). +The graphics licenses and contributions can be found [here](andors-trail-1/gfxcontrib.md). ## Wiki Here is our slightly out of date [Wiki](https://www.andorstrail.com/wiki/doku.php?id=andors_trail_wiki). From b7fe6864d32b2c8277b7f34d8c4099ef3abf7426 Mon Sep 17 00:00:00 2001 From: Scott Devaney Date: Thu, 28 Sep 2017 16:59:07 -0400 Subject: [PATCH 07/96] fix relative links --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 730e01880..dc0904fce 100644 --- a/readme.md +++ b/readme.md @@ -34,7 +34,7 @@ Latest version of APK available from: * **Ian Hasse** - *Lead Cartographer* ### Contributors List -Additional contributors to the project are listed [here](andors-trail-1/contributors.md). +Additional contributors to the project are listed [here](/contributors.md). ## Licenses ### Code @@ -42,7 +42,7 @@ Andor's Trail code is released under GNU GPL v2. ### Content Andor's Trail gameplay content is copyright by their respective authors and has only been licensed for use in Andor's Trail. ### Graphics -The graphics licenses and contributions can be found [here](andors-trail-1/gfxcontrib.md). +The graphics licenses and contributions can be found [here](/gfxcontrib.md). ## Wiki Here is our slightly out of date [Wiki](https://www.andorstrail.com/wiki/doku.php?id=andors_trail_wiki). From 597f90da218662811d7ac8b28b17e9a2803c165c Mon Sep 17 00:00:00 2001 From: Scott Devaney Date: Thu, 28 Sep 2017 17:02:17 -0400 Subject: [PATCH 08/96] fix last of relative links --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index dc0904fce..0a0356c47 100644 --- a/readme.md +++ b/readme.md @@ -47,5 +47,5 @@ The graphics licenses and contributions can be found [here](/gfxcontrib.md). ## Wiki Here is our slightly out of date [Wiki](https://www.andorstrail.com/wiki/doku.php?id=andors_trail_wiki). ## Acknowledgments - +Additional shout-outs. From afadac0f2f41428d2a77c77c672c5dd87259d89d Mon Sep 17 00:00:00 2001 From: Zukero Date: Mon, 2 Oct 2017 18:24:05 +0200 Subject: [PATCH 09/96] NPCs don't need to be aggressive to "pathfind" the player anymore. --- .../rpg/AndorsTrail/controller/MonsterMovementController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java index f31fd7c62..145a4aca4 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java @@ -108,7 +108,7 @@ public final class MonsterMovementController implements EvaluateWalkable { } private void determineMonsterNextPosition(Monster m, MonsterSpawnArea area, Coord playerPosition) { - if (m.isAgressive()) { +// if (m.isAgressive()) { boolean searchForPath = false; if (m.getMovementAggressionType() == MonsterType.AggressionType.protectSpawn) { if (area.area.contains(playerPosition)) searchForPath = true; @@ -118,7 +118,7 @@ public final class MonsterMovementController implements EvaluateWalkable { if (searchForPath) { if (findPathFor(m, playerPosition)) return; } - } +// } // Monster is moving in a straight line. m.nextPosition.topLeft.set( From 716b96b6245d065ee55d956272ea9bbf2422073e Mon Sep 17 00:00:00 2001 From: Zukero Date: Mon, 2 Oct 2017 19:04:27 +0200 Subject: [PATCH 10/96] Even a NPC with a 1x1 spawn area can track a player down. --- AndorsTrail/res/raw/monsterlist_debug.json | 2 ++ .../controller/MonsterMovementController.java | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/AndorsTrail/res/raw/monsterlist_debug.json b/AndorsTrail/res/raw/monsterlist_debug.json index 81dcb97d8..bfad50ac0 100644 --- a/AndorsTrail/res/raw/monsterlist_debug.json +++ b/AndorsTrail/res/raw/monsterlist_debug.json @@ -13,6 +13,7 @@ "attackChance": 50, "droplistID": "debugshop1", "phraseID": "debugshop", + "movementAggressionType":"wholeMap", "attackDamage": { "min": 1, "max": 2 @@ -85,6 +86,7 @@ "attackCost": 10, "attackChance": 50, "droplistID": "debuglist1", + "movementAggressionType":"wholeMap", "attackDamage": { "min": 1, "max": 2 diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java index 145a4aca4..2759de0bb 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java @@ -76,15 +76,7 @@ public final class MonsterMovementController implements EvaluateWalkable { PredefinedMap map = world.model.currentMap; LayeredTileMap tileMap = world.model.currentTileMap; m.nextActionTime = System.currentTimeMillis() + getMillisecondsPerMove(m); - if (m.movementDestination == null) { - // Monster has waited and should start to move again. - m.movementDestination = new Coord(m.position); - if (Constants.rnd.nextBoolean()) { - m.movementDestination.x = area.area.topLeft.x + Constants.rnd.nextInt(area.area.size.width); - } else { - m.movementDestination.y = area.area.topLeft.y + Constants.rnd.nextInt(area.area.size.height); - } - } else if (m.position.equals(m.movementDestination)) { + if (m.movementDestination != null && m.position.equals(m.movementDestination)) { // Monster has been moving and arrived at the destination. cancelCurrentMonsterMovement(m); } else { @@ -119,7 +111,17 @@ public final class MonsterMovementController implements EvaluateWalkable { if (findPathFor(m, playerPosition)) return; } // } - + + // Monster has waited and should start to move again. + if (m.movementDestination == null) { + m.movementDestination = new Coord(m.position); + if (Constants.rnd.nextBoolean()) { + m.movementDestination.x = area.area.topLeft.x + Constants.rnd.nextInt(area.area.size.width); + } else { + m.movementDestination.y = area.area.topLeft.y + Constants.rnd.nextInt(area.area.size.height); + } + } + // Monster is moving in a straight line. m.nextPosition.topLeft.set( m.position.x + sgn(m.movementDestination.x - m.position.x) From 8667e925f39994c60373a29b7fecb9e1e220d4ff Mon Sep 17 00:00:00 2001 From: Zukero Date: Sun, 22 Oct 2017 17:59:18 +0200 Subject: [PATCH 11/96] Simple bug fix where full round triggers incorrectly decreased conditions duration for monsters, while it doesn't for players. --- .../gpl/rpg/AndorsTrail/controller/ActorStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java index 9c70430b3..4759e827d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java @@ -365,7 +365,7 @@ public final class ActorStatsController { return; } - decreaseDurationAndRemoveConditions(monster); + if (!isFullRound) decreaseDurationAndRemoveConditions(monster); } private void applyStatsEffects(Actor actor, boolean isFullRound) { From 29379be41cb3d51a33459bb5321652fdfd514845 Mon Sep 17 00:00:00 2001 From: Zukero Date: Tue, 24 Oct 2017 18:23:45 +0200 Subject: [PATCH 12/96] UI to show actor conditions active on the targeted NPC during battle. --- .../res/anim/hidemonsterconditionbar.xml | 8 + .../res/anim/hidemonsterconditionbutton.xml | 8 + .../res/anim/showmonsterconditionbar.xml | 9 + .../res/anim/showmonsterconditionbutton.xml | 9 + AndorsTrail/res/layout/combatview.xml | 195 +++++++++------- .../res/raw/actorconditions_debug.json | 20 ++ AndorsTrail/res/raw/itemlist_debug.json | 24 +- AndorsTrail/res/values/strings.xml | 1 + .../AndorsTrail/AndorsTrailApplication.java | 4 +- .../AndorsTrail/activity/MainActivity.java | 25 ++- .../resource/tiles/TileManager.java | 212 ++++++++++++++++-- .../gpl/rpg/AndorsTrail/view/CombatView.java | 169 +++++++++++++- .../DisplayActiveActorConditionIcons.java | 56 +++-- 13 files changed, 599 insertions(+), 141 deletions(-) create mode 100644 AndorsTrail/res/anim/hidemonsterconditionbar.xml create mode 100644 AndorsTrail/res/anim/hidemonsterconditionbutton.xml create mode 100644 AndorsTrail/res/anim/showmonsterconditionbar.xml create mode 100644 AndorsTrail/res/anim/showmonsterconditionbutton.xml diff --git a/AndorsTrail/res/anim/hidemonsterconditionbar.xml b/AndorsTrail/res/anim/hidemonsterconditionbar.xml new file mode 100644 index 000000000..7ac9a00c7 --- /dev/null +++ b/AndorsTrail/res/anim/hidemonsterconditionbar.xml @@ -0,0 +1,8 @@ + + diff --git a/AndorsTrail/res/anim/hidemonsterconditionbutton.xml b/AndorsTrail/res/anim/hidemonsterconditionbutton.xml new file mode 100644 index 000000000..a4ca4ac70 --- /dev/null +++ b/AndorsTrail/res/anim/hidemonsterconditionbutton.xml @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/AndorsTrail/res/anim/showmonsterconditionbar.xml b/AndorsTrail/res/anim/showmonsterconditionbar.xml new file mode 100644 index 000000000..2902dc99a --- /dev/null +++ b/AndorsTrail/res/anim/showmonsterconditionbar.xml @@ -0,0 +1,9 @@ + + + diff --git a/AndorsTrail/res/anim/showmonsterconditionbutton.xml b/AndorsTrail/res/anim/showmonsterconditionbutton.xml new file mode 100644 index 000000000..ea004863f --- /dev/null +++ b/AndorsTrail/res/anim/showmonsterconditionbutton.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/AndorsTrail/res/layout/combatview.xml b/AndorsTrail/res/layout/combatview.xml index 16267481e..bf8f10df7 100644 --- a/AndorsTrail/res/layout/combatview.xml +++ b/AndorsTrail/res/layout/combatview.xml @@ -1,93 +1,130 @@ - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" > -