Balanced levels, level-up-bounties, tool-costs
Polished credits
This commit is contained in:
@ -510,9 +510,6 @@
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="22.281925" rightEdge="25.797924" height="0.51" y="-0.34500003">
|
||||
<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="false" deadly="false" leftEdge="22.829952" rightEdge="23.329952" height="0.5" y="0.7533329">
|
||||
<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="false" deadly="false" leftEdge="23.379932" rightEdge="23.879932" height="0.5" y="0.5066667">
|
||||
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
|
||||
</obstacleData>
|
||||
@ -522,9 +519,6 @@
|
||||
<obstacleData floating="true" moving="false" deadly="true" leftEdge="24.463232" rightEdge="24.963232" height="0.5" y="0.49333322">
|
||||
<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="false" deadly="true" leftEdge="24.996567" rightEdge="25.496567" height="0.5" y="0.75333303">
|
||||
<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="false" deadly="true" leftEdge="25.92555" rightEdge="26.30755" height="0.318" y="0.046666645">
|
||||
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
|
||||
</obstacleData>
|
||||
@ -795,16 +789,13 @@
|
||||
<obstacleData floating="true" moving="false" deadly="false" leftEdge="6.7466707" rightEdge="7.7466707" height="0.561" y="0.66666645">
|
||||
<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="false" deadly="true" leftEdge="8.579013" rightEdge="8.961013" height="0.382" y="0.8399999">
|
||||
<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="false" deadly="true" leftEdge="7.77701" rightEdge="8.08301" height="0.331" y="0.43333316">
|
||||
<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="false" deadly="true" leftEdge="7.6111684" rightEdge="7.9421687" height="0.357" y="-0.04">
|
||||
<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="false" deadly="true" leftEdge="8.783334" rightEdge="9.063334" height="0.306" y="0.39999986">
|
||||
<obstacleData floating="true" moving="false" deadly="false" leftEdge="8.783334" rightEdge="9.063334" height="0.306" y="0.39999986">
|
||||
<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="false" deadly="true" leftEdge="7.929989" rightEdge="8.20999" height="0.357" y="-0.65333307">
|
||||
@ -819,9 +810,6 @@
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="10.323043" rightEdge="11.597043" height="0.344" y="-0.42800003">
|
||||
<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="false" deadly="true" leftEdge="9.22001" rightEdge="9.5000105" height="0.28" y="0.7533332">
|
||||
<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="false" deadly="true" leftEdge="8.065852" rightEdge="8.320851" height="0.204" y="0.11333329">
|
||||
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
|
||||
</obstacleData>
|
||||
@ -867,7 +855,7 @@
|
||||
<positionData x="13.483405" y="-0.7733334"/>
|
||||
<positionData x="20.633293" y="0.43333328"/>
|
||||
</stars>
|
||||
<energy x="9.256675" y="0.41999993"/>
|
||||
<energy x="9.316678" y="0.47999987"/>
|
||||
</level>
|
||||
<level packId="1" id="15" goalX="21.456789" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
|
||||
<terrainTiles class="java.util.ArrayList">
|
||||
|
||||
@ -120,7 +120,7 @@
|
||||
<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">
|
||||
<obstacleData floating="true" moving="false" deadly="false" leftEdge="14.902351" 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">
|
||||
@ -129,7 +129,7 @@
|
||||
<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">
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="19.984478" rightEdge="20.31548" height="0.418" y="-0.39100003">
|
||||
<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">
|
||||
@ -747,9 +747,6 @@
|
||||
<obstacleData floating="true" moving="true" deadly="false" leftEdge="12.566045" rightEdge="13.254045" height="0.255" y="-0.006666649">
|
||||
<moveComponent length="2.036" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.265"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="true" moving="true" deadly="false" leftEdge="13.443692" rightEdge="13.749692" height="0.357" y="-0.3466666">
|
||||
<moveComponent length="1.108" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.611" hasPlayerXSpeed="false" triggerDistance="0.0"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="true" moving="true" deadly="true" leftEdge="15.324541" rightEdge="15.65554" height="0.382" y="-0.066666625">
|
||||
<moveComponent length="0.979" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.409" hasPlayerXSpeed="false" triggerDistance="0.0"/>
|
||||
</obstacleData>
|
||||
@ -785,7 +782,7 @@
|
||||
</obstacleData>
|
||||
</obstacles>
|
||||
<stars class="java.util.ArrayList">
|
||||
<positionData x="13.233373" y="-0.3533333"/>
|
||||
<positionData x="13.973402" y="-0.3533333"/>
|
||||
<positionData x="19.786663" y="0.5666666"/>
|
||||
<positionData x="26.836557" y="-0.4199999"/>
|
||||
</stars>
|
||||
|
||||
@ -16,17 +16,17 @@ public enum PlayerShape {
|
||||
R.drawable.playershapes_ball, new EmptyTask()),
|
||||
HYPNO_SPIRAL(R.string.playershape_name_hypno_spiral,
|
||||
R.string.playershape_description_hypno_spiral, R.drawable.playershapes_hypno_spiral,
|
||||
new CollectEnergyTask(3)),
|
||||
new CollectEnergyTask(5)),
|
||||
CLOCK(R.string.playershape_name_clock, R.string.playershape_description_clock,
|
||||
R.drawable.playershapes_clock, new CollectStarTask(15)),
|
||||
SUN(R.string.playershape_name_sun, R.string.playershape_description_sun,
|
||||
R.drawable.playershapes_sun, new CollectEnergyTask(10)),
|
||||
R.drawable.playershapes_sun, new CollectEnergyTask(25)),
|
||||
SMILEY(R.string.playershape_name_smiley, R.string.playershape_description_smiley,
|
||||
R.drawable.playershapes_smiley, new CollectStarTask(30)),
|
||||
R.drawable.playershapes_smiley, new CollectStarTask(50)),
|
||||
PACMAN(R.string.playershape_name_pacman, R.string.playershape_description_pacman,
|
||||
R.drawable.playershapes_pacman, new CompleteWorldTask(1)),
|
||||
WHEEL(R.string.playershape_name_wheel, R.string.playershape_description_wheel,
|
||||
R.drawable.playershapes_wheel, new CollectStarTask(45)),
|
||||
R.drawable.playershapes_wheel, new CollectStarTask(80)),
|
||||
BLUE(R.string.playershape_name_blue, R.string.playershape_description_blue,
|
||||
R.drawable.jury_playershapes_ball_omg_im_blue, new CompleteWorldTask(2));
|
||||
|
||||
|
||||
@ -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, 20, 4, 5,
|
||||
R.drawable.tools_bomb_button, 25, 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, 18, 2, 5,
|
||||
R.drawable.tools_magnet_button, 22, 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, 22, 4, 6,
|
||||
R.drawable.tools_stasis_button, 27, 4, 6,
|
||||
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 6000, 4000),
|
||||
new ToolUpgrade(ToolUpgradeType.FORCE, 1, 2),
|
||||
new ToolUpgrade(ToolUpgradeType.SIZE, 100, 200));
|
||||
|
||||
@ -22,8 +22,11 @@ public class LevelUpBounties extends HashMap<Integer, LevelBounty> {
|
||||
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));
|
||||
super.put(8, new LevelBounty(2, 2, null, false));
|
||||
super.put(9, new LevelBounty(2, 3, null, true));
|
||||
super.put(10, new LevelBounty(2, 1, null, true));
|
||||
super.put(11, new LevelBounty(2, 2, null, true));
|
||||
super.put(12, new LevelBounty(2, 4, null, true));
|
||||
loadAllForLevel(level);
|
||||
}
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@ package de.frajul.endlessroll.views;
|
||||
import android.animation.ObjectAnimator;
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.os.CountDownTimer;
|
||||
import android.support.annotation.IdRes;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
@ -27,6 +28,7 @@ public class CreditsDialog extends Dialog implements View.OnTouchListener {
|
||||
|
||||
private GameActivity gameActivity;
|
||||
|
||||
private View scrollViewLayout;
|
||||
private ImageView ball;
|
||||
private Animation rotation;
|
||||
private ScrollView scrollView;
|
||||
@ -57,6 +59,7 @@ public class CreditsDialog extends Dialog implements View.OnTouchListener {
|
||||
rotation = AnimationUtils.loadAnimation(gameActivity, R.anim.shape_button_rotation);
|
||||
scrollView = ((ScrollView) findViewById(R.id.credits_scrollview));
|
||||
scrollView.setOnTouchListener(this);
|
||||
scrollViewLayout = findViewById(R.id.credits_scrollview_layout);
|
||||
scrollViewAnimatorLock = new ReentrantLock();
|
||||
}
|
||||
|
||||
@ -77,8 +80,8 @@ public class CreditsDialog extends Dialog implements View.OnTouchListener {
|
||||
scrollViewAnimatorLock.lock();
|
||||
try {
|
||||
scrollViewAnimator = ObjectAnimator
|
||||
.ofInt(scrollView, "scrollY", scrollView.getBottom());
|
||||
scrollViewAnimator.setDuration(8000);
|
||||
.ofInt(scrollView, "scrollY", scrollViewLayout.getBottom() - scrollView.getHeight());
|
||||
scrollViewAnimator.setDuration(14000);
|
||||
scrollViewAnimator.setInterpolator(new LinearInterpolator());
|
||||
scrollViewAnimator.start();
|
||||
} finally {
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
android:scrollbars="none">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/credits_scrollview_layout"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
@ -44,7 +45,7 @@
|
||||
android:layout_marginBottom="@dimen/credits_margin_between_categories"
|
||||
android:text="@string/credits_author"
|
||||
android:textAlignment="center"
|
||||
android:textSize="20sp"/>
|
||||
android:textSize="25sp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/credits_testers_title"
|
||||
|
||||
@ -71,11 +71,11 @@
|
||||
<string name="tutorial_switch_tools_two_neccessary">Für dieses Level müssen zwei Tools ausgerüstet sein</string>
|
||||
<string name="tutorial_switch_tools_switch">Wähle, welches Tool du benutzen willst, indem du darauf klickst</string>
|
||||
<string name="tutorial_place_ramp_gap">Setze die Rampe vor die Lücke</string>
|
||||
<string name="credits_author">von Frajul</string>
|
||||
<string name="credits_author">von Julian Mutter</string>
|
||||
<string name="credits_testers_title">TESTER</string>
|
||||
<string name="credits_music_title">MUSIK</string>
|
||||
<string name="settings_music">Musik</string>
|
||||
<string name="settings_show_fps">Fps anzeigen</string>
|
||||
<string name="playershape_name_blue">Ich bin blau</string>
|
||||
<string name="playershape_name_blue">Blau</string>
|
||||
<string name="playershape_description_blue">Warum bin ich blau?</string>
|
||||
</resources>
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="credits_margin_between_categories">30dp</dimen>
|
||||
<dimen name="credits_margin_between_categories">50dp</dimen>
|
||||
<dimen name="tool_inspector_width">170dp</dimen>
|
||||
<dimen name="shape_inspector_width">170dp</dimen>
|
||||
<dimen name="tool_button_width">70dp</dimen>
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
<string name="playershape_name_smiley">Smiley</string>
|
||||
<string name="playershape_name_wheel">Wheel</string>
|
||||
<string name="playershape_name_sun">Sun</string>
|
||||
<string name="playershape_name_blue">I\'m blue</string>
|
||||
<string name="playershape_name_blue">Blue</string>
|
||||
<string name="playershape_name_locked" translatable="false">\?\?\?</string>
|
||||
<string name="playershape_description_ball" translatable="false">Keep calm and roll on</string>
|
||||
<string name="playershape_description_clock" translatable="false">Tick tack!</string>
|
||||
@ -110,7 +110,7 @@
|
||||
<string name="tutorial_switch_tools_switch">Choose which tool to use by clicking on it</string>
|
||||
|
||||
<string name="credits_title" translatable="false">ENDLESS ROLL</string>
|
||||
<string name="credits_author">by Frajul</string>
|
||||
<string name="credits_author">by Julian Mutter</string>
|
||||
<string name="credits_testers_title">TESTERS</string>
|
||||
<string name="credits_testers" translatable="false">Tester1\nTester2\nTester3\nTester4</string>
|
||||
<string name="credits_sounds_title" translatable="false">SOUNDS</string>
|
||||
|
||||
Reference in New Issue
Block a user