Skip to content

Commit

Permalink
Merge pull request #11 from JadeOfMaar/dev
Browse files Browse the repository at this point in the history
1.8.0 signoff
  • Loading branch information
JadeOfMaar authored Jul 25, 2020
2 parents 69b5825 + 0fa14a3 commit 89d2526
Show file tree
Hide file tree
Showing 37 changed files with 5,201 additions and 194 deletions.
64 changes: 0 additions & 64 deletions Extras/RR_TankswitchExtras.txt

This file was deleted.

20 changes: 10 additions & 10 deletions Extras/RR_TankswitchForSquad.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Change all stock tanks to hold fuel, without CryoTanks.
@PART[airplaneTail,airplaneTailB]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART[airplaneTail,airplaneTailB]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
MODULE
{
Expand All @@ -11,7 +11,7 @@
}
}

@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
Expand All @@ -26,7 +26,7 @@
baseVolume = #$../refVolume$
}
}
@PART:HAS[#manufacturer[Probodobodyne*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[#manufacturer[Probodobodyne*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
Expand All @@ -41,7 +41,7 @@
baseVolume = #$../refVolume$
}
}
@PART:HAS[#manufacturer[Rockomax*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[#manufacturer[Rockomax*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
Expand All @@ -56,7 +56,7 @@
baseVolume = #$../refVolume$
}
}
@PART:HAS[#manufacturer[Kerbodyne*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[#manufacturer[Kerbodyne*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
Expand All @@ -71,7 +71,7 @@
baseVolume = #$../refVolume$
}
}
@PART:HAS[#manufacturer[C7?Aero*],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[#manufacturer[C7?Aero*],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
!RESOURCE[MonoPropellant] {}
Expand All @@ -84,7 +84,7 @@
baseVolume = #$../refVolume$
}
}
@PART:HAS[#manufacturer[C7?Aero*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[#manufacturer[C7?Aero*],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer],!MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
!RESOURCE[LiquidFuel] {}
Expand All @@ -97,7 +97,7 @@
baseVolume = #$../refVolume$
}
}
@PART:HAS[#manufacturer[C7?Aero*],!MODULE[ModuleB9PartSwitch],@RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[#manufacturer[C7?Aero*],@RESOURCE[LiquidFuel],@RESOURCE[Oxidizer],!MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
Expand All @@ -112,7 +112,7 @@
baseVolume = #$../refVolume$
}
}
@PART:HAS[#manufacturer[WinterOwl*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[#manufacturer[WinterOwl*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
!RESOURCE[LiquidFuel] {}
Expand All @@ -127,7 +127,7 @@
}

