master #3

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

View File

@ -946,6 +946,7 @@
"Physick", "Physick",
"Aspected Benefic", "Aspected Benefic",
"Form Shift", "Form Shift",
"Fiery Breath",
"Buffet (Sanuwa)", "Buffet (Sanuwa)",
"Buffet (Griffin)", "Buffet (Griffin)",
"Trample", "Trample",

View File

@ -22,6 +22,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ EAction.Physick, "Physick" }, { EAction.Physick, "Physick" },
{ EAction.AspectedBenefic, "Aspected Benefic" }, { EAction.AspectedBenefic, "Aspected Benefic" },
{ EAction.FormShift, "Form Shift" }, { EAction.FormShift, "Form Shift" },
{ EAction.FieryBreath, "Fiery Breath" },
{ EAction.BuffetSanuwa, "Buffet (Sanuwa)" }, { EAction.BuffetSanuwa, "Buffet (Sanuwa)" },
{ EAction.BuffetGriffin, "Buffet (Griffin)" }, { EAction.BuffetGriffin, "Buffet (Griffin)" },
{ EAction.Trample, "Trample" }, { EAction.Trample, "Trample" },

View File

@ -21,6 +21,7 @@ public enum EAction
Physick = 190, Physick = 190,
AspectedBenefic = 3595, AspectedBenefic = 3595,
FormShift = 4262, FormShift = 4262,
FieryBreath = 1764,
BuffetSanuwa = 4931, BuffetSanuwa = 4931,
BuffetGriffin = 4583, BuffetGriffin = 4583,
Trample = 4585, Trample = 4585,
@ -70,7 +71,8 @@ public static class EActionExtensions
public static bool RequiresMount(this EAction action) public static bool RequiresMount(this EAction action)
{ {
return action return action
is EAction.BuffetSanuwa is EAction.FieryBreath
or EAction.BuffetSanuwa
or EAction.BuffetGriffin or EAction.BuffetGriffin
or EAction.Trample or EAction.Trample
or EAction.Fumigate or EAction.Fumigate