From 02379e37f76ab00a23823d4973f3226ab914163f Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 15 Feb 2025 17:49:05 +0300 Subject: [PATCH] Leaf maze demiplane + crayon update (#901) * crayons update * Update workbench.yml * leaf maze demiplane * Update t2_leaf_maze.yml --- .../Crayon/UI/CrayonBoundUserInterface.cs | 2 +- Content.Server/Crayon/CrayonSystem.cs | 4 +- .../en-US/_CP14/demiplane/locations.ftl | 3 +- .../ru-RU/_CP14/demiplane/locations.ftl | 3 +- Resources/Prototypes/Decals/crayons.yml | 72 ++++++------- Resources/Prototypes/_CP14/Decal/crayon.yml | 99 +++++++++++++++++ .../Spawners/Random/Biome/biomeSpawner.yml | 15 ++- .../_CP14/Entities/Objects/Misc/crayons.yml | 51 +++++---- .../Specific/Device/wallmount_buttons.yml | 37 +++++++ .../Demiplane/Locations/t2_leaf_maze.yml | 35 ++++++ .../{biome_template_caves.yml => caves.yml} | 0 ...template_grasslands.yml => grasslands.yml} | 0 ...e_template_ice_caves.yml => ice_caves.yml} | 0 .../Prototypes/_CP14/Procedural/leaf_maze.yml | 101 ++++++++++++++++++ .../{biome_template_snow.yml => snow.yml} | 0 .../{biome_template_swamp.yml => swamp.yml} | 0 .../_CP14/Recipes/Workbench/workbench.yml | 66 ++++++++++++ .../Prototypes/_CP14/UniqueLoot/loot.yml | 6 +- .../_CP14/Decals/crayon.rsi/arrow_d.png | Bin 0 -> 256 bytes .../_CP14/Decals/crayon.rsi/arrow_dl.png | Bin 0 -> 261 bytes .../_CP14/Decals/crayon.rsi/arrow_dr.png | Bin 0 -> 261 bytes .../_CP14/Decals/crayon.rsi/arrow_l.png | Bin 0 -> 208 bytes .../_CP14/Decals/crayon.rsi/arrow_r.png | Bin 0 -> 209 bytes .../_CP14/Decals/crayon.rsi/arrow_u.png | Bin 0 -> 252 bytes .../_CP14/Decals/crayon.rsi/arrow_ul.png | Bin 0 -> 265 bytes .../_CP14/Decals/crayon.rsi/arrow_ur.png | Bin 0 -> 254 bytes .../_CP14/Decals/crayon.rsi/meta.json | 41 +++++++ .../_CP14/Decals/crayon.rsi/point.png | Bin 0 -> 155 bytes .../_CP14/Decals/crayon.rsi/skull.png | Bin 0 -> 286 bytes .../Wallmount/buttons.rsi/meta.json | 15 +++ .../Wallmount/buttons.rsi/wooden.png | Bin 0 -> 395 bytes 31 files changed, 486 insertions(+), 64 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Decal/crayon.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/wallmount_buttons.yml create mode 100644 Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_leaf_maze.yml rename Resources/Prototypes/_CP14/Procedural/{biome_template_caves.yml => caves.yml} (100%) rename Resources/Prototypes/_CP14/Procedural/{biome_template_grasslands.yml => grasslands.yml} (100%) rename Resources/Prototypes/_CP14/Procedural/{biome_template_ice_caves.yml => ice_caves.yml} (100%) create mode 100644 Resources/Prototypes/_CP14/Procedural/leaf_maze.yml rename Resources/Prototypes/_CP14/Procedural/{biome_template_snow.yml => snow.yml} (100%) rename Resources/Prototypes/_CP14/Procedural/{biome_template_swamp.yml => swamp.yml} (100%) create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/arrow_d.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/arrow_dl.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/arrow_dr.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/arrow_l.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/arrow_r.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/arrow_u.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/arrow_ul.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/arrow_ur.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/point.png create mode 100644 Resources/Textures/_CP14/Decals/crayon.rsi/skull.png create mode 100644 Resources/Textures/_CP14/Structures/Wallmount/buttons.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Wallmount/buttons.rsi/wooden.png diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs index 44501767dd..d835fb0e22 100644 --- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs +++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs @@ -30,7 +30,7 @@ namespace Content.Client.Crayon.UI private void PopulateCrayons() { - var crayonDecals = _protoManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon")); + var crayonDecals = _protoManager.EnumeratePrototypes().Where(x => x.Tags.Contains("CP14crayon")); //CP14 crayon _menu?.Populate(crayonDecals.ToList()); } diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs index 4257c436c2..817a380706 100644 --- a/Content.Server/Crayon/CrayonSystem.cs +++ b/Content.Server/Crayon/CrayonSystem.cs @@ -106,7 +106,7 @@ public sealed class CrayonSystem : SharedCrayonSystem private void OnCrayonBoundUI(EntityUid uid, CrayonComponent component, CrayonSelectMessage args) { // Check if the selected state is valid - if (!_prototypeManager.TryIndex(args.State, out var prototype) || !prototype.Tags.Contains("crayon")) + if (!_prototypeManager.TryIndex(args.State, out var prototype) || !prototype.Tags.Contains("CP14crayon")) //CP14 crayon return; component.SelectedState = args.State; @@ -130,7 +130,7 @@ public sealed class CrayonSystem : SharedCrayonSystem component.Charges = component.Capacity; // Get the first one from the catalog and set it as default - var decal = _prototypeManager.EnumeratePrototypes().FirstOrDefault(x => x.Tags.Contains("crayon")); + var decal = _prototypeManager.EnumeratePrototypes().FirstOrDefault(x => x.Tags.Contains("CP14crayon")); //CP14 crayon component.SelectedState = decal?.ID ?? string.Empty; Dirty(uid, component); } diff --git a/Resources/Locale/en-US/_CP14/demiplane/locations.ftl b/Resources/Locale/en-US/_CP14/demiplane/locations.ftl index 2e9df055be..354a24f454 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/locations.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/locations.ftl @@ -2,4 +2,5 @@ cp14-demiplane-location-cave = Dark caves cp14-demiplane-location-cave-grass = Overgrown caves cp14-demiplane-location-grassland-island = Green Island cp14-demiplane-location-ice-cave = Ice caves -cp14-demiplane-location-snow-island = Snowy island \ No newline at end of file +cp14-demiplane-location-snow-island = Snowy island +cp14-demiplane-location-leaf-maze = Leaf maze \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl index 29be4d5846..0a75dad256 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl @@ -2,4 +2,5 @@ cp14-demiplane-location-cave = Темные пещеры cp14-demiplane-location-cave-grass = Заросшие пещеры cp14-demiplane-location-grassland-island = Зеленый остров cp14-demiplane-location-ice-cave = Ледяные пещеры -cp14-demiplane-location-snow-island = Заснеженный остров \ No newline at end of file +cp14-demiplane-location-snow-island = Заснеженный остров +cp14-demiplane-location-leaf-maze = Травяной лабиринт \ No newline at end of file diff --git a/Resources/Prototypes/Decals/crayons.yml b/Resources/Prototypes/Decals/crayons.yml index a15619d483..02c38923cd 100644 --- a/Resources/Prototypes/Decals/crayons.yml +++ b/Resources/Prototypes/Decals/crayons.yml @@ -1,6 +1,6 @@ - type: decal id: 0 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -10,7 +10,7 @@ - type: decal id: 1 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -20,7 +20,7 @@ - type: decal id: 2 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -30,7 +30,7 @@ - type: decal id: 3 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -40,7 +40,7 @@ - type: decal id: 4 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -50,7 +50,7 @@ - type: decal id: 5 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -60,7 +60,7 @@ - type: decal id: 6 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -70,7 +70,7 @@ - type: decal id: 7 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -80,7 +80,7 @@ - type: decal id: 8 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -90,7 +90,7 @@ - type: decal id: 9 - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1040,7 +1040,7 @@ - type: decal id: a - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1050,7 +1050,7 @@ - type: decal id: b - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1060,7 +1060,7 @@ - type: decal id: c - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1070,7 +1070,7 @@ - type: decal id: d - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1080,7 +1080,7 @@ - type: decal id: e - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1090,7 +1090,7 @@ - type: decal id: f - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1100,7 +1100,7 @@ - type: decal id: g - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1110,7 +1110,7 @@ - type: decal id: h - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1120,7 +1120,7 @@ - type: decal id: i - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1130,7 +1130,7 @@ - type: decal id: j - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1140,7 +1140,7 @@ - type: decal id: k - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1150,7 +1150,7 @@ - type: decal id: l - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1160,7 +1160,7 @@ - type: decal id: m - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1170,7 +1170,7 @@ - type: decal id: n - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1180,7 +1180,7 @@ - type: decal id: o - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1190,7 +1190,7 @@ - type: decal id: p - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1200,7 +1200,7 @@ - type: decal id: q - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1210,7 +1210,7 @@ - type: decal id: r - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1220,7 +1220,7 @@ - type: decal id: s - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1230,7 +1230,7 @@ - type: decal id: t - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1240,7 +1240,7 @@ - type: decal id: u - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1250,7 +1250,7 @@ - type: decal id: v - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1260,7 +1260,7 @@ - type: decal id: w - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1270,7 +1270,7 @@ - type: decal id: x - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1280,7 +1280,7 @@ - type: decal id: y - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false @@ -1290,7 +1290,7 @@ - type: decal id: z - tags: ["crayon", "crayon-2-alphanum"] + tags: ["crayon", "CP14crayon", "crayon-2-alphanum"] defaultCleanable: true defaultCustomColor: true defaultSnap: false diff --git a/Resources/Prototypes/_CP14/Decal/crayon.yml b/Resources/Prototypes/_CP14/Decal/crayon.yml new file mode 100644 index 0000000000..493071a133 --- /dev/null +++ b/Resources/Prototypes/_CP14/Decal/crayon.yml @@ -0,0 +1,99 @@ +- type: decal + id: CP14CrayonArrowUp + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: arrow_u + +- type: decal + id: CP14CrayonArrowDown + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: arrow_d + +- type: decal + id: CP14CrayonArrowLeft + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: arrow_l + +- type: decal + id: CP14CrayonArrowRight + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: arrow_r + +- type: decal + id: CP14CrayonArrowDownRight + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: arrow_dr + +- type: decal + id: CP14CrayonArrowDownLeft + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: arrow_dl + +- type: decal + id: CP14CrayonArrowUpLeft + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: arrow_ul + +- type: decal + id: CP14CrayonArrowUpRight + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: arrow_ur + +- type: decal + id: CP14CrayonArrowSkull + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: skull + +- type: decal + id: CP14CrayonArrowPoint + tags: ["CP14crayon", "crayon-2-alphanum"] + defaultCleanable: true + defaultSnap: false + showMenu: true + sprite: + sprite: _CP14/Decals/crayon.rsi + state: point \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml index 7c6301ec33..6ed853a718 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml @@ -123,4 +123,17 @@ color: blue - state: frame - type: CP14BiomeSpawner - biome: CP14IceCavesGeneric \ No newline at end of file + biome: CP14IceCavesGeneric + +- type: entity + id: CP14BiomeSpawnerLeafMaze + parent: CP14BaseBiomeSpawner + suffix: Leaf maze + components: + - type: Sprite + layers: + - state: snow + color: green + - state: frame + - type: CP14BiomeSpawner + biome: CP14LeafMaze \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml index b735308541..997a86f666 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml @@ -52,26 +52,35 @@ parent: CP14Crayon id: CP14CrayonRainbow name: magic rainbow crayon + suffix: Artifact, DO NOT MAP components: - type: Sprite layers: - state: handle - state: crayon color: white + shader: unshaded - type: Item inhandVisuals: left: - state: handle-inhand-left - state: crayon-inhand-left color: white + shader: unshaded right: - state: handle-inhand-right - state: crayon-inhand-right color: white + shader: unshaded - type: Crayon color: Red selectableColor: true - capacity: 30 + capacity: 1000 + - type: PointLight + radius: 1.5 + energy: 1 + - type: RgbLightController + layers: [ 1 ] - type: entity parent: CP14Crayon @@ -105,19 +114,19 @@ layers: - state: handle - state: crayon - color: red + color: "#ed5f5f" - type: Item inhandVisuals: left: - state: handle-inhand-left - state: crayon-inhand-left - color: red + color: "#ed5f5f" right: - state: handle-inhand-right - state: crayon-inhand-right - color: red + color: "#ed5f5f" - type: Crayon - color: red + color: "#ed5f5f" - type: entity parent: CP14Crayon @@ -128,19 +137,19 @@ layers: - state: handle - state: crayon - color: yellow + color: "#ebe46e" - type: Item inhandVisuals: left: - state: handle-inhand-left - state: crayon-inhand-left - color: yellow + color: "#ebe46e" right: - state: handle-inhand-right - state: crayon-inhand-right - color: yellow + color: "#ebe46e" - type: Crayon - color: yellow + color: "#ebe46e" - type: entity parent: CP14Crayon @@ -151,19 +160,19 @@ layers: - state: handle - state: crayon - color: green + color: "#6eeb87" - type: Item inhandVisuals: left: - state: handle-inhand-left - state: crayon-inhand-left - color: green + color: "#6eeb87" right: - state: handle-inhand-right - state: crayon-inhand-right - color: green + color: "#6eeb87" - type: Crayon - color: green + color: "#6eeb87" - type: entity parent: CP14Crayon @@ -174,19 +183,19 @@ layers: - state: handle - state: crayon - color: blue + color: "#6eaaeb" - type: Item inhandVisuals: left: - state: handle-inhand-left - state: crayon-inhand-left - color: blue + color: "#6eaaeb" right: - state: handle-inhand-right - state: crayon-inhand-right - color: blue + color: "#6eaaeb" - type: Crayon - color: lightblue + color: "#6eaaeb" - type: entity parent: CP14Crayon @@ -197,16 +206,16 @@ layers: - state: handle - state: crayon - color: purple + color: "#d46eeb" - type: Item inhandVisuals: left: - state: handle-inhand-left - state: crayon-inhand-left - color: purple + color: "#d46eeb" right: - state: handle-inhand-right - state: crayon-inhand-right - color: purple + color: "#d46eeb" - type: Crayon - color: purple + color: "#d46eeb" diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/wallmount_buttons.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/wallmount_buttons.yml new file mode 100644 index 0000000000..1a24c3cf0b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/wallmount_buttons.yml @@ -0,0 +1,37 @@ +- type: entity + id: CP14WallmountButtonBase + abstract: true + parent: + - CP14BaseWallmount + categories: [ ForkFiltered ] + name: wall button + description: This button can activate something! + components: + - type: Sprite + sprite: _CP14/Structures/Wallmount/buttons.rsi + - type: Clickable + - type: InteractionOutline + - type: Physics + canCollide: false + - type: UseDelay + delay: 0.5 # prevent light-toggling auto-clickers. + - type: SignalSwitch + onPort: Pressed + offPort: Pressed + statusPort: Pressed + - type: Fixtures + - type: DeviceNetwork + deviceNetId: Wireless + - type: WirelessNetworkConnection + range: 100 + - type: DeviceLinkSource + ports: + - Pressed + +- type: entity + id: CP14WallmouontButtonWooden + parent: CP14WallmountButtonBase + name: wooden wall button + components: + - type: Sprite + state: wooden \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_leaf_maze.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_leaf_maze.yml new file mode 100644 index 0000000000..84b3344fc8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_leaf_maze.yml @@ -0,0 +1,35 @@ +- type: cp14DemiplaneLocation + id: T1LeafMaze + tier: 1 + locationConfig: CP14DemiplaneLeafMaze + name: cp14-demiplane-location-leaf-maze + tags: + - CP14DemiplaneHerbals + - CP14DemiplaneOpenSky + - CP14DemiplanePeacefulAnimals + - CP14DemiplaneWater + - CP14DemiplaneAnimalsSwamp + +- type: dungeonConfig + id: CP14DemiplaneLeafMaze + layers: + # Masks + - !type:PrototypeDunGen + proto: CP14DemiplanePlatingMaskBorder + - !type:PrototypeDunGen + proto: CP14DemiplaneCavesFloorMaskStone + - !type:PrototypeDunGen + proto: CP14DemiplaneCavesFloorMaskAir + # Biomes + - !type:BiomeDunGen + biomeTemplate: CP14CavesIndestructibleFill + tileMask: + - Plating + - !type:BiomeDunGen + biomeTemplate: CP14LeafMaze + tileMask: + - CP14FloorSand + - !type:BiomeDunGen + biomeTemplate: CP14Grassland + tileMask: + - CP14FloorGrass \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_caves.yml b/Resources/Prototypes/_CP14/Procedural/caves.yml similarity index 100% rename from Resources/Prototypes/_CP14/Procedural/biome_template_caves.yml rename to Resources/Prototypes/_CP14/Procedural/caves.yml diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/grasslands.yml similarity index 100% rename from Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml rename to Resources/Prototypes/_CP14/Procedural/grasslands.yml diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_ice_caves.yml b/Resources/Prototypes/_CP14/Procedural/ice_caves.yml similarity index 100% rename from Resources/Prototypes/_CP14/Procedural/biome_template_ice_caves.yml rename to Resources/Prototypes/_CP14/Procedural/ice_caves.yml diff --git a/Resources/Prototypes/_CP14/Procedural/leaf_maze.yml b/Resources/Prototypes/_CP14/Procedural/leaf_maze.yml new file mode 100644 index 0000000000..ab242f0883 --- /dev/null +++ b/Resources/Prototypes/_CP14/Procedural/leaf_maze.yml @@ -0,0 +1,101 @@ +- type: biomeTemplate + id: CP14LeafMaze + layers: + - !type:BiomeMetaLayer + template: CP14Grassland + - !type:BiomeTileLayer + tile: CP14FloorDirt + threshold: 0.2 + noise: + seed: 14 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 0.2 + - !type:BiomeEntityLayer # More Trees + threshold: 0.4 + noise: + seed: 4 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 1.5 + allowedTiles: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entities: + - CP14FloraTreeGreen + - CP14FloraTreeGreenLarge + - !type:BiomeEntityLayer # Walls + threshold: -0.6 + invert: true + noise: + seed: 0 + noiseType: Perlin + fractalType: Ridged + octaves: 1 + frequency: 0.15 + gain: 0.5 + allowedTiles: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entities: + - CP14WallLeaf + - !type:BiomeEntityLayer # Walls + threshold: -0.6 + invert: true + noise: + seed: 0 + noiseType: Perlin + fractalType: Ridged + octaves: 1 + frequency: 0.15 + gain: 0.5 + allowedTiles: + - CP14FloorDirt + entities: + - CP14WallDirt + - !type:BiomeEntityLayer # Tall grass! + threshold: -0.3 + noise: + seed: 23 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.05 + octaves: 3 + lacunarity: 1.8 + gain: 0.7 + domainWarpType: OpenSimplex2 + domainWarpAmp: 120 + allowedTiles: + - CP14FloorGrassTall + entities: + - CP14RandomBushOffsetSpawner + - !type:BiomeEntityLayer #Water! + allowedTiles: + - CP14FloorDirt + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + threshold: 0.6 + noise: + seed: 14 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 0.03 + entities: + - CP14FloorWaterReeds + - !type:BiomeEntityLayer #Water! + allowedTiles: + - CP14FloorDirt + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + threshold: 0.7 + noise: + seed: 14 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 0.03 + entities: + - CP14FloorWaterLilies \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml b/Resources/Prototypes/_CP14/Procedural/snow.yml similarity index 100% rename from Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml rename to Resources/Prototypes/_CP14/Procedural/snow.yml diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_swamp.yml b/Resources/Prototypes/_CP14/Procedural/swamp.yml similarity index 100% rename from Resources/Prototypes/_CP14/Procedural/biome_template_swamp.yml rename to Resources/Prototypes/_CP14/Procedural/swamp.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index df4944edfa..8ed959a6b0 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -139,3 +139,69 @@ count: 1 result: CP14Arrow resultCount: 4 + +- type: CP14Recipe + id: CP14CrayonWhite + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14WoodenPlanks + - !type:ProtoIdResource + protoId: CP14CrystalShardBase + result: CP14CrayonWhite + +- type: CP14Recipe + id: CP14CrayonRed + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14CrayonWhite + - !type:ProtoIdResource + protoId: CP14DyeRed + result: CP14CrayonRed + +- type: CP14Recipe + id: CP14CrayonBlue + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14CrayonWhite + - !type:ProtoIdResource + protoId: CP14DyeBlue + result: CP14CrayonBlue + +- type: CP14Recipe + id: CP14CrayonYellow + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14CrayonWhite + - !type:ProtoIdResource + protoId: CP14DyeYellow + result: CP14CrayonYellow + +- type: CP14Recipe + id: CP14CrayonGreen + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14CrayonWhite + - !type:ProtoIdResource + protoId: CP14DyeGreen + result: CP14CrayonGreen + +- type: CP14Recipe + id: CP14CrayonPurple + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14CrayonWhite + - !type:ProtoIdResource + protoId: CP14DyePurple + result: CP14CrayonPurple diff --git a/Resources/Prototypes/_CP14/UniqueLoot/loot.yml b/Resources/Prototypes/_CP14/UniqueLoot/loot.yml index 2f9e197647..db1a4c3022 100644 --- a/Resources/Prototypes/_CP14/UniqueLoot/loot.yml +++ b/Resources/Prototypes/_CP14/UniqueLoot/loot.yml @@ -16,4 +16,8 @@ - type: uniqueLoot id: CP14MagicShadowStaff - entity: CP14MagicShadowStaff \ No newline at end of file + entity: CP14MagicShadowStaff + +- type: uniqueLoot + id: CP14CrayonRainbow + entity: CP14CrayonRainbow \ No newline at end of file diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_d.png b/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_d.png new file mode 100644 index 0000000000000000000000000000000000000000..87a8330dddb7b0a7a2511edccb7447d8cb381070 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}yF6VSLn2!5 zPT$SjV8G+Tf6UACs7a!j5wECfwj(n~>-zH(b&6vrOtP7KzK>x~w#4##vkrzuvA+sZ zn8t9CXMqdD-RTNUR_a?AJa^u&=QO)G_rdMPZJe@GEPtF;SQKk;zQN~e)LLu zB(WED_&l=lV9d+@%M`|zkh@#G^YDolgV&Xr);#_JzuJUyGC=wfq+ z7UPERH7pI=IKNmvn>>L{Px#zez+vR9J=WmN5>)APhx+tDY)jrko}{OE?V^BiEu!siMd&HvE(!ybTHIe{6pz zz+i9%e280b4}IwRavx&S+`FGB?lgCACkO+8TjuHcHv{ipuU2u2ffjK9c(fYG;>$cy z+bQBh-1gD(Atvp#v&7T4b1jw_uEJRrwPu9Z(@Jk%MC_icCRY+=O?@$j(g!7r?~T;A(H20eHIs5WAgF3W7800000 LNkvXXu0mjfM?!0v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_dr.png b/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_dr.png new file mode 100644 index 0000000000000000000000000000000000000000..d8a0b0b27ffa9bf1cb14ff5baee134d242cdbf66 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`#oJ8Ln2z= zPBRp0QQ&d?|8AqsTAQ;~Vivrjs@E^ErA>6~oVh@=Le|*fo{AzD4_j2B-Hh$BB@2{< z&$X|;emDM+-EHqj&UYoeKQcF@&O7n^2#XgdL)pybUjrNCgmmWcN1uO|;%Om&=J9zm zuNj+5xnCLYIrQkhaA(oo>0X*AA}5?U;P~X7M0oJN}ju8@ft=QztalLBTl z6{k0OaCW_{SP;s#QSO9Gz^NF|4z4*T9&CN@+Sg^j`k;fV^|^m}TxXa!@BqES;OXk; Jvd$@?2>=gjWpMxi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_l.png b/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_l.png new file mode 100644 index 0000000000000000000000000000000000000000..97022f029ea315446bf04ee6a5a0f63c84beb0ba GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}U7jwEArY-_ zC+`+)P!MprzKx@I1zYyStPYM$Z{b1-7E2k4$+d>3_dRA7aN_tmbE)}*nj4G~3>Q|v zI#(~|(d|CfoONAL!h<79je9D>emXA*xpRQ2A@1t5r^;&a!6F5AZ%(SUZ`h-9S!jQ1 z(()&~A?qJLJ(4p?(@#$D?&~%33SuidZd@yA5pe2g5w_lA#bt4!Z$8jf44$rjF6*2U FngHbGO`!k) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_r.png b/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_r.png new file mode 100644 index 0000000000000000000000000000000000000000..d54665b2add6e63ffa8aa49941ef3192dc86dd2a GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}-JULvArY-_ zr)(5#P~dSr95p4xM|txBlaMKEmiEqRYB=Vs`)9q^!M}T&1(blw<(1u9eh56@S`y{? zd6$FYK_N-C3lj=mTx@5$vv75;^9VlBo^id%i?LHAWX{e*jxI|S)-Fk8v2wf2vo_`0 z=P#UPL8cpDT`giOdckw&C+FgC4NKpa-PjE@_`v>1hD;HAuEqsRrvbSPp00i_>zopr E0Ie%dbN~PV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_u.png b/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_u.png new file mode 100644 index 0000000000000000000000000000000000000000..c6bb7784bfdefb6617b1ff74f7e5975df3ed914e GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+dN$yLn2z= zPB-LhHV|MjuM|@iU9XtGG5+zXrTbl_CMYQ=-Lu|em}DJpy*>TsIfvI?J6TMd{p7CN z%POdG9*FsyVQ9`+(a97Mp1+ejj`PCW1V*#A9ImSj-4`#E_baamW?<;a{`~aJk^t5Z z&5os9TRCe?Z)Bd-WN>$z*tlS75vS(#m-6=*=RRY3(fDLy!^-z+4E>!N`9^VD-GU+t?l^3e%EA24{j`njxgN@xNA`V3s0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_ul.png b/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_ul.png new file mode 100644 index 0000000000000000000000000000000000000000..cb6ad09c0ae2327f3f5eeff56a4d49b246753b0c GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}hdo^!Ln2z= zPBRp0QQ&cXEZ04$>+**5iI)Qci*&a!ww>&1I@#eGr~a5nf4%^#0Lw!L`A7e*#NA%e zaq-n|CxwNo$90RfE=*iuB%?IHu{{5@gvdWM7m6+wSId0`Mjfj21DihWJYwi;AX5Dn;mPlN)isGJG@=xBR)tm5VO#ym` N!PC{xWt~$(697nSW-tH% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_ur.png b/Resources/Textures/_CP14/Decals/crayon.rsi/arrow_ur.png new file mode 100644 index 0000000000000000000000000000000000000000..47977a238d5a849d75b6fee976a41610bf22cc00 GIT binary patch literal 254 zcmVPx#xJg7oR9J=Wl`#&0APhyn##1>uc^W*6o`#8$Yw3assR$yqn#h|B7+?ES5U5lt zLTF>>(0U^w9EW~7d#`&)s>s%90W1kPF_i)U#-WcoiV}#49ZTvPw+qn5uKV-erN4F+ zwjm73Q}F{p%Pse$$@tj{2*~Bo#?F2M+SoN`7B~`6IL3V`{$gmiE{))o`?&lr+4lgs ze2Syanp!H4{bbk+@a5vijUF{|-j>T8tIzS@&MUuT1GL0nG8TSb#sB~S07*qoM6N<$ Eg3{J%F#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/meta.json b/Resources/Textures/_CP14/Decals/crayon.rsi/meta.json new file mode 100644 index 0000000000..1133911c92 --- /dev/null +++ b/Resources/Textures/_CP14/Decals/crayon.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "By TheShuEd(Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "arrow_d" + }, + { + "name": "arrow_u" + }, + { + "name": "arrow_l" + }, + { + "name": "arrow_r" + }, + { + "name": "arrow_dl" + }, + { + "name": "arrow_dr" + }, + { + "name": "arrow_ur" + }, + { + "name": "arrow_ul" + }, + { + "name": "point" + }, + { + "name": "skull" + } + ] +} diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/point.png b/Resources/Textures/_CP14/Decals/crayon.rsi/point.png new file mode 100644 index 0000000000000000000000000000000000000000..dabe8096d2db0a296310befe0fbb0d263de3de52 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}p`I>|ArY;~ z2@Bn&34EB7#7 yXBb16pI9ZBPfTJt*r0w0sL}192FR2Hj0|3{1-Y1Wx2gawVDNPHb6Mw<&;$V6buTmk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Decals/crayon.rsi/skull.png b/Resources/Textures/_CP14/Decals/crayon.rsi/skull.png new file mode 100644 index 0000000000000000000000000000000000000000..a1e1f9ec720cf1145ec46fd34c7a51eb0d2da1d3 GIT binary patch literal 286 zcmV+(0pb3MP)Px#*hxe|R9J=Wl)(xEAq+&v(y#I;So~yJ!K1%rFR=uR+r*VpsP808+>GNyV6)l$ zJ7#uc%%##Y1!o^$5fF1Z0Qi#jZFX1vZP^5QXqV0AHc&vLXti$N~CU>b|u*_c51BmP@8YFMx^Q%`s@W zehho)#BUj3!o+9=q^?n#9lyqXVowt>vRR#jrD$G3V9tTF#vaP+xbzanTn_f)sph}2 k#DSPgotc2mX7dv~0UFX`E%yzgbpQYW07*qoM6N<$g3tqZx&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Wallmount/buttons.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallmount/buttons.rsi/meta.json new file mode 100644 index 0000000000..73a45f2a63 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Wallmount/buttons.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd", + "size": { + "x": 32, + "y": 96 + }, + "states": [ + { + "name": "wooden", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallmount/buttons.rsi/wooden.png b/Resources/Textures/_CP14/Structures/Wallmount/buttons.rsi/wooden.png new file mode 100644 index 0000000000000000000000000000000000000000..d51298ed2a61eeb83ac4104b2311e8e3e516c7d1 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^4nTZ>gAGV-xtR*07>k44ofy`glX(ebyL!4fhE&XX zdv~`NbD#j*gTQMEAH+6zY+mVlFfRT`_*YFGmDU@aH`S6hX81ITZ4^jN&MDfXGrK0< zvS8Xno#j$9?3sW@CY;UDseWK_K7IMmx+izP#q5>vTNH0|%r{Wy?^&zdYj+*)Zkpm; zxm~t>?%dX@{S|)-o&W2;WXfZEd_&srS(d;4=J?DP`zx6=+fRMWcFCy?&Yri0Tf%p- zjBovJaiH-G3_p^4rBdAX@TXhvzJ2lamS?Y;KdGL&Sn~2=&ZU?IdC%S1xi_EOQ`2`^ zdo#%E7$BllT0C8SbH|spYkWVKYUhTX<%^xpvNLY^*O@bSeQWH_u4jxabu1Ki4h{}+ zPTu_bc6&!gUPe||R>m6j4mdKI;Vst01g42O#lD@ literal 0 HcmV?d00001