Renamed files. Some other changes

Miguel-hrvs · Sep 9, 2019 · aefb10c · aefb10c
1 parent 25badbe
commit aefb10c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 50 deletions.
diff --git a/config/credits.dat b/config/credits.dat
@@ -55,13 +55,6 @@ Di Rodrigues
 --- musics/we_will_never_fight_alone_1.ogg
 --- musics/we_will_never_fight_alone_2.ogg
 
-Colin Beard
---- musics/boss.ogg
---- musics/gimacian.ogg
-
-Mateus Reis
---- musics/citychill.ogg
-
 Johan Brodd (jobromedia)
 --- musics/theme.ogg (public domain)
 --- musics/template.ogg (public domain)
@@ -71,9 +64,21 @@ Johan Brodd (jobromedia)
 --- musics/winning.ogg
 --- musics/winning_plus.ogg
 --- musics/winning_plusplus.ogg
---- musics/option.ogg
+--- musics/menu.ogg
 --- musics/spatial_choirs.ogg
 
+Victor Seven
+--- musics/sunshine.ogg
+
+Colin Beard
+--- musics/boss.ogg
+--- musics/gimacian.ogg
+
+Mateus Reis
+--- musics/citychill.ogg
+
+
+
 $CREDITS_RES_IMAGES
 
 João Victor

diff --git a/images/sunshine_bg.png b/images/sunshine_bg.png
diff --git a/levels/scenes/create.lev b/levels/scenes/create.lev
@@ -6,7 +6,7 @@ requires "0.5.0"
 act 1
 theme "themes/none.brk"
 bgtheme "themes/scenes/mainmenu.bg"
-music "musics/option.ogg"
+music "musics/menu.ogg"
 spawn_point 0 0
 setup "CreateMenu"
 players "None"

diff --git a/levels/scenes/mainmenu.lev b/levels/scenes/mainmenu.lev
@@ -7,7 +7,7 @@ requires "0.5.0"
 act 1
 theme "themes/none.brk"
 bgtheme "themes/scenes/mainmenu.bg"
-music "musics/option.ogg"
+music "musics/menu.ogg"
 spawn_point 0 0
 setup "MainMenu"
 players "None"

diff --git a/levels/sunshine-2.lev b/levels/sunshine-2.lev
@@ -2735,6 +2735,7 @@ brick 143 2576 9824
 brick 144 2576 10000
 brick 144 2256 10000
 brick 144 2032 10000
+brick 227 2000 9856
 brick 8 1152 9728
 brick 8 1152 9856
 brick 4 1280 9856
@@ -3138,7 +3139,6 @@ entity "Collectible" 11616 10080 "3986a78044ea51fa"
 entity "Collectible" 11552 10080 "682a2bd2437abbd9"
 entity "Spikes" 4208 10224 "01c16916caea59de"
 entity "Spikes" 4176 10224 "c2ec5a8f63083aed"
-entity "Springfling" 10080 10080 "d229bcb9db2d31d8"
 entity "Springfling" 6144 9552 "11d2710bfe9a1dbb"
 entity "Mosquito" 4928 9712 "4e6985e7776f590e"
 entity "Mosquito" 4816 9680 "fd91d330810e043c"
@@ -3164,7 +3164,6 @@ entity "Springfling" 5312 9728 "afc000345924e8df"
 entity "Springfling" 2272 9840 "a294cd68082b76ce"
 entity "Fish" 2464 10080 "44a4c78b1b7953a3"
 entity "Fish" 2400 10080 "c2b6fd73aae729c4"
-entity "Fish" 2432 9920 "6f5c9bbf3c6e1697"
 entity "Springfling" 8144 10560 "769da57e1b5c983f"
 entity "Wolfey" 12960 9552 "7c8c221ae7210186"
 entity "Wolfey" 13216 9552 "3938953cfe95e205"
@@ -3173,7 +3172,6 @@ entity "Springfling" 12976 10192 "f014cdffe8464d10"
 entity "Springfling" 13232 10192 "a455f9d9c4b3858a"
 entity "Springfling" 3824 10144 "1c3c111ec821097e"
 entity "Wolfey" 4320 10256 "70364e337504d4ec"
-entity "Springfling" 4416 10256 "3926505e04cc6645"
 entity "Mosquito" 5152 10176 "baf0654716c3a33c"
 entity "Spikes" 15664 10976 "cdc73217436db3e2"
 entity "Spikes" 15696 10976 "87421352fcbb1bad"
@@ -3196,9 +3194,6 @@ entity "Collectible" 1056 10000 "3476ae30ad26a22f"
 entity "Collectible" 1088 10000 "55b579c058c784ab"
 entity "Collectible" 1760 9856 "ee66e2f272fb0b67"
 entity "Collectible" 1760 9824 "308f5e77f2b5c7d4"
