From a944cd9834594a0a5911e86d2e476d304417cc0c Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 27 Aug 2024 08:58:58 +0500 Subject: [PATCH] Cloth pack (#423) * content * Update battle_royale_temp.yml --- .../en-US/_CP14/materials/materials.ftl | 3 +- .../Locale/en-US/_CP14/stack/materials.ftl | 1 + .../ru-RU/_CP14/materials/materials.ftl | 3 +- .../Locale/ru-RU/_CP14/stack/materials.ftl | 1 + .../_CP14/Entities/Clothing/Pants/pants.yml | 2 +- .../Spawners/Random/battle_royale_temp.yml | 8 +- .../Entities/Objects/Materials/simple.yml | 52 ++++- .../_CP14/Entities/Objects/Tools/scissors.yml | 26 +++ .../Structures/Furniture/workbenchs.yml | 37 +++- .../Prototypes/_CP14/Materials/simple.yml | 9 + .../_CP14/Recipes/Workbench/sewing_table.yml | 197 ++++++++++++++++++ .../Prototypes/_CP14/Stacks/materials.yml | 7 + .../_CP14/Mobs/Pets/sheep.rsi/dead.png | Bin 0 -> 1040 bytes .../_CP14/Mobs/Pets/sheep.rsi/meta.json | 18 ++ .../_CP14/Mobs/Pets/sheep.rsi/sheep.png | Bin 0 -> 2071 bytes .../Objects/Materials/cloth.rsi/cloth_1.png | Bin 0 -> 366 bytes .../Objects/Materials/cloth.rsi/cloth_2.png | Bin 0 -> 527 bytes .../Objects/Materials/cloth.rsi/cloth_3.png | Bin 0 -> 545 bytes .../Objects/Materials/cloth.rsi/meta.json | 20 ++ .../Objects/Materials/string.rsi/icon.png | Bin 0 -> 323 bytes .../Materials/string.rsi/inhand-left.png | Bin 0 -> 215 bytes .../Materials/string.rsi/inhand-right.png | Bin 0 -> 213 bytes .../Objects/Materials/string.rsi/meta.json | 22 ++ .../_CP14/Objects/Materials/wood.rsi/log.png | Bin 549 -> 549 bytes .../Objects/Materials/wood.rsi/log_2.png | Bin 554 -> 554 bytes .../Objects/Materials/wood.rsi/log_3.png | Bin 558 -> 558 bytes .../_CP14/Objects/Tools/rope.rsi/meta.json | 2 +- .../_CP14/Objects/Tools/scissors.rsi/icon.png | Bin 0 -> 367 bytes .../Tools/scissors.rsi/inhand-left.png | Bin 0 -> 387 bytes .../Tools/scissors.rsi/inhand-right.png | Bin 0 -> 404 bytes .../Objects/Tools/scissors.rsi/meta.json | 22 ++ Resources/migration.yml | 1 + 32 files changed, 422 insertions(+), 9 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml create mode 100644 Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/dead.png create mode 100644 Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/sheep.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/cloth.rsi/cloth_1.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/cloth.rsi/cloth_2.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/cloth.rsi/cloth_3.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/cloth.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Materials/string.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/string.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/string.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/string.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Tools/scissors.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/scissors.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/scissors.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/scissors.rsi/meta.json diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index dd1ab7c0b2..f66e3992fe 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -1,3 +1,4 @@ cp14-material-wooden-planks = wooden planks cp14-material-dirt-block = dirt -cp14-material-stone-block = stone \ No newline at end of file +cp14-material-stone-block = stone +cp14-material-cloth = cloth \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index 0c49f83c53..375ebb6fd9 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -2,6 +2,7 @@ cp14-stack-dirt-block = dirt blocks cp14-stack-stone-block = stone blocks cp14-stack-wood-planks = wooden planks cp14-stack-nails = nails +cp14-stack-cloth = rolls of fabric cp14-stack-copper-bars = copper bars cp14-stack-iron-bars = iron bars diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index 16d8c2ca1e..d529232e06 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -1,3 +1,4 @@ cp14-material-wooden-planks = деревянные доски cp14-material-dirt-block = земля -cp14-material-stone-block = камень \ No newline at end of file +cp14-material-stone-block = камень +cp14-material-cloth = ткань \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index 2755f00d18..c033f44724 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -2,6 +2,7 @@ cp14-stack-dirt-block = блоки земли cp14-stack-stone-block = каменные блоки cp14-stack-wood-planks = деревянные доски cp14-stack-nails = гвозди +cp14-stack-cloth = рулоны ткани cp14-stack-copper-bars = медные слитки cp14-stack-iron-bars = железные слитки diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml index 654ca9a5bf..5950847950 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml @@ -57,7 +57,7 @@ - type: entity parent: CP14ClothingPantsBase - id: CP14ClothingDressBlack + id: CP14ClothingDressBlack #TODO rename to CP14ClothingPantsDressBlack name: black dress description: A roomy, feminine skirt components: diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml index 4c531e4a27..6093e85c6b 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml @@ -62,7 +62,7 @@ - CP14WoodLog - CP14WoodenPlanks10 - CP14Nail1 - - CP14Nail110 + - CP14Nail10 - CP14Cauldron - CP14Pestle - CP14AlchemyNormalizer @@ -79,4 +79,8 @@ - CP14AuraNodeBase - CP14AuraNodeBase - CP14AuraNodeBase - - CP14AuraNodeBase \ No newline at end of file + - CP14AuraNodeBase + - CP14String + - CP14String + - CP14String + - CP14Cloth10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index a31bbe7979..a3dbd3b53d 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -245,7 +245,7 @@ launchForwardsMultiplier: 0 - type: entity - id: CP14Nail110 + id: CP14Nail10 parent: CP14Nail1 suffix: 10 components: @@ -283,4 +283,52 @@ cP14FireplaceFuel: 5 damage: types: - Heat: 1 \ No newline at end of file + Heat: 1 + +- type: entity + id: CP14String + parent: BaseItem + name: strings + description: Thin thread. Material for mending clothes, or sewing new ones. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: _CP14/Objects/Materials/string.rsi + state: icon + +- type: entity + id: CP14Cloth1 + parent: BaseItem + name: cloth + suffix: 1 + description: White cloth roll + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Materials/cloth.rsi + layers: + - state: cloth_1 + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14Cloth + count: 1 + baseLayer: base + layerStates: + - cloth_1 + - cloth_2 + - cloth_3 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14Cloth: 100 + +- type: entity + id: CP14Cloth10 + parent: CP14Cloth1 + suffix: 10 + components: + - type: Stack + count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml new file mode 100644 index 0000000000..790edc697e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml @@ -0,0 +1,26 @@ +- type: entity + id: CP14Scissors + name: scissors + description: A tool for shredding wool, hair, clothing, and, if not handled carefully, even fingers. + parent: BaseItem + components: + - type: Sprite + sprite: _CP14/Objects/Tools/scissors.rsi + state: icon + - type: MagicMirror + - type: ActivatableUI + key: enum.MagicMirrorUiKey.Key + inHandsOnly: true + requireActiveHand: true + - type: UserInterface + interfaces: + enum.MagicMirrorUiKey.Key: + type: MagicMirrorBoundUserInterface + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1 + damage: + types: + Piercing: 6 + soundHit: + path: "/Audio/Weapons/bladeslice.ogg" diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 1690c134b9..10eca3bcae 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -122,4 +122,39 @@ - CP14FoodDoughMedium - CP14FoodMeatLamb - CP14SeedPumpkin - - CP14SeedWheat \ No newline at end of file + - CP14SeedWheat + +- type: entity + id: CP14WorkbenchSewing + parent: + - CP14WorkbenchMeltingMolds + - CP14BaseWooden + name: sewing table + description: Lets cook + components: + - type: CP14Workbench + craftSound: + collection: CP14Sawing + recipes: + - CP14ClothingShirtCottonBlue + - CP14ClothingShirtCottonBlack + - CP14ClothingShirtCottonPurple + - CP14ClothingShirtCottonRed + - CP14ClothingShirtCottonWhite + - CP14ClothingShirtCottonYellow + - CP14ClothingShirtMercenary + - CP14ClothingShirtYellowWizard + - CP14ClothingCloakSimpleDarkBlue + - CP14ClothingCloakSimpleWhite + - CP14ClothingPantsTrouserWhite + - CP14ClothingPantsTrouserDarkBlue + - CP14ClothingDressBlack + - CP14ClothingPantsSouthernMagician + - CP14ClothingPantsMercenaryTrousers + - CP14ClothingHeadRedBeret + - CP14ClothingHeadPurpleBeret + - CP14ClothingHeadYellowBeret + - CP14ClothingHeadBlueBeret + - CP14ClothingHeadBlackBeret + - CP14ClothingHeadYellowHat + - CP14ClothingHeadMercenaryBeret \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index d74e3bf661..2d147eca36 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -34,6 +34,15 @@ color: "#555963" price: 0 #? +- type: material + id: CP14Cloth + stackEntity: CP14Cloth1 + name: cp14-material-cloth + unit: materials-unit-roll + icon: { sprite: _CP14/Objects/Materials/cloth.rsi, state: cloth_3 } + color: "#d8e3e2" + price: 0 #? + - type: material id: CP14Copper stackEntity: CP14CopperBar1 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml new file mode 100644 index 0000000000..9996d25512 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -0,0 +1,197 @@ +- type: CP14Recipe + id: CP14ClothingShirtCottonBlue + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 2 + result: CP14ClothingShirtCottonBlue + +- type: CP14Recipe + id: CP14ClothingShirtCottonBlack + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingShirtCottonBlack + +- type: CP14Recipe + id: CP14ClothingShirtCottonPurple + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingShirtCottonPurple + +- type: CP14Recipe + id: CP14ClothingShirtCottonRed + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingShirtCottonRed + +- type: CP14Recipe + id: CP14ClothingShirtCottonWhite + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingShirtCottonWhite + +- type: CP14Recipe + id: CP14ClothingShirtCottonYellow + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingShirtCottonYellow + +- type: CP14Recipe + id: CP14ClothingShirtMercenary + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingShirtMercenary + +- type: CP14Recipe + id: CP14ClothingShirtYellowWizard + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingShirtYellowWizard + +- type: CP14Recipe + id: CP14ClothingCloakSimpleDarkBlue + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingCloakSimpleDarkBlue + +- type: CP14Recipe + id: CP14ClothingCloakSimpleWhite + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 3 + result: CP14ClothingCloakSimpleWhite + +- type: CP14Recipe + id: CP14ClothingPantsTrouserWhite + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 2 + result: CP14ClothingPantsTrouserWhite + +- type: CP14Recipe + id: CP14ClothingPantsTrouserDarkBlue + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 2 + result: CP14ClothingPantsTrouserDarkBlue + +- type: CP14Recipe + id: CP14ClothingDressBlack + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 2 + result: CP14ClothingDressBlack + +- type: CP14Recipe + id: CP14ClothingPantsSouthernMagician + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 2 + result: CP14ClothingPantsSouthernMagician + +- type: CP14Recipe + id: CP14ClothingPantsMercenaryTrousers + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 2 + result: CP14ClothingPantsMercenaryTrousers + +- type: CP14Recipe + id: CP14ClothingHeadRedBeret + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 1 + result: CP14ClothingHeadRedBeret + +- type: CP14Recipe + id: CP14ClothingHeadPurpleBeret + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 1 + result: CP14ClothingHeadPurpleBeret + +- type: CP14Recipe + id: CP14ClothingHeadYellowBeret + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 1 + result: CP14ClothingHeadYellowBeret + +- type: CP14Recipe + id: CP14ClothingHeadBlueBeret + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 1 + result: CP14ClothingHeadBlueBeret + +- type: CP14Recipe + id: CP14ClothingHeadBlackBeret + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 1 + result: CP14ClothingHeadBlackBeret + +- type: CP14Recipe + id: CP14ClothingHeadYellowHat + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 2 + result: CP14ClothingHeadYellowHat + +- type: CP14Recipe + id: CP14ClothingHeadMercenaryBeret + craftTime: 2 + entities: + CP14String: 1 + stacks: + CP14Cloth: 2 + result: CP14ClothingHeadMercenaryBeret \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index cfa4f3505e..72a3240453 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -26,6 +26,13 @@ icon: { sprite: _CP14/Objects/Materials/nails.rsi, state: nail_2 } maxCount: 10 +- type: stack + id: CP14Cloth + name: cp14-stack-cloth + spawn: CP14Cloth1 + icon: { sprite: _CP14/Objects/Materials/cloth.rsi, state: cloth_3 } + maxCount: 10 + - type: stack id: CP14CopperBar name: cp14-stack-copper-bars diff --git a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/dead.png b/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..e39f74638b06ac409244bcffa3d018db55954ee5 GIT binary patch literal 1040 zcmV+r1n>KaP)Px&%1J~)R9J=Wm0wJoRT##9m4V0_7HQHnYq8%p$_g?w8%H%|Q6dXVgluyq*~UI+ z%*>1qZ%CtAm={3emC-~mT;jikWl_5*lkH-E6q3P`LQ-R3(1~tM`28ocDR&=e*~9P(T3%6i~qb9fp6qVP$1SS?k);($a_KUz30j3V{6s$P%(K0gd)G|s=eXs6mfH3-vC;8<3F2WwY8xE z5eLUcdAYR(NEPLjo)98(3YeUl7O`tbJ%Aw3hKWkd;78AMscMRf0I;~-ls>hc=Y5^JV^GO! zYaASE^BMpi0r>pA4h10eYidDLqX%cT1822^rbZ6{LxGT(Kl$oj0AlC9XSlbA`06SE ziDZ&QGRfl145o5phBLJ_4i3N4E{;SvaB!zfv02T`%}0d*6)LGZXS14x6P?~804yxU z0J!nh7Zk0m@Mwhz+-|mSs}p(D{z<SH8X%+Pg` zU~_Yd1W>(DiB)pDEVJO;Dy+YMGos6x^=FiREnD9{0l@Obi&WYr?6NGnU)y-OFx=Y0 z?S%yr_wE7Ewfv|48m6PG`+a3%{5k-x2lv@%F;i)m0Qh6}p9<7(c3IZ#zw}~bM$ULR z%vEnY0R8^cxdrTPJFL`gdlG<&@$2;aPa8fv`nv9xoL_t(;+74Mu{`)wwmOK1!@BWR zZ#(I^vkFjStuy#7`H)ZCf5l%Uubiq|4#Ir^0000< KMNUMnLSTZnH1^s6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/meta.json new file mode 100644 index 0000000000..95c469307a --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by Jaraten (discord/Github) for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sheep", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/sheep.png b/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/sheep.png new file mode 100644 index 0000000000000000000000000000000000000000..58f2cf719f7dfbae105f483305781579c084a0b7 GIT binary patch literal 2071 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 R4SN6p002ovPDHLkV1kLM`8xmr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Materials/cloth.rsi/cloth_3.png b/Resources/Textures/_CP14/Objects/Materials/cloth.rsi/cloth_3.png new file mode 100644 index 0000000000000000000000000000000000000000..eff2f57ee6614e08acf5cce2b882dfe91b8e0eae GIT binary patch literal 545 zcmV++0^a?JP)Px$+et)0R9J=Wm9a|#Q5?s=Qo}(FO;HG;h?b6lLPU*C3L&*L6tuVn5(t6R;^g9g z;i5_5wFFjkL8FQ-$4!S+G!(q0UPJtj-|6X{7DaI1<&Jmn-sk)KzTdk8JbCi;Ln>FQ zvaRW|T&c=G0k<_>3L&Hr;&)8gf$6@j>8=e-jssqfClHvMHODlgi@@A0?(c4ac;f5o zQod2Z0Knk{){L$>@BZ!Xf$rHzPf_P=O>(=Um&x;hl9f-e7t{PZ8d?+{vM)> z5es-`dI~SEZ@9X?#=PI}sv&I?;IZd(SpX^u#gc8sBszkmPx#{YgYYR9J=W)UiqfK@bMu|I+9aBmqIL2_$ygq!987R@&SX+$(4y2&rtum$)XW zdr&MD zz(mAE#7BcetlvLdzaeVi>gFEK2Tq55_`1RT_6`T9XDC*yMDkv1M8t7==K~juB|9Hl z#}5b+C>BcwfS2bd#M73Qq_(U9TUPLO0|4-K16x)&nT#+_k45o|b|6k2Q+Ty+NlfNX z8_0~|kH?3vscl(detnq$Kz4DSI3L8j@FV$b%9$}c1-7S`rqRjwKjGhtE2Y$4+W-ir Ve;^-^rbPe%002ovPDHLkV1n|shZ6t* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Materials/string.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Materials/string.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6341b2e7bb13c4b46e8a7a8dcdfe2a1140948e62 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CVIL!hE&XX zdvhaivjY$7h1p$wwKE#~1UIqp^0;))I5aodWoE*HpTE{mvf*5 zq*Pno@9+EhlJDoBya&79YARhSj0L!K!21VBG_~}!5}Ks+C|z98KlysI@Cd^yMsFV2NeH+|G-iF2Re2V z9NZk*4q~l>7KuYZnh2#zFb?fqFPBR#v4caNDb3wIAMg8K3PgwyAp}mga_*?O#={)C zzHj4jeRU)zl&}X)%L!a7CbK?snQ~UW0 z%aNK0Wq^uPklr(`N{|tmiJ@8`mXs0_&V*?>9%0d7P|Kth5KGFFQNs9Ce|{TpUp@|* zIav#Q71-Bxx3s;;e&1ZZqT1|0QxzmN2mYApt49mgMaRKGMitntn1u<>D zPrhIy(<5!QzkgZsR{NWY4KlU4lS64b4zpg9?(>v{rYEU1%z6zEPj*-2#r7o>!S_Ei zKM4R>E6f1^PR}3N+Q1<+EQh5hsWeCm%=umIeV{0X#tj@5)>H*VRZwkqeES2xgr6TR zW@I@L^N1P3#8VOR-t*7ZW@oq|1iGn7D$Pvrkfo;Y`Dp7&69;_(DLjkxz8~x^u~yhd z6PFjy9)aJ?0N%0>GT~b&CbRBFeg=Aeg&E+7Nb6lI9-_dX{tM{gjrL!Kz}MhM6l^{1%p(fwq2y{kU=V4v_l<)x;v<&e?ajM_zxV#f1qP0 z!NILV+d-@!phe;kkfuVZ5{yH8*URNnOYI`$nbO?d^YOm#r9glH0RsF-oNVQsNpVe$ zbLjf6gTsy0iI`BvJ!o3C?^-dD^_VL^R70}8(wC#4n8-Sss(;|DQVH$rx&r`)U`kU5 z`3%dJni$If6{jHmXId3MBQg^swLmN>B_x~))3RN{qCvlwNh=_hlqaKvk=eogKD>Q- zIArEzE$~!eU)P<|_7eMjbM=Z^vkOgCkeHvArXYer)3RA&qAD;f8%M|MDDPE0XQeF& zYq0_OVjG!0X@9Hp&62k|-%MbQSu_e5UWo`fR! z{%2w{0D!gi1pvV5`6F8!I)sL0v-BjD21$WAzpcLy6{XO)fuq8js(`2pYR#@^zweju z^P|O#B;#S1m?2C&6%p?}|6FT!M;k(*mzt!~%mfcvYH0eNzn(O)-xrX=wMg&#!R|6^ zMcZiN^5WSg@S7RHUG`xnJPXA{)+ywp(DN(I06#=p|61`71^)D3Ko1x4Q6%GGmVOkn lao|hDrvf`HL#YQ{DvxMuEuYADzO z_vLmwq;o*}o%1&mf0tvDKfr8gJ@u=O;esa2spwy2m%vz)bLo^EHE zG|PGR{2_bows)|D38YzGs8W#XMOadaqk6#4?ecs{KRtl~OU@90w)=Tws3o*@=7=VUJfV0B- z;2Dq6dFl^CCP-hn$>`Xm74E zN{61#y?z{GM*b5b40vCH(TX>_OEgSE|L~Y6j~l#ue^w|CW+V{e*GB(6o)FR0F$U1y zT%~__?1{rY6Sxicgi8uQu=>AlV3wgjxv(lKD*h=y09Wke8!?S51ONa407*qoM6N<$ Ef*dH`F#rGn delta 462 zcmV;<0Wton1gZp(ItIOJ8$lF>kw7qipGL)|aO0IhBxZ?IC|8-CnU(D%5D5FhHuJOR z+;eAlprWFpqN1YWAM>DW;#F(?#vS{3`q^9m_VtS!fc+1jO5ZgLRVKcc%o9g7XJ%r` zXhl;i;;2S%Fb*2KE8a#C2e`;`fT@_!8;mhpk^Y<)e#c0ufr~6J2pFxVW^8kRf@|ik zhJr0{Uv9TUs<(}Vj7l-~*g?PV8FHIkz-WchilgCIdV?_lTTdgJS{2%3i;9^v%UMh2 z>2{V$vz%woAF|hOdj~t1K$_)+Dg~)tge8?YsuxVbB(;t0M>I@Aw*x2VqhOo71nj=q zRZ1dFt!ORQiK7~qcrQn(Xrh*}4y;MK95Yt?V0ce;6 zI4i6Vo&iZA6q$&KkhH-blYMgw6X9=Hm!*bF6A%*;nIs~#7V7|&GExl zV*u^VRr-g=o;chyf!lCTxTF9CtN-f;W*PdE3+w;p2L|%64R-(l diff --git a/Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json index c04b08fbf7..4f73de375c 100644 --- a/Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "Created by TheShuEd (github) for CrystallPunk14", + "copyright": "Created by omsoyk (Github/Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1e13cde5f96835fc6d4639680fb14efb0510f368 GIT binary patch literal 367 zcmV-#0g(QQP)Px$DM>^@R9J=WlCev}Kp4f}i9@pFFK{XCQbR=t7hN1gLFj+buCCHaDN^Yo?bx+{ zfbKmwIB{@EmJEuebV&%ML-#Dn_Blw3)T(FgB;Rj3xZ}Nd@B09TVHoDWp>#l#>5L}R z8LeGB7jCwD-tG9ni;fz1E<``&G<0{t~KQYtX@Am6Q(1-QL3eokWtQ;;V+1 zAxs}O+dVjzJ^$TcAOQf^trl|gtIKm^y_EtyJv~fQZ1O!Rd{2tp9C&XcibF(kh|zEi$FhI52b;!GmvDBvztCWnqBumc zP(r8MCzFvFH;`nhP&y!`14^<~d^QJsPl}_HV-dySd`B3DVHoBo-T+E4i8KpFz$5?w N002ovPDHLkV1k~notOXs literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e6c879cb2714a7211edda95dc933d0004335c661 GIT binary patch literal 387 zcmV-}0et?6P)Px$JxN4CRCt{2+ObN*P!z`T6Y(V+L`0WTx=VF%5I5hTUAuQ`>DEoB(zR=gK0u++ z2hgQMOH1jXqTvpCjO!p5LZO1`Ig;T2x94!~$q9jc5di=I0000${!}mTyjAT3i=vth zce;JKzP*XG>TNR_z}e}!dd+&RX|e_C1E|-UzFaA()w{Z=diVP2hohd!7N`$kIO;{~ z)kY@M+1__7c8Omu<{EA7Wbz1zh%6U#iCvO;2(e52)8km$twyA|QQHnJik2%SX}21Y z$iT-g@h8Vezh2)g*W||i!@%sd1poj500000$g9{TexGdMFPP*4Ar&gZw|(^nLx`D9 zbG}0o9buz#J6y{wKW#Fd`LJo7Za;IKd`|HP>C|bx+K7nA`^THSJdX=^78PORto|P; hgnxZ_0000Wn=e`zWVPR>#B=}v002ovPDHLkV1mO6t@r={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..bc194a49f354b29bc0716dd0798bbb58e06a2f86 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z{XAV9Ln`LH zy=CZq*g@pLNAZu|79!fW7Ph>ZWMR<}y{~ayYDSuJ%_XFJ zO|=fZJb5#YbLz`)&+?X^HPUK$ZCcLvCtB_D#L0X2t?VwouW^4ZYsVv(wbQa^`naF_ z_i}2w;e5|oPouj(Br{&p3Ge=SCN501aPP7bYu)ERUmjh-A-yzm-8*@?sU02r!dk!9 ztPX?N4)n4pP=@RO_5c2hECK`PXb1{kUbb8_`>o#I;Nx4BvkmRPD~Fxl+R<@Es?^;j zw8S7FaJ=4_E~@!EbicKy%7|J9ea tz4SkDO*)_>Z)*742Q8tYmii!T6Bd`-W#)P(+F5jfxSpo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/meta.json new file mode 100644 index 0000000000..3823b452b3 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/scissors.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by Omsoyk for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/migration.yml b/Resources/migration.yml index 9eb573946c..c03ea7cd64 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -40,6 +40,7 @@ CP14SeedbedDefault: CP14SeedbedWooden # 2024-08-24 CP14DungeonEntrance: CP14DungeonEntranceAutoLink CP14DungeonExit: CP14DungeonExitAutoLink +CP14Nail110: CP14Nail10 # <---> CrystallPunk migration zone end