Minor meat revisions (#1426)

* minor meat revisions * name id --------- Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-16 10:39:33 +03:00
parent f9777102de
commit 06de3a0eca
8 changed files with 41 additions and 33 deletions
--- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
+++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
@@ -1872,22 +1872,22 @@ ent-CP14FoodMeatPigSlice = кусочки мяса
 ent-CP14FoodMeatPigCookedSlice = кусочки приготовленного мяса
    .desc = { ent-CP14FoodMeatPigSlice.desc }

-ent-CP14FoodMeatMole = сырое мясо крота
+ent-CP14FoodMeatMonster = сырое мясо монстра
    .desc = Цвет довольно подозрительный, не каждый решится его опробовать, может, отдать гоблину?

-ent-CP14FoodMeatMoleCooked = приготовленное мясо крота
+ent-CP14FoodMeatMonsterCooked = приготовленное мясо монстра
    .desc = { ent-CP14FoodMeatMole.desc }

-ent-CP14FoodMeatMoleLeg = сырое мясо ноги крота
+ent-CP14FoodMeatMonsterLeg = сырое мясо ноги монстра
    .desc = Подозрительный цвет мяса заставляет усомниться в его съедобности, но если вы действительно голодны...

-ent-CP14FoodMeatMoleLegCooked = приготовленное мясо ноги крота
+ent-CP14FoodMeatMonsterLegCooked = приготовленное мясо ноги монстра
    .desc = { ent-CP14FoodMeatMoleLeg.desc }

-ent-CP14FoodMeatMoleSlice = кусочек мяса монстра
+ent-CP14FoodMeatMonsterSlice = кусочек мяса монстра
    .desc = Мясные шарики-монстры с фирменным подозрительным цветом.

-ent-CP14FoodMeatMoleCookedSlice = кусочки приготовленного мяса монстра
+ent-CP14FoodMeatMonsterCookedSlice = кусочки приготовленного мяса монстра
    .desc = { ent-CP14FoodMeatMoleSlice.desc }

 ent-CP14FoodPieAppleRaw = сырой яблочный пирог
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/invisible_whistler.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/invisible_whistler.yml
@@ -68,7 +68,7 @@
        Base: dead
  - type: Butcherable
    spawned:
-    - id: CP14FoodMeatMole
+    - id: CP14FoodMeatMonster
      amount: 3
    - id: CP14PartsMonsterGlands
      amount: 1
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml
@@ -71,12 +71,12 @@
        Base: dead
  - type: Butcherable
    spawned:
-    - id: CP14FoodMeatMole
+    - id: CP14FoodMeatMonster
      amount: 3
    - id: CP14FoodMeatPig
      amount: 1
      prob: 0.3
-    - id: CP14FoodMeatMoleLeg
+    - id: CP14FoodMeatMonsterLeg
      amount: 1
      prob: 0.6
  - type: Bloodstream
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml
@@ -30,9 +30,9 @@
        - MobLayer
  - type: Butcherable
    spawned:
-    - id: CP14FoodMeatMole #TODO
+    - id: CP14FoodMeatMonster #TODO
      amount: 2
-    - id: CP14FoodMeatMoleLeg #TODO
+    - id: CP14FoodMeatMonsterLeg #TODO
      amount: 1
      prob: 0.6
  - type: CombatMode
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml
@@ -102,7 +102,7 @@
    damageModifierSet: CP14WatcherIce
  - type: Butcherable
    spawned:
-    - id: CP14FoodMeatMole
+    - id: CP14FoodMeatMonster
      amount: 1
    - id: CP14ModularInlayQuartzWater
      amount: 1
@@ -133,7 +133,7 @@
    fireCost: 50
  - type: Butcherable
    spawned:
-    - id: CP14FoodMeatMole
+    - id: CP14FoodMeatMonster
      amount: 1
    - id: CP14ModularInlayQuartzFire
      amount: 1
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/lurker.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/lurker.yml
@@ -76,7 +76,7 @@
  - type: Climbing
  - type: Butcherable
    spawned:
-    - id: CP14FoodMeatDino
+    - id: CP14FoodMeatMonster
      amount: 4
    - id: CP14ClothingMaskBoneHornedMask
      amount: 1
--- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml
@@ -747,12 +747,12 @@
    - temperatureRange: 400, 500
      transformTo: CP14Ash1

-# Mole Meat
+# Monster Meat

 - type: entity
-  id: CP14FoodMeatMole
+  id: CP14FoodMeatMonster
  parent: CP14FoodMeatBase
-  name: raw mole meat
+  name: raw monster meat
  description: The colour is quite suspicious, not everyone would dare to try it out, perhaps give it to a goblin?
  components:
  - type: Sprite
@@ -764,7 +764,7 @@
    size: Small
  - type: SliceableFood
    count: 4
-    slice: CP14FoodMeatMoleSlice
+    slice: CP14FoodMeatMonsterSlice
  - type: SolutionContainerManager
    solutions:
      food:
@@ -786,12 +786,12 @@
  - type: CP14TemperatureTransformation
    entries:
    - temperatureRange: 400, 500
-      transformTo: CP14FoodMeatMoleCooked
+      transformTo: CP14FoodMeatMonsterCooked

 - type: entity
-  id: CP14FoodMeatMoleCooked
-  parent: CP14FoodMeatMole
-  name: cooked mole meat
+  id: CP14FoodMeatMonsterCooked
+  parent: CP14FoodMeatMonster
+  name: cooked monster meat
  components:
  - type: Sprite
    layers:
@@ -800,7 +800,7 @@
        color: "#c98367"
  - type: SliceableFood
    count: 4
-    slice: CP14FoodMeatMoleCookedSlice
+    slice: CP14FoodMeatMonsterCookedSlice
  - type: SolutionContainerManager
    solutions:
      food:
@@ -825,9 +825,9 @@
      transformTo: CP14Ash1

 - type: entity
-  id: CP14FoodMeatMoleLeg
+  id: CP14FoodMeatMonsterLeg
  parent: CP14FoodMeatBase
-  name: raw mole leg meat
+  name: raw monster leg meat
  description: The suspicious colour of the meat makes you question its edibility, but if you're really hungry...
  components:
  - type: Sprite
@@ -849,12 +849,12 @@
  - type: CP14TemperatureTransformation
    entries:
    - temperatureRange: 400, 500
-      transformTo: CP14FoodMeatMoleLegCooked
+      transformTo: CP14FoodMeatMonsterLegCooked

 - type: entity
-  id: CP14FoodMeatMoleLegCooked
-  parent: CP14FoodMeatMoleLeg
-  name: cooked mole leg meat # Jamon? - Хамон?
+  id: CP14FoodMeatMonsterLegCooked
+  parent: CP14FoodMeatMonsterLeg
+  name: cooked monster leg meat # Jamon? - Хамон?
  components:
  - type: Sprite
    state: mole_meat5 # We need fried sprites
@@ -876,7 +876,7 @@
      transformTo: CP14Ash1

 - type: entity
-  id: CP14FoodMeatMoleSlice
+  id: CP14FoodMeatMonsterSlice
  parent: CP14FoodMeatSliceBase
  name: monster meat piece
  description: Monster meat balls with their trademark suspicious colour.
@@ -904,11 +904,11 @@
  - type: CP14TemperatureTransformation
    entries:
    - temperatureRange: 400, 500
-      transformTo: CP14FoodMeatMoleCookedSlice
+      transformTo: CP14FoodMeatMonsterCookedSlice

 - type: entity
-  id: CP14FoodMeatMoleCookedSlice
-  parent: CP14FoodMeatMoleSlice
+  id: CP14FoodMeatMonsterCookedSlice
+  parent: CP14FoodMeatMonsterSlice
  name: cooked monster meat pieces
  components:
  - type: Sprite
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -342,6 +342,14 @@ CP14WoodenChestFilledCheese: null
 CP14ClothingRingFireball: null
 CP14ClothingRingFlashLight: null
 CP14ClothingRingIceShards: null
+
+#2025-06-15
+CP14FoodMeatMole: CP14FoodMeatMonster
+CP14FoodMeatMoleCooked: CP14FoodMeatMonsterCooked
+CP14FoodMeatMoleLeg: CP14FoodMeatMonsterLeg
+CP14FoodMeatMoleLegCooked: CP14FoodMeatMonsterLegCooked
+CP14FoodMeatMoleSlice: CP14FoodMeatMonsterSlice
+CP14FoodMeatMoleCookedSlice: CP14FoodMeatMonsterCookedSlice
 # <---> CrystallEdge migration zone end