diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index e709441..23274b8 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1352,7 +1352,7 @@ Icy Mountains Testcave Mysterious fireworld - #ffda45#f11e6f#39be27#ffb405#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f0f41e02#f0f28117#f0d7b106#9d000000#5b000000#3d000000170dp170dp70dp60dpEndless RollClick me!I\'m a text!997.585.1%0.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Task completedLevel UpGAME OVERLEVEL FINISHEDToolsTo menuTry againRestartNext levelRestart Level %dNext Level: %dLOADING...ContinueRestartExitPlayUnlock all levels (Yes! It\'s magic!)Gain 90 ep (Nope! No magic at all!)Test GL Stuff!!!Time (Lv12)Level: 24Level: %dResetToolshopRamp unlockedGreat world21/15%s%s unlocked!You unlocked a ToolslotNew shape unlockedLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyWheelSun\?\?\?Keep calm and roll onTick tack!Hypnotizes you for more funPACMAN!Don\'t worry, roll happy!A nice car without the... carShine bright like the sunA new shape for more funEmpty taskCollect %d stars (%d/%d)Collect %d energy (%d/%d)Collect %d starsCollect %d energyFinish the %d. world%d/%dYou will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the airDifficult to handle, but if you master it you can do anythingBlow up all obstacles near the bombThis will give you super-powers for a few secondsFreezes a certain area which leads to longer in-air time\?\?\?RampSpringMagnetBombMushroomStasisLevel: %d%1$s (Lv%2$d)NoneTimeRadiusForceMax.YesNoDo you really want to exit the game?This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!Click anywhere on the screen to place the rampTry to place your ramp in front of the gapGreat job!\nNow place it in front of the obstacleYou can even set a Tool in mid-air.\nTime carefully!Now try again!Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.Right! That is your toolbar.Here you can see all the tools you will be able to buy and use.Here one can buy and upgrade the selected tool.Now select the spring and buy it!Now tip on an unlocked slot of your toolbar to equip the spring!\n(It is the same where the ramp is attached at the moment)\nAfter that you will be able to complete the next level.Congratulations! You have leveled up!\nNow go to the toolshopFor this level you will need two tools equippedTo switch between the tools click here \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt index 8a7c49e..e1f693b 100644 --- a/app/build/intermediates/symbols/debug/R.txt +++ b/app/build/intermediates/symbols/debug/R.txt @@ -535,30 +535,31 @@ int drawable tutorial_place_ramp_air_2 0x7f07007f int drawable tutorial_place_ramp_gap 0x7f070080 int drawable tutorial_place_ramp_obstacle 0x7f070081 int drawable tutorial_place_tools 0x7f070082 -int drawable tutorial_to_toolshop 0x7f070083 -int drawable tutorial_toolshop_all_tools 0x7f070084 -int drawable tutorial_toolshop_equip_spring 0x7f070085 -int drawable tutorial_toolshop_inspector 0x7f070086 -int drawable tutorial_toolshop_select_buy_spring 0x7f070087 -int drawable tutorial_toolshop_toolbar 0x7f070088 -int drawable world_previews_grass 0x7f070089 -int drawable xml_background_bountymessage 0x7f07008a -int drawable xml_background_dialog_button 0x7f07008b -int drawable xml_background_exit_confirm_dialog 0x7f07008c -int drawable xml_background_game_over_message_button 0x7f07008d -int drawable xml_background_levelbutton 0x7f07008e -int drawable xml_background_toolslot 0x7f07008f -int drawable xml_background_toolupgrade 0x7f070090 -int drawable xml_background_tutorialtextview 0x7f070091 -int drawable xml_background_worldbutton 0x7f070092 -int drawable xml_layers_toolprogressbar 0x7f070093 -int drawable xml_selector_gamebutton 0x7f070094 -int drawable xml_selector_pricebutton 0x7f070095 -int drawable xml_selector_settingsbutton 0x7f070096 -int drawable xml_selector_shapeshopbutton 0x7f070097 -int drawable xml_selector_sound 0x7f070098 -int drawable xml_selector_toolshopbutton 0x7f070099 -int drawable xml_shape_inspector_checkbox 0x7f07009a +int drawable tutorial_switch_tools 0x7f070083 +int drawable tutorial_to_toolshop 0x7f070084 +int drawable tutorial_toolshop_all_tools 0x7f070085 +int drawable tutorial_toolshop_equip_spring 0x7f070086 +int drawable tutorial_toolshop_inspector 0x7f070087 +int drawable tutorial_toolshop_select_buy_spring 0x7f070088 +int drawable tutorial_toolshop_toolbar 0x7f070089 +int drawable world_previews_grass 0x7f07008a +int drawable xml_background_bountymessage 0x7f07008b +int drawable xml_background_dialog_button 0x7f07008c +int drawable xml_background_exit_confirm_dialog 0x7f07008d +int drawable xml_background_game_over_message_button 0x7f07008e +int drawable xml_background_levelbutton 0x7f07008f +int drawable xml_background_toolslot 0x7f070090 +int drawable xml_background_toolupgrade 0x7f070091 +int drawable xml_background_tutorialtextview 0x7f070092 +int drawable xml_background_worldbutton 0x7f070093 +int drawable xml_layers_toolprogressbar 0x7f070094 +int drawable xml_selector_gamebutton 0x7f070095 +int drawable xml_selector_pricebutton 0x7f070096 +int drawable xml_selector_settingsbutton 0x7f070097 +int drawable xml_selector_shapeshopbutton 0x7f070098 +int drawable xml_selector_sound 0x7f070099 +int drawable xml_selector_toolshopbutton 0x7f07009a +int drawable xml_shape_inspector_checkbox 0x7f07009b int id action0 0x7f080000 int id action_bar 0x7f080001 int id action_bar_activity_content 0x7f080002 diff --git a/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java b/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java index e5d2b49..6f8aef1 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java +++ b/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java @@ -42,7 +42,7 @@ public class TutorialManager { toolShopTutorial = new ToolShopTutorial(gameActivity); switchToolsTutorial = new Tutorial(gameActivity, new BreakPoint(0, R.string.tutorial_switch_tools_two_neccessary, -1), - new BreakPoint(0, R.string.tutorial_switch_tools_switch, -1)); + new BreakPoint(0, R.string.tutorial_switch_tools_switch, R.drawable.tutorial_switch_tools)); } public void update(Level level, float playerProgress) { diff --git a/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java b/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java index b31b31f..5b3afbb 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java +++ b/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java @@ -64,7 +64,7 @@ public class TutorialView implements View.OnClickListener { textView.setText(textId); } if (imageId == -1) - imageView.setVisibility(View.INVISIBLE); + imageView.setVisibility(View.GONE); else { imageView.setVisibility(View.VISIBLE); imageView.setImageResource(imageId); diff --git a/app/src/main/java/de/frajul/endlessroll/views/TopBar.java b/app/src/main/java/de/frajul/endlessroll/views/TopBar.java index 04627b5..c6f14a9 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/TopBar.java +++ b/app/src/main/java/de/frajul/endlessroll/views/TopBar.java @@ -47,12 +47,12 @@ public class TopBar implements View.OnClickListener { Typeface typeface = gameActivity.getTypeface(); levelDisplay = (TextView) layout.findViewById(R.id.topbar_leveldisplay); -// levelDisplay.setTypeface(typeface); + levelDisplay.setTypeface(typeface); levelProgress = (ProgressBar) layout.findViewById(R.id.topbar_levelprogress); starCount = (TextView) layout.findViewById(R.id.topbar_starcount); -// starCount.setTypeface(typeface); + starCount.setTypeface(typeface); energyCount = (TextView) layout.findViewById(R.id.topbar_energycount); -// energyCount.setTypeface(typeface); + energyCount.setTypeface(typeface); settingsButton = (Button) layout.findViewById(R.id.topbar_settings); settingsButton.setOnClickListener(this); toolshopButton = (Button) layout.findViewById(R.id.topbar_toolshop); diff --git a/app/src/main/res/drawable/tutorial_switch_tools.png b/app/src/main/res/drawable/tutorial_switch_tools.png new file mode 100644 index 0000000..e2a0527 Binary files /dev/null and b/app/src/main/res/drawable/tutorial_switch_tools.png differ diff --git a/app/src/main/res/drawable/tutorial_to_toolshop.png b/app/src/main/res/drawable/tutorial_to_toolshop.png index a93bac7..ac03f76 100644 Binary files a/app/src/main/res/drawable/tutorial_to_toolshop.png and b/app/src/main/res/drawable/tutorial_to_toolshop.png differ diff --git a/app/src/main/res/layout/tutorial.xml b/app/src/main/res/layout/tutorial.xml index 52a6c4f..67962cd 100644 --- a/app/src/main/res/layout/tutorial.xml +++ b/app/src/main/res/layout/tutorial.xml @@ -22,13 +22,13 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 765e51c..98f7d5c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -107,7 +107,7 @@ Now try again! Congratulations! You have leveled up!\nNow go to the toolshop For this level you will need two tools equipped - To switch between the tools click here + To select a tool just click on it Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar. Right! That is your toolbar. Here you can see all the tools you will be able to buy and use.