Implement pulls landing.

[pkanalytics] / events.cpp

diff --git a/events.cpp b/events.cpp
index 2fca843ad3f904284afa4c9b79b7205366eb6f0b..8ad0009d1560f0b78f8097cfd94013ee9cd8d178 100644 (file)
--- a/events.cpp
+++ b/events.cpp
@@ -248,10 +248,12 @@ EventsModel::Status EventsModel::get_status_at(uint64_t t)
 
                if (e.type == "goal" || e.type == "their_goal") {
                        s.pull_state = Status::SHOULD_PULL;
-               } else if (e.type == "in" || e.type == "out" || e.type == "stoppage" || e.type == "restart" || e.type == "unknown") {
+               } else if (e.type == "in" || e.type == "out" || e.type == "stoppage" || e.type == "restart" || e.type == "unknown" || e.type == "set_defense" || e.type == "set_offense") {
                        // No effect on pull status.
+               } else if (e.type == "pull") {
+                       s.pull_state = Status::PULL_IN_AIR;
                } else {
-                       s.pull_state = Status::NOT_PULLING;
+                       s.pull_state = Status::NOT_PULLING;  // Includes pull_landed and pull_oob.
                }
 
                if (e.type == "set_offense") {