projects
/
Questionable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0ea735
)
Add 'battlestance' emote
author
Liza Carvelli
<liza@carvel.li>
Sat, 7 Sep 2024 23:40:05 +0000
(
01:40
+0200)
committer
Liza Carvelli
<liza@carvel.li>
Sat, 7 Sep 2024 23:40:05 +0000
(
01:40
+0200)
QuestPaths/quest-v1.json
patch
|
blob
|
blame
|
history
Questionable.Model/Questing/Converter/EmoteConverter.cs
patch
|
blob
|
blame
|
history
Questionable.Model/Questing/EEmote.cs
patch
|
blob
|
blame
|
history
diff --git
a/QuestPaths/quest-v1.json
b/QuestPaths/quest-v1.json
index cb6c9c5e599287a7b6e60542b98472534555e8ad..5b69b6626bc51fa896b44f4b976e22cff7c771d3 100644
(file)
--- a/
QuestPaths/quest-v1.json
+++ b/
QuestPaths/quest-v1.json
@@
-779,7
+779,8
@@
"uchiwasshoi",
"clap",
"victorypose",
- "comfort"
+ "comfort",
+ "battlestance"
]
}
}
diff --git
a/Questionable.Model/Questing/Converter/EmoteConverter.cs
b/Questionable.Model/Questing/Converter/EmoteConverter.cs
index 935bc32ae217a9b9b823475a5feb5a23a1e5be70..27715b546b7a2b90a56d4151f55e58b3e4e05ca9 100644
(file)
--- a/
Questionable.Model/Questing/Converter/EmoteConverter.cs
+++ b/
Questionable.Model/Questing/Converter/EmoteConverter.cs
@@
-33,5
+33,6
@@
public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
{ EEmote.Clap, "clap" },
{ EEmote.VictoryPose, "victorypose" },
{ EEmote.Comfort, "comfort" },
+ { EEmote.BattleStance, "battlestance" },
};
}
diff --git
a/Questionable.Model/Questing/EEmote.cs
b/Questionable.Model/Questing/EEmote.cs
index 0b81fd3e8fb58b0dce5ab3f765cd3903a383da1b..2ec72603ba7d85f0bdbc277202fa7ed22e87cee3 100644
(file)
--- a/
Questionable.Model/Questing/EEmote.cs
+++ b/
Questionable.Model/Questing/EEmote.cs
@@
-34,4
+34,5
@@
public enum EEmote
Clap = 7,
VictoryPose = 122,
Comfort = 9,
+ BattleStance = 121,
}