projects
/
Questionable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8d2c413
)
Add 'disappointed', 'examineself' and 'joy' emotes
author
Liza Carvelli
<liza@carvel.li>
Sat, 19 Oct 2024 08:10:33 +0000
(10:10 +0200)
committer
Liza Carvelli
<liza@carvel.li>
Sat, 19 Oct 2024 08:10:33 +0000
(10:10 +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 eefbf1eb7734ef6354e773645331f1e0e45bdfc3..3751b47d09aaf7b846e2fcc6ba74c7ba11743f18 100644
(file)
--- a/
QuestPaths/quest-v1.json
+++ b/
QuestPaths/quest-v1.json
@@
-826,7
+826,10
@@
"battlestance",
"doze",
"box",
- "sundropdance"
+ "sundropdance",
+ "disappointed",
+ "examineself",
+ "joy"
]
}
}
diff --git
a/Questionable.Model/Questing/Converter/EmoteConverter.cs
b/Questionable.Model/Questing/Converter/EmoteConverter.cs
index 213d909a30470833f5ed8cfc5883d8411e9cdb02..e899a582db55b15a88abc873039a71d5a3965ace 100644
(file)
--- a/
Questionable.Model/Questing/Converter/EmoteConverter.cs
+++ b/
Questionable.Model/Questing/Converter/EmoteConverter.cs
@@
-36,6
+36,9
@@
public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
{ EEmote.BattleStance, "battlestance" },
{ EEmote.Doze, "doze" },
{ EEmote.Box, "box" },
- { EEmote.SundropDance, "sundropdance"}
+ { EEmote.SundropDance, "sundropdance"},
+ { EEmote.Disappointed, "disappointed" },
+ { EEmote.ExamineSelf, "examineself" },
+ { EEmote.Joy, "joy" },
};
}
diff --git
a/Questionable.Model/Questing/EEmote.cs
b/Questionable.Model/Questing/EEmote.cs
index 4f1b2c6f725123fdd71ce335a8797fdbf958b464..2656997b3755608bbf9e1087f8bc6f56eb4681a9 100644
(file)
--- a/
Questionable.Model/Questing/EEmote.cs
+++ b/
Questionable.Model/Questing/EEmote.cs
@@
-38,4
+38,7
@@
public enum EEmote
Doze = 13,
Box = 166,
SundropDance = 120,
+ Disappointed = 49,
+ ExamineSelf = 44,
+ Joy = 18,
}