From 6e0a94898cbb71214241fe5b0c022d51be649ab1 Mon Sep 17 00:00:00 2001 From: Gonk Date: Sun, 1 Dec 2019 19:33:25 +0100 Subject: [PATCH] Changed the labeling and display of the play modes --- AndorsTrail/res/layout/heroinfo_stats.xml | 12 +++++++ AndorsTrail/res/values/strings.xml | 25 +++++++------ .../fragment/HeroinfoActivity_Stats.java | 35 ++++++++++--------- 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/AndorsTrail/res/layout/heroinfo_stats.xml b/AndorsTrail/res/layout/heroinfo_stats.xml index 2b9198165..056f42866 100644 --- a/AndorsTrail/res/layout/heroinfo_stats.xml +++ b/AndorsTrail/res/layout/heroinfo_stats.xml @@ -30,7 +30,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/ui_theme_stdframe_bitmap" > + + + + + + Sort Level up Level - Total experience + Mode + Total experience Worn equipment Inventory Category @@ -55,13 +56,11 @@ Experience points (XP): Action points (AP): Quests - unlimited lives and saves - unlimited lives - 1 life (hardcore mode) - %1$d/%2$d lives left - , unlimited saves - + Standard\n(Unlimited lives and saves) + Unlimited lives, 1 save + Limited lives (%1$d/%2$d left) + Permadeath (1 life) Attack (%1$d AP) Move (%1$d AP) @@ -162,12 +161,12 @@ Can\'t load from an empty slot. Attention Loading this game deletes its save slot. You will have to save again before switching to another game. - Unlimited saves and lives - Unlimited lives - 50 lives - 10 lives - 3 lives - 1 life (hardcore mode) + Standard (Unlimited lives and saves) + Medium (Unlimited lives, 1 save) + Hard (50 lives, 1 save) + Very hard (10 lives, 1 save) + Extreme (3 lives, 1 save) + Permadeath (1 life, 1 save) [You gained %1$d experience] diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java index cb811e214..c46c0bcb4 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java @@ -6,6 +6,10 @@ import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.text.SpannableString; +import android.text.SpannableStringBuilder; +import android.text.Spanned; +import android.text.style.RelativeSizeSpan; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -42,6 +46,7 @@ public final class HeroinfoActivity_Stats extends Fragment { private Button levelUpButton; private TextView heroinfo_reequip_cost; private TextView heroinfo_useitem_cost; + private TextView heroinfo_mode; private TextView heroinfo_level; private TextView heroinfo_totalexperience; private TextView basetraitsinfo_max_hp; @@ -76,23 +81,7 @@ public final class HeroinfoActivity_Stats extends Fragment { TextView tv = (TextView) v.findViewById(R.id.heroinfo_title); if (tv != null) { - String description = player.getName() + "\n"; - final Resources res = getResources(); - if (statistics.hasUnlimitedLives() && statistics.hasUnlimitedSaves()) { - description += res.getString(R.string.heroinfo_unlimited_lives_and_saves); - } else if (statistics.hasUnlimitedLives()) { - description += res.getString(R.string.heroinfo_unlimited_lives); - } else { - if (statistics.getStartLives() == 1 && !statistics.hasUnlimitedSaves()) { - description += res.getString(R.string.heroinfo_hardcore_mode); - } else { - description += res.getString(R.string.heroinfo_lives_left, statistics.getLivesLeft(), statistics.getStartLives()); - if (statistics.hasUnlimitedSaves()) { - description += res.getString(R.string.heroinfo_unlimited_saves); - } - } - } - tv.setText(description); + tv.setText(player.getName()); tv.setCompoundDrawablesWithIntrinsicBounds(HeroCollection.getHeroLargeSprite(player.iconID), 0, 0, 0); } heroinfo_container = (ViewGroup) v.findViewById(R.id.heroinfo_container); @@ -102,6 +91,7 @@ public final class HeroinfoActivity_Stats extends Fragment { basetraitsinfo_max_ap = (TextView) v.findViewById(R.id.basetraitsinfo_max_ap); heroinfo_base_reequip_cost = (TextView) v.findViewById(R.id.heroinfo_base_reequip_cost); heroinfo_base_useitem_cost = (TextView) v.findViewById(R.id.heroinfo_base_useitem_cost); + heroinfo_mode = (TextView) v.findViewById(R.id.heroinfo_mode); heroinfo_level = (TextView) v.findViewById(R.id.heroinfo_level); heroinfo_totalexperience = (TextView) v.findViewById(R.id.heroinfo_totalexperience); actorinfo_onhiteffects = (ItemEffectsView) v.findViewById(R.id.actorinfo_onhiteffects); @@ -157,7 +147,18 @@ public final class HeroinfoActivity_Stats extends Fragment { private void updateTraits() { final Resources res = getResources(); + String mode = ""; + if (statistics.hasUnlimitedLives() && statistics.hasUnlimitedSaves()) { + mode = res.getString(R.string.heroinfo_unlimited_lives_and_saves); + } else if (statistics.hasUnlimitedLives()) { + mode = res.getString(R.string.heroinfo_unlimited_lives); + } else if (statistics.getStartLives() == 1) { + mode = res.getString(R.string.heroinfo_one_life); + } else { + mode = res.getString(R.string.heroinfo_limited_lives, statistics.getLivesLeft(), statistics.getStartLives()); + } + heroinfo_mode.setText(mode); heroinfo_level.setText(Integer.toString(player.getLevel())); heroinfo_totalexperience.setText(Integer.toString(player.getTotalExperience())); // heroinfo_ap.update(player.getMaxAP() + "/" + player.getCurrentAP());