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

Changed particle effects

Browse Source 
Message renamed to GameOverMessage + improved look
Added first implementation of GoalScreen
Cleaned up and improved look of levelButton, worldButton and their screens
This commit is contained in:
=
2017-11-04 17:28:46 +01:00
parent 4e758353b8
commit 8d4caeaf69
37 changed files with 825 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/particleEffects/collectEnergy.pe
View File

@ -34,7 +34,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
spawnShape: point
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0

12
app/src/main/assets/particleEffects/collectStar.pe
View File

@ -38,7 +38,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
spawnShape: point
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
@ -110,20 +110,16 @@ active: false
- Gravity -
active: false
- Tint -
colorsCount: 9
colorsCount: 6
colors0: 1.0
colors1: 0.92941177
colors2: 0.047058824
colors3: 1.0
colors4: 0.92941177
colors5: 0.047058824
colors6: 1.0
colors7: 0.78039217
colors8: 0.047058824
timelineCount: 3
timelineCount: 2
timeline0: 0.0
timeline1: 0.7521515
timeline2: 1.0
timeline1: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0

2
app/src/main/assets/particleEffects/explosion.pe
View File

@ -44,7 +44,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
spawnShape: square
shape: square
- Spawn Width -
lowMin: 200.0
lowMax: 200.0

2
app/src/main/assets/particleEffects/firework.pe
View File

@ -34,7 +34,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
spawnShape: point
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0

2
app/src/main/assets/particleEffects/magnet.pe
View File

@ -38,7 +38,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
spawnShape: point
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0

2
app/src/main/assets/particleEffects/fire.pe → app/src/main/assets/particleEffects/superPower.pe
View File

@ -46,7 +46,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
spawnShape: point
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0

15
app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
View File

