diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 9d37a62118..fecb2caa09 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -2866,6 +2866,15 @@ ent-CP14ModularBladeCopperMace = медный шар булавы ent-CP14ModularBladeMithrilMace = мифриловый шар булавы .desc = { ent-CP14ModularBladeMaceBase.desc } +ent-CP14ModularBladeMopBase = насадка для швабры + .desc = Насадка для швабры без рукояти. Прикрепите ее к рукояти, чтобы сделать швабру. + +ent-CP14ModularBladeWoodMop = насадка для швабры + .desc = { ent-CP14ModularBladeMopBase.desc } + +ent-CP14ModularBladeLucensMop = люценовая насадка для швабры + .desc = { ent-CP14ModularBladeMopBase.desc } + ent-CP14ModularBladePickaxeBase = головка кирки .desc = Массивная острая головка кирки без рукояти. Кузнец может использовать это, чтобы сделать инструмент. @@ -3277,6 +3286,9 @@ ent-CP14RitualChalk = ритуальный мелок ent-CP14Bucket = ведро .desc = Старое скучное ведро +ent-CP14Bucket = люценовая ведро + .desc = Скучное старое ведро, но оно синее. + ent-CP14BaseDemiplaneKey = ключ координат демиплана .desc = Временный сгусток энергии, соединяющий реальный мир и демипланетный. Используйте его, пока он не рассеялся. @@ -4629,7 +4641,7 @@ ent-CP14MagicHealingStaff = посох исцеления ent-CP14BaseShield = щит .desc = Деревянный щит, способный выдержать несколько ударов. -ent-CP14BaseMop = деревянная швабра +ent-CP14ModularWoodMop = деревянная швабра .desc = Швабра для мытья полов от различных неприятных жидкостей ent-CP14BaseWrench = гаечный ключ diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 59feb47008..e674e02856 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -53,7 +53,7 @@ - id: CP14Lighter - id: CP14ModularIronShovel - id: CP14KeyFile - - id: CP14BaseMop + - id: CP14ModularWoodMop - id: CP14LockCopper - id: CP14ModularCopperPickaxe - id: CP14ModularIronSickle diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml new file mode 100644 index 0000000000..38dbf4c7c4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml @@ -0,0 +1,38 @@ +- type: entity + parent: BaseItem + id: CP14ModularBladeMopBase + categories: [ ForkFiltered ] + abstract: true + description: A mop head without a hilt. Attach it to a hilt to make a mop. + components: + - type: Item + storedRotation: 45 + shape: + - 0,0,0,0 + storedOffset: 0, 5 + +- type: entity + parent: CP14ModularBladeMopBase + id: CP14ModularBladeWoodMop + name: wooden mop head + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeWoodMop + +- type: entity + parent: CP14ModularBladeMopBase + id: CP14ModularBladeLucensMop + name: lucens mop head + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeLucensMop diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml index d23f630903..be5b465b1a 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml @@ -1,8 +1,8 @@ - type: entity - name: sack + name: produce sack id: CP14SackFarming parent: BaseStorageItem - description: A bag for various fruits, vegetables, plants and anything else that grows in the bed. + description: A bag for various fruits, vegetables, plants and anything else that grows in the garden. categories: [ ForkFiltered ] components: - type: Sprite @@ -63,8 +63,6 @@ - type: entity id: CP14SackFarmingWheat - name: seed sack - description: Sack for various plant seeds. parent: CP14SackFarming suffix: Wheat components: @@ -82,7 +80,8 @@ - type: entity id: CP14SackFarmingSeed parent: CP14SackFarming - suffix: Seed + name: seed sack + description: A sack for various plant seeds. components: - type: Sprite sprite: _CP14/Objects/Storage/sack.rsi @@ -137,4 +136,3 @@ - id: CP14SeedCotton amount: 1 prob: 0.4 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml index 1e137799f4..b177209a37 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml @@ -17,6 +17,25 @@ visible: false - type: Item size: Ginormous + - type: Clothing + sprite: _CP14/Objects/Tools/wooden_bucket.rsi + clothingVisuals: + head: + - state: equipped-HELMET + equipDelay: 0.25 + unequipDelay: 0.25 + quickEquip: false + breakOnMove: false + slots: + - head + - type: Armor + modifiers: + coefficients: + Blunt: 0.98 + Slash: 0.96 + - type: ClothingSpeedModifier + walkModifier: 0.96 + sprintModifier: 0.80 - type: SolutionContainerManager solutions: bucket: @@ -62,3 +81,20 @@ tags: - Bucket +- type: entity + parent: CP14Bucket + id: CP14BucketLucens + name: lucens bucket + description: It's a boring old bucket, made less boring by being blue. + components: + - type: Sprite + sprite: _CP14/Objects/Tools/lucens_bucket.rsi + - type: Clothing + sprite: _CP14/Objects/Tools/lucens_bucket.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.94 + Slash: 0.93 + - type: ClothingSpeedModifier + walkModifier: 0.98 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml index 6c37509d7f..767ab408a1 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml @@ -33,4 +33,3 @@ Blunt: 0 - type: UseDelay delay: 3 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml deleted file mode 100644 index c2924dec9a..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml +++ /dev/null @@ -1,37 +0,0 @@ -- type: entity - id: CP14BaseMop - parent: - - BaseItem - - CP14BaseWeaponDestructible - name: wooden mop - description: Mop for cleaning floors from various unpleasant liquids - components: - - type: Item - size: Normal - storedRotation: 0 - shape: - - 0,0,0,2 - sprite: _CP14/Objects/Tools/mop.rsi - - type: Sprite - sprite: _CP14/Objects/Tools/mop.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: 10 - damage: - types: - Blunt: 7 - soundHit: - collection: MetalThud - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - types: - Blunt: 3 - - type: Spillable - solution: absorbed - - type: Absorbent - - type: SolutionContainerManager - solutions: - absorbed: - maxVol: 50 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml new file mode 100644 index 0000000000..6f41083150 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml @@ -0,0 +1,14 @@ +- type: entity + id: CP14ModularWoodMop + parent: CP14ModularGripWoodenLong + name: wooden mop + description: A mop for cleaning floors of various unpleasant liquids. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeWoodMop diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml index 5665e58ce9..2f28e2769d 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml @@ -36,6 +36,8 @@ bonusDamage: types: Piercing: 3 + - !type:EditDamageableModifier # Improvised weapon + multiplier: 1.2 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml new file mode 100644 index 0000000000..cb14574735 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml @@ -0,0 +1,67 @@ +# Concept: the mop +# Cleans puddles +# Standard attack speed +# Reasonable blunt damage (mop-fu real) +# Fragile; not a real weapon, should not take the place of one long-term +- type: modularPart + id: BaseBladeMop + modifiers: + - !type:AddComponents + override: true + components: + - type: Spillable + solution: absorbed + - type: Absorbent + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 50 + - !type:EditMeleeWeapon + bonusDamage: + types: + Blunt: 5 + - !type:EditIncreaseDamageOnWield + bonusDamage: + types: + Blunt: 5 + - !type:EditDamageableModifier # Improvised weapon + multiplier: 1.2 + - !type:EditItem + newSize: Normal + adjustShape: 0, 1 + storedOffsetBonus: 0, 5 + - !type:EditModularSlots + addSlots: + - Garde # Remember, Ed asked for this + - BladeInlay # Ed didn't ask for this, but it's REALLY funny + +- type: modularPart + id: BladeWoodMop + slots: + - Blade + rsiPath: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeMop + - BaseBladeIron # TODO wood weapons are planned, revisit this when they're done + - !type:EditDamageableModifier + multiplier: 2 # For now, we treat it as weaker iron + +- type: modularPart + id: BladeLucensMop + slots: + - Blade + rsiPath: _CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeMop + - BaseBladeMithril # TODO wood weapons might mean lucens weapons? + - !type:AddComponents + override: true + components: + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 100 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml index 9b1aa71c42..f5b5c167f6 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml @@ -17,13 +17,15 @@ angleMultiplier: 1.2 bonusDamage: types: - Slash: 2 + Slash: 3 Blunt: 3 - !type:EditIncreaseDamageOnWield bonusDamage: types: Slash: 1 Blunt: 3 + - !type:EditDamageableModifier # Improvised weapon + multiplier: 1.2 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index 44e46aed1d..dd765998a5 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -12,6 +12,20 @@ count: 1 result: CP14Bucket +- type: CP14Recipe + id: CP14BucketLucens + tag: CP14RecipeWorkbench + category: Tools + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14LucensWoodenPlanks + count: 3 + - !type:ProtoIdResource + protoId: CP14Rope + count: 1 + result: CP14BucketLucens + - type: CP14Recipe id: CP14WoodenBeerMug tag: CP14RecipeWorkbench @@ -43,17 +57,32 @@ result: CP14Plate - type: CP14Recipe - id: CP14BaseMop + id: CP14ModularBladeWoodMop tag: CP14RecipeWorkbench - craftTime: 3 + category: Tools + craftTime: 2 requirements: - !type:StackGroupResource group: WoodenPlanks - count: 2 + count: 1 - !type:StackResource stack: CP14Cloth count: 1 - result: CP14BaseMop + result: CP14ModularBladeWoodMop + +- type: CP14Recipe + id: CP14ModularBladeLucensMop + tag: CP14RecipeWorkbench + category: Tools + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14LucensWoodenPlanks + count: 1 + - !type:StackResource + stack: CP14Cloth + count: 1 + result: CP14ModularBladeLucensMop - type: CP14Recipe id: CP14Lighter @@ -275,3 +304,22 @@ count: 2 result: CP14OpenSign +- type: CP14Recipe + id: CP14RopeFromGrass + tag: CP14RecipeWorkbench + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14FloraMaterial + count: 4 + result: CP14Rope + +- type: CP14Recipe + id: CP14RopeFromCloth + tag: CP14RecipeWorkbench + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14Cloth + count: 2 + result: CP14Rope diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml index f821ba9ef1..4e97c985ab 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml @@ -9,11 +9,11 @@ To begin farming, locate the supply table in the garden. Usually, a crate will contain a variety of seeds, while a table will hold farming tools like a bucket and hoe. Grab a seed variety and use it on the ground to plant it. Wait a while, then use any sharp tool (such as a sickle or dagger) to harvest the fully grown crop. To keep your crops alive for an extended period, be sure to water them frequently. Keeping plants healthy is easier with the spell **“Plant Growth”** from the Vivification tree, which restores a plant’s water, nutrients, and health. - + - + If all your seedbeds are full and demand is still high, you can use a hoe to till additional soil. Consider making a seed bag if you plan to expand your farm. Along with growing food crops, cotton can also be grown. Cotton can be used to weave fabrics and clothing for the people, providing an additional source of income for the inn. To do this, gather some cotton, find a few wood planks, and create a tailoring workbench. @@ -21,11 +21,11 @@ - + ## The Cellar The cellar is extremely popular among patrons. Several barrels can be found here that dispense alcohol. Grab a mug, ensure you are drawing from a keg, and profit. For this very reason though, patrons may try to break into the cellar via the caves it is built in. Checking in on the cellar often can keep all your highly valued booze safe. In the event that some ruffian breaks your barrels, the alcohol can be mopped up and put into a new barrel. Customers will certainly enjoy your new "cocktail". - + A typical cellar also contains a few tables and torches, as well as a barrel of water. Tables usually hold spare mugs. Be careful not to serve too much alcohol at once... unless your esteemed customer is a dwarf. ## The Kitchen @@ -39,9 +39,9 @@ - - - Green salad is easy to make because it doesn't require heating. However, almost all other dishes will need to be cooked using the furnace. To use it, place 2–3 wood planks inside to keep the fire burning long enough. Ignite the fire with either the **“Create Flame”** spell or a flint and steel. Then, place the uncooked item on top of the furnace — *after* lighting it — so it begins to cook. Remove the food promptly, or it will burn into inedible ash (which you might try to market, but it won’t end well). The **“Freeze”** spell can stop a furnace from wasting fuel between cooking sessions. The **"Heat"** spell can instantly cook food for patrons without the risk of burning it to ash or using up wood fuel. Mugs and plates can be made at a workbench using the wood saved. + + + Green salad is easy to make because it doesn't require heating. However, almost all other dishes will need to be cooked using the furnace. To use it, place 2–3 wood planks inside to keep the fire burning long enough. Ignite the fire with either the **“Create Flame”** spell or a flint and steel. Then, place the uncooked item on top of the furnace — *after* lighting it — so it begins to cook. Remove the food promptly, or it will burn into inedible ash (which you might try to market, but it won’t end well). The **“Freeze”** spell can stop a furnace from wasting fuel between cooking sessions. The **"Heat"** spell can instantly cook food for patrons without the risk of burning it to ash or using up wood fuel. Mugs and plates can be made at a workbench using the wood saved. @@ -53,7 +53,7 @@ - + ## Customers In the kitchen, there is a small ordering window for customers. It is strongly recommended that you create a small menu using paper and a fountain pen, listing the dishes you offer and their prices. Prices are set by the innkeeper, but customers will appreciate affordable options. @@ -61,7 +61,7 @@ In the event your delightful cooking or your generous portions of ale makes a customer vomit, a mop can be found near the stairs to the cellar. Dip the mop inside one of your water barrels and wipe up the mess. Be careful to avoid serving water from your mopping barrel - customers generally don't enjoy the taste of vomit. - + diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml index f821ba9ef1..4e97c985ab 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml @@ -9,11 +9,11 @@ To begin farming, locate the supply table in the garden. Usually, a crate will contain a variety of seeds, while a table will hold farming tools like a bucket and hoe. Grab a seed variety and use it on the ground to plant it. Wait a while, then use any sharp tool (such as a sickle or dagger) to harvest the fully grown crop. To keep your crops alive for an extended period, be sure to water them frequently. Keeping plants healthy is easier with the spell **“Plant Growth”** from the Vivification tree, which restores a plant’s water, nutrients, and health. - + - + If all your seedbeds are full and demand is still high, you can use a hoe to till additional soil. Consider making a seed bag if you plan to expand your farm. Along with growing food crops, cotton can also be grown. Cotton can be used to weave fabrics and clothing for the people, providing an additional source of income for the inn. To do this, gather some cotton, find a few wood planks, and create a tailoring workbench. @@ -21,11 +21,11 @@ - + ## The Cellar The cellar is extremely popular among patrons. Several barrels can be found here that dispense alcohol. Grab a mug, ensure you are drawing from a keg, and profit. For this very reason though, patrons may try to break into the cellar via the caves it is built in. Checking in on the cellar often can keep all your highly valued booze safe. In the event that some ruffian breaks your barrels, the alcohol can be mopped up and put into a new barrel. Customers will certainly enjoy your new "cocktail". - + A typical cellar also contains a few tables and torches, as well as a barrel of water. Tables usually hold spare mugs. Be careful not to serve too much alcohol at once... unless your esteemed customer is a dwarf. ## The Kitchen @@ -39,9 +39,9 @@ - - - Green salad is easy to make because it doesn't require heating. However, almost all other dishes will need to be cooked using the furnace. To use it, place 2–3 wood planks inside to keep the fire burning long enough. Ignite the fire with either the **“Create Flame”** spell or a flint and steel. Then, place the uncooked item on top of the furnace — *after* lighting it — so it begins to cook. Remove the food promptly, or it will burn into inedible ash (which you might try to market, but it won’t end well). The **“Freeze”** spell can stop a furnace from wasting fuel between cooking sessions. The **"Heat"** spell can instantly cook food for patrons without the risk of burning it to ash or using up wood fuel. Mugs and plates can be made at a workbench using the wood saved. + + + Green salad is easy to make because it doesn't require heating. However, almost all other dishes will need to be cooked using the furnace. To use it, place 2–3 wood planks inside to keep the fire burning long enough. Ignite the fire with either the **“Create Flame”** spell or a flint and steel. Then, place the uncooked item on top of the furnace — *after* lighting it — so it begins to cook. Remove the food promptly, or it will burn into inedible ash (which you might try to market, but it won’t end well). The **“Freeze”** spell can stop a furnace from wasting fuel between cooking sessions. The **"Heat"** spell can instantly cook food for patrons without the risk of burning it to ash or using up wood fuel. Mugs and plates can be made at a workbench using the wood saved. @@ -53,7 +53,7 @@ - + ## Customers In the kitchen, there is a small ordering window for customers. It is strongly recommended that you create a small menu using paper and a fountain pen, listing the dishes you offer and their prices. Prices are set by the innkeeper, but customers will appreciate affordable options. @@ -61,7 +61,7 @@ In the event your delightful cooking or your generous portions of ale makes a customer vomit, a mop can be found near the stairs to the cellar. Dip the mop inside one of your water barrels and wipe up the mess. Be careful to avoid serving water from your mopping barrel - customers generally don't enjoy the taste of vomit. - + diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT.png new file mode 100644 index 0000000000..2c1e091f6a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..6f10324067 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-NECK.png new file mode 100644 index 0000000000..8de9a5f179 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/icon.png new file mode 100644 index 0000000000..e352f3351c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-left.png new file mode 100644 index 0000000000..a5baa40ea3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-right.png new file mode 100644 index 0000000000..74e4790ab9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/meta.json new file mode 100644 index 0000000000..74645b78a0 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by paige404 (GitHub) based on the original mop.rsi by omsoyk (Discord)", + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..b662200648 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..0d94bff084 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT.png new file mode 100644 index 0000000000..78c7ce4606 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..88a173b3bc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-NECK.png new file mode 100644 index 0000000000..c5f639b821 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/icon.png new file mode 100644 index 0000000000..375b66b5b1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-left.png new file mode 100644 index 0000000000..11d439c45b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-right.png new file mode 100644 index 0000000000..cd79dfc2d1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/meta.json new file mode 100644 index 0000000000..d5810b2d0d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Icon by frogoo. (Discord), recolored by paige404. Additional sprites created by paige404 based on that icon.", + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..2209c031e7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..3dea9c8883 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mop/mop.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..a9ef1fa419 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-1.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-1.png new file mode 100644 index 0000000000..2227b0fb19 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-2.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-2.png new file mode 100644 index 0000000000..7c59c880e7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-3.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-3.png new file mode 100644 index 0000000000..bf0d1d016b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/fill-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/icon.png new file mode 100644 index 0000000000..3ea0ecb26f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-left.png new file mode 100644 index 0000000000..0e44821542 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-right.png new file mode 100644 index 0000000000..1b5b4f65d5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/meta.json new file mode 100644 index 0000000000..a1deeaa3ed --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/lucens_bucket.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by paige404 based on the wooden bucket created by Jaraten (github/discord).", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Tools/mop.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Tools/mop.rsi/equipped-NECK.png new file mode 100644 index 0000000000..3c5d256839 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/mop.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/mop.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/mop.rsi/meta.json index e9001001ad..ed35215fc3 100644 --- a/Resources/Textures/_CP14/Objects/Tools/mop.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tools/mop.rsi/meta.json @@ -22,9 +22,13 @@ "name": "wielded-inhand-left", "directions": 4 }, - { + { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/equipped-HELMET.png index 6e1b4a96a1..47dbcdbece 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/equipped-HELMET.png and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png index 71a3395c36..2227b0fb19 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-2.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-2.png index 1a5fa1e3c3..7c59c880e7 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-2.png and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png index e58ebe020b..bf0d1d016b 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/fill-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/icon.png index 570de8dc48..8f08b7fe27 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/icon.png and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-left.png index fffb595899..767c14a389 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-left.png and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-right.png index 9cea5acb69..a921a648ef 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-right.png and b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json index 8445bf3412..1675c69164 100644 --- a/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tools/wooden_bucket.rsi/meta.json @@ -1,10 +1,10 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by Jaraten (github/discord) , modified by vladimir.s", + "copyright": "Created by Jaraten (github/discord) , modified by vladimir.s, resized to 48 and modified by paige404", "size": { - "x": 32, - "y": 32 + "x": 48, + "y": 48 }, "states": [ { diff --git a/Resources/migration.yml b/Resources/migration.yml index 40fe48c4ef..1e49d4f670 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -188,7 +188,7 @@ CP14VialTinyChromiumSlime: CP14VialSmall CP14VialTinyLumiMushroom: CP14VialSmall CP14VialSmallHealthPotion: CP14VialSmall CP14VialSmallManaPotion: CP14VialSmall -CP14SpellScrollCounterSpell: CP14ActionSpellMagicSplitting +CP14SpellScrollCounterSpell: CP14ActionSpellMagicSplitting #2025-04-03 CP14TravelingStoreshipAnchor: null @@ -265,7 +265,7 @@ CP14FenceWoodSmallGate: CP14FenceGateWooden CP14FenceIronGrilleStraight: CP14FenceBigIron CP14FenceIronGrilleGate: CP14FenceGateBigIron CP14FenceIronGrilleGateGuard: CP14FenceGateBigIronGuardBarracks -CP14FenceIronGrilleGateGuildmaster: CP14FenceGateBigIronGuildmaster +CP14FenceIronGrilleGateGuildmaster: CP14FenceGateBigIronGuildmaster CP14FenceIronGrilleGateDemiplaneCrystal: CP14FenceGateBigIronDemiplaneCrystal CP14FenceIronGrilleWindowStraight: CP14FenceWindowIron @@ -343,6 +343,9 @@ CP14ClothingRingFireball: null CP14ClothingRingFlashLight: null CP14ClothingRingIceShards: null +# 2025-06-04 +CP14BaseMop: CP14ModularWoodMop + #2025-06-15 CP14FoodMeatMole: CP14FoodMeatMonster CP14FoodMeatMoleCooked: CP14FoodMeatMonsterCooked