Remove downed effect form stepping on mechanical_fluid field (#47851)

CleverRaven · Mar 5, 2021 · 74a732f · 74a732f
1 parent 91aadfd
commit 74a732f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/src/field_type.cpp b/src/field_type.cpp
@@ -55,7 +55,6 @@ const field_type_str_id fd_fungicidal_gas( "fd_fungicidal_gas" );
 const field_type_str_id fd_insecticidal_gas( "fd_insecticidal_gas" );
 const field_type_str_id fd_smoke_vent( "fd_smoke_vent" );
 const field_type_str_id fd_tindalos_rift( "fd_tindalos_rift" );
-const field_type_str_id fd_mechanical_fluid( "fd_mechanical_fluid" );
 
 namespace io
 {

diff --git a/src/field_type.h b/src/field_type.h
@@ -159,7 +159,6 @@ extern const field_type_str_id fd_fungicidal_gas;
 extern const field_type_str_id fd_insecticidal_gas;
 extern const field_type_str_id fd_smoke_vent;
 extern const field_type_str_id fd_tindalos_rift;
-extern const field_type_str_id fd_mechanical_fluid;
 
 struct field_type;
 

diff --git a/src/map_field.cpp b/src/map_field.cpp
@@ -77,7 +77,6 @@ static const bionic_id bio_heatsink( "bio_heatsink" );
 static const efftype_id effect_badpoison( "badpoison" );
 static const efftype_id effect_blind( "blind" );
 static const efftype_id effect_corroding( "corroding" );
-static const efftype_id effect_downed( "downed" );
 static const efftype_id effect_fungus( "fungus" );
 static const efftype_id effect_onfire( "onfire" );
 static const efftype_id effect_poison( "poison" );
@@ -1706,12 +1705,6 @@ void map::player_in_field( player &u )
                 }
             }
         }
-        if( ft == fd_mechanical_fluid ) {
-            if( !u.in_vehicle && x_in_y( cur.get_field_intensity(), 20 ) ) {
-                u.add_effect( effect_downed, 2_turns );
-            }
-        }
-
         // Process npc complaints (moved here from fields processing)
         if( const int chance = std::get<0>( ft->npc_complain_data ) ) {
             if( u.is_npc() && chance > 0 && one_in( chance ) ) {
@@ -2048,9 +2041,6 @@ void map::monster_in_field( monster &z )
                 dam += rng( 4, 7 * intensity );
             }
         }
-        if( cur_field_type == fd_mechanical_fluid && x_in_y( cur.get_field_intensity(), 20 ) ) {
-            z.add_effect( effect_downed, 2_turns );
-        }
     }
 
     if( dam > 0 ) {