Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ребаланс рнд #49

Merged
merged 1 commit into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public sealed partial class ArtifactComponent : Component
/// The base amount of research points for each artifact node.
/// </summary>
[DataField("pointsPerNode"), ViewVariables(VVAccess.ReadWrite)]
public int PointsPerNode = 5000;
public int PointsPerNode = 6500;

/// <summary>
/// Research points which have been "consumed" from the theoretical max value of the artifact.
Expand All @@ -77,7 +77,7 @@ public sealed partial class ArtifactComponent : Component
/// Used for calculating the research point value of an artifact node.
/// </summary>
[DataField("pointDangerMultiplier"), ViewVariables(VVAccess.ReadWrite)]
public float PointDangerMultiplier = 1.35f;
public float PointDangerMultiplier = 1.5f;

/// <summary>
/// The sound that plays when an artifact is activated
Expand Down
4 changes: 2 additions & 2 deletions Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Robust.Shared.Prototypes;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;

namespace Content.Shared.Research.Prototypes;
Expand Down Expand Up @@ -44,5 +44,5 @@ public sealed class TechDisciplinePrototype : IPrototype
/// Purchasing this tier of technology causes a server to become "locked" to this discipline.
/// </summary>
[DataField("lockoutTier")]
public int LockoutTier = 3;
public int LockoutTier = 4;
}
22 changes: 11 additions & 11 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
state: icon
discipline: Arsenal
tier: 1
cost: 5000
cost: 3500
recipeUnlocks:
- WeaponProtoKineticAccelerator
# These are roundstart but not replenishable for salvage
Expand All @@ -23,7 +23,7 @@
state: incendiarydisplay
discipline: Arsenal
tier: 1
cost: 10000
cost: 8500
recipeUnlocks:
- ShellShotgunIncendiary
- CartridgePistolIncendiary
Expand All @@ -44,7 +44,7 @@
state: payload-explosive-armed
discipline: Arsenal
tier: 1
cost: 7500
cost: 6000
recipeUnlocks:
- Signaller
- SignalTrigger
Expand All @@ -62,7 +62,7 @@
state: icon
discipline: Arsenal
tier: 1
cost: 7500
cost: 6000
recipeUnlocks:
- WeaponLaserCarbine

Expand All @@ -74,7 +74,7 @@
state: beanbag
discipline: Arsenal
tier: 1
cost: 5000
cost: 3500
recipeUnlocks:
- ShellShotgunBeanbag
- CartridgePistolRubber
Expand All @@ -95,7 +95,7 @@
state: practice
discipline: Arsenal
tier: 1
cost: 2000
cost: 1000
recipeUnlocks:
- ShellShotgunPractice
- MagazineBoxPistolPractice
Expand All @@ -115,7 +115,7 @@
state: icon
discipline: Arsenal
tier: 2
cost: 10000
cost: 8500
recipeUnlocks:
- WeaponLaserCannon

Expand All @@ -127,7 +127,7 @@
state: icon
discipline: Arsenal
tier: 2
cost: 10000
cost: 8500
recipeUnlocks:
- WeaponXrayCannon

Expand All @@ -139,7 +139,7 @@
state: icon
discipline: Arsenal
tier: 2
cost: 8000
cost: 6000
recipeUnlocks:
- Truncheon
- TelescopicShield
Expand All @@ -155,7 +155,7 @@
state: icon
discipline: Arsenal
tier: 3
cost: 15000
cost: 12000
recipeUnlocks:
- WeaponTaser

Expand All @@ -167,6 +167,6 @@
state: icon
discipline: Arsenal
tier: 3
cost: 15000
cost: 12000
recipeUnlocks:
- WeaponAdvancedLaser
20 changes: 10 additions & 10 deletions Resources/Prototypes/Research/biochemical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
state: beakerlarge
discipline: Biochemical
tier: 1
cost: 5000
cost: 3500
recipeUnlocks:
- LargeBeaker
- Dropper
Expand All @@ -25,7 +25,7 @@
state: saw
discipline: Biochemical
tier: 1
cost: 2500 #this is useless so heavy decrease
cost: 1000 #this is useless so heavy decrease
recipeUnlocks:
- Scalpel
- Retractor
Expand All @@ -42,7 +42,7 @@
state: icon
discipline: Biochemical
tier: 1
cost: 7500
cost: 6000
recipeUnlocks:
- CryostasisBeaker
- StasisBedMachineCircuitboard
Expand All @@ -55,7 +55,7 @@
state: medical
discipline: Biochemical
tier: 1
cost: 7500
cost: 6000
recipeUnlocks:
- BorgModuleDiagnosis
- BorgModuleTreatment
Expand All @@ -69,7 +69,7 @@
state: icon
discipline: Biochemical
tier: 1
cost: 5000
cost: 3500
recipeUnlocks:
- VaccinatorMachineCircuitboard
- DiagnoserMachineCircuitboard
Expand All @@ -84,7 +84,7 @@
state: pod-on
discipline: Biochemical
tier: 2
cost: 7500
cost: 6000
recipeUnlocks:
- CryoPodMachineCircuitboard

