Fix 2

Lost-Paradise-Project · Dec 7, 2024 · 2e7b3fe · 2e7b3fe
1 parent 8a15249
commit 2e7b3fe
Show file tree

Hide file tree

Showing 16 changed files with 502 additions and 139 deletions.
diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/expeditions_loot.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/expeditions_loot.yml
@@ -154,7 +154,7 @@
       amount: 3
     - id: VendingMachineNutriFlatpack
     - id: VendingMachineSeedsUnlockedFlatpack
-    - id: ServiceTechFabFlatpack
+    # - id: ServiceTechFabFlatpack
 
 - type: entity
   parent: CrateEngineering

diff --git a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/Salvage/spawners.yml b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/Salvage/spawners.yml
@@ -0,0 +1,348 @@
+- type: entity
+  id: SalvageScrapSpawnerCommon
+  table: !type:GroupSelector
+    children:
+    # 70% chance of scrap of some kind
+    - !type:GroupSelector
+      weight: 70
+      children:
+      - !type:NestedSelector
+        tableId: SalvageScrapLowValue
+        weight: 60
+      - !type:NestedSelector
+        tableId: SalvageScrapHighValue
+        weight: 30
+      - !type:NestedSelector
+        tableId: SalvageScrapLarge
+        weight: 10
+    # 10% chance of some trash
+    - !type:NestedSelector
+      tableId: GenericTrashItems
+      weight: 10
+    # 15% chance of low-value equipment
+    - !type:NestedSelector
+      tableId: SalvageEquipmentCommon
+      weight: 15
+    # 5% chance of low-value treasure or maintenance tools
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - !type:NestedSelector
+        tableId: SalvageTreasureCommon
+      - !type:NestedSelector
+        tableId: MaintToolsTable
+
+- type: entity
+  id: SalvageScrapSpawnerValuable
+  table: !type:GroupSelector
+    children:
+    # 75% chance of scrap of some kind
+    - !type:GroupSelector
+      weight: 75
+      children:
+      - !type:NestedSelector
+        tableId: SalvageScrapLowValue
+        weight: 20
+      - !type:NestedSelector
+        tableId: SalvageScrapHighValue
+        weight: 40
+      - !type:NestedSelector
+        tableId: SalvageScrapLarge
+        weight: 40
+    # 15% chance of low-value equipment
+    - !type:NestedSelector
+      tableId: SalvageEquipmentCommon
+      weight: 15
+    # 10% chance of low-value treasure or maintenance tools
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - !type:NestedSelector
+        tableId: SalvageTreasureCommon
+      - !type:NestedSelector
+        tableId: MaintToolsTable
+      - !type:NestedSelector
+        tableId: SalvageTreasureUncommon
+        weight: 0.25
+
+- type: entity
+  id: SalvageTreasureSpawnerCommon
+  table: !type:GroupSelector
+    children:
+    # 80% chance of some treasure
+    - !type:GroupSelector
+      weight: 80
+      children:
+      - !type:NestedSelector
+        tableId: SalvageTreasureCommon
+        weight: 60
+      - !type:NestedSelector
+        tableId: SalvageTreasureUncommon
+        weight: 30
+      - !type:NestedSelector
+        tableId: SalvageTreasureRare
+        weight: 9
+      - !type:NestedSelector
+        tableId: SalvageTreasureLegendary
+        weight: 1
+    # 10% chance of low-level equipment
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - !type:NestedSelector
+        tableId: SalvageEquipmentCommon
+        weight: 60
+      - !type:NestedSelector
+        tableId: SalvageEquipmentUncommon
+        weight: 40
+    # 5% chance of moderate scrap
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - !type:NestedSelector
+        tableId: SalvageScrapLowValue
+        weight: 60
+      - !type:NestedSelector
+        tableId: SalvageScrapHighValue
+        weight: 30
+      - !type:NestedSelector
+        tableId: SalvageScrapLarge
+        weight: 10
+    # 5% chance of maintenance fluff
+    - !type:NestedSelector
+      tableId: MaintFluffTable
+      weight: 5
+
+- type: entity
+  id: SalvageTreasureSpawnerValuable
+  table: !type:GroupSelector
+    children:
+    # 80% chance of some treasure
+    - !type:GroupSelector
+      weight: 80
+      children:
+      - !type:NestedSelector
+        tableId: SalvageTreasureCommon
+        weight: 45
+      - !type:NestedSelector
+        tableId: SalvageTreasureUncommon
+        weight: 35
+      - !type:NestedSelector
+        tableId: SalvageTreasureRare
+        weight: 15
+      - !type:NestedSelector
+        tableId: SalvageTreasureLegendary
+        weight: 5
+    # 10% chance of low-level equipment
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - !type:NestedSelector
+        tableId: SalvageEquipmentCommon
+        weight: 50
+      - !type:NestedSelector
+        tableId: SalvageEquipmentUncommon
+        weight: 40
+      - !type:NestedSelector
+        tableId: SalvageEquipmentUncommon
+        weight: 10
+    # 5% chance of moderate scrap
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - !type:NestedSelector
+        tableId: SalvageScrapLowValue
+        weight: 30
+      - !type:NestedSelector
+        tableId: SalvageScrapHighValue
+        weight: 45
+      - !type:NestedSelector
+        tableId: SalvageScrapLarge
+        weight: 25
+    # 5% chance of maintenance fluff
+    - !type:NestedSelector
+      tableId: MaintFluffTable
+      weight: 5
+      rolls: !type:RangeNumberSelector
+        range: 1, 2
+
+- type: entity
+  id: SalvageEquipmentSpawnerCommon
+  table: !type:GroupSelector
+    children:
+    # 90% chance of equipment item
+    - !type:GroupSelector
+      weight: 90
+      children:
+      - !type:NestedSelector
+        tableId: SalvageEquipmentCommon
+        weight: 50
+      - !type:NestedSelector
+        tableId: SalvageEquipmentUncommon
+        weight: 35
+      - !type:NestedSelector
+        tableId: SalvageEquipmentRare
+        weight: 14
+      - !type:NestedSelector
+        tableId: SalvageEquipmentLegendary
+        weight: 1
+    # 5% chance of decent-ish treasure
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - !type:NestedSelector
+        tableId: SalvageTreasureCommon
+        weight: 75
+      - !type:NestedSelector
+        tableId: SalvageTreasureUncommon
+        weight: 20
+      - !type:NestedSelector
+        tableId: SalvageTreasureRare
+        weight: 5
+    # 5% chance of decent maintenance loot
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - !type:NestedSelector
+        tableId: MaintToolsTable
+      - !type:NestedSelector
+        tableId: MaintFluffTable
+
+- type: entity
+  id: SalvageEquipmentSpawnerValuable
+  table: !type:GroupSelector
+    children:
+    # 90% chance of equipment item
+    - !type:GroupSelector
+      weight: 90
+      children:
+      - !type:NestedSelector
+        tableId: SalvageEquipmentCommon
+        weight: 15
+      - !type:NestedSelector
+        tableId: SalvageEquipmentUncommon
+        weight: 40
+      - !type:NestedSelector
+        tableId: SalvageEquipmentRare
+        weight: 35
+      - !type:NestedSelector
+        tableId: SalvageEquipmentLegendary
+        weight: 10
+    # 5% chance of decent-ish treasure
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - !type:NestedSelector
+        tableId: SalvageTreasureCommon
+        weight: 60
+      - !type:NestedSelector
+        tableId: SalvageTreasureUncommon
+        weight: 30
+      - !type:NestedSelector
+        tableId: SalvageTreasureRare
+        weight: 10
+    # 4% chance of decent maintenance loot
+    - !type:GroupSelector
+      weight: 4
+      children:
+      - !type:NestedSelector
+        tableId: MaintToolsTable
+      - !type:NestedSelector
+        tableId: MaintFluffTable
+    # 1% chance of syndie maintenance loot
+    - !type:GroupSelector
+      weight: 1
+      children:
+      - !type:NestedSelector
+        tableId: SyndieMaintLoot
+
+- type: entity
+  id: SalvageMagnetMobTable
+  table: !type:GroupSelector
+    children:
+    - id: MobCarpSalvage
+      weight: 80
+    - id: MobCarpSalvage
+      weight: 15
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - !type:AllSelector
+      weight: 5
+      children:
+      - id: MobSharkSalvage
+      - id: MobCarpSalvage
+        amount: !type:ConstantNumberSelector
+          value: 2
+    # - id: MobHivebot (solo hivebot spawn)
+
+- type: entity
+  parent: MarkerBase
+  id: SalvageSpawnerMobMagnet
+  name: Salvage Magnet Mob Spawner
+  suffix: 50%
+  components:
+  - type: Sprite
+    layers:
+    - state: pink
+    - sprite: Mobs/Aliens/Carps/space.rsi
+      state: alive
+  - type: LPEntityTableSpawner
+    table: !type:NestedSelector
+      prob: 0.5
+      tableId: SalvageMagnetMobTable
+
+- type: entity
+  parent: SalvageSpawnerMobMagnet
+  id: SalvageSpawnerMobMagnet75
+  suffix: 75%
+  components:
+  - type: LPEntityTableSpawner
+    table: !type:NestedSelector
+      prob: 0.75
+      tableId: SalvageMagnetMobTable
+
+- type: entity
+  parent: SalvageSpawnerMobMagnet
+  id: SalvageSpawnerMobMagnet100
+  suffix: 100%
+  components:
+  - type: LPEntityTableSpawner
+    table: !type:NestedSelector
+      prob: 1.0
+      tableId: SalvageMagnetMobTable
+
+- type: entity
+  parent: MarkerBase
+  id: SalvageSpawnerMobShark
+  name: Salvage Sharkminnow Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: pink
+    - sprite: Mobs/Aliens/Carps/sharkminnow.rsi
+      state: alive
+  - type: LPEntityTableSpawner
+    table: !type:AllSelector
+      children:
+      - id: MobSharkSalvage
+      - id: MobCarpSalvage
+        amount: !type:ConstantNumberSelector
+          value: 3
+
+- type: entity
+  parent: MarkerBase
+  id: SalvageSpawnerMobMiningAsteroid
+  name: Mining Asteroid Mob Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: _LostParadise/Mobs/Aliens/Asteroid/goliath.rsi
+      state: goliath
+  - type: LPEntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: MobGoliath
+        weight: 65
+      - id: MobHivelord
+        weight: 35
diff --git a/...urces/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/...urces/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -458,12 +458,10 @@
     - VendingMachineRoboDrobe
     - VendingMachineGeneDrobe
     - VendingMachineViroDrobe
