Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: syndicate jobs now have the type #15

Merged
merged 5 commits into from
Jun 23, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/worldstate/models/arbitration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,17 @@ mod test {

match client.fetch::<Arbitration>().await {
Ok(_arbitration) => Ok(()),
Err(why) => Err(why),
Err(why) => {
if let ApiError::ApiError(error) = why {
if error.code == 404 {
Ok(())
} else {
Err(ApiError::ApiError(error))
}
TobiTenno marked this conversation as resolved.
Show resolved Hide resolved
} else {
Err(why)
}
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/worldstate/models/faction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ enum_builder! {
Tenno,
Narmer,
Crossfire,
Murmur = "The Murmur"
Murmur = "The Murmur",
:"Honestly, no idea what this is"
ManInTheWall = "FC_MITW"
}
46 changes: 24 additions & 22 deletions src/worldstate/models/mission_type.rs
Original file line number Diff line number Diff line change
@@ -1,44 +1,46 @@
use super::macros::enum_builder;
enum_builder! {
:"A Mission Type in Warframe"
MissionType;
AncientRetribution = "Ancient Retribution",
Arena = "Arena",
Assassination = "Assassination",
Assault = "Assault",
Capture = "Capture",
Conclave = "Conclave",
Arena,
Assassination,
Assault,
Capture,
Conclave,
DarkSectorDefection = "Dark Sector Defection",
DarkSectorDefense = "Dark Sector Defense",
DarkSectorDisruption = "Dark Sector Disruption",
DarkSectorExcavation = "Dark Sector Excavation",
DarkSectorSabotage = "Dark Sector Sabotage",
DarkSectorSurvival = "Dark Sector Survival",
Defense = "Defense",
Disruption = "Disruption",
Excavation = "Excavation",
Defense,
Disruption,
Excavation,
ExterminationArchwing = "Extermination (Archwing)",
Extermination = "Extermination",
Extermination,
FreeRoam = "Free Roam",
Hijack = "Hijack",
Hive = "Hive",
Hijack,
Hive,
HiveSabotage = "Hive Sabotage",
Interception = "Interception",
Interception,
InterceptionArchwing = "Interception (Archwing)",
MobileDefense = "Mobile Defense",
MobileDefenseArchwing = "Mobile Defense (Archwing)",
OrokinSabotage = "Orokin Sabotage",
Orphix = "Orphix",
Orphix,
PursuitArchwing = "Pursuit (Archwing)",
Relay = "Relay",
Rescue = "Rescue",
Relay,
Rescue,
RushArchwing = "Rush (Archwing)",
Sabotage = "Sabotage",
Sabotage,
SabotageArchwing = "Sabotage (Archwing)",
Skirmish = "Skirmish",
Spy = "Spy",
Survival = "Survival",
Volatile = "Volatile",
Alchemy = "Alchemy",
Corruption = "Corruption",
Skirmish,
Spy,
Survival,
Volatile,
Alchemy,
Corruption,
VoidCascade = "Void Cascade",
Defection
}
4 changes: 3 additions & 1 deletion src/worldstate/models/syndicate_mission.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ model_builder! {
:"The Reward Pool of the Bounty"
pub reward_pool: Vec<String>,

:"The name of the syndicate job"
pub job_name: String = "type",
Mettwasser marked this conversation as resolved.
Show resolved Hide resolved

:"The level of the Enemies in this job"
pub enemy_levels: Vec<i32>,
Expand All @@ -29,7 +31,7 @@ model_builder! {
}

model_builder! {
:"Warning: This is extremly janky -- All Syndicate Missions (including Cetus, etc.)\nNote that they *may* be empty, in which case they are not valid."
:"Warning: This is extremely janky -- All Syndicate Missions (including Cetus, etc.)\nNote that they *may* be empty, in which case they are not valid."
SyndicateMission: "/syndicateMissions",
rt = array,
timed = true;
Expand Down
Loading