diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl index 02f0a041d4..9dae3f1762 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl @@ -13,7 +13,7 @@ ent-CP14ClothingHeadHoodieYellow = желтый капюшон # Mask ent-CP14ClothingMaskSinner = маска грешника .desc = Маска предназначенная для ношения не самыми светлыми личностями. Палачи надевают их на себя и на жертву перед казнью. -ent-CP14ClothingMaskMonocle = монокль +ent-CP14ClothingEyesMonocle = монокль .desc = Аристократично, модно, да еще и с позолотой. ent-CP14ClothingEyesGoldGlasses = золотые очки .desc = Аристократично, модно, да еще и с позолотой. diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl index 5437977d2a..11a0c96b4e 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl @@ -19,6 +19,14 @@ ent-CP14BaseThrowableSpear = метательное копьё ent-CP14BaseTwoHandedSword = двуручный меч .desc = Мощное оружие, требующее огромной силы и умения для эффективного использования. +# Weapons/Ranged + +ent-CP14BaseLightCrossbow = легкий арбалет + .desc = Небольшой, компактный арбалет, который удобно держать одной рукой. Не слишком меткий с обратной стороны. + +ent-CP14Crossbolt = арбалетный болт + .desc = Стержень с заостренным концом. Без оперения, это вам не лук. + # Coins ent-CP14CopperCoin = медная корона .desc = Минимальная экономическая единица на просторах Эберрона. Является одной десятой серебрянного соверена. diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/structures.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/structures.ftl index 70facb1adb..a545cfbf8f 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/structures.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/structures.ftl @@ -1,8 +1,10 @@ # Decorations -ent-CP14Bonfire = костёр - .desc = Груда бревен, сложенных вместе, и готовых вспыхнуть от малейшей искры. -ent-CP14WallmountTorch = настенный факел - .desc = Хороший, надеждный источник света. Жаль, недолговечный. +ent-CP14WallmountVines = лозы + .desc = Робкие ростки сорняков пытаются взобраться по стене вверх, к свету. +ent-CP14WallmountWeb = паутина + .desc = Паутина, прилипшая к темным углам, в которой сидят крошечные паучки. +ent-CP14WallmountWoodenBoards = доски + .desc = Прибиты к стене. Зачем? не совсем ясно. # Doors ent-CP14BaseWoodDoor = деревянная дверь @@ -30,13 +32,12 @@ ent-CP14BaseBarrel = деревянная бочка .desc = Большая, удобная емкость для хранения жидкостей. ent-CP14BarrelWater = { ent-CP14BaseBarrel } .desc = { ent-CP14BaseBarrel.desc } +ent-CP14Bonfire = костёр + .desc = Груда бревен, сложенных вместе, и готовых вспыхнуть от малейшей искры. +ent-CP14WallmountTorch = настенный факел + .desc = Хороший, надеждный источник света. Жаль, недолговечный. # Walls -ent-CP14StoneRuinWall = каменная стена руин - .desc = Эти стены повидали многое, и осталось им недолго. - .suffix = Устаревший формат спрайта! -ent-CP14WoodFullWall = деревянная стена - .desc = Доска к доске, и вместе образуют они защиту и уют. ent-CP14CaveStoneWall = каменная порода .desc = Прочная каменная природная стена. От нее веет пещерным холодом. ent-CP14CaveStoneWallCopperOre = { ent-CP14CaveStoneWall } @@ -51,8 +52,8 @@ ent-CP14CaveStoneWallSilverOre = { ent-CP14CaveStoneWall } ent-CP14CaveStoneWallGoldOre = { ent-CP14CaveStoneWall } .desc = Прочная каменная природная стена. Здесь мерцают небольшие вкрапления золота. .suffix = Золото -ent-CP14StoneRuinFragment = обломки каменных стен - .desc = Это все, что осталось от былого величия. +ent-CP14CardboardWall = стена из картона + .desc = Тонкая, непрочная стена из бумаги и картона. Пользуется популярностью в теплых странах. # Sharpening stone ent-CP14BaseSharpeningStoneStructure = стационарный точильный камень diff --git a/Resources/Maps/_CP14/cave-arena.yml b/Resources/Maps/_CP14/cave-arena.yml index e3cf5b3a8c..fc6f20609e 100644 --- a/Resources/Maps/_CP14/cave-arena.yml +++ b/Resources/Maps/_CP14/cave-arena.yml @@ -4170,7 +4170,7 @@ entities: friction: 0.4 - type: PlaceableSurface isPlaceable: True -- proto: CP14WoodFullWall +- proto: CP14CardboardWall entities: - uid: 458 components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml index 3dc7138b34..d3addb703b 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml @@ -2,7 +2,7 @@ id: CP14BaseLightCrossbow name: light crossbow parent: BaseItem - description: a small, compact crossbow that is comfortable to hold with one hand. Not too strong on the back side. + description: A small, compact crossbow that is comfortable to hold with one hand. Not too accurate on the reverse side. components: - type: Sprite sprite: _CP14/Objects/Weapons/Ranged/light_crossbow.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount.yml index ddfec45ee4..c626aad825 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decoration/wallmount.yml @@ -4,14 +4,16 @@ - BaseStructure - CP14BaseWooden #TODO: make BaseFlammable name: wooden boards - description: Nailed to the wall with wooden boards. Why? It's not clear. + description: Nailed to the wall. Why? I'm not quite sure. placement: mode: SnapgridCenter components: - type: Sprite + drawdepth: Mobs sprite: _CP14/Structures/Decoration/wallmount_decor.rsi layers: - state: boards + map: ["random"] - type: Damageable damageContainer: Inorganic damageModifierSet: Wood @@ -27,6 +29,13 @@ layer: - MidImpassable - LowImpassable + - type: RandomSprite + available: + - random: + boards: "" + boards2: "" + boards3: "" + boards4: "" - type: entity id: CP14WallmountWeb @@ -39,6 +48,7 @@ mode: SnapgridCenter components: - type: Sprite + drawdepth: Mobs sprite: _CP14/Structures/Decoration/wallmount_decor.rsi layers: - state: web @@ -64,6 +74,7 @@ - random: web: "" web2: "" + web3: "" - type: entity id: CP14WallmountVines @@ -76,6 +87,7 @@ mode: SnapgridCenter components: - type: Sprite + drawdepth: Mobs sprite: _CP14/Structures/Decoration/wallmount_decor.rsi layers: - state: vines diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml index db42592bda..31fedfe512 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml @@ -6,7 +6,7 @@ components: - type: Sprite noRot: true - sprite: _CP14/Structures/Decoration/bonfire.rsi + sprite: _CP14/Structures/Furniture/bonfire.rsi layers: - state: bonfire - type: Construction @@ -68,11 +68,11 @@ types: Heat: 0.01 - type: FireVisuals - sprite: _CP14/Structures/Decoration/bonfire.rsi + sprite: _CP14/Structures/Furniture/bonfire.rsi normalState: burning - type: ItemPlacer maxEntities: 4 whitelist: components: - Temperature - - type: CP14FlammableEntityHeater \ No newline at end of file + - type: CP14FlammableEntityHeater diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml index eb042f06f5..c127d63748 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml @@ -8,7 +8,6 @@ components: - type: Sprite sprite: _CP14/Structures/Furniture/Tables/wood.rsi - state: full - type: Icon sprite: _CP14/Structures/Furniture/Tables/wood.rsi state: full diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml index 440e4b7346..32407da9c7 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml @@ -10,9 +10,8 @@ - type: Clickable - type: InteractionOutline - type: Sprite - noRot: true - sprite: _CP14/Structures/Decoration/wallmount_torch.rsi - offset: 0, 0.25 + drawdepth: Mobs + sprite: _CP14/Structures/Furniture/wallmount_torch.rsi layers: - state: base - type: Damageable @@ -58,8 +57,8 @@ types: Heat: 0.01 - type: FireVisuals - sprite: _CP14/Structures/Decoration/wallmount_torch.rsi + sprite: _CP14/Structures/Furniture/wallmount_torch.rsi normalState: fire - type: Construction graph: CP14WallmountTorch - node: CP14WallmountTorch \ No newline at end of file + node: CP14WallmountTorch diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index 2348e356fa..585abb435d 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -2,20 +2,22 @@ abstract: true parent: BaseWall id: CP14BaseWall - name: стена - description: Достаточно прочная, чтобы прикрыть вас от угроз или холодного ветра. + name: wall + description: Sturdy enough to cover you from threats or cold winds. placement: mode: SnapgridCenter snap: - Wall components: + - type: Sprite + drawdepth: Mobs - type: IconSmooth key: CPwall base: stone - type: entity id: CP14DebugWall - name: тестовая стена + name: debug wall suffix: DEBUG parent: CP14BaseWall description: Ужасы @@ -24,61 +26,44 @@ sprite: _CP14/Structures/Walls/TEMPLATE.rsi - type: Icon sprite: _CP14/Structures/Walls/TEMPLATE.rsi + state: full - type: IconSmooth - base: brick + base: wood + +- type: entity + id: CP14DebugWindow #TODO remove + name: debug window + suffix: DEBUG + parent: CP14BaseWall + description: Ужасы + components: + - type: Occluder + enabled: false + - type: Sprite + sprite: _CP14/Structures/Walls/TEMPLATE_WINDOW.rsi + drawdepth: Mobs + - type: Icon + sprite: _CP14/Structures/Walls/TEMPLATE_WINDOW.rsi + state: full + - type: IconSmooth + base: wood + key: CPwindow - type: entity id: CP14CardboardWall name: cardboard Wall - description: A wall of paper and thin boards. Enjoys a certain popularity in [eastern place]. - parent: CP14BaseWall - components: - - type: Sprite - sprite: _CP14/Structures/Walls/cardboard_walls.rsi - - type: Icon - sprite: _CP14/Structures/Walls/cardboard_walls.rsi - - type: IconSmooth - base: cardboard - -- type: entity - id: CP14StonebrickWall - name: stone brick Wall - description: Stone brick wall. Classic - parent: CP14BaseWall - components: - - type: Sprite - sprite: _CP14/Structures/Walls/stone_bricks_wall.rsi - - type: Icon - sprite: _CP14/Structures/Walls/stone_bricks_wall.rsi - - type: IconSmooth - base: stonebricks - -- type: entity - id: CP14YellowbrickWall - name: yellow brick Wall - description: Yellow bricks laid according to ancient customs - parent: CP14BaseWall - components: - - type: Sprite - sprite: _CP14/Structures/Walls/yellow_bricks_wall.rsi - - type: Icon - sprite: _CP14/Structures/Walls/yellow_bricks_wall.rsi - - type: IconSmooth - base: yellowbricks - -- type: entity - id: CP14WoodFullWall - name: wooden wall + description: A thin, flimsy wall made of paper and cardboard. Popular in warm countries. parent: - CP14BaseWall - CP14BaseWooden - description: Board to board, and together they form protection and comfort. components: - type: Sprite - sprite: _CP14/Structures/Walls/wood_full.rsi + sprite: _CP14/Structures/Walls/cardboard_walls.rsi - type: Icon - sprite: _CP14/Structures/Walls/wood_full.rsi + sprite: _CP14/Structures/Walls/cardboard_walls.rsi state: full + - type: IconSmooth + base: wood - type: Damageable damageContainer: Inorganic damageModifierSet: Wood @@ -110,32 +95,4 @@ max: 3 - type: FireVisuals sprite: _CP14/Effects/fire.rsi - normalState: full - - type: IconSmooth - base: wood - -- type: entity - id: CP14StoneRuinFragment - parent: BaseRock - name: stone wall fragments - description: It's all that's left of former greatness. - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: PlacementReplacement - key: walls - - type: Sprite - sprite: _CP14/Structures/Walls/ruin_stone.rsi - snapCardinals: true - layers: - - state: fragment1 - map: ["random"] - - type: RandomSprite - available: - - random: - fragment1: "" - fragment2: "" - fragment3: "" - fragment4: "" \ No newline at end of file + normalState: full \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/sharpening_stone.yml b/Resources/Prototypes/_CP14/Entities/Structures/sharpening_stone.yml index ce8ff35b79..2735786cd0 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/sharpening_stone.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/sharpening_stone.yml @@ -12,9 +12,6 @@ state: base - type: PlaceableSurface - type: ItemPlacer - whitelist: - components: - - CPSharpened - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml index bbcbf14c32..2d2f3681ba 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml @@ -44,7 +44,7 @@ targetNode: CP14Bonfire category: construction-category-furniture icon: - sprite: _CP14/Structures/Decoration/bonfire.rsi + sprite: _CP14/Structures/Furniture/bonfire.rsi state: bonfire objectType: Structure placementMode: SnapgridCenter @@ -62,7 +62,7 @@ targetNode: CP14WallmountTorch category: construction-category-furniture icon: - sprite: _CP14/Structures/Decoration/wallmount_torch.rsi + sprite: _CP14/Structures/Furniture/wallmount_torch.rsi state: fire objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-left.png index d214fcbfd3..47103b8d09 100644 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-left.png and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-right.png index 47103b8d09..d214fcbfd3 100644 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-right.png and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards.png index f4e484085c..b9026f402c 100644 Binary files a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards.png and b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards2.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards2.png new file mode 100644 index 0000000000..33af066e82 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards2.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards3.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards3.png new file mode 100644 index 0000000000..e594a7c2c6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards3.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards4.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards4.png new file mode 100644 index 0000000000..54194afc67 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/boards4.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/meta.json b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/meta.json index cbf9212d69..92d5d8cea7 100644 --- a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By jaraten(discord)", + "copyright": "By jaraten(discord), modified by TheShuEd", "size": { "x": 32, "y": 96 @@ -11,6 +11,18 @@ "name": "boards", "directions": 4 }, + { + "name": "boards2", + "directions": 4 + }, + { + "name": "boards3", + "directions": 4 + }, + { + "name": "boards4", + "directions": 4 + }, { "name": "web", "directions": 4 @@ -19,6 +31,10 @@ "name": "web2", "directions": 4 }, + { + "name": "web3", + "directions": 4 + }, { "name": "vines", "directions": 4 diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/vines.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/vines.png index 374fbc3e13..edaafd48b6 100644 Binary files a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/vines.png and b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/vines.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web.png index fae4a9be42..c2706184db 100644 Binary files a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web.png and b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web2.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web2.png index 8d71eeff6c..a9acbb8e89 100644 Binary files a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web2.png and b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web2.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web3.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web3.png new file mode 100644 index 0000000000..ddfb3ca564 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/wallmount_decor.rsi/web3.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/base.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/base.png deleted file mode 100644 index 134179782d..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/burned.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/burned.png deleted file mode 100644 index c445314cd8..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/burned.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/fire.png b/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/fire.png deleted file mode 100644 index 0a585ee3be..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/fire.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/bonfire.rsi/bonfire.png b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/bonfire.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Decoration/bonfire.rsi/bonfire.png rename to Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/bonfire.png diff --git a/Resources/Textures/_CP14/Structures/Decoration/bonfire.rsi/bonfire_extinguished.png b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/bonfire_extinguished.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Decoration/bonfire.rsi/bonfire_extinguished.png rename to Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/bonfire_extinguished.png diff --git a/Resources/Textures/_CP14/Structures/Decoration/bonfire.rsi/burning.png b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/burning.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Decoration/bonfire.rsi/burning.png rename to Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/burning.png diff --git a/Resources/Textures/_CP14/Structures/Decoration/bonfire.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Decoration/bonfire.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Furniture/bonfire.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/base.png b/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/base.png new file mode 100644 index 0000000000..e086da8cc8 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/burned.png b/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/burned.png new file mode 100644 index 0000000000..f0381b17a1 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/burned.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/fire.png b/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/fire.png new file mode 100644 index 0000000000..9071e2f337 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/fire.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/meta.json similarity index 98% rename from Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/meta.json index 8f2d96d1a1..55e898f409 100644 --- a/Resources/Textures/_CP14/Structures/Decoration/wallmount_torch.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/wallmount_torch.rsi/meta.json @@ -4,7 +4,7 @@ "copyright": "Created by Agoichi for CrystallPunk14", "size": { "x": 32, - "y": 48 + "y": 96 }, "states": [ { diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick0.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick0.png deleted file mode 100644 index f7f5c62f8b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick1.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick1.png deleted file mode 100644 index 26673f0104..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick2.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick2.png deleted file mode 100644 index bbf065f8ce..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick3.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick3.png deleted file mode 100644 index d3a5439eb7..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick4.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick4.png deleted file mode 100644 index c0f41fee28..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick5.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick5.png deleted file mode 100644 index 2a60e21158..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick6.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick6.png deleted file mode 100644 index 92a3455b4e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick7.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick7.png deleted file mode 100644 index 4415dbd661..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/brick7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/full.png index 8443c04b99..c648824938 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/full.png and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/meta.json index 1cadc895bb..9088bd1aed 100644 --- a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/meta.json @@ -2,41 +2,41 @@ "version": 1, "size": { "x": 32, - "y": 32 + "y": 64 }, "license": "CC-BY-SA-3.0", - "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "copyright": "Created by TheShuEd (Discord) for CrystallPunk14", "states": [ { - "name": "brick0", + "name": "wood0", "directions": 4 }, { - "name": "brick1", + "name": "wood1", "directions": 4 }, { - "name": "brick2", + "name": "wood2", "directions": 4 }, { - "name": "brick3", + "name": "wood3", "directions": 4 }, { - "name": "brick4", + "name": "wood4", "directions": 4 }, { - "name": "brick5", + "name": "wood5", "directions": 4 }, { - "name": "brick6", + "name": "wood6", "directions": 4 }, { - "name": "brick7", + "name": "wood7", "directions": 4 }, { diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood0.png new file mode 100644 index 0000000000..6dc6ff7774 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood1.png new file mode 100644 index 0000000000..e6fe3a57f4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood2.png new file mode 100644 index 0000000000..07cc6efde4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood3.png new file mode 100644 index 0000000000..2c1d0934d4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood4.png new file mode 100644 index 0000000000..cbbbc9cf99 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood5.png new file mode 100644 index 0000000000..d3d96b9053 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood6.png new file mode 100644 index 0000000000..f3260b5a8f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood7.png new file mode 100644 index 0000000000..dee5f82b59 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE.rsi/wood7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/full.png deleted file mode 100644 index d1e3a0d545..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood0.png deleted file mode 100644 index 7379d543e1..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood1.png deleted file mode 100644 index 399db547df..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood2.png deleted file mode 100644 index 7379d543e1..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood3.png deleted file mode 100644 index 399db547df..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood4.png deleted file mode 100644 index 4e2f0b9e1a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood5.png deleted file mode 100644 index fa56cc73c8..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood6.png deleted file mode 100644 index 4e2f0b9e1a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood7.png deleted file mode 100644 index 5bb8ee8918..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/wood7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/full.png new file mode 100644 index 0000000000..7d3dbd1b81 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/meta.json similarity index 98% rename from Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/meta.json index cfdbf13d6a..9088bd1aed 100644 --- a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_LONG.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/meta.json @@ -2,7 +2,7 @@ "version": 1, "size": { "x": 32, - "y": 48 + "y": 64 }, "license": "CC-BY-SA-3.0", "copyright": "Created by TheShuEd (Discord) for CrystallPunk14", diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood0.png new file mode 100644 index 0000000000..beadb0cca7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood1.png new file mode 100644 index 0000000000..9e30791362 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood2.png new file mode 100644 index 0000000000..beadb0cca7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood3.png new file mode 100644 index 0000000000..df8e1ea3d8 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood4.png new file mode 100644 index 0000000000..4516a565c7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood5.png new file mode 100644 index 0000000000..20d870ea15 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood6.png new file mode 100644 index 0000000000..1202490640 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood7.png new file mode 100644 index 0000000000..b30fb0369f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/TEMPLATE_WINDOW.rsi/wood7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard0.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard0.png deleted file mode 100644 index b6e194ef5c..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard1.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard1.png deleted file mode 100644 index 7e0df33064..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard2.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard2.png deleted file mode 100644 index b6e194ef5c..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard3.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard3.png deleted file mode 100644 index 7e0df33064..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard4.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard4.png deleted file mode 100644 index ee43321256..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard5.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard5.png deleted file mode 100644 index a06bc64032..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard6.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard6.png deleted file mode 100644 index ee43321256..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard7.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard7.png deleted file mode 100644 index e8c651e4e6..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/cardboard7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/full.png index 5b10d0a739..e2e9f2712c 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/full.png and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/meta.json index 3089ec7626..9088bd1aed 100644 --- a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/meta.json @@ -1,46 +1,46 @@ { "version": 1, - "license": "CC0-1.0", - "copyright": "By jaraten(discord)", "size": { "x": 32, - "y": 32 + "y": 64 }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd (Discord) for CrystallPunk14", "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" - }, - { - "name": "cardboard0", - "directions": 4 - }, - { - "name": "cardboard1", - "directions": 4 - }, - { - "name": "cardboard2", - "directions": 4 - }, - { - "name": "cardboard3", - "directions": 4 - }, - { - "name": "cardboard4", - "directions": 4 - }, - { - "name": "cardboard5", - "directions": 4 - }, - { - "name": "cardboard6", - "directions": 4 - }, - { - "name": "cardboard7", - "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood0.png new file mode 100644 index 0000000000..1f6aeb1fc9 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood0.png 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 new file mode 100644 index 0000000000..1948f3fe8e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood1.png 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 new file mode 100644 index 0000000000..7b1109f95b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood2.png 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 new file mode 100644 index 0000000000..6fd0dc9883 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood4.png new file mode 100644 index 0000000000..ec08e48510 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood5.png new file mode 100644 index 0000000000..95d5613386 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood5.png 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 new file mode 100644 index 0000000000..02a95185af Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood7.png new file mode 100644 index 0000000000..d5cbf40e2b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cardboard_walls.rsi/wood7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick0.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick0.png deleted file mode 100644 index 5e709990b8..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick1.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick1.png deleted file mode 100644 index d9ce1b0288..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick2.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick2.png deleted file mode 100644 index 5e709990b8..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick3.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick3.png deleted file mode 100644 index 62b44dff92..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick4.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick4.png deleted file mode 100644 index b0099bef86..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick5.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick5.png deleted file mode 100644 index 9e424b0a3a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick6.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick6.png deleted file mode 100644 index d44b4bdad0..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick7.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick7.png deleted file mode 100644 index 0a0953b63f..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/brick7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment1.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment1.png deleted file mode 100644 index 12217cc457..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment2.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment2.png deleted file mode 100644 index c3b908f3ae..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment3.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment3.png deleted file mode 100644 index 6cb664d5d5..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment4.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment4.png deleted file mode 100644 index e0dcefb7fb..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/fragment4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/full.png deleted file mode 100644 index 88bafb8cd1..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/meta.json deleted file mode 100644 index 5d9859f29d..0000000000 --- a/Resources/Textures/_CP14/Structures/Walls/ruin_stone.rsi/meta.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Created by TheShuEd (Github) for CrystallPunk14", - "states": [ - { - "name": "brick0", - "directions": 4 - }, - { - "name": "brick1", - "directions": 4 - }, - { - "name": "brick2", - "directions": 4 - }, - { - "name": "brick3", - "directions": 4 - }, - { - "name": "brick4", - "directions": 4 - }, - { - "name": "brick5", - "directions": 4 - }, - { - "name": "brick6", - "directions": 4 - }, - { - "name": "brick7", - "directions": 4 - }, - { - "name": "full" - }, - { - "name": "fragment1" - }, - { - "name": "fragment2" - }, - { - "name": "fragment3" - }, - { - "name": "fragment4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/full.png deleted file mode 100644 index 498b24df55..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/meta.json deleted file mode 100644 index ae47862a0d..0000000000 --- a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": 1, - "license": "CC0-1.0", - "copyright": "By jaraten(discord)", - "size": { - "x": 32, - "y": 32 - }, - "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/stone_bricks_wall.rsi/stonebricks0.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks0.png deleted file mode 100644 index 32dfb47bb0..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks1.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks1.png deleted file mode 100644 index a511b4be53..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks2.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks2.png deleted file mode 100644 index 55a025c6d4..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks3.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks3.png deleted file mode 100644 index 85b63e9f65..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks4.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks4.png deleted file mode 100644 index d4bb23b196..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks5.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks5.png deleted file mode 100644 index 298262146b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks6.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks6.png deleted file mode 100644 index b7990c54e9..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks7.png b/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks7.png deleted file mode 100644 index 0589ee38c2..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/stone_bricks_wall.rsi/stonebricks7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/full.png deleted file mode 100644 index f6bd526cd9..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/meta.json deleted file mode 100644 index 85ea1dc5a1..0000000000 --- a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Created by KREKS (Discord) for CrystallPunk14", - "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" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood0.png deleted file mode 100644 index 95aec38c57..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood1.png deleted file mode 100644 index 49d60c9114..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood2.png deleted file mode 100644 index 95aec38c57..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood3.png deleted file mode 100644 index 49d60c9114..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood4.png deleted file mode 100644 index 068d1c9ee0..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood5.png deleted file mode 100644 index 94499892df..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood6.png deleted file mode 100644 index 068d1c9ee0..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood7.png deleted file mode 100644 index 840db5a009..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wood_full.rsi/wood7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/full.png deleted file mode 100644 index 0202bdac3b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/meta.json deleted file mode 100644 index b591694519..0000000000 --- a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": 1, - "license": "CC0-1.0", - "copyright": "By jaraten(discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "yellowbricks0", - "directions": 4 - }, - { - "name": "yellowbricks1", - "directions": 4 - }, - { - "name": "yellowbricks2", - "directions": 4 - }, - { - "name": "yellowbricks3", - "directions": 4 - }, - { - "name": "yellowbricks4", - "directions": 4 - }, - { - "name": "yellowbricks5", - "directions": 4 - }, - { - "name": "yellowbricks6", - "directions": 4 - }, - { - "name": "yellowbricks7", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks0.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks0.png deleted file mode 100644 index 23e270935e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks1.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks1.png deleted file mode 100644 index 74c3bf51ca..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks2.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks2.png deleted file mode 100644 index e39e87fb3a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks3.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks3.png deleted file mode 100644 index 77788c56d9..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks4.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks4.png deleted file mode 100644 index 1fb7066b53..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks5.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks5.png deleted file mode 100644 index 833d72bbf0..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks6.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks6.png deleted file mode 100644 index 7f91a3a2ed..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks7.png b/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks7.png deleted file mode 100644 index 38e02c33a7..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks7.png and /dev/null differ