-    - VendingMachineClothingPunk
     chance: 1
     offset: 0.0
     rarePrototypes:
     - VendingMachineMagivend
-    - VendingMachineBountyVendPunk
     - SpawnDungeonMachineFrame
     rareChance: 0.05
 
@@ -599,7 +597,6 @@
     - DawInstrumentMachineCircuitboard
     - ComputerIFFCircuitboard
     - SpawnDungeonLootFlatpacks
-    # - MercenaryTechFabCircuitboardNF
     chance: 1
     offset: 0.0
     rarePrototypes:
@@ -923,18 +920,14 @@
     - SpawnDungeonLootFlatpacksSuppl
     - SpawnDungeonLootFlatpacksScience
     - SpawnDungeonLootFlatpacksService
-    - HoverbikeFlatpack
     - DawInstrumentFlatpack
     - MinimoogInstrumentFlatpack
     - ComputerIFFFlatpack
     - JukeboxFlatpack
     - VendingMachineBoozeFlatpack
     - VendingMachineCigsFlatpack
-    - VendingMachineClothingPunkFlatpack
-    - VendingMachineBountyVendPunkFlatpack
     - ComputerResearchAndDevelopmentFlatpack
     - ResearchAndDevelopmentServerFlatpack
-    - MercenaryTechFabFlatpack
     chance: 0.95
     offset: 0.0
     rarePrototypes: