Add age and height

Author: Ramza13

data/json/mutations/mutations.json

@@ -145,8 +145,8 @@
         {
           "condition": {
             "or": [
-              { "compare_int": [ { "u_val": "hour" }, { "const": 6 } ], "op": "<" },
-              { "compare_int": [ { "u_val": "hour" }, { "const": 21 } ], "op": ">" }
+              { "compare_int": [ "hour", { "const": 6 } ], "op": "<" },
+              { "compare_int": [ "hour", { "const": 21 } ], "op": ">" }
             ]
           },
           "msg_on": { "text": "Everything is terrible and this makes you so ANGRY!", "rating": "mixed" }
@@ -169,8 +169,8 @@
         {
           "condition": {
             "and": [
-              { "compare_int": [ { "u_val": "hour" }, { "const": 6 } ], "op": ">" },
-              { "compare_int": [ { "u_val": "hour" }, { "const": 21 } ], "op": "<" }
+              { "compare_int": [ "hour", { "const": 6 } ], "op": ">" },
+              { "compare_int": [ "hour", { "const": 21 } ], "op": "<" }
             ]
           },
           "msg_on": { "text": "As the morning comes, you return back to normal.", "rating": "good" }

data/mods/TEST_DATA/mutations.json

@@ -50,8 +50,8 @@
         {
           "condition": {
             "and": [
-              { "compare_int": [ { "u_val": "hour" }, { "const": 1 } ], "op": ">" },
-              { "compare_int": [ { "u_val": "hour" }, { "const": 3 } ], "op": "<" }
+              { "compare_int": [ "hour", { "const": 1 } ], "op": ">" },
+              { "compare_int": [ "hour", { "const": 3 } ], "op": "<" }
             ]
           },
           "msg_on": { "text": "It's 2 am and it triggers the trigger.", "rating": "mixed" }
@@ -101,8 +101,8 @@
         {
           "condition": {
             "or": [
-              { "compare_int": [ { "u_val": "hour" }, { "const": 1 } ], "op": "<" },
-              { "compare_int": [ { "u_val": "hour" }, { "const": 2 } ], "op": ">" }
+              { "compare_int": [ "hour", { "const": 1 } ], "op": "<" },
+              { "compare_int": [ "hour", { "const": 2 } ], "op": ">" }
             ]
           },
           "msg_on": { "text": "It's no longer 2 am and it triggers the trigger.", "rating": "mixed" }

doc/JSON_INFO.md

@@ -2210,8 +2210,8 @@ The `id` must be exact as it is hardcoded to look for that.
     {
       "condition": { //dialog condition(see NPCs.md)
         "or": [
-          { "compare_int": [ { "u_val": "hour" }, { "const": 2 } ], "op": "<" },
-          { "compare_int": [ { "u_val": "hour" }, { "const": 20 } ], "op": ">" }
+          { "compare_int": [ { "hour", { "const": 2 } ], "op": "<" },
+          { "compare_int": [ { "hour", { "const": 20 } ], "op": ">" }
         ]
       },
       "msg_on": { "text": "Everything is terrible and this makes you so ANGRY!", "rating": "mixed" } // message displayed when the trigger activates

doc/NPCs.md

@@ -934,8 +934,6 @@ Example | Description
 `"u_val": "strength_base"` | Player character's strength. Replace `"strength_base"` with `"dexterity_base"`, `"intelligence_base"`, or `"perception_base"` to get such values.
 `"u_val": "var"` | Custom variable. `"var_name"`, `"type"`, and `"context"` must also be specified. If `global_val` is used then a global variable will be used. If `default` is given as either an int or a variable_object then that value will be used if the variable is empty. If `default_time` is the same thing will happen, but it will be parsed as a time string aka "10 hours". Otherwise 0 will be used if the variable is empty.
 `"u_val": "time_since_var"` | Time since a custom variable was set.  Unit used is turns. `"var_name"`, `"type"`, and `"context"` must also be specified.
-`"u_val": "hour"` | Hours since midnight.
-`"u_val": "moon"` | Phase of the moon. MOON_NEW =0, WAXING_CRESCENT =1, HALF_MOON_WAXING =2, WAXING_GIBBOUS =3, FULL =4, WANING_GIBBOUS =5, HALF_MOON_WANING =6, WANING_CRESCENT =7
 `"u_val": "allies"` | Number of allies the character has. Only supported for the player character. Can be read but not written to.
 `"u_val": "cash"` | Amount of money the character has. Only supported for the player character. Can be read but not written to.
 `"u_val": "owed"` | Owed money to the NPC you're talking to.
@@ -965,7 +963,11 @@ Example | Description
 `"u_val": "anger"` | Current anger level, only works for monsters.
 `"u_val": "friendly"` | Current friendly level, only works for monsters.
 `"u_val": "vitamin"` | Current vitamin level. `name` must also be specified which is the vitamins id.
+`"u_val": "age"` | Current age in years.
+`"u_val": "height"` | Current height in cm. When setting there is a range for your character size category. Setting it too high or low will use the limit instead. For tiny its 58, and 87. For small its 88 and 144. For medium its 145 and 200. For large its 201 and 250. For huge its 251 and 320.
 `"distance": []` | Distance between two targets. Valid targets are: "u","npc" and an object with a variable name.
+`"hour"` | Hours since midnight.
+`"moon"` | Phase of the moon. MOON_NEW =0, WAXING_CRESCENT =1, HALF_MOON_WAXING =2, WAXING_GIBBOUS =3, FULL =4, WANING_GIBBOUS =5, HALF_MOON_WANING =6, WANING_CRESCENT =7
 ```
 "condition": { "compare_int": [ { "distance": [ "u",{ "u_val": "stuck", "type": "ps", "context": "teleport" }  ] }, { "const": 5 } ], "op": ">" }
 ```

src/condition.cpp

@@ -992,8 +992,8 @@ void conditional_t<T>::set_compare_int( const JsonObject &jo, const std::string
         };
         return;
     }
-    std::function<int( const T & )> get_first_int  = get_get_int( objects.get_object( 0 ) );
-    std::function<int( const T & )> get_second_int = get_get_int( objects.get_object( 1 ) );
+    std::function<int( const T & )> get_first_int = objects.has_object(0) ? get_get_int( objects.get_object( 0 ) ) : get_get_int( objects.get_string( 0 ), jo );
+    std::function<int( const T & )> get_second_int = objects.has_object(1) ? get_get_int( objects.get_object( 1 ) ) : get_get_int( objects.get_string( 1 ), jo );
     const std::string &op = jo.get_string( "op" );
 
     if( op == "==" || op == "=" ) {
@@ -1314,14 +1314,6 @@ std::function<int( const T & )> conditional_t<T>::get_get_int( const JsonObject
             return [is_npc]( const T & d ) {
                 return d.actor( is_npc )->get_friendly();
             };
-        } else if( checked_value == "moon" ) {
-            return []( const T & ) {
-                return static_cast<int>( get_moon_phase( calendar::turn ) );
-            };
-        } else if( checked_value == "hour" ) {
-            return []( const T & ) {
-                return to_hours<int>( time_past_midnight( calendar::turn ) );
-            };
         } else if( checked_value == "vitamin" ) {
             std::string vitamin_name = jo.get_string( "name" );
             return [is_npc, vitamin_name]( const T & d ) {
@@ -1332,7 +1324,23 @@ std::function<int( const T & )> conditional_t<T>::get_get_int( const JsonObject
                     return 0;
                 }
             };
+        } else if( checked_value == "age" ) {
+            return [is_npc]( const T & d ) {
+                return d.actor( is_npc )->get_age();
+            };
+        } else if( checked_value == "height" ) {
+            return [is_npc]( const T & d ) {
+                return d.actor( is_npc )->get_height();
+            };
         }
+    } else if( jo.has_member( "moon" ) ) {
+        return []( const T & ) {
+            return static_cast<int>( get_moon_phase( calendar::turn ) );
+        };
+    } else if( jo.has_member( "hour" ) ) {
+        return []( const T & ) {
+            return to_hours<int>( time_past_midnight( calendar::turn ) );
+        };
     } else if( jo.has_array( "distance" ) ) {
         JsonArray objects = jo.get_array( "distance" );
         if( objects.size() != 2 ) {
@@ -1352,6 +1360,24 @@ std::function<int( const T & )> conditional_t<T>::get_get_int( const JsonObject
     };
 }
 
+template<class T>
+std::function<int( const T & )> conditional_t<T>::get_get_int( std::string value, const JsonObject &jo )
+{
+    if( value == "moon" ) {
+        return []( const T & ) {
+            return static_cast<int>( get_moon_phase( calendar::turn ) );
+        };
+    } else if (value == "hour") {
+        return [](const T&) {
+            return to_hours<int>( time_past_midnight(calendar::turn) );
+        };
+    }
+    jo.throw_error( "unrecognized integer source in " + value );
+    return []( const T & ) {
+        return 0;
+    };
+}
+
 template<class T>
 void conditional_t<T>::set_u_has_camp()
 {
@@ -1385,7 +1411,8 @@ void conditional_t<T>::set_has_reason()
 }
 
 template<class T>
-void conditional_t<T>::set_has_skill( const JsonObject &jo, const std::string &member, bool is_npc )
+void conditional_t<T>::set_has_skill( const JsonObject &jo, const std::string &member,
+                                      bool is_npc )
 {
     JsonObject has_skill = jo.get_object( member );
     if( !has_skill.has_string( "skill" ) || !has_skill.has_int( "level" ) ) {

src/condition.h

@@ -164,7 +164,7 @@ struct conditional_t {
         void set_can_see( bool is_npc = false );
         void set_compare_int( const JsonObject &jo, const std::string &member );
         static std::function<int( const T & )> get_get_int( const JsonObject &jo );
-
+        static std::function<int(const T&)> get_get_int(std::string value, const JsonObject &jo );
         bool operator()( const T &d ) const {
             if( !condition ) {
                 return false;

src/npctalk.cpp

@@ -3114,6 +3114,14 @@ static std::function<void( const dialogue &, int )> get_set_int( const JsonObjec
                     you->vitamin_set( vitamin_id( vitamin_name ), handle_min_max( d, input, min, max ) );
                 }
             };
+        } else if( checked_value == "age" ) {
+            return [is_npc, min, max]( const dialogue & d, int input ) {
+                d.actor( is_npc )->set_age( handle_min_max( d, input, min, max ) );
+            };
+        } else if( checked_value == "height" ) {
+            return [is_npc, min, max]( const dialogue & d, int input ) {
+                d.actor( is_npc )->set_height( handle_min_max( d, input, min, max ) );
+            };
         }
     }
     jo.throw_error( "error setting integer destination in " + jo.str() );

src/talker.h

@@ -469,5 +469,13 @@ class talker
         virtual int get_kill_xp() const {
             return 0;
         }
+        virtual void set_age( int ) {}
+        virtual int get_age() const {
+            return 0;
+        }
+        virtual void set_height( int ) {}
+        virtual int get_height() const {
+            return 0;
+        }
 };
 #endif // CATA_SRC_TALKER_H

src/talker_character.cpp

@@ -542,6 +542,28 @@ int talker_character_const::get_kill_xp() const
     return me_chr_const->kill_xp;
 }
 
+void talker_character::set_age( int amount )
+{
+    int years_since_cataclysm = to_turns<int>( calendar::turn - calendar::turn_zero ) /
+                                to_turns<int>( calendar::year_length() );
+    me_chr->set_base_age( amount + years_since_cataclysm );
+}
+
+int talker_character_const::get_age() const
+{
+    return me_chr_const->age();
+}
+
+void talker_character::set_height( int amount )
+{
+    me_chr->set_base_height( amount );
+}
+
+int talker_character_const::get_height() const
+{
+    return me_chr_const->height();
+}
+
 void talker_character::add_bionic( const bionic_id &new_bionic )
 {
     me_chr->add_bionic( new_bionic );

src/talker_character.h

@@ -113,6 +113,8 @@ class talker_character_const: public talker
         int get_stamina() const override;
         int get_sleep_deprivation() const override;
         int get_kill_xp() const override;
+        int get_age() const override;
+        int get_height() const override;
     protected:
         talker_character_const() = default;
         const Character *me_chr_const;
@@ -187,6 +189,8 @@ class talker_character: public talker_character_const
         void set_stamina( int ) override;
         void set_sleep_deprivation( int ) override;
         void set_kill_xp( int ) override;
+        void set_age( int ) override;
+        void set_height( int ) override;
         void add_bionic( const bionic_id &new_bionic ) override;
         void remove_bionic( const bionic_id &old_bionic ) override;
         std::vector<skill_id> skills_teacheable() const override;