more expedition changes (#17403)

Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-06-28 14:01:27 +00:00
parent b1f7b15dd7
commit 9cd8d25ae7
16 changed files with 371 additions and 128 deletions
--- a/Resources/Maps/Dungeon/experiment.yml
+++ b/Resources/Maps/Dungeon/experiment.yml
@@ -7948,11 +7948,11 @@ entities:
    - pos: 7.5,32.5
      parent: 1653
      type: Transform
- proto: PowerCellHyperPrinted
+- proto: PowerCellHighPrinted
  entities:
-  - uid: 1599
+  - uid: 822
    components:
-    - pos: 33.368233,13.5307665
+    - pos: 33.49889,13.580287
      parent: 1653
      type: Transform
 - proto: PowerCellRecharger
@@ -8929,6 +8929,49 @@ entities:
    - pos: 25.506968,14.578961
      parent: 1653
      type: Transform
+- proto: SheetGlass
+  entities:
+  - uid: 841
+    components:
+    - pos: 0.32647848,15.48905
+      parent: 1653
+      type: Transform
+  - uid: 844
+    components:
+    - pos: 53.377705,4.600436
+      parent: 1653
+      type: Transform
+- proto: SheetPlastic
+  entities:
+  - uid: 838
+    components:
+    - pos: 10.278141,7.4876976
+      parent: 1653
+      type: Transform
+  - uid: 839
+    components:
+    - pos: 0.43585348,16.5828
+      parent: 1653
+      type: Transform
+  - uid: 846
+    components:
+    - pos: 6.3194933,22.541233
+      parent: 1653
+      type: Transform
+- proto: SheetRGlass
+  entities:
+  - uid: 1112
+    components:
+    - pos: 20.352413,24.551647
+      parent: 1653
+      type: Transform
+- proto: SheetSteel
+  entities:
+  - uid: 840
+    components:
+    - pos: 0.46710348,15.942175
+      parent: 1653
+      type: Transform
 - proto: ShuttersWindow
  entities:
  - uid: 580
--- a/Resources/Maps/Dungeon/lava_brig.yml
+++ b/Resources/Maps/Dungeon/lava_brig.yml
@@ -3144,11 +3144,6 @@ entities:
    - pos: 19.42657,0.6288943
      parent: 588
      type: Transform
-  - uid: 398
-    components:
-    - pos: 28.387192,8.540832
-      parent: 588
-      type: Transform
 - proto: BookRandom
  entities:
  - uid: 1835
@@ -7708,6 +7703,13 @@ entities:
    - pos: 10.645364,44.67479
      parent: 588
      type: Transform
+- proto: ClusterBangFull
+  entities:
+  - uid: 599
+    components:
+    - pos: 33.484257,28.42918
+      parent: 588
+      type: Transform
 - proto: ComputerAlert
  entities:
  - uid: 999
@@ -9004,6 +9006,13 @@ entities:
    - pos: 10.5,48.5
      parent: 588
      type: Transform
+- proto: GatfruitSeeds
+  entities:
+  - uid: 562
+    components:
+    - pos: 8.528373,27.49547
+      parent: 588
+      type: Transform
 - proto: Gauze
  entities:
  - uid: 1482
@@ -9191,18 +9200,17 @@ entities:
      type: Transform
 - proto: HospitalCurtains
  entities:
+  - uid: 402
+    components:
+    - pos: 8.5,27.5
+      parent: 588
+      type: Transform
  - uid: 949
    components:
    - rot: 1.5707963267948966 rad
      pos: 8.5,24.5
      parent: 588
      type: Transform
-  - uid: 950
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 8.5,27.5
-      parent: 588
-      type: Transform
  - uid: 951
    components:
    - rot: 1.5707963267948966 rad
@@ -9352,6 +9360,13 @@ entities:
    - pos: 30.5,42.5
      parent: 588
      type: Transform
+- proto: IngotGold
+  entities:
+  - uid: 952
+    components:
+    - pos: 11.069347,39.504154
+      parent: 588
+      type: Transform
 - proto: KitchenMicrowave
  entities:
  - uid: 524
@@ -9606,13 +9621,6 @@ entities:
    - pos: 30.614443,28.392822
      parent: 588
      type: Transform
- proto: MedkitBruteFilled
-  entities:
-  - uid: 402
-    components:
-    - pos: 30.512049,27.511803
-      parent: 588
-      type: Transform
 - proto: MedkitCombatFilled
  entities:
  - uid: 1154
@@ -9828,7 +9836,7 @@ entities:
    - pos: 22.5,40.5
      parent: 588
      type: Transform
- proto: PowerCellHigh
+- proto: PowerCellHyper
  entities:
  - uid: 469
    components:
@@ -11174,6 +11182,24 @@ entities:
      type: Transform
 - proto: RemoteSignaller
  entities:
+  - uid: 593
+    components:
+    - pos: 34.361877,24.623777
+      parent: 588
+      type: Transform
+    - linkedPorts:
+        1238:
+        - Pressed: Toggle
+        1239:
+        - Pressed: Toggle
+        1237:
+        - Pressed: Toggle
+      registeredSinks:
+        Pressed:
+        - 1238
+        - 1239
+        - 1237
+      type: DeviceLinkSource
  - uid: 1104
    components:
    - pos: 25.24476,30.698978
@@ -11288,6 +11314,39 @@ entities:
    - pos: 28.5,42.5
      parent: 588
      type: Transform
+- proto: SheetGlass
+  entities:
+  - uid: 649
+    components:
+    - pos: 14.3137455,32.471424
+      parent: 588
+      type: Transform
+- proto: SheetPlasteel
+  entities:
+  - uid: 866
+    components:
+    - pos: 2.412651,34.456436
+      parent: 588
+      type: Transform
+- proto: SheetPlastic
+  entities:
+  - uid: 398
+    components:
+    - pos: 20.04785,45.07574
+      parent: 588
+      type: Transform
+- proto: SheetSteel
+  entities:
+  - uid: 656
+    components:
+    - pos: 26.36062,32.5183
+      parent: 588
+      type: Transform
+  - uid: 699
+    components:
+    - pos: 29.259031,40.432583
+      parent: 588
+      type: Transform
 - proto: ShowcaseRobot
  entities:
  - uid: 1621
@@ -11307,11 +11366,17 @@ entities:
    - pos: 34.5,27.5
      parent: 588
      type: Transform
+    - links:
+      - 593
+      type: DeviceLinkSink
  - uid: 1238
    components:
    - pos: 32.5,27.5
      parent: 588
      type: Transform
+    - links:
+      - 593
+      type: DeviceLinkSink
 - proto: ShuttersWindow
  entities:
  - uid: 1239
@@ -11319,6 +11384,9 @@ entities:
    - pos: 33.5,27.5
      parent: 588
      type: Transform
+    - links:
+      - 593
+      type: DeviceLinkSink
 - proto: SignCloning
  entities:
  - uid: 1484
@@ -11474,6 +11542,13 @@ entities:
    - pos: 24.466219,48.441994
      parent: 588
      type: Transform
+- proto: SpeedLoaderMagnumHighVelocity
+  entities:
+  - uid: 950
+    components:
+    - pos: 28.703945,8.421182
+      parent: 588
+      type: Transform
 - proto: StasisBed
  entities:
  - uid: 1425
@@ -11481,6 +11556,13 @@ entities:
    - pos: 13.5,43.5
      parent: 588
      type: Transform
+- proto: StimkitFilled
+  entities:
+  - uid: 561
+    components:
+    - pos: 30.39083,27.514402
+      parent: 588
+      type: Transform
 - proto: StimpackMini
  entities:
  - uid: 1879
@@ -12763,6 +12845,13 @@ entities:
    - pos: 22.543945,6.5464144
      parent: 588
      type: Transform
+- proto: WeaponShotgunKammerer
+  entities:
+  - uid: 583
+    components:
+    - pos: 26.57963,35.4414
+      parent: 588
+      type: Transform
 - proto: WindoorAssemblySecure
  entities:
  - uid: 696
--- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
@@ -97,6 +97,39 @@
  - type: Stack
    count: 1000

+- type: entity
+  parent: SpaceCash
+  id: SpaceCash2500
+  suffix: 2500
+  components:
+  - type: Icon
+    sprite: Objects/Economy/cash.rsi
+    state: cash_1000
+  - type: Stack
+    count: 2500
+
+- type: entity
+  parent: SpaceCash
+  id: SpaceCash5000
+  suffix: 5000
+  components:
+  - type: Icon
+    sprite: Objects/Economy/cash.rsi
+    state: cash_1000
+  - type: Stack
+    count: 5000
+
+- type: entity
+  parent: SpaceCash
+  id: SpaceCash10000
+  suffix: 10000
+  components:
+  - type: Icon
+    sprite: Objects/Economy/cash.rsi
+    state: cash_1000
+  - type: Stack
+    count: 10000
+
 - type: entity
  parent: SpaceCash
  id: SpaceCash1000000
--- a/Resources/Prototypes/Procedural/salvage_mods.yml
+++ b/Resources/Prototypes/Procedural/salvage_mods.yml
@@ -48,14 +48,14 @@
  desc: Daylight
  color: "#D8B059"
  biomes:
-    - Grasslands
+  - Grasslands

 - type: salvageLightMod
  id: Lavalight
  desc: Daylight
  color: "#A34931"
  biomes:
-    - Lava
+  - Lava

 - type: salvageLightMod
  id: Evening
@@ -65,8 +65,8 @@
 - type: salvageLightMod
  id: Night
  desc: Night time
+  cost: 2
  color: null
-  cost: 1

 # Time mods -> at least 1 required
 - type: salvageTimeMod
@@ -89,7 +89,7 @@
 - type: salvageDungeonMod
  id: Experiment
  proto: Experiment
-  biomeMods:
+  biomes:
    - Caves
    #- LowDesert
    - Snow
@@ -98,7 +98,7 @@
 - type: salvageDungeonMod
  id: LavaBrig
  proto: LavaBrig
-  biomeMods:
+  biomes:
    - Lava

 # Air mixtures
@@ -195,3 +195,65 @@
  biomes:
  - Caves
  - Lava
+
+# Temperatures
+
+- type: salvageTemperatureMod
+  id: RoomTemp
+  biomes:
+  - Caves
+  #- LowDesert
+  - Grasslands
+
+- type: salvageTemperatureMod
+  id: Hot
+  temperature: 323.15 # 50C
+  biomes:
+  - Caves
+  #- LowDesert
+  - Grasslands
+  - Lava
+
+- type: salvageTemperatureMod
+  id: Burning
+  desc: High temperature
+  cost: 1
+  temperature: 423.15 # 200C
+  biomes:
+  - Caves
+  #- LowDesert
+  - Lava
+
+- type: salvageTemperatureMod
+  id: Melting
+  desc: Extreme heat
+  cost: 4
+  temperature: 1273.15 # 1000C hot hot hot
+  biomes:
+  - Lava
+
+- type: salvageTemperatureMod
+  id: Cold
+  temperature: 275.15 # 2C
+  biomes:
+  - Caves
+  #- LowDesert
+  - Grasslands
+  - Snow
+
+- type: salvageTemperatureMod
+  id: Tundra
+  desc: Low temperature
+  cost: 2
+  temperature: 263.15 # -40C
+  biomes:
+  - Caves
+  - Snow
+
+- type: salvageTemperatureMod
+  id: Frozen
+  desc: Extreme cold
+  cost: 3
+  temperature: 123.15 # -150C
+  biomes:
+  - Snow
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -16,6 +16,9 @@
    RandomArtifactSpawner: 0.25
    # weighted down since it sells for a lot
    NuclearBombKeg: 0.1
+    # money
+    SpaceCash500: 0.5
+    SpaceCash1000: 0.25

 - type: weightedRandom
  id: SalvageRewardRare
@@ -27,14 +30,11 @@
    SheetUranium: 1.0
    CratePartsT3: 1.0
    CratePartsT3T4: 0.5
-    # things the expedition team might want
-    CrateEmergencyBruteKit: 0.5
-    CrateMedicalSupplies: 0.5
-    CrateSecurityRiot: 0.5
    # cloning boards
    CloningPodMachineCircuitboard: 0.5
    MedicalScannerMachineCircuitboard: 0.5
    CloningConsoleComputerCircuitboard: 0.5
+    BiomassReclaimerMachineCircuitboard: 0.5
    # basic weapons
    CrateArmorySMG: 0.25
    CrateArmoryLaser: 0.25
@@ -43,6 +43,10 @@
    ClothingHeadHelmetSwat: 0.1
    # rare weapons
    WeaponSubMachineGunC20r: 0.1
+    # money
+    SpaceCash500: 1.0
+    SpaceCash1000: 0.75
+    SpaceCash2500: 0.5

 - type: weightedRandom
  id: SalvageRewardEpic
@@ -50,14 +54,16 @@
    # rare machinery
    ResearchAndDevelopmentServerMachineCircuitboard: 1.0
    CratePartsT4: 1.0
+    PowerCellAntiqueProto: 0.25
    # rare weapons
    WeaponAdvancedLaser: 1.0
    WeaponLaserCannon: 1.0
    WeaponXrayCannon: 1.0
    WeaponSniperHristov: 1.0
-    # extremely rare weapons
-    GatfruitSeeds: 0.25
-    WeaponLauncherRocket: 0.1
    # rare chemicals
    CognizineChemistryBottle: 1.0
    OmnizineChemistryBottle: 1.0
+    # money
+    SpaceCash2500: 1.0
+    SpaceCash5000: 0.75
+    SpaceCash10000: 0.5