@ -15,8 +15,8 @@ public class Stasis extends PlayerInfluenceTool {
private ParticleSource particleSource;
private boolean firstCollision = true;
private final static float Y_SLOW_FACTOR = .2f;
private final static float X_SLOW_FACTOR = .8f;
private final static float Y_SLOW_FACTOR = .4f; //Final .2f
private final static float X_SLOW_FACTOR = .9f; //Final .8f
public Stasis(Vector position, ParticleSystem particleSystem) {
super(ToolType.STASIS, position,
@ -27,7 +27,8 @@ public class Stasis extends PlayerInfluenceTool {
animation.setRequiredDelta(300);
animation.setIndexSequence(new int[]{1, 1, 2, 3, 2, 4, 4, 3, 2, 2, 3, 3});
super.setFloating(true);
particleSource = new ParticleSource(new Vector(position), particleSystem.magnet);
particleSource = new ParticleSource(new Vector(position), particleSystem.stasis);
particleSource.setSpawnSize(new Vector(super.width, super.height));
particleSource.start();
}
@ -54,10 +55,12 @@ public class Stasis extends PlayerInfluenceTool {
@Override
public void influencePlayerValues(Player player) {
player.manipulateAllForces(Y_SLOW_FACTOR);
player.getMovement().setX(player.getMovement().getX() * .8f);
float forceValue = ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.FORCE);
float finalXSlow = X_SLOW_FACTOR - forceValue / 20f;
player.manipulateAllForces(Y_SLOW_FACTOR / forceValue);
player.getMovement().setX(player.getMovement().getX() * finalXSlow);
if (firstCollision) {
player.getMovement().y *= Y_SLOW_FACTOR;
player.getMovement().y *= Y_SLOW_FACTOR / forceValue;
firstCollision = false;
}

60
app/src/main/java/de/frajul/endlessroll/main/screens/GoalScreen.java Normal file
View File

@ -0,0 +1,60 @@
package de.frajul.endlessroll.main.screens;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.HashMap;
import java.util.Map;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.levels.Level;
import de.frajul.endlessroll.levels.LevelPack;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.game.Game;
import de.frajul.endlessroll.views.LevelButton;
import de.frajul.endlessroll.views.LevelButtonOnClickListener;
import de.frajul.endlessroll.views.TopBar;
/**
* Created by Julian on 23.04.2016.
*/
public class GoalScreen extends Screen<LinearLayout> implements LevelButtonOnClickListener {
private LevelPack levelPack;
private TopBar topBar;
private TextView title;
private LevelButton restart;
private LevelButton nextLevel;
public GoalScreen(GameActivity gameActivity) {
super(ScreenType.GOAL, gameActivity, R.layout.goal_screen);
topBar = super.createTopBar(R.id.goal_screen_topbar);
title = (TextView) layout.findViewById(R.id.goal_screen_title);
title.setTypeface(gameActivity.getTypeface());
restart = new LevelButton(gameActivity, this, layout.findViewById(R.id.goal_screen_restart));
nextLevel = new LevelButton(gameActivity, this, layout.findViewById(R.id.goal_screen_next_level));
}
public void onLevelFinished(LevelPack levelPack, Level level){
this.levelPack = levelPack;
restart.init(level);
nextLevel.init(levelPack.getNextLevel(level));
}
@Override
public void prepareToBeShown() {
topBar.update();
}
@Override
public void onBackKeyDown() {
flipTo(ScreenType.LEVELS);
}
@Override
public void onClick(LevelButton levelButton) {
gameActivity.startGame(levelPack, levelButton.getLevel());
}
}

11
app/src/main/java/de/frajul/endlessroll/views/LevelButtonOnClickListener.java Normal file
View File

@ -0,0 +1,11 @@
package de.frajul.endlessroll.views;
/**
* Created by Julian on 04.11.2017.
*/
public interface LevelButtonOnClickListener {
public void onClick(LevelButton levelButton);
}

11
app/src/main/java/de/frajul/endlessroll/views/WorldButtonOnClickListener.java Normal file
View File

@ -0,0 +1,11 @@
package de.frajul.endlessroll.views;
/**
* Created by Julian on 04.11.2017.
*/
public interface WorldButtonOnClickListener {
public void onClick(WorldButton worldButton);
}

BIN
app/src/main/res/drawable/tools_stasis_button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 62 KiB

BIN
app/src/main/res/drawable/tutorial_place_ramp_air_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 149 KiB

BIN
app/src/main/res/drawable/tutorial_place_ramp_air_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 124 KiB

BIN
app/src/main/res/drawable/tutorial_place_ramp_gap.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 106 KiB

BIN
app/src/main/res/drawable/tutorial_place_ramp_obstacle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 111 KiB

BIN
app/src/main/res/drawable/tutorial_place_tools.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 105 KiB

BIN
app/src/main/res/drawable/tutorial_toolbar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 165 KiB

16
app/src/main/res/drawable/xml_background_game_over_message_button.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="10dp"/>
<padding android:bottom="0dp" android:left="5dp" android:right="5dp" android:top="0dp"/>
<solid android:color="#96ffffff"/> </shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="10dp"/>
<padding android:bottom="0dp" android:left="5dp" android:right="5dp" android:top="0dp"/>
<solid android:color="#96a7a7a7"/> </shape>
</item>
</selector>

4
app/src/main/res/layout/game.xml
View File

@ -64,8 +64,8 @@
android:visibility="invisible"/>
<include
android:id="@+id/game_message"
layout="@layout/message"
android:id="@+id/game_game_over_message"
layout="@layout/game_over_message"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"

63
app/src/main/res/layout/game_over_message.xml Normal file
View File

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_levelup_message"
android:orientation="vertical">
<include
android:id="@+id/game_over_message_topbar"
layout="@layout/topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/game_over_message_title">
<Button
android:id="@+id/game_over_message_to_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_to_menu"
android:textColor="@color/message_views"
android:background="@drawable/xml_background_game_over_message_button"
android:textSize="40sp"/>
</RelativeLayout>
<TextView
android:id="@+id/game_over_message_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_game_over"
android:textColor="@color/game_over"
android:textSize="55sp"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/game_over_message_title">
<Button
android:id="@+id/game_over_message_try_again"
android:layout_width="wrap_content"
android:background="@drawable/xml_background_game_over_message_button"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_try_again"
android:textColor="@color/message_views"
android:textSize="40sp"/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

59
app/src/main/res/layout/goal_screen.xml Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/backgrounds_menu_grass"
android:orientation="vertical">
<include
android:id="@+id/goal_screen_topbar"
layout="@layout/topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/goal_screen_bottom_layout">
<TextView
android:id="@+id/goal_screen_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/message_level_finished"
android:textColor="@color/level_finished"
android:textSize="55sp"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/goal_screen_bottom_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true">
<include
android:id="@+id/goal_screen_restart"
layout="@layout/levelbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_margin="5dp"/>
<include
android:id="@+id/goal_screen_next_level"
layout="@layout/levelbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_margin="5dp"/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

81
app/src/main/res/layout/levelbutton.xml
View File

@ -2,61 +2,68 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/xml_background_levelbutton"
android:layout_margin="10dp">
<TextView
android:id="@+id/levelbutton_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/placeholder_button"
android:textSize="30sp"
android:layout_centerHorizontal="true"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="140dp"
android:layout_height="70dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true">
android:layout_width="wrap_content"
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<ImageView
<TextView
android:id="@+id/levelbutton_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star1"
android:layout_weight="1"/>
android:text="@string/placeholder_button"
android:textSize="30sp"
android:layout_gravity="center_horizontal"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star2"
android:layout_weight="1"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="140dp"
android:layout_height="50dp"
android:layout_gravity="center_horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star3"
android:layout_weight="1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star1"
android:layout_weight="1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_energy_empty"
android:id="@+id/levelbutton_energy"
android:layout_weight="1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star2"
android:layout_weight="1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star3"
android:layout_weight="1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_energy_empty"
android:id="@+id/levelbutton_energy"
android:layout_weight="1"/>
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/levelbutton_lock"
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@drawable/guis_lock_locked"
android:layout_centerInParent="true"
android:visibility="invisible"
android:layout_weight="1"/>
android:visibility="invisible"/>
</RelativeLayout>

52
app/src/main/res/layout/levels.xml
View File

@ -8,10 +8,8 @@
<include
android:id="@+id/levels_topbar"
layout="@layout/topbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_marginBottom="5dp"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<HorizontalScrollView
android:id="@+id/horizontalScrollView"
@ -19,37 +17,33 @@
android:layout_height="match_parent"
android:layout_gravity="center">
<TableLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:stretchColumns="*">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">
<TableRow
android:id="@+id/levels_topRow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:orientation="vertical">
<!--Will be removed before levelbuttons are added. Just there because android 7.0 doesn't like empty tableRows ;-) -->
<TextView
<LinearLayout
android:id="@+id/levels_top_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"/>
</TableRow>
<TableRow
android:id="@+id/levels_bottomRow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<!--Will be removed before levelbuttons are added. Just there because android 7.0 doesn't like empty tableRows ;-) -->
<TextView
<LinearLayout
android:id="@+id/levels_bottom_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</TableRow>
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"/>
</LinearLayout>
</RelativeLayout>
</TableLayout>
</HorizontalScrollView>
</LinearLayout>

66
app/src/main/res/layout/message.xml
View File

@ -1,66 +0,0 @@
<?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">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_game_over"
android:id="@+id/message_title"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:textSize="55sp"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_above="@+id/message_title"
android:layout_centerHorizontal="true">
<TextView
android:id="@+id/message_tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="200dp"
android:text="@string/message_tools"
android:textColor="@color/message_views"
android:textSize="40sp"/>
<TextView
android:id="@+id/message_to_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_to_menu"
android:textColor="@color/message_views"
android:textSize="40sp"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_marginTop="20dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@+id/message_title"
android:layout_centerHorizontal="true">
<TextView
android:id="@+id/message_restart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_restart"
android:textColor="@color/message_views"
android:textSize="40sp"
android:layout_marginEnd="120dp"/>
<TextView
android:id="@+id/message_next_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_next_level"
android:textColor="@color/message_views"
android:textSize="40sp"/>
</LinearLayout>
</RelativeLayout>

6
app/src/main/res/layout/short_menu.xml
View File

@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:text="@string/short_menu_continue"
android:textSize="40sp"
android:textColor="@color/win"
android:textColor="@color/level_finished"
android:id="@+id/shortmenu_continue"/>
<TextView
@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:text="@string/message_restart"
android:textSize="40sp"
android:textColor="@color/win"
android:textColor="@color/level_finished"
android:id="@+id/shortmenu_restart"/>
<TextView
@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:text="@string/short_menu_exit"
android:textSize="40sp"
android:textColor="@color/win"
android:textColor="@color/level_finished"
android:id="@+id/shortmenu_exit"/>
</LinearLayout>
</FrameLayout>

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

@ -1,7 +1,8 @@
<?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:layout_height="match_parent"
android:background="@color/background_tutorial">
<RelativeLayout
android:layout_width="wrap_content"

136
app/src/main/res/layout/world_button.xml
View File

@ -1,115 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="260dp"
android:layout_height="match_parent"
android:background="@drawable/xml_background_worldbutton">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/xml_background_worldbutton"
android:orientation="vertical"
android:padding="15dp">
<TextView
android:id="@+id/worldbutton_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="@string/world_button_title_placeholder"
android:textColor="#ff2200"
android:textSize="30sp"
android:textStyle="bold|italic"/>
<ImageView
android:id="@+id/worldbutton_preview"
android:layout_height="wrap_content"
android:layout_below="@+id/worldbutton_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:adjustViewBounds="true"
android:src="@drawable/world_previews_grass"
android:layout_width="150dp"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true">
<TextView
android:id="@+id/worldbutton_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/world_button_title_placeholder"
android:textColor="#ff2200"
android:textSize="30sp"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true">
android:layout_gravity="center_horizontal">
<ImageView
android:id="@+id/worldbutton_preview"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="10dp"
android:adjustViewBounds="true"
android:src="@drawable/world_previews_grass"/>
<ImageView
android:id="@+id/worldbutton_lock"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerInParent="true"
android:src="@drawable/guis_lock_locked"
android:visibility="visible"/>
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/worldbutton_tickView"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_alignParentStart="true"
android:layout_gravity="center_vertical"
android:src="@drawable/guis_tick"/>
<TextView
android:id="@+id/worldbutton_levelcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/worldbutton_tickView"
android:layout_toEndOf="@+id/worldbutton_tickView"
android:layout_marginRight="10dp"/>
android:textSize="20sp"/>
<ImageView
android:id="@+id/levelbutton_starView"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/worldbutton_levelcount"
android:layout_toEndOf="@+id/worldbutton_levelcount"
android:layout_gravity="center_vertical"
android:src="@drawable/currency_star"/>
<TextView
android:id="@+id/worldbutton_starcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/levelbutton_starView"
android:layout_toRightOf="@+id/levelbutton_starView"
android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginRight="10dp"/>
android:textSize="20sp"/>
<ImageView
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_gravity="center_vertical"
android:src="@drawable/currency_energy"/>
<TextView
android:id="@+id/worldbutton_energycount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/imageView4"
android:layout_toRightOf="@+id/imageView4"
android:layout_gravity="center_vertical"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"/>
android:textSize="20sp"/>
<ImageView
android:id="@+id/imageView4"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/worldbutton_starcount"
android:layout_toRightOf="@+id/worldbutton_starcount"
android:src="@drawable/currency_energy"/>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
<ImageView
android:id="@+id/worldbutton_lock"
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/guis_lock_locked"
android:visibility="visible"
android:layout_alignBottom="@+id/worldbutton_preview"
android:layout_alignLeft="@+id/worldbutton_preview"
android:layout_alignStart="@+id/worldbutton_preview"/>
</RelativeLayout>
</LinearLayout>

5
app/src/main/res/values/colors.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="win">#ffda45</color>
<color name="loose">#891e4e</color>
<color name="level_finished">#ffda45</color>
<color name="game_over">#f11e6f</color>
<color name="retry">#39be27</color>
<color name="game_progress_text">#ffb405</color>
<color name="message_views">#daf10d</color>
@ -19,4 +19,5 @@
<color name="countdown1">#f0d7b106</color>
<color name="background_levelup_message">#9d000000</color>
<color name="background_short_menu">#5b000000</color>
<color name="background_tutorial">#3d000000</color>
</resources>

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

@ -15,11 +15,11 @@
<string name="task_completed">Task completed</string>
<string name="levelup">Level Up</string>
<string name="message_game_over">GAME OVER</string>
<string name="message_win">YOU DID IT</string>
<string name="message_level_finished">LEVEL FINISHED</string>
<string name="message_tools">Tools</string>
<string name="message_to_menu">To menu</string>
<string name="message_restart">Restart</string>
<string name="message_try_again">Try again</string>
<string name="message_restart">Restart</string>
<string name="message_next_level">Next level</string>
<string name="pre_start_screen_loading">LOADING...</string>
<string name="short_menu_continue">Continue</string>
@ -68,6 +68,8 @@
<string name="task_collect_energy_format_d">Collect %d energy</string>
<string name="task_complete_world_format_d">Finish the %d. world</string>
<string name="world_button_count_format_dd">%d/%d</string>
<string name="tool_description_locked_format_d">You will unlock this mysterious tool at level %d</string>
<string name="tool_description_ramp">Roll up the ramp to gain height</string>
<string name="tool_description_spring">Shoots you in the air</string>
@ -96,11 +98,10 @@
<string name="tutorial_placeholder">This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?</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_tools">Click anywhere on the screen to place the ramp</string>
<string name="tutorial_place_ramp_gap">Try to place your ramp in front of the gap</string>
<string name="tutorial_place_ramp_obstacle">Great job!\nNow place it in front of the obstacle</string>
<string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTime carefully!</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>