Cherry Pick: Mono (#4017) Drone Loot & Contraband Adjustment

Resources/Prototypes/_Mono/Catalogs/Fills/Backpacks/drone_loot.yml

@@ -12,53 +12,60 @@
     shape: square
   - type: SpawnItemsOnUse
     items:
-    # Money - 30k
-    - id: SpaceCash10000
-      amount: 3
+    # Money - 30k # removed
+    # Triad Start
     # Scrap chunks
-    - id: ScrapOre100
+    - id: ScrapOre20
+      amount: 1
+      maxAmount: 2
+    - id: ScrapOre10
       amount: 1
     # Material
     - id: SheetPlastitanium10
-      amount: 2
+      amount: 1
     # Parts
-    - id: SuperCapacitorStockPart
+    - id: AdvancedCapacitorStockPart
       prob: 0.8
-      amount: 3
-    - id: SuperMatterBinStockPart
-      prob: 0.6
-      amount: 2
-    - id: PicoManipulatorStockPart
+      amount: 1
+      maxAmount: 2
+    - id: AdvancedMatterBinStockPart
       prob: 0.8
-      amount: 2
+      amount: 1
+      maxAmount: 2
+    - id: NanoManipulatorStockPart
+      prob: 0.8
+      amount: 1
+      maxAmount: 2
     - id: SpawnDungeonLootPowerCell
-      prob: 0.5
+      prob: 0.3
     # - id: SpawnDungeonLootPartsEngi #Mono: mostly trash and bloat
     #   amount: 3
     #   prob: 0.25
-    # Circuit boards
-    - id: SpawnDungeonLootCircuitBoardEngi
-      prob: 0.3
-    - id: SpawnDungeonLootCircuitBoardScience
-      prob: 0.3
-    - id: SpawnDungeonLootCircuitBoardSalvage
-      prob: 0.3
+    # Circuit boards # Triad Cleanup and simplifies loot due to bloat
+    # - id: SpawnDungeonLootCircuitBoardEngi
+    #   prob: 0.2
+    # - id: SpawnDungeonLootCircuitBoardScience
+    #   prob: 0.2
+    # - id: SpawnDungeonLootCircuitBoardSalvage
+    #   prob: 0.2
     - id: SpawnDungeonLootCircuitBoard
-      prob: 0.3
+      amount: 1
+      maxAmount: 3
     # Flatpacks
     - id: SpawnDungeonLootFlatpacks
-      prob: 0.6
+      prob: 0.1 # Triad
     # rare shard drop even from T1
-    - id: WeaponTurretShardFlatpack
-      prob: 0.5
-    # Research disk, expected value ~30k/drone
+    # - id: WeaponTurretShardFlatpack 
+    #   prob: 0.5
+    # Research disk, expected value ~12.5k/drone
     - id: RogueSiliconResearchDisk5000
-    - id: RogueSiliconResearchDisk10000
-    - id: RogueSiliconResearchDisk25000
-      prob: 0.6
+      amount: 2
+    - id: RogueSiliconResearchDisk5000
+      prob: 0.3
     # Tech disk
     - id: SpawnLootTechDisksT1
-      prob: 0.5
+      prob: 0.25 #0.25 < 0.5 
+      # Triad End
     sound:
       path: /Audio/Machines/windoor_open.ogg
 
@@ -71,46 +78,58 @@
   components:
   - type: SpawnItemsOnUse
     items:
-    # Money - 80k
-    - id: SpaceCash25000
-      amount: 3
-    - id: SpaceCash5000
+    # Money - 80k # removed
+    # Triad Start
     # Scrap chunks
-    - id: ScrapOre100
-      amount: 3
+    - id: ScrapOre50
+      amount: 1
+    - id: ScrapOre20
+      amount: 1
+    - id: ScrapOre20
+      prob: 0.2
+      amount: 1
+    - id: ScrapOre10
+      amount: 1
     # Material
     - id: SheetPlastitanium10
-      amount: 4
+      amount: 1
+      maxAmount: 2
     # Parts
+    - id: AdvancedCapacitorStockPart
+      amount: 1
+      maxAmount: 2
+    - id: AdvancedMatterBinStockPart
+      amount: 1
+      maxAmount: 2
+    - id: NanoManipulatorStockPart
+      amount: 1
+      maxAmount: 2
     - id: SuperCapacitorStockPart
-      amount: 3
+      prob: 0.2
+      amount: 1
     - id: SuperMatterBinStockPart
+      prob: 0.2
       amount: 1
     - id: PicoManipulatorStockPart
-      amount: 2
-    # rare t4 parts
-    - id: QuadraticCapacitorStockPart
-      amount: 2
-      prob: 0.8
-    - id: FemtoManipulatorStockPart
-      prob: 0.8
-    - id: BluespaceMatterBinStockPart
-      prob: 0.6
+      prob: 0.2
+      amount: 1
     - id: SpawnDungeonLootPowerCell
-      prob: 0.5
-    - id: PowerCellMicroreactor
+      prob: 0.6
     # free shard
-    - id: WeaponTurretShardFlatpack
+    # - id: WeaponTurretShardFlatpack # Triad disabled flatpacks
     # no flatpacks or boards, just gamble scrap
-    # Research disk, expected value ~80k/drone
+    # Research disk, expected value ~22.5k/drone # Triad reduce to 20k from 80k
     - id: RogueSiliconResearchDisk5000
+      prob: 0.8
+      amount: 1
     - id: RogueSiliconResearchDisk10000
-    - id: RogueSiliconResearchDisk25000
-      prob: 0.6
-    - id: RogueSiliconResearchDisk50000
+      amount: 2
+    # - id: RogueSiliconResearchDisk25000 # Triad research economy correction
+    #   prob: 0.6
     # Tech disk
     - id: SpawnLootTechDisksT2Mech
-      prob: 0.5
+      prob: 0.4
+    # Triad End
     sound:
       path: /Audio/Machines/windoor_open.ogg
 
@@ -123,50 +142,76 @@
   components:
   - type: SpawnItemsOnUse
     items:
-    # Money - 200k
-    - id: SpaceCash100000
-      amount: 2
+    # Money - 200k # removed
+    # Triad Start
     # Scrap chunks
     - id: ScrapOre100
-      amount: 6
-    # Material
+      amount: 2
+    - id: ScrapOre50
+      prob: 0.3
+      amount: 1
+      maxAmount: 2
+    # Material 
     - id: SheetPlastitanium10
-      amount: 8
+      amount: 5
     # Parts
     - id: SuperCapacitorStockPart
-      amount: 6
+      amount: 1
+      maxAmount: 2
     - id: SuperMatterBinStockPart
-      amount: 2
+      amount: 1
+      maxAmount: 2
     - id: PicoManipulatorStockPart
-      amount: 4
+      amount: 1
+      maxAmount: 2
+    - id: SuperCapacitorStockPart
+      prob: 0.3
+      amount: 1
+    - id: SuperMatterBinStockPart
+      prob: 0.3
+      amount: 1
+    - id: PicoManipulatorStockPart
+      prob: 0.3
+      amount: 1
     # rare t4 parts
     - id: QuadraticCapacitorStockPart
-      amount: 3
-      maxAmount: 6
+      prob: 0.12
+      amount: 1
+      maxAmount: 2
     - id: FemtoManipulatorStockPart
-      amount: 2
-      maxAmount: 4
+      prob: 0.12
+      amount: 1
+      maxAmount: 2
     - id: BluespaceMatterBinStockPart
-      amount: 0
+      prob: 0.12
+      amount: 1
       maxAmount: 2
     - id: SpawnDungeonLootPowerCell
       amount: 1
       maxAmount: 2
     - id: PowerCellMicroreactor
-    # free guns
-    - id: WeaponTurretShardFlatpack
-      amount: 1
-      maxAmount: 2
-    - id: WeaponTurretPinholeFlatpack
+      prob: 0.2 # Triad
+    - id: PowerCellAntiqueProto # Triad adding antique as super rare, as a bonus
+      prob: 0.06 # Triad, Estimated at 15-16 box/5-6 mauler
+    # free guns # Triad disabled gun Flatpacks
+    # - id: WeaponTurretShardFlatpack
+    #   amount: 1
+    #   maxAmount: 2
+    # - id: WeaponTurretPinholeFlatpack
     # no flatpacks or boards, just gamble scrap
-    # Research disk, expected value 200k/drone
+    # Research disk, expected value 110k/drone # Triad
+    - id: RogueSiliconResearchDisk25000
+      amount: 2
+    - id: RogueSiliconResearchDisk50000
+      amount: 1
     - id: RogueSiliconResearchDisk50000
-      amount: 3
-      maxAmount: 5
+      prob: 0.1
+      amount: 1
     # Tech disk
     - id: SpawnLootTechDisksT3Mech
-      prob: 0.6
+      prob: 0.2
     - id: SpawnLootTechDisksT3Fracture
       prob: 0.2
+    # Triad End
     sound:
       path: /Audio/Machines/windoor_open.ogg

Resources/Prototypes/_Mono/Entities/Mobs/NPCs/ai.yml

@@ -52,7 +52,7 @@
     rootTask:
       task: RammerShuttleCompound
   - type: StaticPrice
-    price: 20000
+    price: 20000 # Triad debuff, sells for 25k at depots, due to how easy this one can be farmed in first ring
   - type: ApcPowerReceiver
     powerLoad: 1000 # suspiciously low power-using AI
   - type: ExtensionCableReceiver
@@ -113,6 +113,8 @@
     - state: base
     - state: red_t2
       shader: unshaded
+  - type: StaticPrice  # Triad
+    price: 40000
   - type: HTN
     rootTask:
       task: RammerShuttleSmartDodgingCompound
@@ -168,6 +170,8 @@
     - state: base
     - state: green_t2
       shader: unshaded
+  - type: StaticPrice  # Triad
+    price: 40000
   - type: HTN
     rootTask:
       task: AttackerShuttleSmartCompound
@@ -203,6 +207,8 @@
   description: Shoots at you.
   suffix: AI, Drone-Medusa
   components:
+  - type: StaticPrice  # Triad
+    price: 40000
   - type: HTN
     rootTask:
       task: DroneCompoundMedusa
@@ -213,6 +219,8 @@
   description: Shoots at you. Broadsides.
   suffix: AI, Drone-Assembly
   components:
+  - type: StaticPrice  # Triad
+    price: 40000
   - type: HTN
     rootTask:
       task: DroneCompoundAssembly
@@ -224,6 +232,8 @@
   description: Shoots at you, up-close.
   suffix: AI, Drone-MPulsar
   components:
+  - type: StaticPrice  # Triad
+    price: 20000
   - type: HTN
     rootTask:
       task: DroneCompoundMPulsar
@@ -235,6 +245,8 @@
   description: Shoots at you, close-by.
   suffix: AI, Drone-Lance
   components:
+  - type: StaticPrice  # Triad
+    price: 20000
   - type: HTN
     rootTask:
       task: DroneCompoundLance
@@ -246,6 +258,8 @@
   description: Shoots at you.
   suffix: AI, Drone-Quake
   components:
+  - type: StaticPrice  # Triad
+    price: 40000
   - type: HTN
     sleepPlayerCheckRangeOverride: 2000 # Triad: revert of #4075 (Mono 2x'd 2000->4000)
     rootTask:

Resources/Prototypes/_NF/Entities/Structures/Specific/TradingCrates/base.yml

@@ -49,7 +49,7 @@
     spread: 90
   - type: StaticPrice
     price: 0
-  # Triad Start - disable target of random sentience event  
+  # Triad Start - disable target of random sentience event
   # - type: SentienceTarget
   #   flavorKind: station-event-random-sentience-flavor-inanimate
   #   weight: 0.01 # 100 trade crates = 1 animal
@@ -120,8 +120,8 @@
         - MachineLayer
   - type: Contraband
     turnInValues:
-      FederationMilitaryCredit: 12 # Mono
-      Doubloon: 12 # Mono
+      FederationMilitaryCredit: 20 # Mono 12 -> 25 (50 of each currency is about 100k, so these are worth 50k to a faction person, PURELY based of money, so people have more a reason to talk to factions instead of depotslop)
+      Doubloon: 20 # Mono 12 -> 25
   - type: ShipyardSellCondition
     blockSale: true
     reason: shipyard-console-contraband-onboard
@@ -134,8 +134,9 @@
     taxAccounts:
       BlackMarket: 0.3
       nfsd: -0.075
-  - type: RadarBlip
-    radarColor: "#cc4e0e"
+  - type: RadarBlip # Triad, no immidiate visibility
+    radarColor: "#FFCCCB"
     scale: 1.5
     shape: hexagon
     visibleFromOtherGrids: true
+    maxDistance: 256