Content (#110)

* Add many test walls

* minor bug fix

* fix torch

* add wallmount variation

* final wood wall!

* great sprite clearing + locales

* fixes

* Update bonfire.yml

* Update wallmount_torch.yml

* Update cave-arena.yml

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 = Аристократично, модно, да еще и с позолотой.

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 = Минимальная экономическая единица на просторах Эберрона. Является одной десятой серебрянного соверена.

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 = стационарный точильный камень

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:

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

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

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
+  - type: CP14FlammableEntityHeater

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

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
+    node: CP14WallmountTorch

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: ""
+    normalState: full

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:

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

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

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": [
     {

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
     },
     {

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",

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
     }
   ]
-}
+}