New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock...

* 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 a043fe97d6561c751ac00c6fc06c88d77ed092fc..a76f86af62e9b0a9cc72421cb8175c707174b86e 100644 (file)
--- 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 155ef10bb5e501ea5312ca96401967fa6814f95e..231fbc1b09d27d57bfd5aba9384686002dc2de1f 100644 (file)
--- 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 959d0449f002fc494431c00c0aaf17997d55d21f..2294efbebdf2719bb1fb5454a4bd394c2cd3d54d 100644 (file)
--- 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 e7471138a0d2879413bc3e51245f4eb4d0c886d9..dc43052736788d42fe21b901fd46741585c43a02 100644 (file)
--- 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 4b3b4dea6d786a4fac3de44cb5539536503e5832..7b435a2625d1840498f6a07b4a8f9639102eba3f 100644 (file)
--- 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 9535eb3dbd37524d59dadd4bd709d3341d8acbeb..708d175a51e45a3376760a883fc7c80318219f6f 100644 (file)
--- 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 09bf879ca85af7a523add68cd98c575fc4bf72a2..2b046b0182d66c1474d301c9d552d2f3638520d0 100644 (file)
--- 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 ec9ae49ffc1925da76b6ccf93bea9311a071fe37..1b04ea885c5ea01093af8f664ff4bea931d6f685 100644 (file)
--- 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 a7f4ef11e5526a8dd06eaf6f87dfd2ca887a53a6..7a1a046aafcc3b47792356ca0bef2d4ee2aff963 100644 (file)
--- 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 (file)
index 0000000..ea090bc
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 660de649085590f23b622cd9a9f8dd093cc88ac6..20ad842fce789d7aa46ea29f791beaa48b218969 100644 (file)
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 aeb8bd1aef3edf56b4b338dba831bbd87117aaea..77c5207cdd79103084856026eb9dbada1a315cc6 100644 (file)
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 ca0d1fe0fc089196b3792afbdf103a19a30155c9..e1a30d2284119193f0b13e00db0e482904fbc144 100644 (file)
--- 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 (file)
index 0000000..0475151
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 a1e877ee1ea0dae772823f05c506af06302532b9..db873180d39465d41fe369626000dfe740fdafc9 100644 (file)
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 420d96b6c55a33ee0ec6f37649b26354d064af71..8476dea12fa507dbd63cd817f000b0885ee9824a 100644 (file)
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 c3a0bb3080d3b896176fc198c2cc2eefb02bf2f2..19e74082999b5a96cac810fdfb435ca137068680 100644 (file)
--- 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