diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index eee9c61..ae6b781 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1352,7 +1352,7 @@
- Icy Mountains
- Testcave
- Mysterious fireworld
- #ffda45#891e4e#39be27#ffb405#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f0f41e02#f0f28117#f0d7b106#5b000000#9d000000Endless Roll0.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Level UpGAME OVERYOU DID ITToolsTo menuRestartTry againNext levelLOADING...ContinueRestartExitPlayUnlock all levels (Yes! It\'s magic!)Gain 90 ep (Nope! No magic at all!)Test GL Stuff!!!Time (Lv12)Level: 24Level: %dResetToolshopRamp unlockedGreat world21/15%s%s unlocked!You unlocked a ToolslotLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyRampSpringMagnetBombMushroom%1$s (Lv%2$d)NoneTimeRadiusForceMax.This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!This is the toolbar. Here you can select the tool you currently want to use.You can use the selected tool by clicking on the wanted position on the screen.Now place your ramp in front of the gap!Now place it in front of the obstacle!You can even set a Tool in mid-air.\nTry it out!Now try again!Congratulations!!!\nYou have leveled up!Now go to the toolshop by either clicking on the \'Spring unlocked\' or the toolshop button!Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.Right! That is your toolbar.Here you can see all the tools you will be able to buy and use.Here one can buy and upgrade the selected tool.Now select the spring and buy it!Now tip on an unlocked slot of your toolbar to equip the spring!\n(It is the same where the ramp is attached at the moment)\nAfter that you will be able to complete the next level.SunWheelI\'m a text!85.1%Level: %dClick me!997.5Roll up the ramp to gain heightBlow up all obstacles near the bombShoots you in the airDifficult to handle, but if you master it you can do anythingThis will give you super-powers for a few seconds\?\?\?You will unlock this mysterious tool at level %dTick tack!Don\'t worry, roll happy!Keep calm and roll onShine bright like the sunHypnotizes you for more funPACMAN!A nice car without the... car\?\?\?A new shape for more funFinish the %d. worldCollect %d starsCollect %d energy (%d/%d)Collect %d stars (%d/%d)Collect %d energyEmpty taskNew shape unlockedTask completedDo you really want to exit the game?YesNo170dp170dp70dp60dp
\ No newline at end of file
+ 170dp170dp70dp60dp
\ 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 466eb4c..30c9494 100644
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -526,34 +526,36 @@ int drawable tools_ramp 0x7f070077
int drawable tools_ramp_button 0x7f070078
int drawable tools_spring 0x7f070079
int drawable tools_spring_button 0x7f07007a
-int drawable tutorial_place_ramp_air_1 0x7f07007b
-int drawable tutorial_place_ramp_gap 0x7f07007c
-int drawable tutorial_place_ramp_obstacle 0x7f07007d
-int drawable tutorial_place_tools 0x7f07007e
-int drawable tutorial_to_toolshop 0x7f07007f
-int drawable tutorial_toolbar 0x7f070080
-int drawable tutorial_toolshop_all_tools 0x7f070081
-int drawable tutorial_toolshop_equip_spring 0x7f070082
-int drawable tutorial_toolshop_inspector 0x7f070083
-int drawable tutorial_toolshop_select_buy_spring 0x7f070084
-int drawable tutorial_toolshop_toolbar 0x7f070085
-int drawable world_previews_grass 0x7f070086
-int drawable xml_background_bountymessage 0x7f070087
-int drawable xml_background_dialog_button 0x7f070088
-int drawable xml_background_exit_confirm_dialog 0x7f070089
-int drawable xml_background_levelbutton 0x7f07008a
-int drawable xml_background_toolslot 0x7f07008b
-int drawable xml_background_toolupgrade 0x7f07008c
-int drawable xml_background_tutorialtextview 0x7f07008d
-int drawable xml_background_worldbutton 0x7f07008e
-int drawable xml_layers_toolprogressbar 0x7f07008f
-int drawable xml_selector_gamebutton 0x7f070090
-int drawable xml_selector_pricebutton 0x7f070091
-int drawable xml_selector_settingsbutton 0x7f070092
-int drawable xml_selector_shapeshopbutton 0x7f070093
-int drawable xml_selector_sound 0x7f070094
-int drawable xml_selector_toolshopbutton 0x7f070095
-int drawable xml_shape_inspector_checkbox 0x7f070096
+int drawable tools_stasis 0x7f07007b
+int drawable tools_stasis_button 0x7f07007c
+int drawable tutorial_place_ramp_air_1 0x7f07007d
+int drawable tutorial_place_ramp_gap 0x7f07007e
+int drawable tutorial_place_ramp_obstacle 0x7f07007f
+int drawable tutorial_place_tools 0x7f070080
+int drawable tutorial_to_toolshop 0x7f070081
+int drawable tutorial_toolbar 0x7f070082
+int drawable tutorial_toolshop_all_tools 0x7f070083
+int drawable tutorial_toolshop_equip_spring 0x7f070084
+int drawable tutorial_toolshop_inspector 0x7f070085
+int drawable tutorial_toolshop_select_buy_spring 0x7f070086
+int drawable tutorial_toolshop_toolbar 0x7f070087
+int drawable world_previews_grass 0x7f070088
+int drawable xml_background_bountymessage 0x7f070089
+int drawable xml_background_dialog_button 0x7f07008a
+int drawable xml_background_exit_confirm_dialog 0x7f07008b
+int drawable xml_background_levelbutton 0x7f07008c
+int drawable xml_background_toolslot 0x7f07008d
+int drawable xml_background_toolupgrade 0x7f07008e
+int drawable xml_background_tutorialtextview 0x7f07008f
+int drawable xml_background_worldbutton 0x7f070090
+int drawable xml_layers_toolprogressbar 0x7f070091
+int drawable xml_selector_gamebutton 0x7f070092
+int drawable xml_selector_pricebutton 0x7f070093
+int drawable xml_selector_settingsbutton 0x7f070094
+int drawable xml_selector_shapeshopbutton 0x7f070095
+int drawable xml_selector_sound 0x7f070096
+int drawable xml_selector_toolshopbutton 0x7f070097
+int drawable xml_shape_inspector_checkbox 0x7f070098
int id action0 0x7f080000
int id action_bar 0x7f080001
int id action_bar_activity_content 0x7f080002
@@ -927,42 +929,44 @@ int string tool_description_magnet 0x7f0d0054
int string tool_description_power_mushroom 0x7f0d0055
int string tool_description_ramp 0x7f0d0056
int string tool_description_spring 0x7f0d0057
-int string tool_level_format_d 0x7f0d0058
-int string tool_name_bomb 0x7f0d0059
-int string tool_name_locked 0x7f0d005a
-int string tool_name_magnet 0x7f0d005b
-int string tool_name_power_mushroom 0x7f0d005c
-int string tool_name_ramp 0x7f0d005d
-int string tool_name_spring 0x7f0d005e
-int string tool_upgrade_force 0x7f0d005f
-int string tool_upgrade_none 0x7f0d0060
-int string tool_upgrade_radius 0x7f0d0061
-int string tool_upgrade_time 0x7f0d0062
-int string tool_upgrade_title_format_sd 0x7f0d0063
-int string tool_upgrade_title_placeholder 0x7f0d0064
-int string tool_upgrade_value_max 0x7f0d0065
-int string topbar_level_format_d 0x7f0d0066
-int string topbar_level_placeholder 0x7f0d0067
-int string topbar_toolshop 0x7f0d0068
-int string tutorial_leveled_up 0x7f0d0069
-int string tutorial_place_ramp_air 0x7f0d006a
-int string tutorial_place_ramp_air_2 0x7f0d006b
-int string tutorial_place_ramp_gap 0x7f0d006c
-int string tutorial_place_ramp_obstacle 0x7f0d006d
-int string tutorial_place_tools 0x7f0d006e
-int string tutorial_placeholder 0x7f0d006f
-int string tutorial_to_toolshop 0x7f0d0070
-int string tutorial_toolbar 0x7f0d0071
-int string tutorial_toolshop_all_tools 0x7f0d0072
-int string tutorial_toolshop_equip_spring 0x7f0d0073
-int string tutorial_toolshop_inspector 0x7f0d0074
-int string tutorial_toolshop_select_buy_spring 0x7f0d0075
-int string tutorial_toolshop_toolbar 0x7f0d0076
-int string tutorial_toolshop_welcome 0x7f0d0077
-int string tutorial_welcome 0x7f0d0078
-int string unlock_message_placeholder 0x7f0d0079
-int string world_button_progress_placeholder 0x7f0d007a
-int string world_button_title_placeholder 0x7f0d007b
+int string tool_description_stasis 0x7f0d0058
+int string tool_level_format_d 0x7f0d0059
+int string tool_name_bomb 0x7f0d005a
+int string tool_name_locked 0x7f0d005b
+int string tool_name_magnet 0x7f0d005c
+int string tool_name_power_mushroom 0x7f0d005d
+int string tool_name_ramp 0x7f0d005e
+int string tool_name_spring 0x7f0d005f
+int string tool_name_stasis 0x7f0d0060
+int string tool_upgrade_force 0x7f0d0061
+int string tool_upgrade_none 0x7f0d0062
+int string tool_upgrade_radius 0x7f0d0063
+int string tool_upgrade_time 0x7f0d0064
+int string tool_upgrade_title_format_sd 0x7f0d0065
+int string tool_upgrade_title_placeholder 0x7f0d0066
+int string tool_upgrade_value_max 0x7f0d0067
+int string topbar_level_format_d 0x7f0d0068
+int string topbar_level_placeholder 0x7f0d0069
+int string topbar_toolshop 0x7f0d006a
+int string tutorial_leveled_up 0x7f0d006b
+int string tutorial_place_ramp_air 0x7f0d006c
+int string tutorial_place_ramp_air_2 0x7f0d006d
+int string tutorial_place_ramp_gap 0x7f0d006e
+int string tutorial_place_ramp_obstacle 0x7f0d006f
+int string tutorial_place_tools 0x7f0d0070
+int string tutorial_placeholder 0x7f0d0071
+int string tutorial_to_toolshop 0x7f0d0072
+int string tutorial_toolbar 0x7f0d0073
+int string tutorial_toolshop_all_tools 0x7f0d0074
+int string tutorial_toolshop_equip_spring 0x7f0d0075
+int string tutorial_toolshop_inspector 0x7f0d0076
+int string tutorial_toolshop_select_buy_spring 0x7f0d0077
+int string tutorial_toolshop_toolbar 0x7f0d0078
+int string tutorial_toolshop_welcome 0x7f0d0079
+int string tutorial_welcome 0x7f0d007a
+int string unlock_message_placeholder 0x7f0d007b
+int string world_button_progress_placeholder 0x7f0d007c
+int string world_button_title_placeholder 0x7f0d007d
int style AlertDialog_AppCompat 0x7f0e0000
int style AlertDialog_AppCompat_Light 0x7f0e0001
int style Animation_AppCompat_Dialog 0x7f0e0002
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
new file mode 100644
index 0000000..158037a
--- /dev/null
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
@@ -0,0 +1,47 @@
+package de.frajul.endlessroll.entities.tools;
+
+import de.frajul.endlessroll.data.Vector;
+import de.frajul.endlessroll.entities.DestroyEffect;
+import de.frajul.endlessroll.entities.Player;
+import de.frajul.endlessroll.entities.collision.geometry.Circle;
+import de.frajul.endlessroll.entities.collision.geometry.Geometry;
+import de.frajul.endlessroll.entities.particles.ParticleSource;
+import de.frajul.endlessroll.entities.particles.ParticleSystem;
+import de.frajul.endlessroll.main.game.Timer;
+
+/**
+ * Created by Julian on 11.02.2016.
+ */
+public class Stasis extends Tool {
+
+ private ParticleSource particleSource;
+
+ public Stasis(Vector position, ParticleSystem particleSystem) {
+ super(ToolType.STASIS, position, .6f * ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.SIZE) / 100, .6f * ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.SIZE) / 100, false, false);
+ animation.disable();
+ super.setFloating(true);
+ particleSource = new ParticleSource(new Vector(position), particleSystem.magnet);
+ particleSource.start();
+ }
+
+ @Override
+ public void destroy(DestroyEffect destroyEffect) {
+ super.destroy(destroyEffect);
+ particleSource.kill();
+ }
+
+ @Override
+ public void onPlayerCollision(Player player, Timer timer) {
+ player.getMovement().setY(0);
+ }
+
+ @Override
+ protected Geometry createWorldCollisionBounds() {
+ return this;
+ }
+
+ @Override
+ protected Geometry createPlayerCollisionBounds() {
+ return this;
+ }
+}
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolUpgradeType.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolUpgradeType.java
index 3696875..14c5ee7 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolUpgradeType.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolUpgradeType.java
@@ -6,6 +6,6 @@ package de.frajul.endlessroll.entities.tools;
public enum ToolUpgradeType {
- COOLDOWN, DURATION, FORCE, RANGE;
+ COOLDOWN, DURATION, FORCE, RANGE, SIZE;
}
diff --git a/app/src/main/res/drawable/tools_stasis.png b/app/src/main/res/drawable/tools_stasis.png
new file mode 100644
index 0000000..b73f576
Binary files /dev/null and b/app/src/main/res/drawable/tools_stasis.png differ
diff --git a/app/src/main/res/drawable/tools_stasis_button.png b/app/src/main/res/drawable/tools_stasis_button.png
new file mode 100644
index 0000000..ec01ef8
Binary files /dev/null and b/app/src/main/res/drawable/tools_stasis_button.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4552e8c..dddb9d5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,12 +74,14 @@
Difficult to handle, but if you master it you can do anything
Blow up all obstacles near the bomb
This will give you super-powers for a few seconds
+ Freezes a certain area which leads to longer in-air time
\?\?\?
Ramp
Spring
Magnet
Bomb
Mushroom
+ Stasis
Level: %d
%1$s (Lv%2$d)
None