Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ await Server.WaitAssertion(() =>
{
["Head"] = new()
{
[HumanoidVisualLayers.Snout] = new List<Marking>() { new("VulpSnout", 1) }, // DeltaV - fix test fail
[HumanoidVisualLayers.SnoutCover] = new List<Marking>() { new("VulpSnoutNose", 1) },
},
});
Expand All @@ -59,8 +60,8 @@ await Server.WaitAssertion(() =>
await Client.WaitAssertion(() =>
{
var spriteSystem = CEntMan.System<SpriteSystem>();
var snoutIndex = spriteSystem.LayerMapGet(CPlayer, "VulpSnout-snout");
var snoutCoverIndex = spriteSystem.LayerMapGet(CPlayer, "VulpSnoutNose-snout-nose");
var snoutIndex = spriteSystem.LayerMapGet(CPlayer, "VulpSnout-muzzle"); // DeltaV - different marking names
var snoutCoverIndex = spriteSystem.LayerMapGet(CPlayer, "VulpSnoutNose-nose"); // DeltaV - different marking names
var spriteComp = CEntMan.GetComponent<SpriteComponent>(CPlayer);

Assert.That(spriteComp[snoutIndex].Visible, Is.False);
Expand All @@ -77,8 +78,8 @@ await Server.WaitAssertion(() =>
await Client.WaitAssertion(() =>
{
var spriteSystem = CEntMan.System<SpriteSystem>();
var snoutIndex = spriteSystem.LayerMapGet(CPlayer, "VulpSnout-snout");
var snoutCoverIndex = spriteSystem.LayerMapGet(CPlayer, "VulpSnoutNose-snout-nose");
var snoutIndex = spriteSystem.LayerMapGet(CPlayer, "VulpSnout-muzzle"); // DeltaV - different marking names
var snoutCoverIndex = spriteSystem.LayerMapGet(CPlayer, "VulpSnoutNose-nose"); // DeltaV - different marking names
var spriteComp = CEntMan.GetComponent<SpriteComponent>(CPlayer);

Assert.That(spriteComp[snoutIndex].Visible, Is.True);
Expand Down
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_DVA/chat/emotes.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
delta-chat-emote-name-yip = Yip
delta-chat-emote-name-awoo = Awoo

delta-chat-emote-msg-yip = yips.
delta-chat-emote-msg-awoo = awoos.
265 changes: 265 additions & 0 deletions Resources/Locale/en-US/_DVA/markings/vulpkanin.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
# Ears
marking-VulpEar = Vulpkanin Ears
marking-VulpEar-vulp = Base
marking-VulpEar-vulp-inner = Inner

marking-VulpEarFade = Vulpkanin Ears (Fade)
marking-VulpEarFade-vulp = Base
marking-VulpEarFade-vulp-fade = Tip

marking-VulpEarSharp = Vulpkanin Ears (Sharp)
marking-VulpEarSharp-vulp = Base
marking-VulpEarSharp-vulp-sharp = Tip

marking-VulpEarCoyote = Vulpkanin Ears Coyote
marking-VulpEarCoyote-coyote = Base

marking-VulpEarDalmatian = Vulpkanin Ears Dalmatian
marking-VulpEarDalmatian-dalmatian = Base

marking-VulpEarFennec = Vulpkanin Ears Fennec
marking-VulpEarFennec-fennec = Base
marking-VulpEarFennec-fennec-inner = Inner

marking-VulpEarFox = Vulpkanin Ears Fox
marking-VulpEarFox-fox = Base
marking-VulpEarFox-fox-inner = Inner

marking-VulpEarJackal = Vulpkanin Ears Jackal
marking-VulpEarJackal-jackal = Base
marking-VulpEarJackal-jackal-inner = Inner

marking-VulpEarTajaran = Vulpkanin Ears Tajaran
marking-VulpEarTajaran-msai = Base
marking-VulpEarTajaran-msai-inner = Inner

marking-VulpEarOtie = Vulpkanin Ears Otie
marking-VulpEarOtie-otie = Base
marking-VulpEarOtie-otie-inner = Inner

marking-VulpEarShock = Vulpkanin Ears Shock
marking-VulpEarShock-shock = Base

marking-VulpEarTerrier = Vulpkanin Ears Terrier
marking-VulpEarTerrier-terrier = Base
marking-VulpEarTerrier-terrier-inner = Inner


# Tails
marking-VulpTail = Vulpkanin Tail Straight (Fade tip)
marking-VulpTail-vulp = Base
marking-VulpTail-vulp-fade = Tip

marking-VulpTailTip = Vulpkanin Tail Straight (Sharp tip)
marking-VulpTailTip-vulp = Base
marking-VulpTailTip-vulp-tip = Tip

marking-VulpTailAlt = Vulpkanin Tail Curled (Fade tip)
marking-VulpTailAlt-vulp_alt = Base
marking-VulpTailAlt-vulp_alt-fade = Tip

marking-VulpTailAltTip = Vulpkanin Tail Curled (Sharp tip)
marking-VulpTailAltTip-vulp_alt = Base
marking-VulpTailAltTip-vulp_alt-tip = Tip

marking-VulpTailBushy = Vulpkanin Tail Bushy
marking-VulpTailBushy-bushfluff = Base

marking-VulpTailCoyote = Vulpkanin Tail Coyote
marking-VulpTailCoyote-coyote = Base

marking-VulpTailFennec = Vulpkanin Tail Fennec
marking-VulpTailFennec-fennec = Base

marking-VulpTailFluffy = Vulpkanin Tail Fluffy
marking-VulpTailFluffy-fluffy = Base

marking-VulpTailFox = Vulpkanin Tail Fox (Fade tip)
marking-VulpTailFox-fox = Base
marking-VulpTailFox-fox-fade = Tip

marking-VulpTailFoxTip = Vulpkanin Tail Fox (Sharp tip)
marking-VulpTailFoxTip-fox = Base
marking-VulpTailFoxTip-fox-tip = Tip

marking-VulpTailFox2 = Vulpkanin Tail Fox 2
marking-VulpTailFox2-fox2 = Base

marking-VulpTailFox3 = Vulpkanin Tail Fox 3
marking-VulpTailFox3-fox3 = Base
marking-VulpTailFox3-fox3-tip = Tip

marking-VulpTailHusky = Vulpkanin Tail Husky
marking-VulpTailHusky-husky-outer = Outer
marking-VulpTailHusky-husky-inner = Inner

marking-VulpTailHuskyAlt = Vulpkanin Tail Husky Alt
marking-VulpTailHuskyAlt-husky = Base

marking-VulpTailLong = Vulpkanin Tail Long
marking-VulpTailLong-long = Base
marking-VulpTailLong-long-tip = Tip

marking-VulpTailOtie = Vulpkanin Tail Otie
marking-VulpTailOtie-otie = Base


# Snout markings
marking-VulpSnoutNose = Vulpkanin Nose
marking-VulpSnoutNose-nose = Nose

marking-VulpSnout = Vulpkanin Muzzle
marking-VulpSnout-muzzle = Muzzle

marking-VulpSnoutAlt = Vulpkanin Muzzle Alt
marking-VulpSnoutAlt-muzzle_alt = Muzzle

marking-VulpSnoutFade = Vulpkanin Muzzle Fade
marking-VulpSnoutFade-muzzle_fade = Muzzle

marking-VulpSnoutSharp = Vulpkanin Muzzle Sharp
marking-VulpSnoutSharp-muzzle_sharp = Muzzle

marking-VulpSnoutBlaze = Vulpkanin Blaze
marking-VulpSnoutBlaze-blaze = Blaze

marking-VulpSnoutMask = Vulpkanin Mask
marking-VulpSnoutMask-mask = Mask

marking-VulpSnoutPatch = Vulpkanin Patch
marking-VulpSnoutPatch-patch = Patch

marking-VulpSnoutSwift = Vulpkanin Swift
marking-VulpSnoutSwift-vulpine-lines = Swift

marking-VulpSnoutVulpine = Vulpkanin Vulpine
marking-VulpSnoutVulpine-vulpine = Vulpine
marking-VulpSnoutVulpine-vulpine-lines = Swift

# Head markings
marking-VulpHeadSlash = Vulpkanin Slash
marking-VulpHeadSlash-slash = Slash

marking-VulpHeadTiger = Vulpkanin Tiger (Head)
marking-VulpHeadTiger-tiger_head = Stripes

marking-VulpHeadTigerFace = Vulpkanin Tiger (Face)
marking-VulpHeadTigerFace-tiger_face = Stripes


# Chest markings
marking-VulpBellyCrest = Vulpkanin Crest Belly
marking-VulpBellyCrest-belly_crest = Belly

marking-VulpBellyFox = Vulpkanin Fox Belly
marking-VulpBellyFox-belly_fox = Belly

marking-VulpBellyFull = Vulpkanin Full Belly
marking-VulpBellyFull-belly_full = Belly


# Limb markings
marking-VulpPointsCrestLegs = Vulpkanin Crest Legs
marking-VulpPointsCrestLegs-points_crest-legs = Crest

marking-VulpPointsCrestArms = Vulpkanin Crest Arms
marking-VulpPointsCrestArms-points_crest-arms = Crest

marking-VulpPointsFadeLegs = Vulpkanin Fade Legs
marking-VulpPointsFadeLegs-points_fade-legs = Fade

marking-VulpPointsFadeArms = Vulpkanin Fade Arms
marking-VulpPointsFadeArms-points_fade-arms = Fade

marking-VulpPointsSharpLegs = Vulpkanin Sharp Legs
marking-VulpPointsSharpLegs-points_sharp-legs = Sharp

marking-VulpPointsSharpArms = Vulpkanin Sharp Arms
marking-VulpPointsSharpArms-points_sharp-arms = Sharp


# Extremity markings
marking-VulpPointsFeet = Vulpkanin Points Feet
marking-VulpPointsFeet-points_feet = Feet

marking-VulpPointsHands = Vulpkanin Points Hands
marking-VulpPointsHands-points_hands = Hands


# Vulp hair
marking-VulpHairAdhara = Adhara (Vulpkanin)
marking-VulpHairAdhara-adhara = Adhara

marking-VulpHairAnita = Anita (Vulpkanin)
marking-VulpHairAnita-anita = Anita

marking-VulpHairApollo = Apollo (Vulpkanin)
marking-VulpHairApollo-apollo = Apollo

marking-VulpHairBelle = Belle (Vulpkanin)
marking-VulpHairBelle-belle = Belle

marking-VulpHairBraided = Braided (Vulpkanin)
marking-VulpHairBraided-braided = Braided

marking-VulpHairBun = Bun (Vulpkanin)
marking-VulpHairBun-bun = Bun

marking-VulpHairCleanCut = Clean Cut (Vulpkanin)
marking-VulpHairCleanCut-clean_cut = Clean Cut

marking-VulpHairCurl = Curl (Vulpkanin)
marking-VulpHairCurl-curl = Curl

marking-VulpHairHawk = Hawk (Vulpkanin)
marking-VulpHairHawk-hawk = Hawk

marking-VulpHairJagged = Jagged (Vulpkanin)
marking-VulpHairJagged-jagged = Jagged

marking-VulpHairJeremy = Jeremy (Vulpkanin)
marking-VulpHairJeremy-jeremy = Jeremy

marking-VulpHairKajam = Kajam (Vulpkanin)
marking-VulpHairKajam-kajam = Kajam

marking-VulpHairKeid = Keid (Vulpkanin)
marking-VulpHairKeid-keid = Keid

marking-VulpHairKleeia = Kleeia (Vulpkanin)
marking-VulpHairKleeia-kleeia = Kleeia

marking-VulpHairMizar = Mizar (Vulpkanin)
marking-VulpHairMizar-mizar = Mizar

marking-VulpHairPunkBraided = Punk Braided (Vulpkanin)
marking-VulpHairPunkBraided-punkbraided = Punk Braided

marking-VulpHairRaine = Raine (Vulpkanin)
marking-VulpHairRaine-raine = Raine

marking-VulpHairRough = Rough (Vulpkanin)
marking-VulpHairRough-rough = Rough

marking-VulpHairShort = Short (Vulpkanin)
marking-VulpHairShort-short = Short

marking-VulpHairShort2 = Short 2 (Vulpkanin)
marking-VulpHairShort2-short2 = Short 2

marking-VulpHairSpike = Spike (Vulpkanin)
marking-VulpHairSpike-spike = Spike


# Vulp facial hair
marking-VulpFacialHairElderChin = Elder Chin
marking-VulpFacialHairElderChin-elder_chin = Elder Chin

marking-VulpFacialHairElder = Elder
marking-VulpFacialHairElder-elder = Elder

marking-VulpFacialHairKita = Kita
marking-VulpFacialHairKita-kita = Kita

marking-VulpFacialHairRuff = Ruff
marking-VulpFacialHairRuff-ruff = Ruff
Loading
Loading