master #3

Open
cacahuetes wants to merge 653 commits from liza/Questionable:master into cacahuetes-ShB-Healer
3 changed files with 7 additions and 3 deletions
Showing only changes of commit b41d47a162 - Show all commits

View File

@ -919,7 +919,8 @@
"Yellow Gulal", "Yellow Gulal",
"Blue Gulal", "Blue Gulal",
"Electric Flux", "Electric Flux",
"Hop-step" "Hop-step",
"Dismount"
] ]
} }
}, },

View File

@ -34,5 +34,6 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ EAction.BlueGulal, "Blue Gulal" }, { EAction.BlueGulal, "Blue Gulal" },
{ EAction.ElectrixFlux, "Electric Flux" }, { EAction.ElectrixFlux, "Electric Flux" },
{ EAction.HopStep, "Hop-step" }, { EAction.HopStep, "Hop-step" },
{ EAction.Dismount, "Dismount" },
}; };
} }

View File

@ -14,7 +14,7 @@ public enum EAction
HeavyShot = 97, HeavyShot = 97,
Cure = 120, Cure = 120,
Cure2 = 135, Cure2 = 135,
Eukrasia = 24290, Eukrasia = 24290,
Diagnosis = 24284, Diagnosis = 24284,
EukrasianDiagnosis = 24291, EukrasianDiagnosis = 24291,
Esuna = 7568, Esuna = 7568,
@ -35,6 +35,7 @@ public enum EAction
BlueGulal = 29384, BlueGulal = 29384,
ElectrixFlux = 29718, ElectrixFlux = 29718,
HopStep = 31116, HopStep = 31116,
Dismount = 23,
CollectMiner = 240, CollectMiner = 240,
ScourMiner = 22182, ScourMiner = 22182,
@ -70,6 +71,7 @@ public static class EActionExtensions
or EAction.YellowGulal or EAction.YellowGulal
or EAction.BlueGulal or EAction.BlueGulal
or EAction.ElectrixFlux or EAction.ElectrixFlux
or EAction.HopStep; or EAction.HopStep
or EAction.Dismount;
} }
} }