Made levels easier (probably not enough)

Changed tutorials to standard (evtl. text + evtl. image) + added images
This commit is contained in:
=
2017-07-27 11:50:03 +02:00
parent b8322c9f05
commit c71d1a767e
27 changed files with 2388 additions and 5965 deletions

View File

@ -1,16 +1,16 @@
<levelPack id="1">
<world>GRASSLANDS</world>
<levels class="java.util.ArrayList">
<level packId="1" id="1" goalX="16.896702" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="1" id="1" goalX="16.896702" startSpeed="0.4" endSpeed="0.4" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="1.0092487" width="8.018497"/>
<tileData x="13.61743" width="15.911868"/>
<tileData x="1.0707483" width="8.141497"/>
<tileData x="13.59593" width="15.954868"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="6.948351" width="19.896702"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="12.00004" rightEdge="12.50004" height="0.382" y="-0.40900004">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="12.006709" rightEdge="12.506709" height="0.318" y="-0.44100004">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
</obstacles>
@ -19,13 +19,13 @@
<positionData x="12.263359" y="-0.0266667"/>
<positionData x="16.58005" y="0.77999955"/>
</stars>
<energy x="12.243361" y="-0.40666705"/>
<energy x="12.2500305" y="-0.45333368"/>
</level>
<level packId="1" id="2" goalX="23.896725" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="1" id="2" goalX="23.896725" startSpeed="0.4" endSpeed="0.4" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="1.6106672" width="9.221334"/>
<tileData x="12.331865" width="10.333063"/>
<tileData x="20.876247" width="4.5356846"/>
<tileData x="1.6130004" width="9.226001"/>
<tileData x="12.257368" width="10.486735"/>
<tileData x="20.768412" width="4.751354"/>
<tileData x="25.874727" width="4.7972755"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
@ -44,18 +44,18 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="23.488386" rightEdge="24.138388" height="0.331" y="-0.43450004">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="11.798721" rightEdge="14.454721" height="0.204" y="-0.49800003">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="11.885392" rightEdge="14.541392" height="0.204" y="-0.49800003">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="6.6933284" y="-0.57999974"/>
<positionData x="6.626662" y="-0.5666664"/>
<positionData x="14.833428" y="-0.4399998"/>
<positionData x="18.076752" y="-0.50000006"/>
<positionData x="17.97675" y="-0.5133334"/>
</stars>
<energy x="16.436743" y="-0.37333328"/>
</level>
<level packId="1" id="3" goalX="25.803282" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="1" id="3" goalX="25.449945" startSpeed="0.4" endSpeed="0.4" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="2.928771" width="11.857542"/>
<tileData x="14.645462" width="3.5258408"/>
@ -63,7 +63,7 @@
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="6.5533686" width="19.106737"/>
<tileData x="20.95501" width="9.696545"/>
<tileData x="20.778341" width="9.343208"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="2.3533306" rightEdge="5.3533306" height="0.357" y="-0.42150003">
@ -104,7 +104,7 @@
</stars>
<energy x="9.043368" y="-0.8999996"/>
</level>
<level packId="1" id="4" goalX="23.266603" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="1" id="4" goalX="23.266603" startSpeed="0.4" endSpeed="0.4" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-0.27333355" width="5.453333"/>
<tileData x="10.069099" width="5.231532"/>
@ -159,16 +159,16 @@
</stars>
<energy x="17.186693" y="-0.41333315"/>
</level>
<level packId="1" id="5" goalX="25.756561" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="1" id="5" goalX="25.756561" startSpeed="0.4" endSpeed="0.4" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-0.3149171" width="5.370166"/>
<tileData x="5.247172" width="3.9280117"/>
<tileData x="-0.22666693" width="5.546666"/>
<tileData x="5.158922" width="4.104512"/>
<tileData x="8.653435" width="0.0625"/>
<tileData x="9.939764" width="0.062160492"/>
<tileData x="12.285448" width="3.8192024"/>
<tileData x="16.539871" width="3.5896454"/>
<tileData x="21.039742" width="2.40209"/>
<tileData x="26.437824" width="7.5440884"/>
<tileData x="12.282529" width="3.813364"/>
<tileData x="16.469452" width="3.730482"/>
<tileData x="21.039742" width="2.402092"/>
<tileData x="26.437824" width="7.5440903"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="11.378281" width="28.756561"/>
@ -209,7 +209,7 @@
</stars>
<energy x="19.086668" y="-0.81333315"/>
</level>
<level packId="1" id="6" goalX="16.046711" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="1" id="6" goalX="16.046711" startSpeed="0.45" endSpeed="0.45" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="2.3134198" width="10.62684"/>
<tileData x="11.750938" width="5.8622084"/>

View File

