Merge remote branch 'sychotixdev/master' into master

IlliumIv · Oct 8, 2019 · bf6b603 · bf6b603
2 parents 5734585 + a5d73a2
commit bf6b603
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/TreeRoutine/Buffs/BuffsEnum.cs b/TreeRoutine/Buffs/BuffsEnum.cs
@@ -925,6 +925,12 @@ public enum BuffEnums
         bestiary_tiger_boss_aura1,
         elemental_warding_buff,
         bestiary_legendary_enrage,
+        delve_degen_buff,
+        sand_armour,
+        blood_armour,
+        player_aura_accuracy_and_crits,
+        bloodstained_banner_buff_aura,
+        player_physical_damage_aura,
         royale_pain
     }
 }
diff --git a/config/flaskinfo.json b/config/flaskinfo.json
@@ -147,20 +147,21 @@
     "FlaskBuffResistancesWhileHealing": 5,
     "FlaskRemovesBleeding": 13,
     "FlaskCurseImmunity": 14,
-    
-	"JunMasterLocalFlaskCriticalStrikeChanceDuringFlaskEffect": 8,
-	"JunMasterLocalFlaskLifeLeechOnDamageTakenPermyriadDuringFlaskEffect": 2,
+
+    "JunMasterLocalFlaskCriticalStrikeChanceDuringFlaskEffect": 8,
+    "JunMasterLocalFlaskLifeLeechOnDamageTakenPermyriadDuringFlaskEffect": 2,
     "JunMasterLocalFlaskItemFoundRarityDuringFlaskEffect": 0,
     "JunMasterLocalFlaskSkillManaCostDuringFlaskEffect": 8,
     "JunMasterLocalFlaskAvoidStunChanceAndMovementSpeedDuringFlaskEffect": 7,
     "JunMasterLocalFlaskLifeRegenerationPerMinuteDuringFlaskEffect": 8,
-
-	"FlaskBuffFreezeShockIgniteChanceWhileHealing": 0,
-	"FlaskBuffCastSpeedWhileHealing": 0,
-	"FlaskBuffAttackSpeedWhileHealing": 0,
-	"FlaskManaRecoveryAtEnd" : 0,
-	"FlaskBuffReducedManaCostWhileHealing" : 0,
-	"FlaskFullRechargeOnHit" : 0,
-	"FlaskBuffSpellEnergyShieldLeechWhileHealing" : 0
+
+    "FlaskBuffFreezeShockIgniteChanceWhileHealing": 0,
+    "FlaskBuffCastSpeedWhileHealing": 0,
+    "FlaskBuffAttackSpeedWhileHealing": 0,
+    "FlaskManaRecoveryAtEnd" : 0,
+    "FlaskBuffReducedManaCostWhileHealing" : 0,
+    "FlaskFullRechargeOnHit": 0,
+    "FlaskEffectNotRemovedOnFullMana": 0,
+    "FlaskBuffSpellEnergyShieldLeechWhileHealing" : 0
   }
 }