master #3

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

View File

@ -912,6 +912,7 @@
"Buffet (Griffin)", "Buffet (Griffin)",
"Trample", "Trample",
"Fumigate", "Fumigate",
"Inhale",
"Siphon Snout", "Siphon Snout",
"Peculiar Light", "Peculiar Light",
"Cannonfire", "Cannonfire",

View File

@ -26,6 +26,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ EAction.BuffetGriffin, "Buffet (Griffin)" }, { EAction.BuffetGriffin, "Buffet (Griffin)" },
{ EAction.Trample, "Trample" }, { EAction.Trample, "Trample" },
{ EAction.Fumigate, "Fumigate" }, { EAction.Fumigate, "Fumigate" },
{ EAction.Inhale, "Inhale" },
{ EAction.SiphonSnout, "Siphon Snout" }, { EAction.SiphonSnout, "Siphon Snout" },
{ EAction.PeculiarLight, "Peculiar Light" }, { EAction.PeculiarLight, "Peculiar Light" },
{ EAction.Cannonfire, "Cannonfire" }, { EAction.Cannonfire, "Cannonfire" },

View File

@ -27,6 +27,7 @@ public enum EAction
Fumigate = 5872, Fumigate = 5872,
MagitekPulse = 8624, MagitekPulse = 8624,
MagitekThunder = 8625, MagitekThunder = 8625,
Inhale = 10013,
SiphonSnout = 18187, SiphonSnout = 18187,
PeculiarLight = 20030, PeculiarLight = 20030,
Cannonfire = 20121, Cannonfire = 20121,
@ -63,6 +64,7 @@ public static class EActionExtensions
or EAction.BuffetGriffin or EAction.BuffetGriffin
or EAction.Trample or EAction.Trample
or EAction.Fumigate or EAction.Fumigate
or EAction.Inhale
or EAction.SiphonSnout or EAction.SiphonSnout
or EAction.PeculiarLight or EAction.PeculiarLight
or EAction.Cannonfire or EAction.Cannonfire