Balanced levels, level-up-bounties, tool-costs

Polished credits
This commit is contained in:
julian 2018-06-30 18:15:39 +02:00
parent aec2ce0d80
commit b7cab6f453
16 changed files with 295 additions and 312 deletions

View File

@ -98,6 +98,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />

View File

@ -484,74 +484,74 @@ public final class R {
public static final int chronometer = 0x7f08001c; public static final int chronometer = 0x7f08001c;
public static final int collapseActionView = 0x7f08001d; public static final int collapseActionView = 0x7f08001d;
public static final int contentPanel = 0x7f080021; public static final int contentPanel = 0x7f080021;
public static final int custom = 0x7f08002c; public static final int custom = 0x7f08002d;
public static final int customPanel = 0x7f08002d; public static final int customPanel = 0x7f08002e;
public static final int decor_content_parent = 0x7f08002e; public static final int decor_content_parent = 0x7f08002f;
public static final int default_activity_button = 0x7f08002f; public static final int default_activity_button = 0x7f080030;
public static final int disableHome = 0x7f080030; public static final int disableHome = 0x7f080031;
public static final int edit_query = 0x7f080031; public static final int edit_query = 0x7f080032;
public static final int end = 0x7f080032; public static final int end = 0x7f080033;
public static final int end_padder = 0x7f080033; public static final int end_padder = 0x7f080034;
public static final int expand_activities_button = 0x7f080034; public static final int expand_activities_button = 0x7f080035;
public static final int expanded_menu = 0x7f080035; public static final int expanded_menu = 0x7f080036;
public static final int home = 0x7f08004c; public static final int home = 0x7f08004d;
public static final int homeAsUp = 0x7f08004d; public static final int homeAsUp = 0x7f08004e;
public static final int icon = 0x7f08004e; public static final int icon = 0x7f08004f;
public static final int ifRoom = 0x7f080050; public static final int ifRoom = 0x7f080051;
public static final int image = 0x7f080051; public static final int image = 0x7f080052;
public static final int info = 0x7f080052; public static final int info = 0x7f080053;
public static final int line1 = 0x7f080061; public static final int line1 = 0x7f080062;
public static final int line3 = 0x7f080062; public static final int line3 = 0x7f080063;
public static final int listMode = 0x7f080064; public static final int listMode = 0x7f080065;
public static final int list_item = 0x7f080065; public static final int list_item = 0x7f080066;
public static final int media_actions = 0x7f080066; public static final int media_actions = 0x7f080067;
public static final int middle = 0x7f080067; public static final int middle = 0x7f080068;
public static final int multiply = 0x7f080068; public static final int multiply = 0x7f080069;
public static final int never = 0x7f080069; public static final int never = 0x7f08006a;
public static final int none = 0x7f08006a; public static final int none = 0x7f08006b;
public static final int normal = 0x7f08006b; public static final int normal = 0x7f08006c;
public static final int parentPanel = 0x7f08006f; public static final int parentPanel = 0x7f080070;
public static final int progress_circular = 0x7f080074; public static final int progress_circular = 0x7f080075;
public static final int progress_horizontal = 0x7f080075; public static final int progress_horizontal = 0x7f080076;
public static final int radio = 0x7f080076; public static final int radio = 0x7f080077;
public static final int screen = 0x7f080079; public static final int screen = 0x7f08007a;
public static final int scrollIndicatorDown = 0x7f08007a; public static final int scrollIndicatorDown = 0x7f08007b;
public static final int scrollIndicatorUp = 0x7f08007b; public static final int scrollIndicatorUp = 0x7f08007c;
public static final int scrollView = 0x7f08007c; public static final int scrollView = 0x7f08007d;
public static final int search_badge = 0x7f08007d; public static final int search_badge = 0x7f08007e;
public static final int search_bar = 0x7f08007e; public static final int search_bar = 0x7f08007f;
public static final int search_button = 0x7f08007f; public static final int search_button = 0x7f080080;
public static final int search_close_btn = 0x7f080080; public static final int search_close_btn = 0x7f080081;
public static final int search_edit_frame = 0x7f080081; public static final int search_edit_frame = 0x7f080082;
public static final int search_go_btn = 0x7f080082; public static final int search_go_btn = 0x7f080083;
public static final int search_mag_icon = 0x7f080083; public static final int search_mag_icon = 0x7f080084;
public static final int search_plate = 0x7f080084; public static final int search_plate = 0x7f080085;
public static final int search_src_text = 0x7f080085; public static final int search_src_text = 0x7f080086;
public static final int search_voice_btn = 0x7f080086; public static final int search_voice_btn = 0x7f080087;
public static final int select_dialog_listview = 0x7f080087; public static final int select_dialog_listview = 0x7f080088;
public static final int shortcut = 0x7f08009c; public static final int shortcut = 0x7f08009d;
public static final int showCustom = 0x7f0800a1; public static final int showCustom = 0x7f0800a2;
public static final int showHome = 0x7f0800a2; public static final int showHome = 0x7f0800a3;
public static final int showTitle = 0x7f0800a3; public static final int showTitle = 0x7f0800a4;
public static final int spacer = 0x7f0800a4; public static final int spacer = 0x7f0800a5;
public static final int split_action_bar = 0x7f0800a5; public static final int split_action_bar = 0x7f0800a6;
public static final int src_atop = 0x7f0800a6; public static final int src_atop = 0x7f0800a7;
public static final int src_in = 0x7f0800a7; public static final int src_in = 0x7f0800a8;
public static final int src_over = 0x7f0800a8; public static final int src_over = 0x7f0800a9;
public static final int status_bar_latest_event_content = 0x7f0800ae; public static final int status_bar_latest_event_content = 0x7f0800af;
public static final int submit_area = 0x7f0800af; public static final int submit_area = 0x7f0800b0;
public static final int tabMode = 0x7f0800b0; public static final int tabMode = 0x7f0800b1;
public static final int text = 0x7f0800b2; public static final int text = 0x7f0800b3;
public static final int text2 = 0x7f0800b3; public static final int text2 = 0x7f0800b4;
public static final int textSpacerNoButtons = 0x7f0800b4; public static final int textSpacerNoButtons = 0x7f0800b5;
public static final int time = 0x7f0800b5; public static final int time = 0x7f0800b6;
public static final int title = 0x7f0800b6; public static final int title = 0x7f0800b7;
public static final int title_template = 0x7f0800b7; public static final int title_template = 0x7f0800b8;
public static final int topPanel = 0x7f0800c8; public static final int topPanel = 0x7f0800c9;
public static final int up = 0x7f0800da; public static final int up = 0x7f0800db;
public static final int useLogo = 0x7f0800db; public static final int useLogo = 0x7f0800dc;
public static final int withText = 0x7f0800dc; public static final int withText = 0x7f0800dd;
public static final int wrap_content = 0x7f0800e5; public static final int wrap_content = 0x7f0800e6;
} }
public static final class integer { public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000; public static final int abc_config_activityDefaultDur = 0x7f090000;

View File

@ -510,9 +510,6 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="22.281925" rightEdge="25.797924" height="0.51" y="-0.34500003"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
@ -522,9 +519,6 @@
<obstacleData floating="true" moving="false" deadly="true" leftEdge="24.463232" rightEdge="24.963232" height="0.5" y="0.49333322"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
@ -795,16 +789,13 @@
<obstacleData floating="true" moving="false" deadly="false" leftEdge="6.7466707" rightEdge="7.7466707" height="0.561" y="0.66666645"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="7.6111684" rightEdge="7.9421687" height="0.357" y="-0.04"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="7.929989" rightEdge="8.20999" height="0.357" y="-0.65333307"> <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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
@ -867,7 +855,7 @@
<positionData x="13.483405" y="-0.7733334"/> <positionData x="13.483405" y="-0.7733334"/>
<positionData x="20.633293" y="0.43333328"/> <positionData x="20.633293" y="0.43333328"/>
</stars> </stars>
<energy x="9.256675" y="0.41999993"/> <energy x="9.316678" y="0.47999987"/>
</level> </level>
<level packId="1" id="15" goalX="21.456789" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0"> <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"> <terrainTiles class="java.util.ArrayList">

File diff suppressed because one or more lines are too long

View File

@ -22,6 +22,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:testOnly="true"
android:theme="@style/AppTheme" > android:theme="@style/AppTheme" >
<activity <activity
android:name="de.frajul.endlessroll.main.GameActivity" android:name="de.frajul.endlessroll.main.GameActivity"

View File

@ -651,197 +651,198 @@ int id credits_ball 0x7f080023
int id credits_music 0x7f080024 int id credits_music 0x7f080024
int id credits_music_title 0x7f080025 int id credits_music_title 0x7f080025
int id credits_scrollview 0x7f080026 int id credits_scrollview 0x7f080026
int id credits_sounds 0x7f080027 int id credits_scrollview_layout 0x7f080027
int id credits_sounds_title 0x7f080028 int id credits_sounds 0x7f080028
int id credits_testers 0x7f080029 int id credits_sounds_title 0x7f080029
int id credits_testers_title 0x7f08002a int id credits_testers 0x7f08002a
int id credits_title 0x7f08002b int id credits_testers_title 0x7f08002b
int id custom 0x7f08002c int id credits_title 0x7f08002c
int id customPanel 0x7f08002d int id custom 0x7f08002d
int id decor_content_parent 0x7f08002e int id customPanel 0x7f08002e
int id default_activity_button 0x7f08002f int id decor_content_parent 0x7f08002f
int id disableHome 0x7f080030 int id default_activity_button 0x7f080030
int id edit_query 0x7f080031 int id disableHome 0x7f080031
int id end 0x7f080032 int id edit_query 0x7f080032
int id end_padder 0x7f080033 int id end 0x7f080033
int id expand_activities_button 0x7f080034 int id end_padder 0x7f080034
int id expanded_menu 0x7f080035 int id expand_activities_button 0x7f080035
int id forever 0x7f080036 int id expanded_menu 0x7f080036
int id game_fps 0x7f080037 int id forever 0x7f080037
int id game_game_over_message 0x7f080038 int id game_fps 0x7f080038
int id game_goal_message 0x7f080039 int id game_game_over_message 0x7f080039
int id game_over_message_title 0x7f08003a int id game_goal_message 0x7f08003a
int id game_over_message_to_menu 0x7f08003b int id game_over_message_title 0x7f08003b
int id game_over_message_topbar 0x7f08003c int id game_over_message_to_menu 0x7f08003c
int id game_over_message_try_again 0x7f08003d int id game_over_message_topbar 0x7f08003d
int id game_pausebutton 0x7f08003e int id game_over_message_try_again 0x7f08003e
int id game_playerprogress 0x7f08003f int id game_pausebutton 0x7f08003f
int id game_shortmenu 0x7f080040 int id game_playerprogress 0x7f080040
int id goal_message_bottom_layout 0x7f080041 int id game_shortmenu 0x7f080041
int id goal_message_levelbutton_energy 0x7f080042 int id goal_message_bottom_layout 0x7f080042
int id goal_message_levelbutton_star1 0x7f080043 int id goal_message_levelbutton_energy 0x7f080043
int id goal_message_levelbutton_star2 0x7f080044 int id goal_message_levelbutton_star1 0x7f080044
int id goal_message_levelbutton_star3 0x7f080045 int id goal_message_levelbutton_star2 0x7f080045
int id goal_message_levelbutton_textview 0x7f080046 int id goal_message_levelbutton_star3 0x7f080046
int id goal_message_next_level 0x7f080047 int id goal_message_levelbutton_textview 0x7f080047
int id goal_message_restart 0x7f080048 int id goal_message_next_level 0x7f080048
int id goal_message_title 0x7f080049 int id goal_message_restart 0x7f080049
int id goal_message_to_menu 0x7f08004a int id goal_message_title 0x7f08004a
int id goal_message_topbar 0x7f08004b int id goal_message_to_menu 0x7f08004b
int id home 0x7f08004c int id goal_message_topbar 0x7f08004c
int id homeAsUp 0x7f08004d int id home 0x7f08004d
int id icon 0x7f08004e int id homeAsUp 0x7f08004e
int id icon_group 0x7f08004f int id icon 0x7f08004f
int id ifRoom 0x7f080050 int id icon_group 0x7f080050
int id image 0x7f080051 int id ifRoom 0x7f080051
int id info 0x7f080052 int id image 0x7f080052
int id italic 0x7f080053 int id info 0x7f080053
int id levelbutton_energy 0x7f080054 int id italic 0x7f080054
int id levelbutton_lock 0x7f080055 int id levelbutton_energy 0x7f080055
int id levelbutton_star1 0x7f080056 int id levelbutton_lock 0x7f080056
int id levelbutton_star2 0x7f080057 int id levelbutton_star1 0x7f080057
int id levelbutton_star3 0x7f080058 int id levelbutton_star2 0x7f080058
int id levelbutton_textview 0x7f080059 int id levelbutton_star3 0x7f080059
int id levels_ad_view 0x7f08005a int id levelbutton_textview 0x7f08005a
int id levels_bottom_row 0x7f08005b int id levels_ad_view 0x7f08005b
int id levels_top_row 0x7f08005c int id levels_bottom_row 0x7f08005c
int id levels_topbar 0x7f08005d int id levels_top_row 0x7f08005d
int id levelup_level 0x7f08005e int id levels_topbar 0x7f08005e
int id levelup_text 0x7f08005f int id levelup_level 0x7f08005f
int id levelup_unlocklist 0x7f080060 int id levelup_text 0x7f080060
int id line1 0x7f080061 int id levelup_unlocklist 0x7f080061
int id line3 0x7f080062 int id line1 0x7f080062
int id linearLayout4 0x7f080063 int id line3 0x7f080063
int id listMode 0x7f080064 int id linearLayout4 0x7f080064
int id list_item 0x7f080065 int id listMode 0x7f080065
int id media_actions 0x7f080066 int id list_item 0x7f080066
int id middle 0x7f080067 int id media_actions 0x7f080067
int id multiply 0x7f080068 int id middle 0x7f080068
int id never 0x7f080069 int id multiply 0x7f080069
int id none 0x7f08006a int id never 0x7f08006a
int id normal 0x7f08006b int id none 0x7f08006b
int id notification_background 0x7f08006c int id normal 0x7f08006c
int id notification_main_column 0x7f08006d int id notification_background 0x7f08006d
int id notification_main_column_container 0x7f08006e int id notification_main_column 0x7f08006e
int id parentPanel 0x7f08006f int id notification_main_column_container 0x7f08006f
int id pre_start_screen_text 0x7f080070 int id parentPanel 0x7f080070
int id price_button_currency 0x7f080071 int id pre_start_screen_text 0x7f080071
int id price_button_price 0x7f080072 int id price_button_currency 0x7f080072
int id price_button_title 0x7f080073 int id price_button_price 0x7f080073
int id progress_circular 0x7f080074 int id price_button_title 0x7f080074
int id progress_horizontal 0x7f080075 int id progress_circular 0x7f080075
int id radio 0x7f080076 int id progress_horizontal 0x7f080076
int id right_icon 0x7f080077 int id radio 0x7f080077
int id right_side 0x7f080078 int id right_icon 0x7f080078
int id screen 0x7f080079 int id right_side 0x7f080079
int id scrollIndicatorDown 0x7f08007a int id screen 0x7f08007a
int id scrollIndicatorUp 0x7f08007b int id scrollIndicatorDown 0x7f08007b
int id scrollView 0x7f08007c int id scrollIndicatorUp 0x7f08007c
int id search_badge 0x7f08007d int id scrollView 0x7f08007d
int id search_bar 0x7f08007e int id search_badge 0x7f08007e
int id search_button 0x7f08007f int id search_bar 0x7f08007f
int id search_close_btn 0x7f080080 int id search_button 0x7f080080
int id search_edit_frame 0x7f080081 int id search_close_btn 0x7f080081
int id search_go_btn 0x7f080082 int id search_edit_frame 0x7f080082
int id search_mag_icon 0x7f080083 int id search_go_btn 0x7f080083
int id search_plate 0x7f080084 int id search_mag_icon 0x7f080084
int id search_src_text 0x7f080085 int id search_plate 0x7f080085
int id search_voice_btn 0x7f080086 int id search_src_text 0x7f080086
int id select_dialog_listview 0x7f080087 int id search_voice_btn 0x7f080087
int id settings_credits 0x7f080088 int id select_dialog_listview 0x7f080088
int id settings_fps_checkbox 0x7f080089 int id settings_credits 0x7f080089
int id settings_music_label 0x7f08008a int id settings_fps_checkbox 0x7f08008a
int id settings_musictoggle 0x7f08008b int id settings_music_label 0x7f08008b
int id settings_reset 0x7f08008c int id settings_musictoggle 0x7f08008c
int id settings_sounds_label 0x7f08008d int id settings_reset 0x7f08008d
int id settings_soundtoggle 0x7f08008e int id settings_sounds_label 0x7f08008e
int id settings_topbar 0x7f08008f int id settings_soundtoggle 0x7f08008f
int id shape_button_button 0x7f080090 int id settings_topbar 0x7f080090
int id shape_button_textview 0x7f080091 int id shape_button_button 0x7f080091
int id shape_inspector_check_box 0x7f080092 int id shape_button_textview 0x7f080092
int id shape_inspector_check_box_image 0x7f080093 int id shape_inspector_check_box 0x7f080093
int id shape_inspector_check_box_text 0x7f080094 int id shape_inspector_check_box_image 0x7f080094
int id shape_inspector_description 0x7f080095 int id shape_inspector_check_box_text 0x7f080095
int id shape_inspector_imageview 0x7f080096 int id shape_inspector_description 0x7f080096
int id shape_inspector_title 0x7f080097 int id shape_inspector_imageview 0x7f080097
int id shape_shop_bottomRow 0x7f080098 int id shape_inspector_title 0x7f080098
int id shape_shop_shape_inspector 0x7f080099 int id shape_shop_bottomRow 0x7f080099
int id shape_shop_topRow 0x7f08009a int id shape_shop_shape_inspector 0x7f08009a
int id shape_shop_topbar 0x7f08009b int id shape_shop_topRow 0x7f08009b
int id shortcut 0x7f08009c int id shape_shop_topbar 0x7f08009c
int id shortmenu_continue 0x7f08009d int id shortcut 0x7f08009d
int id shortmenu_exit 0x7f08009e int id shortmenu_continue 0x7f08009e
int id shortmenu_restart 0x7f08009f int id shortmenu_exit 0x7f08009f
int id shortmenu_topbar 0x7f0800a0 int id shortmenu_restart 0x7f0800a0
int id showCustom 0x7f0800a1 int id shortmenu_topbar 0x7f0800a1
int id showHome 0x7f0800a2 int id showCustom 0x7f0800a2
int id showTitle 0x7f0800a3 int id showHome 0x7f0800a3
int id spacer 0x7f0800a4 int id showTitle 0x7f0800a4
int id split_action_bar 0x7f0800a5 int id spacer 0x7f0800a5
int id src_atop 0x7f0800a6 int id split_action_bar 0x7f0800a6
int id src_in 0x7f0800a7 int id src_atop 0x7f0800a7
int id src_over 0x7f0800a8 int id src_in 0x7f0800a8
int id startscreen_finish_world_1 0x7f0800a9 int id src_over 0x7f0800a9
int id startscreen_gain_90_ep 0x7f0800aa int id startscreen_finish_world_1 0x7f0800aa
int id startscreen_play 0x7f0800ab int id startscreen_gain_90_ep 0x7f0800ab
int id startscreen_to_gl_test_screen 0x7f0800ac int id startscreen_play 0x7f0800ac
int id startscreen_unlock_levels 0x7f0800ad int id startscreen_to_gl_test_screen 0x7f0800ad
int id status_bar_latest_event_content 0x7f0800ae int id startscreen_unlock_levels 0x7f0800ae
int id submit_area 0x7f0800af int id status_bar_latest_event_content 0x7f0800af
int id tabMode 0x7f0800b0 int id submit_area 0x7f0800b0
int id task_completed_unlock_list 0x7f0800b1 int id tabMode 0x7f0800b1
int id text 0x7f0800b2 int id task_completed_unlock_list 0x7f0800b2
int id text2 0x7f0800b3 int id text 0x7f0800b3
int id textSpacerNoButtons 0x7f0800b4 int id text2 0x7f0800b4
int id time 0x7f0800b5 int id textSpacerNoButtons 0x7f0800b5
int id title 0x7f0800b6 int id time 0x7f0800b6
int id title_template 0x7f0800b7 int id title 0x7f0800b7
int id tool_inspector_description 0x7f0800b8 int id title_template 0x7f0800b8
int id tool_inspector_imageview 0x7f0800b9 int id tool_inspector_description 0x7f0800b9
int id tool_inspector_level_view 0x7f0800ba int id tool_inspector_imageview 0x7f0800ba
int id tool_inspector_pricebutton 0x7f0800bb int id tool_inspector_level_view 0x7f0800bb
int id tool_inspector_title 0x7f0800bc int id tool_inspector_pricebutton 0x7f0800bc
int id toolofferslot_slot 0x7f0800bd int id tool_inspector_title 0x7f0800bd
int id toolofferslot_title 0x7f0800be int id toolofferslot_slot 0x7f0800be
int id toolshop_slot1 0x7f0800bf int id toolofferslot_title 0x7f0800bf
int id toolshop_slot2 0x7f0800c0 int id toolshop_slot1 0x7f0800c0
int id toolshop_slot3 0x7f0800c1 int id toolshop_slot2 0x7f0800c1
int id toolshop_slot4 0x7f0800c2 int id toolshop_slot3 0x7f0800c2
int id toolshop_tool_offer_bottom_row 0x7f0800c3 int id toolshop_slot4 0x7f0800c3
int id toolshop_tool_offer_top_row 0x7f0800c4 int id toolshop_tool_offer_bottom_row 0x7f0800c4
int id toolshop_toolinspector 0x7f0800c5 int id toolshop_tool_offer_top_row 0x7f0800c5
int id toolshop_topbar 0x7f0800c6 int id toolshop_toolinspector 0x7f0800c6
int id toolslot_image 0x7f0800c7 int id toolshop_topbar 0x7f0800c7
int id topPanel 0x7f0800c8 int id toolslot_image 0x7f0800c8
int id topbar_back_button 0x7f0800c9 int id topPanel 0x7f0800c9
int id topbar_energycount 0x7f0800ca int id topbar_back_button 0x7f0800ca
int id topbar_energycount_decrease 0x7f0800cb int id topbar_energycount 0x7f0800cb
int id topbar_energyview 0x7f0800cc int id topbar_energycount_decrease 0x7f0800cc
int id topbar_leveldisplay 0x7f0800cd int id topbar_energyview 0x7f0800cd
int id topbar_levellayout 0x7f0800ce int id topbar_leveldisplay 0x7f0800ce
int id topbar_levelprogress 0x7f0800cf int id topbar_levellayout 0x7f0800cf
int id topbar_settings 0x7f0800d0 int id topbar_levelprogress 0x7f0800d0
int id topbar_shapeshop 0x7f0800d1 int id topbar_settings 0x7f0800d1
int id topbar_starcount 0x7f0800d2 int id topbar_shapeshop 0x7f0800d2
int id topbar_starcount_decrease 0x7f0800d3 int id topbar_starcount 0x7f0800d3
int id topbar_starview 0x7f0800d4 int id topbar_starcount_decrease 0x7f0800d4
int id topbar_toolshop 0x7f0800d5 int id topbar_starview 0x7f0800d5
int id tutorial_image_view 0x7f0800d6 int id topbar_toolshop 0x7f0800d6
int id tutorial_text_view 0x7f0800d7 int id tutorial_image_view 0x7f0800d7
int id unlockmessage_message 0x7f0800d8 int id tutorial_text_view 0x7f0800d8
int id unlockmessage_toolimage 0x7f0800d9 int id unlockmessage_message 0x7f0800d9
int id up 0x7f0800da int id unlockmessage_toolimage 0x7f0800da
int id useLogo 0x7f0800db int id up 0x7f0800db
int id withText 0x7f0800dc int id useLogo 0x7f0800dc
int id worldbutton_energycount 0x7f0800dd int id withText 0x7f0800dd
int id worldbutton_levelcount 0x7f0800de int id worldbutton_energycount 0x7f0800de
int id worldbutton_lock 0x7f0800df int id worldbutton_levelcount 0x7f0800df
int id worldbutton_preview 0x7f0800e0 int id worldbutton_lock 0x7f0800e0
int id worldbutton_starcount 0x7f0800e1 int id worldbutton_preview 0x7f0800e1
int id worldbutton_title 0x7f0800e2 int id worldbutton_starcount 0x7f0800e2
int id worlds_layout 0x7f0800e3 int id worldbutton_title 0x7f0800e3
int id worlds_topbar 0x7f0800e4 int id worlds_layout 0x7f0800e4
int id wrap_content 0x7f0800e5 int id worlds_topbar 0x7f0800e5
int id wrap_content 0x7f0800e6
int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001 int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002 int integer abc_max_action_buttons 0x7f090002

View File

@ -510,9 +510,6 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="22.281925" rightEdge="25.797924" height="0.51" y="-0.34500003"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
@ -522,9 +519,6 @@
<obstacleData floating="true" moving="false" deadly="true" leftEdge="24.463232" rightEdge="24.963232" height="0.5" y="0.49333322"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
@ -795,16 +789,13 @@
<obstacleData floating="true" moving="false" deadly="false" leftEdge="6.7466707" rightEdge="7.7466707" height="0.561" y="0.66666645"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="7.6111684" rightEdge="7.9421687" height="0.357" y="-0.04"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="7.929989" rightEdge="8.20999" height="0.357" y="-0.65333307"> <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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
@ -867,7 +855,7 @@
<positionData x="13.483405" y="-0.7733334"/> <positionData x="13.483405" y="-0.7733334"/>
<positionData x="20.633293" y="0.43333328"/> <positionData x="20.633293" y="0.43333328"/>
</stars> </stars>
<energy x="9.256675" y="0.41999993"/> <energy x="9.316678" y="0.47999987"/>
</level> </level>
<level packId="1" id="15" goalX="21.456789" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0"> <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"> <terrainTiles class="java.util.ArrayList">

View File

@ -120,7 +120,7 @@
<obstacleData floating="true" moving="true" deadly="false" leftEdge="11.798186" rightEdge="12.435185" height="0.408" y="-0.9466663"> <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"/> <moveComponent length="3.015" rotation="49.948" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.515"/>
</obstacleData> </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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="17.039186" rightEdge="17.574186" height="0.446" y="0.47999996"> <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"> <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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </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"/> <moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="21.741276" rightEdge="21.945274" height="0.369" y="0.4766668"> <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"> <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"/> <moveComponent length="2.036" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.265"/>
</obstacleData> </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"> <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"/> <moveComponent length="0.979" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.409" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData> </obstacleData>
@ -785,7 +782,7 @@
</obstacleData> </obstacleData>
</obstacles> </obstacles>
<stars class="java.util.ArrayList"> <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="19.786663" y="0.5666666"/>
<positionData x="26.836557" y="-0.4199999"/> <positionData x="26.836557" y="-0.4199999"/>
</stars> </stars>

View File

@ -16,17 +16,17 @@ public enum PlayerShape {
R.drawable.playershapes_ball, new EmptyTask()), R.drawable.playershapes_ball, new EmptyTask()),
HYPNO_SPIRAL(R.string.playershape_name_hypno_spiral, HYPNO_SPIRAL(R.string.playershape_name_hypno_spiral,
R.string.playershape_description_hypno_spiral, R.drawable.playershapes_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, CLOCK(R.string.playershape_name_clock, R.string.playershape_description_clock,
R.drawable.playershapes_clock, new CollectStarTask(15)), R.drawable.playershapes_clock, new CollectStarTask(15)),
SUN(R.string.playershape_name_sun, R.string.playershape_description_sun, 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, 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, PACMAN(R.string.playershape_name_pacman, R.string.playershape_description_pacman,
R.drawable.playershapes_pacman, new CompleteWorldTask(1)), R.drawable.playershapes_pacman, new CompleteWorldTask(1)),
WHEEL(R.string.playershape_name_wheel, R.string.playershape_description_wheel, 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, BLUE(R.string.playershape_name_blue, R.string.playershape_description_blue,
R.drawable.jury_playershapes_ball_omg_im_blue, new CompleteWorldTask(2)); R.drawable.jury_playershapes_ball_omg_im_blue, new CompleteWorldTask(2));

View File

@ -23,11 +23,11 @@ public enum ToolType {
R.drawable.tools_spring_button, 5, 2, 5, R.drawable.tools_spring_button, 5, 2, 5,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 4000, 2000)), new ToolUpgrade(ToolUpgradeType.COOLDOWN, 4000, 2000)),
BOMB(R.string.tool_name_bomb, R.string.tool_description_bomb, R.drawable.tools_bomb, 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.COOLDOWN, 5000, 2000),
new ToolUpgrade(ToolUpgradeType.DURATION, 1200, 500)), new ToolUpgrade(ToolUpgradeType.DURATION, 1200, 500)),
MAGNET(R.string.tool_name_magnet, R.string.tool_description_magnet, R.drawable.tools_magnet, 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.COOLDOWN, 5000, 3000),
new ToolUpgrade(ToolUpgradeType.FORCE, 100, 500)), new ToolUpgrade(ToolUpgradeType.FORCE, 100, 500)),
POWER_MUSHROOM(R.string.tool_name_power_mushroom, R.string.tool_description_power_mushroom, 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), 5, 7, new ToolUpgrade(ToolUpgradeType.COOLDOWN, 15000, 11000),
new ToolUpgrade(ToolUpgradeType.DURATION, 5000, 10000)), new ToolUpgrade(ToolUpgradeType.DURATION, 5000, 10000)),
STASIS(R.string.tool_name_stasis, R.string.tool_description_stasis, R.drawable.tools_stasis, 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.COOLDOWN, 6000, 4000),
new ToolUpgrade(ToolUpgradeType.FORCE, 1, 2), new ToolUpgrade(ToolUpgradeType.FORCE, 1, 2),
new ToolUpgrade(ToolUpgradeType.SIZE, 100, 200)); new ToolUpgrade(ToolUpgradeType.SIZE, 100, 200));

