diff --git a/.gitignore b/.gitignore index ea8c4bf..ccb5166 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +.vscode \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 78218b7..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "editor.tabSize": 4 -} diff --git a/hack/metagame-gen/src/main.rs b/hack/metagame-gen/src/main.rs index 628746b..ed4001d 100644 --- a/hack/metagame-gen/src/main.rs +++ b/hack/metagame-gen/src/main.rs @@ -11,6 +11,12 @@ struct MetagameEvent { metagame_event_id: String, #[serde(rename = "type", deserialize_with = "deserialize_number_from_string")] event_type: i32, + name: LangEn, +} + +#[derive(Deserialize)] +struct LangEn { + en: String, } #[tokio::main] @@ -29,13 +35,15 @@ pub fn alert_type(metagame_event_id: i32) -> String {{ match metagame_event_id {{ {} => \"air\".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 == 9).map(|e| e.metagame_event_id.clone()).collect::>().join(" | "), -); + 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 == 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(" | "), + ); std::fs::write("../../src/alert_types.rs", template).unwrap(); diff --git a/src/alert_types.rs b/src/alert_types.rs index ffd541d..71bd69f 100644 --- a/src/alert_types.rs +++ b/src/alert_types.rs @@ -2,15 +2,9 @@ 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() - } - 147 | 148 | 149 | 150 | 151 | 152 | 153 | 154 | 155 | 156 | 157 | 158 | 176 | 177 | 178 - | 179 | 186 | 187 | 188 | 189 | 190 | 191 | 192 | 193 | 208 | 209 | 210 | 211 | 212 - | 213 | 214 | 215 | 222 | 223 | 224 | 226 | 227 | 248 | 249 | 250 | _ => { - "conquest".to_string() - } + 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(), + 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(), } -} +} \ No newline at end of file