From 6c1e780701afe8516691115d9924dc4dcf56c00f Mon Sep 17 00:00:00 2001
From: julian <julian.mutter@comumail.de>
Date: Sat, 7 Jul 2018 11:17:32 +0200
Subject: [PATCH] Mushroom now at lv 8

---
 .gitignore                                      |  4 +++-
 .../endlessroll/entities/tools/ToolType.java    | 17 +++++++++--------
 .../endlessroll/user/LevelUpBounties.java       | 10 +++++-----
 app/src/main/res/layout/game.xml                |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index b83796c..556b32b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@
 .DS_Store
 /build
 /captures
-/app/build
\ No newline at end of file
+/app/build
+/app/release
+*.iml
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
index 2f2548c..264d61a 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
@@ -30,15 +30,15 @@ public enum ToolType {
             R.drawable.tools_magnet_button, 22, 2, 5,
             new ToolUpgrade(ToolUpgradeType.COOLDOWN, 5000, 3000),
             new ToolUpgrade(ToolUpgradeType.FORCE, 100, 500)),
-    POWER_MUSHROOM(R.string.tool_name_power_mushroom, R.string.tool_description_power_mushroom,
-            R.drawable.tools_power_mushroom, R.drawable.tools_power_mushroom_button, 50,
-            5, 7, new ToolUpgrade(ToolUpgradeType.COOLDOWN, 15000, 11000),
-            new ToolUpgrade(ToolUpgradeType.DURATION, 5000, 10000)),
     STASIS(R.string.tool_name_stasis, R.string.tool_description_stasis, R.drawable.tools_stasis,
             R.drawable.tools_stasis_button, 27, 4, 6,
             new ToolUpgrade(ToolUpgradeType.COOLDOWN, 6000, 4000),
             new ToolUpgrade(ToolUpgradeType.FORCE, 1, 2),
-            new ToolUpgrade(ToolUpgradeType.SIZE, 100, 200));
+            new ToolUpgrade(ToolUpgradeType.SIZE, 100, 200)),
+    POWER_MUSHROOM(R.string.tool_name_power_mushroom, R.string.tool_description_power_mushroom,
+            R.drawable.tools_power_mushroom, R.drawable.tools_power_mushroom_button, 50,
+            5, 7, new ToolUpgrade(ToolUpgradeType.COOLDOWN, 15000, 11000),
+            new ToolUpgrade(ToolUpgradeType.DURATION, 5000, 10000));
 
     @StringRes
     private final int name;
@@ -96,9 +96,10 @@ public enum ToolType {
     }
 
     public static void loadAllToolTextures(TexturePack texturePack) {
-            for (ToolType type : values()){
+        for (ToolType type : values()) {
             type.loadToolTexture(texturePack);
-            type.loadToolButtonTexture(texturePack);}
+            type.loadToolButtonTexture(texturePack);
+        }
     }
 
     private void loadToolTexture(TexturePack texturePack) {
@@ -110,7 +111,7 @@ public enum ToolType {
             toolTexture = texturePack.loadTexture(toolTextureId);
     }
 
-    private void loadToolButtonTexture(TexturePack texturePack){
+    private void loadToolButtonTexture(TexturePack texturePack) {
         if (buttonDrawable == -1)
             return;
         toolButtonTexture = texturePack.loadTexture(buttonDrawable);
diff --git a/app/src/main/java/de/frajul/endlessroll/user/LevelUpBounties.java b/app/src/main/java/de/frajul/endlessroll/user/LevelUpBounties.java
index 3a1d392..7c3a040 100644
--- a/app/src/main/java/de/frajul/endlessroll/user/LevelUpBounties.java
+++ b/app/src/main/java/de/frajul/endlessroll/user/LevelUpBounties.java
@@ -17,16 +17,16 @@ public class LevelUpBounties extends HashMap<Integer, LevelBounty> {
     public LevelUpBounties(int level) {
         super.put(1, new LevelBounty(0, 0, ToolType.RAMP, true));
         super.put(2, new LevelBounty(5, 0, ToolType.SPRING, false));
-        super.put(3, new LevelBounty(5, 0, ToolType.POWER_MUSHROOM, true));
+        super.put(3, new LevelBounty(5, 0, null, true));
         super.put(4, new LevelBounty(5, 1, ToolType.BOMB, false));
         super.put(5, new LevelBounty(5, 1, ToolType.MAGNET, false));
         super.put(6, new LevelBounty(5, 2, null, true));
         super.put(7, new LevelBounty(5, 1, ToolType.STASIS, false));
-        super.put(8, new LevelBounty(2, 2, null, false));
+        super.put(8, new LevelBounty(2, 2, ToolType.POWER_MUSHROOM, false));
         super.put(9, new LevelBounty(2, 3, null, true));
-        super.put(10, new LevelBounty(2, 1, null, true));
-        super.put(11, new LevelBounty(2, 2, null, true));
-        super.put(12, new LevelBounty(2, 4, null, true));
+        super.put(10, new LevelBounty(2, 1, null, false));
+        super.put(11, new LevelBounty(2, 2, null, false));
+        super.put(12, new LevelBounty(2, 4, null, false));
         loadAllForLevel(level);
     }
 
diff --git a/app/src/main/res/layout/game.xml b/app/src/main/res/layout/game.xml
index b0851a5..118f037 100644
--- a/app/src/main/res/layout/game.xml
+++ b/app/src/main/res/layout/game.xml
@@ -11,7 +11,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_margin="10dp"
-        android:visibility="invisible"
+        android:visibility="visible"
         android:src="@drawable/guis_pausebutton"/>
 
     <TextView