From 325f1643fd9495a5c9b728bce2aee5151892edb1 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:10:44 +0300 Subject: [PATCH 1/3] Price Fixup (#2257) --- Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml | 2 +- Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml | 2 +- Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml | 2 +- Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml | 2 +- Resources/Prototypes/_NF/Shipyard/bookworm.yml | 2 +- Resources/Prototypes/_NF/Shipyard/caduceus.yml | 8 ++++---- Resources/Prototypes/_NF/Shipyard/ceres.yml | 2 +- Resources/Prototypes/_NF/Shipyard/garden.yml | 2 +- Resources/Prototypes/_NF/Shipyard/kilderkin.yml | 8 ++++---- Resources/Prototypes/_NF/Shipyard/lantern.yml | 8 ++++---- Resources/Prototypes/_NF/Shipyard/mccargo.yml | 2 +- Resources/Prototypes/_NF/Shipyard/pts.yml | 2 +- Resources/Prototypes/_NF/Shipyard/spirit.yml | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml index f92a7e90e73..0f39fb0ea03 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml @@ -12,7 +12,7 @@ id: Broadhead name: NSF Broadhead description: A medium size detective ship with facilities for autopsies, interrogations and detailed investigations. - price: 50000 #Appraises at 46495 and added markup of ~8% - TODO: fix these values, getting tests to pass - Whatstone + price: 60000 # TODO: fix these values, getting tests to pass - Whatstone category: Medium group: Security access: Detective diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml index 2aee91db4f9..3f854549638 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml @@ -2,7 +2,7 @@ id: Inquisitor name: NSF Inquisitor description: A small detective-oriented ship with two cells for holding prisoners - price: 29000 + price: 30000 category: Small group: Security access: Detective diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml index 44ef9fccdcf..c96e0bd6946 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml @@ -2,7 +2,7 @@ id: Orange name: SV Orange description: A cargo slash salvage shuttle made from scavenged wrecks, comes with some damage. - price: 17000 #Appraisal is 15800, +5% margin - TODO: fix this value, getting tests to pass - Whatstone + price: 18000 #Appraisal is 15800, +5% margin - TODO: fix this value, getting tests to pass - Whatstone category: Small group: Scrap shuttlePath: /Maps/_NF/Shuttles/Scrap/orange.yml diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml index ca0052347aa..0850b7c93e8 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml @@ -13,7 +13,7 @@ id: Chauffeur name: NC Chauffeur description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. - price: 15500 # $14325 after appraisal + ~$1200 (~5% markup) - TODO: fix this value, getting tests to pass - Whatstone + price: 16500 # $14325 after appraisal + ~$1200 (~5% markup) - TODO: fix this value, getting tests to pass - Whatstone category: Small group: Sr access: Service diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml index 1c122bc8831..d23343683a5 100644 --- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml +++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml @@ -12,7 +12,7 @@ id: Bookworm name: SBB Bookworm description: A cozy medium-size library for travellers who wish to relax with a book or perhaps a board game. - price: 27000 # ~24660 after purchase + ~9% markup + price: 30000 # ~24660 after purchase + ~9% markup category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/bookworm.yml diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml index 9795058c879..56fcf5b365a 100644 --- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml +++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml @@ -1,8 +1,8 @@ - type: vessel - id: caduceus + id: Caduceus name: NM Caduceus description: A former humanitarian vessel, the Caduceus now works as the best mobile hospital money can buy. - price: 110000 # Appraises at 101889, ~9% margin - TODO: fix this value, getting tests to pass - Whatstone + price: 115000 # Appraises at 101889, ~9% margin - TODO: fix this value, getting tests to pass - Whatstone category: Large group: Shipyard shuttlePath: /Maps/_NF/Shuttles/caduceus.yml @@ -12,12 +12,12 @@ - Chemistry - type: gameMap - id: caduceus + id: Caduceus mapName: 'NM Caduceus' mapPath: /Maps/_NF/Shuttles/caduceus.yml minPlayers: 0 stations: - caduceus: + Caduceus: stationProto: StandardFrontierVessel components: - type: StationNameSetup diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml index 28d56a60451..c726475ca83 100644 --- a/Resources/Prototypes/_NF/Shipyard/ceres.yml +++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml @@ -12,7 +12,7 @@ id: Ceres name: SBB Ceres description: A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests - price: 56000 # ~5% markup - TODO: fix this value, just getting tests to pass - Whatstone + price: 60000 # ~5% markup - TODO: fix this value, just getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/ceres.yml diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml index c087f0e0df9..a8be30f7588 100644 --- a/Resources/Prototypes/_NF/Shipyard/garden.yml +++ b/Resources/Prototypes/_NF/Shipyard/garden.yml @@ -12,7 +12,7 @@ id: Garden name: HS Garden description: A small botany vessel dedicated to horiticultural experimentation. - price: 24750 + price: 26000 category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/garden.yml diff --git a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml index 2cef0f4f898..98a2f657ac2 100644 --- a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml @@ -9,10 +9,10 @@ # Shuttle Notes: # - type: vessel - id: kilderkin + id: Kilderkin name: LVHI Kilderkin description: "Spaceworthy bar/microbrewery with everything one needs to facilitate poor life choices: lots of booze, smokes, and lack of food. Manufactured by Langstad-Voigt Heavy Industries." - price: 45500 # ~39600$ on mapinit + ~5950$ from 15% markup + price: 47000 # ~39600$ on mapinit + ~5950$ from 15% markup category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/kilderkin.yml @@ -21,12 +21,12 @@ - Civilian - type: gameMap - id: kilderkin + id: Kilderkin mapName: 'Kilderkin' mapPath: /Maps/_NF/Shuttles/kilderkin.yml minPlayers: 0 stations: - kilderkin: + Kilderkin: stationProto: StandardFrontierVessel components: - type: StationNameSetup diff --git a/Resources/Prototypes/_NF/Shipyard/lantern.yml b/Resources/Prototypes/_NF/Shipyard/lantern.yml index 3cf4aba934f..614dc936bcd 100644 --- a/Resources/Prototypes/_NF/Shipyard/lantern.yml +++ b/Resources/Prototypes/_NF/Shipyard/lantern.yml @@ -9,10 +9,10 @@ # Shuttle Notes: # - type: vessel - id: lantern + id: Lantern name: LVHI Lantern description: The Lantern is a medium-sized chapel-vessel equipped with everything chaplain might need in their never ending battle for salvation of NT personnel souls. Manufactured by Langstad-Voigt Heavy Industries. - price: 32100 # ~27900$ on mapinit + ~4200$ from 10% markup + price: 34000 # ~27900$ on mapinit + ~4200$ from 10% markup category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/lantern.yml @@ -21,12 +21,12 @@ - Civilian - type: gameMap - id: lantern + id: Lantern mapName: 'Lantern' mapPath: /Maps/_NF/Shuttles/lantern.yml minPlayers: 0 stations: - lantern: + Lantern: stationProto: StandardFrontierVessel components: - type: StationNameSetup diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index 94b7c453c13..19f44fe89a2 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -9,7 +9,7 @@ id: McCargo name: DC McCargo description: "Your very own McCargo™ franchise! Comes fully stocked and ready for production of McMeals." - price: 72000 # appraises at 67456, ~10% margin - TODO: fix these values, getting tests to pass - Whatstone + price: 75000 # appraises at 67456, ~10% margin - TODO: fix these values, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/mccargo.yml diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml index 629aefb3f1f..e4f7ee0b0c8 100644 --- a/Resources/Prototypes/_NF/Shipyard/pts.yml +++ b/Resources/Prototypes/_NF/Shipyard/pts.yml @@ -12,7 +12,7 @@ id: PTS name: NC Personal Transport description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. - price: 15500 # $14325 after appraisal + $1200 (~5% markup) + price: 16500 # $14325 after appraisal + $1200 (~5% markup) category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/pts.yml diff --git a/Resources/Prototypes/_NF/Shipyard/spirit.yml b/Resources/Prototypes/_NF/Shipyard/spirit.yml index ae7dfd0ed5c..aa792192836 100644 --- a/Resources/Prototypes/_NF/Shipyard/spirit.yml +++ b/Resources/Prototypes/_NF/Shipyard/spirit.yml @@ -12,7 +12,7 @@ id: Spirit name: FSB Spirit description: A tiny medical search and rescue shuttle, as nimble as it is cramped. Running costs guarenteed* to be 5% lower than competing models! - price: 15500 + price: 16500 category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/spirit.yml From a88085723b60f34b24b34f074c4920ab5af1bd96 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:55:23 +0300 Subject: [PATCH 2/3] Frontier Mobs Fixup (#2258) * Split base * Prefixing MobRestrictions, MobTimedDespawn --------- Co-authored-by: Whatstone --- .../Prototypes/Entities/Mobs/NPCs/carp.yml | 8 +-- .../Prototypes/Entities/Mobs/NPCs/flesh.yml | 3 +- .../Prototypes/Entities/Mobs/NPCs/space.yml | 12 +--- .../Entities/Mobs/NPCs/spacetick.yml | 4 +- .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 6 +- .../Entities/Mobs/Player/dragon.yml | 3 +- .../_NF/Entities/Mobs/NPCs/corpses.yml | 1 - .../_NF/Entities/Mobs/NPCs/elemental.yml | 6 +- .../Entities/Mobs/NPCs/mob_hostile_base.yml | 68 +++++++++++++++++-- .../Mobs/NPCs/mob_hostile_bloodcultist.yml | 23 +++---- ...mob_hostile_expeditions_aberrant_flesh.yml | 5 +- .../NPCs/mob_hostile_expeditions_argocyte.yml | 2 +- .../NPCs/mob_hostile_expeditions_carp.yml | 1 + .../mob_hostile_expeditions_dinosaurs.yml | 2 +- .../mob_hostile_expeditions_explorers.yml | 1 + .../NPCs/mob_hostile_expeditions_xeno.yml | 3 +- .../Mobs/NPCs/mob_hostile_mercenaries.yml | 1 + .../Mobs/NPCs/mob_hostile_rogue_ai.yml | 9 +-- .../NPCs/mob_hostile_wizardfederation.yml | 12 +--- .../Mobs/NPCs/mob_meme_goblinbane.yml | 11 ++- .../Mobs/NPCs/mob_meme_goblinbane_minions.yml | 16 ++--- .../_NF/Entities/Objects/base_contraband.yml | 22 ++++-- 22 files changed, 126 insertions(+), 93 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index cb811a761e1..380b741c391 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -152,10 +152,8 @@ - type: entity id: MobCarpSalvage - parent: MobCarp + parent: [NFMobRestrictions, MobCarp] # Frontier: add NFMobRestrictions, remove components suffix: "Salvage Ruleset" - components: - - type: NFSalvageMobRestrictions # Frontier - type: entity name: space carp @@ -244,7 +242,5 @@ - type: entity id: MobSharkSalvage - parent: MobShark + parent: [NFMobRestrictions, MobShark] # Frontier: add NFMobRestrictions suffix: "Salvage Ruleset" - components: - - type: NFSalvageMobRestrictions diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml index 64f8418d7bc..b4f6227c005 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml @@ -205,7 +205,7 @@ Blunt: 10 - type: entity - parent: [ SimpleSpaceMobBase, MobCombat ] + parent: [ NFMobRestrictions, SimpleSpaceMobBase, MobCombat ] # Frontier: add NFMobRestrictions id: BaseMobFleshSalvage #This one is immune to space! name: aberrant flesh suffix: "Salvage Ruleset" @@ -261,7 +261,6 @@ Slash: 6 - type: ReplacementAccent accent: genericAggressive - - type: NFSalvageMobRestrictions # Frontier - type: entity parent: BaseMobFleshSalvage diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index aacf17d4165..e590eea848d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -113,10 +113,8 @@ - type: entity id: MobBearSpaceSalvage - parent: MobBearSpace + parent: [NFMobRestrictions, MobBearSpace] # Frontier: add NFMobRestrictions, remove components suffix: "Salvage Ruleset" - components: - - type: NFSalvageMobRestrictions # Frontier - type: entity name: space kangaroo @@ -268,10 +266,8 @@ - type: entity id: MobSpiderSpaceSalvage - parent: MobSpiderSpace + parent: [NFMobRestrictions, MobSpiderSpace] # Frontier: add NFMobRestrictions, remove components suffix: "Salvage Ruleset" - components: - - type: NFSalvageMobRestrictions - type: entity name: space cobra @@ -365,10 +361,8 @@ - type: entity id: MobCobraSpaceSalvage - parent: MobCobraSpace + parent: [NFMobRestrictions, MobCobraSpace] # Frontier: add NFMobRestrictions, remove components suffix: "Salvage Ruleset" - components: - - type: NFSalvageMobRestrictions # Frontier: SalvageMobRestrictions Date: Wed, 16 Oct 2024 16:56:01 +0300 Subject: [PATCH 3/3] Board (#2259) --- .../Tests/MachineBoardTest.cs | 9 +++++++-- .../Objects/Devices/Circuitboards/computer.yml | 13 ------------- .../Objects/Devices/Circuitboards/computer.yml | 15 ++++++++++++++- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Content.IntegrationTests/Tests/MachineBoardTest.cs b/Content.IntegrationTests/Tests/MachineBoardTest.cs index a379ef8e0e4..01a4d324382 100644 --- a/Content.IntegrationTests/Tests/MachineBoardTest.cs +++ b/Content.IntegrationTests/Tests/MachineBoardTest.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Server.Construction.Components; using Content.Shared.Construction.Components; @@ -57,7 +57,7 @@ await server.WaitAssertion(() => Assert.Multiple(() => { Assert.That(protoMan.TryIndex(mId, out var mProto), - $"Machine board {p.ID}'s corresponding machine has an invalid prototype."); // Frontier + $"Machine board {p.ID}'s corresponding machine has an invalid prototype."); Assert.That(mProto.TryGetComponent(out var mComp, compFact), $"Machine board {p.ID}'s corresponding machine {mId} does not have MachineComponent"); Assert.That(mComp.Board, Is.EqualTo(p.ID), @@ -93,6 +93,11 @@ await server.WaitAssertion(() => continue; var cId = cbc.Prototype; + // Frontier: we accept null as board prototypes, but this will fail the assertions. + if (cId == "Null") + continue; + // End Frontier + Assert.Multiple(() => { Assert.That(cId, Is.Not.Null, $"Computer board \"{p.ID}\" does not have a corresponding computer."); diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index c65f82c0070..79e3c92278a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -444,19 +444,6 @@ - type: ComputerTabletopBoard # Frontier prototype: ComputerTabletopIFFSyndicate # Frontier -- type: entity - parent: BaseComputerCircuitboard - id: ShipyardComputerCircuitboard - name: shipyard computer board - description: A computer printed circuit board for a shipyard computer. - components: - - type: Sprite - state: cpu_supply - - type: ComputerBoard - prototype: ComputerShipyard - - type: ComputerTabletopBoard # Frontier - prototype: ComputerTabletopShipyard # Frontier - - type: entity parent: BaseComputerCircuitboard id: ComputerMassMediaCircuitboard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml index 41d659e9197..e36935485e2 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml @@ -23,4 +23,17 @@ # - type: ComputerBoard # prototype: ComputerAdvancedRadar # - type: ComputerTabletopBoard # Frontier - # prototype: ComputerTabletopAdvancedRadar # Frontier \ No newline at end of file + # prototype: ComputerTabletopAdvancedRadar # Frontier + +# - type: entity + # parent: BaseComputerCircuitboard + # id: ShipyardComputerCircuitboard + # name: shipyard computer board + # description: A computer printed circuit board for a shipyard computer. + # components: + # - type: Sprite + # state: cpu_supply + # - type: ComputerBoard + # prototype: ComputerShipyard + # - type: ComputerTabletopBoard # Frontier + # prototype: ComputerTabletopShipyard # Frontier \ No newline at end of file