diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index bf5ed260a6..5a229ecc88 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -1 +1 @@ -cp14-material-wood-log = wooden log +cp14-material-wooden-planks = wooden planks \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/tools/tool-qualities.ftl b/Resources/Locale/en-US/_CP14/tools/tool-qualities.ftl new file mode 100644 index 0000000000..4790ad8c72 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/tools/tool-qualities.ftl @@ -0,0 +1,2 @@ +cp14-tool-quality-digging-name = Digging +cp14-tool-quality-digging-tool-name = Shovel \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index 64bfa4c2b4..00dc67d512 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -1 +1 @@ -cp14-material-wood-log = деревянное бревно \ No newline at end of file +cp14-material-wooden-planks = деревянные доски \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/tools/tool-qualities.ftl b/Resources/Locale/ru-RU/_CP14/tools/tool-qualities.ftl new file mode 100644 index 0000000000..e015c8673c --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/tools/tool-qualities.ftl @@ -0,0 +1,2 @@ +cp14-tool-quality-digging-name = Копание +cp14-tool-quality-digging-tool-name = Лопата \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index f4ac9e7ee1..acbe005738 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -213,6 +213,7 @@ - type: entity parent: MaterialBase id: MaterialWoodPlank + noSpawn: true name: wood suffix: Full components: @@ -251,6 +252,7 @@ - type: entity parent: MaterialWoodPlank id: MaterialWoodPlank10 + noSpawn: true suffix: 10 components: - type: Stack @@ -259,6 +261,7 @@ - type: entity parent: MaterialWoodPlank id: MaterialWoodPlank1 + noSpawn: true suffix: Single components: - type: Stack diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index 64b919441b..a1e67ff069 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -40,8 +40,8 @@ count: 10 - type: entity - id: CP14WoodLog1 - parent: + id: CP14WoodLog + parent: - BaseItem - CP14BaseWooden name: wooden log @@ -49,24 +49,19 @@ components: - type: Item size: Normal + shape: + - 0,0,1,0 - type: Sprite - sprite: _CP14/Objects/Materials/logs.rsi + sprite: _CP14/Objects/Materials/wood.rsi layers: - state: log - map: ["base"] - - type: Appearance - - type: Stack - stackType: CP14WoodLog - count: 1 - baseLayer: base - layerStates: - - log - - log_2 - - log_3 - - type: Material - - type: PhysicalComposition # точно ли это нужно? - materialComposition: - CP14WoodLog: 100 + map: ["random"] + - type: RandomSprite + available: + - random: + log: "" + log_2: "" + log_3: "" - type: Tag tags: - CP14FireplaceFuel @@ -76,14 +71,67 @@ canResistFire: false alwaysCombustible: true canExtinguish: true + cP14FireplaceFuel: 30 damage: types: Heat: 1 + - type: Log + spawnedPrototype: CP14WoodenPlanks1 + spawnCount: 3 - type: entity - id: CP14WoodLog10 - parent: CP14WoodLog1 - suffix: 10 + id: CP14WoodenPlanks1 + parent: + - BaseItem + - CP14BaseWooden + name: wooden planks + description: Treated and ready-to-use wood. + 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: FloorTile + placeTileSound: + path: /Audio/Effects/woodenclosetclose.ogg + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorWoodPlanks + - type: Stack + stackType: CP14WoodenPlanks + count: 1 + baseLayer: base + layerStates: + - planks + - planks_2 + - planks_3 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14WoodenPlanks: 100 + +- type: entity + id: CP14WoodenPlanks10 + parent: CP14WoodenPlanks1 components: - type: Stack count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Wallmount/wallmount.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/wallmount.yml similarity index 100% rename from Resources/Prototypes/_CP14/Entities/Structures/Wallmount/wallmount.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Decorations/wallmount.yml diff --git a/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/crystal.yml similarity index 73% rename from Resources/Prototypes/_CP14/Entities/Structures/crystal.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Flora/crystal.yml index 3d8c17083e..c290c6d1d0 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/crystal.yml @@ -1,3 +1,124 @@ +# Wallmount crystall + +- type: entity + id: CP14WallmountCrystalBase + parent: + - BaseStructure + abstract: true + placement: + mode: SnapgridCenter + components: + - type: Sprite + drawdepth: Mobs + sprite: _CP14/Structures/Wallmount/wallmount_crystal.rsi + layers: + - state: crystal1 + map: ["random"] + shader: unshaded + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "0.49,0.49,-0.49,0.36" + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - type: RandomSprite + available: + - random: + crystal1: Inherit + crystal2: Inherit + crystal3: Inherit + - type: PointLight + radius: 1.5 + energy: 1 + +- type: entity + id: CP14WallmountCrystalRubies + parent: CP14WallmountCrystalBase + name: sparkling rubies + description: wawa + components: + - type: RandomSprite + cP14InheritBaseColor: "#ff3d0b" + - type: PointLight + color: "#ff3d0b" + +- type: entity + id: CP14WallmountCrystalTopazes + parent: CP14WallmountCrystalBase + name: sparkling topazes + description: wawa + components: + - type: RandomSprite + cP14InheritBaseColor: "#ffe269" + - type: PointLight + color: "#ffe269" + +- type: entity + id: CP14WallmountCrystalEmeralds + parent: CP14WallmountCrystalBase + name: sparkling emeralds + description: wawa + components: + - type: RandomSprite + cP14InheritBaseColor: "#30be81" + - type: PointLight + color: "#30be81" + +- type: entity + id: CP14WallmountCrystalSapphires + parent: CP14WallmountCrystalBase + name: sparkling sapphires + description: wawa + components: + - type: RandomSprite + cP14InheritBaseColor: "#5eabeb" + - type: PointLight + color: "#5eabeb" + +- type: entity + id: CP14WallmountCrystalAmethysts + parent: CP14WallmountCrystalBase + name: sparkling amethysts + description: wawa + components: + - type: RandomSprite + cP14InheritBaseColor: "#a878d1" + - type: PointLight + color: "#a878d1" + +- type: entity + id: CP14WallmountCrystalDiamonds + parent: CP14WallmountCrystalBase + name: sparkling diamonds + description: wawa + components: + - type: RandomSprite + cP14InheritBaseColor: "#f8f8f8" + - type: PointLight + color: "#f8f8f8" + +# Floor Crystal + - type: entity id: CP14CrystalBase abstract: true diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml index 4e82649843..d032bf6ea5 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml @@ -53,9 +53,13 @@ acts: [ "Destruction" ] - !type:SpawnEntitiesBehavior spawn: - CP14WoodLog1: + CP14WoodLog: min: 1 max: 3 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14WoodenPlanks: 100 - type: entity parent: CP14BaseTree @@ -97,7 +101,7 @@ acts: [ "Destruction" ] - !type:SpawnEntitiesBehavior spawn: - CP14WoodLog1: + CP14WoodLog: min: 3 max: 6 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml b/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml new file mode 100644 index 0000000000..33483495aa --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml @@ -0,0 +1,36 @@ +- type: entity + id: CP14FrameWooden + name: wooden wall frame + parent: BaseStructureDynamic + description: Wooden frame for any wooden wall. + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Sprite + drawdepth: Mobs + sprite: _CP14/Structures/Walls/wall_frame.rsi + state: wooden + - type: PlacementReplacement + key: walls + - type: Transform + anchored: true + noRot: false + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.45" + density: 60 + mask: + - MachineMask + layer: + - GlassAirlockLayer + - type: InteractionOutline + - type: Construction + graph: CP14Wall + node: FrameWooden \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Wallmount/crystal.yml b/Resources/Prototypes/_CP14/Entities/Structures/Wallmount/crystal.yml deleted file mode 100644 index 58afd1c442..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Structures/Wallmount/crystal.yml +++ /dev/null @@ -1,116 +0,0 @@ -- type: entity - id: CP14WallmountCrystalBase - parent: - - BaseStructure - abstract: true - placement: - mode: SnapgridCenter - components: - - type: Sprite - drawdepth: Mobs - sprite: _CP14/Structures/Wallmount/wallmount_crystal.rsi - layers: - - state: crystal1 - map: ["random"] - shader: unshaded - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Glass - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "0.49,0.49,-0.49,0.36" - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - - type: RandomSprite - available: - - random: - crystal1: Inherit - crystal2: Inherit - crystal3: Inherit - - type: PointLight - radius: 1.5 - energy: 1 - -- type: entity - id: CP14WallmountCrystalRubies - parent: CP14WallmountCrystalBase - name: sparkling rubies - description: wawa - components: - - type: RandomSprite - cP14InheritBaseColor: "#ff3d0b" - - type: PointLight - color: "#ff3d0b" - -- type: entity - id: CP14WallmountCrystalTopazes - parent: CP14WallmountCrystalBase - name: sparkling topazes - description: wawa - components: - - type: RandomSprite - cP14InheritBaseColor: "#ffe269" - - type: PointLight - color: "#ffe269" - -- type: entity - id: CP14WallmountCrystalEmeralds - parent: CP14WallmountCrystalBase - name: sparkling emeralds - description: wawa - components: - - type: RandomSprite - cP14InheritBaseColor: "#30be81" - - type: PointLight - color: "#30be81" - -- type: entity - id: CP14WallmountCrystalSapphires - parent: CP14WallmountCrystalBase - name: sparkling sapphires - description: wawa - components: - - type: RandomSprite - cP14InheritBaseColor: "#5eabeb" - - type: PointLight - color: "#5eabeb" - -- type: entity - id: CP14WallmountCrystalAmethysts - parent: CP14WallmountCrystalBase - name: sparkling amethysts - description: wawa - components: - - type: RandomSprite - cP14InheritBaseColor: "#a878d1" - - type: PointLight - color: "#a878d1" - -- type: entity - id: CP14WallmountCrystalDiamonds - parent: CP14WallmountCrystalBase - name: sparkling diamonds - description: wawa - components: - - type: RandomSprite - cP14InheritBaseColor: "#f8f8f8" - - type: PointLight - color: "#f8f8f8" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 1b367dbfea..f70ae753bf 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -5,9 +5,9 @@ description: A solid stone natural wall. It has a cave-like coldness to it. components: - type: Sprite - sprite: _CP14/Structures/Walls/cave_stone.rsi + sprite: _CP14/Structures/Walls/Natural/cave_stone.rsi - type: Icon - sprite: _CP14/Structures/Walls/cave_stone.rsi + sprite: _CP14/Structures/Walls/Natural/cave_stone.rsi - type: IconSmooth base: wall - type: Damageable @@ -92,9 +92,9 @@ description: A solid stone natural wall. You see the tantalizing particles of silver in it. components: - type: Sprite - sprite: _CP14/Structures/Walls/cave_stone_silver.rsi + sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi - type: Icon - sprite: _CP14/Structures/Walls/cave_stone_silver.rsi + sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi - type: Destructible thresholds: - trigger: @@ -123,9 +123,9 @@ description: A solid stone natural wall. You see the tantalizing particles of gold in it. components: - type: Sprite - sprite: _CP14/Structures/Walls/cave_stone_gold.rsi + sprite: _CP14/Structures/Walls/Natural/cave_stone_gold.rsi - type: Icon - sprite: _CP14/Structures/Walls/cave_stone_gold.rsi + sprite: _CP14/Structures/Walls/Natural/cave_stone_gold.rsi - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index 21f45cf859..6323dd948a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -13,116 +13,77 @@ drawdepth: Mobs - type: SpriteFade - type: IconSmooth - key: CPwall + key: CP14wall base: stone - -- type: entity - id: CP14WallDebug - name: debug wall - suffix: DEBUG - parent: CP14BaseWall - description: Ужасы - components: - - type: Sprite - sprite: _CP14/Structures/Walls/TEMPLATE.rsi - type: Icon - sprite: _CP14/Structures/Walls/TEMPLATE.rsi state: full - - type: IconSmooth - base: wood - + - type: PlacementReplacement + key: walls + - type: entity id: CP14WallStonebrick name: stone brick wall parent: CP14BaseWall - description: Ужасы + description: Bruh components: - type: Sprite sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - type: Icon sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: full - type: IconSmooth base: stonebricks - type: entity - id: CP14WindowDebug #TODO remove - name: debug window - suffix: DEBUG + id: CP14WallWhitebrick + name: white brick wall parent: CP14BaseWall - description: Ужасы + description: Bruh components: - - type: Occluder - enabled: false - type: Sprite - sprite: _CP14/Structures/Windows/TEMPLATE_WINDOW.rsi - drawdepth: Mobs + sprite: _CP14/Structures/Walls/whitebricks_stone_wall.rsi - type: Icon - sprite: _CP14/Structures/Windows/TEMPLATE_WINDOW.rsi - state: full + sprite: _CP14/Structures/Walls/whitebricks_stone_wall.rsi + - type: IconSmooth + base: stonebricks + +- type: entity + id: CP14WallBrownbrick + name: brick wall + parent: CP14BaseWall + description: Bruh + components: + - type: Sprite + sprite: _CP14/Structures/Walls/bricks_wall.rsi + - type: Icon + sprite: _CP14/Structures/Walls/bricks_wall.rsi + - type: IconSmooth + base: bricksA + +- type: entity + id: CP14WallWooden + name: wooden wall + parent: CP14BaseWall + description: Bruh + components: + - type: Sprite + sprite: _CP14/Structures/Walls/wooden_wall.rsi + - type: Icon + sprite: _CP14/Structures/Walls/wooden_wall.rsi - type: IconSmooth base: wood - key: CPwindow - type: entity - id: CP14WindowStoneBrick - parent: CP14WindowDebug - name: stone brick window - description: A stone brick wall with a glass window in it. - components: - - type: Sprite - sprite: _CP14/Structures/Windows/stone_bricks_window.rsi - drawdepth: Mobs - - type: Icon - sprite: _CP14/Structures/Windows/stone_bricks_window.rsi - state: full - - type: IconSmooth - base: stone_bricks_window - -- type: entity - id: CP14CardboardWall + id: CP14WallCardboard name: cardboard Wall description: A thin, flimsy wall made of paper and cardboard. Popular in warm countries. parent: - - CP14BaseWall + - CP14WallWooden - CP14BaseWooden components: - type: Sprite - sprite: _CP14/Structures/Walls/cardboard_walls.rsi + sprite: _CP14/Structures/Walls/cardboard_wall.rsi - type: Icon - sprite: _CP14/Structures/Walls/cardboard_walls.rsi - state: full - - type: IconSmooth - base: wood - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - MaterialWoodPlank: - min: 2 - max: 3 - - type: FireVisuals - sprite: _CP14/Effects/fire.rsi - normalState: full \ No newline at end of file + sprite: _CP14/Structures/Walls/cardboard_wall.rsi + - type: Construction + graph: CP14Wall + node: WallCardboard \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml b/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml new file mode 100644 index 0000000000..1d718daf49 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml @@ -0,0 +1,40 @@ +- type: entity + id: CP14WindowBase + abstract: true + parent: Window + components: + - type: Sprite + drawdepth: Mobs + - type: Icon + state: full + - type: IconSmooth + key: CP14window + - type: PlacementReplacement + key: walls + +- type: entity + id: CP14WindowStoneBrick + parent: CP14WindowBase + name: stone brick window + description: A stone brick wall with a glass window in it. + components: + - type: Sprite + sprite: _CP14/Structures/Windows/stone_bricks_window.rsi + - type: Icon + sprite: _CP14/Structures/Windows/stone_bricks_window.rsi + state: full + - type: IconSmooth + base: stone_bricks_window + +- type: entity + id: CP14WindowWooden + parent: CP14WindowBase + name: wooden window + description: A wooden wall with a glass window in it. + components: + - type: Sprite + sprite: _CP14/Structures/Windows/wooden_window.rsi + - type: Icon + sprite: _CP14/Structures/Windows/wooden_window.rsi + - type: IconSmooth + base: wood_window \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/Materials/simple.yml b/Resources/Prototypes/_CP14/Reagents/Materials/simple.yml index 9226257d87..2765e54d21 100644 --- a/Resources/Prototypes/_CP14/Reagents/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Reagents/Materials/simple.yml @@ -1,8 +1,8 @@ - type: material - id: CP14WoodLog - stackEntity: CP14WoodLog1 - name: cp14-material-wood-log - unit: materials-unit-piece - icon: { sprite: _CP14/Objects/Materials/logs.rsi, state: log_2 } + id: CP14WoodenPlanks + stackEntity: CP14WoodenPlanks1 + name: cp14-material-wooden-planks + unit: materials-unit-plank + icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 } color: "#874d3a" price: 0 #? \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml index b834a7c7ff..d8a9c06428 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/bonfire.yml @@ -8,7 +8,7 @@ edges: - to: CP14Bonfire steps: - - material: WoodPlank + - material: CP14WoodenPlanks amount: 5 doAfter: 3 @@ -25,7 +25,7 @@ edges: - to: CP14WallmountTorch steps: - - material: WoodPlank + - material: CP14WoodenPlanks amount: 5 doAfter: 3 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/chests.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/chests.yml index b8b2f37e6b..55a91f14d0 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/chests.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/chests.yml @@ -8,7 +8,7 @@ edges: - to: CP14WoodenChest steps: - - material: WoodPlank + - material: CP14WoodenPlanks amount: 5 doAfter: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml index 0e82bf67bf..f833f40cbe 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: WoodPlank + - material: CP14WoodenPlanks amount: 4 doAfter: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml index 729e7b7aff..fa2c9256d0 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: WoodPlank + - material: CP14WoodenPlanks amount: 3 doAfter: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/wall.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/wall.yml new file mode 100644 index 0000000000..672388edcb --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/wall.yml @@ -0,0 +1,44 @@ +- type: constructionGraph + id: CP14Wall + start: start + graph: + - node: start + edges: + - to: FrameWooden + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: CP14WoodenPlanks + amount: 4 + doAfter: 2 + + - node: FrameWooden + entity: CP14FrameWooden + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 4 + - !type:DeleteEntity {} + steps: + - tool: Screwing #TODO - new tool + doAfter: 1 + - to: WallCardboard + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 1 + - tool: CP14Digging #Lol TODO Axe smth + doAfter: 1 + - node: WallCardboard + entity: CP14WallCardboard + edges: + - to: FrameWooden + steps: + - tool: CP14Digging #Lol TODO - new tool + doAfter: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml index 7a3ef15193..0c7992ec2e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml @@ -62,7 +62,7 @@ targetNode: CP14WallmountTorch category: construction-category-furniture icon: - sprite: _CP14/Structures/wallmount_32icon.rsi + sprite: _CP14/Structures/Wallmount/wallmount_32icon.rsi state: torch objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml new file mode 100644 index 0000000000..f662e51ad6 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml @@ -0,0 +1,17 @@ +- type: construction + crystallPunkAllowed: true + name: Cardboard wall + description: A thin, flimsy wall made of paper and cardboard. Popular in warm countries. + id: CP14CardboardWall + graph: CP14Wall + startNode: start + targetNode: WallCardboard + category: construction-category-structures + icon: + sprite: _CP14/Structures/Walls/cardboard_wall.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index 9c9db6356c..8aee29dea1 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -7,9 +7,9 @@ itemSize: 5 - type: stack - id: CP14WoodLog - name: wooden log - spawn: CP14WoodLog1 - icon: { sprite: _CP14/Objects/Materials/logs.rsi, state: log_2 } + id: CP14WoodenPlanks + name: wooden planks + spawn: CP14WoodenPlanks1 + icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 } maxCount: 10 itemSize: 5 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log.png b/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log.png deleted file mode 100644 index 8c52d0e40e..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log_2.png b/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log_2.png deleted file mode 100644 index 21d2201052..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log_2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log_3.png b/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log_3.png deleted file mode 100644 index 83a2623a08..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Materials/logs.rsi/log_3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log.png new file mode 100644 index 0000000000..bc15fda2d0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_2.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_2.png new file mode 100644 index 0000000000..46e572e573 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_3.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_3.png new file mode 100644 index 0000000000..8cc2aae439 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/log_3.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/logs.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/meta.json similarity index 71% rename from Resources/Textures/_CP14/Objects/Materials/logs.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Materials/wood.rsi/meta.json index ef233f258a..131f87f352 100644 --- a/Resources/Textures/_CP14/Objects/Materials/logs.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/meta.json @@ -15,6 +15,15 @@ }, { "name": "log_3" + }, + { + "name": "planks" + }, + { + "name": "planks_2" + }, + { + "name": "planks_3" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks.png new file mode 100644 index 0000000000..26d6542ced Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_2.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_2.png new file mode 100644 index 0000000000..62e4c08502 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_3.png b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_3.png new file mode 100644 index 0000000000..d1bca4799b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/wood.rsi/planks_3.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed.png index ea8df3b3aa..420c4b9faa 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open.png index fbb376d609..4451e610f2 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/wallmount_32icon.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_32icon.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/wallmount_32icon.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Wallmount/wallmount_32icon.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/wallmount_32icon.rsi/torch.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_32icon.rsi/torch.png similarity index 100% rename from Resources/Textures/_CP14/Structures/wallmount_32icon.rsi/torch.png rename to Resources/Textures/_CP14/Structures/Wallmount/wallmount_32icon.rsi/torch.png diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/base.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/base.png new file mode 100644 index 0000000000..b09a239615 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/meta.json new file mode 100644 index 0000000000..aebc1d8aa6 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Jaraten for CrystallPunk14", + "size": { + "x": 32, + "y": 96 + }, + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "on", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/on.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/on.png new file mode 100644 index 0000000000..f76a2eb767 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_lamp.rsi/on.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/full.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/full.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/full.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall0.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall0.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall1.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall1.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall2.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall2.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall3.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall3.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall4.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall5.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall6.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall6.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall6.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall7.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone.rsi/wall7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/full.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/full.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/full.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone0.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone0.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone1.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone1.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone2.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone2.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone3.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone3.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone4.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone5.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone6.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone6.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone6.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone7.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_copper.rsi/stone7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/full.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/full.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/full.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall0.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall0.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall1.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall1.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall2.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall2.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall3.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall3.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall4.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall5.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall6.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall6.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall6.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_gold.rsi/wall7.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_gold.rsi/wall7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/full.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/full.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/full.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone0.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone0.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone1.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone1.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone2.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone2.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone3.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone3.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone4.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone5.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone6.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone6.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone6.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_iron.rsi/stone7.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_iron.rsi/stone7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/full.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/full.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/full.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall0.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall0.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall1.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall1.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall2.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall2.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall3.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall3.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall4.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall5.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall6.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall6.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall6.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/wall7.png rename to Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_silver.rsi/wall7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA0.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA0.png new file mode 100644 index 0000000000..ed6e26865b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA1.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA1.png new file mode 100644 index 0000000000..65fd336de3 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA2.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA2.png new file mode 100644 index 0000000000..ed6e26865b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA3.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA3.png new file mode 100644 index 0000000000..65fd336de3 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA4.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA4.png new file mode 100644 index 0000000000..fde15ed655 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png new file mode 100644 index 0000000000..deef3e4948 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA6.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA6.png new file mode 100644 index 0000000000..fde15ed655 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA7.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA7.png new file mode 100644 index 0000000000..cd63b33ec0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png new file mode 100644 index 0000000000..ed6e26865b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png new file mode 100644 index 0000000000..65fd336de3 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png new file mode 100644 index 0000000000..ed6e26865b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png new file mode 100644 index 0000000000..65fd336de3 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png new file mode 100644 index 0000000000..fde15ed655 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png new file mode 100644 index 0000000000..deef3e4948 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png new file mode 100644 index 0000000000..fde15ed655 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png new file mode 100644 index 0000000000..cd63b33ec0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/full.png new file mode 100644 index 0000000000..9470c785d7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/meta.json new file mode 100644 index 0000000000..03fa75940f --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/meta.json @@ -0,0 +1,78 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "By jaraten(discord)", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "full" + }, + { + "name": "bricksA0", + "directions": 4 + }, + { + "name": "bricksA1", + "directions": 4 + }, + { + "name": "bricksA2", + "directions": 4 + }, + { + "name": "bricksA3", + "directions": 4 + }, + { + "name": "bricksA4", + "directions": 4 + }, + { + "name": "bricksA5", + "directions": 4 + }, + { + "name": "bricksA6", + "directions": 4 + }, + { + "name": "bricksA7", + "directions": 4 + }, + { + "name": "bricksB0", + "directions": 4 + }, + { + "name": "bricksB1", + "directions": 4 + }, + { + "name": "bricksB2", + "directions": 4 + }, + { + "name": "bricksB3", + "directions": 4 + }, + { + "name": "bricksB4", + "directions": 4 + }, + { + "name": "bricksB5", + "directions": 4 + }, + { + "name": "bricksB6", + "directions": 4 + }, + { + "name": "bricksB7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/full.png new file mode 100644 index 0000000000..7f0971010d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood0.png new file mode 100644 index 0000000000..682fd3c779 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood1.png new file mode 100644 index 0000000000..ef07ddf9db Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood2.png new file mode 100644 index 0000000000..f8ff90c3fd Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood3.png new file mode 100644 index 0000000000..93e5618674 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood4.png rename to Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood5.png rename to Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood6.png new file mode 100644 index 0000000000..751515fe41 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood7.png rename to Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/full.png deleted file mode 100644 index e2e9f2712c..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood0.png deleted file mode 100644 index 1f6aeb1fc9..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood1.png deleted file mode 100644 index 1948f3fe8e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood2.png deleted file mode 100644 index 7b1109f95b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood3.png deleted file mode 100644 index 6fd0dc9883..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood6.png deleted file mode 100644 index 02a95185af..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json new file mode 100644 index 0000000000..cb4f3f894e --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd for CrystallPunk14", + "states": [ + { + "name": "wooden" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png new file mode 100644 index 0000000000..6dd391984d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/full.png new file mode 100644 index 0000000000..9391a33578 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/meta.json new file mode 100644 index 0000000000..bc4cb98b55 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "By jaraten(discord)", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "full" + }, + { + "name": "stonebricks0", + "directions": 4 + }, + { + "name": "stonebricks1", + "directions": 4 + }, + { + "name": "stonebricks2", + "directions": 4 + }, + { + "name": "stonebricks3", + "directions": 4 + }, + { + "name": "stonebricks4", + "directions": 4 + }, + { + "name": "stonebricks5", + "directions": 4 + }, + { + "name": "stonebricks6", + "directions": 4 + }, + { + "name": "stonebricks7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks0.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks0.png new file mode 100644 index 0000000000..7ab923fd9c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks1.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks1.png new file mode 100644 index 0000000000..6cdfc12f73 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks2.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks2.png new file mode 100644 index 0000000000..17cd061795 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks3.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks3.png new file mode 100644 index 0000000000..c3a26e8b34 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks4.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks4.png new file mode 100644 index 0000000000..1f6581051e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks5.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks5.png new file mode 100644 index 0000000000..546fdb4ee2 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks6.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks6.png new file mode 100644 index 0000000000..ee5a977b0c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks7.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks7.png new file mode 100644 index 0000000000..c8b4aae378 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/full.png new file mode 100644 index 0000000000..2100b8ddab Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/meta.json similarity index 89% rename from Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/meta.json index 9088bd1aed..6b3ab3b55a 100644 --- a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/meta.json @@ -5,7 +5,7 @@ "y": 64 }, "license": "CC-BY-SA-3.0", - "copyright": "Created by TheShuEd (Discord) for CrystallPunk14", + "copyright": "Created by jaraten (Discord) for CrystallPunk14", "states": [ { "name": "wood0", @@ -43,4 +43,4 @@ "name": "full" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood0.png new file mode 100644 index 0000000000..8057d7ed3a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood1.png new file mode 100644 index 0000000000..42dfc5b02a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood2.png new file mode 100644 index 0000000000..8057d7ed3a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood3.png new file mode 100644 index 0000000000..42dfc5b02a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood4.png new file mode 100644 index 0000000000..917ffea842 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood5.png new file mode 100644 index 0000000000..1d298be41d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood6.png new file mode 100644 index 0000000000..917ffea842 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood7.png new file mode 100644 index 0000000000..d5cbf40e2b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood7.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/full.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/full.png deleted file mode 100644 index 7d3dbd1b81..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood0.png deleted file mode 100644 index beadb0cca7..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood1.png deleted file mode 100644 index 9e30791362..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood2.png deleted file mode 100644 index beadb0cca7..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood3.png deleted file mode 100644 index df8e1ea3d8..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood4.png deleted file mode 100644 index 4516a565c7..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood5.png deleted file mode 100644 index 20d870ea15..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood6.png deleted file mode 100644 index 1202490640..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood7.png deleted file mode 100644 index b30fb0369f..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Windows/TEMPLATE_WINDOW.rsi/wood7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/full.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/full.png index 6a79248b88..c295b3a01a 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/full.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/meta.json b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/meta.json index 3cc69034af..a33c0af956 100644 --- a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, + "license": "CC0-1.0", + "copyright": "By jaraten(discord)", "size": { "x": 32, "y": 64 }, - "license": "CC-BY-SA-3.0", - "copyright": "Created by Jaraten (Discord) for CrystallPunk14", "states": [ + { + "name": "full" + }, { "name": "stone_bricks_window0", "directions": 4 @@ -38,9 +41,6 @@ { "name": "stone_bricks_window7", "directions": 4 - }, - { - "name": "full" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window0.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window0.png index 6197794aae..1496db7f26 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window0.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window0.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window1.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window1.png index f57586d182..9dee64643e 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window1.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window1.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window2.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window2.png index 6197794aae..96413a70c1 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window2.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window2.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window3.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window3.png index 2a9bf84a83..6100ac8a04 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window3.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window3.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window4.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window4.png index 5223e0fcb8..e88d654083 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window4.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window4.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window5.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window5.png index 6aa98fe61c..60aa521feb 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window5.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window5.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window6.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window6.png index 956800b8de..b05f7e7433 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window6.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window6.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window7.png b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window7.png index c277636cc2..154a310e30 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window7.png and b/Resources/Textures/_CP14/Structures/Windows/stone_bricks_window.rsi/stone_bricks_window7.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/full.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/full.png new file mode 100644 index 0000000000..a7a9b72883 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/meta.json b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/meta.json new file mode 100644 index 0000000000..74fa1ab5a8 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "By jaraten(discord)", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "full" + }, + { + "name": "wood_window0", + "directions": 4 + }, + { + "name": "wood_window1", + "directions": 4 + }, + { + "name": "wood_window2", + "directions": 4 + }, + { + "name": "wood_window3", + "directions": 4 + }, + { + "name": "wood_window4", + "directions": 4 + }, + { + "name": "wood_window5", + "directions": 4 + }, + { + "name": "wood_window6", + "directions": 4 + }, + { + "name": "wood_window7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window0.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window0.png new file mode 100644 index 0000000000..8d38612f32 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window0.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window1.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window1.png new file mode 100644 index 0000000000..683ca8f2c6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window1.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window2.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window2.png new file mode 100644 index 0000000000..8d38612f32 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window2.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window3.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window3.png new file mode 100644 index 0000000000..ca32197e39 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window3.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window4.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window4.png new file mode 100644 index 0000000000..8be87a8792 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window4.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window5.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window5.png new file mode 100644 index 0000000000..6789dd20a2 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window5.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window6.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window6.png new file mode 100644 index 0000000000..37ef7d6e6e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window6.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window7.png b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window7.png new file mode 100644 index 0000000000..bb428264e3 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Windows/wooden_window.rsi/wood_window7.png differ diff --git a/Resources/Textures/_CP14/Tiles/stonebricks.png b/Resources/Textures/_CP14/Tiles/stonebricks.png index 07357051fb..7465457ad4 100644 Binary files a/Resources/Textures/_CP14/Tiles/stonebricks.png and b/Resources/Textures/_CP14/Tiles/stonebricks.png differ diff --git a/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_1.png b/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_1.png index 1b2d603fef..55704f50d6 100644 Binary files a/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_1.png and b/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_1.png differ diff --git a/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_2.png b/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_2.png index d42709a976..5ff4dc6e52 100644 Binary files a/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_2.png and b/Resources/Textures/_CP14/Tiles/stonebricks_small_carved_2.png differ diff --git a/Resources/Textures/_CP14/Tiles/stonebricks_square_carved.png b/Resources/Textures/_CP14/Tiles/stonebricks_square_carved.png index c1f130ec5e..82edec3a3e 100644 Binary files a/Resources/Textures/_CP14/Tiles/stonebricks_square_carved.png and b/Resources/Textures/_CP14/Tiles/stonebricks_square_carved.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index bd11dc48fd..71e6b9f49c 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -8,6 +8,9 @@ CP14FloorBricksCarvedSmall1: null CP14FloorBricksCarvedSmall2: null CP14FloorBricksCarvedSquare: null +# 2024-05-24 +CP14CardboardWall: CP14WallCardboard + # <---> CrystallPunk migration zone end