From b9b68f2aa6cb892a9531aa2b69b16d610358f0dd Mon Sep 17 00:00:00 2001 From: juh9870 Date: Mon, 13 Sep 2021 22:03:11 +0300 Subject: [PATCH] v1.0.1 --- build.gradle | 4 ++-- .../shatteredpixeldungeon/Challenges.java | 2 +- .../shatteredpixeldungeon/Dungeon.java | 12 ++++++------ .../ui/changelist/Cruel_Changes.java | 18 ++++++++++++++++++ .../windows/WndGameInProgress.java | 2 +- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index e590afd65..d47048767 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,8 @@ allprojects { appName = 'Too Cruel Pixel Dungeon' appPackageName = 'ua.dreamfools.toocruelpixeldungeon' - appVersionCode = 574 - appVersionName = '1.0.0' + appVersionCode = 575 + appVersionName = '1.0.1' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Challenges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Challenges.java index 188ab3943..11f0160c8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Challenges.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Challenges.java @@ -431,7 +431,7 @@ private void deck(Generator.Category category, boolean enabled) { SLIDING(91,5,-7f), //endregion - //Last id 90 + //Last id 91 ; private static final Challenges[] mappings; public static int LEVEL_LIMIT = 3; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java index 76daafac2..a492feed9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java @@ -210,9 +210,9 @@ public static void init() { Generator.Category.hardReset(); - if(DeviceCompat.isDebug()){ - seed = 2592635102693L; - } +// if(DeviceCompat.isDebug()){ +// seed = 2592635102693L; +// } modifiers = SPDSettings.modifiers(); extraData.init(); @@ -222,9 +222,9 @@ public static void init() { challengesInform = true; } - if(DeviceCompat.isDebug()){ - modifiers.fromBigIntString("7ahfotpexdcapupz4"); - } +// if(DeviceCompat.isDebug()){ +// modifiers.fromBigIntString("7ahfotpexdcapupz4"); +// } SPDSettings.modifiers(new Modifiers(modifiers).setDynasty("")); Actor.clear(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/Cruel_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/Cruel_Changes.java index 536ea2fea..69f089ae8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/Cruel_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/Cruel_Changes.java @@ -73,6 +73,23 @@ public static void add_v1_0_0_Changes(ArrayList changeInfos) { changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); + + changes = new ChangeInfo("v1.0.1", false, ""); + changes.hardlight(Window.TITLE_COLOR); + changeInfos.add(changes); + changes.addButton(new ChangeButton(Icons.get(Icons.CHALLENGE_HELL2), "Challenges", + "_-_ Added 1 new modifier\n" + + "_-_ Reworked/nerfed Summoning Champion\n" + + "_-_ Nerfed Stone champion\n" + + "_-_ Nerfed swarm/swarming champions interactions with champion titles" + + "_-_ Champions can no longer reduce received damage to 0 when attacked by a hero\n" + + "_-_ Fixed typos in challenges descriptions" + )); + + changes.addButton(new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + "_-_ Fixed various of crashes caused by recent code optimizations" + )); + changes = new ChangeInfo(Messages.get(ChangesScene.class, "changes"), false, null); changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); @@ -85,6 +102,7 @@ public static void add_v1_0_0_Changes(ArrayList changeInfos) { "_-_ Added 5 new challenges and 2 modifiers\n" + "_-_ Added 3 new champion titles and 3 new elite champion titles\n" + "_-_ Limited Revenge Rage attack bonus to _Over 9000!_\n" + + "_-_ Champions are now using deck-based spawning system\n" + "_-_ Tweaked Korean MMO again..." )); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java index fdd89bc22..92ade5b3e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java @@ -82,7 +82,7 @@ protected boolean onLongClick() { Bundle bundle = FileUtils.bundleFromFile(GamesInProgress.gameFile(slot)); ShatteredPixelDungeon.scene().addToFront(new WndMessage("_Debug Info:_\n\n" + "Version: " + Game.version + " (" + Game.versionCode + ")\n" + - "Seed: " + bundle.getLong("seed") + "\n" + + "Seed: " + Long.toString(bundle.getLong("seed"),36) + "\n" + "Challenges: " + Challenges.displayString(info.modifiers.challenges))); } catch (IOException ignored) { } return true;