Merge branch 'dev' into feat/chest-model

ucsd-cse125-sp24 · Jun 7, 2024 · 370db0e · 370db0e
2 parents 18f5141 + 06f90b5
commit 370db0e
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 10 deletions.
diff --git a/assets/sounds/client_music/maze_exploration_dm.mp3 b/assets/sounds/client_music/maze_exploration_dm.mp3
diff --git a/assets/sounds/client_music/maze_exploration_players.mp3 b/assets/sounds/client_music/maze_exploration_players.mp3
diff --git a/assets/sounds/client_music/menu.flac b/assets/sounds/client_music/menu.flac
diff --git a/assets/sounds/client_music/menu.mp3 b/assets/sounds/client_music/menu.mp3
diff --git a/assets/sounds/client_music/relay_race_dm.flac b/assets/sounds/client_music/relay_race_dm.flac
diff --git a/assets/sounds/client_music/relay_race_dm.mp3 b/assets/sounds/client_music/relay_race_dm.mp3
diff --git a/assets/sounds/client_music/relay_race_players.flac b/assets/sounds/client_music/relay_race_players.flac
diff --git a/assets/sounds/client_music/relay_race_players.mp3 b/assets/sounds/client_music/relay_race_players.mp3
diff --git a/assets/sounds/client_sfx/victory_dm.flac b/assets/sounds/client_sfx/victory_dm.flac
diff --git a/assets/sounds/client_sfx/victory_dm.mp3 b/assets/sounds/client_sfx/victory_dm.mp3
diff --git a/assets/sounds/client_sfx/victory_players.mp3 b/assets/sounds/client_sfx/victory_players.mp3
diff --git a/assets/sounds/server_sfx/players_start_theme.mp3 b/assets/sounds/server_sfx/players_start_theme.mp3
diff --git a/assets/sounds/server_sfx/players_start_theme_old.mp3 b/assets/sounds/server_sfx/players_start_theme_old.mp3
diff --git a/assets/sounds/server_sfx/start_game_dm.flac b/assets/sounds/server_sfx/start_game_dm.flac
diff --git a/assets/sounds/server_sfx/start_game_dm.mp3 b/assets/sounds/server_sfx/start_game_dm.mp3
diff --git a/config.json b/config.json
@@ -14,9 +14,9 @@
   "server": {
       "lobby_name": "Hope you're doing well!",
       "lobby_broadcast": true,
-      "max_players": 1,
-      "disable_dm": true,
-      "skip_intro": true 
+      "max_players": 4,
+      "disable_dm": false,
+      "skip_intro": false 
   },
   "client": {
     "default_name": "Conan O'Brien",
@@ -25,6 +25,6 @@
     "draw_bboxes": false,
     "fps_counter": true,
     "presentation": false,
-    "render": 50
+    "render": 80
   }
 }
diff --git a/src/client/client.cpp b/src/client/client.cpp
@@ -226,7 +226,7 @@ bool Client::init() {
     auto sungod_model_path = entity_models_dir / "sungod.obj";
     this->sungod_model = std::make_unique<Model>(sungod_model_path.string(), true);
 
-    auto python_model_path = entity_models_dir / "python.obj";
+    auto python_model_path = entity_models_dir / "flying-python.obj";
     this->python_model = std::make_unique<Model>(python_model_path.string(), true);
 
     auto item_model_path = item_models_dir / "item.obj";
@@ -1001,6 +1001,8 @@ void Client::geometryPass() {
             case ObjectType::Python: {
                 this->python_model->setDimensions(sharedObject->physics.dimensions);
                 this->python_model->translateAbsolute(sharedObject->physics.getCenterPosition());
+                this->python_model->rotateAbsolute(sharedObject->physics.facing);
+
                 this->python_model->draw(this->deferred_geometry_shader.get(),
                     this->cam->getPos(),
                     true);

diff --git a/src/shared/audio/soundtype.cpp b/src/shared/audio/soundtype.cpp
@@ -13,7 +13,7 @@ std::string getAudioPath(ClientSFX sound) {
             return (dir / "victory_players.flac").string();
         case ClientSFX::VictoryThemeDM:
             //  TODO: Replace with DM Victory theme!
-            return (dir / "victory_players.flac").string();
+            return (dir / "victory_dm.flac").string();
         default:
             std::cerr << "FATAL: no known path for ClientSFX " << static_cast<int>(sound) << std::endl;
             std::exit(1);
@@ -74,7 +74,7 @@ std::string getAudioPath(ServerSFX sfx) {
         case ServerSFX::IntroGateOpen:
             return (dir / "cutscene_gate_open.wav").string();
         case ServerSFX::ZeusStartTheme:
-            return (dir / "zeus_start_theme.mp3").string();
+            return (dir / "start_game_dm.flac").string();
         case ServerSFX::Wind:
             return (dir / "wind.wav").string();
         case ServerSFX::Teleport:
@@ -104,16 +104,16 @@ std::string getAudioPath(ClientMusic music) {
     switch (music) {
         case ClientMusic::MenuTheme:
             //  TODO: Replace with menu theme!
-            return (dir / "menu.mp3").string();
+            return (dir / "menu.flac").string();
         case ClientMusic::MazeExplorationPlayersTheme:
             return (dir / "maze_exploration_players.flac").string();
         case ClientMusic::MazeExplorationDMTheme:
             return (dir / "maze_exploration_dm.flac").string();
         case ClientMusic::RelayRacePlayersTheme:
-            return (dir / "relay_race_players.mp3").string();
+            return (dir / "relay_race_players.flac").string();
         case ClientMusic::RelayRaceDMTheme:
             //  TODO: Replace with DM Relay Race theme!
-            return (dir / "maze_exploration_dm.flac").string();
+            return (dir / "relay_race_dm.flac").string();
         default:
             std::cerr << "FATAL: no known path for ClientMusic " << static_cast<int>(music) << std::endl;
             std::exit(1);