Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

2019-09-04 16:38:14 +10:00
parent b910f99f89 1600ca6c82
commit d643884b2c
3 changed files with 312 additions and 11 deletions
@@ -44,139 +44,229 @@ pub enum Item {
    LifeRBPlusPlus,

    // Power Upgrades
+    PowerGG,
    PowerRR,
    PowerBB,
-    PowerGG,
    PowerRG,
    PowerGB,
    PowerRB,
-    PowerRRPlus,
    PowerGGPlus,
+    PowerRRPlus,
    PowerBBPlus,
    PowerRGPlus,
    PowerGBPlus,
    PowerRBPlus,
+    PowerGGPlusPlus,
    PowerRRPlusPlus,
    PowerBBPlusPlus,
-    PowerGGPlusPlus,
    PowerRGPlusPlus,
    PowerGBPlusPlus,
    PowerRBPlusPlus,

    // Speed Upgrades
+    SpeedGG,
    SpeedRR,
    SpeedBB,
-    SpeedGG,
    SpeedRG,
    SpeedGB,
    SpeedRB,
-
+    SpeedGGPlus,
    SpeedRRPlus,
    SpeedBBPlus,
-    SpeedGGPlus,
    SpeedRGPlus,
    SpeedGBPlus,
    SpeedRBPlus,
-
+    SpeedGGPlusPlus,
    SpeedRRPlusPlus,
    SpeedBBPlusPlus,
-    SpeedGGPlusPlus,
    SpeedRGPlusPlus,
    SpeedGBPlusPlus,
    SpeedRBPlusPlus,

    Amplify,
+    #[serde(rename = "Amplify+")]
    AmplifyPlus,
+    #[serde(rename = "Amplify++")]
    AmplifyPlusPlus,
+    
    Absorb,
+    #[serde(rename = "Absorb+")]
    AbsorbPlus,
+    #[serde(rename = "Absorb++")]
    AbsorbPlusPlus,
+    
    Banish,
+    #[serde(rename = "Banish+")]
    BanishPlus,
+    #[serde(rename = "Banish++")]
    BanishPlusPlus,
+    
    Bash,
+    #[serde(rename = "Bash+")]
    BashPlus,
+    #[serde(rename = "Bash++")]
    BashPlusPlus,
+    
    Blast,
+    #[serde(rename = "Blast+")]
    BlastPlus,
+    #[serde(rename = "Blast++")]
    BlastPlusPlus,
+    
    Chaos,
+    #[serde(rename = "Chaos+")]
    ChaosPlus,
+    #[serde(rename = "Chaos++")]
    ChaosPlusPlus,
+    
    Sustain,
+    #[serde(rename = "Sustain+")]
    SustainPlus,
+    #[serde(rename = "Sustain++")]
    SustainPlusPlus,
+    
    Electrify,
+    #[serde(rename = "Electrify+")]
    ElectrifyPlus,
+    #[serde(rename = "Electrify++")]
    ElectrifyPlusPlus,
+    
    Curse,
+    #[serde(rename = "Curse+")]
    CursePlus,
+    #[serde(rename = "Curse++")]
    CursePlusPlus,
+    
    Decay,
+    #[serde(rename = "Decay+")]
    DecayPlus,
+    #[serde(rename = "Decay++")]
    DecayPlusPlus,
+    
    Hex,
+    #[serde(rename = "Hex+")]
    HexPlus,
+    #[serde(rename = "Hex++")]
    HexPlusPlus,
+    
    Haste,
+    #[serde(rename = "Haste+")]
    HastePlus,
+    #[serde(rename = "Haste++")]
    HastePlusPlus,
+    
    Heal,
+    #[serde(rename = "Heal+")]
    HealPlus,
+    #[serde(rename = "Heal++")]
    HealPlusPlus,
+    
    Hybrid,
+    #[serde(rename = "Hybrid+")]
    HybridPlus,
+    #[serde(rename = "Hybrid++")]
    HybridPlusPlus,
+    
    Invert,
+    #[serde(rename = "Invert+")]
    InvertPlus,
+    #[serde(rename = "Invert++")]
    InvertPlusPlus,
+    
    Counter,
+    #[serde(rename = "Counter+")]
    CounterPlus,
+    #[serde(rename = "Counter++")]
    CounterPlusPlus,
+    
    Purge,
+    #[serde(rename = "Purge+")]
    PurgePlus,
+    #[serde(rename = "Purge++")]
    PurgePlusPlus,
+    
    Purify,
+    #[serde(rename = "Purify+")]
    PurifyPlus,
+    #[serde(rename = "Purify++")]
    PurifyPlusPlus,
+    
    Reflect,
+    #[serde(rename = "Reflect+")]
    ReflectPlus,
+    #[serde(rename = "Reflect++")]
    ReflectPlusPlus,
+    
    Recharge,
+    #[serde(rename = "Recharge+")]
    RechargePlus,
+    #[serde(rename = "Recharge++")]
    RechargePlusPlus,
+    
    Ruin,
+    #[serde(rename = "Ruin+")]
    RuinPlus,
+    #[serde(rename = "Ruin++")]
    RuinPlusPlus,
+    
    Link,
+    #[serde(rename = "Link+")]
    LinkPlus,
+    #[serde(rename = "Link++")]
    LinkPlusPlus,
+    
    Silence,
+    #[serde(rename = "Silence+")]
    SilencePlus,
+    #[serde(rename = "Silence++")]
    SilencePlusPlus,
+    
    Slay,
+    #[serde(rename = "Slay+")]
    SlayPlus,
+    #[serde(rename = "Slay++")]
    SlayPlusPlus,
+    
    Sleep,
+    #[serde(rename = "Sleep+")]
    SleepPlus,
+    #[serde(rename = "Sleep++")]
    SleepPlusPlus,
+    
    Restrict,
+    #[serde(rename = "Restrict+")]
    RestrictPlus,
+    #[serde(rename = "Restrict++")]
    RestrictPlusPlus,
+    
    Strike,
+    #[serde(rename = "Strike+")]
    StrikePlus,
+    #[serde(rename = "Strike++")]
    StrikePlusPlus,
+    
    Siphon,
+    #[serde(rename = "Siphon+")]
    SiphonPlus,
+    #[serde(rename = "Siphon++")]
    SiphonPlusPlus,
+    
    Intercept,
+    #[serde(rename = "Intercept+")]
    InterceptPlus,
+    #[serde(rename = "Intercept++")]
    InterceptPlusPlus,
+    
    Break,
+    #[serde(rename = "Break+")]
    BreakPlus,
+    #[serde(rename = "Break++")]
    BreakPlusPlus,
+    
    Triage,
+    #[serde(rename = "Triage+")]
    TriagePlus,
+    #[serde(rename = "Triage++")]
    TriagePlusPlus,
 }