From: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Date: Fri, 30 May 2025 01:16:20 +0000 (+0100)
Subject: New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock... 
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1118ea50e0bfe0ce45108147497f9caf3d80371b;p=space-station-14.git

New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock anomaly. (#37787)

* new sprites for coal and gold ore crabs, new bananioum ore crab and rock anomaly.

* add whitespace to end of line in ore.yml

* fix white space end of file.

* fix for linter fail.
---

diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml
index a043fe97d6..a76f86af62 100644
--- a/Resources/Prototypes/Entities/Effects/mobspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml
@@ -87,6 +87,18 @@
   - type: SpawnOnDespawn
     prototype: MobUraniumCrab
 
+- type: entity
+  id: MobSpawnCrabBananium
+  parent: MobSpawnCrabQuartz
+  name: mobspawner bananiumcrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/Effects/mobspawn.rsi
+    state: crab_bananium
+  - type: SpawnOnDespawn
+    prototype: MobBananiumCrab
+
 - type: entity
   id: EffectAnomalyFloraBulb
   categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml
index 155ef10bb5..231fbc1b09 100644
--- a/Resources/Prototypes/Entities/Effects/wallspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml
@@ -34,6 +34,22 @@
   - type: SpawnOnDespawn
     prototype: AsteroidRockUraniumCrab
 
+- type: entity
+  id: WallSpawnAsteroidBananium
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockBananium
+
+- type: entity
+  id: WallSpawnAsteroidBananiumCrab
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockBananiumCrab
+
 - type: entity
   id: WallSpawnAsteroidUranium
   parent: WallSpawnAsteroid
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml
index 959d0449f0..2294efbebd 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml
@@ -144,6 +144,9 @@
     - MobSpawnCrabIron
     - MobSpawnCrabQuartz
     - MobSpawnCrabSilver
+    - MobSpawnCrabCoal
+    - MobSpawnCrabGold
+    - MobSpawnCrabBananium
 
 - type: entity
   parent: MarkerBase
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
index e7471138a0..dc43052736 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -46,6 +46,7 @@
     - AnomalyRockGold
     - AnomalyRockQuartz
     - AnomalyRockUranium
+    - AnomalyRockBananium
     chance: 1
     offset: 0.15
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 4b3b4dea6d..7b435a2625 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -227,6 +227,62 @@
     energy: 3
     color: "#06DF24"
 
+- type: entity
+  parent: MobOreCrab
+  id: MobBananiumCrab
+  description: An ore crab made from bananium.
+  suffix: Bananium
+  components:
+  - type: Sprite
+    state: bananium_crab
+  - type: FactionException
+  - type: NPCRetaliation
+    attackMemoryLength: 10
+  - type: NpcFactionMember
+    factions:
+      - SimpleNeutral
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          BananiumOre1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Slippery
+    slipData:
+      launchForwardsMultiplier: 2
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        hard: false
+        layer:
+          - SlipLayer
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 20
+        mask:
+        - MobMask
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   parent: MobOreCrab
   id: MobSilverCrab
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 9535eb3dbd..708d175a51 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -429,3 +429,4 @@
   components:
   - type: Stack
     count: 1
+
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index 09bf879ca8..2b046b0182 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -453,6 +453,56 @@
       spawns:
       - MobSpawnCrabUranium
 
+- type: entity
+  id: AnomalyRockBananium
+  parent: AnomalyRockBase
+  suffix: Rock, Bananium
+  components:
+  - type: Sprite
+    color: "#ddde40"
+  - type: PointLight
+    radius: 2.0
+    energy: 7.5
+    color: "#ddde40"
+  - type: EntitySpawnAnomaly
+    entries:
+    - settings:
+        spawnOnPulse: true
+        minAmount: 8
+        maxAmount: 15
+        minRange: 4.5
+        maxRange: 7.5
+      spawns:
+      - WallSpawnAsteroid
+      - WallSpawnAsteroid
+      - WallSpawnAsteroidBananium
+      - WallSpawnAsteroidBananiumCrab
+    - 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
+      - WallSpawnAsteroidBananiumCrab
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 3
+        maxAmount: 6
+        maxRange: 5
+      spawns:
+      - MobSpawnCrabBananium
+
 - type: entity
   id: AnomalyRockQuartz
   parent: AnomalyRockBase
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index ec9ae49ffc..1b04ea885c 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -366,6 +366,14 @@
     - state: rock_bananium
       map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
+- type: entity
+  id: AsteroidRockBananiumCrab
+  parent: AsteroidRockBananium
+  suffix: Bananium Crab
+  components:
+  - type: OreVein
+    currentOre: OreBananiumCrab
+
 - type: entity
   id: AsteroidRockSalt
   parent: AsteroidRock
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index a7f4ef11e5..7a1a046aaf 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -84,6 +84,10 @@
   id: OreGoldCrab
   oreEntity: MobSpawnCrabGold
 
+- type: ore
+  id: OreBananiumCrab
+  oreEntity: MobSpawnCrabBananium
+
 - type: ore
   id: OreUraniumCrab
   oreEntity: MobSpawnCrabUranium
@@ -114,3 +118,6 @@
     OreIronCrab: 5
     OreUraniumCrab: 2
     OreSilverCrab: 3
+    OreBananiumCrab: 1
+    OreCoalCrab: 5
+    OreGoldCrab: 2
diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_bananium.png b/Resources/Textures/Effects/mobspawn.rsi/crab_bananium.png
new file mode 100644
index 0000000000..ea090bcb87
Binary files /dev/null and b/Resources/Textures/Effects/mobspawn.rsi/crab_bananium.png differ
diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png b/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png
index 660de64908..20ad842fce 100644
Binary files a/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png and b/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png differ
diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_gold.png b/Resources/Textures/Effects/mobspawn.rsi/crab_gold.png
index aeb8bd1aef..77c5207cdd 100644
Binary files a/Resources/Textures/Effects/mobspawn.rsi/crab_gold.png and b/Resources/Textures/Effects/mobspawn.rsi/crab_gold.png differ
diff --git a/Resources/Textures/Effects/mobspawn.rsi/meta.json b/Resources/Textures/Effects/mobspawn.rsi/meta.json
index ca0d1fe0fc..e1a30d2284 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), Gold and Coal Crab pallet swapped by Firewars763 (github)",
+  "copyright": "Made by brainfood1183 (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -63,6 +63,20 @@
                 ]
             ]
         },
