diff --git a/Content.Server/_Goobstation/ItemMiner/Systems/ItemMinerSystem.cs b/Content.Server/_Goobstation/ItemMiner/Systems/ItemMinerSystem.cs index af7949eb3dc..9acf6a927c9 100644 --- a/Content.Server/_Goobstation/ItemMiner/Systems/ItemMinerSystem.cs +++ b/Content.Server/_Goobstation/ItemMiner/Systems/ItemMinerSystem.cs @@ -3,7 +3,6 @@ using Content.Server.Power.EntitySystems; using Content.Server.Stack; using Robust.Shared.Audio.Systems; -using Robust.Shared.Random; using Robust.Shared.Timing; namespace Content.Server._Goobstation.ItemMiner; @@ -11,7 +10,6 @@ namespace Content.Server._Goobstation.ItemMiner; public sealed class ItemMinerSystem : EntitySystem { [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _gambling = default!; [Dependency] private readonly PowerReceiverSystem _power = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly StackSystem _stack = default!; @@ -66,9 +64,6 @@ public override void Update(float frameTime) continue; miner.NextAt += miner.Interval; - if (miner.SpawnChance < 1f && !_gambling.Prob(miner.SpawnChance)) - continue; - // mine var minedUid = Spawn(proto, xform.Coordinates); var ev = new ItemMinedEvent(minedUid); diff --git a/Content.Server/_Mono/Cargo/DriftingPriceComponent.cs b/Content.Server/_Mono/Cargo/DriftingPriceComponent.cs deleted file mode 100644 index 8be5645fbcd..00000000000 --- a/Content.Server/_Mono/Cargo/DriftingPriceComponent.cs +++ /dev/null @@ -1,45 +0,0 @@ -namespace Content.Server._Mono.Cargo; - -/// -/// Assigns a price to an object that drifts over time. -/// -[RegisterComponent] -public sealed partial class DriftingPriceComponent : Component -{ - /// - /// Minimum price to initialise to. - /// - [DataField(required: true)] - public double MinInitial; - - /// - /// Maximum price to initialise to. - /// - [DataField(required: true)] - public double MaxInitial; - - /// - /// Base price to tend towards. - /// - [DataField(required: true)] - public double BasePrice; - - /// - /// Current price. - /// - [DataField] - public double CurrentPrice; - - /// - /// How much to pull the price back towards the base. - /// 0 means do not pull at all. - /// - [DataField] - public double Stability = 0.5; - - /// - /// How fast to drift the price, fraction per second. - /// - [DataField] - public double DriftRate = 0.01; -} diff --git a/Content.Server/_Mono/Cargo/DriftingPriceSystem.cs b/Content.Server/_Mono/Cargo/DriftingPriceSystem.cs deleted file mode 100644 index 4f70e99861c..00000000000 --- a/Content.Server/_Mono/Cargo/DriftingPriceSystem.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Content.Server.Cargo.Systems; -using Robust.Shared.Random; -using Robust.Shared.Timing; - -namespace Content.Server._Mono.Cargo; - -public sealed class DriftingPriceSystem : EntitySystem -{ - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - - private float _updateSpacing = 1f; - private float _updateAccum = 0f; - - public override void Initialize() - { - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnGetPrice); - } - - private void OnInit(Entity ent, ref MapInitEvent args) - { - ent.Comp.CurrentPrice = _random.NextDouble(ent.Comp.MinInitial, ent.Comp.MaxInitial); - } - - private void OnGetPrice(Entity ent, ref PriceCalculationEvent args) - { - args.Price += ent.Comp.CurrentPrice; - } - - public override void Update(float frameTime) - { - _updateAccum += frameTime; - if (_updateAccum < _updateSpacing) - return; - _updateAccum -= _updateSpacing; - - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var price)) - { - var driftTotal = price.CurrentPrice * price.DriftRate * _updateSpacing; - var priceScale = price.CurrentPrice / price.BasePrice; - var priceOffset = Math.Pow(priceScale, price.Stability); - var driftPoint = Math.Pow(_random.NextDouble(), priceOffset) * 2 - 1; - price.CurrentPrice += driftTotal * driftPoint; - } - } -} diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs index 7b12a8e629f..b5496a4c93d 100644 --- a/Content.Shared/Construction/SharedFlatpackSystem.cs +++ b/Content.Shared/Construction/SharedFlatpackSystem.cs @@ -50,7 +50,7 @@ private void OnInsertAttempt(Entity ent, ref ItemSlotI if (args.Slot.ID != ent.Comp.SlotId || args.Cancelled) return; - if (TryComp(args.Item, out var board) && board.Flatpackable) // Mono + if (HasComp(args.Item)) return; if (TryComp(args.Item, out var computer) && computer.Prototype != null) diff --git a/Content.Shared/_Goobstation/ItemMiner/ItemMinerComponent.cs b/Content.Shared/_Goobstation/ItemMiner/ItemMinerComponent.cs index c841f809363..96d759ed5ec 100644 --- a/Content.Shared/_Goobstation/ItemMiner/ItemMinerComponent.cs +++ b/Content.Shared/_Goobstation/ItemMiner/ItemMinerComponent.cs @@ -41,12 +41,6 @@ public sealed partial class ItemMinerComponent : Component [DataField] public TimeSpan Interval = TimeSpan.FromSeconds(10.0f); - /// - /// Chance to actually spawn the result each interval. - /// - [DataField] - public float SpawnChance = 1f; - /// /// Whether to need to be anchored to run. /// diff --git a/Resources/Locale/en-US/_Mono/research/experimental.ftl b/Resources/Locale/en-US/_Mono/research/experimental.ftl index 2e25fb4ca20..0de3494c167 100644 --- a/Resources/Locale/en-US/_Mono/research/experimental.ftl +++ b/Resources/Locale/en-US/_Mono/research/experimental.ftl @@ -2,7 +2,5 @@ research-technology-xenopsychology = Xenopsychology research-technology-bluespace-tethering = Bluespace Tethering research-technology-basic-parts = Basic Components -research-technology-data-farms = Data Farming - research-technology-basic-research = Basic Research -research-technology-advanced-research = Advanced Research +research-technology-advanced-research = Advanced Research \ No newline at end of file diff --git a/Resources/Maps/Dungeon/experiment.yml b/Resources/Maps/Dungeon/experiment.yml index 81cd95bd730..2e303f835c1 100644 --- a/Resources/Maps/Dungeon/experiment.yml +++ b/Resources/Maps/Dungeon/experiment.yml @@ -8695,7 +8695,7 @@ entities: - type: Transform pos: 42.607162,12.70194 parent: 1653 -- proto: ResearchDisk10000 +- proto: ResearchDisk entities: - uid: 1625 components: diff --git a/Resources/Maps/Salvage/medium-1.yml b/Resources/Maps/Salvage/medium-1.yml index d85115027e6..f9e5a7c0017 100644 --- a/Resources/Maps/Salvage/medium-1.yml +++ b/Resources/Maps/Salvage/medium-1.yml @@ -855,7 +855,7 @@ entities: - type: Transform pos: -3.5,-0.5 parent: 85 -- proto: ResearchDisk10000 +- proto: ResearchDisk entities: - uid: 87 components: diff --git a/Resources/Maps/_Mono/POI/pdvhelios.yml b/Resources/Maps/_Mono/POI/pdvhelios.yml index e3b3d35beea..f97b1303632 100644 --- a/Resources/Maps/_Mono/POI/pdvhelios.yml +++ b/Resources/Maps/_Mono/POI/pdvhelios.yml @@ -9193,7 +9193,7 @@ entities: - type: Transform pos: 1.5,67.5 parent: 1 -- proto: DatafarmResearchFaction +- proto: BaseResearchAndDevelopmentPointSource entities: - uid: 316 components: diff --git a/Resources/Maps/_Mono/POI/tsfmchalcyon.yml b/Resources/Maps/_Mono/POI/tsfmchalcyon.yml index 846b0197b8d..366f74176ba 100644 --- a/Resources/Maps/_Mono/POI/tsfmchalcyon.yml +++ b/Resources/Maps/_Mono/POI/tsfmchalcyon.yml @@ -10974,13 +10974,15 @@ entities: rot: 3.141592653589793 rad pos: 24.5,-13.5 parent: 1 -- proto: DatafarmResearchFaction +- proto: BaseResearchAndDevelopmentPointSource entities: - uid: 1217 components: - type: Transform pos: -3.5,9.5 parent: 1 + missingComponents: + - Anchorable - proto: Bed entities: - uid: 1218 diff --git a/Resources/Maps/_Mono/POI/usspbaikal.yml b/Resources/Maps/_Mono/POI/usspbaikal.yml index 85a18f645ba..8499ba40f99 100644 --- a/Resources/Maps/_Mono/POI/usspbaikal.yml +++ b/Resources/Maps/_Mono/POI/usspbaikal.yml @@ -9118,7 +9118,7 @@ entities: - type: Transform pos: 63.5,60.5 parent: 1 -- proto: DatafarmResearchFaction +- proto: BaseResearchAndDevelopmentPointSource entities: - uid: 716 components: diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml index 7c66d27616a..3f9c8394b77 100644 --- a/Resources/Maps/reach.yml +++ b/Resources/Maps/reach.yml @@ -1900,7 +1900,7 @@ entities: - type: Transform pos: -9.5,6.5 parent: 2 -- proto: DatafarmResearchFaction +- proto: BaseResearchAndDevelopmentPointSource entities: - uid: 82 components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 32970a13509..77e3c85ce06 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -44,7 +44,7 @@ prob: 0.1 - id: WelderIndustrialAdvanced prob: 0.1 - - id: ResearchDisk10000 # Mono + - id: ResearchDisk prob: 0.1 - id: SheetUranium prob: 0.1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml index 18b8bd20fd9..f5f46ea74fc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml @@ -71,7 +71,7 @@ weight: 10 children: - id: ClothingBeltUtilityFilled - - id: ResearchDisk10000 + - id: ResearchDisk - id: ResearchDisk35000 - id: RandomInstruments diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 650844b658e..0e843d0f4c4 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -93,7 +93,7 @@ - id: SheetPlasma1 amount: !type:RangeNumberSelector range: 3, 5 - - id: ResearchDisk10000 + - id: ResearchDisk - id: DrinkGoldenCup - id: TreasureSampleTube - !type:NestedSelector diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 22d6b504f79..6511605603f 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -234,7 +234,7 @@ orGroup: GiftPool - id: WeaponFlareGun orGroup: GiftPool - - id: ResearchDisk10000 + - id: ResearchDisk orGroup: GiftPool - id: Machete orGroup: GiftPool diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index b7aeaf9907e..31cc48c43d7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -100,9 +100,6 @@ points: 10000 - type: StaticPrice price: 2000 - - type: Tag - tags: - - ResearchDisk10000 - type: entity parent: ResearchDisk @@ -140,9 +137,6 @@ points: 10000 - type: StaticPrice # Frontier price: 2000 # Mono - - type: Tag - tags: - - ResearchDisk10000 - type: entity parent: ResearchDisk diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml index 599ba30d250..5dda9126771 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml @@ -1,10 +1,14 @@ - type: entity abstract: true parent: BaseStructure - id: BaseMachineIndestructible # Mono: Changed to BaseMachineIndestructible and removed destructible/damageable components + id: BaseMachine components: - type: Animateable - type: InteractionOutline + - type: Anchorable + delay: 2 + - type: Physics + bodyType: Static - type: Transform noRot: true - type: Fixtures @@ -18,30 +22,17 @@ - MachineMask layer: - MachineLayer - - type: LanguageSpeaker # Einstein Engines - Language - Yes, on BASE MACHINE. This is all I need to make sure that in 99% of cases, machines use the language system. - - type: LanguageKnowledge # Einstein Engines - Language - speaks: - - TauCetiBasic - understands: - - TauCetiBasic - - type: Climbable # mono - - type: FootstepModifier # mono - footstepSoundCollection: - collection: FootstepHull - -- type: entity - abstract: true - parent: BaseMachineIndestructible - id: BaseMachine # Mono: Changed to parent off of previous BaseMachine but without destructible/damageable components - components: + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: !type:DamageTrigger damage: 200 behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] + - !type:DoActsBehavior + acts: [ "Destruction" ] - trigger: !type:DamageTrigger damage: 100 @@ -51,11 +42,16 @@ - !type:PlaySoundBehavior sound: collection: MetalBreak - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: StructuralMetallic - - type: Anchorable - delay: 2 + - type: LanguageSpeaker # Einstein Engines - Language - Yes, on BASE MACHINE. This is all I need to make sure that in 99% of cases, machines use the language system. + - type: LanguageKnowledge # Einstein Engines - Language + speaks: + - TauCetiBasic + understands: + - TauCetiBasic + - type: Climbable # mono + - type: FootstepModifier # mono + footstepSoundCollection: + collection: FootstepHull - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml index 445ddbe296b..c69905c0ec2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/research.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml @@ -70,78 +70,62 @@ - Science - type: entity - abstract: true # Mono: Abstract id: BaseResearchAndDevelopmentPointSource - parent: DatafarmResearchFaction # Mono: Changed to parent off of new research generation servers to replace existing mapped generators - name: bolted data farm (Research) # Mono - suffix: Unused - description: A power-hungry server dedicated towards scraping data from... somewhere. This one generates research points at a rate of 200 per second. It seems to be bolted to the floor. # Mono + parent: BaseMachinePowered + name: "base R&D supercomputer" # We should make this abstract once there are actual point sources. components: + - type: Sprite + sprite: Structures/Machines/rndpointsource.rsi + layers: + - state: rndpointsource-off + - state: rndpointsource + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] - type: ResearchClient - type: ResearchPointSource - pointsPerSecond: 200 + pointsPerSecond: 35 active: true - type: PointLight radius: 1.5 - energy: 1.5 - color: "#93005b" - - type: Sprite # Mono: Changed sprite - sprite: _Mono/Structures/Machines/neapolitan_server.rsi - layers: - - state: icon - - state: unlit - shader: unshaded - map: [ "enum.PowerDeviceVisualLayers.Powered" ] - - state: stripe - color: "#b3aa79" - - state: stripe2 - color: "#5b0093" - #- type: ActivatableUI - # key: enum.ResearchClientUiKey.Key - #- type: ActivatableUIRequiresPower - #- type: UserInterface - # interfaces: - # enum.ResearchClientUiKey.Key: - # type: ResearchClientBoundUserInterface - #- type: Appearance - #- type: GenericVisualizer - # visuals: - # enum.PowerDeviceVisuals.Powered: - # enum.PowerDeviceVisualLayers.Powered: - # True: {visible: true} - # False: {visible: false} - #- type: Destructible - # thresholds: - # - trigger: - # !type:DamageTrigger - # damage: 400 - # behaviors: - # - !type:DoActsBehavior - # acts: [ "Destruction" ] - # - trigger: - # !type:DamageTrigger - # damage: 200 - # behaviors: - # - !type:DoActsBehavior - # acts: ["Destruction"] - # - !type:PlaySoundBehavior - # sound: - # collection: MetalBreak - # - !type:SpawnEntitiesBehavior - # spawn: - # SheetSteel1: - # min: 1 - # max: 1 - #- type: GuideHelp - # guides: - # - Science - #- type: Sprite - # sprite: Structures/Machines/rndpointsource.rsi - # layers: - # - state: rndpointsource-off - # - state: rndpointsource - # shader: unshaded - # map: ["enum.PowerDeviceVisualLayers.Powered"] - - # / Mono end + energy: 1.6 + color: "#3db83b" + - type: ActivatableUI + key: enum.ResearchClientUiKey.Key + - type: ActivatableUIRequiresPower + - type: UserInterface + interfaces: + enum.ResearchClientUiKey.Key: + type: ResearchClientBoundUserInterface + - type: Appearance + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: {visible: true} + False: {visible: false} + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 1 + - type: GuideHelp + guides: + - Science diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml index 988ed647c02..688b17b45ae 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml @@ -99,7 +99,6 @@ - APECircuitboard - ArtifactAnalyzerMachineCircuitboard - ArtifactCrusherMachineCircuitboard - - DataFarmResearchCircuitboard - type: latheRecipePack id: CameraBoards diff --git a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/bitcoin.yml b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/bitcoin.yml deleted file mode 100644 index 23716d8af85..00000000000 --- a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/bitcoin.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: entity - name: random bitcoin - id: SpawnLootDatafarmBitcoin - parent: MarkerBasePlaceFree - suffix: "Datafarm Bitcoin Spawner" - components: - - type: Sprite - layers: - - state: green - scale: 0.7, 0.7 - - sprite: _NF/Markers/general.rsi - state: questionmark - color: red - - type: RandomSpawner - prototypes: - - BitcoinContribcoin - - BitcoinIdeascoin - chance: 0.75 - offset: 0.0 - rarePrototypes: - - BitcoinGoidacoin - rareChance: 0.1 diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml b/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml deleted file mode 100644 index 265ecdd5846..00000000000 --- a/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml +++ /dev/null @@ -1,51 +0,0 @@ -- type: entity - id: DataFarmResearchCircuitboard - parent: BaseMachineCircuitboard - name: data farm (research) circuitboard - description: Looks like you could use a screwdriver to change the board type. Unable to be flatpacked due to complex components. - components: - - type: Sprite - sprite: _Mono/Objects/Misc/module.rsi - state: datafarm_research - - type: MachineBoard - prototype: DatafarmResearch - flatpackable: false - requirements: - Capacitor: 4 - stackRequirements: - Cable: 5 - CableHV: 5 - tagRequirements: - ResearchDisk10000: - amount: 2 - defaultPrototype: ResearchDisk10000 - - type: Construction - deconstructionTarget: null - graph: Datafarm - node: research - -- type: entity - id: DataFarmCryptoCircuitboard - parent: BaseMachineCircuitboard - name: data farm (crypto) circuitboard - description: Looks like you could use a screwdriver to change the board type. Unable to be flatpacked due to complex components. - components: - - type: Sprite - sprite: _Mono/Objects/Misc/module.rsi - state: datafarm_crypto - - type: MachineBoard - prototype: DatafarmCrypto - flatpackable: false - requirements: - Capacitor: 4 - stackRequirements: - Cable: 5 - CableHV: 5 - tagRequirements: - ResearchDisk10000: - amount: 2 - defaultPrototype: ResearchDisk10000 - - type: Construction - deconstructionTarget: null - graph: Datafarm - node: crypto diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Misc/bitcoin.yml b/Resources/Prototypes/_Mono/Entities/Objects/Misc/bitcoin.yml deleted file mode 100644 index 70b4f8797b6..00000000000 --- a/Resources/Prototypes/_Mono/Entities/Objects/Misc/bitcoin.yml +++ /dev/null @@ -1,81 +0,0 @@ -- type: entity - parent: BaseItem - id: BaseBitcoin - name: basic bitcoin - abstract: true - description: A valuable bitcoin, composed of arbitrary data. Definitely a good investment. - components: - - type: EmitSoundOnPickup - sound: - path: /Audio/_Goobstation/Items/handling/disk_pickup.ogg - params: - volume: -6 - - type: EmitSoundOnDrop - sound: - path: /Audio/_Goobstation/Items/handling/disk_drop.ogg - params: - volume: -6 - - type: EmitSoundOnLand - sound: - path: /Audio/_Goobstation/Items/handling/disk_drop.ogg - params: - volume: -6 - - type: Sprite - sprite: _Mono/Objects/Misc/bitcoin.rsi - layers: - - state: icon - - state: fluffcoin - - type: DriftingPrice - minInitial: 8000 - maxInitial: 12000 - basePrice: 10000 - stability: 0.4 - driftRate: 0.025 - -- type: entity - parent: BaseBitcoin - id: BitcoinContribcoin - name: Contribcoin™ - description: A weirdly valuable bitcoin composed of many generic definitions, raw data and operating presets. Slightly volatile. - components: - - type: Sprite - sprite: _Mono/Objects/Misc/bitcoin.rsi - layers: - - state: icon - - state: fluffcoin - -- type: entity - parent: BaseBitcoin - id: BitcoinIdeascoin - name: Ideascoin™ - description: A strangely valuable bitcoin composed of raw conceptual data of a multitude of completely hypothetical things. Moderately volatile. - components: - - type: Sprite - sprite: _Mono/Objects/Misc/bitcoin.rsi - layers: - - state: icon - - state: kyrescoin - - type: DriftingPrice - minInitial: 12000 - maxInitial: 18000 - basePrice: 15000 - stability: 0.2 - driftRate: 0.05 - -- type: entity - parent: BaseBitcoin - id: BitcoinGoidacoin - name: Goidacoin™ - description: An absurdly valuable and rare bitcoin, made up of tons of high(?)-quality code and generic systems. Highly volatile. - components: - - type: Sprite - sprite: _Mono/Objects/Misc/bitcoin.rsi - layers: - - state: icon - - state: spiritcoin - - type: DriftingPrice - minInitial: 10000 - maxInitial: 30000 - basePrice: 20000 - stability: 0.1 - driftRate: 0.1 diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/datafarms.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/datafarms.yml deleted file mode 100644 index dc2fdd13c02..00000000000 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/datafarms.yml +++ /dev/null @@ -1,157 +0,0 @@ -- type: entity - id: BaseDataFarmIndestructible - parent: BaseMachineIndestructible - name: base datafarm - abstract: true - components: - - type: Sprite - sprite: _Mono/Structures/Machines/neapolitan_server.rsi - layers: - - state: icon - - state: unlit - shader: unshaded - map: [ "enum.PowerDeviceVisualLayers.Powered" ] - - state: stripe - color: "#b3aa79" - - state: stripe2 - color: "#5b0093" - - type: Appearance - - type: GenericVisualizer - visuals: - enum.PowerDeviceVisuals.Powered: - enum.PowerDeviceVisualLayers.Powered: - True: {visible: true} - False: {visible: false} - - type: ApcPowerReceiver - powerLoad: 40000 - - type: AmbientSound - volume: -9 - range: 5 - sound: - path: /Audio/Ambience/Objects/server_fans.ogg - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: StructuralMetallic - - type: PassiveThermalSignature - signature: 8000000 # ~8km - - type: ThermalSignature - - type: ExtensionCableReceiver - - type: LightningTarget - priority: 1 - -- type: entity - id: BaseDataFarm - parent: BaseDataFarmIndestructible - name: base datafarm - abstract: true - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - type: Anchorable - -- type: entity - id: BaseDataFarmResearch - parent: BaseDataFarm - abstract: true - components: - - type: Sprite - sprite: _Mono/Structures/Machines/neapolitan_server.rsi - layers: - - state: icon - - state: unlit - shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: stripe - color: "#b3aa79" - - state: stripe2 - color: "#5b0093" - - type: ResearchClient - - type: ActivatableUI - key: enum.ResearchClientUiKey.Key - - type: ActivatableUIRequiresPower - - type: UserInterface - interfaces: - enum.ResearchClientUiKey.Key: - type: ResearchClientBoundUserInterface - - type: PointLight - radius: 1 - energy: 1 - color: "#5b0093" - - type: GuideHelp - guides: - - Science - - type: ResearchPointSource - pointsPerSecond: 20 - active: true - -- type: entity - id: DatafarmResearchFaction - parent: BaseDataFarmIndestructible - name: bolted data farm (Research) - description: A power-hungry server dedicated towards scraping data from... somewhere. This one generates research points at a rate of 200 per second. It seems to be bolted to the floor. - components: - - type: ResearchClient - - type: ResearchPointSource - pointsPerSecond: 200 - active: true - - type: ApcPowerReceiver - powerLoad: 10000 - -- type: entity - id: DatafarmResearch - parent: [BaseDataFarmResearch, ConstructibleMachine] - name: data farm (Research) - description: A power-hungry server dedicated towards scraping data from... somewhere. This one generates research points at a rate of 20 per second. - components: - - type: PointLight - radius: 1.1 - energy: 1.1 - - type: Machine - board: DataFarmResearchCircuitboard - -- type: entity - id: DatafarmCrypto - parent: [BaseDataFarm, ConstructibleMachine] - name: data farm (Crypto) - description: A power-hungry server dedicated towards scraping data from... somewhere. This one generates valuable but random cryptocurrency at a rate of one every 10 minutes. - components: - - type: Sprite - sprite: _Mono/Structures/Machines/neapolitan_server.rsi - layers: - - state: icon - - state: unlit - shader: unshaded - map: [ "enum.PowerDeviceVisualLayers.Powered" ] - - state: stripe - color: "#b3aa79" - - state: stripe2 - color: "#009360" - - type: ApcPowerReceiver - powerLoad: 40000 - - type: PointLight - radius: 1.1 - energy: 1.1 - color: "#009360" - - type: ItemMiner - proto: SpawnLootDatafarmBitcoin - interval: 6 - spawnChance: 0.01 # highly random like real cryptomining - minedSound: /Audio/Effects/Cargo/ping.ogg - needApcPower: true - - type: Machine - board: DataFarmCryptoCircuitboard diff --git a/Resources/Prototypes/_Mono/Recipes/Crafting/Graphs/datafarm.yml b/Resources/Prototypes/_Mono/Recipes/Crafting/Graphs/datafarm.yml deleted file mode 100644 index 85498ea3769..00000000000 --- a/Resources/Prototypes/_Mono/Recipes/Crafting/Graphs/datafarm.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: constructionGraph - id: Datafarm - start: research - graph: - - node: research - entity: DataFarmResearchCircuitboard - edges: - - to: crypto - steps: - - tool: Screwing - doAfter: 2 - - node: crypto - entity: DataFarmCryptoCircuitboard - edges: - - to: research - steps: - - tool: Screwing - doAfter: 2 diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/electronics.yml index ea2b1fdd4e6..2b64a5e403e 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/electronics.yml @@ -88,13 +88,6 @@ id: LargeThrusterMachineCircuitboard result: LargeThrusterMachineCircuitboard -# Datafarm - -- type: latheRecipe - parent: BaseGoldCircuitboardRecipe - id: DataFarmResearchCircuitboard - result: DataFarmResearchCircuitboard - # economy - type: latheRecipe diff --git a/Resources/Prototypes/_Mono/Research/experimental.yml b/Resources/Prototypes/_Mono/Research/experimental.yml index 774b8d3a662..c2c23f6d07a 100644 --- a/Resources/Prototypes/_Mono/Research/experimental.yml +++ b/Resources/Prototypes/_Mono/Research/experimental.yml @@ -74,16 +74,3 @@ technologyPrerequisites: - BasicResearch position: -1, -2 - -- type: technology - id: DataFarmingTechnology - name: research-technology-data-farms - entityIcon: DatafarmCrypto - discipline: Experimental - tier: 3 - cost: 25000 - recipeUnlocks: - - DataFarmResearchCircuitboard - technologyPrerequisites: - - SuperParts - position: 1, 18 diff --git a/Resources/Prototypes/_Mono/tags.yml b/Resources/Prototypes/_Mono/tags.yml index e7c2e0f8a43..39d2eff9621 100644 --- a/Resources/Prototypes/_Mono/tags.yml +++ b/Resources/Prototypes/_Mono/tags.yml @@ -477,9 +477,6 @@ - type: Tag id: TechDiskMono -- type: Tag - id: ResearchDisk10000 - # survival kit - type: Tag diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml index 56b36af849f..439c6315cbe 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml @@ -214,8 +214,8 @@ color: red - type: RandomSpawner prototypes: - - ResearchDisk10000 - - ResearchDisk10000 + - ResearchDisk + - ResearchDisk - ResearchDisk35000 chance: 0.95 offset: 0.0 diff --git a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/fluffcoin.png b/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/fluffcoin.png deleted file mode 100644 index 2162d933be4..00000000000 Binary files a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/fluffcoin.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/icon.png b/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/icon.png deleted file mode 100644 index fefbaaf6787..00000000000 Binary files a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/kyrescoin.png b/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/kyrescoin.png deleted file mode 100644 index 8cfafd05059..00000000000 Binary files a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/kyrescoin.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/meta.json b/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/meta.json deleted file mode 100644 index e0367e9a2e5..00000000000 --- a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/meta.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Onezero0 for Monolith", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "fluffcoin" - }, - { - "name": "kyrescoin" - }, - { - "name": "spiritcoin" - } - ] -} diff --git a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/spiritcoin.png b/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/spiritcoin.png deleted file mode 100644 index 3a226ca2a58..00000000000 Binary files a/Resources/Textures/_Mono/Objects/Misc/bitcoin.rsi/spiritcoin.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Objects/Misc/module.rsi/datafarm_crypto.png b/Resources/Textures/_Mono/Objects/Misc/module.rsi/datafarm_crypto.png deleted file mode 100644 index 00ccd5a76b3..00000000000 Binary files a/Resources/Textures/_Mono/Objects/Misc/module.rsi/datafarm_crypto.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Objects/Misc/module.rsi/datafarm_research.png b/Resources/Textures/_Mono/Objects/Misc/module.rsi/datafarm_research.png deleted file mode 100644 index 5db4e353261..00000000000 Binary files a/Resources/Textures/_Mono/Objects/Misc/module.rsi/datafarm_research.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Objects/Misc/module.rsi/meta.json b/Resources/Textures/_Mono/Objects/Misc/module.rsi/meta.json index 022d604fc30..dad81be92b2 100644 --- a/Resources/Textures/_Mono/Objects/Misc/module.rsi/meta.json +++ b/Resources/Textures/_Mono/Objects/Misc/module.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "CPU rogue Made by Supernoob6677 (discord), Datafarm sprites made by Onezero0 for Monolith", + "copyright": "Made by Supernoob6677 (discord)", "size": { "x": 32, "y": 32 @@ -9,12 +9,6 @@ "states": [ { "name": "cpu_rogue" - }, - { - "name": "datafarm_research" - }, - { - "name": "datafarm_crypto" } ] } diff --git a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/icon.png b/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/icon.png deleted file mode 100644 index ac12ff3c488..00000000000 Binary files a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/meta.json b/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/meta.json deleted file mode 100644 index 171501cb90a..00000000000 --- a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/meta.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/9c3494fd79e6bf8dc532300b9de4f688ff276ac9/icons/obj/machines/telecomms.dmi, edited by Onezero0 for Monolith", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "icon" - }, - { - "name": "panel" - }, - { - "name": "stripe" - }, - { - "name": "stripe2" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/panel.png b/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/panel.png deleted file mode 100644 index 1ab3cfb29ca..00000000000 Binary files a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/stripe.png b/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/stripe.png deleted file mode 100644 index fdc40583ad2..00000000000 Binary files a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/stripe.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/stripe2.png b/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/stripe2.png deleted file mode 100644 index 8727936f5e6..00000000000 Binary files a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/stripe2.png and /dev/null differ diff --git a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/unlit.png b/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/unlit.png deleted file mode 100644 index b804f4c6c8a..00000000000 Binary files a/Resources/Textures/_Mono/Structures/Machines/neapolitan_server.rsi/unlit.png and /dev/null differ