diff --git a/Resources/Audio/_CP14/Items/attributions.yml b/Resources/Audio/_CP14/Items/attributions.yml index e4f851dd87..bac070465d 100644 --- a/Resources/Audio/_CP14/Items/attributions.yml +++ b/Resources/Audio/_CP14/Items/attributions.yml @@ -26,4 +26,9 @@ - files: ["grass_gather.ogg", "grass_gather2.ogg", "grass_gather3.ogg"] license: "CC0-1.0" copyright: 'by hadescolossus of Freesound.org. Cropped and mixed from stereo to mono.' - source: "https://freesound.org/people/hadescolossus/sounds/705228/" \ No newline at end of file + source: "https://freesound.org/people/hadescolossus/sounds/705228/" + +- files: ["shovel_dig1.ogg", "shovel_dig2.ogg", "shovel_dig3.ogg", "shovel_dig4.ogg", "shovel_dig5.ogg"] + license: "CC0-1.0" + copyright: 'by Ali_6868 of Freesound.org. Cropped and mixed from stereo to mono.' + source: "https://freesound.org/people/Ali_6868/sounds/384361/" \ No newline at end of file diff --git a/Resources/Audio/_CP14/Items/shovel_dig1.ogg b/Resources/Audio/_CP14/Items/shovel_dig1.ogg new file mode 100644 index 0000000000..9a3d5d6eb1 Binary files /dev/null and b/Resources/Audio/_CP14/Items/shovel_dig1.ogg differ diff --git a/Resources/Audio/_CP14/Items/shovel_dig2.ogg b/Resources/Audio/_CP14/Items/shovel_dig2.ogg new file mode 100644 index 0000000000..0cb559194b Binary files /dev/null and b/Resources/Audio/_CP14/Items/shovel_dig2.ogg differ diff --git a/Resources/Audio/_CP14/Items/shovel_dig3.ogg b/Resources/Audio/_CP14/Items/shovel_dig3.ogg new file mode 100644 index 0000000000..30c379d459 Binary files /dev/null and b/Resources/Audio/_CP14/Items/shovel_dig3.ogg differ diff --git a/Resources/Audio/_CP14/Items/shovel_dig4.ogg b/Resources/Audio/_CP14/Items/shovel_dig4.ogg new file mode 100644 index 0000000000..711d4b9034 Binary files /dev/null and b/Resources/Audio/_CP14/Items/shovel_dig4.ogg differ diff --git a/Resources/Audio/_CP14/Items/shovel_dig5.ogg b/Resources/Audio/_CP14/Items/shovel_dig5.ogg new file mode 100644 index 0000000000..c5ce877f35 Binary files /dev/null and b/Resources/Audio/_CP14/Items/shovel_dig5.ogg differ diff --git a/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml b/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml new file mode 100644 index 0000000000..9a8ee691d7 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml @@ -0,0 +1,23 @@ +- type: entity + id: CP14DirtEffect + noSpawn: true + components: + - type: TimedDespawn + lifetime: 2 + - type: Sprite + drawdepth: Effects + noRot: true + layers: + - sprite: _CP14/Effects/dirt.rsi + state: dirt1 + map: [ "random" ] + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + - type: AnimationPlayer + - type: RandomSprite + available: + - random: + dirt1: "" + dirt2: "" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml new file mode 100644 index 0000000000..2333d0c49b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml @@ -0,0 +1,10 @@ +- type: entity + id: CP14RandomDirtLootSpawner + name: dirt spawner + parent: CP14DirtEffect + components: + - type: RandomSpawner + prototypes: + - CP14DirtBlock + chance: 1 + deleteSpawnerAfterSpawn: false \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml new file mode 100644 index 0000000000..c819601a9b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -0,0 +1,32 @@ +- type: entity + id: CP14DirtBlock + parent: BaseItem + name: dirt block + description: A block of excellent black soil. + components: + - type: Item + size: Normal + - type: Sprite + noRot: true + sprite: _CP14/Objects/Materials/dirt_block.rsi + layers: + - state: dirt + map: ["base"] + - type: FloorTile + placeTileSound: + collection: CP14Digging + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorDirt + - type: Stack + stackType: CP14Dirt + count: 1 + baseLayer: base + layerStates: + - dirt + - dirt_2 + - dirt_3 + - type: Appearance + # TODO material \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/shovel.yml new file mode 100644 index 0000000000..95d2777f36 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/shovel.yml @@ -0,0 +1,29 @@ +- type: entity + id: CP14Shovel + parent: BaseItem + name: shovel + description: An implement for digging up earth, digging beds or graves. + components: + - type: Sprite + sprite: _CP14/Objects/Tools/shovel.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 45 + damage: + types: + Blunt: 7 + Slash: 3 + soundHit: + collection: MetalThud + - type: Item + size: Normal + sprite: _CP14/Objects/Tools/shovel.rsi + - type: ToolTileCompatible + - type: Tool + qualities: + - CP14Digging + useSound: + collection: CP14Digging + params: + variation: 0.03 + volume: 2 \ 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 bb904403ed..f5c92c28cd 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml @@ -59,4 +59,4 @@ sprite: _CP14/Objects/Ores/ore_gold.rsi layers: - state: ore1 - map: ["random"] + map: ["random"] \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml b/Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml deleted file mode 100644 index 74d6ed6f3b..0000000000 --- a/Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml +++ /dev/null @@ -1,6 +0,0 @@ - -- type: soundCollection - id: CP14CrystalDings - files: - - /Audio/_CP14/Effects/crystal_ding.ogg - - /Audio/_CP14/Effects/crystal_ding2.ogg \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/SoundCollections/misc.yml b/Resources/Prototypes/_CP14/SoundCollections/misc.yml new file mode 100644 index 0000000000..80c7b08f4e --- /dev/null +++ b/Resources/Prototypes/_CP14/SoundCollections/misc.yml @@ -0,0 +1,14 @@ +- type: soundCollection + id: CP14CrystalDings + files: + - /Audio/_CP14/Effects/crystal_ding.ogg + - /Audio/_CP14/Effects/crystal_ding2.ogg + +- type: soundCollection + id: CP14Digging + files: + - /Audio/_CP14/Items/shovel_dig1.ogg + - /Audio/_CP14/Items/shovel_dig2.ogg + - /Audio/_CP14/Items/shovel_dig3.ogg + - /Audio/_CP14/Items/shovel_dig4.ogg + - /Audio/_CP14/Items/shovel_dig5.ogg \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml new file mode 100644 index 0000000000..1e8ee8f876 --- /dev/null +++ b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml @@ -0,0 +1,6 @@ +- type: stack + id: CP14Dirt + name: dirt block + spawn: CP14DirtBlock + maxCount: 10 + itemSize: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Tiles/base.yml b/Resources/Prototypes/_CP14/Tiles/base.yml index 61a71883cb..7f7ea4abbf 100644 --- a/Resources/Prototypes/_CP14/Tiles/base.yml +++ b/Resources/Prototypes/_CP14/Tiles/base.yml @@ -30,7 +30,6 @@ - 1.0 - 1.0 - 1.0 - - 1.0 baseTurf: CP14FloorBase #Recursivle indestructible isSubfloor: true footstepSounds: diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index 8616e70196..32c7958dc9 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -2,7 +2,7 @@ editorHidden: false id: CP14FloorDirt name: cp14-tiles-dirt - sprite: /Textures/_CP14/Tiles/cavedrought.png + sprite: /Textures/_CP14/Tiles/Dirt/cavedrought.png variants: 16 placementVariants: - 1.0 @@ -21,7 +21,19 @@ - 1.0 - 1.0 - 1.0 + edgeSpritePriority: 1 + edgeSprites: + SouthEast: /Textures/_CP14/Tiles/Dirt/single_edge.png + NorthEast: /Textures/_CP14/Tiles/Dirt/single_edge.png + NorthWest: /Textures/_CP14/Tiles/Dirt/single_edge.png + SouthWest: /Textures/_CP14/Tiles/Dirt/single_edge.png + South: /Textures/_CP14/Tiles/Dirt/double_edge.png + East: /Textures/_CP14/Tiles/Dirt/double_edge.png + North: /Textures/_CP14/Tiles/Dirt/double_edge.png + West: /Textures/_CP14/Tiles/Dirt/double_edge.png baseTurf: CP14FloorBase + deconstructTools: [ CP14Digging ] + itemDrop: CP14RandomDirtLootSpawner isSubfloor: true footstepSounds: collection: FootstepAsteroid @@ -39,7 +51,7 @@ - 1.0 - 1.0 - 1.0 - edgeSpritePriority: 1 + edgeSpritePriority: 2 edgeSprites: SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png @@ -49,8 +61,10 @@ East: /Textures/Tiles/Planet/Grass/double_edge.png North: /Textures/Tiles/Planet/Grass/double_edge.png West: /Textures/Tiles/Planet/Grass/double_edge.png - baseTurf: CP14FloorPlanetDirt - isSubfloor: true + baseTurf: CP14FloorDirt + deconstructTools: [ CP14Digging ] + itemDrop: CP14DirtEffect + isSubfloor: false footstepSounds: collection: FootstepGrass heatCapacity: 10000 diff --git a/Resources/Prototypes/_CP14/tools.yml b/Resources/Prototypes/_CP14/tools.yml new file mode 100644 index 0000000000..75dfe291ae --- /dev/null +++ b/Resources/Prototypes/_CP14/tools.yml @@ -0,0 +1,6 @@ +- type: tool + id: CP14Digging + name: cp14-tool-quality-digging-name + toolName: cp14-tool-quality-digging-tool-name + spawn: CP14Shovel + icon: { sprite: _CP14/Objects/Tools/shovel.rsi, state: icon} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/dirt.rsi/dirt1.png b/Resources/Textures/_CP14/Effects/dirt.rsi/dirt1.png new file mode 100644 index 0000000000..e2171ade1c Binary files /dev/null and b/Resources/Textures/_CP14/Effects/dirt.rsi/dirt1.png differ diff --git a/Resources/Textures/_CP14/Effects/dirt.rsi/dirt2.png b/Resources/Textures/_CP14/Effects/dirt.rsi/dirt2.png new file mode 100644 index 0000000000..dd48549d91 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/dirt.rsi/dirt2.png differ diff --git a/Resources/Textures/_CP14/Effects/dirt.rsi/meta.json b/Resources/Textures/_CP14/Effects/dirt.rsi/meta.json new file mode 100644 index 0000000000..1ccdf69f8e --- /dev/null +++ b/Resources/Textures/_CP14/Effects/dirt.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd", + "states": [ + { + "name": "dirt1", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ] + ] + }, + { + "name": "dirt2", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt.png b/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt.png new file mode 100644 index 0000000000..b4c1ab9da6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt_2.png b/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt_2.png new file mode 100644 index 0000000000..033d006ea5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt_2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt_3.png b/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt_3.png new file mode 100644 index 0000000000..87d052ecf5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/dirt_3.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/meta.json new file mode 100644 index 0000000000..c2f9eed7d8 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Materials/dirt_block.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "states": [ + { + "name": "dirt" + }, + { + "name": "dirt_2" + }, + { + "name": "dirt_3" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/icon.png new file mode 100644 index 0000000000..bb6349a43f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-left.png new file mode 100644 index 0000000000..fee212ccec Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-right.png new file mode 100644 index 0000000000..765229c5e8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/meta.json new file mode 100644 index 0000000000..8f4fcd67c9 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml b/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml new file mode 100644 index 0000000000..f4e04eed45 --- /dev/null +++ b/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml @@ -0,0 +1,9 @@ +- files: ["cavedrought.png"] + license: "CC-BY-SA-3.0" + copyright: "Space Station 14, recolored by TheShuEd" + source: "https://github.com/crystallpunk-14/crystall-punk-14/" + +- files: ["double_edge.png", "single_edge.png", "triple_edge.png"] + license: "CC-BY-SA-3.0" + copyright: "Created by TheShuEd" + source: "https://github.com/crystallpunk-14/crystall-punk-14/" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Tiles/cavedrought.png b/Resources/Textures/_CP14/Tiles/Dirt/cavedrought.png similarity index 100% rename from Resources/Textures/_CP14/Tiles/cavedrought.png rename to Resources/Textures/_CP14/Tiles/Dirt/cavedrought.png diff --git a/Resources/Textures/_CP14/Tiles/Dirt/double_edge.png b/Resources/Textures/_CP14/Tiles/Dirt/double_edge.png new file mode 100644 index 0000000000..fbeb24f9db Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Dirt/double_edge.png differ diff --git a/Resources/Textures/_CP14/Tiles/Dirt/single_edge.png b/Resources/Textures/_CP14/Tiles/Dirt/single_edge.png new file mode 100644 index 0000000000..4160a75dd3 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Dirt/single_edge.png differ diff --git a/Resources/Textures/_CP14/Tiles/Dirt/triple_edge.png b/Resources/Textures/_CP14/Tiles/Dirt/triple_edge.png new file mode 100644 index 0000000000..757c26da89 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Dirt/triple_edge.png differ diff --git a/Resources/Textures/_CP14/Tiles/attributions.yml b/Resources/Textures/_CP14/Tiles/attributions.yml index 7829a85031..27e20cd730 100644 --- a/Resources/Textures/_CP14/Tiles/attributions.yml +++ b/Resources/Textures/_CP14/Tiles/attributions.yml @@ -6,11 +6,6 @@ copyright: "Space Station 14, recolored by TheShuEd" source: "https://github.com/crystallpunk-14/crystall-punk-14/" -- files: ["cavedrought.png"] - license: "CC-BY-SA-3.0" - copyright: "Space Station 14, recolored by TheShuEd" - source: "https://github.com/crystallpunk-14/crystall-punk-14/" - - files: ["foundation.png"] license: "CC-BY-SA-3.0" copyright: "by TheShuEd"