Alpine 1.1 compat

CMakeLists.txt

@@ -1,5 +1,5 @@
-# CMake 3.15 is required for CMAKE_MSVC_RUNTIME_LIBRARY.
-cmake_minimum_required(VERSION 3.15)
+# CMake 3.20 is required for C++23.
+cmake_minimum_required(VERSION 3.20)
 project(DashFaction)
 
 if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")

README.md

@@ -64,6 +64,9 @@ Name                          | Description
 `debug_event_msg`             | toggle tracking of event messages in console
 `gibs`                        | toggle gibs (characters exploding into parts)
 `muzzle_flash`                | toggle muzzle flash
+`hit_sounds`                  | toggle whether to play a sound, when you hit players in multiplayer, if enabled by a server
+`weapon_screen_shake`         | toggle camera shake from weapon fire [may be force enabled by multiplayer servers]
+`full_bright_entities`        | toggle full-bright entities [may be force disabled by multiplayer servers]
 
 ### Server commands
 

common/include/common/config/GameConfig.h

@@ -58,6 +58,8 @@ struct GameConfig
     CfgVar<bool> muzzle_flash = true;
     CfgVar<bool> glares = true;
     CfgVar<bool> show_enemy_bullets = true;
+    CfgVar<bool> weapon_screen_shake = true;
+    CfgVar<bool> full_bright_entities = false;
 
     static constexpr float min_fov = 75.0f;
     static constexpr float max_fov = 160.0f;
@@ -67,6 +69,7 @@ struct GameConfig
     // Audio
     CfgVar<float> level_sound_volume = 1.0f;
     CfgVar<bool> eax_sound = true;
+    CfgVar<bool> hit_sounds = true;
 
     // Multiplayer
     static const char default_rf_tracker[];

common/src/config/GameConfig.cpp

@@ -167,13 +167,16 @@ bool GameConfig::visit_vars(T&& visitor, bool is_save)
     result &= visitor(dash_faction_key, "Scoreboard Animations", scoreboard_anim);
     result &= visitor(dash_faction_key, "Spectate Mode Minimal UI", spectate_mode_minimal_ui);
     result &= visitor(dash_faction_key, "Level Sound Volume", level_sound_volume);
+    result &= visitor(dash_faction_key, "Hit Sounds", hit_sounds);
     result &= visitor(dash_faction_key, "Allow Overwriting Game Files", allow_overwrite_game_files);
     result &= visitor(dash_faction_key, "Version", dash_faction_version);
     result &= visitor(dash_faction_key, "Swap Assault Rifle Controls", swap_assault_rifle_controls);
     result &= visitor(dash_faction_key, "Swap Grenade Controls", swap_grenade_controls);
     result &= visitor(dash_faction_key, "Glares", glares);
     result &= visitor(dash_faction_key, "Linear Pitch", linear_pitch);
     result &= visitor(dash_faction_key, "Show Enemy Bullets", show_enemy_bullets);
+    result &= visitor(dash_faction_key, "Weapon Screen Shake", weapon_screen_shake);
+    result &= visitor(dash_faction_key, "Full-Bright Entities", full_bright_entities);
     result &= visitor(dash_faction_key, "Keep Launcher Open", keep_launcher_open);
     result &= visitor(dash_faction_key, "Skip Cutscene Control", skip_cutscene_ctrl);
     result &= visitor(dash_faction_key, "Damage Screen Flash", damage_screen_flash);

docs/CHANGELOG.md

