master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
7 changed files with 97 additions and 58 deletions
Showing only changes of commit f336de8f9b - Show all commits

View File

@ -36,7 +36,7 @@
"Yes": true
}
],
"NextQuestId": 553
"NextQuestId": 351
}
]
}

View File

@ -36,7 +36,8 @@
"Prompt": "TEXT_CLSTHM020_00345_Q1_001_1",
"Yes": true
}
]
],
"NextQuestId": 351
}
]
}

View File

@ -209,7 +209,8 @@
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"NextQuestId": 352
}
]
}

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
@ -13,7 +12,8 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1044403,
@ -30,6 +30,38 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044412,
"Position": {
"X": -181.56714,
"Y": -49.19972,
"Z": -304.76843
},
"TerritoryId": 959,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38871,
"ItemCount": 1
},
{
"DataId": 1044584,
"Position": {
"X": 563.8971,
"Y": -167.50002,
"Z": -594.53723
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
@ -42,7 +74,8 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1044403,

View File

@ -826,7 +826,8 @@
"battlestance",
"doze",
"box",
"sundropdance"
"sundropdance",
"cry"
]
}
}

View File

@ -7,35 +7,36 @@ public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
{
private static readonly Dictionary<EEmote, string> Values = new()
{
{ EEmote.Stretch, "stretch" },
{ EEmote.Wave, "wave" },
{ EEmote.Rally, "rally" },
{ EEmote.Deny, "deny" },
{ EEmote.Pray, "pray" },
{ EEmote.Slap, "slap" },
{ EEmote.Doubt, "doubt" },
{ EEmote.Psych, "psych" },
{ EEmote.Cheer, "cheer" },
{ EEmote.Happy, "happy" },
{ EEmote.Poke, "poke" },
{ EEmote.Flex, "flex" },
{ EEmote.Soothe, "soothe" },
{ EEmote.Me, "me" },
{ EEmote.Welcome, "welcome" },
{ EEmote.ImperialSalute, "imperialsalute" },
{ EEmote.Pet, "pet" },
{ EEmote.Dance, "dance" },
{ EEmote.Respect, "respect" },
{ EEmote.Lookout, "lookout" },
{ EEmote.Kneel, "kneel" },
{ EEmote.Bow, "bow" },
{ EEmote.Uchiwasshoi, "uchiwasshoi" },
{ EEmote.Cheer, "cheer" },
{ EEmote.Clap, "clap" },
{ EEmote.VictoryPose, "victorypose" },
{ EEmote.Comfort, "comfort" },
{ EEmote.BattleStance, "battlestance" },
{ EEmote.Dance, "dance" },
{ EEmote.Doubt, "doubt" },
{ EEmote.Doze, "doze" },
{ EEmote.Wave, "wave" },
{ EEmote.Kneel, "kneel" },
{ EEmote.Lookout, "lookout" },
{ EEmote.Me, "me" },
{ EEmote.Deny, "deny" },
{ EEmote.Poke, "poke" },
{ EEmote.Psych, "psych" },
{ EEmote.Rally, "rally" },
{ EEmote.Soothe, "soothe" },
{ EEmote.Stretch, "stretch" },
{ EEmote.Welcome, "welcome" },
{ EEmote.Happy, "happy" },
{ EEmote.Pray, "pray" },
{ EEmote.ImperialSalute, "imperialsalute" },
{ EEmote.Cry, "cry" },
{ EEmote.Pet, "pet" },
{ EEmote.Slap, "slap" },
{ EEmote.SundropDance, "sundropdance"},
{ EEmote.BattleStance, "battlestance" },
{ EEmote.VictoryPose, "victorypose" },
{ EEmote.Flex, "flex" },
{ EEmote.Respect, "respect" },
{ EEmote.Box, "box" },
{ EEmote.SundropDance, "sundropdance"}
{ EEmote.Uchiwasshoi, "uchiwasshoi" }
};
}

View File

@ -8,34 +8,36 @@ public enum EEmote
{
None = 0,
Stretch = 37,
Wave = 16,
Rally = 34,
Deny = 25,
Pray = 58,
Slap = 111,
Doubt = 12,
Psych = 30,
Cheer = 6,
Happy = 48,
Poke = 28,
Flex = 139,
Soothe = 35,
Me = 23,
Welcome = 41,
ImperialSalute = 59,
Pet = 105,
Dance = 11,
Respect = 140,
Lookout = 22,
Kneel = 19,
Bow = 5,
Uchiwasshoi = 278,
Cheer = 6,
Clap = 7,
VictoryPose = 122,
Comfort = 9,
BattleStance = 121,
Dance = 11,
Doubt = 12,
Doze = 13,
Wave = 16,
Kneel = 19,
Lookout = 22,
Me = 23,
Deny = 25,
Poke = 28,
Psych = 30,
Rally = 34,
Soothe = 35,
Stretch = 37,
Welcome = 41,
Happy = 48,
Pray = 58,
ImperialSalute = 59,
Cry = 74,
Pet = 105,
Slap = 111,
SundropDance = 120,
BattleStance = 121,
VictoryPose = 122,
Flex = 139,
Respect = 140,
Box = 166,
SundropDance = 120,
Uchiwasshoi = 278
}