[Tweak] Shipyard & Salvage Update (Rxup#934)

* Update Shipyard Shittles

* Remove Corvax Salvage Shuttle

* Migrate Cargo Call shuttle computer to Shipyard

* Shipwrecked Upd

* Revert corvax shit

* delete corvax shit The Sequel

Resources/Maps/Dungeon/ruined_dwellings.yml

@@ -20,7 +20,10 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
+      mapPaused: True
     - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -392,8 +395,6 @@ entities:
     - type: GasTileOverlay
     - type: LoadedMap
     - type: RadiationGridResistance
-    - type: GridTree
-    - type: MovedGrids
     - type: Fixtures
       fixtures: {}
 - proto: APCBasic
@@ -476,6 +477,13 @@ entities:
     - type: Transform
       pos: 13.5,11.5
       parent: 1
+- proto: BookRandomStory
+  entities:
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 13.5,2.5
+      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 24
@@ -1452,6 +1460,11 @@ entities:
     - type: Transform
       pos: 8.5,21.5
       parent: 1
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 1
 - proto: CableMV
   entities:
   - uid: 177
@@ -1838,6 +1851,20 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: FakeSpaceCash10
+  entities:
+  - uid: 130
+    components:
+    - type: Transform
+      pos: 6.607684,15.804618
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 6.467059,15.335868
+      parent: 1
+    - type: Stack
+      count: 20
 - proto: FloorTileItemWood
   entities:
   - uid: 136
@@ -1876,13 +1903,20 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: GeneratorBasic
+- proto: GeneratorBasic15kW
   entities:
   - uid: 149
     components:
     - type: Transform
       pos: 6.5,22.5
       parent: 1
+- proto: GeneratorRTG
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 1
 - proto: LockerFreezer
   entities:
   - uid: 16
@@ -2095,13 +2129,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,17.5
       parent: 1
-- proto: BookRandomStory
-  entities:
-  - uid: 269
-    components:
-    - type: Transform
-      pos: 13.5,2.5
-      parent: 1
 - proto: RandomDrinkBottle
   entities:
   - uid: 23
@@ -2303,20 +2330,6 @@ entities:
     - type: Transform
       pos: 8.5,22.5
       parent: 1
-- proto: FakeSpaceCash10
-  entities:
-  - uid: 130
-    components:
-    - type: Transform
-      pos: 6.607684,15.804618
-      parent: 1
-  - uid: 131
-    components:
-    - type: Transform
-      pos: 6.467059,15.335868
-      parent: 1
-    - type: Stack
-      count: 20
 - proto: SubstationBasicEmpty
   entities:
   - uid: 156

Resources/Maps/Dungeon/ruined_hospital.yml

@@ -22,7 +22,10 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
+      mapPaused: True
     - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
     - type: LoadedMap
     - type: MapGrid
       chunks:
@@ -1239,8 +1242,6 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-    - type: GridTree
-    - type: MovedGrids
     - type: Fixtures
       fixtures: {}
 - proto: APCBasic
@@ -1304,6 +1305,18 @@ entities:
     - type: Transform
       pos: 19.5,9.5
       parent: 1
+- proto: BookRandomStory
+  entities:
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 17.5,3.5
+      parent: 1
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 19.5,10.5
+      parent: 1
 - proto: Bookshelf
   entities:
   - uid: 51
@@ -4290,22 +4303,24 @@ entities:
     - type: Transform
       pos: 17.5,4.5
       parent: 1
-- proto: GeneratorBasic
+- proto: GeneratorBasic15kW
   entities:
-  - uid: 651
+  - uid: 822
     components:
     - type: Transform
-      pos: 32.5,2.5
+      pos: 32.5,4.5
       parent: 1
-  - uid: 822
+  - uid: 823
     components:
     - type: Transform
-      pos: 32.5,3.5
+      pos: 32.5,2.5
       parent: 1
-  - uid: 823
+- proto: GeneratorRTG
+  entities:
+  - uid: 651
     components:
     - type: Transform
-      pos: 32.5,4.5
+      pos: 32.5,3.5
       parent: 1
 - proto: HospitalCurtains
   entities:
@@ -4862,18 +4877,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 27.5,2.5
       parent: 1
-- proto: BookRandomStory
-  entities:
-  - uid: 138
-    components:
-    - type: Transform
-      pos: 17.5,3.5
-      parent: 1
-  - uid: 460
-    components:
-    - type: Transform
-      pos: 19.5,10.5
-      parent: 1
 - proto: RandomDrinkGlass
   entities:
   - uid: 4

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -7,7 +7,8 @@
     - id: CargoBountyComputerCircuitboard
     - id: CargoRequestComputerCircuitboard
     - id: CargoSaleComputerCircuitboard
-    - id: CargoShuttleComputerCircuitboard
+    #- id: CargoShuttleComputerCircuitboard # backmen: salvage
+    - id: ShipyardComputerCircuitboard
     - id: CargoShuttleConsoleCircuitboard
     - id: SalvageMagnetMachineCircuitboard
     - id: CigPackGreen

Resources/Prototypes/Corvax/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -1,8 +0,0 @@
-- type: entity
-  parent: BaseComputerCircuitboard
-  id: SalvageShuttleConsoleCircuitboard
-  name: salvage shuttle console board
-  description: A computer printed circuit board for a salvage shuttle console.
-  components:
-    - type: ComputerBoard
-      prototype: ComputerShuttleSalvage

Resources/Prototypes/Corvax/Entities/Structures/Machines/Computers/computers.yml

@@ -12,31 +12,3 @@
         path: /Audio/Corvax/Announcements/centcomm.ogg
         params:
           volume: -4
-
-- type: entity
-  parent: BaseComputerShuttle
-  id: ComputerShuttleSalvage
-  name: salvage shuttle console
-  description: Used to pilot the salvage shuttle.
-  components:
-    - type: Sprite
-      layers:
-        - map: ["computerLayerBody"]
-          state: computer
-        - map: ["computerLayerKeyboard"]
-          state: generic_keyboard
-        - map: ["computerLayerScreen"]
-          state: shuttle
-        - map: ["computerLayerKeys"]
-          state: generic_keys
-    - type: DroneConsole
-      components:
-        - type: SalvageShuttle
-    - type: RadarConsole
-      maxRange: 256
-    - type: PointLight
-      radius: 1.5
-      energy: 1.6
-      color: "#c94242"
-    - type: Computer
-      board: SalvageShuttleConsoleCircuitboard

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -111,6 +111,7 @@
   parent: BaseComputerCircuitboard
   id: CargoShuttleComputerCircuitboard
   name: cargo shuttle computer board
+  categories: [ HideSpawnMenu ] # backmen: salvage
   description: A computer printed circuit board for a cargo shuttle computer.
   components:
     - type: Sprite

Resources/Prototypes/Entities/Stations/base.yml

@@ -71,11 +71,6 @@
           - /Maps/Ruins/syndicate_dropship.yml
           - /Maps/Ruins/whiteship_ancient.yml
           - /Maps/Ruins/whiteship_bluespacejumper.yml
-        # Corvax-start
-        mining: !type:GridSpawnGroup
-          paths:
-          - /Maps/Shuttles/corvax_mining.yml
-        # Corvax-Mapping-End
 
 - type: entity
   id: BaseStationCentcomm

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -746,6 +746,7 @@
 - type: entity
   id: ComputerCargoShuttle
   parent: BaseComputerAiAccess
+  categories: [ HideSpawnMenu ] # backmen: salvage
   name: cargo shuttle computer
   description: Used to order the shuttle.
   components:

Resources/Prototypes/Objectives/objectiveGroups.yml

@@ -77,11 +77,11 @@
     ClothingOuterHardsuitVoidParamedStealObjective: 1   #med
     MedicalTechFabCircuitboardStealObjective: 1
     ClothingHeadsetAltMedicalStealObjective: 1
-    FireAxeStealObjective: 1                            #eng
+    FireAxeStealObjective: 1   
+                             #eng
     AmePartFlatpackStealObjective: 1
     ExpeditionsCircuitboardStealObjective: 1            #sup
     CargoShuttleCircuitboardStealObjective: 1
-    SalvageShuttleCircuitboardStealObjective: 1
     ClothingEyesHudBeerStealObjective: 1                #srv
     BibleStealObjective: 1
     ClothingNeckGoldmedalStealObjective: 1              #other

Resources/Prototypes/Research/civilianservices.yml

@@ -68,7 +68,6 @@
     - SynthesizerInstrument
     - DawInstrumentMachineCircuitboard
     - MassMediaCircuitboard
-    - ShipyardCircuitboard
     - JukeboxCircuitBoard
 
 - type: technology

Resources/Prototypes/Research/industrial.yml

@@ -14,6 +14,7 @@
   - MineralScannerEmpty
   - OreProcessorIndustrialMachineCircuitboard
   - ClothingMaskWeldingGas
+  - ShipyardCircuitboard # backmen: salvage
 
 - type: technology
   id: SpaceScanning

Resources/Prototypes/_Backmen/Catalog/default_shipyard_catalog.yml

@@ -38,7 +38,7 @@
   id: Prospecter
   name: NT-7 Prospecter
   description: A small mining vessel designed to assist salvage operations.
-  price: 19000
+  price: 15000
   category: Small
   group: Civilian
   shuttlePath: /Maps/Backmen/ForSale/prospecter.yml

Resources/Prototypes/_Backmen/Entities/Structures/Machines/computers.yml

@@ -13,6 +13,8 @@
     interfaces:
       enum.ShipyardConsoleUiKey.Shipyard:
         type: ShipyardConsoleBoundUserInterface
+      enum.WiresUiKey.Key:
+        type: WiresBoundUserInterface
   - type: Computer
     board: ShipyardComputerCircuitboard
   - type: StationAiWhitelist

Resources/migration.yml

@@ -566,9 +566,9 @@ SpawnPointStationAI: PlayerStationAi
 WeaponTurretLaserNanoTrasenAI: WeaponTurretSyndicateBroken
 
 # 2024-08-22
-# ComputerShuttleSalvage: null # Corvax reverted
-# SalvageShuttleConsoleCircuitboard: null
-# SalvageShuttleCircuitboardStealObjective: null
+ComputerShuttleSalvage: null
+SalvageShuttleConsoleCircuitboard: null
+SalvageShuttleCircuitboardStealObjective: null
 
 # 2024-08-28
 ClothingBackpackDuffelSyndicateCostumeCentcom: null
@@ -652,3 +652,9 @@ TorsoBorgJanitor: TorsoBorg
 PresentRandomAsh: PresentRandomCoal
 # 2024-11-19
 CrateCrewMonitoringBoards: CrateCrewMonitoring
+
+# 2024-11-23 backmen
+# Computer that by idea let's you call cargo shuttle is replaced
+# with console that let's you buy any shuttle.
+ComputerCargoShuttle: ComputerShipyard
+CargoShuttleComputerCircuitboard: ShipyardComputerCircuitboard