@@ -4,9 +4,22 @@ Dash Faction Changelog
 Version 1.9.2 (not released yet)
 --------------------------------
 [@is-this-c](https://github.com/is-this-c)
+- Changes derived from [Alpine Faction's](https://github.com/GooberRF/alpinefaction) source code
+- - Improve compatibility with Alpine Faction network protocol
+- - In Alpine Faction levels
+- - - Handle `AlpineLevelProps::legacy_cyclic_timers`
+- - - Allow triggers to activate events in multiplayer
+- - - Fix events that broke if their delay parameter was set
+- - - Support loading Alpine Faction's `$Lightmap Clamp Floor`, and `$Lightmap Clamp Ceiling`, `$Crater Texture PPM`, and `$Mesh Replacement`from `{map_name}_info.tbl`
+- - - Support dynamic lights
+- - - Make particle emitters placed in levels respect their active distance parameter
 - Fix a potential crash after a client quits a game if Directd3D 11 is enabled
-- Improve compatibility with Alpine Faction servers
 - Fix `PgUp`, `PgDown`, `End`, and `Home` on numeric keypads
+- Add `af_killsound1.wav` from Alpine Faction
+- Add `hit_sounds` command
+- Add `weapon_screen_shake` command
+- Add `full_bright_entities` command
+- Add `remote_server_flags` command
 
 Version 1.9.1 (released 2025-07-05)
 --------------------------------

game_patch/CMakeLists.txt

@@ -158,6 +158,7 @@ set(SRCS
     misc/ui.cpp
     misc/game.cpp
     misc/level.cpp
+    misc/af_options.cpp
     sound/sound.cpp
     sound/sound.h
     sound/sound_ds.cpp
@@ -172,7 +173,7 @@ set(SRCS
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SRCS})
 
 add_library(DashFaction SHARED ${SRCS})
-target_compile_features(DashFaction PUBLIC cxx_std_20)
+target_compile_features(DashFaction PRIVATE cxx_std_23)
 set_target_properties(DashFaction PROPERTIES
     PREFIX ""
     CXX_EXTENSIONS NO

game_patch/graphics/d3d11/gr_d3d11_mesh.cpp

@@ -9,6 +9,8 @@
 #include "../../rf/math/quaternion.h"
 #include "../../rf/v3d.h"
 #include "../../rf/character.h"
+#include "../../main/main.h"
+#include "../../multi/multi.h"
 #include "gr_d3d11.h"
 #include "gr_d3d11_mesh.h"
 #include "gr_d3d11_context.h"
@@ -378,7 +380,7 @@ namespace df::gr::d3d11
         render_caches_.clear();
     }
 
-    void MeshRenderer::render_v3d_vif(rf::VifLodMesh *lod_mesh, int lod_index, const rf::Vector3& pos, const rf::Matrix3& orient, const rf::MeshRenderParams& params)
+    void MeshRenderer::render_v3d_vif(rf::VifLodMesh *lod_mesh, int lod_index, const rf::Vector3& pos, const rf::Matrix3& orient, rf::MeshRenderParams params)
     {
         page_in_v3d_mesh(lod_mesh);
 
@@ -389,10 +391,28 @@ namespace df::gr::d3d11
         render_context_.set_index_buffer(v3d_ib_.buffer());
 
         auto render_cache = reinterpret_cast<MeshRenderCache*>(lod_mesh->render_cache);
+
+        const bool ir_scanner = (params.flags & MRF_SCANNER_1) != 0;
+        if (!ir_scanner) {
+            rf::Vector3 ambient_light{0.f, 0.f, 0.f};
+            light_get_ambient(&ambient_light.x, &ambient_light.y, &ambient_light.z);
+            ambient_light *= 255.f;
+            // RF uses some hard-coded lights here but for now let's keep it simple
+            ambient_light += 40.f;
+            // Ignore ambient_color from params, it changes sharply and RF uses it only indirectly for
+            // its hard-coded lights
+            params.ambient_color.set(
+                static_cast<rf::ubyte>(std::min(ambient_light.x, 255.f)),
+                static_cast<rf::ubyte>(std::min(ambient_light.y, 255.f)),
+                static_cast<rf::ubyte>(std::min(ambient_light.z, 255.f)),
+                255
+            );
+        }
+
         draw_cached_mesh(lod_mesh, *render_cache, params, lod_index);
     }
 
-    void MeshRenderer::render_character_vif(rf::VifLodMesh *lod_mesh, int lod_index, const rf::Vector3& pos, const rf::Matrix3& orient, const rf::CharacterInstance *ci, const rf::MeshRenderParams& params)
+    void MeshRenderer::render_character_vif(rf::VifLodMesh *lod_mesh, int lod_index, const rf::Vector3& pos, const rf::Matrix3& orient, const rf::CharacterInstance *ci, rf::MeshRenderParams params)
     {
         page_in_character_mesh(lod_mesh);
         auto render_cache = reinterpret_cast<CharacterMeshRenderCache*>(lod_mesh->render_cache);
@@ -416,6 +436,18 @@ namespace df::gr::d3d11
         }
         render_cache->update_bone_transforms_buffer(ci, render_context_);
         render_cache->bind_buffers(render_context_, morphed);
+
+        const bool ir_scanner = (params.flags & MRF_SCANNER_1) != 0;
+        if (!ir_scanner) {
+            const bool allow_full_bright = !(get_remote_server_info()
+                && !get_remote_server_info().value().allow_full_bright_entities);
+            if (g_game_config.full_bright_entities
+                && allow_full_bright
+                && !(params.flags & MRF_FIRST_PERSON)) {
+                params.ambient_color.set(255, 255, 255, 255);
+            }
+        }
+
         draw_cached_mesh(lod_mesh, *render_cache, params, lod_index);
     }
 
@@ -458,20 +490,7 @@ namespace df::gr::d3d11
         }
         rf::Color color{255, 255, 255};
         if (!ir_scanner) {
-            // Ignore ambient_color from params, it changes sharply and RF uses it only indirectly for
-            // its hard-coded lights
-            float ambient_r, ambient_g, ambient_b;
-            light_get_ambient(&ambient_r, &ambient_g, &ambient_b);
-            color.set(
-                static_cast<rf::ubyte>(ambient_r * 255.0f),
-                static_cast<rf::ubyte>(ambient_g * 255.0f),
-                static_cast<rf::ubyte>(ambient_b * 255.0f),
-                255
-            );
-            // RF uses some hard-coded lights here but for now let's keep it simple
-            color.red += 40;
-            color.green += 40;
-            color.blue += 40;
+            color = params.ambient_color;
         } else {
             color = params.self_illum;
         }

