From 8274d8c5edca8180e2b64deca931b58a400ed59f Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Thu, 3 Aug 2023 23:42:05 -0400 Subject: [PATCH] separate max and sudden death --- hack/metagame-gen/src/main.rs | 4 +++- src/alert_types.rs | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hack/metagame-gen/src/main.rs b/hack/metagame-gen/src/main.rs index ed4001d..8e95a4b 100644 --- a/hack/metagame-gen/src/main.rs +++ b/hack/metagame-gen/src/main.rs @@ -34,13 +34,15 @@ async fn main() { pub fn alert_type(metagame_event_id: i32) -> String {{ match metagame_event_id {{ {} => \"air\".to_string(), + {} => \"max\".to_string(), {} => \"sudden_death\".to_string(), {} => \"unstable_meltdown\".to_string(), {} | _ => \"conquest\".to_string(), }} }}", metagame_events.metagame_event_list.iter().filter(|e| e.event_type == 10).map(|e| e.metagame_event_id.clone()).collect::>().join(" | "), - metagame_events.metagame_event_list.iter().filter(|e| e.event_type == 6).map(|e| e.metagame_event_id.clone()).collect::>().join(" | "), + metagame_events.metagame_event_list.iter().filter(|e| e.event_type == 6 && e.name.en.contains("aximum")).map(|e| e.metagame_event_id.clone()).collect::>().join(" | "), + metagame_events.metagame_event_list.iter().filter(|e| e.event_type == 6 && !e.name.en.contains("aximum")).map(|e| e.metagame_event_id.clone()).collect::>().join(" | "), metagame_events.metagame_event_list.iter().filter(|e| e.event_type == 9 && e.name.en.contains("eltdown")).map(|e| e.metagame_event_id.clone()).collect::>().join(" | "), metagame_events.metagame_event_list.iter().filter(|e| e.event_type == 9 && !e.name.en.contains("eltdown")).map(|e| e.metagame_event_id.clone()).collect::>().join(" | "), ); diff --git a/src/alert_types.rs b/src/alert_types.rs index 71bd69f..439f5b4 100644 --- a/src/alert_types.rs +++ b/src/alert_types.rs @@ -3,7 +3,8 @@ pub fn alert_type(metagame_event_id: i32) -> String { match metagame_event_id { 167 | 168 | 172 | 173 | 174 | 175 | 194 | 195 | 196 | 197 | 204 | 206 | 207 | 216 | 217 | 218 | 219 | 220 | 221 | 225 | 228 | 229 | 230 | 231 | 232 | 235 => "air".to_string(), - 106 | 198 | 199 | 200 | 201 | 233 | 236 | 237 | 238 | 239 | 240 | 241 => "sudden_death".to_string(), + 198 | 199 | 200 | 201 | 233 => "max".to_string(), + 106 | 236 | 237 | 238 | 239 | 240 | 241 => "sudden_death".to_string(), 176 | 177 | 178 | 179 | 186 | 187 | 188 | 189 | 190 | 191 | 192 | 193 | 248 | 249 | 250 => "unstable_meltdown".to_string(), 147 | 148 | 149 | 150 | 151 | 152 | 153 | 154 | 155 | 156 | 157 | 158 | 208 | 209 | 210 | 211 | 212 | 213 | 214 | 215 | 222 | 223 | 224 | 226 | 227 | _ => "conquest".to_string(), }