Вульпы (#3461)

2026-02-14 19:30:01 +01:00 · 2025-12-02 15:29:43 +07:00
parent bfc0d8ef49
commit d9922d9e94
8 changed files with 126 additions and 47 deletions
--- a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/vulpkanin.yml
+++ b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/vulpkanin.yml
@@ -2,7 +2,7 @@
  id: PawSocks
  markingCategory: Overlay
  bodyPart: RFoot #highest possible layer
-  speciesRestriction: [CorvaxVulpkanin]
+  speciesRestriction: [Vulpkanin] # Corvax-CorvaxVulp_Port CorvaxVulpkanin
  sponsorOnly: true # Corvax-Sponsors
  sprites:
    - sprite: Corvax/Mobs/Customization/vulpkanin.rsi
@@ -12,7 +12,7 @@
  id: FoxTail
  bodyPart: Tail
  markingCategory: Tail
-  speciesRestriction: [CorvaxVulpkanin]
+  speciesRestriction: [Vulpkanin] # Corvax-CorvaxVulp_Port CorvaxVulpkanin
  sponsorOnly: true # Corvax-Sponsors
  sprites:
    - sprite: Corvax/Mobs/Customization/vulpkanin.rsi
@@ -24,7 +24,7 @@
  id: FoxEar
  bodyPart: HeadTop
  markingCategory: HeadTop
-  speciesRestriction: [CorvaxVulpkanin]
+  speciesRestriction: [Vulpkanin] # Corvax-CorvaxVulp_Port CorvaxVulpkanin
  sponsorOnly: true # Corvax-Sponsors
  sprites:
    - sprite: Corvax/Mobs/Customization/vulpkanin.rsi
@@ -36,7 +36,7 @@
  id: WolfTail
  bodyPart: Tail
  markingCategory: Tail
-  speciesRestriction: [CorvaxVulpkanin]
+  speciesRestriction: [Vulpkanin] # Corvax-CorvaxVulp_Port CorvaxVulpkanin
  sponsorOnly: true # Corvax-Sponsors
  sprites:
    - sprite: Corvax/Mobs/Customization/vulpkanin.rsi
@@ -48,7 +48,7 @@
  id: FoxBelly
  bodyPart: Chest
  markingCategory: Chest
-  speciesRestriction: [CorvaxVulpkanin]
+  speciesRestriction: [Vulpkanin] # Corvax-CorvaxVulp_Port CorvaxVulpkanin
  sponsorOnly: true # Corvax-Sponsors
  sprites:
    - sprite: Corvax/Mobs/Customization/vulpkanin.rsi
@@ -58,7 +58,7 @@
  id: FoxSnout
  bodyPart: Snout
  markingCategory: Snout
-  speciesRestriction: [CorvaxVulpkanin]
+  speciesRestriction: [Vulpkanin] # Corvax-CorvaxVulp_Port CorvaxVulpkanin
  sponsorOnly: true # Corvax-Sponsors
  sprites:
    - sprite: Corvax/Mobs/Customization/vulpkanin.rsi
--- a/Resources/Prototypes/Corvax/Recipes/Cooking/meat_recipes.yml
+++ b/Resources/Prototypes/Corvax/Recipes/Cooking/meat_recipes.yml
@@ -22,4 +22,4 @@
    FoodPlate: 1
    FoodMeat: 1
    FoodApple: 1
-    HeadCorvaxVulpkanin: 1
+    HeadCorvaxVulpkanin: 1 # не дай хрен оно сломается...
--- a/Resources/Prototypes/Corvax/Species/vulpkanin.yml
+++ b/Resources/Prototypes/Corvax/Species/vulpkanin.yml
@@ -1,7 +1,7 @@
 - type: species
  id: CorvaxVulpkanin
  name: species-name-vulpkanin
-  roundStart: True
+  roundStart: false
  sponsorOnly: false # Corvax-Sponsors
  prototype: MobCorvaxVulpkanin
  sprites: MobCorvaxVulpkaninSprites
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -159,7 +159,7 @@
  id: Card
  coefficients:
    Slash: 2.0
-    Piercing: 0.1 # Holes easily poked through, but do little to structural integrity 
+    Piercing: 0.1 # Holes easily poked through, but do little to structural integrity
    Heat: 3.0

 - type: damageModifierSet
@@ -336,5 +336,5 @@
 - type: damageModifierSet
  id: Vulpkanin
  coefficients:
-    Heat: 1.15
-    Cold: 0.85
+    Heat: 1.30 #1.15 Corvax-CorvaxVulp_Port
+    Cold: 0.65 #0.85 Corvax-CorvaxVulp_Port
--- a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
@@ -10,7 +10,7 @@
  - type: MessyDrinker
    spillChance: 0.33
  - type: Icon
-    sprite: Mobs/Species/Vulpkanin/parts.rsi
+    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi # Mobs/Species/Vulpkanin/parts.rsi # Corvax-CorvaxVulp_Port
    state: full
  - type: Body
    prototype: Vulpkanin
@@ -121,33 +121,63 @@
            sprite: Mobs/Species/Vulpkanin/displacement.rsi
            state: hair
  - type: Inventory
-    speciesId: vulpkanin
+    speciesId: vulpkanin #временно не corvaxvulpkanin Corvax-CorvaxVulp_Port
+    #vulpkanin Corvax-CorvaxVulp_Port start
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Corvax/Mobs/Species/displacement.rsi
+            state: jumpsuit-female
+      shoes:
+        sizeMaps:
+          32:
+            sprite: Corvax/Mobs/Species/displacement.rsi
+            state: shoes
    displacements:
      jumpsuit:
        sizeMaps:
          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            sprite: Corvax/Mobs/Species/displacement.rsi
            state: jumpsuit
+      shoes:
+        sizeMaps:
+          32:
+            sprite: Corvax/Mobs/Species/displacement.rsi
+            state: shoes
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: Corvax/Mobs/Species/displacement.rsi
+            state: outerclothing
+    ##########################################
+    #displacements:
+    #  jumpsuit:
+    #    sizeMaps:
+    #      32:
+    #        sprite: Mobs/Species/Vulpkanin/displacement.rsi
+    #        state: jumpsuit
      back:
        sizeMaps:
          32:
            sprite: Mobs/Species/Vulpkanin/displacement.rsi
            state: back
-      outerClothing:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: outerwear
+      #outerClothing:
+      #  sizeMaps:
+      #    32:
+      #      sprite: Mobs/Species/Vulpkanin/displacement.rsi
+      #      state: outerwear
      gloves:
        sizeMaps:
          32:
            sprite: Mobs/Species/Vulpkanin/displacement.rsi
            state: hand
-      shoes:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: shoes
+      #shoes:
+      #  sizeMaps:
+      #    32:
+      #      sprite: Mobs/Species/Vulpkanin/displacement.rsi
+      #      state: shoes
+      #vulpkanin Corvax-CorvaxVulp_Port end
      head:
        sizeMaps:
          32:
@@ -168,6 +198,20 @@
          32:
            sprite: Mobs/Species/Vulpkanin/displacement.rsi
            state: belt
+#vulpkanin Corvax-CorvaxVulp_Port start
+  - type: ContentEye
+    targetZoom: "1.0, 1.0"
+    maxZoom: "1.0, 1.0"
+  - type: GrowlingAccent
+  - type: Wagging
+  - type: Respirator
+    damage:
+      types:
+        Asphyxiation: 2.0
+    damageRecovery:
+      types:
+        Asphyxiation: -2.0
+#vulpkanin Corvax-CorvaxVulp_Port end

 - type: entity
  parent: [BaseSpeciesDummy]
@@ -187,33 +231,63 @@
            sprite: Mobs/Species/Vulpkanin/displacement.rsi
            state: hair
  - type: Inventory
-    speciesId: vulpkanin
+    speciesId: vulpkanin #временно не corvaxvulpkanin Corvax-CorvaxVulp_Port
+    #vulpkanin Corvax-CorvaxVulp_Port start
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Corvax/Mobs/Species/displacement.rsi
+            state: jumpsuit-female
+      shoes:
+        sizeMaps:
+          32:
+            sprite: Corvax/Mobs/Species/displacement.rsi
+            state: shoes
    displacements:
      jumpsuit:
        sizeMaps:
          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
+            sprite: Corvax/Mobs/Species/displacement.rsi
            state: jumpsuit
+      shoes:
+        sizeMaps:
+          32:
+            sprite: Corvax/Mobs/Species/displacement.rsi
+            state: shoes
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: Corvax/Mobs/Species/displacement.rsi
+            state: outerclothing
+    ##########################################
+    #displacements:
+    #  jumpsuit:
+    #    sizeMaps:
+    #      32:
+    #        sprite: Mobs/Species/Vulpkanin/displacement.rsi
+    #        state: jumpsuit
      back:
        sizeMaps:
          32:
            sprite: Mobs/Species/Vulpkanin/displacement.rsi
            state: back
-      outerClothing:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: outerwear
+      #outerClothing:
+      #  sizeMaps:
+      #    32:
+      #      sprite: Mobs/Species/Vulpkanin/displacement.rsi
+      #      state: outerwear
      gloves:
        sizeMaps:
          32:
            sprite: Mobs/Species/Vulpkanin/displacement.rsi
            state: hand
-      shoes:
-        sizeMaps:
-          32:
-            sprite: Mobs/Species/Vulpkanin/displacement.rsi
-            state: shoes
+      #shoes:
+      #  sizeMaps:
+      #    32:
+      #      sprite: Mobs/Species/Vulpkanin/displacement.rsi
+      #      state: shoes
+      #vulpkanin Corvax-CorvaxVulp_Port end
      head:
        sizeMaps:
          32:
--- a/Resources/Prototypes/SoundCollections/vulpkanin.yml
+++ b/Resources/Prototypes/SoundCollections/vulpkanin.yml
@@ -14,6 +14,11 @@
  - /Audio/Voice/Vulpkanin/dog_growl4.ogg
  - /Audio/Voice/Vulpkanin/dog_growl5.ogg
  - /Audio/Voice/Vulpkanin/dog_growl6.ogg
+# Corvax-CorvaxVulp_Port-Start
+  - /Audio/Corvax/Effects/Growl/growl1.ogg
+  - /Audio/Corvax/Effects/Growl/growl2.ogg
+  - /Audio/Corvax/Effects/Growl/growl3.ogg
+# Corvax-CorvaxVulp_Port-End

 - type: soundCollection
  id: VulpkaninSnarls
--- a/Resources/Prototypes/Species/species_weights.yml
+++ b/Resources/Prototypes/Species/species_weights.yml
@@ -5,6 +5,6 @@
    Human: 5
    Reptilian: 4
    SlimePerson: 4
-    CorvaxVulpkanin: 4 # Corvax-Vulp
+    #CorvaxVulpkanin: 4 # Corvax-Vulp
    Diona: 2
-    #Vulpkanin: 4 # Corvax-Vulp мы передумали :(
+    Vulpkanin: 4
--- a/Resources/Prototypes/Species/vulpkanin.yml
+++ b/Resources/Prototypes/Species/vulpkanin.yml
@@ -1,15 +1,15 @@
 - type: species
  id: Vulpkanin
  name: species-name-vulpkanin
-  roundStart: False
+  roundStart: True
  prototype: MobVulpkanin
-  sprites: MobVulpkaninSprites
-  defaultSkinTone: "#5a3f2d"
+  sprites: MobCorvaxVulpkaninSprites #MobVulpkaninSprites # Corvax-CorvaxVulp_Port
+  defaultSkinTone:  "#eb943d" # "#5a3f2d" Corvax-CorvaxVulp_Port ибо нефиг
  markingLimits: MobVulpkaninMarkingLimits
  dollPrototype: MobVulpkaninDummy
-  skinColoration: VulpkaninColors
-  maleFirstNames: names_vulpkanin_male
-  femaleFirstNames: names_vulpkanin_female
+  skinColoration: Hues # VulpkaninColors Corvax-CorvaxVulp_Port
+  maleFirstNames: NamesVulpFirstMale # Corvax-CorvaxVulp_Port names_vulpkanin_male
+  femaleFirstNames: NamesVulpFirstFemale # Corvax-CorvaxVulp_Port names_vulpkanin_female
  maleLastNames: NamesVulpLast # Corvax-LastnameGender
  femaleLastNames: NamesVulpLast # Corvax-LastnameGender

@@ -50,21 +50,21 @@
    Snout:
      points: 1
      required: true
-      defaultMarkings: [ VulpSnout ]
+      defaultMarkings: [ FoxSnout ] # VulpSnout Corvax-CorvaxVulp_Port
    SnoutCover:
      points: 3
      required: false
    Tail:
      points: 1
      required: true
-      defaultMarkings: [ VulpTailVulp ]
+      defaultMarkings: [ FoxTail ] # VulpTailVulp Corvax-CorvaxVulp_Port
    Head:
      points: 3
      required: false
    HeadTop:
      points: 1
      required: true
-      defaultMarkings: [ VulpEar ]
+      defaultMarkings: [ FoxEar ] # VulpEar Corvax-CorvaxVulp_Port
    UndergarmentTop:
      points: 1
      required: false