Add Treetops

data/json/effects.json

@@ -607,7 +607,7 @@
     "name": [ "Unstable Footing" ],
     "desc": [ "Your footing is unstable.  It's more difficult to fight while standing here." ],
     "apply_message": "You try to keep your balance.",
-    "resist_traits": [ "GASTROPOD_BALANCE" ],
+    "resist_traits": [ "GASTROPOD_BALANCE", "BIRD_LEGS" ],
     "rating": "bad",
     "limb_score_mods": [ { "limb_score": "balance", "modifier": 0.75 }, { "limb_score": "footing", "modifier": 0.4 } ],
     "flags": [ "EFFECT_LIMB_SCORE_MOD" ]

data/json/furniture_and_terrain/terrain-roofs.json

@@ -329,5 +329,45 @@
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
     "bash": { "str_min": 48, "str_max": 80, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
+  },
+  {
+    "type": "terrain",
+    "id": "t_treetop",
+    "name": "treetop",
+    "description": "The upper branches of a tree.  There's just enough room to perch here.",
+    "symbol": "#",
+    "color": [ "light_green", "green", "yellow_yellow", "brown" ],
+    "move_cost": 6,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "UNSTABLE", "CLIMBABLE", "SINGLE_SUPPORT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_treetop_evergreen",
+    "name": "treetop",
+    "description": "The upper branches of a tree.  There's just enough room to perch here.",
+    "symbol": "#",
+    "color": [ "green" ],
+    "move_cost": 6,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "UNSTABLE", "CLIMBABLE", "SINGLE_SUPPORT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_treetop_dead",
+    "name": "dead treetop",
+    "description": "The bare upper branches of a dead tree.  There's just enough room to perch here.",
+    "symbol": "#",
+    "color": "brown",
+    "move_cost": 6,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "SINGLE_SUPPORT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_treetop_giant_fern",
+    "name": "giant fern top",
+    "description": "The top of some unearthly gigantic fern.  There is enough room to perch up here, but only just.",
+    "symbol": "#",
+    "color": "green",
+    "move_cost": 6,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "SINGLE_SUPPORT" ]
   }
 ]

data/json/mutations/mutations.json

@@ -4670,7 +4670,7 @@
     "visibility": 4,
     "ugliness": 2,
     "mixed_effect": true,
-    "description": "Your legs and feet have become bird-like.  Instead of toes you now have three long talons at the front and one at the back, ending in wicked claws and preventing you from wearing shoes.  Fortunately they don't impede your movement.",
+    "description": "Your legs and feet have become bird-like, perfect for perching on precarious terrain.  Instead of toes you now have three long talons at the front and one at the back, ending in wicked claws and preventing you from wearing shoes.  Fortunately they don't impede your movement.",
     "active": true,
     "activated_is_setup": false,
     "activated_eocs": [ "EOC_AVIAN_LEAP" ],

src/activity_actor.cpp

@@ -6170,6 +6170,7 @@ void chop_tree_activity_actor::finish( player_activity &act, Character &who )
     here.ter_set( pos, t_stump );
     who.add_msg_if_player( m_good, _( "You finish chopping down a tree." ) );
     // sound of falling tree
+    here.collapse_at( pos, false, true, false );
     sfx::play_variant_sound( "misc", "timber",
                              sfx::get_heard_volume( here.getlocal( act.placement ) ) );
     get_event_bus().send<event_type::cuts_tree>( who.getID() );

src/faction_camp.cpp

