Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pehvbot/LRKerbalism
Browse files Browse the repository at this point in the history
  • Loading branch information
pehvbot committed Sep 11, 2022
2 parents c119e53 + 7c7b999 commit 66103cc
Show file tree
Hide file tree
Showing 15 changed files with 37 additions and 18 deletions.
Binary file modified GameData/KerbalismConfig/Parts/@thumbs/kerbalism-antenna_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions GameData/KerbalismConfig/Profiles/LRTRSimple.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ Profile
{
name = Pressure Control
desc = Use <b>Nitrogen</b> to maintain the internal atmosphere at a comfortable pressure.
tech = crewSurvivability
tech = survivability
mass = 0.01
cost = 250
Expand Down Expand Up @@ -653,7 +653,7 @@ Profile
{
name = Pressure Control
desc = Use <b>Nitrogen</b> to maintain the internal atmosphere at a comfortable pressure.
tech = crewSurvivability
tech = survivability
mass = 0.01
cost = 250
Expand Down Expand Up @@ -924,7 +924,7 @@ Profile
{
name = Xenon Gas // Stored at 180 bar (2646psi) when full
desc = Store pressurized <b>Xenon</b> gas @ 180 bar.
tech = earlyElecPropulsion
tech = ionPropulsion
RESOURCE
{
Expand Down
6 changes: 3 additions & 3 deletions GameData/KerbalismConfig/Profiles/LRTRStock.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ Profile
{
name = Pressure Control
desc = Use <b>Nitrogen</b> to maintain the internal atmosphere at a comfortable pressure.
tech = crewSurvivability
tech = survivability
mass = 0.01
cost = 250
Expand Down Expand Up @@ -780,7 +780,7 @@ Profile
{
name = Pressure Control
desc = Use <b>Nitrogen</b> to maintain the internal atmosphere at a comfortable pressure.
tech = crewSurvivability
tech = survivability
mass = 0.01
cost = 250
Expand Down Expand Up @@ -1076,7 +1076,7 @@ Profile
{
name = Xenon Gas // Stored at 180 bar (2646psi) when full
desc = Store pressurized <b>Xenon</b> gas @ 180 bar.
tech = earlyElecPropulsion
tech = ionPropulsion
RESOURCE
{
Expand Down
4 changes: 2 additions & 2 deletions GameData/KerbalismConfig/Settings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Kerbalism
// lrtrSimple should be used with SimpleISRU enabled in LRTR/config.cfg

// user-defined features
Reliability = false // component malfunctions and critical failures, missing configs and so disabled
Reliability = true // component malfunctions and critical failures, missing configs and so disabled
Deploy = true // add EC cost to keep module working, add EC cost to Extend\Retract (Deploy.cfg has the modules supported list)
Science = true // science data storage, transmission and analysis
SpaceWeather = true // coronal mass ejections
Expand Down Expand Up @@ -60,7 +60,7 @@ Kerbalism
ComfortLivingSpace = 20 // ideal living space in m^3 for 1 kerbal

// misc
EnforceCoherency = true // detect and avoid issues at high timewarp in external modules
EnforceCoherency = false // detect and avoid issues at high timewarp in external modules
TrackingPivot = true // simulate tracking solar panel around the pivot
HeadLampsCost = 0.01 // EC/s cost if eva headlamps are on (10 W, assuming LEDs)
LowQualityRendering = false // use less particles to render the magnetic fields
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ KERBALISM_CREW_EXPERIMENTS {}
ECCost = 0
SampleMass = 0.002
size = 0.02
value = 15000 // 15 science
value = 15
duration = 1440 //24 minutes, requires 3 flights
requirements = CrewMin:1,SurfaceSpeedMin:300,AltitudeMin:5000
ResourceRates =
Expand All @@ -24,7 +24,7 @@ KERBALISM_CREW_EXPERIMENTS {}
ECCost = 0
SampleMass = 0.002
size = 0.02
value = 20000 // 20 science
value = 20
duration = 2160 //36 minutes, requires 3 flights
requirements = CrewMin:1,SurfaceSpeedMin:600,AltitudeMin:10000
ResourceRates =
Expand All @@ -35,7 +35,7 @@ KERBALISM_CREW_EXPERIMENTS {}
ECCost = 0
SampleMass = 0.002
size = 0.02
value = 20 // 20 science
value = 20
duration = 1440 //24 minutes, requires 3 flights
requirements = CrewMin:1,SurfaceSpeedMin:650
ResourceRates =
Expand Down Expand Up @@ -330,3 +330,15 @@ KERBALISM_CREW_EXPERIMENTS {}
}

}

@KERBALISM_CREW_EXPERIMENTS:NEEDS[RealSolarSystem]
{
@RP0-SupersonicLow1
{
@value *= 1000
}
@RP0-SupersonicLow2
{
@value *= 1000
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
name = Orbital Maneuvering
desc = It will be necessary for our future spacecraft to be able to change their oribts in order to rendezvous and dock. This experiment will test the Orbital Maneuvering system to better understand what is required and possible.
mass = 0
tech = secondGenCapsules
tech = advFlightControl

MODULE
{
Expand Down Expand Up @@ -580,7 +580,7 @@
name = Simple Navigation
desc = Study the capability of crew to provide a reliable method of navigation without input from the ground utilizing a space stedimeter and a sextant.
mass = 0.005
tech = secondGenCapsules
tech = advFlightControl
MODULE
{
Expand All @@ -594,7 +594,7 @@
name = Zodiacal Light Photography
desc = To obtain photographs of zodiacal light, airglow layer, and other dim light phenomena, including day sky brightness from orbital altitude.
mass = 0.008
tech = secondGenCapsules
tech = advFlightControl
MODULE
{
Expand Down
11 changes: 9 additions & 2 deletions GameData/KerbalismConfig/System/Science/HardDriveConfigs.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,14 @@ KERBALISM_HDD_SIZES
}
}

@PART[ScienceBox,kerbalEVA*]:NEEDS[FeatureScience,LRTRScience]:FOR[LRTR-Kerbalism]
@PART[ScienceBox]:NEEDS[FeatureScience,LRTRScience]:FOR[LRTR-Kerbalism]
{
MODULE
{
name = HardDrive
}
}
@PART[kerbalEVA*]:HAS[@MODULE[KerbalEVA]]:NEEDS[FeatureScience,LRTRScience]:FOR[LRTR-Kerbalism]
{
MODULE
{
Expand Down Expand Up @@ -406,7 +413,7 @@ KERBALISM_HDD_SIZES
// samples. So no matter how much they get here, it won't be OP
// c) you can't use EVAs to store data for very long, after 8h they're dead
// ============================================================================
@PART[kerbalEVA*]:NEEDS[FeatureScience,LRTRScience]:AFTER[LRTR-Kerbalism]
@PART[kerbalEVA*]:HAS[@MODULE[KerbalEVA]]:NEEDS[FeatureScience,LRTRScience]:AFTER[LRTR-Kerbalism]
{
@MODULE[HardDrive]
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ KERBALISM_EXPERIMENT_VALUES {}
}
surfaceSample
{
ECCost = 0.02 //EC consumption from sample scooping
ECCost = 0.01 //EC consumption from sample scooping
SampleMass = 0.00008 // 80g
size = 0.1
value = 6
Expand All @@ -253,7 +253,7 @@ KERBALISM_EXPERIMENT_VALUES {}
}
surfaceSample3 // actual rock selection and drilling for subsurface samples
{
ECCost = 0.05 // let's say an avg of 50W for intermittent drilling operations
ECCost = 0.005 // let's say an avg of 50W for intermittent drilling operations
SampleMass = 0.03
size = 50
value = 15
Expand Down

0 comments on commit 66103cc

Please sign in to comment.