diff --git a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml index e6b8b10..2d8eccb 100644 --- a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml +++ b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml @@ -996,7 +996,7 @@ - + diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 23274b8..8c620cd 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1371,4 +1371,4 @@ @drawable/xml_background_tutorialtextview #000000 15sp - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt index e1f693b..200486e 100644 --- a/app/build/intermediates/symbols/debug/R.txt +++ b/app/build/intermediates/symbols/debug/R.txt @@ -550,16 +550,17 @@ int drawable xml_background_game_over_message_button 0x7f07008e int drawable xml_background_levelbutton 0x7f07008f int drawable xml_background_toolslot 0x7f070090 int drawable xml_background_toolupgrade 0x7f070091 -int drawable xml_background_tutorialtextview 0x7f070092 -int drawable xml_background_worldbutton 0x7f070093 -int drawable xml_layers_toolprogressbar 0x7f070094 -int drawable xml_selector_gamebutton 0x7f070095 -int drawable xml_selector_pricebutton 0x7f070096 -int drawable xml_selector_settingsbutton 0x7f070097 -int drawable xml_selector_shapeshopbutton 0x7f070098 -int drawable xml_selector_sound 0x7f070099 -int drawable xml_selector_toolshopbutton 0x7f07009a -int drawable xml_shape_inspector_checkbox 0x7f07009b +int drawable xml_background_tutorialimageview 0x7f070092 +int drawable xml_background_tutorialtextview 0x7f070093 +int drawable xml_background_worldbutton 0x7f070094 +int drawable xml_layers_toolprogressbar 0x7f070095 +int drawable xml_selector_gamebutton 0x7f070096 +int drawable xml_selector_pricebutton 0x7f070097 +int drawable xml_selector_settingsbutton 0x7f070098 +int drawable xml_selector_shapeshopbutton 0x7f070099 +int drawable xml_selector_sound 0x7f07009a +int drawable xml_selector_toolshopbutton 0x7f07009b +int drawable xml_shape_inspector_checkbox 0x7f07009c int id action0 0x7f080000 int id action_bar 0x7f080001 int id action_bar_activity_content 0x7f080002 diff --git a/app/src/main/assets/levelpacks/Grasslands.xml b/app/src/main/assets/levelpacks/Grasslands.xml index e6b8b10..2d8eccb 100644 --- a/app/src/main/assets/levelpacks/Grasslands.xml +++ b/app/src/main/assets/levelpacks/Grasslands.xml @@ -996,7 +996,7 @@ - + diff --git a/app/src/main/assets/levelpacks/Icy Mountains.xml b/app/src/main/assets/levelpacks/Icy Mountains.xml index d7f42d4..0ba629a 100644 --- a/app/src/main/assets/levelpacks/Icy Mountains.xml +++ b/app/src/main/assets/levelpacks/Icy Mountains.xml @@ -89,50 +89,206 @@ - + - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + - - + + + + + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + - - + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + \ No newline at end of file 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 b50e919..0590c6b 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 @@ -28,16 +28,16 @@ public enum ToolType { new ToolUpgrade(ToolUpgradeType.DURATION, 1200, 400), new ToolUpgrade(ToolUpgradeType.RANGE, 100, 200)), MAGNET(R.string.tool_name_magnet, R.string.tool_description_magnet, R.drawable.tools_magnet, - R.drawable.tools_magnet_button, R.raw.ramp, 10, 4, 5, - new ToolUpgrade(ToolUpgradeType.COOLDOWN, 6000, 4000), + R.drawable.tools_magnet_button, R.raw.ramp, 10, 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, R.raw.ramp, 5, 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, R.raw.ramp, 15, 6, 6, - new ToolUpgrade(ToolUpgradeType.COOLDOWN, 8000, 5000), + R.drawable.tools_stasis_button, R.raw.ramp, 15, 4, 6, + new ToolUpgrade(ToolUpgradeType.COOLDOWN, 6000, 4000), new ToolUpgrade(ToolUpgradeType.FORCE, 1, 2), new ToolUpgrade(ToolUpgradeType.SIZE, 100, 200)); diff --git a/app/src/main/res/drawable/xml_background_tutorialimageview.xml b/app/src/main/res/drawable/xml_background_tutorialimageview.xml new file mode 100644 index 0000000..ffff789 --- /dev/null +++ b/app/src/main/res/drawable/xml_background_tutorialimageview.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/tutorial.xml b/app/src/main/res/layout/tutorial.xml index 67962cd..1f20595 100644 --- a/app/src/main/res/layout/tutorial.xml +++ b/app/src/main/res/layout/tutorial.xml @@ -26,9 +26,10 @@ android:layout_below="@+id/tutorial_text_view" android:layout_centerHorizontal="true" android:layout_marginTop="15dp" + android:adjustViewBounds="true" + android:background="@drawable/xml_background_tutorialimageview" android:padding="2dp" android:scaleType="centerCrop" - android:adjustViewBounds="true" android:src="@drawable/backgrounds_menu_grass"/>