@@ -4584,7 +4584,7 @@ int om_cutdown_trees( const tripoint_abs_omt &omt_tgt, int chance, bool estimate
     int harvested = 0;
     int total = 0;
     tripoint mapmin = tripoint( 0, 0, omt_tgt.z() );
-    tripoint mapmax = tripoint( 2 * SEEX - 1, 2 * SEEY - 1, omt_tgt.z() );
+    tripoint mapmax = tripoint( 2 * SEEX - 1, 2 * SEEY - 1, omt_tgt.z() + 1 );
     for( const tripoint &p : target_bay.points_in_rectangle( mapmin, mapmax ) ) {
         if( target_bay.ter( p ).obj().has_flag( ter_furn_flag::TFLAG_TREE ) && rng( 0, 100 ) < chance ) {
             total++;
@@ -4596,6 +4596,10 @@ int om_cutdown_trees( const tripoint_abs_omt &omt_tgt, int chance, bool estimate
             tripoint to = p + tripoint( dir, omt_tgt.z() );
             std::vector<tripoint> tree = line_to( p, to, rng( 1, 8 ) );
             for( tripoint &elem : tree ) {
+                const tripoint &treetop = tripoint( elem.xy(), elem.z + 1 );
+                if( target_bay.ter( treetop ).obj().has_flag( ter_furn_flag::TFLAG_SINGLE_SUPPORT ) ) {
+                    target_bay.destroy( treetop );
+                    }
                 target_bay.destroy( elem );
                 target_bay.ter_set( elem, t_trunk );
             }

src/game.cpp

@@ -11774,9 +11774,15 @@ void game::vertical_move( int movez, bool force, bool peeking )
     int move_cost = 100;
     tripoint stairs( u.posx(), u.posy(), u.posz() + movez );
     bool wall_cling = u.has_flag( json_flag_WALL_CLING );
+    bool adjacent_climb = false;
     if( !force && movez == 1 && !here.has_flag( ter_furn_flag::TFLAG_GOES_UP, u.pos() ) &&
         !u.is_underwater() ) {
         // Climbing
+        for( const tripoint &p : here.points_in_radius( u.pos(), 2 ) ) {
+            if( here.has_flag( ter_furn_flag::TFLAG_CLIMB_ADJACENT, p ) ) {
+                adjacent_climb = true;
+            }
+        }
         if( here.has_floor_or_support( stairs ) ) {
             add_msg( m_info, _( "You can't climb here - there's a ceiling above your head." ) );
             return;
@@ -11791,7 +11797,7 @@ void game::vertical_move( int movez, bool force, bool peeking )
         add_msg_debug( debugmode::DF_GAME, "Climb cost %d", cost );
         const bool can_climb_here = cost > 0 ||
                                     u.has_flag( json_flag_CLIMB_NO_LADDER ) || wall_cling;
-        if( !can_climb_here ) {
+        if( !can_climb_here && !adjacent_climb ) {
             add_msg( m_info, _( "You can't climb here - you need walls and/or furniture to brace against." ) );
             return;
         }

src/map.cpp

@@ -3657,6 +3657,9 @@ int map::collapse_check( const tripoint &p ) const
                 if( tbelow == pbelow ) {
                     num_supports += 2;
                 }
+                if( has_flag( ter_furn_flag::TFLAG_SINGLE_SUPPORT, p ) ) {
+                    num_supports = 0;
+                }
             }
         }
     }
@@ -3681,6 +3684,9 @@ int map::collapse_check( const tripoint &p ) const
                 }
             }
         }
+        if( has_flag( ter_furn_flag::TFLAG_SINGLE_SUPPORT, p ) ) {
+            num_supports = 0;
+        }
     }
 
     return 1.7 * num_supports;

src/mapdata.cpp

@@ -266,6 +266,8 @@ std::string enum_to_string<ter_furn_flag>( ter_furn_flag data )
         case ter_furn_flag::TFLAG_GRAZER_INEDIBLE: return "GRAZER_INEDIBLE";
         case ter_furn_flag::TFLAG_BROWSABLE: return "BROWSABLE";
         case ter_furn_flag::TFLAG_MUTANT_TREE: return "MUTANT_TREE";
+        case ter_furn_flag::TFLAG_SINGLE_SUPPORT: return "SINGLE_SUPPORT";
+        case ter_furn_flag::TFLAG_CLIMB_ADJACENT: return "CLIMB_ADJACENT";
 
         // *INDENT-ON*
         case ter_furn_flag::NUM_TFLAG_FLAGS:

src/mapdata.h

@@ -316,6 +316,8 @@ enum class ter_furn_flag : int {
     TFLAG_SMALL_HIDE,
     TFLAG_NO_FLOOR_WATER,
     TFLAG_MUTANT_TREE,
+    TFLAG_SINGLE_SUPPORT,
+    TFLAG_CLIMB_ADJACENT,
 
     NUM_TFLAG_FLAGS
 };