More detailed cave bg + fade in/fade out on game start/exit

Author: dbeef

CMakeLists.txt

@@ -51,4 +51,4 @@ add_executable(spelunkyds
         source/collisions/collisions.cpp
         source/collisions/collisions.h
         source/hud/hud.cpp source/hud/hud.h
-        source/sprites/sprite_info.cpp source/sprites/sprite_info.h source/camera/camera.cpp source/camera/camera.h source/memory/oam_manager.cpp source/memory/oam_manager.h source/input/input_handler.cpp source/input/input_handler.h source/sprites/spritesheet_type.h source/memory/oam_type.h source/sprites/items/rock.h source/sprites/items/jar.cpp source/sprites/items/jar.h source/sprites/enemies/snake.cpp source/sprites/enemies/snake.h source/sprites/collectibles/moniez.cpp source/sprites/collectibles/moniez.h source/tiles/map_tile_type.h source/sprites/animations/blood.cpp source/sprites/animations/blood.h source/sprites/animations/blood_element.cpp source/sprites/animations/blood_element.h source/sprites/non_interactive/spelunky_title.cpp source/sprites/non_interactive/spelunky_title.h source/tiles/tile_orientation.h source/sprites/non_interactive/title_menu_sign.cpp source/sprites/non_interactive/title_menu_sign.h source/sprites/menu_sign_type.h source/tiles/splash_screen_type.h source/rooms/left_right_rooms.h source/rooms/left_right_down_rooms.h source/rooms/left_right_up_rooms.h source/rooms/closed_rooms.h source/rooms/splash_screens.h source/rooms/entrance_rooms.h source/rooms/exit_rooms.h source/rooms/room_type.h source/sprites/enemies/bat.cpp source/sprites/enemies/bat.h source/sprites/enemies/spider.cpp source/sprites/enemies/spider.h source/sprites/sprite_type.h source/globals_definitions.h source/sound/sound_utils.h source/console/console_utils.h source/time/time_utils.h source/time/time_utils.cpp source/memory/oam_utils.cpp source/memory/oam_utils.h source/sprites/main_dude/whip.cpp source/sprites/main_dude/whip.h source/sprites/traps/spikes.cpp source/sprites/traps/spikes.h source/sprites/collectibles/chest.cpp source/sprites/collectibles/chest.h source/sprites/collectibles/crate.h source/sprites/collectibles/crate.cpp source/sprites/collectibles/shotgun.h source/sprites/collectibles/shotgun.cpp source/sprites/collectibles/bullet.h source/sprites/collectibles/bullet.cpp source/sprites/collectibles/pistol.h source/sprites/collectibles/pistol.cpp source/sprites/collectibles/spring_shoes.h source/sprites/collectibles/spring_shoes.cpp source/sprites/collectibles/mitt.h source/sprites/collectibles/mitt.cpp source/sprites/collectibles/glove.h source/sprites/collectibles/glove.cpp source/sprites/collectibles/compass.h source/sprites/collectibles/compass.cpp source/sprites/animations/got_collectible.h source/sprites/animations/got_collectible.cpp source/camera/layer_level.h source/sprites/enemies/shopkeeper.h source/sprites/enemies/shopkeeper.cpp source/sprites/main_dude/dude_utils.cpp source/sprites/main_dude/game_state.h source/sprites/main_dude/game_state.cpp source/sprites/enemies/caveman.h source/sprites/enemies/caveman.cpp source/sprites/animations/fall_poof.h source/sprites/animations/fall_poof.cpp source/sprites/items/cape.h source/sprites/items/cape.cpp source/sprites/items/spike_shoes.h source/sprites/items/spike_shoes.cpp source/sprites/items/pick.h source/sprites/items/pick.cpp source/sprites/items/jetpack.h source/sprites/items/jetpack.cpp source/sprites/items/parachute.h source/sprites/items/parachute.cpp source/sprites/items/rope_pile.h source/sprites/items/rope_pile.cpp source/sprites/items/bomb_bag.h source/sprites/items/bomb_bag.cpp source/sprites/items/bomb_box.h source/sprites/items/bomb_box.cpp source/sprites/animations/flame.h source/sprites/animations/flame_element.cpp source/sprites/animations/flame.cpp source/sprites/animations/flame_element.h source/sprites/enemies/damsel.h source/sprites/enemies/damsel.cpp source/sprites/animations/smooch.h source/sprites/animations/smooch.cpp source/rooms/shops.h source/sprites/non_interactive/lamp.h source/sprites/non_interactive/lamp.cpp source/tiles/direction.h source/sprites/collectibles/collectibles_utils.h source/sprites/collectibles/collectibles_utils.cpp source/sprites/shopping_object.h source/sprites/non_interactive/shopping_icon.h source/sprites/non_interactive/shopping_icon.cpp source/sprites/shopping_object.cpp source/sprites/traps/arrow_trap.h source/sprites/traps/arrow_trap.cpp source/sprites/animations/blast.h source/sprites/animations/blast.cpp source/rooms/snake_well.h)
+        source/sprites/sprite_info.cpp source/sprites/sprite_info.h source/camera/camera.cpp source/camera/camera.h source/memory/oam_manager.cpp source/memory/oam_manager.h source/input/input_handler.cpp source/input/input_handler.h source/sprites/spritesheet_type.h source/memory/oam_type.h source/sprites/items/rock.h source/sprites/items/jar.cpp source/sprites/items/jar.h source/sprites/enemies/snake.cpp source/sprites/enemies/snake.h source/sprites/collectibles/moniez.cpp source/sprites/collectibles/moniez.h source/tiles/map_tile_type.h source/sprites/animations/blood.cpp source/sprites/animations/blood.h source/sprites/animations/blood_element.cpp source/sprites/animations/blood_element.h source/sprites/non_interactive/spelunky_title.cpp source/sprites/non_interactive/spelunky_title.h source/tiles/tile_orientation.h source/sprites/non_interactive/title_menu_sign.cpp source/sprites/non_interactive/title_menu_sign.h source/sprites/menu_sign_type.h source/tiles/splash_screen_type.h source/rooms/left_right_rooms.h source/rooms/left_right_down_rooms.h source/rooms/left_right_up_rooms.h source/rooms/closed_rooms.h source/rooms/splash_screens.h source/rooms/entrance_rooms.h source/rooms/exit_rooms.h source/rooms/room_type.h source/sprites/enemies/bat.cpp source/sprites/enemies/bat.h source/sprites/enemies/spider.cpp source/sprites/enemies/spider.h source/sprites/sprite_type.h source/globals_definitions.h source/sound/sound_utils.h source/console/console_utils.h source/time/time_utils.h source/time/time_utils.cpp source/memory/oam_utils.cpp source/memory/oam_utils.h source/sprites/main_dude/whip.cpp source/sprites/main_dude/whip.h source/sprites/traps/spikes.cpp source/sprites/traps/spikes.h source/sprites/collectibles/chest.cpp source/sprites/collectibles/chest.h source/sprites/collectibles/crate.h source/sprites/collectibles/crate.cpp source/sprites/collectibles/shotgun.h source/sprites/collectibles/shotgun.cpp source/sprites/collectibles/bullet.h source/sprites/collectibles/bullet.cpp source/sprites/collectibles/pistol.h source/sprites/collectibles/pistol.cpp source/sprites/collectibles/spring_shoes.h source/sprites/collectibles/spring_shoes.cpp source/sprites/collectibles/mitt.h source/sprites/collectibles/mitt.cpp source/sprites/collectibles/glove.h source/sprites/collectibles/glove.cpp source/sprites/collectibles/compass.h source/sprites/collectibles/compass.cpp source/sprites/animations/got_collectible.h source/sprites/animations/got_collectible.cpp source/camera/layer_level.h source/sprites/enemies/shopkeeper.h source/sprites/enemies/shopkeeper.cpp source/sprites/main_dude/dude_utils.cpp source/sprites/main_dude/game_state.h source/sprites/main_dude/game_state.cpp source/sprites/enemies/caveman.h source/sprites/enemies/caveman.cpp source/sprites/animations/fall_poof.h source/sprites/animations/fall_poof.cpp source/sprites/items/cape.h source/sprites/items/cape.cpp source/sprites/items/spike_shoes.h source/sprites/items/spike_shoes.cpp source/sprites/items/pick.h source/sprites/items/pick.cpp source/sprites/items/jetpack.h source/sprites/items/jetpack.cpp source/sprites/items/parachute.h source/sprites/items/parachute.cpp source/sprites/items/rope_pile.h source/sprites/items/rope_pile.cpp source/sprites/items/bomb_bag.h source/sprites/items/bomb_bag.cpp source/sprites/items/bomb_box.h source/sprites/items/bomb_box.cpp source/sprites/animations/flame.h source/sprites/animations/flame_element.cpp source/sprites/animations/flame.cpp source/sprites/animations/flame_element.h source/sprites/enemies/damsel.h source/sprites/enemies/damsel.cpp source/sprites/animations/smooch.h source/sprites/animations/smooch.cpp source/rooms/shops.h source/sprites/non_interactive/lamp.h source/sprites/non_interactive/lamp.cpp source/tiles/direction.h source/sprites/collectibles/collectibles_utils.h source/sprites/collectibles/collectibles_utils.cpp source/sprites/shopping_object.h source/sprites/non_interactive/shopping_icon.h source/sprites/non_interactive/shopping_icon.cpp source/sprites/shopping_object.cpp source/sprites/traps/arrow_trap.h source/sprites/traps/arrow_trap.cpp source/sprites/animations/blast.h source/sprites/animations/blast.cpp source/rooms/snake_well.h source/sprites/enemies/skeleton.cpp source/sprites/enemies/skeleton.h)

