diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs index 3acd5051c9..e66b259388 100644 --- a/Content.Shared/Tiles/FloorTileSystem.cs +++ b/Content.Shared/Tiles/FloorTileSystem.cs @@ -170,7 +170,7 @@ public sealed class FloorTileSystem : EntitySystem return tileDef.BaseTurf == baseTurf; } - private void PlaceAt(EntityUid user, EntityUid gridUid, MapGridComponent mapGrid, EntityCoordinates location, + public void PlaceAt(EntityUid user, EntityUid gridUid, MapGridComponent mapGrid, EntityCoordinates location, ushort tileId, SoundSpecifier placeSound, float offset = 0) { _adminLogger.Add(LogType.Tile, LogImpact.Low, $"{ToPrettyString(user):actor} placed tile {_tileDefinitionManager[tileId].Name} at {ToPrettyString(gridUid)} {location}"); diff --git a/Content.Shared/_CP14/Farming/Components/CP14SeedComponent.cs b/Content.Shared/_CP14/Farming/Components/CP14SeedComponent.cs index e359a3c648..eb128a7180 100644 --- a/Content.Shared/_CP14/Farming/Components/CP14SeedComponent.cs +++ b/Content.Shared/_CP14/Farming/Components/CP14SeedComponent.cs @@ -16,5 +16,5 @@ public sealed partial class CP14SeedComponent : Component public EntProtoId PlantProto; [DataField] - public HashSet> SoilTile = new() { "CP14FloorDirt" }; + public HashSet> SoilTile = new() { "CP14FloorDirtSeedbed" }; } diff --git a/Content.Shared/_CP14/TileEditTool/CP14EditTileToolComponent.cs b/Content.Shared/_CP14/TileEditTool/CP14EditTileToolComponent.cs new file mode 100644 index 0000000000..b674380d62 --- /dev/null +++ b/Content.Shared/_CP14/TileEditTool/CP14EditTileToolComponent.cs @@ -0,0 +1,35 @@ +using Content.Shared.DoAfter; +using Content.Shared.Maps; +using Robust.Shared.Audio; +using Robust.Shared.Map; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared._CP14.TileEditTool; + +[RegisterComponent, Access(typeof(CP14EditTileToolSystem))] +public sealed partial class CP14EditTileToolComponent : Component +{ + [DataField] + public TimeSpan Delay = TimeSpan.FromSeconds(1f); + + [DataField] + public SoundSpecifier? Sound; + + [DataField] + public Dictionary, ProtoId> TileReplace = new(); +} + +[Serializable, NetSerializable] +public sealed partial class CP14TileToolReplaceDoAfter : DoAfterEvent +{ + [DataField(required:true)] + public NetCoordinates Coordinates; + + public CP14TileToolReplaceDoAfter(NetCoordinates coordinates) + { + Coordinates = coordinates; + } + + public override DoAfterEvent Clone() => this; +} diff --git a/Content.Shared/_CP14/TileEditTool/CP14EditTileToolSystem.cs b/Content.Shared/_CP14/TileEditTool/CP14EditTileToolSystem.cs new file mode 100644 index 0000000000..5b110fc5a6 --- /dev/null +++ b/Content.Shared/_CP14/TileEditTool/CP14EditTileToolSystem.cs @@ -0,0 +1,72 @@ +using Content.Shared.DoAfter; +using Content.Shared.Interaction; +using Content.Shared.Maps; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Map; +using Robust.Shared.Map.Components; +using Robust.Shared.Prototypes; + +namespace Content.Shared._CP14.TileEditTool; + +public sealed class CP14EditTileToolSystem : EntitySystem +{ + [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnTileClick); + SubscribeLocalEvent(OnDoAfterEnd); + } + + private void OnTileClick(Entity ent, ref AfterInteractEvent args) + { + if (args.Handled || !args.CanReach) + return; + + var doAfterArgs = + new DoAfterArgs(EntityManager, + args.User, + ent.Comp.Delay, + new CP14TileToolReplaceDoAfter(GetNetCoordinates(args.ClickLocation)), + ent) + { + BreakOnDamage = true, + BlockDuplicate = false, + BreakOnMove = true, + BreakOnHandChange = true, + }; + _doAfter.TryStartDoAfter(doAfterArgs); + } + + private void OnDoAfterEnd(Entity ent, ref CP14TileToolReplaceDoAfter args) + { + if (args.Cancelled || args.Handled) + return; + + var location = GetCoordinates(args.Coordinates); + + var map = _transform.GetMap(location); + if (!TryComp(map, out var gridComp)) + return; + + var tileRef = location.GetTileRef(); + + if (tileRef is null) + return; + + var tile = tileRef.Value.Tile.GetContentTileDefinition(); + + if (!ent.Comp.TileReplace.TryGetValue(tile, out var replaceTile)) + return; + + args.Handled = true; + + _map.SetTile((map.Value, gridComp), location, new Tile(_proto.Index(replaceTile).TileId)); + _audio.PlayPredicted(ent.Comp.Sound, location, args.User); + } +} diff --git a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl index 1a7396eb19..a0fc614de3 100644 --- a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl @@ -13,6 +13,7 @@ cp14-tiles-snow-deep-deep = deep deep snow # Produced cp14-tiles-foundation = foundation +cp14-tiles-dirt-seedbed = dirt seedbed cp14-tiles-red-woodplanks = red woodplanks cp14-tiles-red-woodplanks-big = big red planks diff --git a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl index 0b4fabb18f..c288d50f67 100644 --- a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl @@ -13,6 +13,7 @@ cp14-tiles-snow-deep-deep = очень глубокий снег # Produced cp14-tiles-foundation = фундамент +cp14-tiles-dirt-seedbed = земляная грядка cp14-tiles-red-woodplanks = красные доски cp14-tiles-red-woodplanks-big = большие красные доски diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml index 804ffc629d..bca044f7e2 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml @@ -27,8 +27,6 @@ amount: 3 - id: CP14SeedTomato amount: 3 - - id: CP14SeedOnion - amount: 3 - id: CP14SeedPepper amount: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml b/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml index 03cb9d7db1..b665ab14d2 100644 --- a/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml +++ b/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml @@ -22,6 +22,9 @@ tags: - HideContextMenu - type: AnimationPlayer + - type: EmitSoundOnSpawn + sound: + collection: CP14Digging - type: entity id: CP14SnowEffect diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml index bf0f301dab..df99828917 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml @@ -9,9 +9,6 @@ - CP14DirtBlock1 chance: 1 deleteSpawnerAfterSpawn: false - - type: EmitSoundOnSpawn - sound: - collection: CP14Digging - type: entity id: CP14RandomSnowLootSpawner diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index 316cedb0e3..b4f022a3cd 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -459,6 +459,8 @@ Quantity: 4 - ReagentId: Allicin Quantity: 3 + - type: CP14Seed + plantProto: CP14PlantOnion - type: Tag tags: - CP14FarmFood diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hoe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hoe.yml new file mode 100644 index 0000000000..8138579d9c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hoe.yml @@ -0,0 +1,79 @@ +- type: entity + parent: BaseItem + id: CP14ModularBladeHoeBase + categories: [ ForkFiltered ] + abstract: true + description: A hoe blade without a hilt. A blacksmith can use it as a spare part to create a tool. + components: + - type: Item + storedRotation: 45 + shape: + - 0,0,0,0 + storedOffset: 0, 5 + +- type: entity + parent: CP14ModularBladeHoeBase + id: CP14ModularBladeIronHoe + name: iron hoe blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeIronHoe + - type: CP14Material + materials: + CP14Iron: 10 + +- type: entity + parent: CP14ModularBladeHoeBase + id: CP14ModularBladeCopperHoe + name: copper hoe blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + layers: + - state: icon + color: "#ffaf47" + - type: CP14ModularCraftPart + possibleParts: + - BladeCopperHoe + - type: CP14Material + materials: + CP14Copper: 10 + +- type: entity + parent: CP14ModularBladeHoeBase + id: CP14ModularBladeGoldHoe + name: golden hoe blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + layers: + - state: icon + color: "#bd712f" + - type: CP14ModularCraftPart + possibleParts: + - BladeGoldHoe + - type: CP14Material + materials: + CP14Gold: 10 + +- type: entity + parent: CP14ModularBladeSickleBase + id: CP14ModularBladeMithrilHoe + name: mithril hoe blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + layers: + - state: icon + color: "#45d2a4" + - type: CP14ModularCraftPart + possibleParts: + - BladeMithrilHoe + - type: CP14Material + materials: + CP14Mithril: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml index c166aea09b..4f82178153 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml @@ -75,19 +75,6 @@ - type: CP14Seed plantProto: CP14PlantTomatoes -- type: entity - id: CP14SeedOnion - name: onion seeds - description: Onion seeds, small but strong. - parent: CP14BaseSeed - components: - - type: Sprite - layers: - - state: bag - - state: onion - - type: CP14Seed - plantProto: CP14PlantOnion - - type: entity id: CP14SeedPepper name: pepper seeds diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml deleted file mode 100644 index 2712189011..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml +++ /dev/null @@ -1,24 +0,0 @@ -- type: entity - id: CP14BaseHoe - parent: - - BaseItem - - CP14BaseWeaponDestructible - - CP14BaseWeaponSelfDamage - - CP14BaseWeaponLight - name: hoe - description: A gardening tool to prepare the soil for planting, or to clear weeds - components: - - type: Sprite - sprite: _CP14/Objects/Weapons/Melee/Hoe/hoe.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: 65 - damage: - types: - Piercing: 4 - Slash: 3 - soundHit: - collection: MetalThud - - type: Item - size: Normal - sprite: _CP14/Objects/Weapons/Melee/Hoe/hoe.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hoe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hoe.yml new file mode 100644 index 0000000000..d1a248d35d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hoe.yml @@ -0,0 +1,14 @@ +- type: entity + id: CP14ModularIronHoe + parent: CP14ModularGripWooden + name: iron hoe + description: Hoe. Your perfect tool for tilling the ground and preparing it for gardening. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeIronHoe \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/onion.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/onion.yml index 07eb4887cc..c7d2ddc917 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/onion.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/onion.yml @@ -20,5 +20,5 @@ id: CP14GatherOnion entries: - id: CP14FoodOnion - amount: 1 - maxAmount: 3 + amount: 2 + maxAmount: 4 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pepper.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pepper.yml index bf83625f4b..260d2fe9f9 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pepper.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pepper.yml @@ -1,6 +1,6 @@ - type: entity id: CP14PlantPepper - parent: CP14GatherablePlantSingleHarvestBase + parent: CP14GatherablePlantMultiHarvestBase name: pepper description: Russian roulette. Are you hot, or are you sweet peppers? components: @@ -22,5 +22,5 @@ id: CP14GatherPepper entries: - id: CP14FoodPepper - amount: 2 - maxAmount: 4 + amount: 1 + maxAmount: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/tomatoes.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/tomatoes.yml index c30ae02fe0..51887c280b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/tomatoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/tomatoes.yml @@ -13,7 +13,6 @@ sprite: _CP14/Structures/Flora/Farm/tomatoes.rsi map: ["enum.PlantVisualLayers.Base"] - type: CP14PlantGatherable - deleteAfterHarvest: false loot: All: CP14GatherTomatoes diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml index e2a850406b..ecd13285da 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml @@ -104,7 +104,7 @@ thresholds: - trigger: !type:DamageTrigger #Overkill - damage: 35 + damage: 45 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -123,7 +123,7 @@ - trigger: !type:DamageTypeTrigger #Heat damageType: Heat - damage: 10 + damage: 20 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -135,7 +135,7 @@ - trigger: !type:DamageGroupTrigger #Brute damageGroup: Brute - damage: 10 + damage: 15 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml new file mode 100644 index 0000000000..72e70f31b7 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml @@ -0,0 +1,96 @@ +#Concept: +# Copy of dagger with bigger damage, but without throwing +- type: modularPart + id: BaseBladeHoe + modifiers: + - !type:Inherit + copyFrom: + - BaseWeaponChemical + - BaseWeaponThrowable + #components: TODO Add gathering tag + - !type:AddComponents + override: true + components: + - type: DamageOtherOnHit + damage: + types: + Piercing: 6 + - type: ThrowingAngle + angle: 135 + - type: EmbeddableProjectile + offset: -0.15,-0.15 + removalTime: 0.5 + - type: CP14EditTileTool + sound: + collection: CP14Digging + tileReplace: + CP14FloorDirt: CP14FloorDirtSeedbed + CP14FloorDirtSeedbed: CP14FloorDirt + - !type:EditMeleeWeapon + newWideAnimation: CP14WeaponArcThrust + attackRateMultiplier: 1.5 + bonusDamage: + types: + Piercing: 6 + - !type:EditIncreaseDamageOnWield + bonusDamage: + types: + Piercing: 3 + - !type:EditItem + newSize: Normal + adjustShape: 0, 1 + storedOffsetBonus: 0, 5 + - !type:EditModularSlots + addSlots: + - Garde + +- type: modularPart + id: BladeIronHoe + slots: + - Blade + sourcePart: CP14ScrapIron + rsiPath: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeHoe + - BaseBladeIron + +- type: modularPart + id: BladeGoldHoe + slots: + - Blade + sourcePart: CP14ScrapGold + rsiPath: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + color: "#ffaf47" + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeHoe + - BaseBladeGold + +- type: modularPart + id: BladeCopperHoe + slots: + - Blade + sourcePart: CP14ScrapCopper + rsiPath: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + color: "#bd712f" + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeHoe + - BaseBladeCopper + +- type: modularPart + id: BladeMithrilHoe + slots: + - Blade + sourcePart: CP14ScrapMithril + rsiPath: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + color: "#45d2a4" + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeHoe + - BaseBladeMithril diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml index c4c68fab2a..b4c5e172e2 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml @@ -29,6 +29,10 @@ bonusDamage: types: Piercing: 8 + - !type:EditIncreaseDamageOnWield + bonusDamage: + types: + Piercing: 3 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml index bc40bc6a51..2d7ff53a16 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml @@ -503,4 +503,45 @@ stack: CP14MithrilBar count: 2 result: CP14ModularBladeMithrilHammer - \ No newline at end of file + +# Sickle + +- type: CP14Recipe + id: CP14ModularBladeIronHoe + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14ModularBladeIronHoe + +- type: CP14Recipe + id: CP14ModularBladeCopperHoe + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + result: CP14ModularBladeCopperHoe + +- type: CP14Recipe + id: CP14ModularBladeGoldHoe + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + result: CP14ModularBladeGoldHoe + +- type: CP14Recipe + id: CP14ModularBladeMithrilHoe + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + result: CP14ModularBladeMithrilHoe \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml index ca9d405512..2f51e7e5c6 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml @@ -51,17 +51,6 @@ count: 1 result: CP14SeedCucumber -- type: CP14Recipe - id: CP14SeedOnion - tag: CP14RecipeCooking - craftTime: 1 - requirements: - - !type:ProtoIdResource - protoId: CP14FoodOnion - count: 1 - result: CP14SeedOnion - resultCount: 2 - - type: CP14Recipe id: CP14SeedPepper tag: CP14RecipeCooking diff --git a/Resources/Prototypes/_CP14/Tiles/produced.yml b/Resources/Prototypes/_CP14/Tiles/produced.yml index 4a6bffd94a..24d0711ab7 100644 --- a/Resources/Prototypes/_CP14/Tiles/produced.yml +++ b/Resources/Prototypes/_CP14/Tiles/produced.yml @@ -190,3 +190,31 @@ collection: FootstepAsteroid heatCapacity: 10000 weather: true + +- type: tile + editorHidden: false + id: CP14FloorDirtSeedbed + name: cp14-tiles-dirt-seedbed + sprite: /Textures/_CP14/Tiles/DirtSeedBag/seedbed.png + variants: 2 + placementVariants: + - 1.0 + - 1.0 + edgeSpritePriority: 100 + edgeSprites: + SouthEast: /Textures/_CP14/Tiles/DirtSeedBag/single_edge_SE.png + NorthEast: /Textures/_CP14/Tiles/DirtSeedBag/single_edge_NE.png + NorthWest: /Textures/_CP14/Tiles/DirtSeedBag/single_edge_NW.png + SouthWest: /Textures/_CP14/Tiles/DirtSeedBag/single_edge_SW.png + South: /Textures/_CP14/Tiles/DirtSeedBag/double_edge_S.png + East: /Textures/_CP14/Tiles/DirtSeedBag/double_edge_E.png + North: /Textures/_CP14/Tiles/DirtSeedBag/double_edge_N.png + West: /Textures/_CP14/Tiles/DirtSeedBag/double_edge_W.png + baseTurf: CP14FloorDirt + deconstructTools: [ CP14Digging ] + itemDrop: CP14DirtEffect + isSubfloor: true + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + weather: true \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..adc02b3793 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..aed0986238 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-NECK.png new file mode 100644 index 0000000000..bc47bd5a1f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/icon.png new file mode 100644 index 0000000000..9cecc779ff Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/inhand-left.png new file mode 100644 index 0000000000..08dce83f01 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/inhand-right.png new file mode 100644 index 0000000000..4e138aa315 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json new file mode 100644 index 0000000000..2a39519ae5 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "name": "equipped-BELT1", + "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/Hoe/metall_hoe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..2edcbb7cc8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..7121ff2d90 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/icon.png deleted file mode 100644 index 26a88c3dc0..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-left.png deleted file mode 100644 index df2b4dec60..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-right.png deleted file mode 100644 index 51782b92a8..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/meta.json deleted file mode 100644 index 8d478226a2..0000000000 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png index d8e7d86a66..2bbcf27834 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png and b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png index 84037c9c80..b61dd844d6 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png and b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png index 1011d52dab..0d369bf6dd 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png and b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png index 4df37911cf..0a676de1a6 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png and b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json index 234400f178..53d36cc464 100644 --- a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json @@ -1,27 +1,12 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by Jaraten(Discord/Github)", + "copyright": "Created by TheShuEd", "size": { - "x": 35, - "y": 35 + "x": 32, + "y": 32 }, "states": [ - { - "name": "seedbed_default" - }, - { - "name": "seedbed_default_east" - }, - { - "name": "seedbed_default_west" - }, - { - "name": "seedbed_default_north" - }, - { - "name": "seedbed_default_south" - }, { "name": "liq-1" }, diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default.png deleted file mode 100644 index 3da2a4f4ec..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_east.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_east.png deleted file mode 100644 index 20dafe3ed1..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_east.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_north.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_north.png deleted file mode 100644 index 0d56d68c23..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_north.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_south.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_south.png deleted file mode 100644 index fc30498251..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_south.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_west.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_west.png deleted file mode 100644 index cb47a267e3..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/seedbed_default_west.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/attributions.yml b/Resources/Textures/_CP14/Tiles/DirtSeedBag/attributions.yml new file mode 100644 index 0000000000..cbaaa0b02d --- /dev/null +++ b/Resources/Textures/_CP14/Tiles/DirtSeedBag/attributions.yml @@ -0,0 +1,9 @@ +- files: ["seedbed.png"] + license: "All right reserved" + copyright: "Created by Jaraten" + source: "https://github.com/crystallpunk-14/crystall-punk-14/" + +- files: ["double_edge.png", "single_edge.png"] + license: "All right reserved" + copyright: "Created by Jaraten" + source: "https://github.com/crystallpunk-14/crystall-punk-14/" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_E.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_E.png new file mode 100644 index 0000000000..c3f80fd3cb Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_E.png differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_N.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_N.png new file mode 100644 index 0000000000..a34a841701 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_N.png differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_S.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_S.png new file mode 100644 index 0000000000..068ae56539 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_S.png differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_W.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_W.png new file mode 100644 index 0000000000..ae6f47358e Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/double_edge_W.png differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/seedbed.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/seedbed.png new file mode 100644 index 0000000000..0e6b1718d9 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/seedbed.png differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_NE.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_NE.png new file mode 100644 index 0000000000..f3e44fbeb2 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_NE.png differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_NW.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_NW.png new file mode 100644 index 0000000000..1c03aaf057 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_NW.png differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_SE.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_SE.png new file mode 100644 index 0000000000..9d10808319 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_SE.png differ diff --git a/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_SW.png b/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_SW.png new file mode 100644 index 0000000000..0133495c2b Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/DirtSeedBag/single_edge_SW.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 8f453b0106..43b8a53a76 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -322,6 +322,8 @@ CP14PlantPotatoDeath: CP14PlantPotato CP14PlantPumpkinDeath: CP14PlantPumpkin CP14PlantTomatoesDeath: CP14PlantTomatoes CP14PlantWheatDeath: CP14PlantWheat +CP14BaseHoe: CP14ModularIronHoe +CP14PlantOnion: null # <---> CrystallEdge migration zone end