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

Tutorial image view now has black border

Browse Source 
Added 3 levels in second world
This commit is contained in:
= 2018-01-12 16:09:00 +01:00
parent b0dd09b8f0
commit 60bc673ffc
8 changed files with 205 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -996,7 +996,7 @@
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="2.8533204" y="-0.37999988"/>
<positionData x="2.8266537" y="-0.38666654"/>
<positionData x="13.450049" y="-0.45333323"/>
<positionData x="22.803272" y="-0.34666654"/>
</stars>

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

File diff suppressed because one or more lines are too long

21
app/build/intermediates/symbols/debug/R.txt
View File

@ -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

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

@ -996,7 +996,7 @@
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="2.8533204" y="-0.37999988"/>
<positionData x="2.8266537" y="-0.38666654"/>
<positionData x="13.450049" y="-0.45333323"/>
<positionData x="22.803272" y="-0.34666654"/>
</stars>

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

@ -89,50 +89,206 @@
</stars>
<energy x="17.053387" y="-0.8066667"/>
</level>
<level packId="2" id="2" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="2" id="2" goalX="29.280016" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-2.75" width="0.5"/>
<tileData x="2.75" width="0.5"/>
<tileData x="1.4756713" width="8.951343"/>
<tileData x="8.532685" width="4.234686"/>
<tileData x="16.462751" width="1.6254578"/>
<tileData x="19.197458" width="2.2259521"/>
<tileData x="27.477955" width="13.297041"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
<tileData x="13.140007" width="32.280014"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="true" moving="true" deadly="false" leftEdge="-1.1566665" rightEdge="-0.6566666" height="0.5" y="-0.99333346">
<moveComponent length="3.687" rotation="55.602" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.204"/>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="1.6104994" rightEdge="2.3494992" 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="false" moving="true" deadly="true" leftEdge="3.5200005" rightEdge="4.0200005" height="0.306" y="-0.44700003">
<moveComponent length="2.311" rotation="90.0" startOffset="0.5" direction="-1.0" speed="0.402" hasPlayerXSpeed="false" triggerDistance="-0.25"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="5.220497" rightEdge="5.9594975" height="0.369" y="-0.41550004">
<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="9.273026" rightEdge="11.107026" height="0.255" y="-0.47250003">
<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.540025" rightEdge="11.400025" height="0.306" y="-0.14666666">
<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="10.851039" rightEdge="12.609038" height="0.28" y="0.1866667">
<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="11.798186" rightEdge="12.435185" height="0.408" y="-0.9466663">
<moveComponent length="3.015" rotation="49.948" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.515"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="14.90235" rightEdge="16.864353" height="0.331" y="0.5000002">
<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="17.039186" rightEdge="17.574186" height="0.446" y="0.47999996">
<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="18.556505" rightEdge="20.543505" height="0.344" y="0.49333334">
<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="19.984478" rightEdge="20.31548" 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="true" moving="true" deadly="true" leftEdge="21.741276" rightEdge="21.945274" height="0.369" y="0.4766668">
<moveComponent length="1.649" rotation="140.419" startOffset="0.495" direction="1.0" speed="0.803" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="26.050245" rightEdge="26.356245" height="0.306" y="-0.41333312">
<moveComponent length="2.437" rotation="90.0" startOffset="1.0" direction="-1.0" speed="1.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="23.962397" rightEdge="26.077398" height="0.166" y="-0.08">
<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="26.410192" rightEdge="26.716192" height="0.318" y="-0.4133333">
<moveComponent length="2.866" rotation="90.0" startOffset="0.0" direction="1.0" speed="1.0" hasPlayerXSpeed="false" triggerDistance="-0.704"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="26.72003" rightEdge="29.293028" height="0.166" y="-0.06666667">
<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"/>
<stars class="java.util.ArrayList">
<positionData x="3.7166643" y="-0.42666662"/>
<positionData x="11.576696" y="-0.13333344"/>
<positionData x="26.386534" y="-0.26666668"/>
</stars>
<energy x="15.180049" y="-0.066666745"/>
</level>
<level packId="2" id="3" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="2" id="3" goalX="25.860003" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-2.75" width="0.5"/>
<tileData x="2.75" width="0.5"/>
<tileData x="-1.6967497" width="2.6065006"/>
<tileData x="4.180088" width="1.1731749"/>
<tileData x="15.665028" width="1.7966995"/>
<tileData x="18.417282" width="2.5078144"/>
<tileData x="28.989388" width="8.214399"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
<tileData x="8.863336" width="23.726671"/>
<tileData x="23.293339" width="5.1333294"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="true" moving="true" deadly="false" leftEdge="-1.1233333" rightEdge="-0.62333333" height="0.5" y="-0.96000004">
<moveComponent length="5.0" rotation="22.618" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="0.0"/>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="-0.34966657" rightEdge="0.23633346" height="0.344" y="-0.91999984">
<moveComponent length="3.041" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.413"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="4.8861732" rightEdge="5.447173" height="0.344" y="-0.9466667">
<moveComponent length="8.969" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.332"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="6.9713426" rightEdge="7.7353425" height="0.268" y="-0.53999996">
<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.790513" rightEdge="8.249513" height="0.255" y="-0.41999993">
<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="8.390855" rightEdge="9.995854" height="0.268" y="0.43333322">
<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="10.046182" rightEdge="10.6071825" height="0.548" y="0.43999988">
<moveComponent length="2.99" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.393"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="11.534539" rightEdge="12.145539" height="0.369" y="-0.49333328">
<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="14.576048" rightEdge="16.84405" height="0.344" y="0.5399999">
<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="17.023209" rightEdge="18.73021" height="0.242" y="-0.26666662">
<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="17.642849" rightEdge="18.20385" height="0.166" y="-0.517">
<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="18.332848" rightEdge="18.993847" height="0.191" y="-0.50450003">
<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="19.080456" rightEdge="19.819454" height="0.777" y="0.046666622">
<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="19.897995" rightEdge="21.961994" height="0.191" y="-0.7866664">
<moveComponent length="1.649" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.472" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="22.333464" rightEdge="24.626463" height="0.191" y="-0.7999999">
<moveComponent length="1.675" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.306" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="25.007763" rightEdge="25.338764" height="0.764" y="0.15333332">
<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"/>
<stars class="java.util.ArrayList">
<positionData x="8.313339" y="-0.6133333"/>
<positionData x="9.153345" y="0.73999983"/>
<positionData x="14.440009" y="-0.44000006"/>
</stars>
<energy x="22.146631" y="-0.24666664"/>
</level>
<level packId="2" id="4" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="2" id="4" goalX="29.313349" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-2.75" width="0.5"/>
<tileData x="2.75" width="0.5"/>
<tileData x="-0.77800035" width="4.4439993"/>
<tileData x="7.711343" width="4.390688"/>
<tileData x="11.118361" width="1.2233505"/>
<tileData x="12.970045" width="1.2800169"/>
<tileData x="15.317139" width="2.2141714"/>
<tileData x="19.00354" width="3.428629"/>
<tileData x="26.584368" width="4.3910217"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
<tileData x="13.156673" width="32.313347"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="true" moving="true" deadly="false" leftEdge="-1.1566666" rightEdge="-0.65666664" height="0.5" y="-0.92666656">
<moveComponent length="2.929" rotation="84.817" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="0.0"/>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="1.0356662" rightEdge="1.6976664" 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="false" leftEdge="1.9989979" rightEdge="2.380998" height="0.561" y="-0.4666667">
<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="2.6224985" rightEdge="3.1574984" height="0.5" y="-0.6066667">
<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="3.3799977" rightEdge="3.8799977" height="0.5" y="-0.8066666">
<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="8.220012" rightEdge="8.720012" height="0.318" y="-0.44100004">
<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="9.960027" rightEdge="10.460027" height="0.5" y="-0.35666674">
<moveComponent length="1.959" rotation="0.0" startOffset="0.301" direction="1.0" speed="0.467" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="11.773375" rightEdge="12.273375" height="0.5" y="0.39999986">
<moveComponent length="1.985" rotation="0.0" startOffset="0.697" direction="1.0" speed="0.29" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="13.636717" rightEdge="14.136717" height="0.5" y="-0.006666666">
<moveComponent length="1.856" rotation="0.0" startOffset="0.462" direction="1.0" speed="0.548" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="17.287226" rightEdge="18.306227" height="0.382" y="-0.40900004">
<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="19.328707" rightEdge="20.704706" height="0.382" y="-0.40900004">
<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="21.054178" rightEdge="22.099176" height="0.293" y="-0.59333324">
<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.329338" rightEdge="22.737339" height="0.395" y="-0.49333328">
<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="22.973795" rightEdge="23.992796" height="0.306" y="-0.24666682">
<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="26.663101" rightEdge="28.370102" 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>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="28.176752" rightEdge="28.60975" height="0.548" y="0.0333333">
<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"/>
<stars class="java.util.ArrayList">
<positionData x="4.706664" y="0.11333333"/>
<positionData x="12.033373" y="-0.020000003"/>
<positionData x="18.820047" y="-0.43333328"/>
</stars>
<energy x="28.576557" y="-0.42666665"/>
</level>
</levels>
</levelPack>

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

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

8
app/src/main/res/drawable/xml_background_tutorialimageview.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="1dp" />
<stroke
android:width="3dp"
android:color="#d8000000" />
</shape>

3
app/src/main/res/layout/tutorial.xml
View File

@ -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"/>
</RelativeLayout>