OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'permadeath' into nut_arulir_mountain

Browse Source
This commit is contained in:
Gonk
2019-12-01 19:34:55 +01:00
parent 2d2bc41708 6e0a94898c
commit 968b63394f
3 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AndorsTrail/res/layout/heroinfo_stats.xml
View File

@@ -30,7 +30,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/ui_theme_stdframe_bitmap" >
<TableRow>
<TextView
style="@style/traitsinfo_label"
android:text="@string/heroinfo_mode" />
<TextView
android:id="@+id/heroinfo_mode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@android:string/unknownName" />
</TableRow>
<TableRow>
<TextView

25
AndorsTrail/res/values/strings.xml
View File

@@ -45,7 +45,8 @@
<string name="heroinfo_skill_sort">Sort</string>
<string name="heroinfo_levelup">Level up</string>
<string name="heroinfo_level">Level</string>
<string name="heroinfo_totalexperience">Total experience</string>
<string name="heroinfo_mode">Mode</string>
<string name="heroinfo_totalexperience">Total experience</string>
<string name="heroinfo_wornequipment">Worn equipment</string>
<string name="heroinfo_inventory">Inventory</string>
<string name="heroinfo_inventory_categories">Category</string>
@@ -55,13 +56,11 @@
<string name="heroinfo_experiencepoints">Experience points (XP):</string>
<string name="heroinfo_actionpoints">Action points (AP):</string>
<string name="heroinfo_quests">Quests</string>
<string name="heroinfo_unlimited_lives_and_saves">unlimited lives and saves</string>
<string name="heroinfo_unlimited_lives">unlimited lives</string>
<string name="heroinfo_hardcore_mode">1 life (hardcore mode)</string>
<string name="heroinfo_lives_left">%1$d/%2$d lives left</string>
<string name="heroinfo_unlimited_saves">, unlimited saves</string>
<string name="heroinfo_unlimited_lives_and_saves">Standard\n(Unlimited lives and saves)</string>
<string name="heroinfo_unlimited_lives">Unlimited lives, 1 save</string>
<string name="heroinfo_limited_lives">Limited lives (%1$d/%2$d left)</string>
<string name="heroinfo_one_life">Permadeath (1 life)</string>
<string name="combat_attack">Attack (%1$d AP)</string>
<string name="combat_move">Move (%1$d AP)</string>
@@ -162,12 +161,12 @@
<string name="startscreen_error_loading_empty_slot">Can\'t load from an empty slot.</string>
<string name="startscreen_attention_slot_gets_delete_on_load">Attention</string>
<string name="startscreen_attention_message_slot_gets_delete_on_load">Loading this game deletes its save slot. You will have to save again before switching to another game.</string>
<string name="startscreen_mode_unlimited_saves_and_lives">Unlimited saves and lives</string>
<string name="startscreen_mode_unlimited_lives">Unlimited lives</string>
<string name="startscreen_mode_50_lives">50 lives</string>
<string name="startscreen_mode_10_lives">10 lives</string>
<string name="startscreen_mode_3_lives">3 lives</string>
<string name="startscreen_mode_1_life">1 life (hardcore mode)</string>
<string name="startscreen_mode_unlimited_saves_and_lives">Standard (Unlimited lives and saves)</string>
<string name="startscreen_mode_unlimited_lives">Medium (Unlimited lives, 1 save)</string>
<string name="startscreen_mode_50_lives">Hard (50 lives, 1 save)</string>
<string name="startscreen_mode_10_lives">Very hard (10 lives, 1 save)</string>
<string name="startscreen_mode_3_lives">Extreme (3 lives, 1 save)</string>
<string name="startscreen_mode_1_life">Permadeath (1 life, 1 save)</string>
<!-- <string name="conversation_title">%1$s says</string> -->
<string name="conversation_rewardexp"> [You gained %1$d experience]</string>

35
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
View File

@@ -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());