From f252bfd4bd0540e9329e73179e649d07785b4d50 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 20 Feb 2017 16:07:12 +0100 Subject: [PATCH] Energy Drawable created + animation for Entity -> AnimatedEntity A Scene will automatically update all AnimatedEntities LevelUpBounties no longer grant EP --- app/app.iml | 16 +-- .../debug/android/support/v7/appcompat/R.java | 2 +- .../com/example/julian/endlessroll/R.java | 110 +++++++++--------- .../blame/res/debug/single/drawable.json | 16 ++- .../mergeDebugResources/merger.xml | 4 +- .../res/merged/debug/layout/topbar.xml | 50 ++++++-- .../res/merged/debug/layout/world_button.xml | 2 +- .../intermediates/res/resources-debug.ap_ | Bin 2090209 -> 2151672 bytes app/build/intermediates/symbols/debug/R.txt | 110 +++++++++--------- .../endlessroll/entities/AnimatedEntity.java | 25 ++++ .../julian/endlessroll/entities/Energy.java | 4 +- .../entities/textures/TexturePack.java | 4 +- .../endlessroll/entities/tools/Magnet.java | 5 - .../endlessroll/entities/tools/Ramp.java | 6 - .../endlessroll/entities/tools/Tool.java | 10 +- .../levels/levelup/LevelUpBounties.java | 4 +- .../julian/endlessroll/main/GameActivity.java | 7 ++ .../julian/endlessroll/main/game/Game.java | 4 +- .../endlessroll/main/game/GameScene.java | 3 +- .../julian/endlessroll/main/game/Physics.java | 2 - .../julian/endlessroll/main/game/Scene.java | 3 + .../julian/endlessroll/main/game/User.java | 19 +-- .../main/screens/ToolShopScreen.java | 2 +- .../julian/endlessroll/views/LevelButton.java | 6 +- .../endlessroll/views/LevelupMessage.java | 2 + .../julian/endlessroll/views/TopBar.java | 10 +- app/src/main/res/drawable/currency_energy.png | Bin 0 -> 12400 bytes .../res/drawable/currency_energy_atlas.png | Bin 0 -> 65020 bytes .../main/res/drawable/currency_star.png} | Bin app/src/main/res/drawable/star.png | Bin 11659 -> 0 bytes app/src/main/res/layout/topbar.xml | 50 ++++++-- app/src/main/res/layout/world_button.xml | 2 +- particlelab/particlelab.iml | 16 +-- 33 files changed, 295 insertions(+), 199 deletions(-) create mode 100644 app/src/main/java/com/example/julian/endlessroll/entities/AnimatedEntity.java create mode 100644 app/src/main/res/drawable/currency_energy.png create mode 100644 app/src/main/res/drawable/currency_energy_atlas.png rename app/{build/intermediates/res/merged/debug/drawable/star.png => src/main/res/drawable/currency_star.png} (100%) delete mode 100644 app/src/main/res/drawable/star.png diff --git a/app/app.iml b/app/app.iml index 7e28fff..a90aae5 100644 --- a/app/app.iml +++ b/app/app.iml @@ -66,14 +66,6 @@ - - - - - - - - @@ -82,6 +74,14 @@ + + + + + + + + diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java index 4849711..623c1c3 100644 --- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java +++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java @@ -456,7 +456,7 @@ public final class R { public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f020042; public static final int abc_textfield_search_default_mtrl_alpha = 0x7f020043; public static final int abc_textfield_search_material = 0x7f020044; - public static final int notification_template_icon_bg = 0x7f020070; + public static final int notification_template_icon_bg = 0x7f020072; } public static final class id { public static final int action0 = 0x7f0d006a; diff --git a/app/build/generated/source/r/debug/com/example/julian/endlessroll/R.java b/app/build/generated/source/r/debug/com/example/julian/endlessroll/R.java index 1dd7f56..61eaa73 100644 --- a/app/build/generated/source/r/debug/com/example/julian/endlessroll/R.java +++ b/app/build/generated/source/r/debug/com/example/julian/endlessroll/R.java @@ -1621,44 +1621,46 @@ containing a value of this type. public static final int backgrounds_menu_grass=0x7f020048; public static final int backgrounds_menu_levelup=0x7f020049; public static final int backgrounds_menu_shortmenu=0x7f02004a; - public static final int goal=0x7f02004b; - public static final int guis_pausebutton=0x7f02004c; - public static final int guis_playerarrow=0x7f02004d; - public static final int guis_sound_off=0x7f02004e; - public static final int guis_sound_on=0x7f02004f; - public static final int lock_locked=0x7f020050; - public static final int lock_unlocked=0x7f020051; - public static final int notification_template_icon_bg=0x7f020070; - public static final int obstacles_cave=0x7f020052; - public static final int obstacles_grass=0x7f020053; - public static final int obstacles_mountains=0x7f020054; - public static final int playershapes_ball=0x7f020055; - public static final int previews_grass=0x7f020056; - public static final int purple=0x7f020057; - public static final int ramp=0x7f020058; - public static final int rampbutton=0x7f020059; - public static final int splitter=0x7f02005a; - public static final int star=0x7f02005b; - public static final int star_empty=0x7f02005c; - public static final int star_icon=0x7f02005d; - public static final int terrain_c_grass=0x7f02005e; - public static final int terrain_t_grass=0x7f02005f; - public static final int tools_bomb=0x7f020060; - public static final int tools_bombbutton=0x7f020061; - public static final int tools_emptybutton=0x7f020062; - public static final int tools_lockedbutton=0x7f020063; - public static final int tools_magnet=0x7f020064; - public static final int tools_magnetbutton=0x7f020065; - public static final int tools_spring=0x7f020066; - public static final int tools_springbutton=0x7f020067; - public static final int tools_unlockedbutton=0x7f020068; - public static final int xml_custom_button=0x7f020069; - public static final int xml_levelbutton_background=0x7f02006a; - public static final int xml_sound_toggle=0x7f02006b; - public static final int xml_tool_slot_background=0x7f02006c; - public static final int xml_toolprogressbarlayers=0x7f02006d; - public static final int xml_unlock_message_background=0x7f02006e; - public static final int xml_worldbutton_background=0x7f02006f; + public static final int currency_energy=0x7f02004b; + public static final int currency_energy_atlas=0x7f02004c; + public static final int currency_star=0x7f02004d; + public static final int goal=0x7f02004e; + public static final int guis_pausebutton=0x7f02004f; + public static final int guis_playerarrow=0x7f020050; + public static final int guis_sound_off=0x7f020051; + public static final int guis_sound_on=0x7f020052; + public static final int lock_locked=0x7f020053; + public static final int lock_unlocked=0x7f020054; + public static final int notification_template_icon_bg=0x7f020072; + public static final int obstacles_cave=0x7f020055; + public static final int obstacles_grass=0x7f020056; + public static final int obstacles_mountains=0x7f020057; + public static final int playershapes_ball=0x7f020058; + public static final int previews_grass=0x7f020059; + public static final int purple=0x7f02005a; + public static final int ramp=0x7f02005b; + public static final int rampbutton=0x7f02005c; + public static final int splitter=0x7f02005d; + public static final int star_empty=0x7f02005e; + public static final int star_icon=0x7f02005f; + public static final int terrain_c_grass=0x7f020060; + public static final int terrain_t_grass=0x7f020061; + public static final int tools_bomb=0x7f020062; + public static final int tools_bombbutton=0x7f020063; + public static final int tools_emptybutton=0x7f020064; + public static final int tools_lockedbutton=0x7f020065; + public static final int tools_magnet=0x7f020066; + public static final int tools_magnetbutton=0x7f020067; + public static final int tools_spring=0x7f020068; + public static final int tools_springbutton=0x7f020069; + public static final int tools_unlockedbutton=0x7f02006a; + public static final int xml_custom_button=0x7f02006b; + public static final int xml_levelbutton_background=0x7f02006c; + public static final int xml_sound_toggle=0x7f02006d; + public static final int xml_tool_slot_background=0x7f02006e; + public static final int xml_toolprogressbarlayers=0x7f02006f; + public static final int xml_unlock_message_background=0x7f020070; + public static final int xml_worldbutton_background=0x7f020071; } public static final class id { public static final int action0=0x7f0d006a; @@ -1712,8 +1714,8 @@ containing a value of this type. public static final int ifRoom=0x7f0d001d; public static final int image=0x7f0d0026; public static final int imageView=0x7f0d0064; - public static final int imageView2=0x7f0d00a4; - public static final int imageView3=0x7f0d00a2; + public static final int imageView2=0x7f0d00a6; + public static final int imageView3=0x7f0d00a4; public static final int info=0x7f0d0075; public static final int levelbutton_lock=0x7f0d005c; public static final int levelbutton_star1=0x7f0d0059; @@ -1805,28 +1807,30 @@ containing a value of this type. public static final int toolshop_topbar=0x7f0d008a; public static final int toolslot_image=0x7f0d0082; public static final int topPanel=0x7f0d002e; + public static final int topbar_energycount=0x7f0d0099; + public static final int topbar_energyview=0x7f0d0098; public static final int topbar_layout=0x7f0d0092; public static final int topbar_leveldisplay=0x7f0d0094; public static final int topbar_levellayout=0x7f0d0093; public static final int topbar_levelprogress=0x7f0d0095; - public static final int topbar_resetButton=0x7f0d009a; - public static final int topbar_soundtoggle=0x7f0d0098; + public static final int topbar_resetButton=0x7f0d009d; + public static final int topbar_soundtoggle=0x7f0d009a; public static final int topbar_starcount=0x7f0d0097; - public static final int topbar_starcount_decrease=0x7f0d009b; + public static final int topbar_starcount_decrease=0x7f0d009c; public static final int topbar_starview=0x7f0d0096; - public static final int topbar_toolshop=0x7f0d0099; - public static final int unlockmessage_message=0x7f0d009d; - public static final int unlockmessage_toolimage=0x7f0d009c; + public static final int topbar_toolshop=0x7f0d009b; + public static final int unlockmessage_message=0x7f0d009f; + public static final int unlockmessage_toolimage=0x7f0d009e; public static final int up=0x7f0d0008; public static final int useLogo=0x7f0d0012; public static final int withText=0x7f0d001f; - public static final int worldbutton_levelcount=0x7f0d00a1; - public static final int worldbutton_lock=0x7f0d00a0; - public static final int worldbutton_preview=0x7f0d009f; - public static final int worldbutton_starcount=0x7f0d00a3; - public static final int worldbutton_title=0x7f0d009e; - public static final int worlds_layout=0x7f0d00a6; - public static final int worlds_topbar=0x7f0d00a5; + public static final int worldbutton_levelcount=0x7f0d00a3; + public static final int worldbutton_lock=0x7f0d00a2; + public static final int worldbutton_preview=0x7f0d00a1; + public static final int worldbutton_starcount=0x7f0d00a5; + public static final int worldbutton_title=0x7f0d00a0; + public static final int worlds_layout=0x7f0d00a8; + public static final int worlds_topbar=0x7f0d00a7; public static final int wrap_content=0x7f0d0020; } public static final class integer { diff --git a/app/build/intermediates/blame/res/debug/single/drawable.json b/app/build/intermediates/blame/res/debug/single/drawable.json index 64406a4..208abae 100644 --- a/app/build/intermediates/blame/res/debug/single/drawable.json +++ b/app/build/intermediates/blame/res/debug/single/drawable.json @@ -67,6 +67,10 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_unlocked.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lock_unlocked.png" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy_atlas.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy_atlas.png" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_springbutton.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_springbutton.png" @@ -135,10 +139,6 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_default_mtrl_shape.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_btn_default_mtrl_shape.xml" }, - { - "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\star.png", - "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\star.png" - }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_grass.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_grass.png" @@ -223,10 +223,18 @@ "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_sound_off.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_sound_off.png" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy.png" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_magnetbutton.png", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_magnetbutton.png" }, + { + "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star.png", + "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star.png" + }, { "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml", "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_seekbar_track_material.xml" diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 5cdb663..512614b 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1346,7 +1346,7 @@ ?android:attr/actionMenuTextAppearance @drawable/abc_control_background_material - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/res/merged/debug/layout/topbar.xml b/app/build/intermediates/res/merged/debug/layout/topbar.xml index 150370d..e71e77c 100644 --- a/app/build/intermediates/res/merged/debug/layout/topbar.xml +++ b/app/build/intermediates/res/merged/debug/layout/topbar.xml @@ -1,5 +1,6 @@ + android:background="@drawable/currency_star" /> + + + + @@ -74,15 +96,6 @@ android:layout_marginRight="5dp" android:text="Tool-Shop" /> -