@ -18,10 +18,17 @@ public class ToolShopTutorial extends Tutorial {
private boolean firstPartShown;
public ToolShopTutorial() {
super(-1, -1, new BreakPoint(0, R.id.tutorial_toolshop_welcome),
new BreakPoint(0, R.id.tutorial_toolshop_all_tools_and_inspector),
new BreakPoint(0, R.id.tutorial_toolshop_buy_spring),
new BreakPoint(1, R.id.tutorial_toolshop_equip_spring));
super(-1, -1, new BreakPoint(0, R.string.tutorial_toolshop_welcome, -1),
new BreakPoint(0, R.string.tutorial_toolshop_toolbar,
R.drawable.tutorial_toolshop_toolbar),
new BreakPoint(0, R.string.tutorial_toolshop_all_tools,
R.drawable.tutorial_toolshop_all_tools),
new BreakPoint(0, R.string.tutorial_toolshop_inspector,
R.drawable.tutorial_toolshop_inspector),
new BreakPoint(0, R.string.tutorial_toolshop_select_buy_spring,
R.drawable.tutorial_toolshop_select_buy_spring),
new BreakPoint(1, R.string.tutorial_toolshop_equip_spring,
R.drawable.tutorial_toolshop_equip_spring));
for (BreakPoint breakPoint : super.getBreakPoints()) {
if (breakPoint.getX() == 0)
atStartBreakPoints.add(breakPoint);

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 KiB

View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="20dp" />
<corners android:radius="13dp" />
<padding
android:bottom="13dp"
android:left="13dp"
android:right="13dp"
android:top="13dp" />
android:bottom="10dp"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
<stroke
android:width="3dp"
android:width="2dp"
android:color="#d8000000" />
<solid
android:color="#ffffff"/>

View File

@ -7,39 +7,41 @@
android:id="@+id/startscreen_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/startscreen_play"
android:layout_marginLeft="75dp"
android:layout_marginStart="75dp"
android:layout_marginTop="34dp"
android:layout_toEndOf="@+id/startscreen_play"
android:layout_toRightOf="@+id/startscreen_play"
android:background="@drawable/xml_selector_sound"
android:textOff=""
android:textOn=""
android:layout_below="@+id/startscreen_play"
android:layout_toRightOf="@+id/startscreen_play"
android:layout_toEndOf="@+id/startscreen_play"
android:layout_marginLeft="75dp"
android:layout_marginStart="75dp"/>
android:textOn=""/>
<Button
android:id="@+id/startscreen_play"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_marginTop="38dp"
android:background="@drawable/playershapes_ball"
android:text="Play"
android:textSize="25sp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:textColor="#ffffff"/>
android:layout_marginTop="38dp"
android:background="@drawable/playershapes_ball"
android:gravity="center"
android:text="Play"
android:textAlignment="gravity"
android:textColor="#ffffff"
android:textSize="26sp"/>
<Button
android:id="@+id/startscreen_comingsoon"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Level Up"
android:visibility="visible"
android:layout_alignBottom="@+id/startscreen_play"
android:layout_alignRight="@+id/startscreen_sound"
android:layout_alignEnd="@+id/startscreen_sound"
android:layout_marginBottom="26dp"/>
android:layout_alignRight="@+id/startscreen_sound"
android:layout_marginBottom="26dp"
android:text="Level Up"
android:visibility="visible"/>
<Button
android:id="@+id/startscreen_maxcheat"

View File

@ -1,295 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/backgrounds_menu_shortmenu">
android:layout_height="match_parent">
<!--android:background="@drawable/backgrounds_menu_shortmenu">-->
<include
layout="@layout/game"
android:visibility="gone"/>
<!--Empty-->
<RelativeLayout
android:id="@+id/tutorial_empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
<!--Welcome-->
<RelativeLayout
android:id="@+id/tutorial_welcome"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<TextView
android:id="@+id/tutorial_text_view"
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="56dp"
android:layout_marginRight="56dp"
android:layout_marginTop="80dp"
android:text="Welcome to Endless Roll!\nHave fun!"/>
</RelativeLayout>
<!--Tools-->
<RelativeLayout
android:id="@+id/tutorial_tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/imageView3"
android:layout_marginTop="23dp"
android:layout_toEndOf="@+id/imageView3"
android:layout_toRightOf="@+id/imageView3"
android:text="Here you can see your tools"/>
android:layout_centerHorizontal="true"
android:text="Welcome to Endless Roll!\nHave fun!"
android:textAlignment="center"/>
<ImageView
android:id="@+id/imageView3"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="171dp"
android:layout_marginStart="171dp"
android:layout_marginTop="86dp"
android:background="@drawable/guis_playerarrow"/>
</RelativeLayout>
<!--Place ramp-->
<RelativeLayout
android:id="@+id/tutorial_place_ramp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="104dp"
android:layout_marginRight="104dp"
android:layout_marginTop="105dp"
android:text="Now place your ramp in front of the gap!"/>
</RelativeLayout>
<!--Place ramp 2-->
<RelativeLayout
android:id="@+id/tutorial_place_ramp_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="104dp"
android:layout_marginRight="104dp"
android:layout_marginTop="105dp"
android:text="Now place it in front of the obstacle!"/>
</RelativeLayout>
<!--Ramp in air-->
<RelativeLayout
android:id="@+id/tutorial_ramp_in_air"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="43dp"
android:layout_marginStart="43dp"
android:layout_marginTop="88dp"
android:text="You can even set a Tool in mid-air!"/>
</RelativeLayout>
<!--Ramp in air 2-->
<RelativeLayout
android:id="@+id/tutorial_ramp_in_air_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="66dp"
android:text="Now try again!"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"/>
</RelativeLayout>
<!--Leveled up-->
<RelativeLayout
android:id="@+id/tutorial_leveled_up"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
android:id="@+id/textView3"
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="43dp"
android:layout_marginStart="43dp"
android:layout_marginTop="40dp"
android:text="Congratulations!!!"/>
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/textView3"
android:layout_alignStart="@+id/textView3"
android:layout_below="@+id/textView3"
android:text="You have leveled up!"/>
</RelativeLayout>
<!--Go to toolshop-->
<RelativeLayout
android:id="@+id/tutorial_go_to_toolshop"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="34dp"
android:layout_marginStart="34dp"
android:layout_marginTop="111dp"
android:text="Now go to the toolshop"/>
</RelativeLayout>
<!--Toolshop welcome-->
<RelativeLayout
android:id="@+id/tutorial_toolshop_welcome"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="34dp"
android:layout_marginStart="34dp"
android:layout_marginTop="111dp"
android:text="Welcome to the toolshop!"/>
</RelativeLayout>
<!--Toolshop all tools and inspector-->
<RelativeLayout
android:id="@+id/tutorial_toolshop_all_tools_and_inspector"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="34dp"
android:layout_marginStart="34dp"
android:layout_marginTop="111dp"
android:text="Here you can see all the tools you'll be able to buy"/>
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:text="Here you can buy and upgrade the selected tool"/>
</RelativeLayout>
<!--Toolshop buy spring-->
<RelativeLayout
android:id="@+id/tutorial_toolshop_buy_spring"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="34dp"
android:layout_marginStart="34dp"
android:layout_marginTop="111dp"
android:text="Now select the spring and buy it"/>
</RelativeLayout>
<!--Toolshop equip spring-->
<RelativeLayout
android:id="@+id/tutorial_toolshop_equip_spring"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="34dp"
android:layout_marginStart="34dp"
android:layout_marginTop="111dp"
android:text="Now tip on an unlocked slot of your toolbar to equip the spring"/>
<TextView
style="@style/TutorialTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:text="After that you'll be able to complete the next level"/>
android:id="@+id/tutorial_image_view"
android:layout_width="320dp"
android:layout_height="200dp"
android:layout_below="@+id/tutorial_text_view"
android:layout_centerHorizontal="true"
android:layout_marginTop="15dp"
android:padding="2dp"
android:background="#000000"
android:scaleType="fitXY"
android:src="@drawable/backgrounds_menu_grass"/>
</RelativeLayout>

View File

@ -1,3 +1,18 @@
<resources>
<string name="app_name">EndlessRoll</string>
<string name="app_name">Endless Roll</string>
<string name="tutorial_welcome">Welcome to Endless Roll!\nHave fun!</string>
<string name="tutorial_toolbar">This is the toolbar. Here you can select the tool you currently want to use.</string>
<string name="tutorial_place_tools">You can use the selected tool by clicking on the wanted position on the screen.</string>
<string name="tutorial_place_ramp_gap">Now place your ramp in front of the gap!</string>
<string name="tutorial_place_ramp_obstacle">Now place it in front of the obstacle!</string>
<string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTry it out!</string>
<string name="tutorial_place_ramp_air_2">Now try again!</string>
<string name="tutorial_leveled_up">Congratulations!!!\nYou have leveled up!</string>
<string name="tutorial_to_toolshop">Now go to the toolshop by either clicking on the \'Spring unlocked\' or the toolshop button!</string>
<string name="tutorial_toolshop_welcome">Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.</string>
<string name="tutorial_toolshop_toolbar">Right! That is your toolbar.</string>
<string name="tutorial_toolshop_all_tools">Here you can see all the tools you will be able to buy and use.</string>
<string name="tutorial_toolshop_inspector">Here one can buy and upgrade the selected tool.</string>
<string name="tutorial_toolshop_select_buy_spring">Now select the spring and buy it!</string>
<string name="tutorial_toolshop_equip_spring">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.</string>
</resources>