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/_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/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/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..c87ca6a983 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -33,22 +33,33 @@ - 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 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/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/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/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/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 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 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/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/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/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/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/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 5f8d372ba2..a991d3546e 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 @@ -290,6 +296,7 @@ - CP14ClothingCottonWhiteCollarDress - CP14ClothinGreenBeltDress - CP14ClothinGreenBeltDress2 + - CP14ClothinGreenLightDress - CP14ClothingShirtCottonYellow - CP14ClothingShirtCottonYellowCollar - CP14ClothingCottonYellowCollarDress @@ -395,6 +402,11 @@ equipment: shirt: CP14ClothinGreenBeltDress2 +- type: loadout + id: CP14ClothinGreenLightDress + equipment: + shirt: CP14ClothinGreenLightDress + - type: loadout id: CP14ClothingShirtCottonYellow equipment: 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/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/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/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 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 0000000000..93e53d9bc5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/equipped-CLOAK.png differ 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 0000000000..69e076472b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/insulated_mantle.rsi/icon.png differ 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 + } + ] +} 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 0000000000..7c91d2b3e6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/icon.png new file mode 100644 index 0000000000..8443ab24d2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi/icon.png differ 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 + } + ] +} 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 0000000000..1b934c3201 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/icon.png differ 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 0000000000..51ffa308d2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/inhand-left.png differ 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 0000000000..9d125f0147 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/meta.json new file mode 100644 index 0000000000..c2bddb9048 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Rod/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": "tail" + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/tail.png b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/tail.png new file mode 100644 index 0000000000..96195c746f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Rod/arrow.rsi/tail.png differ 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 0000000000..bf5ae60899 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/icon.png differ 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 0000000000..eef583121b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/inhand-right.png new file mode 100644 index 0000000000..eab545628a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/inhand-right.png differ 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 0000000000..20e77e7f1f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Tip/arrow.rsi/solution1.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 3e62834fcf..05a74c68d9 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -253,6 +253,14 @@ CP14WoodenClosetBankerFilled: CP14WoodenClosetMerchantFilled C14IronCabinet: CP14IronCabinet C14IronCabinetCargo: CP14IronCabinetCargo +#2025-16-02 +CP14Arrow: CP14ModularIronArrow +CP14ClothingBeltQuiverArrow: CP14ClothingBeltQuiverIronArrow + +#2025-17-02 +CP14Crossbolt: CP14CrossboltIron + + # <---> CrystallEdge migration zone end