diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs index 6cc430b74f..b88248b82f 100644 --- a/Content.Server/Construction/ConstructionSystem.Initial.cs +++ b/Content.Server/Construction/ConstructionSystem.Initial.cs @@ -2,6 +2,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Content.Server.Construction.Components; +using Content.Shared._CP14.Workbench.Prototypes; using Content.Shared.ActionBlocker; using Content.Shared.Construction; using Content.Shared.Construction.Prototypes; @@ -236,6 +237,36 @@ namespace Content.Server.Construction } break; + + //CP14 stack group support + case CP14StackGroupConstructionGraphStep stackGroupStep: + foreach (var entity in new HashSet(EnumerateNearby(user))) + { + if (!stackGroupStep.EntityValid(entity, out var stack)) + continue; + + if (used.Contains(entity)) + continue; + + var splitStack = _stackSystem.Split(entity, stackGroupStep.Amount, user.ToCoordinates(0, 0), stack); + + if (splitStack == null) + continue; + + if (string.IsNullOrEmpty(stackGroupStep.Store)) + { + if (!_container.Insert(splitStack.Value, container)) + continue; + } + else if (!_container.Insert(splitStack.Value, GetContainer(stackGroupStep.Store))) + continue; + + handled = true; + break; + } + + break; + //CP14 stack group support end } if (handled == false) diff --git a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs index 83277aa8cd..fb84c2d091 100644 --- a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs +++ b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs @@ -97,13 +97,13 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem foreach (var req in recipe.Requirements) { - req.PostCraft(EntityManager, placedEntities, args.User); + req.PostCraft(EntityManager, _proto, placedEntities, args.User); } //We teleport result to workbench AFTER craft. foreach (var resultEntity in resultEntities) { - _transform.SetCoordinates(resultEntity, Transform(ent).Coordinates.Offset(new Vector2(_random.NextFloat(-0.5f, 0.5f), _random.NextFloat(-0.5f, 0.5f)))); + _transform.SetCoordinates(resultEntity, Transform(ent).Coordinates.Offset(new Vector2(_random.NextFloat(-0.25f, 0.25f), _random.NextFloat(-0.25f, 0.25f)))); } UpdateUIRecipes(ent, args.User); diff --git a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs index 7b5b020d2f..67f520165c 100644 --- a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs +++ b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs @@ -1,4 +1,5 @@ -using Robust.Shared.Serialization; +using Content.Shared._CP14.Workbench.Prototypes; +using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager; using Robust.Shared.Serialization.Markdown.Mapping; using Robust.Shared.Serialization.Markdown.Validation; @@ -46,6 +47,13 @@ namespace Content.Shared.Construction.Steps return typeof(PartAssemblyConstructionGraphStep); } + //CP14 stack group support + if (node.Has("stackGroup")) + { + return typeof(CP14StackGroupConstructionGraphStep); + } + //CP14 stack group support end + return null; } diff --git a/Content.Shared/_CP14/Workbench/Prototypes/CP14StackGroupConstructionGraphStep.cs b/Content.Shared/_CP14/Workbench/Prototypes/CP14StackGroupConstructionGraphStep.cs new file mode 100644 index 0000000000..4aa2fc5a86 --- /dev/null +++ b/Content.Shared/_CP14/Workbench/Prototypes/CP14StackGroupConstructionGraphStep.cs @@ -0,0 +1,65 @@ +/* + * This file is sublicensed under MIT License + * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT + */ + +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Construction; +using Content.Shared.Construction.Steps; +using Content.Shared.Examine; +using Content.Shared.Stacks; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Shared._CP14.Workbench.Prototypes; + +[DataDefinition] +public sealed partial class CP14StackGroupConstructionGraphStep : EntityInsertConstructionGraphStep +{ + [DataField] + public ProtoId StackGroup = default!; + + [DataField] + public int Amount = 1; + + public override void DoExamine(ExaminedEvent examinedEvent) + { + var group = IoCManager.Resolve().Index(StackGroup); + + examinedEvent.PushMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", Loc.GetString(group.Name)))); + } + + public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory) + { + var group = IoCManager.Resolve().Index(StackGroup); + + return entityManager.TryGetComponent(uid, out StackComponent? stack) && group.Stacks.Contains(stack.StackTypeId) && stack.Count >= Amount; + } + + public bool EntityValid(EntityUid entity, [NotNullWhen(true)] out StackComponent? stack) + { + var group = IoCManager.Resolve().Index(StackGroup); + + if (IoCManager.Resolve().TryGetComponent(entity, out StackComponent? otherStack) && group.Stacks.Contains(otherStack.StackTypeId) && otherStack.Count >= Amount) + stack = otherStack; + else + stack = null; + + return stack != null; + } + + public override ConstructionGuideEntry GenerateGuideEntry() + { + var proto = IoCManager.Resolve(); + var group = proto.Index(StackGroup); + + var firstStack = group.Stacks.FirstOrNull(); + + return new ConstructionGuideEntry() + { + Localization = "construction-presenter-material-step", + Arguments = new (string, object)[]{("amount", Amount), ("material", Loc.GetString(group.Name))}, + Icon = firstStack != null ? proto.Index(firstStack.Value).Icon : SpriteSpecifier.Invalid, + }; + } +} diff --git a/Content.Shared/_CP14/Workbench/Prototypes/CP14StackGroupPrototype.cs b/Content.Shared/_CP14/Workbench/Prototypes/CP14StackGroupPrototype.cs new file mode 100644 index 0000000000..6eb3646f68 --- /dev/null +++ b/Content.Shared/_CP14/Workbench/Prototypes/CP14StackGroupPrototype.cs @@ -0,0 +1,25 @@ +/* + * This file is sublicensed under MIT License + * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT + */ + +using Content.Shared.Stacks; +using Robust.Shared.Prototypes; + +namespace Content.Shared._CP14.Workbench.Prototypes; + +/// +/// Allows you to group several different kinds of stacks into one group. Can be used for situations where different stacks are appropriate for a particular situation +/// +[Prototype("CP14StackGroup")] +public sealed class CP14StackGroupPrototype : IPrototype +{ + [IdDataField] + public string ID { get; private set; } = default!; + + [DataField(required: true)] + public LocId Name = default!; + + [DataField(required: true)] + public List> Stacks = new(); +} diff --git a/Content.Shared/_CP14/Workbench/Requirements/KnowledgeRequired.cs b/Content.Shared/_CP14/Workbench/Requirements/KnowledgeRequired.cs index ddd52e133f..c814e6535d 100644 --- a/Content.Shared/_CP14/Workbench/Requirements/KnowledgeRequired.cs +++ b/Content.Shared/_CP14/Workbench/Requirements/KnowledgeRequired.cs @@ -34,7 +34,7 @@ public sealed partial class SkillRequired : CP14WorkbenchCraftRequirement return haveAllSkills; } - public override void PostCraft(EntityManager entManager, HashSet placedEntities, EntityUid user) + public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager, HashSet placedEntities, EntityUid user) { } diff --git a/Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs b/Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs index a6e61546b1..d0b96a0c14 100644 --- a/Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs +++ b/Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs @@ -59,7 +59,7 @@ public sealed partial class MaterialResource : CP14WorkbenchCraftRequirement return true; } - public override void PostCraft(EntityManager entManager, HashSet placedEntities, EntityUid user) + public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager, HashSet placedEntities, EntityUid user) { var stackSystem = entManager.System(); diff --git a/Content.Shared/_CP14/Workbench/Requirements/ProtoIdResource.cs b/Content.Shared/_CP14/Workbench/Requirements/ProtoIdResource.cs index d29923362b..6c714ace0a 100644 --- a/Content.Shared/_CP14/Workbench/Requirements/ProtoIdResource.cs +++ b/Content.Shared/_CP14/Workbench/Requirements/ProtoIdResource.cs @@ -30,9 +30,7 @@ public sealed partial class ProtoIdResource : CP14WorkbenchCraftRequirement return indexedIngredients.TryGetValue(ProtoId, out var availableQuantity) && availableQuantity >= Count; } - public override void PostCraft(EntityManager entManager, - HashSet placedEntities, - EntityUid user) + public override void PostCraft(EntityManager entManager,IPrototypeManager protoManager, HashSet placedEntities, EntityUid user) { var requiredCount = Count; diff --git a/Content.Shared/_CP14/Workbench/Requirements/StackGroupResource.cs b/Content.Shared/_CP14/Workbench/Requirements/StackGroupResource.cs new file mode 100644 index 0000000000..a6ed0e43b8 --- /dev/null +++ b/Content.Shared/_CP14/Workbench/Requirements/StackGroupResource.cs @@ -0,0 +1,97 @@ +/* + * This file is sublicensed under MIT License + * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT + */ + +using Content.Shared._CP14.Workbench.Prototypes; +using Content.Shared.Stacks; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Shared._CP14.Workbench.Requirements; + +public sealed partial class StackGroupResource : CP14WorkbenchCraftRequirement +{ + public override bool HideRecipe { get; set; } = false; + + [DataField(required: true)] + public ProtoId Group; + + [DataField] + public int Count = 1; + + public override bool CheckRequirement(EntityManager entManager, + IPrototypeManager protoManager, + HashSet placedEntities, + EntityUid user, + CP14WorkbenchRecipePrototype recipe) + { + if (!protoManager.TryIndex(Group, out var indexedGroup)) + return false; + + var count = 0; + foreach (var ent in placedEntities) + { + if (!entManager.TryGetComponent(ent, out var stack)) + continue; + + if (!indexedGroup.Stacks.Contains(stack.StackTypeId)) + continue; + + count += stack.Count; + } + + if (count < Count) + return false; + + return true; + } + + public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager, + HashSet placedEntities, + EntityUid user) + { + var stackSystem = entManager.System(); + + if (!protoManager.TryIndex(Group, out var indexedGroup)) + return; + + var requiredCount = Count; + foreach (var placedEntity in placedEntities) + { + if (!entManager.TryGetComponent(placedEntity, out var stack)) + continue; + + if (!indexedGroup.Stacks.Contains(stack.StackTypeId)) + continue; + + var count = (int)MathF.Min(requiredCount, stack.Count); + + if (stack.Count - count <= 0) + entManager.DeleteEntity(placedEntity); + else + stackSystem.SetCount(placedEntity, stack.Count - count, stack); + + requiredCount -= count; + } + } + + public override string GetRequirementTitle(IPrototypeManager protoManager) + { + var indexedGroup = protoManager.Index(Group); + + return $"{Loc.GetString(indexedGroup.Name)} x{Count}"; + } + + public override EntityPrototype? GetRequirementEntityView(IPrototypeManager protoManager) + { + return null; + } + + public override SpriteSpecifier? GetRequirementTexture(IPrototypeManager protoManager) + { + var indexedGroup = protoManager.Index(Group); + + return !protoManager.TryIndex(indexedGroup.Stacks.FirstOrNull(), out var indexedStack) ? null : indexedStack.Icon; + } +} diff --git a/Content.Shared/_CP14/Workbench/Requirements/StackResource.cs b/Content.Shared/_CP14/Workbench/Requirements/StackResource.cs index 6b63a93556..ce67cff95a 100644 --- a/Content.Shared/_CP14/Workbench/Requirements/StackResource.cs +++ b/Content.Shared/_CP14/Workbench/Requirements/StackResource.cs @@ -44,7 +44,7 @@ public sealed partial class StackResource : CP14WorkbenchCraftRequirement return true; } - public override void PostCraft(EntityManager entManager, + public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager, HashSet placedEntities, EntityUid user) { diff --git a/Content.Shared/_CP14/Workbench/Requirements/TagResource.cs b/Content.Shared/_CP14/Workbench/Requirements/TagResource.cs index 3db65ecf13..549a2e7756 100644 --- a/Content.Shared/_CP14/Workbench/Requirements/TagResource.cs +++ b/Content.Shared/_CP14/Workbench/Requirements/TagResource.cs @@ -50,7 +50,7 @@ public sealed partial class TagResource : CP14WorkbenchCraftRequirement return true; } - public override void PostCraft(EntityManager entManager, HashSet placedEntities, EntityUid user) + public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager, HashSet placedEntities, EntityUid user) { var tagSystem = entManager.System(); diff --git a/Content.Shared/_CP14/Workbench/WorkbenchCraftRequirement.cs b/Content.Shared/_CP14/Workbench/WorkbenchCraftRequirement.cs index 3a5b1b8963..f17d610071 100644 --- a/Content.Shared/_CP14/Workbench/WorkbenchCraftRequirement.cs +++ b/Content.Shared/_CP14/Workbench/WorkbenchCraftRequirement.cs @@ -33,6 +33,7 @@ public abstract partial class CP14WorkbenchCraftRequirement /// An event that is triggered after crafting. This is the place to put important things like removing items, spending stacks or other things. /// public abstract void PostCraft(EntityManager entManager, + IPrototypeManager protoManager, HashSet placedEntities, EntityUid user); diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index d43a821bd2..6d79da02fb 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -1,7 +1,8 @@ cp14-stack-dirt-block = dirt blocks cp14-stack-stone-block = stone blocks cp14-stack-marble-block = marble rocks -cp14-stack-wood-planks = wooden planks +cp14-stack-wood-planks = oak planks +cp14-stack-wood-planks-birch = birch planks cp14-stack-nails = nails cp14-stack-cloth = rolls of fabric cp14-stack-flora = tufts of grass @@ -22,3 +23,5 @@ cp14-stack-wallpaper = rolls of wallpaper cp14-stack-glass-sheet = glass cp14-stack-ash-pile = pile of ashes + +cp14-stack-group-wooden-planks-any = planks (any) \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index 6e1f9081d1..16f7cbb2cf 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -1,7 +1,8 @@ cp14-stack-dirt-block = блоки земли cp14-stack-stone-block = каменные блоки cp14-stack-marble-block = мраморные камни -cp14-stack-wood-planks = деревянные доски +cp14-stack-wood-planks = дубовые доски +cp14-stack-wood-planks-birch = березовые доски cp14-stack-nails = гвозди cp14-stack-cloth = рулоны ткани cp14-stack-flora = пучки травы @@ -22,3 +23,7 @@ cp14-stack-wallpaper = рулон обоев cp14-stack-glass-sheet = стекло cp14-stack-ash-pile = кучка пепла + + + +cp14-stack-group-wooden-planks-any = доски (любые) \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index 630016edf5..75c4c13109 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -1,193 +1,3 @@ -- type: entity - id: CP14WoodLog - parent: BaseItem - name: wooden log - description: A piece of unprocessed wood. Good material for building, or starting a fire. - categories: [ ForkFiltered ] - components: - - type: Item - size: Normal - shape: - - 0,0,1,0 - - type: Sprite - sprite: _CP14/Objects/Materials/wood.rsi - layers: - - state: log - map: ["random"] - - type: RandomSprite - available: - - random: - log: "" - log_2: "" - log_3: "" - - type: Tag - tags: - - CP14FireplaceFuel - - Wooden - - type: Flammable - fireSpread: false - canResistFire: false - alwaysCombustible: true - canExtinguish: true - cP14FireplaceFuel: 30 - damage: - types: - Heat: 1 - - type: Log - spawnedPrototype: CP14WoodenPlanks1 - spawnCount: 3 - - type: Appearance - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 25 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - id: CP14WoodenPlanks1 - parent: BaseItem - name: wooden planks - description: Treated and ready-to-use wood. - categories: [ ForkFiltered ] - suffix: 1 - components: - - type: Item - size: Normal - - type: Sprite - sprite: _CP14/Objects/Materials/wood.rsi - layers: - - state: planks - map: ["base"] - - type: Tag - tags: - - CP14FireplaceFuel - - Wooden - - type: Flammable - fireSpread: false - canResistFire: false - alwaysCombustible: true - canExtinguish: true - cP14FireplaceFuel: 12 - damage: - types: - Heat: 1 - - type: Appearance - - type: Stack - stackType: CP14WoodenPlanks - count: 1 - baseLayer: base - layerStates: - - planks - - planks_2 - - planks_3 - - type: Material - - type: PhysicalComposition # точно ли это нужно? - materialComposition: - CP14WoodenPlanks: 100 - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 25 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - id: CP14WoodenPlanks10 - parent: CP14WoodenPlanks1 - suffix: 10 - components: - - type: Stack - count: 10 - -- type: entity - id: CP14WoodenPlanks20 - parent: CP14WoodenPlanks1 - suffix: 20 - components: - - type: Stack - count: 20 - -- type: entity - id: CP14LucensWoodLog - parent: CP14WoodLog - name: lucens log - components: - - type: Sprite - sprite: _CP14/Objects/Materials/lucens_wood.rsi - layers: - - state: log - map: ["random"] - - type: RandomSprite - available: - - random: - log: "" - log_2: "" - log_3: "" - - type: Log - spawnedPrototype: CP14LucensWoodenPlanks1 - spawnCount: 3 - -- type: entity - id: CP14LucensWoodenPlanks1 - parent: CP14WoodenPlanks1 - name: lucens planks - suffix: 1 - components: - - type: Sprite - sprite: _CP14/Objects/Materials/lucens_wood.rsi - layers: - - state: planks - map: ["base"] - - type: Stack - stackType: CP14LucensWoodenPlanks - count: 1 - baseLayer: base - layerStates: - - planks - - planks_2 - - planks_3 - - type: FloorTile - placeTileSound: - path: /Audio/Effects/woodenclosetclose.ogg - params: - variation: 0.03 - volume: 2 - outputs: - - CP14FloorLucensWoodPlanks - -- type: entity - id: CP14LucensWoodenPlanks10 - parent: CP14LucensWoodenPlanks1 - suffix: 10 - components: - - type: Stack - count: 10 - -- type: entity - id: CP14LucensWoodenPlanks20 - parent: CP14LucensWoodenPlanks1 - suffix: 20 - components: - - type: Stack - count: 20 - - type: entity id: CP14Nail1 parent: BaseItem diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml new file mode 100644 index 0000000000..cca8f99cc5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml @@ -0,0 +1,241 @@ +- type: entity + id: CP14WoodLog + parent: BaseItem + name: wooden log + description: A piece of unprocessed wood. Good material for building, or starting a fire. + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + shape: + - 0,0,1,0 + - type: Sprite + sprite: _CP14/Objects/Materials/wood.rsi + layers: + - state: log + map: ["random"] + - type: RandomSprite + available: + - random: + log: "" + log_2: "" + log_3: "" + - type: Tag + tags: + - CP14FireplaceFuel + - Wooden + - type: Flammable + fireSpread: false + canResistFire: false + alwaysCombustible: true + canExtinguish: true + cP14FireplaceFuel: 30 + damage: + types: + Heat: 1 + - type: Log + spawnedPrototype: CP14WoodenPlanks1 + spawnCount: 3 + - type: Appearance + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14WoodenPlanks1 + parent: BaseItem + name: wooden planks + description: Treated and ready-to-use wood. + categories: [ ForkFiltered ] + suffix: 1 + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Materials/wood.rsi + layers: + - state: planks + map: ["base"] + - type: Tag + tags: + - CP14FireplaceFuel + - Wooden + - type: Flammable + fireSpread: false + canResistFire: false + alwaysCombustible: true + canExtinguish: true + cP14FireplaceFuel: 12 + damage: + types: + Heat: 1 + - type: Appearance + - type: Stack + stackType: CP14WoodenPlanks + count: 1 + baseLayer: base + layerStates: + - planks + - planks_2 + - planks_3 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14WoodenPlanks: 100 + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14WoodenPlanks10 + parent: CP14WoodenPlanks1 + suffix: 10 + components: + - type: Stack + count: 10 + +- type: entity + id: CP14WoodenPlanks20 + parent: CP14WoodenPlanks1 + suffix: 20 + components: + - type: Stack + count: 20 + +# Lucen + +- type: entity + id: CP14LucensWoodLog + parent: CP14WoodLog + name: lucens log + components: + - type: Sprite + sprite: _CP14/Objects/Materials/wood_lucens.rsi + layers: + - state: log + map: ["random"] + - type: RandomSprite + available: + - random: + log: "" + log_2: "" + log_3: "" + - type: Log + spawnedPrototype: CP14LucensWoodenPlanks1 + spawnCount: 3 + +- type: entity + id: CP14LucensWoodenPlanks1 + parent: CP14WoodenPlanks1 + name: lucens planks + suffix: 1 + components: + - type: Sprite + sprite: _CP14/Objects/Materials/wood_lucens.rsi + layers: + - state: planks + map: ["base"] + - type: Stack + stackType: CP14LucensWoodenPlanks + count: 1 + baseLayer: base + layerStates: + - planks + - planks_2 + - planks_3 + +- type: entity + id: CP14LucensWoodenPlanks10 + parent: CP14LucensWoodenPlanks1 + suffix: 10 + components: + - type: Stack + count: 10 + +- type: entity + id: CP14LucensWoodenPlanks20 + parent: CP14LucensWoodenPlanks1 + suffix: 20 + components: + - type: Stack + count: 20 + +#Birch + +- type: entity + id: CP14BirchWoodLog + parent: CP14WoodLog + name: birch log + components: + - type: Sprite + sprite: _CP14/Objects/Materials/wood_birch.rsi + layers: + - state: log + map: ["random"] + - type: RandomSprite + available: + - random: + log: "" + log_2: "" + log_3: "" + - type: Log + spawnedPrototype: CP14BirchWoodenPlanks1 + spawnCount: 3 + +- type: entity + id: CP14BirchWoodenPlanks1 + parent: CP14WoodenPlanks1 + name: birch planks + suffix: 1 + components: + - type: Sprite + sprite: _CP14/Objects/Materials/wood_birch.rsi + layers: + - state: planks + map: ["base"] + - type: Stack + stackType: CP14BirchWoodenPlanks + count: 1 + baseLayer: base + layerStates: + - planks + - planks_2 + - planks_3 + +- type: entity + id: CP14BirchWoodenPlanks10 + parent: CP14BirchWoodenPlanks1 + suffix: 10 + components: + - type: Stack + count: 10 + +- type: entity + id: CP14BirchWoodenPlanks20 + parent: CP14BirchWoodenPlanks1 + suffix: 20 + components: + - type: Stack + count: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml index 6a2bb0ddc5..32f305b4a0 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml @@ -87,6 +87,11 @@ - type: Sprite state: oak_woodplanks - type: FloorTile + placeTileSound: + path: /Audio/Effects/woodenclosetclose.ogg + params: + variation: 0.03 + volume: 2 outputs: - CP14FloorOakWoodPlanks - type: Stack @@ -196,4 +201,77 @@ outputs: - CP14FloorStonebricksSquareCarved - type: Stack - stackType: CP14FloorTileStonebricksSquareCarved \ No newline at end of file + stackType: CP14FloorTileStonebricksSquareCarved + + +- type: entity + parent: CP14FloorTileBase + id: CP14FloorTileBirchWoodplanks + name: birch woodplanks + components: + - type: Sprite + state: birch_woodplanks + - type: FloorTile + placeTileSound: + path: /Audio/Effects/woodenclosetclose.ogg + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorBirchWoodPlanks + - type: Stack + stackType: CP14FloorTileBirchWoodplanks + +- type: entity + parent: CP14FloorTileBase + id: CP14FloorTileBirchWoodplanksBig + name: birch big woodplanks + components: + - type: Sprite + state: birch_woodplanks_big + - type: FloorTile + placeTileSound: + path: /Audio/Effects/woodenclosetclose.ogg + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorBirchWoodPlanksBig + - type: Stack + stackType: CP14FloorTileBirchWoodplanksBig + +- type: entity + parent: CP14FloorTileBase + id: CP14FloorTileBirchWoodplanksCruciform + name: birch cruciform woodplanks + components: + - type: Sprite + state: birch_woodplanks_cruciform + - type: FloorTile + placeTileSound: + path: /Audio/Effects/woodenclosetclose.ogg + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorBirchWoodPlanksCruciform + - type: Stack + stackType: CP14FloorTileBirchWoodplanksCruciform + +- type: entity + parent: CP14FloorTileBase + id: CP14FloorTileBirchWoodplanksStairs + name: birch stairs woodplanks + components: + - type: Sprite + state: birch_woodplanks_stairways + - type: FloorTile + placeTileSound: + path: /Audio/Effects/woodenclosetclose.ogg + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorBirchWoodPlanksStairways + - type: Stack + stackType: CP14FloorTileBirchWoodplanksStairs \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml index ebd1bd037e..640764b0c9 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml @@ -24,7 +24,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.35,-0.4,0.35,0.4" + bounds: "-0.2,-0.2,0.2,0.2" density: 1000 layer: - WallLayer @@ -82,15 +82,6 @@ components: - type: Sprite offset: 0,1.55 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.18,-0.35,0.18,0.35" - density: 2000 - layer: - - WallLayer - type: Destructible thresholds: - trigger: @@ -148,7 +139,7 @@ id: CP14FloraTreeSnow components: - type: Sprite - sprite: _CP14/Structures/Flora/snow_trees.rsi + sprite: _CP14/Structures/Flora/tree_snow.rsi layers: - state: tree01 map: ["random"] @@ -256,15 +247,6 @@ - random: tree01: "" tree02: "" - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.18,-0.35,0.18,0.35" - density: 2000 - layer: - - WallLayer - type: Destructible thresholds: - trigger: @@ -297,3 +279,151 @@ CP14LucensWoodLog: min: 3 max: 6 + +- type: entity + parent: CP14BaseTree + id: CP14FloraTreeBirchSmall + suffix: Small + components: + - type: Sprite + offset: 0,1.3 + sprite: _CP14/Structures/Flora/tree_birch_small.rsi + layers: + - state: tree01 + map: ["random"] + - type: RandomSprite + available: + - random: + tree01: "" + tree02: "" + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/tree_fell.ogg + params: + volume: 5 + variation: 0.05 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14BirchWoodLog: + min: 1 + max: 2 + +- type: entity + parent: CP14BaseTree + id: CP14FloraTreeBirchMedium + suffix: Medium + components: + - type: Sprite + offset: 0,1.8 + sprite: _CP14/Structures/Flora/tree_birch_medium.rsi + layers: + - state: tree01 + map: ["random"] + - type: RandomSprite + available: + - random: + tree01: "" + tree02: "" + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/tree_fell.ogg + params: + volume: 5 + variation: 0.05 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14BirchWoodLog: + min: 2 + max: 4 + +- type: entity + parent: CP14BaseTree + id: CP14FloraTreeBirchLarge + suffix: Large + components: + - type: Sprite + offset: 0,2.6 + sprite: _CP14/Structures/Flora/tree_birch_big.rsi + layers: + - state: tree01 + map: ["random"] + - type: RandomSprite + available: + - random: + tree01: "" + tree02: "" + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/tree_fell.ogg + params: + volume: 5 + variation: 0.05 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14BirchWoodLog: + min: 3 + max: 6 + diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index 764d73cd4f..ce99d5cc99 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -147,6 +147,18 @@ node: WallWooden - type: CP14WallpaperHolder +- type: entity + id: CP14WallWoodenBirch + parent: CP14WallWooden + components: + - type: Sprite + sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi + - type: Icon + sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi + - type: Construction + graph: CP14WallWood + node: WallWoodenBirch + - type: entity id: CP14WallWoodenPalisade name: palisade diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index d973e54f8b..180c7faed6 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -93,7 +93,7 @@ stackEntity: CP14LucensWoodenPlanks1 name: cp14-material-lucens-planks unit: materials-unit-bar - icon: { sprite: _CP14/Objects/Materials/lucens_wood.rsi, state: planks_2 } + icon: { sprite: _CP14/Objects/Materials/wood_lucens.rsi, state: planks_2 } color: "#1a1e22" price: 0 diff --git a/Resources/Prototypes/_CP14/Procedural/grasslands.yml b/Resources/Prototypes/_CP14/Procedural/grasslands.yml index d21b8ea0c3..dbe6bf5ec8 100644 --- a/Resources/Prototypes/_CP14/Procedural/grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/grasslands.yml @@ -126,8 +126,12 @@ - CP14FloorGrassLight - CP14FloorGrassTall entities: + - CP14FloraTreeGreen - CP14FloraTreeGreen - CP14FloraTreeGreenLarge + - CP14FloraTreeBirchSmall + - CP14FloraTreeBirchMedium + - CP14FloraTreeBirchLarge - !type:BiomeEntityLayer # More Rocks threshold: 0.7 noise: @@ -174,8 +178,12 @@ - CP14FloorGrassLight - CP14FloorGrassTall entities: + - CP14FloraTreeGreen - CP14FloraTreeGreen - CP14FloraTreeGreenLarge + - CP14FloraTreeBirchSmall + - CP14FloraTreeBirchMedium + - CP14FloraTreeBirchLarge - type: biomeTemplate id: CP14GrasslandHills # Холмы diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml index de4c5470ac..1e2d89d11d 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml @@ -8,7 +8,7 @@ edges: - to: CP14WoodenBed steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 - material: CP14Cloth amount: 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml index 0b302f5400..e58ca892b7 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml @@ -8,7 +8,7 @@ completed: - !type:SnapToGrid steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 - material: CP14Nail amount: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml index fd5a36abd3..d2ef73b335 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml @@ -8,7 +8,7 @@ completed: - !type:SnapToGrid steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 4 - material: CP14Nail amount: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml index 8a083342ff..e9aef0720a 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml @@ -8,7 +8,7 @@ edges: - to: CP14CurtainsWhite steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 1 doAfter: 2 - material: CP14Nail diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml index c3ecfa6907..d8b02a1b6f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml @@ -11,7 +11,7 @@ - material: CP14Stone amount: 3 doAfter: 2 - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/mannequin.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/mannequin.yml index 2677e7b5fb..3e451d18ef 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/mannequin.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/mannequin.yml @@ -10,7 +10,7 @@ completed: - !type:SnapToGrid { } steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 5 doAfter: 3 - node: CP14mannequin diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml index 37e7467d20..741908c9df 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml @@ -8,7 +8,7 @@ edges: - to: CP14WallmountOrdersBorder steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 3 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml index dd84b37b14..c1f93c953c 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml @@ -8,7 +8,7 @@ edges: - to: CP14ChairWooden steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - node: CP14ChairWooden @@ -24,7 +24,7 @@ edges: - to: CP14BenchWood steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 2 - node: CP14BenchWood diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml index 9d104229c4..e43e5e1132 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml @@ -8,7 +8,7 @@ edges: - to: CP14TableWooden steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 2 - node: CP14TableWooden @@ -24,7 +24,7 @@ edges: - to: CP14TableWoodenRound steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 2 - node: CP14TableWoodenRound @@ -40,7 +40,7 @@ edges: - to: CP14TableWoodenCounter steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 2 - node: CP14TableWoodenCounter @@ -56,7 +56,7 @@ edges: - to: CP14Workbench steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 2 - node: CP14Workbench @@ -72,7 +72,7 @@ edges: - to: CP14WorkbenchCooking steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 2 - node: CP14WorkbenchCooking @@ -88,7 +88,7 @@ edges: - to: CP14WorkbenchSewing steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 2 - node: CP14WorkbenchSewing diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml index 782dd75b31..f07bb43feb 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml @@ -8,7 +8,7 @@ edges: - to: CP14WoodenPallet steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - node: CP14WoodenPallet diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml index 8afdfa2ff1..cc5d94563b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml @@ -9,7 +9,7 @@ - !type:SnapToGrid southRotation: true steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 @@ -18,16 +18,13 @@ edges: - to: start completed: - - !type:GivePrototype - prototype: CP14WoodenPlanks1 - amount: 2 - !type:DeleteEntity {} steps: - tool: Screwing doAfter: 1 - to: CP14target steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 1 - material: CP14Nail @@ -64,7 +61,7 @@ completed: - !type:SnapToGrid steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 5 - material: CP14Cloth amount: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml index b1ded56d19..699b9ab35d 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml @@ -8,7 +8,7 @@ edges: - to: CP14BaseBarrel steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 5 doAfter: 3 - material: CP14Nail @@ -27,7 +27,7 @@ edges: - to: CP14CraneBarrel steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 5 doAfter: 3 - material: CP14Nail @@ -46,7 +46,7 @@ edges: - to: CP14CraneBarrelSmall steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 3 - material: CP14Nail diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml index a487fdadb9..f11ba020a8 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml @@ -8,7 +8,7 @@ edges: - to: CP14WoodenChestFrame steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 @@ -17,7 +17,7 @@ edges: - to: CP14WoodenChest steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - material: CP14Nail diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml index 56b6707a47..b7a34df729 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml @@ -8,7 +8,7 @@ completed: - !type:SnapToGrid steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 - material: CP14Cloth amount: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml index a721ca8bf8..611c3c4dca 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml @@ -8,7 +8,7 @@ completed: - !type:SnapToGrid steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 - material: CP14Nail amount: 1 @@ -26,7 +26,7 @@ completed: - !type:SnapToGrid steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 4 - material: CP14Nail amount: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml index fb3b0cae5d..d94fe351c2 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml @@ -8,7 +8,7 @@ edges: - to: CP14WoodenDoorFrame steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 @@ -30,7 +30,7 @@ doAfter: 1 - to: CP14WoodenDoor steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - to: CP14WoodenDoorWindowed @@ -47,9 +47,6 @@ edges: - to: start completed: - - !type:SpawnPrototype - prototype: CP14WoodenPlanks1 - amount: 2 - !type:DeleteEntity {} steps: - tool: Prying #TODO - new tool @@ -76,10 +73,6 @@ entity: CP14WoodenDoor edges: - to: CP14WoodenDoorFrame - completed: - - !type:SpawnPrototype - prototype: CP14WoodenPlanks1 - amount: 2 steps: - tool: Prying #TODO - new tool doAfter: 5 @@ -88,10 +81,6 @@ entity: CP14WoodenDoorMirrored edges: - to: CP14WoodenDoorFrameMirrored - completed: - - !type:SpawnPrototype - prototype: CP14WoodenPlanks1 - amount: 2 steps: - tool: Prying #TODO - new tool doAfter: 5 @@ -100,10 +89,6 @@ entity: CP14WoodenDoorWindowed edges: - to: CP14WoodenDoorFrame - completed: - - !type:SpawnPrototype - prototype: CP14WoodenPlanks1 - amount: 2 steps: - tool: Prying #TODO - new tool doAfter: 5 @@ -112,10 +97,6 @@ entity: CP14WoodenDoorWindowedMirrored edges: - to: CP14WoodenDoorFrameMirrored - completed: - - !type:SpawnPrototype - prototype: CP14WoodenPlanks1 - amount: 2 steps: - tool: Prying #TODO - new tool doAfter: 5 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Fence/wooden_fence.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Fence/wooden_fence.yml index a38235a370..0e96e4fdda 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Fence/wooden_fence.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Fence/wooden_fence.yml @@ -8,32 +8,32 @@ edges: - to: CP14FenceWoodSmallStraight steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - to: CP14FenceWoodSmallCorner steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - to: CP14FenceWoodSmallGate steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - to: CP14FenceWoodStraight steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 4 doAfter: 2 - to: CP14FenceWoodCorner steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 4 doAfter: 2 - to: CP14FenceWoodGate steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 4 doAfter: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml index dbc7d77cc7..35630f3b2e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml @@ -6,7 +6,7 @@ edges: - to: CP14RoofWooden steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/lighting.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/lighting.yml index 2293692b79..0cd8ae795b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/lighting.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/lighting.yml @@ -8,7 +8,7 @@ edges: - to: CP14WallmountTorch steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 3 doAfter: 3 - material: CP14Cloth diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml index c273b9d16b..0b11dcdcd2 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml @@ -8,7 +8,7 @@ edges: - to: CP14WallmountBarShelfA steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - node: CP14WallmountBarShelfA @@ -24,7 +24,7 @@ edges: - to: CP14WallmountBarShelfB steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 - node: CP14WallmountBarShelfB diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml index d982447f06..8b09764110 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml @@ -9,7 +9,7 @@ - !type:SnapToGrid southRotation: true steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 2 doAfter: 2 @@ -35,6 +35,16 @@ doAfter: 1 - tool: CP14Hammering doAfter: 2 + - to: WallWoodenBirch + steps: + - material: CP14BirchWoodenPlanks + amount: 2 + doAfter: 1 + - material: CP14Nail + amount: 2 + doAfter: 1 + - tool: CP14Hammering + doAfter: 2 - to: WindowWooden steps: - material: CP14GlassSheet @@ -49,6 +59,14 @@ - tool: CP14Hammering doAfter: 2 + - node: WallWoodenBirch + entity: CP14WallWoodenBirch + edges: + - to: FrameWooden + steps: + - tool: CP14Hammering + doAfter: 2 + - node: WindowWooden entity: CP14WindowWooden @@ -63,7 +81,7 @@ completed: - !type:SnapToGrid steps: - - material: CP14WoodenPlanks + - stackGroup: WoodenPlanks amount: 4 doAfter: 2 - node: CP14WallWoodenPalisade diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml index 0efaa2c6ed..8c5a41ec46 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml @@ -16,6 +16,24 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + name: wooden birch wall + description: Sturdy enough to cover you from threats or cold winds. + id: CP14WoodenWallBirch + graph: CP14WallWood + startNode: start + targetNode: WallWoodenBirch + category: construction-category-structures + icon: + sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction crystallPunkAllowed: true name: palisade diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index a09bfad224..62dbeb0141 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -3,8 +3,8 @@ tag: CP14RecipeWorkbench craftTime: 2 requirements: - - !type:StackResource - stack: CP14WoodenPlanks + - !type:StackGroupResource + group: WoodenPlanks count: 3 - !type:ProtoIdResource protoId: CP14Rope @@ -16,8 +16,8 @@ tag: CP14RecipeWorkbench craftTime: 3 requirements: - - !type:StackResource - stack: CP14WoodenPlanks + - !type:StackGroupResource + group: WoodenPlanks count: 2 - !type:StackResource stack: CP14Nail @@ -29,8 +29,8 @@ tag: CP14RecipeWorkbench craftTime: 3 requirements: - - !type:StackResource - stack: CP14WoodenPlanks + - !type:StackGroupResource + group: WoodenPlanks count: 2 result: CP14SmokingPipe @@ -39,8 +39,8 @@ tag: CP14RecipeWorkbench craftTime: 3 requirements: - - !type:StackResource - stack: CP14WoodenPlanks + - !type:StackGroupResource + group: WoodenPlanks count: 2 result: CP14Plate @@ -49,8 +49,8 @@ tag: CP14RecipeWorkbench craftTime: 3 requirements: - - !type:StackResource - stack: CP14WoodenPlanks + - !type:StackGroupResource + group: WoodenPlanks count: 2 - !type:StackResource stack: CP14Cloth @@ -115,8 +115,8 @@ tag: CP14RecipeWorkbench craftTime: 2 requirements: - - !type:StackResource - stack: CP14WoodenPlanks + - !type:StackGroupResource + group: WoodenPlanks count: 4 - !type:ProtoIdResource protoId: CP14String @@ -150,8 +150,8 @@ tag: CP14RecipeWorkbench craftTime: 1 requirements: - - !type:StackResource - stack: CP14WoodenPlanks + - !type:StackGroupResource + group: WoodenPlanks - !type:ProtoIdResource protoId: CP14CrystalShardBase result: CP14CrayonWhite diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml index a5b6dc8fef..8c472ff808 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml @@ -117,4 +117,48 @@ stack: CP14WoodenPlanks count: 1 result: CP14FloorTileOakWoodplanksStairs + resultCount: 4 + +- type: CP14Recipe + id: CP14FloorTileBirchWoodplanks + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14BirchWoodenPlanks + count: 1 + result: CP14FloorTileBirchWoodplanks + resultCount: 4 + +- type: CP14Recipe + id: CP14FloorTileBirchWoodplanksBig + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14BirchWoodenPlanks + count: 1 + result: CP14FloorTileBirchWoodplanksBig + resultCount: 4 + +- type: CP14Recipe + id: CP14FloorTileBirchWoodplanksCruciform + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14BirchWoodenPlanks + count: 1 + result: CP14FloorTileBirchWoodplanksCruciform + resultCount: 4 + +- type: CP14Recipe + id: CP14FloorTileBirchWoodplanksStairs + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14BirchWoodenPlanks + count: 1 + result: CP14FloorTileBirchWoodplanksStairs resultCount: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml index 7e0d19b7e2..043f63fc30 100644 --- a/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml @@ -73,4 +73,32 @@ name: square carved stonebricks spawn: CP14FloorTileStonebricksSquareCarved icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: stonebrick_square_carved } + maxCount: 30 + +- type: stack + id: CP14FloorTileBirchWoodplanks + name: birch woodplanks + spawn: CP14FloorTileOakWoodplanks + icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks } + maxCount: 30 + +- type: stack + id: CP14FloorTileBirchWoodplanksBig + name: birch big woodplanks + spawn: CP14FloorTileBirchWoodplanksBig + icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_big } + maxCount: 30 + +- type: stack + id: CP14FloorTileBirchWoodplanksCruciform + name: birch cruciform woodplanks + spawn: CP14FloorTileBirchWoodplanksCruciform + icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_cruciform } + maxCount: 30 + +- type: stack + id: CP14FloorTileBirchWoodplanksStairs + name: birch stairs woodplanks + spawn: CP14FloorTileBirchWoodplanksStairs + icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_stairways } maxCount: 30 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index 0ed9e839bb..659eec30bc 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -26,6 +26,20 @@ icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 } maxCount: 20 +- type: stack + id: CP14BirchWoodenPlanks + name: cp14-stack-wood-planks-birch + spawn: CP14BirchWoodenPlanks1 + icon: { sprite: _CP14/Objects/Materials/wood_birch.rsi, state: planks_2 } + maxCount: 20 + +- type: stack + id: CP14LucensWoodenPlanks + name: cp14-material-lucens-planks + spawn: CP14LucensWoodenPlanks1 + icon: { sprite: _CP14/Objects/Materials/wood_lucens.rsi, state: planks_2 } + maxCount: 20 + - type: stack id: CP14Nail name: cp14-stack-nails @@ -68,13 +82,6 @@ icon: { sprite: _CP14/Objects/Materials/mithril_bar.rsi, state: bar_2 } maxCount: 10 -- type: stack - id: CP14LucensWoodenPlanks - name: cp14-material-lucens-planks - spawn: CP14LucensWoodenPlanks1 - icon: { sprite: _CP14/Objects/Materials/lucens_wood.rsi, state: planks_2 } - maxCount: 20 - - type: stack id: CP14GlassSheet name: cp14-stack-glass-sheet diff --git a/Resources/Prototypes/_CP14/Stacks/stack_groups.yml b/Resources/Prototypes/_CP14/Stacks/stack_groups.yml new file mode 100644 index 0000000000..78c8695116 --- /dev/null +++ b/Resources/Prototypes/_CP14/Stacks/stack_groups.yml @@ -0,0 +1,7 @@ +- type: CP14StackGroup + id: WoodenPlanks + name: cp14-stack-group-wooden-planks-any + stacks: + - CP14WoodenPlanks + - CP14BirchWoodenPlanks + - CP14LucensWoodenPlanks \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Tiles/woodplanks.yml b/Resources/Prototypes/_CP14/Tiles/woodplanks.yml index 9a87c98832..3c158bf764 100644 --- a/Resources/Prototypes/_CP14/Tiles/woodplanks.yml +++ b/Resources/Prototypes/_CP14/Tiles/woodplanks.yml @@ -276,7 +276,7 @@ baseTurf: CP14FloorFoundation isSubfloor: false deconstructTools: [ Prying ] - itemDrop: CP14WoodenPlanks1 + itemDrop: CP14FloorTileBirchWoodplanks footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -307,7 +307,7 @@ baseTurf: CP14FloorFoundation isSubfloor: false deconstructTools: [ Prying ] - itemDrop: CP14WoodenPlanks1 + itemDrop: CP14FloorTileBirchWoodplanksBig footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -338,7 +338,7 @@ baseTurf: CP14FloorFoundation isSubfloor: false deconstructTools: [ Prying ] - itemDrop: CP14WoodenPlanks1 + itemDrop: CP14FloorTileBirchWoodplanksCruciform footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -369,7 +369,7 @@ baseTurf: CP14FloorFoundation isSubfloor: false deconstructTools: [ Prying ] - itemDrop: CP14WoodenPlanks1 + itemDrop: CP14FloorTileBirchWoodplanksStairs footstepSounds: collection: FootstepWood heatCapacity: 10000 diff --git a/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log.png b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log.png new file mode 100644 index 0000000000..48a65909c0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log_2.png b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log_2.png new file mode 100644 index 0000000000..7ff8e8b94f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log_2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log_3.png b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log_3.png new file mode 100644 index 0000000000..1049ddfdb8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/log_3.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/meta.json new file mode 100644 index 0000000000..0d219ebb18 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk", + "states": [ + { + "name": "log" + }, + { + "name": "log_2" + }, + { + "name": "log_3" + }, + { + "name": "planks" + }, + { + "name": "planks_2" + }, + { + "name": "planks_3" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks.png b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks.png new file mode 100644 index 0000000000..65ba61b83a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks_2.png b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks_2.png new file mode 100644 index 0000000000..6e4ad91857 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks_2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks_3.png b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks_3.png new file mode 100644 index 0000000000..909993570a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood_birch.rsi/planks_3.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/log.png b/Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/log.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/log.png rename to Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/log.png diff --git a/Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/log_2.png b/Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/log_2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/log_2.png rename to Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/log_2.png diff --git a/Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/log_3.png b/Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/log_3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/log_3.png rename to Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/log_3.png diff --git a/Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/planks.png b/Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/planks.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/planks.png rename to Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/planks.png diff --git a/Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/planks_2.png b/Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/planks_2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/planks_2.png rename to Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/planks_2.png diff --git a/Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/planks_3.png b/Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/planks_3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Materials/lucens_wood.rsi/planks_3.png rename to Resources/Textures/_CP14/Objects/Materials/wood_lucens.rsi/planks_3.png diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks.png b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks.png new file mode 100644 index 0000000000..902df17e2a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks.png differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_big.png b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_big.png new file mode 100644 index 0000000000..d6d42fa8d1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_big.png differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_cruciform.png b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_cruciform.png new file mode 100644 index 0000000000..f7453be84a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_cruciform.png differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_stairways.png b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_stairways.png new file mode 100644 index 0000000000..7600eddec5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/birch_woodplanks_stairways.png differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json index 75c1f84aab..a1fabcdabd 100644 --- a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json @@ -7,6 +7,18 @@ "y": 32 }, "states": [ + { + "name": "birch_woodplanks" + }, + { + "name": "birch_woodplanks_big" + }, + { + "name": "birch_woodplanks_cruciform" + }, + { + "name": "birch_woodplanks_stairways" + }, { "name": "foundation" }, diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/oak_woodplanks_stairways.png b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/oak_woodplanks_stairways.png index ea7e78188d..8525eae284 100644 Binary files a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/oak_woodplanks_stairways.png and b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/oak_woodplanks_stairways.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/meta.json new file mode 100644 index 0000000000..f76e9a9dee --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd and Omsoyk", + "size": { + "x": 80, + "y": 204 + }, + "states": [ + { + "name": "tree01" + }, + { + "name": "tree02" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/tree01.png b/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/tree01.png new file mode 100644 index 0000000000..09378cfac2 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/tree01.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/tree02.png b/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/tree02.png new file mode 100644 index 0000000000..4eaad614fc Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/tree02.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/meta.json new file mode 100644 index 0000000000..aa435515e9 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd and Omsoyk", + "size": { + "x": 64, + "y": 156 + }, + "states": [ + { + "name": "tree01" + }, + { + "name": "tree02" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/tree01.png b/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/tree01.png new file mode 100644 index 0000000000..11ae9e809b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/tree01.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/tree02.png b/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/tree02.png new file mode 100644 index 0000000000..2f00b8932f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/tree02.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/meta.json new file mode 100644 index 0000000000..c01f06b8f9 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd and Omsoyk", + "size": { + "x": 64, + "y": 124 + }, + "states": [ + { + "name": "tree01" + }, + { + "name": "tree02" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/tree01.png b/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/tree01.png new file mode 100644 index 0000000000..d1071ed400 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/tree01.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/tree02.png b/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/tree02.png new file mode 100644 index 0000000000..6feab7c1f4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/tree02.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree01.png b/Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree01.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree01.png rename to Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree01.png diff --git a/Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree02.png b/Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree02.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree02.png rename to Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree02.png diff --git a/Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree03.png b/Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree03.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree03.png rename to Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree03.png diff --git a/Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree04.png b/Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree04.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree04.png rename to Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree04.png diff --git a/Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree05.png b/Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree05.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree05.png rename to Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree05.png diff --git a/Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree06.png b/Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree06.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/tree06.png rename to Resources/Textures/_CP14/Structures/Flora/tree_snow.rsi/tree06.png diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/full.png new file mode 100644 index 0000000000..ac81c2f432 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/meta.json new file mode 100644 index 0000000000..f032108316 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "All right reserved", + "copyright": "Created by jaraten (Discord/Github), recolor by omsoyk", + "states": [ + { + "name": "wood0", + "directions": 4 + }, + { + "name": "wood1", + "directions": 4 + }, + { + "name": "wood2", + "directions": 4 + }, + { + "name": "wood3", + "directions": 4 + }, + { + "name": "wood4", + "directions": 4 + }, + { + "name": "wood5", + "directions": 4 + }, + { + "name": "wood6", + "directions": 4 + }, + { + "name": "wood7", + "directions": 4 + }, + { + "name": "full" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood0.png new file mode 100644 index 0000000000..90eda1c543 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood1.png new file mode 100644 index 0000000000..89760d70ae Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood2.png new file mode 100644 index 0000000000..90eda1c543 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood3.png new file mode 100644 index 0000000000..bd6250e6ce Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood4.png new file mode 100644 index 0000000000..f0508e8a03 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood5.png new file mode 100644 index 0000000000..cd02ee1563 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood6.png new file mode 100644 index 0000000000..e5489f88a7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood7.png new file mode 100644 index 0000000000..d5cbf40e2b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/wood7.png differ