Expand All @@ -96,7 +96,7 @@
state: industrial-working
discipline: Biochemical
tier: 2
cost: 10000
cost: 8500
recipeUnlocks:
- ChemMasterMachineCircuitboard
- ChemDispenserMachineCircuitboard
Expand All @@ -114,7 +114,7 @@
state: scanner
discipline: Biochemical
tier: 2
cost: 10000
cost: 8500
recipeUnlocks:
- HandheldCrewMonitor

Expand All @@ -128,7 +128,7 @@
state: beakerbluespace
discipline: Biochemical
tier: 3
cost: 10000
cost: 8500
recipeUnlocks:
- BluespaceBeaker
- SyringeBluespace
Expand All @@ -142,7 +142,7 @@
state: pod_0
discipline: Biochemical
tier: 3
cost: 15000
cost: 12000
recipeUnlocks:
- CloningPodMachineCircuitboard
- MedicalScannerMachineCircuitboard
Expand Down
26 changes: 13 additions & 13 deletions Resources/Prototypes/Research/civilianservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
state: mop
discipline: CivilianServices
tier: 1
cost: 5000
cost: 3500
recipeUnlocks:
- MopItem
- Holoprojector
Expand All @@ -24,7 +24,7 @@
state: icon
discipline: CivilianServices
tier: 1
cost: 5000
cost: 3500
recipeUnlocks:
- UniformPrinterMachineCircuitboard

Expand All @@ -36,7 +36,7 @@
state: seedextractor
discipline: CivilianServices
tier: 1
cost: 5000
cost: 3500
recipeUnlocks:
- BorgModuleGardening
- BorgModuleHarvesting
Expand All @@ -51,7 +51,7 @@
state: hamtr
discipline: CivilianServices
tier: 1
cost: 7500
cost: 3500
recipeUnlocks:
- HamtrHarness
- HamtrLArm
Expand All @@ -71,7 +71,7 @@
state: juicer1
discipline: CivilianServices
tier: 1
cost: 7500
cost: 6000
recipeUnlocks: #remove all of these once we have more kitchen equipment
- MicrowaveMachineCircuitboard
- ReagentGrinderMachineCircuitboard
Expand All @@ -87,7 +87,7 @@
state: cameracase
discipline: CivilianServices
tier: 1
cost: 5000
cost: 3500
recipeUnlocks:
- SurveillanceCameraRouterCircuitboard
- SurveillanceCameraWirelessRouterCircuitboard
Expand All @@ -105,7 +105,7 @@
state: television
discipline: CivilianServices
tier: 1
cost: 7500
cost: 6000
recipeUnlocks:
- ComputerTelevisionCircuitboard
- SynthesizerInstrument
Expand All @@ -125,7 +125,7 @@
state: janitor
discipline: CivilianServices
tier: 2
cost: 5000
cost: 3500
recipeUnlocks:
- BorgModuleLightReplacer
- BorgModuleCleaning
Expand All @@ -139,7 +139,7 @@
state: advmop
discipline: CivilianServices
tier: 2
cost: 10000
cost: 8500
recipeUnlocks:
- AdvMopItem
- MegaSprayBottle
Expand All @@ -154,7 +154,7 @@
state: display
discipline: CivilianServices
tier: 2
cost: 5000
cost: 3500
recipeUnlocks:
- FatExtractorMachineCircuitboard
- SheetifierMachineCircuitboard
Expand All @@ -167,7 +167,7 @@
state: honker
discipline: CivilianServices
tier: 2
cost: 7500
cost: 6000
recipeUnlocks:
- HonkerHarness
- HonkerLArm
Expand All @@ -187,7 +187,7 @@
state: icon
discipline: CivilianServices
tier: 2
cost: 10000
cost: 8500
recipeUnlocks:
- WeaponSprayNozzle
- ClothingBackpackWaterTank
Expand All @@ -202,6 +202,6 @@
state: display
discipline: CivilianServices
tier: 3
cost: 15000
cost: 12000
recipeUnlocks:
- CargoTelepadMachineCircuitboard
Loading
Loading