src/chat.rs

@@ -112,7 +112,6 @@ pub struct Talker {
     pub chat_name: String,
     pub actor_id: String,
     pub name: Option<String>,
-    pub counts_towards_achievement: bool,
     pub pronoun: Option<String>,
     pub talking_speed: f32,
 }
@@ -655,10 +654,8 @@ pub fn handle_new_conversations(
         }
         match (*chatdb).get_chat_by_id(&event.talker.chat_name) {
             Ok(chat_id) => {
-                if event.talker.counts_towards_achievement {
+                if let Some(name) = &event.talker.name {
-                    if let Some(name) = &event.talker.name {
+                    ew_achievement.send(game::AchievementEvent::TalkTo(name.clone()));
-                        ew_achievement.send(game::AchievementEvent::TalkTo(name.clone()));
-                    }
                 }
                 let mut chat = Chat {
                     internal_id: chat_id,

src/chats/serenity.yaml

@@ -822,10 +822,3 @@
   - Phew, that was close.  Take care of yourself!
 - Anything else?
 - goto: entrypoint
-
-
----
-
-- chat: OxygenTank
-- script: refilloxygen 1
-- system: Oxygen refilled

src/cmd.rs

@@ -80,7 +80,6 @@ struct ParserState {
     angular_momentum: DVec3,
     pronoun: Option<String>,
     message_on_entry: Option<String>,
-    chat_counts_towards_achievements: bool,
     is_sphere: bool,
     is_player: bool,
     is_lifeform: bool,
@@ -141,7 +140,6 @@ impl Default for ParserState {
             angular_momentum: DVec3::new(0.03, 0.3, 0.09),
             pronoun: None,
             message_on_entry: None,
-            chat_counts_towards_achievements: true,
             is_sphere: false,
             is_player: false,
             is_lifeform: false,
@@ -484,9 +482,6 @@ pub fn load_defs(mut ew_spawn: EventWriter<SpawnEvent>) {
             ["chatid", chat] => {
                 state.chat = chat.to_string();
             }
-            ["chat_achievement", "no"] => {
-                state.chat_counts_towards_achievements = false;
-            }
             ["scale", scale] => {
                 if let Ok(scale_float) = scale.parse::<f32>() {
                     state.model_scale = scale_float;
@@ -837,12 +832,6 @@ fn spawn_scenes(
                         // command: density 2000
                         state.density = 2000.0;
 
-                        // command: chatid OxygenTank
-                        state.chat = String::from("OxygenTank");
-
-                        // command: chat_achievement no
-                        state.chat_counts_towards_achievements = false;
-
                         // command: pointofinterest yes
                         ew_spawn.send(SpawnEvent(state));
                     }
@@ -1090,19 +1079,16 @@ fn spawn_entities(
             actor.insert(actor::Identifier(state.id.clone()));
             id2pos.0.insert(state.id.clone(), absolute_pos);
         }
-        if !state.chat.is_empty()  {
+        if !state.chat.is_empty() {
             actor.insert(chat::Talker {
                 actor_id: state.id.clone(),
                 chat_name: state.chat.clone(),
                 name: state.name.clone(),
                 pronoun: state.pronoun.clone(),
-                counts_towards_achievement: state.chat_counts_towards_achievements,
                 talking_speed: 1.0,
             });
-            if state.chat_counts_towards_achievements {
+            if let Some(name) = &state.name {
-                if let Some(name) = &state.name {
+                achievement_tracker.all_people.insert(name.clone());
-                    achievement_tracker.all_people.insert(name.clone());
-                }
             }
         }
         if state.is_vehicle {

src/data/defs.txt

@@ -575,7 +575,6 @@ actor -300 0 40 suitv2
     id Drifter
     name "梓涵"
     chatid Drifter
-    chat_achievement no
     alive no
     wants maxvelocity none
     oxygen 0.08
@@ -756,7 +755,6 @@ actor 100 -18000 2000 clippy
         wants matchvelocitywith orbbusstopserenity
         name "Rudy"
         chatid NPCinCryoStasis
-        chat_achievement no
         pronoun he
 
 actor -184971e3 149410e3 -134273e3 clippy