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

Levels 7 + 8 added to Icy Mountains

Browse Source
This commit is contained in:
= 2018-02-24 18:16:01 +01:00
parent 8dc99fb59f
commit d8a5974c52
6 changed files with 172 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.iml
View File

@ -108,7 +108,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.android.support:support-v4-23.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />

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

File diff suppressed because one or more lines are too long

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

@ -82,7 +82,7 @@
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="1.5266662" y="0.28666657"/>
<positionData x="10.550025" y="0.060000025"/>
<positionData x="11.843367" y="0.8266664"/>
<positionData x="21.966604" y="-0.35999998"/>
</stars>
<energy x="17.053387" y="-0.8066667"/>
@ -275,9 +275,9 @@
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="5.0933304" y="0.11333333"/>
<positionData x="4.999997" y="-0.3933333"/>
<positionData x="12.633385" y="-0.020000003"/>
<positionData x="19.653397" y="-0.43333328"/>
<positionData x="19.673399" y="0.6933332"/>
</stars>
<energy x="29.409906" y="-0.42666665"/>
</level>
@ -391,7 +391,7 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="15.60644" rightEdge="16.60044" height="0.395" y="-0.40250003">
<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="true" deadly="false" leftEdge="16.60941" rightEdge="17.577408" height="0.318" y="-1.2399998">
<obstacleData floating="true" moving="true" deadly="false" leftEdge="16.589409" rightEdge="17.557407" height="0.318" y="-1.2799997">
<moveComponent length="3.273" rotation="71.623" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.372"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="20.558361" rightEdge="21.06836" height="0.306" y="-0.44700003">
@ -418,7 +418,7 @@
<obstacleData floating="false" 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.885813" rightEdge="32.420815" height="0.433" y="0.006666662">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="31.88581" rightEdge="32.420815" height="0.433" y="0.006666662">
<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="true" leftEdge="11.342353" rightEdge="11.724353" height="0.561" y="0.25999996">
@ -432,18 +432,173 @@
</stars>
<energy x="18.570074" y="0.46666658"/>
</level>
<level packId="2" id="7" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="2" id="7" goalX="33.733437" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
<tileData x="-0.9783335" width="4.043333"/>
<tileData x="1.7499995" width="0.21333408"/>
<tileData x="2.5599995" width="0.206666"/>
<tileData x="3.3716652" width="0.21666574"/>
<tileData x="4.178331" width="0.19666576"/>
<tileData x="6.1162505" width="2.4791737"/>
<tileData x="9.003868" width="1.1860332"/>
<tileData x="11.213392" width="1.207016"/>
<tileData x="13.78623" width="1.9126596"/>
<tileData x="17.157478" width="1.959837"/>
<tileData x="20.764118" width="3.269434"/>
<tileData x="26.239532" width="1.183403"/>
<tileData x="27.40131" width="0.21215057"/>
<tileData x="28.09564" width="0.20650482"/>
<tileData x="30.193727" width="3.1456718"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
<tileData x="15.36672" width="36.73344"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList"/>
<obstacles class="java.util.ArrayList">
<obstacleData floating="true" moving="true" deadly="false" leftEdge="0.926168" rightEdge="2.0471683" height="0.191" y="-0.4778334">
<moveComponent length="2.964" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.699" hasPlayerXSpeed="false" triggerDistance="-0.837"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="5.984505" rightEdge="6.3155055" height="0.5" y="-0.35000002">
<moveComponent length="1.082" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.503" hasPlayerXSpeed="false" triggerDistance="0.367"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="9.367712" rightEdge="10.845713" height="0.127" y="-0.53650004">
<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="true" leftEdge="7.386346" rightEdge="8.380346" height="0.204" y="-0.7424998">
<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="true" leftEdge="11.87405" rightEdge="12.76605" height="0.191" y="-0.7703331">
<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="true" deadly="false" leftEdge="14.7720585" rightEdge="16.148058" height="0.395" y="-0.64666647">
<moveComponent length="1.881" rotation="0.0" startOffset="0.131" direction="1.0" speed="1.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="16.360397" rightEdge="16.9464" height="0.331" y="0.37333345">
<moveComponent length="2.835" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.286"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="19.87619" rightEdge="20.437191" height="0.955" y="-0.12250003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="20.612684" rightEdge="21.020685" height="0.943" y="-0.12850001">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="21.201145" rightEdge="21.532146" height="0.65" y="-0.27500004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="21.713654" rightEdge="22.299652" height="0.65" y="-0.27500004">
<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="true" leftEdge="22.483648" rightEdge="23.069647" height="0.382" y="-0.34666663">
<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="23.22813" rightEdge="23.585129" height="0.408" y="-0.3399999">
<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="true" deadly="false" leftEdge="23.730124" rightEdge="24.443125" height="0.357" y="-0.57999986">
<moveComponent length="1.856" rotation="51.832" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.347"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="31.580885" rightEdge="33.058884" height="0.191" y="-0.24666671">
<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="true" leftEdge="33.04455" rightEdge="33.528553" height="0.688" y="0.5266666">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="0.3066666" y="-0.37999997"/>
<positionData x="2.946666" y="-0.77333313"/>
<positionData x="18.630062" y="-0.18666665"/>
<positionData x="24.073275" y="0.71333313"/>
</stars>
<energy x="1.9466664" y="-0.3933333"/>
<energy x="10.09338" y="-0.79333293"/>
</level>
<level packId="2" id="8" goalX="35.71337" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-0.035833836" width="5.9283323"/>
<tileData x="4.0709963" width="1.1453273"/>
<tileData x="14.44771" width="3.196042"/>
<tileData x="21.424417" width="4.513382"/>
<tileData x="27.701664" width="3.019106"/>
<tileData x="32.25354" width="4.396641"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<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">
<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">
<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.903328" rightEdge="8.903328" height="0.331" y="0.6733333">
<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="9.766688" rightEdge="13.766688" height="0.331" y="0.6733333">
<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="7.5767" rightEdge="11.5767" height="0.127" y="0.080000006">
<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="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>
<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"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="12.155539" rightEdge="12.384539" height="0.5" y="-0.27333316">
<moveComponent length="0.954" rotation="0.0" startOffset="0.475" direction="-1.0" speed="0.295" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="14.315394" rightEdge="15.971395" height="0.599" y="-0.30050004">
<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="true" leftEdge="16.081547" rightEdge="16.438545" height="0.408" y="-0.0333334">
<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="true" deadly="false" leftEdge="16.624893" rightEdge="17.261894" height="0.242" y="-0.31999993">
<moveComponent length="5.387" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.327"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="19.633873" rightEdge="20.372871" height="0.14" y="-0.08000003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="23.044516" rightEdge="23.655516" height="0.548" y="-0.32600003">
<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="true" deadly="false" leftEdge="23.81144" rightEdge="24.168438" height="0.522" y="-0.6333329">
<moveComponent length="1.469" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.606" hasPlayerXSpeed="false" triggerDistance="0.245"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="24.32496" rightEdge="24.67496" height="0.535" y="-0.64666665">
<moveComponent length="1.469" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.593" hasPlayerXSpeed="false" triggerDistance="0.429"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="24.821457" rightEdge="25.178455" height="0.548" y="-0.6533331">
<moveComponent length="1.469" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.604" hasPlayerXSpeed="false" triggerDistance="0.612"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="25.295965" rightEdge="25.703966" height="0.548" y="0.1466666">
<moveComponent length="1.469" rotation="180.0" startOffset="0.429" direction="1.0" speed="0.4" hasPlayerXSpeed="false" triggerDistance="0.367"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="25.763456" rightEdge="26.196455" height="0.51" y="0.58666664">
<moveComponent length="2.242" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.813" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="32.325844" rightEdge="32.73384" height="0.79" y="-0.20500001">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="32.907654" rightEdge="33.518654" height="0.65" y="-0.27500004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="33.60883" rightEdge="34.270832" height="0.5" y="-0.35000002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="1.225666" rightEdge="2.9076662" height="0.331" y="-0.43450004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="18.476706" y="1.0133333"/>
<positionData x="22.923344" y="-0.4666665"/>
<positionData x="29.62654" y="0.31333333"/>
</stars>
<energy x="10.900037" y="0.33333334"/>
</level>
</levels>
</levelPack>