+        {
+            "name": "crab_bananium",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
         {
             "name": "crab_iron",
             "directions": 1,
diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/bananium_crab.png b/Resources/Textures/Mobs/Elemental/orecrab.rsi/bananium_crab.png
new file mode 100644
index 0000000000..04751515de
Binary files /dev/null and b/Resources/Textures/Mobs/Elemental/orecrab.rsi/bananium_crab.png differ
diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png b/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png
index a1e877ee1e..db873180d3 100644
Binary files a/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png and b/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png differ
diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/gold_crab.png b/Resources/Textures/Mobs/Elemental/orecrab.rsi/gold_crab.png
index 420d96b6c5..8476dea12f 100644
Binary files a/Resources/Textures/Mobs/Elemental/orecrab.rsi/gold_crab.png and b/Resources/Textures/Mobs/Elemental/orecrab.rsi/gold_crab.png differ
diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json b/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json
index c3a0bb3080..19e7408299 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), Gold and Coal Crab pallet swapped by Firewars763 (github),",
+  "copyright": "Made by brainfood1183 (github)",
   "states": [
     {
       "name": "iron_crab",
@@ -27,6 +27,10 @@
         "name": "gold_crab",
         "directions": 4
     },
+    {
+        "name": "bananium_crab",
+        "directions": 4
+    },
     {
       "name": "quartz_crab",
       "directions": 4