julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Balanced

Browse Source 
Fixed minor bugs
-> Version 0.6.0
This commit is contained in:
=
2018-05-01 09:55:31 +02:00
parent 66b3b1d55e
commit c4da4d96ac
12 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
View File

@ -23,11 +23,11 @@ public enum ToolType {
R.drawable.tools_spring_button, 5, 2, 5,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 4000, 2000)),
BOMB(R.string.tool_name_bomb, R.string.tool_description_bomb, R.drawable.tools_bomb,
R.drawable.tools_bomb_button, 12, 4, 5,
R.drawable.tools_bomb_button, 20, 4, 5,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 5000, 2000),
new ToolUpgrade(ToolUpgradeType.DURATION, 1200, 500)),
MAGNET(R.string.tool_name_magnet, R.string.tool_description_magnet, R.drawable.tools_magnet,
R.drawable.tools_magnet_button, 10, 2, 5,
R.drawable.tools_magnet_button, 18, 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,
@ -35,7 +35,7 @@ public enum ToolType {
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, 15, 4, 6,
R.drawable.tools_stasis_button, 22, 4, 6,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 6000, 4000),
new ToolUpgrade(ToolUpgradeType.FORCE, 1, 2),
new ToolUpgrade(ToolUpgradeType.SIZE, 100, 200));

1
app/src/main/java/de/frajul/endlessroll/main/game/Game.java
View File

@ -94,6 +94,7 @@ public class Game extends Rendering<GameScene> {
if (scene != null) {
gameActivity.getSoundManager().getCurrentGameMusic().reset();
gameActivity.getSoundManager().randomizeCurrentGameMusic();
gameActivity.getSoundManager().stopAllSounds();
gameState = GameState.COUNTDOWN;
gameActivity.getTutorialManager().resetGameTutorials();
collectedStars.clear();

2
app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java
View File

@ -15,7 +15,7 @@ public class TutorialManager {
private final int WELCOME_TUTORIAL_LEVEL = 1;
private final int IN_AIR_TUTORIAL_LEVEL = 5;
private final int SWITCH_TOOLS_TUTORIAL_LEVEL = 10;
private final int SWITCH_TOOLS_TUTORIAL_LEVEL = 11;
private Tutorial welcomeTutorial;
private Tutorial inAirTutorial;

14
app/src/main/java/de/frajul/endlessroll/user/LevelUpBounties.java
View File

@ -17,13 +17,13 @@ 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(6, 0, ToolType.POWER_MUSHROOM, true));
super.put(4, new LevelBounty(7, 0, ToolType.BOMB, false));
super.put(5, new LevelBounty(8, 2, ToolType.MAGNET, false));
super.put(6, new LevelBounty(8, 1, null, true));
super.put(7, new LevelBounty(8, 1, ToolType.STASIS, false));
super.put(8, new LevelBounty(100, 100, null, false));
super.put(9, new LevelBounty(0, 0, null, true));
super.put(3, new LevelBounty(5, 0, ToolType.POWER_MUSHROOM, 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(5, 2, null, false));
super.put(9, new LevelBounty(5, 1, null, true));
loadAllForLevel(level);
}