View File

@ -22,8 +22,11 @@ public class LevelUpBounties extends HashMap<Integer, LevelBounty> {
super.put(5, new LevelBounty(5, 1, ToolType.MAGNET, false)); super.put(5, new LevelBounty(5, 1, ToolType.MAGNET, false));
super.put(6, new LevelBounty(5, 2, null, true)); super.put(6, new LevelBounty(5, 2, null, true));
super.put(7, new LevelBounty(5, 1, ToolType.STASIS, false)); super.put(7, new LevelBounty(5, 1, ToolType.STASIS, false));
super.put(8, new LevelBounty(5, 2, null, false)); super.put(8, new LevelBounty(2, 2, null, false));
super.put(9, new LevelBounty(5, 1, null, true)); 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); loadAllForLevel(level);
} }

View File

@ -3,6 +3,7 @@ package de.frajul.endlessroll.views;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.os.CountDownTimer;
import android.support.annotation.IdRes; import android.support.annotation.IdRes;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -27,6 +28,7 @@ public class CreditsDialog extends Dialog implements View.OnTouchListener {
private GameActivity gameActivity; private GameActivity gameActivity;
private View scrollViewLayout;
private ImageView ball; private ImageView ball;
private Animation rotation; private Animation rotation;
private ScrollView scrollView; private ScrollView scrollView;
@ -57,6 +59,7 @@ public class CreditsDialog extends Dialog implements View.OnTouchListener {
rotation = AnimationUtils.loadAnimation(gameActivity, R.anim.shape_button_rotation); rotation = AnimationUtils.loadAnimation(gameActivity, R.anim.shape_button_rotation);
scrollView = ((ScrollView) findViewById(R.id.credits_scrollview)); scrollView = ((ScrollView) findViewById(R.id.credits_scrollview));
scrollView.setOnTouchListener(this); scrollView.setOnTouchListener(this);
scrollViewLayout = findViewById(R.id.credits_scrollview_layout);
scrollViewAnimatorLock = new ReentrantLock(); scrollViewAnimatorLock = new ReentrantLock();
} }
@ -77,8 +80,8 @@ public class CreditsDialog extends Dialog implements View.OnTouchListener {
scrollViewAnimatorLock.lock(); scrollViewAnimatorLock.lock();
try { try {
scrollViewAnimator = ObjectAnimator scrollViewAnimator = ObjectAnimator
.ofInt(scrollView, "scrollY", scrollView.getBottom()); .ofInt(scrollView, "scrollY", scrollViewLayout.getBottom() - scrollView.getHeight());
scrollViewAnimator.setDuration(8000); scrollViewAnimator.setDuration(14000);
scrollViewAnimator.setInterpolator(new LinearInterpolator()); scrollViewAnimator.setInterpolator(new LinearInterpolator());
scrollViewAnimator.start(); scrollViewAnimator.start();
} finally { } finally {

View File

@ -13,6 +13,7 @@
android:scrollbars="none"> android:scrollbars="none">
<LinearLayout <LinearLayout
android:id="@+id/credits_scrollview_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
@ -44,7 +45,7 @@
android:layout_marginBottom="@dimen/credits_margin_between_categories" android:layout_marginBottom="@dimen/credits_margin_between_categories"
android:text="@string/credits_author" android:text="@string/credits_author"
android:textAlignment="center" android:textAlignment="center"
android:textSize="20sp"/> android:textSize="25sp"/>
<TextView <TextView
android:id="@+id/credits_testers_title" android:id="@+id/credits_testers_title"

View File

@ -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_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_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="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_testers_title">TESTER</string>
<string name="credits_music_title">MUSIK</string> <string name="credits_music_title">MUSIK</string>
<string name="settings_music">Musik</string> <string name="settings_music">Musik</string>
<string name="settings_show_fps">Fps anzeigen</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> <string name="playershape_description_blue">Warum bin ich blau?</string>
</resources> </resources>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <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="tool_inspector_width">170dp</dimen>
<dimen name="shape_inspector_width">170dp</dimen> <dimen name="shape_inspector_width">170dp</dimen>
<dimen name="tool_button_width">70dp</dimen> <dimen name="tool_button_width">70dp</dimen>

View File

@ -53,7 +53,7 @@
<string name="playershape_name_smiley">Smiley</string> <string name="playershape_name_smiley">Smiley</string>
<string name="playershape_name_wheel">Wheel</string> <string name="playershape_name_wheel">Wheel</string>
<string name="playershape_name_sun">Sun</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_name_locked" translatable="false">\?\?\?</string>
<string name="playershape_description_ball" translatable="false">Keep calm and roll on</string> <string name="playershape_description_ball" translatable="false">Keep calm and roll on</string>
<string name="playershape_description_clock" translatable="false">Tick tack!</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="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_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_title">TESTERS</string>
<string name="credits_testers" translatable="false">Tester1\nTester2\nTester3\nTester4</string> <string name="credits_testers" translatable="false">Tester1\nTester2\nTester3\nTester4</string>
<string name="credits_sounds_title" translatable="false">SOUNDS</string> <string name="credits_sounds_title" translatable="false">SOUNDS</string>