game_patch/graphics/d3d11/gr_d3d11_mesh.h

@@ -94,8 +94,8 @@ namespace df::gr::d3d11
     public:
         MeshRenderer(ComPtr<ID3D11Device> device, ShaderManager& shader_manager, StateManager& state_manager, RenderContext& render_context);
         ~MeshRenderer();
-        void render_v3d_vif(rf::VifLodMesh *lod_mesh, int lod_index, const rf::Vector3& pos, const rf::Matrix3& orient, const rf::MeshRenderParams& params);
-        void render_character_vif(rf::VifLodMesh *lod_mesh, int lod_index, const rf::Vector3& pos, const rf::Matrix3& orient, const rf::CharacterInstance *ci, const rf::MeshRenderParams& params);
+        void render_v3d_vif(rf::VifLodMesh *lod_mesh, int lod_index, const rf::Vector3& pos, const rf::Matrix3& orient, rf::MeshRenderParams params);
+        void render_character_vif(rf::VifLodMesh *lod_mesh, int lod_index, const rf::Vector3& pos, const rf::Matrix3& orient, const rf::CharacterInstance *ci, rf::MeshRenderParams params);
         void clear_vif_cache(rf::VifLodMesh *lod_mesh);
         void page_in_v3d_mesh(rf::VifLodMesh* lod_mesh);
         void page_in_character_mesh(rf::VifLodMesh* lod_mesh);

game_patch/graphics/gr.cpp

@@ -82,10 +82,13 @@ float gr_scale_world_fov(float horizontal_fov = 90.0f)
         horizontal_fov = gr_scale_fov_hor_plus(horizontal_fov);
     }
 
-    const auto& server_info_opt = get_df_server_info();
-    if (server_info_opt && server_info_opt.value().max_fov) {
-        horizontal_fov = std::min(horizontal_fov, server_info_opt.value().max_fov.value());
+    if (get_remote_server_info()) {
+        const RemoteServerInfo& remote_server_info = get_remote_server_info().value();
+        if (remote_server_info.max_fov) {
+            horizontal_fov = std::min(horizontal_fov, remote_server_info.max_fov.value());
+        }
     }
+
     return horizontal_fov;
 }
 
@@ -122,10 +125,12 @@ ConsoleCommand2 fov_cmd{
             g_game_config.save();
         }
         rf::console::print("Horizontal FOV: {:.2f}", gr_scale_world_fov());
-
-        const auto& server_info_opt = get_df_server_info();
-        if (server_info_opt && server_info_opt.value().max_fov) {
-            rf::console::print("Server FOV limit: {:.2f}", server_info_opt.value().max_fov.value());
+
+        if (get_remote_server_info()) {
+            const RemoteServerInfo& remote_server_info = get_remote_server_info().value();
+            if (remote_server_info.max_fov) {
+                rf::console::print("Server FOV limit: {:.2f}", remote_server_info.max_fov.value());
+            }
         }
     },
     "Sets horizontal FOV (field of view) in degrees. Use 0 to enable automatic FOV scaling.",
@@ -240,7 +245,7 @@ ConsoleCommand2 nearest_texture_filtering_cmd{
 ConsoleCommand2 lod_distance_scale_cmd{
     "lod_distance_scale",
     [](std::optional<float> scale_opt) {
-        if (scale_opt.has_value()) {
+        if (scale_opt) {
             gr_lod_dist_scale = scale_opt.value();
         }
         rf::console::print("LOD distance scale: {:.2f}", gr_lod_dist_scale);

game_patch/main/main.cpp

@@ -29,6 +29,8 @@
 #include "../misc/misc.h"
 #include "../misc/vpackfile.h"
 #include "../misc/high_fps.h"
+#include "../misc/level.h"
+#include "../misc/af_options.h"
 #include "../input/input.h"
 #include "../rf/gr/gr.h"
 #include "../rf/multi.h"
@@ -145,6 +147,7 @@ FunHook<int(rf::String&, rf::String&, char*)> level_load_hook{
         xlog::info("Loading level: {}", level_filename);
         if (!save_filename.empty())
             xlog::info("Restoring game from save file: {}", save_filename);
+        load_af_level_info_config(level_filename);
         int ret = level_load_hook.call_target(level_filename, save_filename, error);
         if (ret != 0)
             xlog::warn("Loading failed: {}", error);
@@ -160,6 +163,9 @@ FunHook<void(bool)> level_init_post_hook{
     [](bool transition) {
         level_init_post_hook.call_target(transition);
         xlog::info("Level loaded: {}{}", rf::level.filename, transition ? " (transition)" : "");
+        if (!rf::is_dedicated_server) {
+            set_levelmod_autotexture_ppm();
+        }
     },
 };