[Xedra Evolved] Rubik dialogue about Jotunn quads

data/mods/Xedra_Evolved/achievements/achievements.json

@@ -225,5 +225,19 @@
     "stat_type": "count",
     "event_transformation": "avatar_gains_deduction_level_5",
     "description": { "str_sp": "Investigation skill level 5 gained" }
+  },
+  {
+    "id": "achievement_find_border_patrol_office",
+    "type": "achievement",
+    "name": "Do borders even matter now?",
+    "requirements": [
+      {
+        "event_statistic": "last_oter_type_avatar_entered",
+        "is": "==",
+        "target": [ "oter_type_str_id", "field_office_3" ],
+        "visible": "when_achievement_completed",
+        "description": "Enter a Border Patrol Office"
+      }
+    ]
   }
 ]

src/avatar.cpp

@@ -295,7 +295,89 @@ void avatar::memorize_clear_decoration( const tripoint_abs_ms &p, std::string_vi
     player_map_memory->clear_tile_decoration( p, prefix );
 }
 
-std::vector<mission *> avatar::get_active_missions() const
+std::vector<achievement *> avatar::has_achievement() const
+{
+    std::vector<achievement *> ret;
+    for( auto &elem : achievements ) {
+        if( elem.second ) {
+            ret.push_back( elem.second.get() );
+        }
+    }
+    return ret;
+}
+
+void avatar::gain_achievement( const std::string &id )
+{
+    if( has_achievement( id ) ) {
+        return;
+    }
+    achievements[id] = std::make_unique<achievement>( id );
+}
+
+bool avatar::has_achievement( const std::string &id ) const
+{
+    return achievements.count( id ) > 0;
+}
+
+void avatar::set_achievement( const std::string &id, const bool achieved )
+{
+    if( !has_achievement( id ) ) {
+        return;
+    }
+    achievements[id]->set_achieved( achieved );
+}
+
+void avatar::set_achievement( const std::string &id, const int progress )
+{
+    if( !has_achievement( id ) ) {
+        return;
+    }
+    achievements[id]->set_progress( progress );
+}
+
+void avatar::set_achievement( const std::string &id, const std::string &progress )
+{
+    if( !has_achievement( id ) ) {
+        return;
+    }
+    achievements[id]->set_progress( progress );
+}
+
+void avatar::set_achievement( const std::string &id, const std::string &progress,
+                              const bool achieved )
+{
+    if( !has_achievement( id ) ) {
+        return;
+    }
+    achievements[id]->set_progress( progress );
+    achievements[id]->set_achieved( achieved );
+}
+
+void avatar::set_achievement( const std::string &id, const int progress,
+                              const bool achieved )
+{
+    if( !has_achievement( id ) ) {
+        return;
+    }
+    achievements[id]->set_progress( progress );
+    achievements[id]->set_achieved( achieved );
+}
+
+void avatar::set_achievement( const std::string &id, const std::string &progress,
+                              const std::string &progress_max, const bool achieved )
+{
+    if( !has_achievement( id ) ) {
+        return;
+    }
+    achievements[id]->set_progress( progress );
+    achievements[id]->set_progress_max( progress_max );
+    achievements[id]->set_achieved( achieved );
+}
+
+void avatar::set_achievement( const std::string &id, const int progress,
+                              const int progress_max
+
+                              std::vector<mission *> avatar::get_active_missions() const
 {
     return active_missions;
 }

src/condition.cpp

@@ -556,6 +556,14 @@ void conditional_t::set_u_has_mission( const JsonObject &jo, const std::string &
     };
 }
 
+void conditional_t::set_u_has_achievement( const JsonObject &jo, const std::string &member )
+{
+    str_or_var u_achievement = get_str_or_var( jo.get_member( member ), member, true );
+    condition = [u_achievement]( dialogue const & d ) {
+        return get_avatar().has_achievement( achievement_id( u_achievement.evaluate( d ) ) );
+    };
+}
+
 void conditional_t::set_u_monsters_in_direction( const JsonObject &jo,
         const std::string &member )
 {
@@ -3279,6 +3287,8 @@ conditional_t::conditional_t( const JsonObject &jo )
         set_is_riding( is_npc );
     } else if( jo.has_member( "u_has_mission" ) ) {
         set_u_has_mission( jo, "u_has_mission" );
+    } else if( jo.has_member( "u_has_achievement" ) ) {
+        set_u_has_achievement( jo, "u_has_achievement" );
     } else if( jo.has_member( "u_monsters_in_direction" ) ) {
         set_u_monsters_in_direction( jo, "u_monsters_in_direction" );
     } else if( jo.has_member( "u_safe_mode_trigger" ) ) {

src/condition.h

@@ -121,6 +121,7 @@ struct conditional_t {
         void set_is_riding( bool is_npc = false );
         void set_npc_has_class( const JsonObject &jo, const std::string &member, bool is_npc );
         void set_u_has_mission( const JsonObject &jo, const std::string &member );
+        void set_u_has_achievement( const JsonObject &jo, const std::string &member );
         void set_u_monsters_in_direction( const JsonObject &jo, const std::string &member );
         void set_u_safe_mode_trigger( const JsonObject &jo, const std::string &member );
         void set_has_strength( const JsonObject &jo, const std::string &member, bool is_npc = false );