3
app/src/main/java/de/frajul/endlessroll/main/screens/ScreenFlipper.java
View File

@ -33,7 +33,8 @@ public class ScreenFlipper extends ViewFlipper {
screen.setCaller(caller);
screen.prepareToBeShown();
int positionDifference = type.getInFlipperPosition() - currentScreen.getType().getInFlipperPosition();
int positionDifference = type.getInFlipperPosition() - currentScreen.getType()
.getInFlipperPosition();
if (positionDifference < 0)
for (; positionDifference != 0; positionDifference++)
super.showPrevious();

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

@ -72,7 +72,7 @@
<string name="topbar_toolshop">Toolshop</string>
<string name="bounty_message_tool_slot">Neuer Slot freigeschaltet</string>
<string name="bounty_message_shape_unlocked">Neues Aussehen freigeschaltet</string>
<string name="playershape_description_locked">Ein neues Aussehen und noch viel mehr Spaß</string>
<string name="playershape_description_locked">Ein neuer Look und noch viel mehr Spaß</string>
<string name="task_empty">Leere Aufgabe</string>
<string name="tool_description_locked_format_d">Erreiche Level %d, um dieses Tool freizuschalten</string>
<string name="tutorial_place_ramp_air">Du kannst Tools auch mitten in der Luft setzen. Achte auf das richtige Timing!</string>

2
particlelab/particlelab.iml
View File

@ -108,7 +108,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.android.support:support-v4-23.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />