Skip to content

Commit

Permalink
- more resource compatibility (Enriched/Delpleted Uranium)
Browse files Browse the repository at this point in the history
  • Loading branch information
confusingbits committed Aug 16, 2014
1 parent 5220eca commit d1b5600
Show file tree
Hide file tree
Showing 63 changed files with 2,206 additions and 216 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,18 +1,18 @@
@ATMOSPHERIC_RESOURCE_DEFINITION[EveArgon]
{
resourceName = Argon
resourceName = ArgonGas
}
@ATMOSPHERIC_RESOURCE_DEFINITION[KerbinArgon]
{
resourceName = Argon
resourceName = ArgonGas
}
@ATMOSPHERIC_RESOURCE_DEFINITION[KerbinMethane]
{
resourceName = LqdMethane
}
@ATMOSPHERIC_RESOURCE_DEFINITION[DunaArgon]
{
resourceName = Argon
resourceName = ArgonGas
}
@ATMOSPHERIC_RESOURCE_DEFINITION[JoolMethane]
{
Expand All @@ -32,5 +32,5 @@
}
@ATMOSPHERIC_RESOURCE_DEFINITION[LaytheArgon]
{
resourceName = Argon
resourceName = ArgonGas
}
Expand Up @@ -6,9 +6,9 @@
{
resourceName = Lithium
}
@OCEANIC_RESOURCE_DEFINITION[EveUF4]
@OCEANIC_RESOURCE_DEFINITION[EveEnrichedUranium]
{
resourceName = UF4
resourceName = EnrichedUranium
}
@OCEANIC_RESOURCE_DEFINITION[KerbinWater]
{
Expand All @@ -18,9 +18,9 @@
{
resourceName = Lithium
}
@OCEANIC_RESOURCE_DEFINITION[KerbinUF4]
@OCEANIC_RESOURCE_DEFINITION[KerbinEnrichedUranium]
{
resourceName = UF4
resourceName = EnrichedUranium
}
@OCEANIC_RESOURCE_DEFINITION[LaytheWater]
{
Expand All @@ -34,7 +34,7 @@
{
resourceName = Lithium
}
@OCEANIC_RESOURCE_DEFINITION[LaytheUF4]
@OCEANIC_RESOURCE_DEFINITION[LaytheEnrichedUranium]
{
resourceName = UF4
resourceName = EnrichedUranium
}
@@ -0,0 +1,257 @@
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Moho
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/moho_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 3
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Eve
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/eve_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 2.5
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Gilly
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/gilly_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 2.5
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Kerbin
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/kerbin_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 2
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Mun
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/mun_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 2
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Alumina
celestialBodyName = Mun
resourceName = Alumina
mapUrl = CommunityResourcePack/Interstellar/mun_alumina
resourceScale = LINEAR_SCALE
scaleMultiplier = 1
displayTexture = CommunityResourcePack/Interstellar/alumina_resource_point
displayThreshold = 1
}
PLANETARY_RESOURCE_DEFINITION
{
name = Water
celestialBodyName = Mun
resourceName = Water
mapUrl = CommunityResourcePack/Interstellar/mun_water
resourceScale = LINEAR_SCALE
scaleMultiplier = 1
displayTexture = CommunityResourcePack/Interstellar/water_resource_point
displayThreshold = 1
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Minmus
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/minmus_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 2
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Water
celestialBodyName = Minmus
resourceName = Water
mapUrl = CommunityResourcePack/Interstellar/minmus_water
resourceScale = LINEAR_SCALE
scaleMultiplier = 1
displayTexture = CommunityResourcePack/Interstellar/water_resource_point
displayThreshold = 1
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Duna
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/duna_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 1.8
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Water
celestialBodyName = Duna
resourceName = Water
mapUrl = CommunityResourcePack/Interstellar/duna_water
resourceScale = LINEAR_SCALE
scaleMultiplier = 1
displayTexture = CommunityResourcePack/Interstellar/water_resource_point
displayThreshold = 1
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Ike
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/ike_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 1.9
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Alumina
celestialBodyName = Ike
resourceName = Alumina
mapUrl = CommunityResourcePack/Interstellar/ike_alumina
resourceScale = LINEAR_SCALE
scaleMultiplier = 1
displayTexture = CommunityResourcePack/Interstellar/alumina_resource_point
displayThreshold = 1
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Dres
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/dres_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 3
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Laythe
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/laythe_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 1.5
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Vall
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/vall_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 0.001
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Water
celestialBodyName = Vall
resourceName = Water
mapUrl = CommunityResourcePack/Interstellar/vall_water
resourceScale = LINEAR_SCALE
scaleMultiplier = 1
displayTexture = CommunityResourcePack/Interstellar/water_resource_point
displayThreshold = 2
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Tylo
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/tylo_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 1.8
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Alumina
celestialBodyName = Tylo
resourceName = Alumina
mapUrl = CommunityResourcePack/Interstellar/tylo_alumina
resourceScale = LINEAR_SCALE
scaleMultiplier = 1
displayTexture = CommunityResourcePack/Interstellar/alumina_resource_point
displayThreshold = 1
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Bop
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/bop_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 3
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Pol
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/pol_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 3
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
PLANETARY_RESOURCE_DEFINITION
{
name = Uranium
celestialBodyName = Eeloo
resourceName = EnrichedUranium
mapUrl = CommunityResourcePack/Interstellar/eeloo_uranium
resourceScale = LOG_SCALE
scaleFactor = 1.0311580936394657748190008944693
scaleMultiplier = 0.0006
displayTexture = CommunityResourcePack/Interstellar/uranium_resource_point
displayThreshold = 0.001
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions GameData/Interstellar/ElectricEnginePropellants.cfg
Expand Up @@ -15,14 +15,14 @@ BASIC_ELECTRIC_PROPELLANT
}
BASIC_ELECTRIC_PROPELLANT
{
name = Argon
name = ArgonGas
guiName = Argon
ispMultiplier = 0.22222
efficiency = 0.76
electroThermal = True
PROPELLANT
{
name = Argon
name = ArgonGas
ratio = 1
DrawGauge = True
}
Expand Down

3 comments on commit d1b5600

@GitHawk
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why you change Argon to ArgonGas.

Also a thing that I noticed while trying to balance stuff with tweakscale.
If you use a thrust scaling power of 2 and and mass scaling power of 3, making a small engine big gives it worse TWR, while a big engine resized to small becomes overpowered!
Example:
Ion Engine 62.5cm base
0.25t, 2kN => TWR 8
Ion Engine 3.75m
54t, 72kN => TWR 1.333

S3 KS-24x4 3.75m base
9.75t, 3200kN => TWR 328
S3 KS-24x4 62.5cm
0.045t, 89kN => TWR 1977

Notice the weight difference at 3.75m. With a scaling power of 2, the weight of the Ion Engine at 3.75m would be 9t, quite close to the S3. Also the S3 would weigh 0.271t at 62.5cm.

The KSPI parts suffer from a similar problem, since they are by default 2.5m. If you want to increase the output of the bigger parts, you nerf the small ones and vice versa. It becomes clear after plotting the variables on a log-log plot.

@confusingbits
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The resource changes are for compatibility. KSPI doesn't need Argon or ArgonGas, but it could use more compatibility. These resource changes came about as a result of discussion with other developers.

I haven't touched scaling for stock parts. And I don't intend to.

@GitHawk
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, but starting to add states of matter to some resources isn't going to help. That's why I removed them from my branch, so no more LqdMethane or LdqHelium, just Methane and Helium.

The scaling was just as an introduction, since it will affect KSPI.

Please sign in to comment.