From 275cff86b729ef1aab292f472f8a90ba06afdc4b Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Wed, 19 Feb 2025 21:15:39 +0200 Subject: [PATCH 1/7] New crossbolt (#912) * bolt * eee * closets --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../_CP14/Catalog/Fills/closets.yml | 2 +- .../_CP14/Entities/Clothing/Belt/quiver.yml | 4 +- .../Ranged/Ammunition/crossbowBolts.yml | 83 ++++++++++++++++++- .../_CP14/Recipes/Workbench/Anvil/misc.yml | 43 +++++++++- Resources/migration.yml | 4 + 5 files changed, 127 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index 030756e360..14b76ccbf2 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -141,7 +141,7 @@ - id: CP14ModularGripIronLongGuard amount: 2 - id: CP14BaseLightCrossbow - - id: CP14Crossbolt + - id: CP14CrossboltIron amount: 5 - id: CP14EnergyCrystalSmall - id: CP14CrystalLampBlueEmpty diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml index 6bdd81595b..a42e52c6cc 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -46,9 +46,9 @@ parent: CP14ClothingBeltQuiver id: CP14ClothingBeltQuiverCrossbolt categories: [ ForkFiltered ] - suffix: Full. Crossbolt + suffix: Full. Iron. Crossbolt components: - type: StorageFill contents: - - id: CP14Crossbolt + - id: CP14CrossboltIron amount: 32 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml index 6233a28559..f907b19273 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml @@ -13,10 +13,10 @@ - CP14CrossbowBolt - type: entity - id: CP14Crossbolt + id: CP14CrossboltIron parent: CP14BaseCrossbolt - name: crossbow bolt - description: Rod with a sharpened spike. No plumage, they're not bows. + name: iron crossbow bolt + description: Rod with a pointed spike in iron. No plumage, they're not bows. components: - type: Projectile deleteOnCollide: false @@ -30,4 +30,79 @@ - state: rod - state: solution1 map: ["enum.SolutionContainerLayers.Fill"] - visible: false \ No newline at end of file + visible: false + - type: CP14Material + materials: + CP14Iron: 3 + +- type: entity + id: CP14CrossboltGold + parent: CP14BaseCrossbolt + name: gold crossbow bolt + description: Rod with a pointed spike in gold. No plumage, they're not bows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 15 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: rod + color: "#ffaf47" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14Material + materials: + CP14Gold: 3 + +- type: entity + id: CP14CrossboltCopper + parent: CP14BaseCrossbolt + name: copper crossbow bolt + description: Rod with a pointed spike in copper. No plumage, they're not bows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 15 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: rod + color: "#bd712f" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14Material + materials: + CP14Copper: 3 + +- type: entity + id: CP14CrossboltMithril + parent: CP14BaseCrossbolt + name: mithril crossbow bolt + description: Rod with a pointed spike in mithril. No plumage, they're not bows. + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 25 + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi + layers: + - state: rod + color: "#45d2a4" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14Material + materials: + CP14Mithril: 3 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index 41fd1b4b53..903f6fb41e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -149,7 +149,7 @@ result: CP14ClothingOuterClothingCopperArmor - type: CP14Recipe - id: CP14Crossbolt + id: CP14CrossboltCopper tag: CP14RecipeAnvil craftTime: 1 requirements: @@ -158,7 +158,46 @@ count: 1 - !type:KnowledgeRequired knowledge: MetallForging - result: CP14Crossbolt + result: CP14CrossboltCopper + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltIron + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14CrossboltIron + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltGold + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14CrossboltGold + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltMithril + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14CrossboltMithril resultCount: 3 - type: CP14Recipe diff --git a/Resources/migration.yml b/Resources/migration.yml index 3e62834fcf..b772e730f9 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -253,6 +253,10 @@ CP14WoodenClosetBankerFilled: CP14WoodenClosetMerchantFilled C14IronCabinet: CP14IronCabinet C14IronCabinetCargo: CP14IronCabinetCargo +#2025-17-02 +CP14Crossbolt: CP14CrossboltIron + + # <---> CrystallEdge migration zone end From dfd1603b6479cd34acf557525c5c1141645deb7f Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Wed, 19 Feb 2025 21:16:35 +0200 Subject: [PATCH 2/7] meat and damag (#916) Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../_CP14/Entities/Mobs/NPC/animals.yml | 9 ++-- .../_CP14/Entities/Mobs/NPC/dinosaurs.yml | 2 +- .../_CP14/Entities/Mobs/NPC/mole.yml | 4 +- .../_CP14/Entities/Mobs/Species/dwarf.yml | 2 +- .../_CP14/Entities/Mobs/Species/elf.yml | 4 +- .../_CP14/Entities/Mobs/Species/goblin.yml | 4 +- .../_CP14/Entities/Mobs/Species/human.yml | 2 +- .../_CP14/Entities/Mobs/Species/silva.yml | 2 +- .../_CP14/Entities/Mobs/Species/tiefling.yml | 2 +- .../Prototypes/_CP14/Entities/Mobs/base.yml | 47 +++++++++++++++++++ 10 files changed, 64 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml index ab0e114957..8108ae1d2b 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml @@ -1,6 +1,6 @@ - type: entity id: CP14MobRabbit - parent: SimpleMobBase + parent: CP14SimpleMobBase name: rabbit description: A little fluffy rabbit. I could eat it. categories: [ ForkFiltered ] @@ -46,6 +46,9 @@ thresholds: 0: Alive 30: Dead + - type: FireVisuals + sprite: Mobs/Effects/onfire.rsi + normalState: Mouse_burning - type: CombatMode - type: MeleeWeapon angle: 0 @@ -79,7 +82,7 @@ - type: entity id: CP14MobPig - parent: SimpleMobBase + parent: CP14SimpleMobBase name: pig description: An omnivorous and unpretentious animal that is sure to make juicy cuts of meat. categories: [ ForkFiltered ] @@ -224,7 +227,7 @@ - type: entity name: frog - parent: SimpleMobBase + parent: CP14SimpleMobBase id: CP14MobFrog description: Green and constantly jumping frog, and perhaps thanks to it mosquitoes have not completely filled the marshes. categories: [ ForkFiltered ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml index 40ef80541a..8eb3500849 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml @@ -1,6 +1,6 @@ - type: entity id: CP14MobDino - parent: SimpleMobBase + parent: CP14SimpleMobBase name: dino abstract: true components: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml index 2cce6f473b..794e4f59ca 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml @@ -1,6 +1,6 @@ - type: entity id: CP14MobMonsterMole - parent: SimpleMobBase + parent: CP14SimpleMobBase name: predatory mole description: Hunts in the dark and loves the taste of meat and blood in its mouth. categories: [ ForkFiltered ] @@ -100,4 +100,4 @@ - FootstepSound - CP14Mosquito - type: StealTarget - stealGroup: CP14Mole \ No newline at end of file + stealGroup: CP14Mole diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml index 06349c5930..8a0409876a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml @@ -18,7 +18,7 @@ - type: Butcherable butcheringType: Spike spawned: - - id: FoodMeatHuman + - id: CP14FoodMeatHuman amount: 5 - type: Body prototype: CP14Dwarf diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml index fa9a8ac705..116f7d0f96 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml @@ -18,8 +18,8 @@ - type: Butcherable butcheringType: Spike spawned: - - id: FoodMeatHuman - amount: 5 + - id: CP14FoodMeatHuman + amount: 4 - type: Body prototype: CP14Elf requiredLegs: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index 719d5dc742..ada22c8cc4 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -23,8 +23,8 @@ - type: Butcherable butcheringType: Spike spawned: - - id: FoodMeatHuman - amount: 5 + - id: CP14FoodMeatHuman + amount: 3 - type: Body prototype: CP14Human requiredLegs: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index b0dfe08ca4..9ac0436b6c 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -18,7 +18,7 @@ - type: Butcherable butcheringType: Spike spawned: - - id: FoodMeatHuman + - id: CP14FoodMeatHuman amount: 5 - type: Body prototype: CP14Human diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml index e73db860fd..69f712fe4d 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml @@ -67,7 +67,7 @@ - type: Butcherable butcheringType: Spike spawned: - - id: FoodMeatHuman + - id: CP14FoodMeatHuman # Replace it with silva meat, heh. amount: 5 - type: CP14MagicEnergyPhotosynthesis # Silva special feature - type: CP14SpellStorage diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index 0466bca324..2b60a820f3 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -18,7 +18,7 @@ - type: Butcherable butcheringType: Spike spawned: - - id: FoodMeatHuman + - id: CP14FoodMeatHuman amount: 5 - type: Body prototype: CP14Tiefling diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/base.yml index 59dc23142d..84ef1f7143 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/base.yml @@ -28,3 +28,50 @@ - !type:PlaySoundBehavior sound: collection: MeatLaserImpact + +- type: entity + parent: + - CP14MobDamageable + - MobRespirator + - MobAtmosStandard + - SimpleSpaceMobBase + id: CP14SimpleMobBase + suffix: AI + abstract: true + components: + - type: Hunger + thresholds: + Overfed: 100 + Okay: 50 + Peckish: 25 + Starving: 10 + Dead: 0 + baseDecayRate: 0.00925925925926 + - type: Thirst + thresholds: + OverHydrated: 200 + Okay: 150 + Thirsty: 100 + Parched: 50 + Dead: 0 + baseDecayRate: 0.04 + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - Stutter + - Electrocution + - ForcedSleep + - TemporaryBlindness + - Pacified + - StaminaModifier + - Flashed + - RadiationProtection + - Drowsiness + - Adrenaline + - type: Bloodstream + bloodMaxVolume: 150 + - type: MobPrice + price: 150 + - type: FloatingVisuals From 88462e5a1b948ba1d4a48291abb75dd680a425f9 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Wed, 19 Feb 2025 21:36:21 +0200 Subject: [PATCH 3/7] Modular arrows (#906) * arrow * sprite * slots * migration * fix * fix2 * del --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Locale/en-US/_CP14/modularCraft/slots.ftl | 4 +- .../Locale/ru-RU/_CP14/modularCraft/slots.ftl | 4 +- .../_CP14/Entities/Clothing/Belt/quiver.yml | 17 ++- .../Objects/ModularTools/Tip/arrows.yml | 88 ++++++++++++++++ .../Entities/Objects/ModularTools/grips.yml | 2 +- .../Entities/Objects/ModularTools/rod.yml | 99 ++++++++++++++++++ .../Objects/Weapons/ModularPresets/arrow.yml | 33 ++++++ .../Weapons/Ranged/Ammunition/arrows.yml | 31 ------ .../_CP14/ModularCraft/Tip/arrow.yml | 96 +++++++++++++++++ .../ModularCraft/baseModularModifier.yml | 26 ++++- .../Prototypes/_CP14/ModularCraft/slots.yml | 10 +- .../Recipes/Workbench/Anvil/modular_tip.yml | 54 ++++++++++ .../_CP14/Recipes/Workbench/workbench.yml | 14 ++- .../ModularTools/Rod/arrow.rsi/icon.png | Bin 0 -> 219 bytes .../Rod/arrow.rsi/inhand-left.png | Bin 0 -> 241 bytes .../Rod/arrow.rsi/inhand-right.png | Bin 0 -> 244 bytes .../ModularTools/Rod/arrow.rsi/meta.json | 25 +++++ .../ModularTools/Rod/arrow.rsi/tail.png | Bin 0 -> 209 bytes .../ModularTools/Tip/arrow.rsi/icon.png | Bin 0 -> 224 bytes .../Tip/arrow.rsi/inhand-left.png | Bin 0 -> 241 bytes .../Tip/arrow.rsi/inhand-right.png | Bin 0 -> 244 bytes .../ModularTools/Tip/arrow.rsi/meta.json | 25 +++++ .../ModularTools/Tip/arrow.rsi/solution1.png | Bin 0 -> 131 bytes Resources/migration.yml | 4 + 24 files changed, 490 insertions(+), 42 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/tail.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/solution1.png diff --git a/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl b/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl index 3deaaed820..9314098fe9 100644 --- a/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl +++ b/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl @@ -1,3 +1,5 @@ cp14-modular-slot-blade = blade cp14-modular-slot-garde = garde -cp14-modular-slot-blade-inlay = blade inlay \ No newline at end of file +cp14-modular-slot-blade-inlay = blade inlay +cp14-modular-slot-rod = rod +cp14-modular-slot-arrow-tip = arrow tip diff --git a/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl b/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl index 8fe7a523ce..62102a2d1c 100644 --- a/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl +++ b/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl @@ -1,3 +1,5 @@ cp14-modular-slot-blade = лезвие cp14-modular-slot-garde = гарда -cp14-modular-slot-blade-inlay = инкрустация лезвия \ No newline at end of file +cp14-modular-slot-blade-inlay = инкрустация лезвия +cp14-modular-slot-rod = древко +cp14-modular-slot-arrow-tip = наконечник стрелы diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml index a42e52c6cc..c87ca6a983 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -33,13 +33,24 @@ - type: entity parent: CP14ClothingBeltQuiver - id: CP14ClothingBeltQuiverArrow + id: CP14ClothingBeltQuiverIronArrow categories: [ ForkFiltered ] - suffix: Full. Arrow + suffix: Full. Iron. Arrow components: - type: StorageFill contents: - - id: CP14Arrow + - id: CP14ModularIronArrow + amount: 16 + +- type: entity + parent: CP14ClothingBeltQuiver + id: CP14ClothingBeltQuiverMithrilArrow + categories: [ ForkFiltered ] + suffix: Full. Mithril. Arrow + components: + - type: StorageFill + contents: + - id: CP14ModularMithrilArrow amount: 16 - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml new file mode 100644 index 0000000000..73c9439010 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml @@ -0,0 +1,88 @@ +- type: entity + parent: BaseItem + id: CP14ModularBladeTipBase + categories: [ ForkFiltered ] + abstract: true + description: The tip on an arrow shaft, a well-finished little piece of metal. + components: + - type: Item + storedRotation: 0 + +- type: entity + parent: CP14ModularBladeTipBase + id: CP14ModularTipIronArrow + name: iron tip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi + layers: + - state: icon + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14ModularCraftPart + possibleParts: + - TipIronArrow + - type: CP14Material + materials: + CP14Iron: 2 + +- type: entity + parent: CP14ModularBladeTipBase + id: CP14ModularTipGoldArrow + name: golden tip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi + layers: + - state: icon + color: "#ffaf47" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14ModularCraftPart + possibleParts: + - TipGoldArrow + - type: CP14Material + materials: + CP14Gold: 2 + +- type: entity + parent: CP14ModularBladeTipBase + id: CP14ModularTipCopperArrow + name: copper tip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi + layers: + - state: icon + color: "#bd712f" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14ModularCraftPart + possibleParts: + - TipCopperArrow + - type: CP14Material + materials: + CP14Copper: 2 + +- type: entity + parent: CP14ModularBladeTipBase + id: CP14ModularTipMithrilArrow + name: mithril tip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi + layers: + - state: icon + color: "#45d2a4" + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: CP14ModularCraftPart + possibleParts: + - TipMithrilArrow + - type: CP14Material + materials: + CP14Mithril: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml index 1523a71695..2b9a8badc5 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml @@ -387,4 +387,4 @@ collection: MetalBreak - !type:CP14ModularDisassembleBehavior - !type:DoActsBehavior - acts: ["Destruction"] \ No newline at end of file + acts: ["Destruction"] diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml new file mode 100644 index 0000000000..1b05fbb1bf --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml @@ -0,0 +1,99 @@ +- type: entity + parent: CP14ModularGripBase + id: CP14ModularRod + abstract: true + description: A thin shaft of wood, the most important part of the future arrow. + components: + - type: CP14ModularCraftStartPoint + startSlots: + - ArrowTip + - type: Item + storedRotation: 0 + - type: MeleeWeapon + resetOnHandSelected: false #Fast swap + range: 1.0 # 1.5 standart + cPAnimationOffset: -0.75 #-1 standart + attackRate: 1 # 1 standart + - type: Clothing + slots: + - belt + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.2 + density: 5 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.1,-0.1,0.1,0.1" + hard: false + mask: + - Impassable + - BulletImpassable + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + embedOnThrow: false + - type: ThrowingAngle + angle: 0 + - type: Ammo + muzzleFlash: null + - type: Tag + tags: + - CP14Arrow + +# Rod +- type: entity + parent: CP14ModularRod + id: CP14ModularRodWooden + name: wooden grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Rod/arrow.rsi + layers: + - state: tail + - state: icon + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularRodWooden + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + +- type: entity + parent: CP14ModularRod + id: CP14ModularRodLucens + name: lucens grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Rod/arrow.rsi + layers: + - state: tail + - state: icon + color: "#0398fc" + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularRodLucens + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 45 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml new file mode 100644 index 0000000000..47ffda7e2e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml @@ -0,0 +1,33 @@ +- type: entity + id: CP14ModularIronArrow + parent: CP14ModularRodWooden + name: iron arrow + description: Standard arrow, balance between damage and reliability. + components: + - type: Sprite + layers: + - state: icon + - state: tail + - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - TipIronArrow + +- type: entity + id: CP14ModularMithrilArrow + parent: CP14ModularRodLucens + name: mithril arrow + description: An arrow made of expensive wood and magical iron, you shoot money, but the damage matches. + components: + - type: Sprite + layers: + - state: icon + color: "#0398fc" + - state: tail + - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi + state: icon + color: "#45d2a4" + - type: CP14ModularCraftAutoAssemble + details: + - TipMithrilArrow diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml deleted file mode 100644 index e2fc06b480..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: entity - parent: BaseArrow - id: CP14BaseArrow - categories: [ ForkFiltered ] - abstract: true - components: - - type: Tag - tags: - - CP14Arrow - -- type: entity - id: CP14Arrow - parent: CP14BaseArrow - name: arrow - description: Wooden rod with iron tip and plumage. Simple and dangerous. - components: - - type: Projectile - deleteOnCollide: false - onlyCollideWhenShot: true - damage: - types: - Piercing: 25 - - type: Sprite - sprite: _CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi - layers: - - state: tail - - state: rod - - state: tip - - state: solution1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false diff --git a/Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml b/Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml new file mode 100644 index 0000000000..7e34b8db6a --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml @@ -0,0 +1,96 @@ +- type: modularPart + id: BaseTipArrow + modifiers: + - !type:Inherit + copyFrom: + - BaseWeaponRangedChemical + - !type:EditMeleeWeapon + resetOnHandSelected: true # Disable fast swap + attackRateMultiplier: 1.4 + bonusDamage: + types: + Piercing: 3 + - !type:EditItem + newSize: Small + - !type:EditModularSlots + addSlots: + - Rod + +- type: modularPart + id: TipIronArrow + slots: + - ArrowTip + rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseTipArrow + - BaseBladeIron + - !type:AddComponents + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 25 + +- type: modularPart + id: TipGoldArrow + slots: + - ArrowTip + rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi + color: "#ffaf47" + modifiers: + - !type:Inherit + copyFrom: + - BaseTipArrow + - BaseBladeGold + - !type:AddComponents + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 15 + +- type: modularPart + id: TipCopperArrow + slots: + - ArrowTip + rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi + color: "#bd712f" + modifiers: + - !type:Inherit + copyFrom: + - BaseTipArrow + - BaseBladeCopper + - !type:AddComponents + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 15 + +- type: modularPart + id: TipMithrilArrow + slots: + - ArrowTip + rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi + color: "#45d2a4" + modifiers: + - !type:Inherit + copyFrom: + - BaseTipArrow + - BaseBladeMithril + - !type:AddComponents + components: + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Piercing: 30 diff --git a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml index 08b08f9bc6..47cbc5507c 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml @@ -65,4 +65,28 @@ - type: Utensil types: - Knife - - type: CP14WallpaperRemover \ No newline at end of file + - type: CP14WallpaperRemover + +- type: modularPart + id: BaseWeaponRangedChemical + modifiers: + - !type:AddComponents + components: + - type: SolutionContainerManager + solutions: + ammo: + maxVol: 2 + - type: MeleeChemicalInjector + solution: ammo + - type: RefillableSolution + solution: ammo + - type: InjectableSolution + solution: ammo + - type: SolutionInjectOnEmbed + transferAmount: 2 + solution: ammo + - type: SolutionTransfer + maxTransferAmount: 2 + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: solution diff --git a/Resources/Prototypes/_CP14/ModularCraft/slots.yml b/Resources/Prototypes/_CP14/ModularCraft/slots.yml index 3a258ccc0d..8f0ba7a5f1 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/slots.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/slots.yml @@ -8,4 +8,12 @@ - type: modularSlot id: BladeInlay - name: cp14-modular-slot-blade-inlay \ No newline at end of file + name: cp14-modular-slot-blade-inlay + +- type: modularSlot + id: Rod + name: cp14-modular-slot-rod + +- type: modularSlot + id: ArrowTip + name: cp14-modular-slot-arrow-tip diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml new file mode 100644 index 0000000000..2ad569dc93 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml @@ -0,0 +1,54 @@ + +# Tip + +- type: CP14Recipe + id: CP14ModularTipIronArrow + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularTipIronArrow + resultCount: 4 + +- type: CP14Recipe + id: CP14ModularTipGoldArrow + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularTipGoldArrow + resultCount: 4 + +- type: CP14Recipe + id: CP14ModularTipCopperArrow + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularTipCopperArrow + resultCount: 4 + +- type: CP14Recipe + id: CP14ModularTipMithrilArrow + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + - !type:KnowledgeRequired + knowledge: MetallForging + result: CP14ModularTipMithrilArrow + resultCount: 4 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index 8ed959a6b0..4b5d13f5da 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -127,17 +127,25 @@ result: CP14BowCombat - type: CP14Recipe - id: CP14Arrow + id: CP14ModularRodWooden tag: CP14RecipeWorkbench craftTime: 3 requirements: - !type:StackResource stack: CP14WoodenPlanks count: 1 + result: CP14ModularRodWooden + resultCount: 4 + +- type: CP14Recipe + id: CP14ModularRodLucens + tag: CP14RecipeWorkbench + craftTime: 3 + requirements: - !type:StackResource - stack: CP14IronBar + stack: CP14LucensWoodenPlanks count: 1 - result: CP14Arrow + result: CP14ModularRodLucens resultCount: 4 - type: CP14Recipe diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1b934c32011bcc5358a953fdcb295f4e5e71baf5 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Q$1ZALn2y} z6C_v{H!w|*e0I3SXEO7NYbOpIIPf52>EQ*M%AfCF^lHyB)+jn~*j-fD>EO1e1%l(iP_u% QKnF5-y85}Sb4q9e0BsIVrvLx| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..51ffa308d200d1f16ff52f2096ff0df796c47bc3 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|R(rZQhE&XX zdut=_Ap-%{fNo0-%?8c{CaG6f0xkt@be4LSz@Uz^j^BiOpB=U+AvJ_Eq=ti}W{n zH)L%+Bm3{=Y=ymdKI;Vst0DlZ#Bme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9d125f01471d3a9e7a3f0e6f5a0526726b0371f1 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_J-(hE&XX zduy*?lY;in1qv)czt_cG`3i29FWZ3pz+4x>2tSt75dL+>}~D+cG?K2 z^}*zCb&~&L51ZFsZ&|tV{j9|K&kwJ)Tfd7lG_qyodaZ87HhYEBOeTsE;hd}Y&U;q7 z`Q;ppq@DYQ%wk(^kq@)^<-gI`s2}XYTy$J#j9wt=$c)_ZAEP!nf z&sB|2EUvRwGHR4D@LQigVAT-hu#x!*>ksy8j7gJfm|rt^9bCceCTs9T_QR{6%Nt7% z9Ojn?$}w|US*05)US?+6_SVLBi*un!Pg9`50|th`mEs#pgw#MzW$<+Mb6Mw<&;$T_ Cw?rlY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5ae6089952a3af0eeddf9ebe19a5a9502f2d1d GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}vpiiKLn2y} z6C_v{H!w|*e0I3SXEO7NYbOpIIPf52>EQ*M%7>q1EOp){DPsBH;bL(fCL0+Ze)+u% zj!2wpn7&ZTb>0FGV^fBsd=C=SB_r4axHQTd_AvZEVCCR5DL+BhK~tjizzXKJeavyT z|4laVRs4AP_<&V{gQNTNHUIhL?f>7uX!-hogJsg~bC>^be{16#In{#8?VyIlMFxho XpX8>V7CkKtbR~nQtDnm{r-UW|n;liR literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..eef583121b400fa8a7b5598ea75bf649b0aca494 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|R(rZQhE&XX zdut=_Ap-%{0PW&{AO_(BEGAc0E?lxSsomtvK?aXA2Lb|IJW4nwHOG9p$8hcM#Jzd#YdYU&)e6V(%`Z2I2Y6L8E3x?s{tMmJ*uLuK+G71p z-VIedPssjzIa^_IwbOi-T`~FJPelGp+j0Zkl3PadByn$RaPvmk~^BzpR~P l*Rw44Qmg$!jZ}sM()_(DiW{gTe~DWM4fd9Pp& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/meta.json new file mode 100644 index 0000000000..35e5588787 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by odlieerr (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "solution1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/solution1.png b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/solution1.png new file mode 100644 index 0000000000000000000000000000000000000000..20e77e7f1fc7b0c68a1ff9debea3628881e6ae89 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ww^AIArY-_ z&js=_DDW^}Y@9#SK}2aoxbtU+=>n6g|L5v40afjvyk*YcH(ZrYmkRCO!X47`%#Zak bG)S}h@bMgt-^%k8sD#1O)z4*}Q$iB}(3dB8 literal 0 HcmV?d00001 diff --git a/Resources/migration.yml b/Resources/migration.yml index b772e730f9..05a74c68d9 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -253,6 +253,10 @@ CP14WoodenClosetBankerFilled: CP14WoodenClosetMerchantFilled C14IronCabinet: CP14IronCabinet C14IronCabinetCargo: CP14IronCabinetCargo +#2025-16-02 +CP14Arrow: CP14ModularIronArrow +CP14ClothingBeltQuiverArrow: CP14ClothingBeltQuiverIronArrow + #2025-17-02 CP14Crossbolt: CP14CrossboltIron From b29cfaf2a87271f827ea00e713c2f7bdfe648254 Mon Sep 17 00:00:00 2001 From: creamybag Date: Thu, 20 Feb 2025 02:12:17 +0300 Subject: [PATCH 4/7] Winter is coming... (#918) --- .../Entities/Clothing/Cloak/Roles/general.yml | 13 ++++++++++++- .../_CP14/Loadouts/Jobs/general.yml | 6 ++++++ .../insulated_mantle.rsi/equipped-CLOAK.png | Bin 0 -> 1304 bytes .../General/insulated_mantle.rsi/icon.png | Bin 0 -> 581 bytes .../General/insulated_mantle.rsi/meta.json | 18 ++++++++++++++++++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml index 9799d8c984..352b6a10be 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml @@ -73,4 +73,15 @@ - type: Sprite sprite: _CP14/Clothing/Cloak/Roles/General/fur_coat.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/Roles/General/fur_coat.rsi \ No newline at end of file + sprite: _CP14/Clothing/Cloak/Roles/General/fur_coat.rsi + +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakInsulated + name: insulated mantle + description: Winter is coming... + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 5f8d372ba2..5a35335e4a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -13,6 +13,7 @@ - CP14ClothingCloakGreen - CP14ClothingCloakBlue - CP14ClothingCloakFurCoat + - CP14ClothingCloakInsulated - type: loadout id: CP14ClothingCloakFurcapeBlack @@ -54,6 +55,11 @@ equipment: cloak: CP14ClothingCloakFurCoat +- type: loadout + id: CP14ClothingCloakInsulated + equipment: + cloak: CP14ClothingCloakInsulated + # OuterClothing - type: loadoutGroup diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..93e53d9bc5cf8d748f8d60c5ced3ffa924863e91 GIT binary patch literal 1304 zcmV+z1?T#SP)Px((n&-?RCt{2nr}!OcNoXN88x;^ww0uEHPf0urZ$K@iikmtu)XOkUyK!`Z_;-% z_Ij`(^zE=P_HNQ`^o8w+jZ!faDC8=&+l^24`47D3?^aDN+ACD5fbwY z7#@mI>pwvwH2doUwzpLPKw^0n6Qd*K{f|D?y*x2GLcaNO6m5YPUB+q>%d2P$v_MFv zAS6@phg$XDgk-8f&InYg66AYzkG{kC(dWx0&gASe2D$Gv9y|n z+YKx&&4BZU;Xl_70K^I>X!@t)xAB8;9$$TX3#S`iuLT)dz=ih9$jAbs{V{6&R8v43 zd@z(Vq|WZZbbJT(7rSul*#zqB4(#pj;6nRlq?6Nz2U!VOkqVAoPB&c6Gx~8>-9Sbb zO3Ig`Y!T#p21qEt>&Fcq4o$vJ0DvNjHu1ZMHboR|0MO*?M1zOZWkUfTe9ypvilL@| zaefNX{ur|AMu9EbM$@;fU8E^JFn)~EOUsj}oW25@1mcipl zahliJ9j5M6)&W^{)6`9C>H3<@0IR4u2bfLuQcyc!Z+FL1IV;Iu9gI@e0U22^w5H}G zD^kJQY?g!Qr-3R1N)?mlHh$lA_MpW}qm%<_BTf?lLp7k1SItJN5_NWme(zFKOgk?t zlA$_L_EA_7McX2#3Zh&px>(w2h4XnA1Cu@m0TdCiz z;H@M#yi=YpwJC53W($L@hWx6eC(^)*os;7EUN0 zyw)a9EU)6TuWwt^9nL4eN3Tfh@NkU)a+zVo>sAndFh;b9E7E$w{ski#GJ1F@MzsDr z0H|BJ_jETtyo%4qzsGOCJUJ96bX@8q9}m8ZPj21?065?NuR%K49i)yvVDP2r_|r5x z!cjDFEl{^4L?TxZiCh5yoQig1Y~;G7TVwWPY~(sQ73~H9UB9{|p^0ljM>vZ70MTG5 zVnM!_xSVc%uK)o3eO&#;E_fuR>RHfnsgEd}2d|#Z>hA^tAf22B=M5vPZW`L1LR|y+ zo&nOxHDg^`1CZ;_Ya1sNQM5sP2+`IU)AO$;Ms2LQ=BU+BJHV=T*I{79R+a%rZNO1unFH?MxmUJpV-+5+m)yT|&$9bb zJ0K$qkY84(`)eigOJn;I3}--A-8_!OdmbOoq zo#ThmoxOSEi;_CjEeYu@srq)D^|cc1Q&mO#P+S0y(iR4T!C)|IoPPlDH6`+vDfs*V O0000}urz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..69e076472b1f8e88212dc2878ffdff36907cdadf GIT binary patch literal 581 zcmV-L0=oT)P)Px$|4BqaR9J=Wmd{VqU>L_gESnQGh98zD-4fT5AqKSvLNp*}PWuzMav~&L_#2ED z6Qdj?UgQtpz{wMbVWQbV@GzA`s*%=o%}7I-23DAdg(j7>eFr3(*w3YHp6~m--}iam zzAYpqB>eAmi3*L)w=IAtPoH7gwNr6L9$&@5y~CgfpBJhVGT=G} zPR$OD9~}M)jX5E00000NkvXXu0mjf7B&Mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/meta.json new file mode 100644 index 0000000000..2d6e3d7b23 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Lucson1337", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-CLOAK", + "directions": 4 + } + ] +} From d32ed931b3a2d3c890c5442ad22b270bbd1b2aeb Mon Sep 17 00:00:00 2001 From: creamybag Date: Thu, 20 Feb 2025 15:44:45 +0300 Subject: [PATCH 5/7] lightgreendress (#919) Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Entities/Clothing/Shirt/Roles/general.yml | 10 ++++++++++ .../_CP14/Loadouts/Jobs/general.yml | 6 ++++++ .../light_green_dress.rsi/equipped-SHIRT.png | Bin 0 -> 1272 bytes .../Dress/light_green_dress.rsi/icon.png | Bin 0 -> 651 bytes .../Dress/light_green_dress.rsi/meta.json | 18 ++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index c5e37bcfae..6446fb08c0 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -249,3 +249,13 @@ sprite: _CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi - type: Clothing sprite: _CP14/Clothing/Shirt/Roles/General/Dress/green_belt2_dress.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothinGreenLightDress + name: light green dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 5a35335e4a..a991d3546e 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -296,6 +296,7 @@ - CP14ClothingCottonWhiteCollarDress - CP14ClothinGreenBeltDress - CP14ClothinGreenBeltDress2 + - CP14ClothinGreenLightDress - CP14ClothingShirtCottonYellow - CP14ClothingShirtCottonYellowCollar - CP14ClothingCottonYellowCollarDress @@ -401,6 +402,11 @@ equipment: shirt: CP14ClothinGreenBeltDress2 +- type: loadout + id: CP14ClothinGreenLightDress + equipment: + shirt: CP14ClothinGreenLightDress + - type: loadout id: CP14ClothingShirtCottonYellow equipment: diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..7c91d2b3e6c815059751d776ffd3704a43f617d9 GIT binary patch literal 1272 zcmVPx(vPnciRCt{2nn6e-R~X0tDV2pKV6xy%Ga%WEB!cwf!Lj7lEN#(VR*G9MmQq?P zJ&3U2Nf4GC0(CtU_o9|1y%eFM3m!ss!B7xk4PF|And~jlBrp_853dLJn|(8xB=1dT ztajh;GC01x|NnjO&6_vxdw@crP$(1%#XCx*TY-bAajZrA7yx|n!3@6q{+qVH+01XS z?b8AP;IZ{jB)ePc*9Vt>3ORozgtZrc)Yl3cD--teFi4fl(%-zkOQ3P%Vb!O#ek8Si+f*;O_4&W~GD)o;6{9Jw-!TAn z(?apsu!q&Fm#+Z;`zQdH1zU^^y?Xf?qZ5O6kJL@eN0YnjQv-SY>UW(3mj3*k@%Q41 zsBMU%4!~2ee01h}_!FtgF^B%>#GtKBkOvA7k-K-Nw>f|+0f6jo$u`3eE%z`J5tV_0 zNS#qN8}_5dLq5t!XOV-capC%|qV{})IFU~zgLxw&Oj&4%6UG~wjtma#ZJABssYeV$(QyUqb#G0inSM5+Ir#;rR&nx6BKJNT4wE_2uojR!r+&rH0jZ7OjrJXP~QR9p)WK7 z)}nnZqdS+t^tac2`gjS7F!hB3P&X~ddfRIfqHD!y2L3h(Q(q_mi_`P=DvMu$@J9I6 zSkP~SF!hBe!DlP0sGC-c5ni}%T6ngyDl9HTSo*@Nrp^2Y`)uZ80KkV2rw~s>Q8z97 z`rFUD0DxZ#dmT3|{1TSFl+n%n26Jyl5VR=~M&rZOmp1EV;yN0CQ}h)Ig+ifFC=?3C zJIZE$Ba}_gAPC)?KC3f*R%bUc2%Gs0M*d`eC%hv>X|bV14Ar|QC>`!Ogi42d(&B#5 zXLaVKUA=n(@+ad%==+%(@6O16m-z|+>~Hgh^>0JX50a1dg{J`C<^+By{@CJ8)Q3=J zsBT)0!w<9%H@~`qcp_?-b8k@x4RylQ(yYT9oeAK*iS7&w^%P}gc_VZf!F@m?h%*7* zym;x3P7FGBiA6KTLL(q|?@naNwCv}KHY3SEP{(0JshSN(Z^si+@52!SbqNLFO`6FO z&Cefy!uW(lM%Pd=nkXNgiB#zu>iy!eVc#1{#9E$rk;Vf)v%>)J=%N+@fSr*6mel(3 zV0Z@Se;Ig=U;S1oL}uV4q=z*CS7($SUDP7DsNuQK`lJHjb@XI?;pw%f#{uBM@C@#M zn#S*6KLp_PCX<*I4#1nVbIYXSKBSnM9AjZkgp?xR-nu$4*{PhU2cd<~!PL0pbw})s z3^2;e(G3c<+?w=wSRQUodOR!-w<Px%MM*?KR9J=Wl`&`r=GG$7Zln!Po4#j4ZR);LHpl%W2K8277J%w9JhwD(juctBIT~cTV|I3H(p6~yE z@BZIAm|=z)X86bOIVF5vd(4)9&H`9}l%ig*bN}u=+WnsTZ{*IBb#`%1JRax$NfCf| z=1<>h>G);>BzY(t1fVMhBO)a1`AEkIWcoXSrZU+3g1lRLhG!s5ISV6}8ibYzF#eh&as7`y_?RNlNPGHMFXFW@3BQg1VQe1w#{+a+o zn5sLteE03~wm$T98(ay$h)Q*Y&hE_jY!zSX3L?0TQRJCe4=a liQKb*t3+Ive1`u5zW`7KH)b4-90&ja002ovPDHLkV1hz{Cx8F| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/meta.json new file mode 100644 index 0000000000..7b10adb18c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} From 225d9b27f9299b7d7f7612f638b6f49153d4aec1 Mon Sep 17 00:00:00 2001 From: Deserty0 <86846189+Deserty0@users.noreply.github.com> Date: Fri, 21 Feb 2025 02:21:50 +1000 Subject: [PATCH 6/7] fix (#923) --- Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml index 6a82e5dcce..4ce3865f55 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml @@ -78,6 +78,7 @@ 30: 0.4 - type: StatusEffects allowed: + - Stun - KnockedDown - SlowedDown - Electrocution From b8cc4c8c20ff75388d844856146d82ff68d15550 Mon Sep 17 00:00:00 2001 From: Deserty0 <86846189+Deserty0@users.noreply.github.com> Date: Fri, 21 Feb 2025 02:22:29 +1000 Subject: [PATCH 7/7] Fix (#922) --- .../Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl | 4 ++-- .../_CP14/Entities/Objects/Consumable/Food/meat.yml | 6 +++--- .../Entities/Objects/Specific/Medical/healing.yml | 12 ++++++------ Resources/Prototypes/_CP14/Stacks/medical.yml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 9d17470020..8a05f27764 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -2102,7 +2102,7 @@ ent-CP14SeedTomato = семена помидоров ent-CP14HerbalBandage = травяной бинт .desc = Бинт для перевязки, сплетенная из травы. Не самая надежная и полезная вещь, но лучше, чем ничего. - .suffix = 10 + .suffix = 5 ent-CP14HerbalBandage1 = { ent-CP14HerbalBandage } .desc = { ent-CP14HerbalBandage.desc } @@ -2110,7 +2110,7 @@ ent-CP14HerbalBandage1 = { ent-CP14HerbalBandage } ent-CP14Gauze = марля .desc = Марля из плотной ткани, чтобы предотвратить кровотечение. - .suffix = 10 + .suffix = 5 ent-CP14Gauze1 = { ent-CP14Gauze } .desc = { ent-CP14Gauze.desc } diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml index cee30953fa..a639db9191 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml @@ -70,7 +70,7 @@ count: 3 slice: CP14FoodMeatLambSlice - type: Item - size: Tiny + size: Small shape: - 0,0,1,0 - type: CP14TemperatureTransformation @@ -393,7 +393,7 @@ sprite: _CP14/Objects/Consumable/Food/meat.rsi state: dino_meat2 - type: Item - size: Small + size: Tiny - type: SolutionContainerManager solutions: food: @@ -444,7 +444,7 @@ - state: rabbit_meat1 map: [ "random" ] - type: Item - size: Small + size: Tiny - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Medical/healing.yml index 21b58c3709..5d4a5e65bd 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Medical/healing.yml @@ -3,11 +3,11 @@ parent: BaseItem name: herbal bandage description: A bandage net woven from grass, not the most reliable or useful thing, but better than nothing. - suffix: 10 + suffix: 5 categories: [ ForkFiltered ] components: - type: Item - size: Small + size: Normal - type: Sprite sprite: _CP14/Objects/Specific/Medical/medical.rsi state: herbbandage_3 @@ -32,7 +32,7 @@ path: "/Audio/Items/Medical/brutepack_end.ogg" - type: Stack stackType: CP14HerbalBandage - count: 10 + count: 5 baseLayer: base layerStates: - herbbandage @@ -54,11 +54,11 @@ parent: BaseItem name: gauze description: Dense cloth gauze, to prevent valuable blood from leaking out of the body. - suffix: 10 + suffix: 5 categories: [ ForkFiltered ] components: - type: Item - size: Small + size: Normal - type: Sprite sprite: _CP14/Objects/Specific/Medical/medical.rsi state: bandage_3 @@ -83,7 +83,7 @@ path: "/Audio/Items/Medical/brutepack_end.ogg" - type: Stack stackType: CP14Gauze - count: 10 + count: 5 baseLayer: base layerStates: - bandage diff --git a/Resources/Prototypes/_CP14/Stacks/medical.yml b/Resources/Prototypes/_CP14/Stacks/medical.yml index 5ca31dbb7c..79926e3778 100644 --- a/Resources/Prototypes/_CP14/Stacks/medical.yml +++ b/Resources/Prototypes/_CP14/Stacks/medical.yml @@ -3,11 +3,11 @@ name: cp14-stack-pack-herbal-bandage icon: { sprite: "_CP14/Objects/Specific/Medical/medical.rsi", state: herbbandage_3 } spawn: CP14HerbalBandage - maxCount: 10 + maxCount: 5 - type: stack id: CP14Gauze name: cp14-stack-pack-gauze icon: { sprite: "_CP14/Objects/Specific/Medical/medical.rsi", state: bandage_3 } spawn: CP14Gauze - maxCount: 10 + maxCount: 5