From 0be18fafd4be6d4ee06051606acaf512d631910c Mon Sep 17 00:00:00 2001 From: Trosling <111116669+RHSvenson@users.noreply.github.com> Date: Mon, 21 Jul 2025 10:06:18 +0200 Subject: [PATCH] Issue#974 Fix (#1556) * Renamed all instances of mentioned entities * Corrected loc * Added migration entry --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 34 +++---- .../Prototypes/_CP14/Catalog/Fills/crates.yml | 2 +- .../Entities/Clothing/Back/backpacks.yml | 2 +- .../_CP14/Entities/Clothing/Back/satchels.yml | 2 +- .../Entities/Clothing/Shirt/Roles/general.yml | 26 +++--- .../_CP14/Entities/Clothing/Shoes/shoes.yml | 2 +- .../_CP14/Loadouts/Jobs/general.yml | 90 +++++++++---------- .../Loadouts/Misc/skeleton_startinggear.yml | 12 +-- .../_CP14/Recipes/Workbench/sewing_table.yml | 6 +- .../_CP14/Trading/BuyPositions/tailors.yml | 6 +- Resources/migration.yml | 19 ++++ 11 files changed, 110 insertions(+), 91 deletions(-) diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index a1e87e3f87..1a94d25379 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -706,12 +706,12 @@ ent-CP14ImpactEffectWaterCreation = { ent-CP14BaseMagicImpact } ent-CP14SpellScrollWaterCreation = свиток заклинания создания воды .desc = { ent-CP14BaseSpellScrollWater.desc } -ent-CP14ClothingBackpackLeather = кожаный рюкзак +ent-CP14ClothingBackLeatherBackpack = кожаный рюкзак .desc = Вы носите его на спине и кладете в него предметы. ent-CP14ClothingSatchelBase = None -ent-CP14ClothingSatchelLeather = кожаная сумка +ent-CP14ClothingBackLeatherSatchel = кожаная сумка .desc = Вы носите его на спине и кладете в него предметы. ent-CP14ClothingBeltPouchPotions = подсумок для зелий @@ -1191,7 +1191,7 @@ ent-CP14ClothingShirtCottonBlue = холщовая синяя рубашка ent-CP14ClothingShirtCottonBlueCollar = холщовая синяя рубашка с воротником .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingBlueCollarDress = хлопковое платье с голубым воротником +ent-CP14ClothingShirtBlueCollarDress = хлопковое платье с голубым воротником .desc = { ent-CP14ClothingShirtBase.desc } ent-CP14ClothingShirtMercenary = рубашка наемника @@ -1200,19 +1200,19 @@ ent-CP14ClothingShirtMercenary = рубашка наемника ent-CP14ClothingShirtBlueOpen = холщовая открытая синяя рубашка .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingBlueOpenDress = хлопковое голубое открытое платье +ent-CP14ClothingShirtBlueOpenDress = хлопковое голубое открытое платье .desc = { ent-CP14ClothingShirtBase.desc } ent-CP14ClothingShirtRedOpen = холщовая открытая красная рубашка .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingRedOpenDress = хлопковое красное открытое платье +ent-CP14ClothingShirtRedOpenDress = хлопковое красное открытое платье .desc = { ent-CP14ClothingShirtBase.desc } ent-CP14ClothingShirtYellowOpen = холщовая открытая желтая рубашка .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingYellowOpenDress = хлопковое желтое открытое платье +ent-CP14ClothingShirtYellowOpenDress = хлопковое желтое открытое платье .desc = { ent-CP14ClothingShirtBase.desc } ent-CP14ClothingShirtCottonPurple = холщовая фиолетовая рубашка @@ -1221,19 +1221,19 @@ ent-CP14ClothingShirtCottonPurple = холщовая фиолетовая руб ent-CP14ClothingShirtCottonRed = холщовая красная рубашка .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingCottonRedDress = хлопковое красное платье +ent-CP14ClothingShirtCottonRedDress = хлопковое красное платье .desc = { ent-CP14ClothingShirtBase.desc } ent-CP14ClothingShirtCottonWhite = холщовая белая рубашка .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingCottonWhiteDress = хлопковое белое платье +ent-CP14ClothingShirtCottonWhiteDress = хлопковое белое платье .desc = { ent-CP14ClothingShirtBase.desc } ent-CP14ClothingShirtCottonWhiteCollar = хлопковая рубашка с белым воротником .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingCottonWhiteCollarDress = хлопковое платье с белым воротником +ent-CP14ClothingShirtCottonWhiteCollarDress = хлопковое платье с белым воротником .desc = { ent-CP14ClothingShirtBase.desc } ent-CP14ClothingShirtCottonYellow = холщовая желтая рубашка @@ -1245,22 +1245,22 @@ ent-CP14ClothingShirtJestersAttire = шутовской наряд ent-CP14ClothingShirtCottonYellowCollar = холщовая желтая рубашка с воротником .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingCottonYellowCollarDress = хлопковое платье с желтым воротником +ent-CP14ClothingShirtCottonYellowCollarDress = хлопковое платье с желтым воротником .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingYellowWizardDress = желтая мантия волшебника +ent-CP14ClothingShirtYellowWizardDress = желтая мантия волшебника .desc = Свободная рубашка мага, удобная и приятная на вид. -ent-CP14ClothinGreenBeltDress = зеленая юбка с поясом +ent-CP14ClothingShirtGreenBeltDress = зеленая юбка с поясом .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothinGreenBeltDress2 = зеленая юбка с поясом +ent-CP14ClothingShirtGreenBeltDress2 = зеленая юбка с поясом .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothinGreenLightDress = светло-зеленое платье +ent-CP14ClothingShirtGreenLightDress = светло-зеленое платье .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingWarriorsGarbDress = воинское одеяние +ent-CP14ClothingShirtWarriorsGarbDress = воинское одеяние .desc = Покажите свою силу. ent-CP14ClothinShirtMaidDress = платье горничной @@ -1336,7 +1336,7 @@ ent-CP14ClothingShoesArtifactSpeedboots = ботинки Гермеса .desc = Зачарованные ботинки, позволяющие их владельцу быстро передвигаться по земле. Это выглядит увлекательно! .suffix = Артефакт -ent-CP14LongLeatherBoots = длинные кожаные сапоги +ent-CP14ClothingShoesLongLeatherBoots = длинные кожаные сапоги .desc = Удобная обувь для ударов ногой налево и направо. ent-CP14ClothingShoesJestersRingers = шутовские звонари @@ -1420,7 +1420,7 @@ ent-CP14MobGroupSpawnerFlem = { ent-CP14BaseMobGroupSpawner } .desc = { ent-CP14BaseMobGroupSpawner.desc } .suffix = 2-3 Флема -ent-CP14SpawnPointJobBase = маркер спавна игроков +ent-CP14SpawnPointJobBase = маркер спавна игроков ent-CP14SpawnPointGuardCommander = командир стражи .desc = { ent-CP14SpawnPointJobBase.desc } diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 75eefe1940..773e301d9b 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -133,7 +133,7 @@ - id: CP14ClothingHeadBeretMercenary - id: CP14ClothingPantsMercenaryTrousers - id: CP14ClothingShirtMercenary - - id: CP14ClothingYellowWizardDress + - id: CP14ClothingShirtYellowWizardDress - !type:GroupSelector children: - id: CP14DyeYellow diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml index 5b81a40152..d676643b6d 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml @@ -34,7 +34,7 @@ - type: entity parent: CP14ClothingBackpackBase - id: CP14ClothingBackpackLeather + id: CP14ClothingBackLeatherBackpack name: leather backpack description: You wear this on your back and put items into it. components: diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml index 7400e3476f..0f0a502427 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml @@ -12,7 +12,7 @@ - type: entity parent: CP14ClothingSatchelBase - id: CP14ClothingSatchelLeather + id: CP14ClothingBackLeatherSatchel name: leather satchel description: You wear this on your back and put items into it. components: diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index 5a0087db2a..0c8043d52e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -51,7 +51,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingBlueCollarDress + id: CP14ClothingShirtBlueCollarDress name: cotton blue collar dress components: - type: Sprite @@ -87,7 +87,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingBlueOpenDress + id: CP14ClothingShirtBlueOpenDress name: cotton blue open dress components: - type: Sprite @@ -107,7 +107,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingRedOpenDress + id: CP14ClothingShirtRedOpenDress name: cotton red open dress components: - type: Sprite @@ -127,7 +127,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingYellowOpenDress + id: CP14ClothingShirtYellowOpenDress name: cotton yellow open dress components: - type: Sprite @@ -167,7 +167,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingCottonRedDress + id: CP14ClothingShirtCottonRedDress name: cotton red dress components: - type: Sprite @@ -190,7 +190,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingCottonWhiteDress + id: CP14ClothingShirtCottonWhiteDress name: cotton white dress components: - type: Sprite @@ -210,7 +210,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingCottonWhiteCollarDress + id: CP14ClothingShirtCottonWhiteCollarDress name: cotton white collar dress components: - type: Sprite @@ -256,7 +256,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingCottonYellowCollarDress + id: CP14ClothingShirtCottonYellowCollarDress name: cotton yellow collar dress components: - type: Sprite @@ -266,7 +266,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingYellowWizardDress + id: CP14ClothingShirtYellowWizardDress name: yellow wizard robe description: A loose magician's shirt, comfortable and nice looking. components: @@ -282,7 +282,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothinGreenBeltDress + id: CP14ClothingShirtGreenBeltDress name: green skirt with belt components: - type: Sprite @@ -292,7 +292,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothinGreenBeltDress2 + id: CP14ClothingShirtGreenBeltDress2 name: green skirt with belt components: - type: Sprite @@ -302,7 +302,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothinGreenLightDress + id: CP14ClothingShirtGreenLightDress name: light green dress components: - type: Sprite @@ -312,7 +312,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingWarriorsGarbDress + id: CP14ClothingShirtWarriorsGarbDress name: warrior's garb description: show your strength. components: diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index bb8250bfb0..7c01a99b91 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -94,7 +94,7 @@ - type: entity parent: CP14ClothingShoesBase - id: CP14LongLeatherBoots + id: CP14ClothingShoesLongLeatherBoots name: long leather boots description: the perfect tool for kicking left and right components: diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 89f7e78452..4f3e4117d8 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -388,40 +388,40 @@ - CP14ClothinShirtMaidDress - CP14ClothingShirtCottonBlue - CP14ClothingShirtCottonBlueCollar - - CP14ClothingBlueCollarDress + - CP14ClothingShirtBlueCollarDress - CP14ClothingShirtBlueOpen - - CP14ClothingBlueOpenDress + - CP14ClothingShirtBlueOpenDress - CP14ClothinShirtWhiteBlueDress - CP14ClothinShirtWhiteBlue2Dress - CP14ClothinShirtRedBlueDress - CP14ClothingShirtJestersAttire - CP14ClothingShirtRedOpen - - CP14ClothingRedOpenDress + - CP14ClothingShirtRedOpenDress - CP14ClothingShirtYellowOpen - - CP14ClothingYellowOpenDress + - CP14ClothingShirtYellowOpenDress - CP14ClothinShirtBlueYellowDress - CP14ClothingShirtCottonPurple - CP14ClothingShirtCottonRed - - CP14ClothingCottonRedDress + - CP14ClothingShirtCottonRedDress - CP14ClothingShirtCottonWhite - - CP14ClothingCottonWhiteDress + - CP14ClothingShirtCottonWhiteDress - CP14ClothingShirtCottonWhiteCollar - - CP14ClothingCottonWhiteCollarDress + - CP14ClothingShirtCottonWhiteCollarDress - CP14ClothinShirtWhiteBrown - CP14ClothinShirtBrown2Dress - CP14ClothinShirtBrown3Dress - - CP14ClothinGreenBeltDress - - CP14ClothinGreenBeltDress2 + - CP14ClothingShirtGreenBeltDress + - CP14ClothingShirtGreenBeltDress2 - CP14ClothinShirtWhiteGreenDress - CP14ClothinShirtwhiteGreenYellowDress - CP14ClothinShirtGreenYellow - CP14ClothinShirtBlueGreen - - CP14ClothinGreenLightDress + - CP14ClothingShirtGreenLightDress - CP14ClothingShirtCottonYellow - CP14ClothingShirtCottonYellowCollar - - CP14ClothingCottonYellowCollarDress + - CP14ClothingShirtCottonYellowCollarDress - CP14ClothinShirtYellowBlueDress - - CP14ClothingWarriorsGarbDress + - CP14ClothingShirtWarriorsGarbDress - CP14ClothingShirtMercenary - type: loadout @@ -450,9 +450,9 @@ shirt: CP14ClothingShirtCottonBlueCollar - type: loadout - id: CP14ClothingBlueCollarDress + id: CP14ClothingShirtBlueCollarDress equipment: - shirt: CP14ClothingBlueCollarDress + shirt: CP14ClothingShirtBlueCollarDress - type: loadout id: CP14ClothingShirtBlueOpen @@ -460,9 +460,9 @@ shirt: CP14ClothingShirtBlueOpen - type: loadout - id: CP14ClothingBlueOpenDress + id: CP14ClothingShirtBlueOpenDress equipment: - shirt: CP14ClothingBlueOpenDress + shirt: CP14ClothingShirtBlueOpenDress - type: loadout id: CP14ClothingShirtJestersAttire @@ -475,9 +475,9 @@ shirt: CP14ClothingShirtRedOpen - type: loadout - id: CP14ClothingRedOpenDress + id: CP14ClothingShirtRedOpenDress equipment: - shirt: CP14ClothingRedOpenDress + shirt: CP14ClothingShirtRedOpenDress - type: loadout id: CP14ClothingShirtYellowOpen @@ -485,9 +485,9 @@ shirt: CP14ClothingShirtYellowOpen - type: loadout - id: CP14ClothingYellowOpenDress + id: CP14ClothingShirtYellowOpenDress equipment: - shirt: CP14ClothingYellowOpenDress + shirt: CP14ClothingShirtYellowOpenDress - type: loadout id: CP14ClothingShirtCottonPurple @@ -500,9 +500,9 @@ shirt: CP14ClothingShirtCottonRed - type: loadout - id: CP14ClothingCottonRedDress + id: CP14ClothingShirtCottonRedDress equipment: - shirt: CP14ClothingCottonRedDress + shirt: CP14ClothingShirtCottonRedDress - type: loadout id: CP14ClothingShirtCottonWhite @@ -510,9 +510,9 @@ shirt: CP14ClothingShirtCottonWhite - type: loadout - id: CP14ClothingCottonWhiteDress + id: CP14ClothingShirtCottonWhiteDress equipment: - shirt: CP14ClothingCottonWhiteDress + shirt: CP14ClothingShirtCottonWhiteDress - type: loadout id: CP14ClothingShirtCottonWhiteCollar @@ -520,24 +520,24 @@ shirt: CP14ClothingShirtCottonWhiteCollar - type: loadout - id: CP14ClothingCottonWhiteCollarDress + id: CP14ClothingShirtCottonWhiteCollarDress equipment: - shirt: CP14ClothingCottonWhiteCollarDress + shirt: CP14ClothingShirtCottonWhiteCollarDress - type: loadout - id: CP14ClothinGreenBeltDress + id: CP14ClothingShirtGreenBeltDress equipment: - shirt: CP14ClothinGreenBeltDress + shirt: CP14ClothingShirtGreenBeltDress - type: loadout - id: CP14ClothinGreenBeltDress2 + id: CP14ClothingShirtGreenBeltDress2 equipment: - shirt: CP14ClothinGreenBeltDress2 + shirt: CP14ClothingShirtGreenBeltDress2 - type: loadout - id: CP14ClothinGreenLightDress + id: CP14ClothingShirtGreenLightDress equipment: - shirt: CP14ClothinGreenLightDress + shirt: CP14ClothingShirtGreenLightDress - type: loadout id: CP14ClothingShirtCottonYellow @@ -550,14 +550,14 @@ shirt: CP14ClothingShirtCottonYellowCollar - type: loadout - id: CP14ClothingCottonYellowCollarDress + id: CP14ClothingShirtCottonYellowCollarDress equipment: - shirt: CP14ClothingCottonYellowCollarDress + shirt: CP14ClothingShirtCottonYellowCollarDress - type: loadout - id: CP14ClothingWarriorsGarbDress + id: CP14ClothingShirtWarriorsGarbDress equipment: - shirt: CP14ClothingWarriorsGarbDress + shirt: CP14ClothingShirtWarriorsGarbDress - type: loadout id: CP14ClothinShirtBlueYellowDress @@ -638,7 +638,7 @@ - CP14ShoesBlack - CP14ShoesAristocraticBlack - CP14ShoesSandals - - CP14LongLeatherBoots + - CP14ClothingShoesLongLeatherBoots - CP14ClothingShoesJestersRingers - type: loadout @@ -657,9 +657,9 @@ shoes: CP14ClothingShoesSandals - type: loadout - id: CP14LongLeatherBoots + id: CP14ClothingShoesLongLeatherBoots equipment: - shoes: CP14LongLeatherBoots + shoes: CP14ClothingShoesLongLeatherBoots - type: loadout id: CP14ClothingShoesJestersRingers @@ -672,18 +672,18 @@ id: CP14GeneralBack name: cp14-loadout-general-back loadouts: - - CP14ClothingBackpackLeather - - CP14ClothingSatchelLeather + - CP14ClothingBackLeatherBackpack + - CP14ClothingBackLeatherSatchel - type: loadout - id: CP14ClothingBackpackLeather + id: CP14ClothingBackLeatherBackpack equipment: - back: CP14ClothingBackpackLeather + back: CP14ClothingBackLeatherBackpack - type: loadout - id: CP14ClothingSatchelLeather + id: CP14ClothingBackLeatherSatchel equipment: - back: CP14ClothingSatchelLeather + back: CP14ClothingBackLeatherSatchel # Trinkets diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml index 851a3bd3f6..c62c494ee5 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml @@ -14,7 +14,7 @@ head: CP14ClothingHeadTriangularHatGolden shirt: CP14ClothingShirtCottonBlack pants: CP14ClothingPantsBrown - shoes: CP14LongLeatherBoots + shoes: CP14ClothingShoesLongLeatherBoots belt: CP14ModularSkeletonSwordUpgrade neck: CP14ModularIronPickaxe @@ -25,7 +25,7 @@ equipment: outerClothing: CP14ClothingOuterClothingBoneArmor cloak: CP14ClothingCloakBone - shirt: CP14ClothingWarriorsGarbDress + shirt: CP14ClothingShirtWarriorsGarbDress pants: CP14ClothingPantsLoincloth neck: CP14ModularSkeletonHalberd shoes: CP14ClothingShoesSandals @@ -53,7 +53,7 @@ - type: startingGear id: CP14MobSkeletonArcherT1 equipment: - shirt: CP14ClothingWarriorsGarbDress + shirt: CP14ClothingShirtWarriorsGarbDress pants: CP14ClothingPantsLoincloth neck: CP14BowCombat belt: CP14ClothingBeltQuiverCopperArrow @@ -66,7 +66,7 @@ outerClothing: CP14ClothingOuterClothingBoneArmorUpgrade cloak: CP14ClothingCloakBone mask: CP14ClothingMaskSteelMask - shirt: CP14ClothingWarriorsGarbDress + shirt: CP14ClothingShirtWarriorsGarbDress pants: CP14ClothingPantsLoincloth neck: CP14ModularSkeletonHalberdUpgrade shoes: CP14ClothingShoesSandals @@ -103,7 +103,7 @@ neck: CP14BowCombat belt: CP14ClothingBeltQuiverIronArrow belt2: CP14ModularSkeletonSword - shoes: CP14LongLeatherBoots + shoes: CP14ClothingShoesLongLeatherBoots - type: startingGear id: CP14MobSkeletonWizardT2 @@ -113,7 +113,7 @@ head: CP14ClothingHeadTriangularHatGolden shirt: CP14ClothingShirtCottonBlack pants: CP14ClothingPantsBrown - shoes: CP14LongLeatherBoots + shoes: CP14ClothingShoesLongLeatherBoots ring2: CP14ClothingCloakAmuletMana belt: CP14ModularSkeletonSword diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index 1a8d2a823b..e2bd3f2a0b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -217,7 +217,7 @@ result: CP14ClothingShirtMercenary - type: CP14Recipe - id: CP14ClothingYellowWizardDress + id: CP14ClothingShirtYellowWizardDress tag: CP14RecipeSewing craftTime: 2 category: Clothing @@ -233,7 +233,7 @@ - !type:StackResource stack: CP14Cloth count: 3 - result: CP14ClothingYellowWizardDress + result: CP14ClothingShirtYellowWizardDress - type: CP14Recipe id: CP14ClothingHeadBeretMercenary @@ -695,4 +695,4 @@ protoId: CP14String - !type:ProtoIdResource protoId: CP14DyeYellow - result: CP14FloorCarpetItemYellow10 \ No newline at end of file + result: CP14FloorCarpetItemYellow10 diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/tailors.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/tailors.yml index bf787e23ca..7f91ae910c 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/tailors.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/tailors.yml @@ -125,7 +125,7 @@ count: 5 - type: cp14TradingPosition - id: CP14ClothingYellowWizardDress + id: CP14ClothingShirtYellowWizardDress faction: Tailors reputationLevel: 1 uiPosition: 8 @@ -134,7 +134,7 @@ sprite: _CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi state: icon service: !type:CP14BuyItemsService - product: CP14ClothingYellowWizardDress + product: CP14ClothingShirtYellowWizardDress count: 1 # Reputation Level 2 @@ -162,4 +162,4 @@ state: base service: !type:CP14BuyItemsService product: CP14DyeBlack - count: 5 \ No newline at end of file + count: 5 diff --git a/Resources/migration.yml b/Resources/migration.yml index 65d0e4ef34..59251752c3 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -378,6 +378,25 @@ CP14FoodPieFishRaw: null CP14FoodPieMeat: null CP14FoodPieMeatRaw: null +# 2025-07-20 +CP14ClothingBackpackLeather: CP14ClothingBackLeatherBackpack +CP14ClothingSatchelLeather: CP14ClothingBackLeatherSatchel +CP14ClothingBlueCollarDress: CP14ClothingShirtBlueCollarDress +CP14ClothingBlueOpenDress: CP14ClothingShirtBlueOpenDress +CP14ClothingRedOpenDress: CP14ClothingShirtRedOpenDress +CP14ClothingYellowOpenDress: CP14ClothingShirtYellowOpenDress +CP14ClothingCottonRedDress: CP14ClothingShirtCottonRedDress +CP14ClothingCottonWhiteDress: CP14ClothingShirtCottonWhiteDress +CP14ClothingCottonWhiteCollarDress: CP14ClothingShirtCottonWhiteCollarDress +CP14ClothingCottonYellowCollarDress: CP14ClothingShirtCottonYellowCollarDress +CP14ClothingYellowWizardDress: CP14ClothingShirtYellowWizardDress +CP14ClothinGreenBeltDress: CP14ClothingShirtGreenBeltDress +CP14ClothinGreenBeltDress2: CP14ClothingShirtGreenBeltDress2 +CP14ClothinGreenLightDress: CP14ClothingShirtGreenLightDress +CP14ClothingWarriorsGarbDress: CP14ClothingShirtWarriorsGarbDress +CP14LongLeatherBoots: CP14ClothingShoesLongLeatherBoots + + # <---> CrystallEdge migration zone end