Skip to content

Commit

Permalink
Modified Science Experiments and 20in XRay Probe
Browse files Browse the repository at this point in the history
* Science Experiments (Geiger, IonMass, MM Detector) now have EntryCostModifiers
* The 20in Probe now costs 550 as it is the cost of the science experiements it contains plus 100 for the probe itself
* 20in Probe now has EntryCostModifiers for all of the science experiments it contains. If the science experiments are already unlocked, it will not cost against the cost of the probe
pap1723 committed Dec 29, 2018
1 parent d88a4cf commit 7e0b7a8
Showing 7 changed files with 43 additions and 32 deletions.
9 changes: 5 additions & 4 deletions GameData/RP-0/Tree/ECM-Parts.cfg
Original file line number Diff line number Diff line change
@@ -80,6 +80,7 @@
FASAMercuryAtlasEngBooster = LR43-NA-3
FASAMercuryAtlasVernierEngine = LR101-NA-3
FASAMercuryPodRCS = 1000, rcsMult
FASAProbeGeigerCounter = Geiger
FASAProbeParachute = 1
FASASolarMini = 100, solarInitial
FASAUmbilicalTower = 1
@@ -323,6 +324,7 @@
RO-DigitalCamera = 2500,RO-HighResFilmCamera
RO-E1 = E-1
RO-FluxgateMagnet = 5000,RO-HeliumMagnet
RO-GeigerMuller = Geiger
RO-H1-RS27 = H-1-SaturnI
RO-HG-3 = HG3
RO-HIRES = 2500,RO-AdvancedImager
@@ -332,11 +334,13 @@
RO-ImprovedFilmCamera = 2500, science_module
RO-ImprovedSIGINT = 480000,RO-EarlySIGINT
RO-ImprovedTVCamera = 2500,RO-BasicTVCamera
RO-IonMassSpectrometer = IonMass
RO-Kestrel = Kestrel
RO-LR-89 = LR43-NA-3
RO-M55 = M55
RO-MIMS = 2500,RO-IonMassSpectrometer
RO-MMRTG = 50000,RTGlevel6
RO-Micrometeorite = Micrometeorite
RO-NIMS = 2500,RO-UVSpectrometer
RO-PMIRR = 2500,RO-TwoChannelIR
RO-QuadropoleMassSpectrometer = 2500, RO-MIMS
@@ -384,7 +388,7 @@
RP0probeAvionics1-4m = 500, avionicsUpperBasic
RP0probeAvionics1-5m = 2000, avionicsUpperBasic, avionicsHibernation
RP0probeSounding0-3m = 1
RP0probeVanguardXray = 1000, avioincsProbesEarly
RP0probeVanguardXray = 1000, avioincsProbesEarly, Geiger, IonMass, Micrometeorite
RSB-PSLV-RCS = 1000, rcsMult
RSBclamp01 = 1
RSBclamp02 = 1
@@ -449,9 +453,6 @@
SSTU-AJ10-CustomAdvanced = AJ10-118F
SSTU-AJ10-CustomEarly = AJ10-37
SSTU-AJ10-CustomMid = AJ10-104
SSTU-D-Tank-II = Tanks-LevelII
SSTU-D-Tank-III = Tanks-LevelIII
SSTU-D-Tank-IV = Tanks-LevelIV
SSTU-SC-ENG-AJ10-137 = AJ10-137
SSTU-SC-ENG-AJ10-190 = AJ10-190
SSTU-SC-ENG-F1 = F-1
12 changes: 11 additions & 1 deletion GameData/RP-0/Tree/EntryCostModifiers.cfg
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ ENTRYCOSTMODS
SM-LevelIV = 20000, SM-LevelIII, Tanks-LevelIV

