FTL fix

dvir001 · Jan 1, 2024 · a5b4314 · a5b4314
1 parent c2606fe
commit a5b4314
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 9 deletions.
diff --git a/Resources/Locale/en-US/_Nyano/felinid.ftl → ...Locale/en-US/_Nyano/abilities/felinid.ftl b/Resources/Locale/en-US/_Nyano/felinid.ftl → ...Locale/en-US/_Nyano/abilities/felinid.ftl
@@ -1,5 +1,6 @@
-hairball-action = Cough Up Hairball
-hairball-action-desc = Purge some of your chemstream, and gain a cool hairball to throw at people.
+action-name-hairball = Cough Up Hairball
+action-description-hairball = Purge some of your chemstream, and gain a cool hairball to throw at people.
+
 hairball-mask = Take off your {$mask} first.
 hairball-cough = {CAPITALIZE(THE($name))} starts coughing up a hairball!
 

diff --git a/Resources/Locale/en-US/_Nyano/oni.ftl → ...ces/Locale/en-US/_Nyano/abilities/oni.ftl b/Resources/Locale/en-US/_Nyano/oni.ftl → ...ces/Locale/en-US/_Nyano/abilities/oni.ftl
diff --git a/Resources/Locale/en-US/markings/felinid.ftl b/Resources/Locale/en-US/markings/felinid.ftl
@@ -1,5 +1,56 @@
-marking-FelinidFluffyTail-Felinid_fluffy_tail_full = Fluffy Tail
-marking-FelinidFluffyTailRings-Felinid_fluffy_tail_full = Fluffy tail
-marking-FelinidFluffyTailRings-felinid_fluffy_tail_rings = Fluffy Tail Rings
-marking-FelinidFluffyTail = Fluffy Tail
-marking-FelinidFluffyTailRings = Fluffy Tail with rings
+marking-FelinidEarsBasic = Basic Ears
+marking-FelinidEarsBasic-basic_outer = Outer ear
+marking-FelinidEarsBasic-basic_inner = Inner ear
+
+marking-FelinidEarsCurled = Curled Ears
+marking-FelinidEarsCurled-curled_outer = Outer ear
+marking-FelinidEarsCurled-curled_inner = Inner ear
+
+marking-FelinidEarsDroopy = Droopy Ears
+marking-FelinidEarsDroopy-droopy_outer = Outer ear
+marking-FelinidEarsDroopy-droopy_inner = Inner ear
+
+marking-FelinidEarsFuzzy = Fuzzy Ears
+marking-FelinidEarsFuzzy-basic_outer = Outer ear
+marking-FelinidEarsFuzzy-fuzzy_inner = Ear fuzz
+
+marking-FelinidEarsStubby = Stubby Ears
+marking-FelinidEarsStubby-stubby_outer = Outer ear
+marking-FelinidEarsStubby-stubby_inner = Inner ear
+
+marking-FelinidEarsTall = Tall Ears
+marking-FelinidEarsTall-tall_outer = Outer ear
+marking-FelinidEarsTall-tall_inner = Inner ear
+marking-FelinidEarsTall-tall_fuzz = Ear fuzz
+
+marking-FelinidEarsTorn = Torn Ears
+marking-FelinidEarsTorn-torn_outer = Outer ear
+marking-FelinidEarsTorn-torn_inner = Inner ear
+
+marking-FelinidEarsWide = Wide Ears
+marking-FelinidEarsWide-wide_outer = Outer ear
+marking-FelinidEarsWide-wide_inner = Inner ear
+
+marking-FelinidTailBasic = Basic Tail
+marking-FelinidTailBasic-basic_tail_tip = Tail tip
+marking-FelinidTailBasic-basic_tail_stripes_even = Tail stripes, even
+marking-FelinidTailBasic-basic_tail_stripes_odd = Tail stripes, odd
+
+marking-FelinidTailBasicWithBow = Basic Tail with Bow
+marking-FelinidTailBasicWithBow-basic_tail_tip = Tail tip
+marking-FelinidTailBasicWithBow-basic_tail_stripes_even = Tail stripes, even
+marking-FelinidTailBasicWithBow-basic_tail_stripes_odd = Tail stripes, odd
+marking-FelinidTailBasicWithBow-basic_bow = Bow
+
+marking-FelinidTailBasicWithBell = Basic Tail with Bell
+marking-FelinidTailBasicWithBell-basic_tail_tip = Tail tip
+marking-FelinidTailBasicWithBell-basic_tail_stripes_even = Tail stripes, even
+marking-FelinidTailBasicWithBell-basic_tail_stripes_odd = Tail stripes, odd
+marking-FelinidTailBasicWithBell-basic_bell = Bell
+
+marking-FelinidTailBasicWithBowAndBell = Basic Tail with Bow & Bell
+marking-FelinidTailBasicWithBowAndBell-basic_tail_tip = Tail tip
+marking-FelinidTailBasicWithBowAndBell-basic_tail_stripes_even = Tail stripes, even
+marking-FelinidTailBasicWithBowAndBell-basic_tail_stripes_odd = Tail stripes, odd
+marking-FelinidTailBasicWithBowAndBell-basic_bow = Bow
+marking-FelinidTailBasicWithBowAndBell-basic_bell = Bell
diff --git a/Resources/Prototypes/_Nyano/Actions/types.yml b/Resources/Prototypes/_Nyano/Actions/types.yml
@@ -12,8 +12,8 @@
 
 - type: entity
   id: ActionHairball
-  name: hairball-action
-  description: hairball-action-desc
+  name: action-name-hairball
+  description: action-description-hairball
   noSpawn: true
   components:
   - type: InstantAction