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

Fixed narrator messages being greyed out as rewards.

Browse Source
This commit is contained in:
Zukero
2018-02-12 22:06:16 +01:00
parent 27a2a87949
commit 153ea0a660
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
View File

@@ -223,8 +223,10 @@ public final class ConversationActivity
} else {
conversation.nameColor = oldNPCNameColor;
}
}else{
} else if (conversation.isReward) {
conversation.textColor = oldRewardColor;
} else {
conversation.textColor = oldPhraseColor;
}
numberOfNewMessage--;
}
@@ -240,12 +242,12 @@ public final class ConversationActivity
} else {
if (rb == null) return;
Reply r = (Reply) rb.getTag();
addConversationStatement(player, rb.getText().toString(), playerPhraseColor);
addConversationStatement(player, rb.getText().toString(), playerPhraseColor, false);
conversationState.playerSelectedReply(getResources(), r);
}
}
private void addConversationStatement(Actor actor, String text, int textColor) {
private void addConversationStatement(Actor actor, String text, int textColor, boolean isReward) {
ConversationStatement s = new ConversationStatement();
if (actor != null) {
s.iconID = actor.iconID;
@@ -257,6 +259,7 @@ public final class ConversationActivity
s.nameColor = actor == player ? playerNameColor : NPCNameColor;
s.textColor = textColor;
s.isPlayerActor = actor != null && actor == player;
s.isReward = isReward;
conversationHistory.add(s);
numberOfNewMessage++;
statementList.clearFocus();
@@ -280,6 +283,7 @@ public final class ConversationActivity
public int nameColor;
public int textColor;
public boolean isPlayerActor;
public boolean isReward;
public boolean hasActor() {
return iconID != NO_ICON;
@@ -296,6 +300,7 @@ public final class ConversationActivity
dest.writeInt(nameColor);
dest.writeInt(textColor);
dest.writeByte((byte) (isPlayerActor ? 1 : 0));
dest.writeByte((byte) (isReward ? 1 : 0));
}
@SuppressWarnings("unused")
@@ -309,6 +314,7 @@ public final class ConversationActivity
result.nameColor = in.readInt();
result.textColor = in.readInt();
result.isPlayerActor = in.readByte() == 1;
result.isReward = in.readByte() == 1;
return result;
}
@@ -375,7 +381,7 @@ public final class ConversationActivity
@Override
public void onTextPhraseReached(String message, Actor actor, String phraseID) {
addConversationStatement(actor, message, NPCPhraseColor);
addConversationStatement(actor, message, NPCPhraseColor, false);
}
@Override
@@ -411,7 +417,7 @@ public final class ConversationActivity
}
private void addRewardMessage(String text) {
addConversationStatement(null, text, rewardColor);
addConversationStatement(null, text, rewardColor, true);
}
@Override