From 96e3e548bfa6f68c98bf05628df502f793c096ee Mon Sep 17 00:00:00 2001 From: Firewars763 Date: Sat, 1 Feb 2025 14:16:11 -0500 Subject: [PATCH 1/4] This commit adds 2 new Rock Anomaly types, Coal and Gold. It also adds Resource Crabs, colored crystals, and lights for both. --- .../Prototypes/Entities/Effects/mobspawn.yml | 24 +++++ .../Prototypes/Entities/Effects/wallspawn.yml | 34 +++++- .../Markers/Spawners/Random/anomaly.yml | 6 +- .../Markers/Spawners/Random/crystal.yml | 2 + .../Entities/Mobs/NPCs/elemental.yml | 60 +++++++++++ .../Objects/Materials/crystal_shard.yml | 32 ++++++ .../Entities/Objects/Power/lights.yml | 41 +++++++ .../Structures/Decoration/crystals.yml | 56 ++++++++++ .../Structures/Lighting/base_lighting.yml | 59 +++++++++++ .../Structures/Specific/Anomaly/anomalies.yml | 100 ++++++++++++++++++ .../Entities/Structures/Walls/asteroid.yml | 46 ++++++++ .../Prototypes/Procedural/biome_templates.yml | 4 + .../Graphs/utilities/lighting.yml | 40 +++++++ Resources/Prototypes/ore.yml | 8 ++ Resources/Prototypes/tags.yml | 6 ++ .../Effects/mobspawn.rsi/crab_coal.png | Bin 0 -> 2296 bytes .../Effects/mobspawn.rsi/crab_gold.png | Bin 0 -> 2361 bytes .../Textures/Effects/mobspawn.rsi/meta.json | 28 +++++ .../Mobs/Elemental/orecrab.rsi/coal_crab.png | Bin 0 -> 2631 bytes .../Mobs/Elemental/orecrab.rsi/gold_crab.png | Bin 0 -> 2711 bytes .../Mobs/Elemental/orecrab.rsi/meta.json | 8 ++ 21 files changed, 551 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Effects/mobspawn.rsi/crab_coal.png create mode 100644 Resources/Textures/Effects/mobspawn.rsi/crab_gold.png create mode 100644 Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png create mode 100644 Resources/Textures/Mobs/Elemental/orecrab.rsi/gold_crab.png diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml index 1489c26493ab..a043fe97d656 100644 --- a/Resources/Prototypes/Entities/Effects/mobspawn.yml +++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml @@ -39,6 +39,18 @@ - type: SpawnOnDespawn prototype: MobIronCrab +- type: entity + id: MobSpawnCrabCoal + parent: MobSpawnCrabQuartz + name: mobspawner coalcrab + categories: [ HideSpawnMenu, Spawner ] + components: + - type: Sprite + sprite: /Textures/Effects/mobspawn.rsi + state: crab_coal + - type: SpawnOnDespawn + prototype: MobCoalCrab + - type: entity id: MobSpawnCrabSilver parent: MobSpawnCrabQuartz @@ -51,6 +63,18 @@ - type: SpawnOnDespawn prototype: MobSilverCrab +- type: entity + id: MobSpawnCrabGold + parent: MobSpawnCrabQuartz + name: mobspawner goldcrab + categories: [ HideSpawnMenu, Spawner ] + components: + - type: Sprite + sprite: /Textures/Effects/mobspawn.rsi + state: crab_gold + - type: SpawnOnDespawn + prototype: MobGoldCrab + - type: entity id: MobSpawnCrabUranium parent: MobSpawnCrabQuartz diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml index 44afe80e978a..155ef10bb5e5 100644 --- a/Resources/Prototypes/Entities/Effects/wallspawn.yml +++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml @@ -74,6 +74,22 @@ - type: SpawnOnDespawn prototype: AsteroidRockSilver +- type: entity + id: WallSpawnAsteroidGoldCrab + parent: WallSpawnAsteroid + categories: [ HideSpawnMenu ] + components: + - type: SpawnOnDespawn + prototype: AsteroidRockGoldCrab + +- type: entity + id: WallSpawnAsteroidGold + parent: WallSpawnAsteroid + categories: [ HideSpawnMenu ] + components: + - type: SpawnOnDespawn + prototype: AsteroidRockGold + - type: entity id: WallSpawnAsteroidIronCrab parent: WallSpawnAsteroid @@ -88,4 +104,20 @@ categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn - prototype: AsteroidRockTin \ No newline at end of file + prototype: AsteroidRockTin + +- type: entity + id: WallSpawnAsteroidCoalCrab + parent: WallSpawnAsteroid + categories: [ HideSpawnMenu ] + components: + - type: SpawnOnDespawn + prototype: AsteroidRockCoalCrab + +- type: entity + id: WallSpawnAsteroidCoal + parent: WallSpawnAsteroid + categories: [ HideSpawnMenu ] + components: + - type: SpawnOnDespawn + prototype: AsteroidRockCoal diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml index d12709341243..40f37c737fe5 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml @@ -22,7 +22,7 @@ - AnomalyFlora - AnomalyShadow - AnomalyTech - #- AnomalySanta + #- AnomalySanta rareChance: 0.3 rarePrototypes: - RandomAnomalyInjectorSpawner @@ -40,7 +40,9 @@ - type: RandomSpawner prototypes: - AnomalyRockIron + - AnomalyRockCoal - AnomalyRockSilver + - AnomalyRockGold - AnomalyRockQuartz - AnomalyRockUranium chance: 1 @@ -69,4 +71,4 @@ - AnomalyTrapRock #- AnomalyTrapSanta chance: 1 - + diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml index 84adf28e2d9f..fccc04b49577 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml @@ -16,5 +16,7 @@ - CrystalOrange - CrystalBlue - CrystalCyan + - CrystalYellow + - CrystalBlack - CrystalGrey chance: 0.7 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index a26b1511dd6e..1a2c13460769 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -157,6 +157,37 @@ - !type:DoActsBehavior acts: [ "Destruction" ] +- type: entity + parent: MobOreCrab + id: MobCoalCrab + description: An ore crab made from coal. + components: + - type: Sprite + state: coal_crab + - type: MeleeWeapon + damage: + types: + Blunt: 2.5 + - type: MovementSpeedModifier + baseWalkSpeed : 1.0 + baseSprintSpeed : 1.5 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + Coal1: + min: 2 + max: 4 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: entity parent: MobOreCrab id: MobUraniumCrab @@ -221,6 +252,35 @@ - !type:DoActsBehavior acts: [ "Destruction" ] +- type: entity + parent: MobOreCrab + id: MobGoldCrab + name: ore crab + description: An ore crab made from gold. + components: + - type: Sprite + state: gold_crab + - type: MeleeWeapon + damage: + types: + Blunt: 5 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 70 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + GoldOre1: + min: 1 + max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: entity name: reagent slime id: ReagentSlime diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml index 47828ed8f588..3b2b441aabed 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml @@ -73,6 +73,22 @@ - Trash - CrystalBlue +- type: entity + parent: ShardCrystalBase + name: yellow crystal shard + id: ShardCrystalYellow + components: + - type: Sprite + color: "#ffde46" + - type: PointLight + radius: 2 + energy: 2.5 + color: "#ffde46" + - type: Tag + tags: + - Trash + - CrystalYellow + - type: entity parent: ShardCrystalBase id: ShardCrystalOrange @@ -89,6 +105,22 @@ - Trash - CrystalOrange +- type: entity + parent: ShardCrystalBase + name: black crystal shard + id: ShardCrystalBlack + components: + - type: Sprite + color: "#363636" + - type: PointLight + radius: 2 + energy: 2.5 + color: "#363636" + - type: Tag + tags: + - Trash + - CrystalBlack + - type: entity parent: ShardCrystalBase id: ShardCrystalPink diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 0e4d0056c734..8040d1b4bd57 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -344,6 +344,26 @@ - id: SheetGlass1 - id: ShardCrystalBlue +- type: entity + parent: LightTubeCrystalCyan + name: yellow crystal light tube + id: LightTubeCrystalYellow + components: + - type: LightBulb + color: "#ffde46" + lightEnergy: 3 + lightRadius: 8 + lightSoftness: 0.5 + BurningTemperature: 350 + PowerUse: 60 + - type: Construction + graph: YellowLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalYellow + - type: entity parent: LightTubeCrystalCyan name: pink crystal light tube @@ -384,6 +404,27 @@ - id: SheetGlass1 - id: ShardCrystalOrange +- type: entity + parent: LightTubeCrystalCyan + name: black crystal light tube + description: A high power high energy bulb which has a small colored crystal inside. It seems quite dim. + id: LightTubeCrystalBlack + components: + - type: LightBulb + color: "#363636" + lightEnergy: 1 + lightRadius: 8 + lightSoftness: 0.5 + BurningTemperature: 350 + PowerUse: 60 + - type: Construction + graph: BlackLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalBlack + - type: entity parent: LightTubeCrystalCyan name: red crystal light tube diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml index 3e5f9ca18a9b..d68d163b5ebf 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml @@ -140,6 +140,34 @@ min: 1 max: 2 +- type: entity + id: CrystalBlack + parent: CrystalGreen + suffix: black + components: + - type: Sprite + color: "#363636" + - type: PointLight + radius: 3 + energy: 3 + color: "#363636" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + ShardCrystalBlack: + min: 1 + max: 2 + - type: entity id: CrystalBlue parent: CrystalGreen @@ -168,6 +196,34 @@ min: 1 max: 2 +- type: entity + id: CrystalYellow + parent: CrystalGreen + suffix: yellow + components: + - type: Sprite + color: "#ffde46" + - type: PointLight + radius: 3 + energy: 3 + color: "#ffde46" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + ShardCrystalYellow: + min: 1 + max: 2 + - type: entity id: CrystalCyan parent: CrystalGreen diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index baa90189cfc5..0cfb57dca12c 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -564,6 +564,35 @@ softness: 0.5 color: "#39a1ff" +- type: entity + id: PoweredlightYellow + suffix: Yellow + parent: Poweredlight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalYellow + - type: PointLight + radius: 8 + energy: 3 + softness: 0.5 + color: "#ffde46" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + +- type: entity + id: AlwaysPoweredlightYellow + suffix: Always Powered, Yellow + parent: AlwaysPoweredWallLight + components: + - type: PointLight + radius: 8 + energy: 3 + softness: 0.5 + color: "#ffde46" + - type: entity id: PoweredlightPink suffix: Pink @@ -622,6 +651,36 @@ softness: 0.5 color: "#ff8227" +- type: entity + id: PoweredlightBlack + suffix: Black + parent: Poweredlight + description: + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalBlack + - type: PointLight + radius: 8 + energy: 1 + softness: 0.5 + color: "#363636" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + +- type: entity + id: AlwaysPoweredlightBlack + suffix: Always Powered, Black + parent: AlwaysPoweredWallLight + components: + - type: PointLight + radius: 8 + energy: 1 + softness: 0.5 + color: "#363636" + - type: entity id: PoweredlightRed suffix: Red diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index 841c0a309b55..ad6c2a770128 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -556,6 +556,56 @@ spawns: - MobSpawnCrabSilver +- type: entity + id: AnomalyRockGold + parent: AnomalyRockBase + suffix: Rock, Gold + components: + - type: Sprite + color: "#e3ba70" + - type: PointLight + radius: 2.0 + energy: 7.5 + color: "#e3ba70" + - type: EntitySpawnAnomaly + entries: + - settings: + spawnOnPulse: true + minAmount: 8 + maxAmount: 15 + minRange: 4.5 + maxRange: 7.5 + spawns: + - WallSpawnAsteroid + - WallSpawnAsteroid + - WallSpawnAsteroidGold + - WallSpawnAsteroidGoldCrab + - settings: + spawnOnPulse: true + maxAmount: 3 + minRange: 2.5 + maxRange: 4.5 + spawns: + - CrystalYellow + - settings: + spawnOnSuperCritical: true + minAmount: 30 + maxAmount: 40 + minRange: 5 + maxRange: 15 + spawns: + - CrystalYellow + - WallSpawnAsteroid + - WallSpawnAsteroid + - WallSpawnAsteroidGoldCrab + - settings: + spawnOnSuperCritical: true + minAmount: 6 + maxAmount: 10 + maxRange: 5 + spawns: + - MobSpawnCrabGold + - type: entity id: AnomalyRockIron parent: AnomalyRockBase @@ -606,6 +656,56 @@ spawns: - MobSpawnCrabIron +- type: entity + id: AnomalyRockCoal + parent: AnomalyRockBase + suffix: Rock, Coal + components: + - type: Sprite + color: "#484848" + - type: PointLight + radius: 2.0 + energy: 7.5 + color: "#484848" + - type: EntitySpawnAnomaly + entries: + - settings: + spawnOnPulse: true + minAmount: 8 + maxAmount: 15 + minRange: 4.5 + maxRange: 7.5 + spawns: + - WallSpawnAsteroid + - WallSpawnAsteroid + - WallSpawnAsteroidCoal + - WallSpawnAsteroidCoalCrab + - settings: + spawnOnPulse: true + maxAmount: 3 + minRange: 2.5 + maxRange: 4.5 + spawns: + - CrystalBlack + - settings: + spawnOnSuperCritical: true + minAmount: 30 + maxAmount: 40 + minRange: 5 + maxRange: 15 + spawns: + - CrystalBlack + - WallSpawnAsteroid + - WallSpawnAsteroid + - WallSpawnAsteroidCoalCrab + - settings: + spawnOnSuperCritical: true + minAmount: 6 + maxAmount: 10 + maxRange: 5 + spawns: + - MobSpawnCrabCoal + - type: entity id: AnomalyFlora parent: BaseAnomaly diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 54f553ab9cd7..e83b4c5f071b 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -73,6 +73,29 @@ - state: rock_coal map: [ "enum.MiningScannerVisualLayers.Overlay" ] +- type: entity + id: AsteroidRockCoalCrab + parent: AsteroidRock + description: An ore vein rich with coal. + suffix: Coal Crab + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCoalCrab + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_coal + map: [ "enum.MiningScannerVisualLayers.Overlay" ] + - type: entity id: AsteroidRockGold parent: AsteroidRock @@ -96,6 +119,29 @@ - state: rock_gold map: [ "enum.MiningScannerVisualLayers.Overlay" ] +- type: entity + id: AsteroidRockGoldCrab + parent: AsteroidRock + description: An ore vein rich with gold. + suffix: Gold Crab + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreGoldCrab + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_gold + map: [ "enum.MiningScannerVisualLayers.Overlay" ] + - type: entity id: AsteroidRockDiamond parent: AsteroidRock diff --git a/Resources/Prototypes/Procedural/biome_templates.yml b/Resources/Prototypes/Procedural/biome_templates.yml index 588d95f40da5..d630ebad489f 100644 --- a/Resources/Prototypes/Procedural/biome_templates.yml +++ b/Resources/Prototypes/Procedural/biome_templates.yml @@ -513,7 +513,9 @@ - CrystalGreen - CrystalPink - CrystalOrange + - CrystalBlack - CrystalBlue + - CrystalYellow - CrystalCyan - !type:BiomeEntityLayer threshold: 0.95 @@ -561,7 +563,9 @@ - CrystalGreen - CrystalPink - CrystalOrange + - CrystalBlack - CrystalBlue + - CrystalYellow - CrystalCyan - !type:BiomeEntityLayer threshold: 0.95 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml index 977be3f4d698..6b05a50a71a3 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml @@ -39,6 +39,26 @@ - node: icon entity: LightTubeCrystalBlue +- type: constructionGraph + id: YellowLight + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalYellow + name: yellow crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightTubeCrystalYellow + - type: constructionGraph id: PinkLight start: start @@ -79,6 +99,26 @@ - node: icon entity: LightTubeCrystalOrange +- type: constructionGraph + id: BlackLight + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalBlack + name: black crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightTubeCrystalBlack + - type: constructionGraph id: RedLight start: start diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml index 30ac6a537342..a7f4ef11e552 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -72,10 +72,18 @@ id: OreIronCrab oreEntity: MobSpawnCrabIron +- type: ore + id: OreCoalCrab + oreEntity: MobSpawnCrabCoal + - type: ore id: OreSilverCrab oreEntity: MobSpawnCrabSilver +- type: ore + id: OreGoldCrab + oreEntity: MobSpawnCrabGold + - type: ore id: OreUraniumCrab oreEntity: MobSpawnCrabUranium diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index f1283f96e6de..624caebf6651 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -419,6 +419,9 @@ - type: Tag id: CrystalBlue +- type: Tag + id: CrystalYellow + - type: Tag id: CrystalCyan @@ -428,6 +431,9 @@ - type: Tag id: CrystalOrange +- type: Tag + id: CrystalBlack + - type: Tag id: CrystalPink diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png b/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png new file mode 100644 index 0000000000000000000000000000000000000000..660de649085590f23b622cd9a9f8dd093cc88ac6 GIT binary patch literal 2296 zcmV+4>d3-Z_3*B!>j#)kWTe0;3iWD!F*aA5=h`7oY_(-06)T`N{rR*LGo{QCOpMF^6w z@ppH3T~prP-ir74_fe_{CIPOlu4>_)o}R|MaA#*{tQ(%3oMiJxiC+;uRxgEt7?ltu z%ICxfAcO@Dhz=bPrV=38=KoUe0QqRd>guX%4Ae)%LZYP9Yb{FyfscduINwH$wQg%U zV9C$-_jiF0@WDmuVd?>>6eQE|t*xyF4#c1cq27?%sJ8OJUtV4w3q!!4#QRd)_5A!? z92^`pZex!`yKo>>rGz1~0H~bC)7#MP5PR{B56(k~zC^I#BMw(hjm}I`$%mbA0NvB* zl&BBlq>cq90UjP6MpT{+V7EgUkb$#05a4T)v}*ws+66av5D zjW{3%eorzO#RN#fXI(kh1;j@v!ohKee1teyTU(2nRhVZ%@OG$=P(U#JMgwr|^Yb$b zHc0_2uy9O*&wD4q)%QqzhC_Ul1K1zppbB4|@a7%>@;5g(otNubko1V0-tP$y5CH>{ocp3zuo1fa6ds6$ zm78hFBZiN79J(*H9U!o+9@$}ysr{2^!TK1ib(+7aDZ{%3u8Gj;X5Pw4wl_q zwxJ6j?ZHF$Sx(QPpc0AgQXU+eoh4&WONz_r}u0}Qhd ze2BpYgz)uD1Z3dR#54lL@KHC~0{ih{8@M)#VVlPQR0M*tCJ0s92l>E}3mw_pbQ>@} z$eD=u#B$n46cQiatf!%D2kI{V>l)OVwLoGz2qRq84$2Qe)V^GcXwB>&~ctIA7o+n zQC*+<(KH2=_@P;##D@?u&nIW|E`TEvBFOQl^86BBh;N9X9bnqH&-$u`RO#pO4Ge}D z_6|O(W(b5MPyp1?<)CvdfLO_P88Oq4C_|c_{eWon6qbpRkMeUZK#!r#R5e$z?1i`q zzxVg|i~IX~5Y3)Z9v&X@oSO+jgxD&05FjFhdX^OGX;b$;^E$xfGDD$c1_l9=Da(7q zAV6L|lWQ9UNTw|B4TAuA`An{D5FnYdyf+L2(IIK^4cu$f!EcBHhP&Ltn*-X7GP>paMHuLKJw#J{OLFGK`c|` z(dN+pfNGyY^0Ohc0Da}hTLt)S{I>lGGG)?lAaNT;tcO{EzVhR(4gIV5W&uc)&UxfN zt(hNVNyoF29x6BQ_^~t;ZBvo}edNcdh_MLxl|4!6@n!+~%8$1Sut@kA3#juk zvCS+1^W$YU8pD#@Iw~{S&;X`)mMxR90 zxmxTSKjs9Quxjw1cz*!uVzxF!fc@3Evh`I3+>A!Wa0Bz)b*dfnBT*LD7$TSzCg;N( zoMT<`xA8%k+=j}mJJ`~f{lO3yUURu?;lSjJt?FJ8S!HguyH*nepjY+ z>nzA;29NsAkJqfQ`}cs)OzNN`F#Z#t`Jg%M$IPc~$7VwSA0shcta-_qA1||sTins5 zqRW{|PW%cp+6%d}hGSk%{LpTlh5)(%y)fjZa-*CjKOUkQ$AOxp-1xC<@54;krC0%46Y0F@rO~;2=!H z`T7+dItV6-=Q*JHJz9-X5=UaNJ47Gqoa@d?IPSOV3^8&w3~%&d(Zx+GzF&7Zd^!miVFo8?yqd??;qYM- z?Bs438lul}1{K2BBD76I<>t4>pdl+I!8B45E=21jyzQbUpXE~Vxt`H4+lw`d_>9}M zP1-2!_gj`+wG<7Q==oiRJe0?gzD6d@J}i+YjM3mkzNxih%e92&oRfZ#|q+CWlXF8h5!i(OL{&XonI#^ zQr8FJIXR%XI*dq1=}_wNhXpvb#cpd zH3h`50MymFP2OFHo|ts4ak^fYFqZ=O@Z#*3Vt7)5gE@MN@G!ZU<3Ju=;{cEUFhN~% z0LC>C=^t0Skb|=PRDZg#CCTQyicnA6`l1}(9Ub;_kQbO-)c;_iGjP2iXN@GAAxPGP za|`?K=#;RNqii6ogr?UHiXlsSI>!^%6MBbTqX*<@^iW3{19LkDq?xg}rT+o)18g_H S?Eql_0000>;n-^KI-y~P3?rg2l5``hPMwom zTSchMC01glVls{q3Auz}%k=gAAHF}lpXc@b`n;YWp3BF)+%;6UsR96?;c>+E#HN!s zIkZK2Qz!PtYHk{Ya>PFl0MxYq2MD-b3I~8KGajy(lZmHiiB35rH=VnN?LoR~X^RB- z^L*7^fl5(94@^CEbie0;@na6aD@jKDc+XOWw38ujfmJ>dK0Qf+-Nnb#^v3UVh{9Y*b=t>Z=YiJ|)Z|>oJVh1^c4hwak> z#82YP1rtQ(T8c*Mk-C2EKb(t?IfT^1x6kGM$kaB-1sERXHyf`7*rRuNt`k+)jMNs; z^0EKOADdlt(8Lv^!=+=ltFp!lSk9De%M~wJQ_3$mb;}xD4Z2(9X`1YtZm(x>v)%N# zk!TN;A5EC%KER(8TrZKFaL zmaW&IciG+pv?Em%R7XbaR?wi#7NpTscQ_@^9=PMVqHx44TmOh(bOTTP7D0|sF zdB~W}iOQEweL`Vj>sf&Ac^B5V$-#OWdYp>iCE*H$!*b`8jLe z;=DE&FT{_hCSC-%q4NIw!6oH`62YRa{)}=_9LA8S!$3jW`fR9nfS$0I-`BkV&xNG? z3umQp?dcvE%m30r5R{_Ej?O5Lb;l_oM70C_tRBUi0jkS__^Dqn_oQ+9oLmj!=uM&W zg$Wh=x`%9Q-;RgRc=!LrIu!2&`qdoR4%?ZT#jbWOud`PCHN7PG*)NtXoZzgJ#t z6R}7=e|fjs%1Ph|@hnm45WMh!!()dMZt43PI&t(b0;%se=3hqc z7%U-yf^k)f9awUe*(e7k_{t^#XQvfWG%OpuUDXEOR~xO6~kQBFE!^hn*nVkhU#&^EWvPw=AQtf8W)1vQgwV{sfUixxX^tS3u*m_Z+9}O;Q zwZ${t7K{3WfA09~{#FP%ZgDS-HZs%ES9lqN$Dzv=3xA&^%nu?(RpP)~`8`|aItzGy zjd$6vcoV$b#5>47n|bZI+~}i|lUg2g?!QcZx@|0^w6my++)a80Ge1{QEc!yFaRXqpcyEl zGz)WVgvK>U%a89Scz<_9JSAy-=|6HVf(T)LzXHcg>R?AlPqT{cp8Ur>U~S=1M`uw2O1*0# z96Tm*Y zL3cYAX&HdVF(Rv7%WzZwR9N~$Jkr{jn!Ujwk zfzlZlD>Og7kohWCL{GDveBI+FgS|h;b|--l4wQF3WvFI-DK(}(X{F6iuQC7L2=$xL zu60Mpp@rOKk(Z2gqek8Qll7lPPaX`r6qVap;7;}uEpq%5KG{Gkn;N~BRra=ygp(PX zX@9pkx#2z+JZs!4_q)oUke1&(E=2VUSPH=mx6b~34@S7!9~mxsPKqR};kfM7-dpR3 zyV4zlc2>Lze?HqH{9{$uney-y!-{gQee2JvbYnPX@?-t8PbH~MUkjV+{BAq&uPb5W ztJ(dJaqa|J++6WQwLq%}BNW{`^R--#ebg3Z89)f~d3UXW7Uie{y&!r|d%cHtYL54z zku;(ggV`Mk*LtN6%~^GKEKcoQp&p66`zJGObB-bp@DS8|rPV(~8Y1EC!S{RfQy zyw4nTow0j|O{gSZ>7>G=yyoIQp{`A+!iHiB{fi2tb=-gR3jrQ(UamD*a>joFV25`! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/mobspawn.rsi/meta.json b/Resources/Textures/Effects/mobspawn.rsi/meta.json index 720bc8a32124..209a2a333946 100644 --- a/Resources/Textures/Effects/mobspawn.rsi/meta.json +++ b/Resources/Textures/Effects/mobspawn.rsi/meta.json @@ -35,6 +35,20 @@ ] ] }, + { + "name": "crab_gold", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, { "name": "crab_uranium", "directions": 1, @@ -62,6 +76,20 @@ 0.3 ] ] + }, + { + "name": "crab_coal", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] } ] } diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png b/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png new file mode 100644 index 0000000000000000000000000000000000000000..a1e877ee1ea0dae772823f05c506af06302532b9 GIT binary patch literal 2631 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 R)Y Date: Sat, 1 Feb 2025 16:02:10 -0500 Subject: [PATCH 2/4] Added crafting recipes for yellow and black light tubes. Somehow I forgot that the first time. --- .../Recipes/Construction/lighting.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Resources/Prototypes/Recipes/Construction/lighting.yml b/Resources/Prototypes/Recipes/Construction/lighting.yml index 0533f70f1ac4..ef09696d07ca 100644 --- a/Resources/Prototypes/Recipes/Construction/lighting.yml +++ b/Resources/Prototypes/Recipes/Construction/lighting.yml @@ -20,6 +20,17 @@ icon: { sprite: Objects/Power/light_tube.rsi, state: normal } objectType: Item +- type: construction + name: yellow light tube + id: YellowLight + graph: YellowLight + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a yellow crystal + icon: { sprite: Objects/Power/light_tube.rsi, state: normal } + objectType: Item + - type: construction name: pink light tube id: PinkLight @@ -42,6 +53,17 @@ icon: { sprite: Objects/Power/light_tube.rsi, state: normal } objectType: Item +- type: construction + name: black light tube + id: BlackLight + graph: BlackLight + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a black crystal + icon: { sprite: Objects/Power/light_tube.rsi, state: normal } + objectType: Item + - type: construction name: red light tube id: RedLight From 31d1829951051c5705be621f6c01d6b38f6694dc Mon Sep 17 00:00:00 2001 From: Firewars763 Date: Sat, 1 Feb 2025 18:10:18 -0500 Subject: [PATCH 3/4] Sorted tags.yml alphabetically this time instead of not doing that. --- Resources/Prototypes/tags.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 700887884b8c..83b4c8f8c326 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -417,10 +417,10 @@ id: Cryobeaker - type: Tag - id: CrystalBlue + id: CrystalBlack - type: Tag - id: CrystalYellow + id: CrystalBlue - type: Tag id: CrystalCyan @@ -431,15 +431,15 @@ - type: Tag id: CrystalOrange -- type: Tag - id: CrystalBlack - - type: Tag id: CrystalPink - type: Tag id: CrystalRed +- type: Tag + id: CrystalYellow + - type: Tag id: CubanCarp From 86d13d1b9aec7612b84e0b2aa95bd14aad25e52f Mon Sep 17 00:00:00 2001 From: Firewars763 Date: Tue, 4 Feb 2025 09:34:06 -0500 Subject: [PATCH 4/4] Updated Texture Copyright information --- Resources/Textures/Effects/mobspawn.rsi/meta.json | 2 +- Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Effects/mobspawn.rsi/meta.json b/Resources/Textures/Effects/mobspawn.rsi/meta.json index 209a2a333946..ca0d1fe0fc08 100644 --- a/Resources/Textures/Effects/mobspawn.rsi/meta.json +++ b/Resources/Textures/Effects/mobspawn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by brainfood1183 (github), Gold and Coal Crab pallet swapped by Firewars763 (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json b/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json index 4133580e3576..c3a0bb3080d3 100644 --- a/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json +++ b/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by brainfood1183 (github), Gold and Coal Crab pallet swapped by Firewars763 (github),", "states": [ { "name": "iron_crab",