diff --git a/Resources/Maps/_CP14/cave-arena.yml b/Resources/Maps/_CP14/cave-arena.yml index fc6f20609e..915355524e 100644 --- a/Resources/Maps/_CP14/cave-arena.yml +++ b/Resources/Maps/_CP14/cave-arena.yml @@ -14,6 +14,7 @@ entities: name: map 1000 - type: Transform - type: Map + mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids @@ -122,6 +123,139 @@ entities: - type: GridAtmosphere version: 2 data: + tiles: + 0,0: + 0: 32767 + 0,-1: + 0: 63281 + -1,0: + 0: 52991 + 0,1: + 0: 4403 + -1,1: + 0: 32776 + 0,2: + 0: 63631 + -1,2: + 0: 15 + 0,3: + 0: 255 + -1,3: + 0: 8 + 1,0: + 0: 127 + 1,2: + 0: 65535 + 1,3: + 0: 127 + 1,-1: + 0: 4096 + 1,1: + 0: 32768 + 2,0: + 0: 17519 + 2,1: + 0: 14180 + 2,2: + 0: 15283 + 2,3: + 0: 1 + 2,-1: + 0: 30327 + 3,0: + 0: 26231 + 3,1: + 0: 30566 + 3,2: + 0: 14199 + 3,-1: + 0: 12292 + 0,-4: + 0: 55040 + -1,-4: + 0: 34816 + -1,-3: + 0: 65228 + 0,-2: + 0: 6143 + 0,-3: + 0: 57344 + -1,-2: + 0: 143 + -1,-1: + 0: 64648 + 1,-4: + 0: 64512 + 1,-3: + 0: 37070 + 1,-2: + 0: 2287 + 2,-4: + 0: 65280 + 2,-3: + 0: 61183 + 2,-2: + 0: 13111 + 3,-4: + 0: 4096 + 3,-3: + 0: 25395 + 3,-2: + 0: 30566 + -4,-2: + 0: 35020 + -4,-3: + 0: 32768 + -3,-3: + 0: 63232 + -3,-2: + 0: 40959 + -3,-1: + 0: 51340 + -3,0: + 0: 32492 + -2,-2: + 0: 319 + -2,-1: + 0: 12288 + -2,0: + 0: 31 + -2,-3: + 0: 49152 + -4,1: + 0: 52424 + -4,2: + 0: 36044 + -4,3: + 0: 8 + -3,1: + 0: 61047 + -3,2: + 0: 53516 + -3,3: + 0: 205 + -2,1: + 0: 4096 + -2,2: + 0: 61455 + -2,3: + 0: 255 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -483,6 +617,113 @@ entities: - type: Transform pos: -8.5,6.5 parent: 2 +- proto: CP14CardboardWall + entities: + - uid: 458 + components: + - type: Transform + pos: -3.5,14.5 + parent: 2 + - uid: 459 + components: + - type: Transform + pos: -4.5,14.5 + parent: 2 + - uid: 460 + components: + - type: Transform + pos: -5.5,14.5 + parent: 2 + - uid: 461 + components: + - type: Transform + pos: -6.5,14.5 + parent: 2 + - uid: 462 + components: + - type: Transform + pos: -7.5,14.5 + parent: 2 + - uid: 463 + components: + - type: Transform + pos: -8.5,14.5 + parent: 2 + - uid: 464 + components: + - type: Transform + pos: -9.5,14.5 + parent: 2 + - uid: 465 + components: + - type: Transform + pos: -10.5,14.5 + parent: 2 + - uid: 561 + components: + - type: Transform + pos: -10.5,10.5 + parent: 2 + - uid: 578 + components: + - type: Transform + pos: -9.5,10.5 + parent: 2 + - uid: 587 + components: + - type: Transform + pos: -8.5,10.5 + parent: 2 + - uid: 605 + components: + - type: Transform + pos: -7.5,10.5 + parent: 2 + - uid: 626 + components: + - type: Transform + pos: -6.5,10.5 + parent: 2 + - uid: 648 + components: + - type: Transform + pos: -5.5,10.5 + parent: 2 + - uid: 665 + components: + - type: Transform + pos: -4.5,10.5 + parent: 2 + - uid: 681 + components: + - type: Transform + pos: -3.5,10.5 + parent: 2 + - uid: 682 + components: + - type: Transform + pos: -3.5,11.5 + parent: 2 + - uid: 683 + components: + - type: Transform + pos: -3.5,12.5 + parent: 2 + - uid: 684 + components: + - type: Transform + pos: -3.5,13.5 + parent: 2 + - uid: 736 + components: + - type: Transform + pos: -10.5,13.5 + parent: 2 + - uid: 783 + components: + - type: Transform + pos: -10.5,11.5 + parent: 2 - proto: CP14CaveStoneWall entities: - uid: 3 @@ -4170,113 +4411,6 @@ entities: friction: 0.4 - type: PlaceableSurface isPlaceable: True -- proto: CP14CardboardWall - entities: - - uid: 458 - components: - - type: Transform - pos: -3.5,14.5 - parent: 2 - - uid: 459 - components: - - type: Transform - pos: -4.5,14.5 - parent: 2 - - uid: 460 - components: - - type: Transform - pos: -5.5,14.5 - parent: 2 - - uid: 461 - components: - - type: Transform - pos: -6.5,14.5 - parent: 2 - - uid: 462 - components: - - type: Transform - pos: -7.5,14.5 - parent: 2 - - uid: 463 - components: - - type: Transform - pos: -8.5,14.5 - parent: 2 - - uid: 464 - components: - - type: Transform - pos: -9.5,14.5 - parent: 2 - - uid: 465 - components: - - type: Transform - pos: -10.5,14.5 - parent: 2 - - uid: 561 - components: - - type: Transform - pos: -10.5,10.5 - parent: 2 - - uid: 578 - components: - - type: Transform - pos: -9.5,10.5 - parent: 2 - - uid: 587 - components: - - type: Transform - pos: -8.5,10.5 - parent: 2 - - uid: 605 - components: - - type: Transform - pos: -7.5,10.5 - parent: 2 - - uid: 626 - components: - - type: Transform - pos: -6.5,10.5 - parent: 2 - - uid: 648 - components: - - type: Transform - pos: -5.5,10.5 - parent: 2 - - uid: 665 - components: - - type: Transform - pos: -4.5,10.5 - parent: 2 - - uid: 681 - components: - - type: Transform - pos: -3.5,10.5 - parent: 2 - - uid: 682 - components: - - type: Transform - pos: -3.5,11.5 - parent: 2 - - uid: 683 - components: - - type: Transform - pos: -3.5,12.5 - parent: 2 - - uid: 684 - components: - - type: Transform - pos: -3.5,13.5 - parent: 2 - - uid: 736 - components: - - type: Transform - pos: -10.5,13.5 - parent: 2 - - uid: 783 - components: - - type: Transform - pos: -10.5,11.5 - parent: 2 - proto: CrystalCyan entities: - uid: 567 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml index 566ea5a47a..64370a0f18 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml @@ -62,6 +62,7 @@ acts: ["Destruction"] - type: Appearance - type: Sprite + drawdepth: Mobs sprite: _CP14/Structures/Furniture/barrel.rsi noRot: true layers: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 774dfb9795..e106909649 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -8,6 +8,8 @@ sprite: _CP14/Structures/Walls/cave_stone.rsi - type: Icon sprite: _CP14/Structures/Walls/cave_stone.rsi + - type: IconSmooth + base: wall - type: Damageable damageContainer: StructuralInorganic damageModifierSet: Rock @@ -25,118 +27,118 @@ params: volume: -6 -- type: entity - id: CP14CaveStoneWallCopperOre - suffix: copper ore - parent: CP14CaveStoneWall - description: A solid stone natural wall. You can see the sharp flecks of copper in it. - components: - - type: Sprite - sprite: _CP14/Structures/Walls/cave_stone_copper.rsi - - type: Icon - sprite: _CP14/Structures/Walls/cave_stone_copper.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreCopper: - min: 1 - max: 5 - -- type: entity - id: CP14CaveStoneWallIronOre - suffix: iron ore - parent: CP14CaveStoneWall - description: A solid stone natural wall. You can see the sharp flecks of iron in it. - components: - - type: Sprite - sprite: _CP14/Structures/Walls/cave_stone_iron.rsi - - type: Icon - sprite: _CP14/Structures/Walls/cave_stone_iron.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreIron: - min: 1 - max: 5 - -- type: entity - id: CP14CaveStoneWallSilverOre - suffix: silver ore - parent: CP14CaveStoneWall - 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 - - type: Icon - sprite: _CP14/Structures/Walls/cave_stone_silver.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreSilver: - min: 1 - max: 5 - -- type: entity - id: CP14CaveStoneWallGoldOre - suffix: gold ore - parent: CP14CaveStoneWall - 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 - - type: Icon - sprite: _CP14/Structures/Walls/cave_stone_gold.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreGold: - min: 1 - max: 5 \ No newline at end of file +#- type: entity +# id: CP14CaveStoneWallCopperOre +# suffix: copper ore +# parent: CP14CaveStoneWall +# description: A solid stone natural wall. You can see the sharp flecks of copper in it. +# components: +# - type: Sprite +# sprite: _CP14/Structures/Walls/cave_stone_copper.rsi +# - type: Icon +# sprite: _CP14/Structures/Walls/cave_stone_copper.rsi +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 100 +# behaviors: +# - !type:DoActsBehavior +# acts: ["Destruction"] +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/Effects/break_stone.ogg +# params: +# volume: -6 +# - !type:SpawnEntitiesBehavior +# spawn: +# CP14OreCopper: +# min: 1 +# max: 5 +# +#- type: entity +# id: CP14CaveStoneWallIronOre +# suffix: iron ore +# parent: CP14CaveStoneWall +# description: A solid stone natural wall. You can see the sharp flecks of iron in it. +# components: +# - type: Sprite +# sprite: _CP14/Structures/Walls/cave_stone_iron.rsi +# - type: Icon +# sprite: _CP14/Structures/Walls/cave_stone_iron.rsi +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 100 +# behaviors: +# - !type:DoActsBehavior +# acts: ["Destruction"] +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/Effects/break_stone.ogg +# params: +# volume: -6 +# - !type:SpawnEntitiesBehavior +# spawn: +# CP14OreIron: +# min: 1 +# max: 5 +# +#- type: entity +# id: CP14CaveStoneWallSilverOre +# suffix: silver ore +# parent: CP14CaveStoneWall +# 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 +# - type: Icon +# sprite: _CP14/Structures/Walls/cave_stone_silver.rsi +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 100 +# behaviors: +# - !type:DoActsBehavior +# acts: ["Destruction"] +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/Effects/break_stone.ogg +# params: +# volume: -6 +# - !type:SpawnEntitiesBehavior +# spawn: +# CP14OreSilver: +# min: 1 +# max: 5 +# +#- type: entity +# id: CP14CaveStoneWallGoldOre +# suffix: gold ore +# parent: CP14CaveStoneWall +# 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 +# - type: Icon +# sprite: _CP14/Structures/Walls/cave_stone_gold.rsi +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 100 +# behaviors: +# - !type:DoActsBehavior +# acts: ["Destruction"] +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/Effects/break_stone.ogg +# params: +# volume: -6 +# - !type:SpawnEntitiesBehavior +# spawn: +# CP14OreGold: +# min: 1 +# max: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index 585abb435d..26425dafc8 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -11,6 +11,7 @@ components: - type: Sprite drawdepth: Mobs + - type: SpriteFade - type: IconSmooth key: CPwall base: stone diff --git a/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png index 226a8025c2..719381ba10 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/full.png index 6a92a14f05..84e977c38e 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/full.png and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/meta.json index 9478c9c945..a37c4349c8 100644 --- a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/cave_stone.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 KREKS (Discord) for CrystallPunk14, modified and stratch by TheShuEd", + "copyright": "Created by TheShuEd (Discord) for CrystallPunk14", "states": [ { - "name": "stone0", + "name": "wall0", "directions": 4 }, { - "name": "stone1", + "name": "wall1", "directions": 4 }, { - "name": "stone2", + "name": "wall2", "directions": 4 }, { - "name": "stone3", + "name": "wall3", "directions": 4 }, { - "name": "stone4", + "name": "wall4", "directions": 4 }, { - "name": "stone5", + "name": "wall5", "directions": 4 }, { - "name": "stone6", + "name": "wall6", "directions": 4 }, { - "name": "stone7", + "name": "wall7", "directions": 4 }, { diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone0.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone0.png deleted file mode 100644 index a406b6121b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone1.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone1.png deleted file mode 100644 index f63329ee55..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone2.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone2.png deleted file mode 100644 index a406b6121b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone3.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone3.png deleted file mode 100644 index 201a0212aa..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone4.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone4.png deleted file mode 100644 index 31bf8de762..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone5.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone5.png deleted file mode 100644 index b0ddbf3ee3..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone6.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone6.png deleted file mode 100644 index fe2a1551e2..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone7.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone7.png deleted file mode 100644 index 004f6cadb0..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/stone7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall0.png new file mode 100644 index 0000000000..7425d8e364 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall1.png new file mode 100644 index 0000000000..44f1ee768e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall2.png new file mode 100644 index 0000000000..0dc1b1ae12 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall3.png new file mode 100644 index 0000000000..9483ef8fdd Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall4.png new file mode 100644 index 0000000000..3c49a40282 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall5.png new file mode 100644 index 0000000000..059426f235 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall6.png new file mode 100644 index 0000000000..20155fdb3c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall7.png new file mode 100644 index 0000000000..d5cbf40e2b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone.rsi/wall7.png differ