OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-16 16:46:35 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Typos, broken links, and one NPE fixed.

Browse Source
This commit is contained in:
Zukero
2015-08-11 17:36:25 +02:00
parent 903564a037
commit 22f8a4827a
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndorsTrail/res/raw/conversationlist_shortcut_lodar.json
View File

@@ -53,6 +53,7 @@
"replies":[
{
"nextPhraseID":"sign_lodar_shortcut_5a",
"text":"N",
"requires":[
{
"negate":true,
@@ -68,7 +69,7 @@
]
},
{
"message":"There is no way to go further. Maybe this has something to do this the stones?",
"message":"There is no way to go further. Maybe this has something to do with the stones?",
"id":"sign_lodar_shortcut_2a",
"rewards":[
{

1
AndorsTrail/res/xml/shortcut_lodar2.tmx
View File

@@ -234,7 +234,6 @@
<property name="Objects" value="Objects_replace"/>
</properties>
</object>
<object name="sign_lodar_shortcut_6" type="sign" x="704" y="384" width="32" height="32"/>
</objectgroup>
<objectgroup name="Spawn" visible="0">
<object name="cavebat1" type="spawn" x="128" y="192" width="160" height="96">

5
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
View File

@@ -376,11 +376,12 @@ public final class CombatController implements VisualEffectCompletedCallback {
handleNextMonsterAction();
return;
}
final Monster movingMonster = currentActiveMonster;
controllers.monsterMovementController.moveMonsterToNextPositionDuringCombat(currentActiveMonster, world.model.currentMap, new VisualEffectController.VisualEffectCompletedCallback(){
@Override
public void onVisualEffectCompleted(int callbackValue) {
combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster);
combatActionListeners.onMonsterMovedDuringCombat(movingMonster);
handleNextMonsterAction();
}
});