diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml index 474b0a434f..c49758c3d8 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml @@ -40,12 +40,4 @@ offset: 0.15,0.15 removalTime: 1 - type: ThrowingAngle - angle: 225 - - type: CPMelting - meltTemperature: 1000 - meltSolution: - temperature: 1000 - reagents: - - ReagentId: CPMetledIron - Quantity: 10 - - type: Temperature \ No newline at end of file + angle: 225 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml index 5e28585dfe..4d1e3966e1 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml @@ -13,6 +13,18 @@ ore3: "" ore4: "" +- type: entity + id: CPOreCopper + parent: CPBaseOre + name: copper piece + description: A piece of pale, heavy copper. + components: + - type: Sprite + sprite: _CP14/Objects/Ores/ore_copper.rsi + layers: + - state: ore1 + map: ["random"] + - type: entity id: CPOreIron parent: CPBaseOre @@ -20,7 +32,19 @@ description: A piece of cold, heavy iron. components: - type: Sprite - sprite: _CP14/Objects/Ores/iron_ore.rsi + sprite: _CP14/Objects/Ores/ore_iron.rsi + layers: + - state: ore1 + map: ["random"] + +- type: entity + id: CPOreSilver + parent: CPBaseOre + name: silver piece + description: A piece of shiny, warm silver. + components: + - type: Sprite + sprite: _CP14/Objects/Ores/ore_silver.rsi layers: - state: ore1 map: ["random"] @@ -32,7 +56,7 @@ description: A piece of soft, pure gold. components: - type: Sprite - sprite: _CP14/Objects/Ores/gold_ore.rsi + sprite: _CP14/Objects/Ores/ore_gold.rsi layers: - state: ore1 - map: ["random"] \ No newline at end of file + map: ["random"] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 0e1ee0e2ce..9b20118d0b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -28,6 +28,39 @@ params: volume: -6 +- type: entity + id: CPCaveStoneWallCopperOre + name: rock + suffix: copper ore + parent: CPCaveStoneWall + 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: IconSmooth + key: CPwall + base: stone + - 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: + CPOreCopper: + min: 1 + max: 5 + - type: entity id: CPCaveStoneWallIronOre name: rock @@ -61,6 +94,39 @@ min: 1 max: 5 +- type: entity + id: CPCaveStoneWallSilverOre + name: rock + suffix: silver ore + parent: CPCaveStoneWall + 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: IconSmooth + key: CPwall + base: stone + - 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: + CPOreSilver: + min: 1 + max: 5 + - type: entity id: CPCaveStoneWallGoldOre name: rock diff --git a/Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png new file mode 100644 index 0000000000..0a2c9c7372 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png differ diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png new file mode 100644 index 0000000000..d1dbc770d6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png differ diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore3.png new file mode 100644 index 0000000000..aa0414ebad Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore3.png differ diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore4.png new file mode 100644 index 0000000000..4ee6a4e72b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore4.png differ diff --git a/Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/ore1.png rename to Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore1.png diff --git a/Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/ore2.png rename to Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore2.png diff --git a/Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/ore3.png rename to Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore3.png diff --git a/Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore4.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/gold_ore.rsi/ore4.png rename to Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore4.png diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/meta.json new file mode 100644 index 0000000000..36560da7b6 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "states": [ + { + "name": "ore1" + }, + { + "name": "ore2" + }, + { + "name": "ore3" + }, + { + "name": "ore4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/ore1.png rename to Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore1.png diff --git a/Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/ore2.png rename to Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore2.png diff --git a/Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/ore3.png rename to Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore3.png diff --git a/Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore4.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ores/iron_ore.rsi/ore4.png rename to Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore4.png diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json new file mode 100644 index 0000000000..36560da7b6 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "states": [ + { + "name": "ore1" + }, + { + "name": "ore2" + }, + { + "name": "ore3" + }, + { + "name": "ore4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png new file mode 100644 index 0000000000..c6d14dcfdf Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png differ diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png new file mode 100644 index 0000000000..ed988b27a0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png differ diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png new file mode 100644 index 0000000000..fe9e1cc29e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png differ diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png new file mode 100644 index 0000000000..0ec07b2c7d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/full.png new file mode 100644 index 0000000000..00205f193f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/meta.json new file mode 100644 index 0000000000..9478c9c945 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by KREKS (Discord) for CrystallPunk14, modified and stratch by TheShuEd", + "states": [ + { + "name": "stone0", + "directions": 4 + }, + { + "name": "stone1", + "directions": 4 + }, + { + "name": "stone2", + "directions": 4 + }, + { + "name": "stone3", + "directions": 4 + }, + { + "name": "stone4", + "directions": 4 + }, + { + "name": "stone5", + "directions": 4 + }, + { + "name": "stone6", + "directions": 4 + }, + { + "name": "stone7", + "directions": 4 + }, + { + "name": "full" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone0.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone0.png new file mode 100644 index 0000000000..997d2d038e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone1.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone1.png new file mode 100644 index 0000000000..6ec127796c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone2.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone2.png new file mode 100644 index 0000000000..997d2d038e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone3.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone3.png new file mode 100644 index 0000000000..aba42eb61a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone4.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone4.png new file mode 100644 index 0000000000..ba12f7ab3d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone5.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone5.png new file mode 100644 index 0000000000..71448116f1 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone6.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone6.png new file mode 100644 index 0000000000..433de5eafd Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone7.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone7.png new file mode 100644 index 0000000000..004f6cadb0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_copper.rsi/stone7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/full.png new file mode 100644 index 0000000000..6087145e3f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/meta.json new file mode 100644 index 0000000000..9478c9c945 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by KREKS (Discord) for CrystallPunk14, modified and stratch by TheShuEd", + "states": [ + { + "name": "stone0", + "directions": 4 + }, + { + "name": "stone1", + "directions": 4 + }, + { + "name": "stone2", + "directions": 4 + }, + { + "name": "stone3", + "directions": 4 + }, + { + "name": "stone4", + "directions": 4 + }, + { + "name": "stone5", + "directions": 4 + }, + { + "name": "stone6", + "directions": 4 + }, + { + "name": "stone7", + "directions": 4 + }, + { + "name": "full" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone0.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone0.png new file mode 100644 index 0000000000..753205d058 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone1.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone1.png new file mode 100644 index 0000000000..3363ed935e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone2.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone2.png new file mode 100644 index 0000000000..753205d058 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone3.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone3.png new file mode 100644 index 0000000000..e7cc22c607 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone4.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone4.png new file mode 100644 index 0000000000..ac74f25247 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone5.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone5.png new file mode 100644 index 0000000000..6801c021f1 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone6.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone6.png new file mode 100644 index 0000000000..1f29ffce75 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone7.png b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone7.png new file mode 100644 index 0000000000..004f6cadb0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/cave_stone_silver.rsi/stone7.png differ