more ++ fixes, shows + during anims

2019-09-05 22:41:36 +10:00
parent 968d0a01aa
commit 21f3a80752
5 changed files with 184 additions and 119 deletions
@@ -497,33 +497,201 @@ pub enum Skill {
    // Evade, // actively evade
    // Nightmare,
    // Sleep,
+
    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,
+
+    Absorption,
+    AbsorptionPlus,
+    AbsorptionPlusPlus,
+
+    CounterAttack,
+    CounterAttackPlus,
+    CounterAttackPlusPlus,
+    
    Electrocute,
    ElectrocutePlus,
    ElectrocutePlusPlus,
@@ -531,116 +699,17 @@ pub enum Skill {
    ElectrocuteTickPlus,
    ElectrocuteTickPlusPlus,

-    Curse,
-    CursePlus,
-    CursePlusPlus,
-
-    Decay, // dot
-    DecayPlus,
-    DecayPlusPlus,
    DecayTick, // dot
    DecayTickPlus,
    DecayTickPlusPlus,

-    Haste,
-    HastePlus,
-    HastePlusPlus,
    HasteStrike,
-
-    Heal,
-    HealPlus,
-    HealPlusPlus,
-
-    Hex,
-    HexPlus,
-    HexPlusPlus,
-
-    Absorption,
-    AbsorptionPlus,
-    AbsorptionPlusPlus,
-    Absorb,
-    AbsorbPlus,
-    AbsorbPlusPlus,
    HybridBlast,

-    Hybrid,
-    HybridPlus,
-    HybridPlusPlus,
-
-    Invert,
-    InvertPlus,
-    InvertPlusPlus,
-
-    Counter, // avoid all damage
-    CounterPlus,
-    CounterPlusPlus,
-    Purge,
-    PurgePlus,
-    PurgePlusPlus,
-
-    Purify,
-    PurifyPlus,
-    PurifyPlusPlus,
-
-    Recharge,
-    RechargePlus,
-    RechargePlusPlus,
-
-    Reflect,
-    ReflectPlus,
-    ReflectPlusPlus,
-
-    CounterAttack,
-    CounterAttackPlus,
-    CounterAttackPlusPlus,
-
-    Ruin,
-    RuinPlus,
-    RuinPlusPlus,
-
-    Link,
-    LinkPlus,
-    LinkPlusPlus,
-
-    Silence,
-    SilencePlus,
-    SilencePlusPlus,
-
-    Siphon,
-    SiphonPlus,
-    SiphonPlusPlus,
    SiphonTick,
    SiphonTickPlus,
    SiphonTickPlusPlus,

-    Slay,
-    SlayPlus,
-    SlayPlusPlus,
-
-    Sleep,
-    SleepPlus,
-    SleepPlusPlus,
-
-    Restrict,
-    RestrictPlus,
-    RestrictPlusPlus,
-
-    Strike,
-    StrikePlus,
-    StrikePlusPlus,
-
-    Intercept,
-    InterceptPlus,
-    InterceptPlusPlus,
-
-    Break, // no damage stun, adds vulnerable
-    BreakPlus,
-    BreakPlusPlus,
-
-    Triage, // hot
-    TriagePlus,
-    TriagePlusPlus,
-
    TriageTick,
    TriageTickPlus,
    TriageTickPlusPlus,