master #3

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

View File

@ -942,7 +942,10 @@
"Yellow Gulal", "Yellow Gulal",
"Blue Gulal", "Blue Gulal",
"Electric Flux", "Electric Flux",
"Hop-step" "Hop-step",
"Fuma Shuriken",
"Katon",
"Raiton"
] ]
} }
}, },

View File

@ -35,5 +35,8 @@ 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.FumaShuriken, "Fuma Shuriken" },
{ EAction.Katon, "Katon" },
{ EAction.Raiton, "Raiton" },
}; };
} }

View File

@ -36,6 +36,13 @@ public enum EAction
BlueGulal = 29384, BlueGulal = 29384,
ElectrixFlux = 29718, ElectrixFlux = 29718,
HopStep = 31116, HopStep = 31116,
Ten = 2259,
Ninjutsu = 2260,
Chi = 2261,
Jin = 2263,
FumaShuriken = 2265,
Katon = 2266,
Raiton = 2267,
CollectMiner = 240, CollectMiner = 240,
ScourMiner = 22182, ScourMiner = 22182,