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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -9,8 +9,8 @@ android {
applicationId 'de.frajul.endlessroll'
minSdkVersion 12
targetSdkVersion 23
versionCode 5
versionName '0.5.0'
versionCode 6
versionName '0.6.0'
}
buildTypes {
release {

4
app/build/intermediates/assets/debug/levelpacks/Grasslands.xml
View File

@ -974,8 +974,8 @@
<obstacleData floating="true" moving="false" deadly="false" leftEdge="18.443184" rightEdge="20.150185" height="0.5" y="0.2733334">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="22.634523" rightEdge="22.965525" height="0.331" y="-0.37333316">
<moveComponent length="2.74" rotation="90.0" startOffset="0.5" direction="1.0" speed="0.609" hasPlayerXSpeed="false" triggerDistance="0.0"/>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="23.141178" rightEdge="23.47218" height="0.331" y="-0.35333315">
<moveComponent length="2.01" rotation="90.0" startOffset="0.76" direction="1.0" speed="0.601" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="20.568808" rightEdge="22.097807" height="0.166" y="-4.656613E-9">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>

4
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

5
app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.frajul.endlessroll"
android:versionCode="5"
android:versionName="0.5.0" >
android:versionCode="6"
android:versionName="0.6.0" >
<uses-sdk
android:minSdkVersion="12"
@ -18,7 +18,6 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:testOnly="true"
android:theme="@style/AppTheme" >
<activity
android:name="de.frajul.endlessroll.main.GameActivity"

4
app/src/main/assets/levelpacks/Grasslands.xml
View File

@ -974,8 +974,8 @@
<obstacleData floating="true" moving="false" deadly="false" leftEdge="18.443184" rightEdge="20.150185" height="0.5" y="0.2733334">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="22.634523" rightEdge="22.965525" height="0.331" y="-0.37333316">
<moveComponent length="2.74" rotation="90.0" startOffset="0.5" direction="1.0" speed="0.609" hasPlayerXSpeed="false" triggerDistance="0.0"/>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="23.141178" rightEdge="23.47218" height="0.331" y="-0.35333315">
<moveComponent length="2.01" rotation="90.0" startOffset="0.76" direction="1.0" speed="0.601" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="20.568808" rightEdge="22.097807" height="0.166" y="-4.656613E-9">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>

8
app/src/main/assets/levelpacks/Icy Mountains.xml
View File

@ -415,7 +415,7 @@
<obstacleData floating="true" moving="true" deadly="false" leftEdge="29.002832" rightEdge="29.843832" height="0.217" y="-0.49150002">
<moveComponent length="1.186" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.801" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="true" deadly="true" leftEdge="30.963612" rightEdge="31.829613" height="0.191" y="-0.50450003">
<obstacleData floating="true" moving="true" deadly="true" leftEdge="30.963612" rightEdge="31.829613" height="0.191" y="-0.50450003">
<moveComponent length="1.211" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.301" hasPlayerXSpeed="false" triggerDistance="1.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="31.88581" rightEdge="32.420815" height="0.433" y="0.006666662">
@ -523,7 +523,7 @@
<tileData x="16.356686" width="38.71337"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="3.5284984" rightEdge="4.291498" height="1.172" y="-0.013999999">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="3.5284986" rightEdge="4.291498" height="1.172" y="-0.013999999">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="4.3224974" rightEdge="6.9974976" height="0.127" y="0.10000001">
@ -541,8 +541,8 @@
<obstacleData floating="true" moving="true" deadly="true" leftEdge="7.1236734" rightEdge="7.429673" height="0.446" y="0.2599999">
<moveComponent length="0.979" rotation="180.0" startOffset="0.0" direction="1.0" speed="0.505" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="8.193854" rightEdge="8.652854" height="0.242" y="1.0133331">
<moveComponent length="3.737" rotation="90.0" startOffset="0.222" direction="1.0" speed="0.391" hasPlayerXSpeed="false" triggerDistance="0.0"/>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="9.100535" rightEdge="9.559535" height="0.242" y="0.96666646">
<moveComponent length="3.737" rotation="90.0" startOffset="0.5" direction="1.0" speed="0.391" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="14.34642" rightEdge="15.62042" height="0.229" y="0.9999999">
<moveComponent length="2.732" rotation="90.0" startOffset="0.0" direction="-1.0" speed="0.606" hasPlayerXSpeed="true" triggerDistance="-0.429"/>

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);
}

2
app/src/main/res/values-de/strings.xml
View File

@ -9,7 +9,7 @@
<string name="message_restart">Neustart</string>
<string name="goal_message_restart_format_d">Neustart: Level %d</string>
<string name="goal_message_next_level_format_d">Nächstes Level: %d</string>
<string name="goal_message_next_world_format_s">Gehe zur nächsten Welt:\n%s</string>
<string name="goal_message_next_world_format_s">Nächste Welt:\n%s</string>
<string name="pre_start_screen_loading">LÄDT...</string>
<string name="short_menu_continue">Weiter</string>
<string name="short_menu_exit">Beenden</string>

2
app/src/main/res/values/strings.xml
View File

@ -22,7 +22,7 @@
<string name="message_restart">Restart</string>
<string name="goal_message_restart_format_d">Restart level %d</string>
<string name="goal_message_next_level_format_d">Next level: %d</string>
<string name="goal_message_next_world_format_s">Go to the next world:\n%s</string>
<string name="goal_message_next_world_format_s">Next world:\n%s</string>
<string name="pre_start_screen_loading">LOADING...</string>
<string name="short_menu_continue">Continue</string>
<string name="short_menu_exit">Exit</string>