// Add primary tank types to stock parts.
@PART:HAS[@MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers]:FOR[RationalResourcesSquad]
@PART:HAS[@MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
{
@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRStockSwitch]]
{
Expand Down
190 changes: 190 additions & 0 deletions Extras/RR_TankswitchFusionFuel.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
// Create your own extra tank combo configs in this manner:
// * Tank type def
// * Subtype to add without CryoTanks;
// * Subtype to add with CryoTanks

// These tank types taken from Far Future Technologies and partially used by Galaxies Unbound (planet pack)
B9_TANK_TYPE:NEEDS[!FarFutureTechnologies]
{
name = Deuterium
tankMass = 0.0
tankCost = 0

RESOURCE
{
name = LqdDeuterium
unitsPerVolume = 4
}

}
B9_TANK_TYPE:NEEDS[!FarFutureTechnologies]
{
name = He3
tankMass = 0.00
tankCost = 0

RESOURCE
{
name = LqdHe3
unitsPerVolume = 6
}
}
B9_TANK_TYPE:NEEDS[!FarFutureTechnologies]
{
name = DeuteriumHe3
tankMass = 0.0
tankCost = 0

RESOURCE
{
name = LqdDeuterium
unitsPerVolume = 2
}
RESOURCE
{
name = LqdHe3
unitsPerVolume = 3
}
}
B9_TANK_TYPE:NEEDS[!FarFutureTechnologies]
{
name = FissionPellets
tankMass = 0.0
tankCost = 0

RESOURCE
{
name = FissionPellets
unitsPerVolume = 1
}
}
B9_TANK_TYPE:NEEDS[!FarFutureTechnologies]
{
name = FusionPellets
tankMass = 0.0
tankCost = 0
RESOURCE
{
name = FusionPellets
unitsPerVolume = 5
}
}

// Add tank type to RR's cloned bread tanks
@PART[RRBreadTank*]:NEEDS[B9PartSwitch]:AFTER[RationalResourcesParts]
{
@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRSwitch]]
{
SUBTYPE
{
name = Deuterium
tankType = Deuterium
title = LqdDeuterium
primaryColor = PowderBlue
secondaryColor = PowderBlue
}
SUBTYPE
{
name = Helium3
tankType = He3
title = LqdHe3
primaryColor = CloudyBlue
secondaryColor = CloudyBlue
}
SUBTYPE
{
name = D/He3
tankType = DeuteriumHe3
title = LqdDeuterium + LqdHe3
primaryColor = PowderBlue
secondaryColor = CloudyBlue
}
}
}
// Add tank type to Squad parts without CryoTanks
@PART:HAS[@MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,!CryoTanks,!ConfigurableContainers/Parts]:AFTER[RationalResourcesSquad]
{
@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRStockSwitch]]
{
SUBTYPE
{
name = Deuterium
tankType = Deuterium
title = LqdDeuterium
primaryColor = PowderBlue
secondaryColor = PowderBlue
}
SUBTYPE
{
name = Helium3
tankType = He3
title = LqdHe3
primaryColor = CloudyBlue
secondaryColor = CloudyBlue
}
SUBTYPE
{
name = D/He3
tankType = DeuteriumHe3
title = LqdDeuterium + LqdHe3
primaryColor = PowderBlue
secondaryColor = CloudyBlue
}
}
}
// Add tank type to CryoTanks parts
@PART[hydrogen-*]:NEEDS[B9PartSwitch,CryoTanks,!ConfigurableContainers/Parts]:AFTER[zzz_CryoTanks]
{
@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[fuelSwitch]]
{
SUBTYPE
{
name = Deuterium
tankType = Deuterium
title = LqdDeuterium
primaryColor = PowderBlue
secondaryColor = PowderBlue
}
SUBTYPE
{
name = Helium3
tankType = He3
title = LqdHe3
primaryColor = CloudyBlue
secondaryColor = CloudyBlue
}
SUBTYPE
{
name = D/He3
tankType = DeuteriumHe3
title = LqdDeuterium + LqdHe3
primaryColor = PowderBlue
secondaryColor = CloudyBlue
}
}
}
// Color the tank options in FFT tanks
@PART[fusionfuel-*]:NEEDS[FarFutureTechnologies]
{
@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[fuelSwitch]]
{
@SUBTYPE[Deuterium]
{
primaryColor = PowderBlue
secondaryColor = PowderBlue
}
@SUBTYPE[Helium3]
{
primaryColor = CloudyBlue
secondaryColor = CloudyBlue
}
@SUBTYPE[D/He3]
{
primaryColor = PowderBlue
secondaryColor = CloudyBlue
}
}
}
47 changes: 47 additions & 0 deletions GameData/RationalResources/CCK/Categories.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
@CCKExtraFilterConfig
{
Item
{
name = Rational Resources
tag = cck-rr
normalIcon = RationalResources/CCK/RR_N
selectedIcon = RationalResources/CCK/RR_S
usedByMod = Rational Resources
}
}
@PART[OrbitalScanner]
{
@tags ^= :$: cck-rr:
}
@PART[airScoop]:NEEDS[RationalResourcesParts]
{
@tags ^= :$: cck-rr:
}
@PART[MiniISRU|ISRU|MiniDrill|RadialDrill|FuelCell|FuelCellArray]:NEEDS[RationalResourcesParts]
{
@tags ^= :$: cck-rr:
}
@PART:HAS[#manufacturer[Kenron]]:NEEDS[RationalResourcesParts]
{
@tags ^= :$: cck-rr:
}
@PART[SMX_*Generator|SMX_*AtmCondenser|SMX_*Drill|SMX_*Pump|SMX_*Ore?ank|SMX_*Driver|SMX_*ISRU*]:NEEDS[MiningExpansion]
{
@tags ^= :$: cck-rr:
}
@PART[hydrogen-*]:NEEDS[CryoTanks]
{
@tags ^= :$: cck-rr:
}
@PART[particle-scoop-01|imaging-spectrometer-01|atmosphere-scoop-01|antimatter-*|fusionfuel-*]:NEEDS[FarFutureTechnologies]
{
@tags ^= :$: cck-rr:
}
@PART[fusion-*-25-1|fusion-*-375-1|z-pinch-*|aim-375-1|am-beam-core-375-1|amcf-375-1|am-plasma-core-375-1]:NEEDS[FarFutureTechnologies]
{
@tags ^= :$: cck-rr:
}
@PART[wbiLasso*|wbiDrillingRig|wbiCastilloFactory|WBI_BuffaloISRU|WBI_BisonISRU]:NEEDS[Pathfinder]
{
@tags ^= :$: cck-rr:
}
Binary file added GameData/RationalResources/CCK/RR_N.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GameData/RationalResources/CCK/RR_S.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 89d2526

Please sign in to comment.