-entity "Collectible" 3152 10000 "9c3532d6ba6dd95b"
-entity "Collectible" 3152 9968 "4ebb54d85f163429"
-entity "Collectible" 3152 9936 "1b61c6c488a23201"
 entity "Collectible" 3792 9984 "72df68249c9094c9"
 entity "Collectible" 3824 9984 "06678a6aac55a7a0"
 entity "Collectible" 3760 9984 "e27b3b7e114ee4ef"
@@ -3436,9 +3431,6 @@ entity "Collectible" 10816 9888 "40514a9f4f7dcdbe"
 entity "Collectible" 4960 10256 "53360ec01c9eb620"
 entity "Collectible" 4992 10256 "31590ad56b56034c"
 entity "Collectible" 5024 10256 "51c208232cfdfc4a"
-entity "Collectible" 2432 9760 "d22835c340365532"
-entity "Collectible" 2400 9760 "2fc57e746bb53518"
-entity "Collectible" 2464 9760 "48c275fcfa681972"
 entity "Collectible" 2432 9920 "df10b266b45dad33"
 entity "Collectible" 2400 9920 "70876bd4aeaa3aa9"
 entity "Collectible" 2464 9920 "973dd1a42314e49c"
@@ -3460,12 +3452,8 @@ entity "Collectible" 8816 9296 "67f99d777b193f5c"
 entity "Collectible" 8880 9296 "ed1f3466c00f5a22"
 entity "Collectible" 8784 9296 "9cfb0184fd318c16"
 entity "Collectible" 8912 9296 "ef0f1b4adc362a8e"
-entity "Collectible" 9168 10304 "7f39e89fa32ba3e8"
-entity "Collectible" 9200 10304 "66e19bc632312786"
 entity "Collectible" 9232 10304 "8b4442e3de7e6449"
-entity "Collectible" 9712 10304 "7b446a23829319de"
 entity "Collectible" 9744 10304 "c3661e9212b1886d"
-entity "Collectible" 9680 10304 "684e638b0b81503d"
 entity "Audio Source" 896 9968 "cd12681e89c03367"
 entity "Audio Source" 1152 9968 "b5b81f33d7318ac1"
 entity "Audio Source" 1024 9968 "f2ea95ec6ef72769"
@@ -3561,5 +3549,21 @@ entity "Audio Source" 18272 9888 "afa56641f82f9bd9"
 entity "Wolfey" 7424 8864 "a18209e9d953b2bc"
 entity "Powerup Invincibility" 11312 10112 "e96f38ee9868d5a7"
 entity "Collectible" 16496 10864 "2a6233937b7c5b4a"
+entity "Collectible" 2400 9840 "0085adee87377fb5"
+entity "Collectible" 2432 9840 "afb6fdd2c0045c0a"
+entity "Collectible" 2464 9840 "09df62bdc3761632"
+entity "Collectible" 3328 10000 "728e8400ca8f369e"
+entity "Collectible" 3296 10000 "a39d9c6310e24f73"
+entity "Collectible" 3360 10000 "ab3692ffc9e4372d"
+entity "Springfling" 4992 10256 "3926505e04cc6645"
+entity "Collectible" 9200 10304 "66e19bc632312786"
+entity "Collectible" 9168 10304 "7f39e89fa32ba3e8"
+entity "Collectible" 9776 10304 "b7912f7621ae69b0"
+entity "Collectible" 9808 10304 "ba71c217d9875963"
+entity "Springfling" 10080 10080 "d229bcb9db2d31d8"
+entity "Collectible" 6048 9600 "23787e24b5c39e33"
+entity "Collectible" 6080 9600 "0e7e6e5e1417f5cf"
+entity "Collectible" 6016 9600 "4d386173c0b349e4"
+entity "Collectible" 2032 9856 "805d3dcb625abda7"
 
 // EOF
diff --git a/musics/option.ogg → musics/menu.ogg b/musics/option.ogg → musics/menu.ogg
diff --git a/themes/sunshine.bg b/themes/sunshine.bg
@@ -89,7 +89,7 @@ background
     sprite
     {
         source_file     "images/sunshine_bg.png"
-        source_rect     416 288 32 32
+        source_rect     32 112 32 32
         frame_size      32 32
 
         animation
@@ -127,32 +127,7 @@ background
     }
 }
 
-// trees
-//background
-//{
-//    initial_position    0 680
-//    scroll_speed        -0.45 -0.05
-//    behavior            DEFAULT
-//    repeat_x            TRUE
-//    repeat_y            FALSE
-//    zindex              0.25
-//
-//    sprite
-//    {
-//        source_file     "images/sunshine_bg.png"
-//        source_rect     0 128 160 128
-//        frame_size      160 128
-//
-//        animation
-//        {
-//            repeat      TRUE
-//            fps         8
-//            data        0
-//        }
-//    }
-//}
-
-//// ------------------------------
+// ------------------------------
 // water layers
 // ------------------------------
 background