resolved merge conflicts
This commit is contained in:
parent
d010dec9f6
commit
6e7ade5ee7
@ -838,6 +838,7 @@
|
|||||||
"description": "The action to use",
|
"description": "The action to use",
|
||||||
"enum": [
|
"enum": [
|
||||||
"Heavy Swing",
|
"Heavy Swing",
|
||||||
|
"Heavy Shot",
|
||||||
"Cure",
|
"Cure",
|
||||||
"Esuna",
|
"Esuna",
|
||||||
"Physick",
|
"Physick",
|
||||||
|
@ -8,6 +8,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
|
|||||||
private static readonly Dictionary<EAction, string> Values = new()
|
private static readonly Dictionary<EAction, string> Values = new()
|
||||||
{
|
{
|
||||||
{ EAction.HeavySwing, "Heavy Swing" },
|
{ EAction.HeavySwing, "Heavy Swing" },
|
||||||
|
{ EAction.HeavyShot, "Heavy Shot" },
|
||||||
{ EAction.Cure, "Cure" },
|
{ EAction.Cure, "Cure" },
|
||||||
{ EAction.Esuna, "Esuna" },
|
{ EAction.Esuna, "Esuna" },
|
||||||
{ EAction.Physick, "Physick" },
|
{ EAction.Physick, "Physick" },
|
||||||
|
@ -7,6 +7,7 @@ namespace Questionable.Model.Questing;
|
|||||||
public enum EAction
|
public enum EAction
|
||||||
{
|
{
|
||||||
HeavySwing = 31,
|
HeavySwing = 31,
|
||||||
|
HeavyShot = 97,
|
||||||
Cure = 120,
|
Cure = 120,
|
||||||
Esuna = 7568,
|
Esuna = 7568,
|
||||||
Physick = 190,
|
Physick = 190,
|
||||||
|
Loading…
Reference in New Issue
Block a user