//**********************************************************************************
Solar panels
// Solar panels
//**********************************************************************************
solarInitial = 1500
solarLevel1 = 5000, solarInitial
@@ -175,6 +175,16 @@ ENTRYCOSTMODS
BipropRCS = 20000, NTOOxidizer, HydrazineFuel
MMHRCS = 5000, BipropRCS
//**********************************************************************************
// SCIENCE
// * Each Science Experiment will have a base value that will allow the probes
// with integrated experiments to be properly costed
//**********************************************************************************
Geiger = 1000
IonMass = 5000
Micrometeorite = 1000
//**********************************************************************************
// CAPSULES
// * Capsules are made up of the current level of CM, the previous level of CM
16 changes: 8 additions & 8 deletions GameData/RP-0/Tree/identicalParts.cfg
Original file line number Diff line number Diff line change
@@ -148,6 +148,8 @@
@PART[SSTU-SC-ENG-F1B]:FOR[xxxRP0] { %identicalParts = RSBengineF1B,SSTU-SC-ENG-F1B }
@PART[FASASolarMini]:FOR[xxxRP0] { %identicalParts = FASASolarMini,RO_EarlyTinySolarPanel }
@PART[RO_EarlyTinySolarPanel]:FOR[xxxRP0] { %identicalParts = FASASolarMini,RO_EarlyTinySolarPanel }
@PART[FASAProbeGeigerCounter]:FOR[xxxRP0] { %identicalParts = FASAProbeGeigerCounter,RO-GeigerMuller }
@PART[RO-GeigerMuller]:FOR[xxxRP0] { %identicalParts = FASAProbeGeigerCounter,RO-GeigerMuller }
@PART[bluedog_Delta_GEM40]:FOR[xxxRP0] { %identicalParts = KK_ATK_GEM40,KK_ATK_GEM40AL,RO_KWsrbGlobeI_GEM,RSBdelta2srm,bluedog_Delta_GEM40 }
@PART[KK_ATK_GEM40]:FOR[xxxRP0] { %identicalParts = KK_ATK_GEM40,KK_ATK_GEM40AL,RO_KWsrbGlobeI_GEM,RSBdelta2srm,bluedog_Delta_GEM40 }
@PART[KK_ATK_GEM40AL]:FOR[xxxRP0] { %identicalParts = KK_ATK_GEM40,KK_ATK_GEM40AL,RO_KWsrbGlobeI_GEM,RSBdelta2srm,bluedog_Delta_GEM40 }
@@ -234,6 +236,7 @@
@PART[xmonkeyreptarx]:FOR[xxxRP0] { %identicalParts = KK_SPX_Merlin1Ci,SSTU-SC-ENG-Merlin-1A,engineLargeSkipper_125m,xmonkeyreptarx }
@PART[SSTU-SC-ENG-Merlin-1BV]:FOR[xxxRP0] { %identicalParts = SSTU-SC-ENG-Merlin-1BV,xmonkeyreptarvacx }
@PART[xmonkeyreptarvacx]:FOR[xxxRP0] { %identicalParts = SSTU-SC-ENG-Merlin-1BV,xmonkeyreptarvacx }
@PART[RO-Micrometeorite]:FOR[xxxRP0] { %identicalParts = RO-Micrometeorite }
@PART[dockingPort2]:FOR[xxxRP0] { %identicalParts = SSTU-SC-GEN-DP-1P,dockingPort2,ndsport1,ndsport3,xndsport1x }
@PART[ndsport1]:FOR[xxxRP0] { %identicalParts = SSTU-SC-GEN-DP-1P,dockingPort2,ndsport1,ndsport3,xndsport1x }
@PART[ndsport3]:FOR[xxxRP0] { %identicalParts = SSTU-SC-GEN-DP-1P,dockingPort2,ndsport1,ndsport3,xndsport1x }
@@ -416,16 +419,13 @@
@PART[ca_landv_core]:FOR[xxxRP0] { %identicalParts = ca_landv_core }
@PART[RFTank-I]:FOR[xxxRP0] { %identicalParts = RFTank-I,SSTU-A-Tank-I }
@PART[SSTU-A-Tank-I]:FOR[xxxRP0] { %identicalParts = RFTank-I,SSTU-A-Tank-I }
@PART[RFTank-II]:FOR[xxxRP0] { %identicalParts = RFTank-II,SSTU-A-Tank-II,SSTU-D-Tank-II }
@PART[SSTU-A-Tank-II]:FOR[xxxRP0] { %identicalParts = RFTank-II,SSTU-A-Tank-II,SSTU-D-Tank-II }
@PART[SSTU-D-Tank-II]:FOR[xxxRP0] { %identicalParts = RFTank-II,SSTU-A-Tank-II,SSTU-D-Tank-II }
@PART[RFTank-III]:FOR[xxxRP0] { %identicalParts = RFTank-III,SSTU-A-Tank-III,SSTU-D-Tank-III }
@PART[SSTU-A-Tank-III]:FOR[xxxRP0] { %identicalParts = RFTank-III,SSTU-A-Tank-III,SSTU-D-Tank-III }
@PART[SSTU-D-Tank-III]:FOR[xxxRP0] { %identicalParts = RFTank-III,SSTU-A-Tank-III,SSTU-D-Tank-III }
@PART[RFTank-II]:FOR[xxxRP0] { %identicalParts = RFTank-II,SSTU-A-Tank-II }
@PART[SSTU-A-Tank-II]:FOR[xxxRP0] { %identicalParts = RFTank-II,SSTU-A-Tank-II }
@PART[RFTank-III]:FOR[xxxRP0] { %identicalParts = RFTank-III,SSTU-A-Tank-III }
@PART[SSTU-A-Tank-III]:FOR[xxxRP0] { %identicalParts = RFTank-III,SSTU-A-Tank-III }
@PART[RFTank-III-Balloon]:FOR[xxxRP0] { %identicalParts = RFTank-III-Balloon,SSTU-A-Tank-III-Balloon }
@PART[SSTU-A-Tank-III-Balloon]:FOR[xxxRP0] { %identicalParts = RFTank-III-Balloon,SSTU-A-Tank-III-Balloon }
@PART[SSTU-A-Tank-IV]:FOR[xxxRP0] { %identicalParts = SSTU-A-Tank-IV,SSTU-D-Tank-IV }
@PART[SSTU-D-Tank-IV]:FOR[xxxRP0] { %identicalParts = SSTU-A-Tank-IV,SSTU-D-Tank-IV }
@PART[SSTU-A-Tank-IV]:FOR[xxxRP0] { %identicalParts = SSTU-A-Tank-IV }
@PART[ca_landv_vernier]:FOR[xxxRP0] { %identicalParts = RO-SurveyorVernier,TD339,ca_landv_vernier,rn_surveyor_s_engine }
@PART[rn_surveyor_s_engine]:FOR[xxxRP0] { %identicalParts = RO-SurveyorVernier,TD339,ca_landv_vernier,rn_surveyor_s_engine }
@PART[RO-SurveyorVernier]:FOR[xxxRP0] { %identicalParts = RO-SurveyorVernier,TD339,ca_landv_vernier,rn_surveyor_s_engine }
8 changes: 4 additions & 4 deletions Source/Tech Tree/Parts Browser/data/FASA.json
Original file line number Diff line number Diff line change
@@ -4226,8 +4226,8 @@
"title": "Geiger Counter",
"description": "This Geiger counter measures gamma rays and stores that data for scientific study.",
"mod": "FASA",
"cost": "40",
"entry_cost": "800",
"cost": "100",
"entry_cost": "0",
"category": "SCIENCE",
"info": "Geiger",
"year": "1950",
@@ -4240,8 +4240,8 @@
"spacecraft": "",
"engine_config": "",
"upgrade": false,
"entry_cost_mods": "",
"identical_part_name": "",
"entry_cost_mods": "Geiger",
"identical_part_name": "Geiger",
"module_tags": [
"Instruments"
]
16 changes: 8 additions & 8 deletions Source/Tech Tree/Parts Browser/data/RP_0__Bluedog_Model.json
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@
"description": "The Geiger Counter is used for measuring ionizing radiation such as alpha particles, beta particles and gamma rays using the ionization effect created inside the tube.",
"mod": "RP-0 (Bluedog Model)",
"cost": "100",
"entry_cost": "2000",
"entry_cost": "0",
"category": "SCIENCE",
"info": "Cosmic Ray",
"year": "1955",
@@ -93,8 +93,8 @@
"spacecraft": "GEIGER-1/1",
"engine_config": "",
"upgrade": false,
"entry_cost_mods": "",
"identical_part_name": "",
"entry_cost_mods": "Geiger",
"identical_part_name": "Geiger",
"module_tags": [
"Instruments"
]
@@ -180,7 +180,7 @@
"description": "Commonly called Bennet Radio frequency mass spectrometers, they are only sensitive to charged atoms and molecules since they do not incorporate an ion source. Mass spectrometry is an analytical technique that ionizes chemical species and sorts the ions based on their mass-to-charge ratio. Historically, these simple experiments were flown on many Aerobee sounding rockets and return to Earth for study.\\nThe science cannot be transmitted and must be returned for further study. Level 1 Mass Spectrometry Experiment Device. Can gather 25% of Mass Spectrometry Science.",
"mod": "RP-0 (Bluedog Model)",
"cost": "250",
"entry_cost": "5000",
"entry_cost": "0",
"category": "SCIENCE",
"info": "Mass Spectrometry",
"year": "1950",
@@ -193,7 +193,7 @@
"spacecraft": "MS-1/4",
"engine_config": "",
"upgrade": false,
"entry_cost_mods": "",
"entry_cost_mods": "IonMass",
"identical_part_name": "",
"module_tags": [
"Instruments"
@@ -205,7 +205,7 @@
"description": "This device contains three plates for measuring the impacts of 'micrometeorites', the little pieces of debris and particles that travel through open vacuum at thousands of meters per second. Measuring the number of impacts gives us an idea of how dangerous an area of space may be for our ships.",
"mod": "RP-0 (Bluedog Model)",
"cost": "100",
"entry_cost": "2000",
"entry_cost": "0",
"category": "SCIENCE",
"info": "Micrometeorite Detection",
"year": "1958",
@@ -218,8 +218,8 @@
"spacecraft": "MM-1/1",
"engine_config": "",
"upgrade": false,
"entry_cost_mods": "",
"identical_part_name": "",
"entry_cost_mods": "Micrometeorite",
"identical_part_name": "Micrometeorite",
"module_tags": [
"Instruments"
]
6 changes: 3 additions & 3 deletions Source/Tech Tree/Parts Browser/data/SXT.json
Original file line number Diff line number Diff line change
@@ -416,8 +416,8 @@
"title": "20in X-Ray Detector",
"description": "A small (0.5m) satellite designed to study the variation in solar X-ray radiation.",
"mod": "SXT",
"cost": "160",
"entry_cost": "3200",
"cost": "550",
"entry_cost": "0",
"category": "AVIONICS",
"info": "Probe",
"year": "1956",
@@ -430,7 +430,7 @@
"spacecraft": "Vanguard 2",
"engine_config": "",
"upgrade": false,
"entry_cost_mods": "1000, avioincsProbesEarly",
"entry_cost_mods": "1000, avioincsProbesEarly, Geiger, IonMass, Micrometeorite",
"identical_part_name": "",
"module_tags": [
"Avionics",
8 changes: 4 additions & 4 deletions Source/Tech Tree/Parts Browser/data/Stock__RO_Config.json
Original file line number Diff line number Diff line change
@@ -1896,16 +1896,16 @@
"title": "Geiger-Muller Tube",
"description": "A Geiger-Muller tube for detecting radiation.",
"mod": "Stock (RO Config)",
"cost": "40",
"entry_cost": "800",
"cost": "100",
"entry_cost": "2000",
"category": "SCIENCE",
"info": "Geiger",
"year": "1950",
"technology": "earlyScience",
"era": "01-PW",
"ro": true,
"rp0": true,
"orphan": false,
"orphan": true,
"rp0_conf": true,
"spacecraft": "",
"engine_config": "",
@@ -1930,7 +1930,7 @@
"era": "01-PW",
"ro": true,
"rp0": true,
"orphan": false,
"orphan": true,
"rp0_conf": true,
"spacecraft": "",
"engine_config": "",

0 comments on commit 7e0b7a8

Please sign in to comment.