gfx/_not_used/tilemaps/tiles.png

@@ -219,6 +219,7 @@ bool Collisions::isStandingOnRightEdge(MapTile *neighboringTiles[9], int x, int
     return (!neighboringTiles[TileOrientation::RIGHT_DOWN] /*&& !neighboringTiles[8]->collidable && x >= (tileX * 16)*/);
 }
 
+
 //#include <cassert>
 //
 void Collisions::getNeighboringTiles(MapTile *mapTiles[32][32], int xx, int yy, MapTile *out_neighboringTiles[9]) {

gfx/tilemaps/bgCave.png

@@ -55,6 +55,38 @@ void gameloop::scroll() {
 
         global::input_handler->updateInput();
 
+        if (global::game_state->just_started_game) {
+            global::game_state->change_brightness_timer += *global::timer;
+
+            if (global::game_state->change_brightness_timer > 100) {
+
+                global::game_state->brightness_level--;
+
+                if (global::game_state->brightness_level == 0)
+                    global::game_state->just_started_game = false;
+                else
+                    setBrightness(3, global::game_state->brightness_level);
+
+            }
+
+        }
+
+        if (global::game_state->in_main_menu && global::game_state->exiting_game) {
+
+            global::game_state->change_brightness_timer += *global::timer;
+
+            if (global::game_state->change_brightness_timer > 100) {
+
+                global::game_state->brightness_level++;
+
+                if (global::game_state->brightness_level > 16)
+                    exit(0);
+
+                setBrightness(3, global::game_state->brightness_level);
+
+            }
+        }
+
         if (global::game_state->bombed) {
             global::level_generator->render_tiles_on_base_map();
             global::game_state->bombed = false;
@@ -305,14 +337,14 @@ void gameloop::populate_cave_npcs() {
                     u16 pos_x = (OFFSET_X + tab_x * 2 + 2 * ROOM_TILE_WIDTH_GAME * a) / 2;
                     u16 pos_y = (OFFSET_X + tab_y * 2 + 2 * ROOM_TILE_HEIGHT_GAME * ((ROOMS_Y - b) - 1)) / 2;
 
-                    if(npc == 9 || npc == 10){
+                    if (npc == 9 || npc == 10) {
                         ArrowTrap *arrowTrap = new ArrowTrap();
                         arrowTrap->init();
                         arrowTrap->x = pos_x * 16;
                         arrowTrap->y = pos_y * 16;
-                        if(npc == 9)
+                        if (npc == 9)
                             arrowTrap->sprite_state = SpriteState::W_LEFT;
-                        else if(npc == 10)
+                        else if (npc == 10)
                             arrowTrap->sprite_state = SpriteState::W_RIGHT;
                         global::sprites.push_back(arrowTrap);
                     }
@@ -400,7 +432,7 @@ void gameloop::populate_cave_npcs() {
                             shop_starting_item = 0;
 
                         ShoppingObject *m = collectibles_utils::spawn_item(pos_x * 16, pos_y * 16, shop_starting_item,
-                                                                         false);
+                                                                           false);
 
                         shop_items[shop_items_index] = m;
                         shop_items_index++;
@@ -476,9 +508,11 @@ void gameloop::populate_main_menu() {
     Rope *rope = new Rope();
     rope->init();
     rope->x = 227;
-    rope->y = 260;
+    rope->y = 272;
     rope->ySpeed = -4;
 
+    rope->instant_rope = true;
+    rope->extended_rope = true;
     rope->hold_by_main_dude = false;
     rope->activated = false;
     rope->thrown = true;