master #3

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

View File

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

View File

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

View File

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