Salvage magnet revamp (#23119)

* Generic offering window

* More work

* weh

* Parity

* Progression meter

* magnet

* rona

* PG asteroid work

* code red

* Asteroid spawnings

* clams

* a

* Marker fixes

* More fixes

* Workings of biome asteroids

* A

* Fix this loading code

* a

* Fix masking

* weh

* Fixes

* Magnet claiming

* toe

* petogue

* magnet

* Bunch of fixes

* Fix default

* Fixes

* asteroids

* Fix offerings

* Localisation and a bunch of fixes

* a

* Fixes

* Preliminary draft

* Announcement fixes

* Fixes and bump spawn rate

* Fix asteroid spawns and UI

* More fixes

* Expeditions fix

* fix

* Gravity

* Fix announcement rounding

* a

* Offset tweak

* sus

* jankass

* Fix merge
This commit is contained in:
metalgearsloth
2024-01-04 14:25:32 +11:00
committed by GitHub
parent 98f5f47355
commit bf79acd127
66 changed files with 2257 additions and 1252 deletions

View File

@@ -73,6 +73,12 @@
components:
- type: SalvageExpeditionData
- type: entity
id: BaseStationMagnet
abstract: true
components:
- type: SalvageMagnetData
- type: entity
id: BaseStationSiliconLawCrewsimov
abstract: true

View File

@@ -19,6 +19,7 @@
- BaseStationCentcomm
- BaseStationEvacuation
- BaseStationAlertLevels
- BaseStationMagnet
- BaseStationExpeditions
- BaseStationSiliconLawCrewsimov
- BaseStationAllEventsEligible

View File

@@ -23,36 +23,17 @@
- state: salvage-magnet-o4
map: ["chargeState"]
shader: unshaded
- type: Appearance
- type: GenericVisualizer
visuals:
enum.SalvageMagnetVisuals.ChargeState:
chargeState:
0: { state: salvage-magnet-o0, shader: "unshaded", visible: false }
1: { state: salvage-magnet-o0, shader: "unshaded", visible: true }
2: { state: salvage-magnet-o1, shader: "unshaded", visible: true }
3: { state: salvage-magnet-o2, shader: "unshaded", visible: true }
4: { state: salvage-magnet-o3, shader: "unshaded", visible: true }
5: { state: salvage-magnet-o4, shader: "unshaded", visible: true }
enum.SalvageMagnetVisuals.Ready:
ready:
False: { state: salvage-magnet-ready, visible: false, shader: "unshaded" }
True: { state: salvage-magnet-ready, visible: true, shader: "unshaded" }
enum.SalvageMagnetVisuals.ReadyBlinking:
readyBlinking:
False: { state: salvage-magnet-ready-blinking, visible: false, shader: "unshaded" }
True: { state: salvage-magnet-ready-blinking, visible: true, shader: "unshaded" }
enum.SalvageMagnetVisuals.Unready:
unready:
False: { state: salvage-magnet-unready, visible: false, shader: "unshaded" }
True: { state: salvage-magnet-unready, visible: true, shader: "unshaded" }
enum.SalvageMagnetVisuals.UnreadyBlinking:
unreadyBlinking:
False: { state: salvage-magnet-unready-blinking, visible: false, shader: "unshaded" }
True: { state: salvage-magnet-unready-blinking, visible: true, shader: "unshaded" }
- type: Rotatable
- type: ActivatableUI
key: enum.SalvageMagnetUiKey.Key
- type: ActivatableUIRequiresPower
- type: UserInterface
interfaces:
- key: enum.SalvageMagnetUiKey.Key
type: SalvageMagnetBoundUserInterface
- type: Transform
noRot: false
- type: Appearance
- type: Rotatable
- type: IntrinsicRadioReceiver
- type: ActiveRadio
channels:

View File

@@ -56,12 +56,210 @@
- FullTileMask
layer:
- WallLayer
- type: OreVein
oreChance: 0.2
oreRarityPrototypeId: RandomOreDistributionStandard
- type: RadiationBlocker
resistance: 2
# Ore veins
- type: entity
id: AsteroidRockCoal
parent: AsteroidRock
description: An ore vein rich with coal.
suffix: Coal
components:
- type: OreVein
oreChance: 1.0
currentOre: OreCoal
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_coal
- type: entity
id: AsteroidRockGold
parent: AsteroidRock
description: An ore vein rich with gold.
suffix: Gold
components:
- type: OreVein
oreChance: 1.0
currentOre: OreGold
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_gold
- type: entity
id: AsteroidRockPlasma
parent: AsteroidRock
description: An ore vein rich with plasma.
suffix: Plasma
components:
- type: OreVein
oreChance: 1.0
currentOre: OrePlasma
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_phoron
- type: entity
id: AsteroidRockQuartz
parent: AsteroidRock
description: An ore vein rich with quartz.
suffix: Quartz
components:
- type: OreVein
oreChance: 1.0
currentOre: OreSpaceQuartz
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_quartz
- type: entity
id: AsteroidRockSilver
parent: AsteroidRock
description: An ore vein rich with silver.
suffix: Silver
components:
- type: OreVein
oreChance: 1.0
currentOre: OreSilver
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_silver
# Yes I know it drops steel but we may get smelting at some point
- type: entity
id: AsteroidRockTin
parent: AsteroidRock
description: An ore vein rich with steel.
suffix: Steel
components:
- type: OreVein
oreChance: 1.0
currentOre: OreSteel
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_tin
- type: entity
id: AsteroidRockUranium
parent: AsteroidRock
description: An ore vein rich with uranium.
suffix: Uranium
components:
- type: OreVein
oreChance: 1.0
currentOre: OreUranium
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_uranium
- type: entity
id: AsteroidRockBananium
parent: AsteroidRock
description: An ore vein rich with bananium.
suffix: Bananium
components:
- type: OreVein
oreChance: 1.0
currentOre: OreBananium
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_bananium
- type: entity
id: AsteroidRockArtifactFragment
parent: AsteroidRock
description: A rock wall. What's that sticking out of it?
suffix: Artifact Fragment
components:
- type: OreVein
oreChance: 1.0
currentOre: OreArtifactFragment
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_asteroid_west
- state: rock_artifact_fragment
- type: entity
id: AsteroidRockMining
parent: AsteroidRock