diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Parts/Electrical/SAFER/SAFER.cfg b/GameData/WildBlueIndustries/000WildBlueTools/Parts/Electrical/SAFER/SAFER.cfg index 4f8bdce..39b0740 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/Parts/Electrical/SAFER/SAFER.cfg +++ b/GameData/WildBlueIndustries/000WildBlueTools/Parts/Electrical/SAFER/SAFER.cfg @@ -71,7 +71,7 @@ attachRules = 1,1,1,0,1 MODULE { name = ModuleActiveRadiator - maxEnergyTransfer = 2500 + maxEnergyTransfer = 3500 overcoolFactor = 0.25 isCoreRadiator = true parentCoolingOnly = true diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Readme.txt b/GameData/WildBlueIndustries/000WildBlueTools/Readme.txt index 74915ed..653c2ae 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/Readme.txt +++ b/GameData/WildBlueIndustries/000WildBlueTools/Readme.txt @@ -6,6 +6,14 @@ A KSP mod that provides common functionality for mods by Wild Blue Industries. Copy the contents of the mod's GameData directory into your GameData folder. +1.40 +- Streamlined the WBIModuleResourceConverter +- WBIProspector now supports one or more harvest types. +- WBIProspector can now prospect resources from the atmosphere, exosphere, ocean, and planet. + +1.31.2 +- Bug Fixes + 1.39.1 - Cruise Control fix for single-mode engines. They still need ModuleEnginesFX though. - Fix for deprecated parts. diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Minerite.txt b/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Minerite.txt index d66c7b5..2018c13 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Minerite.txt +++ b/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Minerite.txt @@ -87,4 +87,100 @@ PLANETARY_RESOURCE Variance = 0 Dispersal = 0 } +} + +//Exospheric +PLANETARY_RESOURCE +{ + ResourceName = Minerite + ResourceType = 3 + PlanetName = Kerbin + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = 0.234 //Should begin right at edge of atmo + MaxAltitude = 0.234 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Minerite + ResourceType = 3 + PlanetName = Laythe + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = .2 //Should begin right at edge of atmo + MaxAltitude = .2 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Minerite + ResourceType = 3 + PlanetName = Eve + + Distribution + { + PresenceChance = 100 + MinAbundance = .1 + MaxAbundance = .5 + Variance = 0 + MinAltitude = .257 //Should begin right at edge of atmo + MaxAltitude = .257 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Minerite + ResourceType = 3 + PlanetName = Duna + + Distribution + { + PresenceChance = 100 + MinAbundance = .001 + MaxAbundance = .05 + Variance = 0 + MinAltitude = .001 //Should begin right at edge of atmo + MaxAltitude = .001 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Minerite + ResourceType = 3 + PlanetName = Jool + + Distribution + { + PresenceChance = 100 + MinAbundance = .1 + MaxAbundance = .5 + Variance = 0 + MinAltitude = 0.0665 //Should begin right at edge of atmo + MaxAltitude = 0.0665 + MinRange = 1 + MaxRange = 1 + } } \ No newline at end of file diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Nitronite.txt b/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Nitronite.txt index a524151..c7a7d5d 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Nitronite.txt +++ b/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Nitronite.txt @@ -86,4 +86,100 @@ PLANETARY_RESOURCE Variance = 0 Dispersal = 0 } +} + +//Exospheric +PLANETARY_RESOURCE +{ + ResourceName = Nitronite + ResourceType = 3 + PlanetName = Kerbin + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = 0.234 //Should begin right at edge of atmo + MaxAltitude = 0.234 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Nitronite + ResourceType = 3 + PlanetName = Laythe + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = .2 //Should begin right at edge of atmo + MaxAltitude = .2 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Nitronite + ResourceType = 3 + PlanetName = Eve + + Distribution + { + PresenceChance = 100 + MinAbundance = .1 + MaxAbundance = .5 + Variance = 0 + MinAltitude = .257 //Should begin right at edge of atmo + MaxAltitude = .257 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Nitronite + ResourceType = 3 + PlanetName = Duna + + Distribution + { + PresenceChance = 100 + MinAbundance = .001 + MaxAbundance = .05 + Variance = 0 + MinAltitude = .001 //Should begin right at edge of atmo + MaxAltitude = .001 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Nitronite + ResourceType = 3 + PlanetName = Jool + + Distribution + { + PresenceChance = 100 + MinAbundance = .1 + MaxAbundance = .5 + Variance = 0 + MinAltitude = 0.0665 //Should begin right at edge of atmo + MaxAltitude = 0.0665 + MinRange = 1 + MaxRange = 1 + } } \ No newline at end of file diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Snacks.txt b/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Snacks.txt new file mode 100644 index 0000000..a389c1c --- /dev/null +++ b/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Snacks.txt @@ -0,0 +1,45 @@ +STORAGE_TEMPLATE:NEEDS[SnacksUtils] +{ + author = Angel-125 + name = Snacks Greenhouse + shortName = Snacks + logoPanel = WildBlueIndustries/000WildBlueTools/Decals/LifeSupport + glowPanel = WildBlueIndustries/000WildBlueTools/Decals/LifeSupportGlow + description = This kit stores resources needed for a Snacks greenhouse. + templateTags = stowage + + RESOURCE + { + name = Soil + amount = 1120 + maxAmount = 1120 + } + + RESOURCE + { + name = Water + amount = 1120 + maxAmount = 1120 + } + + RESOURCE + { + name = Compost + amount = 1120 + maxAmount = 1120 + } + + RESOURCE + { + name = Minerite + amount = 1120 + maxAmount = 1120 + } + + RESOURCE + { + name = Snacks + amount = 1120 + maxAmount = 1120 + } +} \ No newline at end of file diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Lead.cfg b/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Lead.cfg index aeed725..e88a14d 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Lead.cfg +++ b/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Lead.cfg @@ -3,7 +3,7 @@ RESOURCE_DEFINITION:NEEDS[!CommunityResourcePack] name = Lead displayName = Lead density = 0.01134 - unitCost = 0.067392 + unitCost = 0.0 hsp = 128 flowMode = ALL_VESSEL transfer = PUMP diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Propellium.txt b/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Propellium.cfg similarity index 68% rename from GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Propellium.txt rename to GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Propellium.cfg index 6fcb0bd..bdcf97d 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/Templates/ClassicStock/Storage/Propellium.txt +++ b/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Propellium.cfg @@ -27,4 +27,22 @@ STORAGE_TEMPLATE maxAmount = 5600 } +} + +GLOBAL_RESOURCE +{ + ResourceName = Propellium + ResourceType = 3 + + Distribution + { + PresenceChance = 100 + MinAbundance = .00000001 + MaxAbundance = .00000005 + MinAltitude = 500 + MaxAltitude = 200000000000 + MinRange = .01 + MaxRange = .5 + Variance = 20 + } } \ No newline at end of file diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Water.cfg b/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Water.cfg index 2184e51..a8b7874 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Water.cfg +++ b/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/Storage/Water.cfg @@ -30,4 +30,117 @@ STORAGE_TEMPLATE maxAmount = 5600 } +} + +GLOBAL_RESOURCE:NEEDS[!CommunityResourcePack] +{ + ResourceName = Water + ResourceType = 3 + + Distribution + { + PresenceChance = 20 + MinAbundance = .001 + MaxAbundance = .5 + MinAltitude = .2 + MaxAltitude = 2 + MinRange = .01 + MaxRange = .5 + } +} + +//Exospheric +PLANETARY_RESOURCE +{ + ResourceName = Water + ResourceType = 3 + PlanetName = Kerbin + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = 0.234 //Should begin right at edge of atmo + MaxAltitude = 0.234 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Water + ResourceType = 3 + PlanetName = Laythe + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = .2 //Should begin right at edge of atmo + MaxAltitude = .2 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Water + ResourceType = 3 + PlanetName = Eve + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = .257 //Should begin right at edge of atmo + MaxAltitude = .257 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Water + ResourceType = 3 + PlanetName = Duna + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = .001 //Should begin right at edge of atmo + MaxAltitude = .001 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Water + ResourceType = 3 + PlanetName = Jool + + Distribution + { + PresenceChance = 100 + MinAbundance = .01 + MaxAbundance = .5 + Variance = 0 + MinAltitude = 0.0665 //Should begin right at edge of atmo + MaxAltitude = 0.0665 + MinRange = 1 + MaxRange = 1 + } } \ No newline at end of file diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/WBIResources.cfg b/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/WBIResources.cfg index faca9c1..19e9686 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/WBIResources.cfg +++ b/GameData/WildBlueIndustries/000WildBlueTools/Templates/Common/WBIResources.cfg @@ -10,10 +10,11 @@ RESOURCE_DEFINITION:NEEDS[!CommunityResourcePack] volume = 1 } -RESOURCE_DEFINITION:NEEDS[!CommunityResourcePack] +//Produced in fusion reactors +RESOURCE_DEFINITION { - name = ChargedParticles - displayName = ChargedParticles + name = ElectroPlasma + displayName = ElectroPlasma density = 0 flowMode = ALL_VESSEL transfer = NONE @@ -170,6 +171,36 @@ RESOURCE_DEFINITION isVisible = true } +RESOURCE_DEFINITION:NEEDS[!CommunityResourcePack] +{ + name = IntakeLqd + density = 0.001 + hsp = 4183 + flowMode = ALL_VESSEL + transfer = PUMP + isTweakable = false + isVisible = false + unitCost = 0.0008 + color = .5,.5,1 + volume = 1 +} + +//Resource concentrations +GLOBAL_RESOURCE:NEEDS[!CommunityResourcePack] +{ + ResourceName = IntakeLqd + ResourceType = 1 + + Distribution + { + PresenceChance = 100 + MinAbundance = 100 + MaxAbundance = 100 + Variance = 20 + Dispersal = 3 + } +} + PLANETARY_RESOURCE { ResourceName = Atmosphere @@ -228,4 +259,100 @@ PLANETARY_RESOURCE MaxAbundance = 30 Variance = 0 } +} + +//Exospheric +PLANETARY_RESOURCE +{ + ResourceName = Atmosphere + ResourceType = 3 + PlanetName = Kerbin + + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 5 + Variance = 0 + MinAltitude = 0.234 //Should begin right at edge of atmo + MaxAltitude = 0.234 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Atmosphere + ResourceType = 3 + PlanetName = Laythe + + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 5 + Variance = 0 + MinAltitude = .2 //Should begin right at edge of atmo + MaxAltitude = .2 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Atmosphere + ResourceType = 3 + PlanetName = Eve + + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 5 + Variance = 0 + MinAltitude = .257 //Should begin right at edge of atmo + MaxAltitude = .257 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Atmosphere + ResourceType = 3 + PlanetName = Duna + + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 5 + Variance = 0 + MinAltitude = .001 //Should begin right at edge of atmo + MaxAltitude = .001 + MinRange = 1 + MaxRange = 1 + } +} + +PLANETARY_RESOURCE +{ + ResourceName = Atmosphere + ResourceType = 3 + PlanetName = Jool + + Distribution + { + PresenceChance = 100 + MinAbundance = 1 + MaxAbundance = 5 + Variance = 0 + MinAltitude = 0.0665 //Should begin right at edge of atmo + MaxAltitude = 0.0665 + MinRange = 1 + MaxRange = 1 + } } \ No newline at end of file diff --git a/GameData/WildBlueIndustries/000WildBlueTools/WildBlueTools.version b/GameData/WildBlueIndustries/000WildBlueTools/WildBlueTools.version index 33b32e2..c3531eb 100644 --- a/GameData/WildBlueIndustries/000WildBlueTools/WildBlueTools.version +++ b/GameData/WildBlueIndustries/000WildBlueTools/WildBlueTools.version @@ -11,8 +11,8 @@ "VERSION": { "MAJOR":1, - "MINOR":39, - "PATCH":1 + "MINOR":40, + "PATCH":0 }, "KSP_VERSION": { diff --git a/GameData/WildBlueIndustries/Buffalo/Buffalo.version b/GameData/WildBlueIndustries/Buffalo/Buffalo.version index 3953b6d..2cc023e 100644 --- a/GameData/WildBlueIndustries/Buffalo/Buffalo.version +++ b/GameData/WildBlueIndustries/Buffalo/Buffalo.version @@ -12,7 +12,7 @@ { "MAJOR":2, "MINOR":3, - "PATCH":3 + "PATCH":4 }, "KSP_VERSION": { diff --git a/GameData/WildBlueIndustries/Buffalo/Parts/JetWing/Jetwing.cfg b/GameData/WildBlueIndustries/Buffalo/Parts/JetWing/Jetwing.cfg index f8ec8ba..fa14008 100644 --- a/GameData/WildBlueIndustries/Buffalo/Parts/JetWing/Jetwing.cfg +++ b/GameData/WildBlueIndustries/Buffalo/Parts/JetWing/Jetwing.cfg @@ -78,7 +78,7 @@ PART engineSpoolIdle = 0.05 engineSpoolTime = 2.0 EngineType = Turbine - exhaustDamageMultiplier = 24 + exhaustDamageMultiplier = 5 PROPELLANT { name = MonoPropellant diff --git a/GameData/WildBlueIndustries/Buffalo/Readme.txt b/GameData/WildBlueIndustries/Buffalo/Readme.txt index ee24408..001b25a 100644 --- a/GameData/WildBlueIndustries/Buffalo/Readme.txt +++ b/GameData/WildBlueIndustries/Buffalo/Readme.txt @@ -32,6 +32,9 @@ If these directories already exist, then delete the existing ones before install ---REVISION HISTORY--- +2.3.4 +- WBI update + 2.3.3 - WBT update - Module Manager update diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/AeroScoop.png b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/AeroScoop.png index b8d082e..b21ae18 100644 Binary files a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/AeroScoop.png and b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/AeroScoop.png differ diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize0.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize0.cfg index 789f768..fae8cf1 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize0.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize0.cfg @@ -43,48 +43,81 @@ PART intakeTransformName = Intake } + MODULE + { + name = ModuleResourceHarvester + HarvesterType = 2 //Atmospheric + AutoShutdown = true + ResourceName = Atmosphere + ConverterName = Atmosphere Scoop + StartActionName = Open Atmosphere Scoop + StopActionName = Close Atmosphere Scoop + ToggleActionName = Toggle Atmosphere Scoop + intakeTransformName = Intake + intakeSpeed = 10 + airStaticSpeed = 10 + AlwaysActive = true + } + MODULE { name = ModuleResourceIntake - resourceName = Atmosphere + resourceName = IntakeLqd checkForOxygen = false area = 0.001 intakeSpeed = 10 + underwaterOnly = true intakeTransformName = Intake } -//Resource types: -// 0 = Crustal (Stuff you dig up) -// 1 = Oceanic (Stuff in the oceans) -// 2 = Atmospheric (Stuff in the air, varies with pressure) -// 3 = Interplanetary (Stuff you find between planets) MODULE { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName:NEEDS[!FarFutureTechnologies] = Explodium - ResourceName:NEEDS[FarFutureTechnologies] = NuclearSaltWater - ConverterName = Explodium Filter - StartActionName = Start Explodium Filter - StopActionName = Stop Explodium Filter - ToggleActionName = Start/Stop Explodium Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 + name = WBIProspector + ConverterName = Atmosphere Processor + StartActionName = Start Atmosphere Processor + StopActionName = Stop Atmosphere Processor + AutoShutdown = false + GeneratesHeat = false + guiVisible = true + harvestTypes = Atmospheric + outputsGuiName = Show Processor Outputs + + INPUT_RESOURCE + { + ResourceName = Atmosphere + Ratio = 0.1 + } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 0.75 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill + Ratio = 5 + } + } + + MODULE + { + name = WBIProspector + ConverterName = Liquid Distiller + StartActionName = Start Liquid Distiller + StopActionName = Stop Liquid Distiller + AutoShutdown = false + GeneratesHeat = false + guiVisible = true + harvestTypes = Oceanic + outputsGuiName = Show Distiller Outputs + + INPUT_RESOURCE + { + ResourceName = IntakeLqd + Ratio = 0.1 + } + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 5 + } } MODULE @@ -268,4 +301,11 @@ PART amount = 1 maxAmount = 1 } + + RESOURCE + { + name = IntakeLqd + amount = 1 + maxAmount = 1 + } } diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize1.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize1.cfg index 2a2e298..481ac9e 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize1.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize1.cfg @@ -43,48 +43,81 @@ PART intakeTransformName = Intake } + MODULE + { + name = ModuleResourceHarvester + HarvesterType = 2 //Atmospheric + AutoShutdown = true + ResourceName = Atmosphere + ConverterName = Atmosphere Scoop + StartActionName = Open Atmosphere Scoop + StopActionName = Close Atmosphere Scoop + ToggleActionName = Toggle Atmosphere Scoop + intakeTransformName = Intake + intakeSpeed = 10 + airStaticSpeed = 10 + AlwaysActive = true + } + MODULE { name = ModuleResourceIntake - resourceName = Atmosphere + resourceName = IntakeLqd checkForOxygen = false area = 0.0075 intakeSpeed = 10 + underwaterOnly = true intakeTransformName = Intake } -//Resource types: -// 0 = Crustal (Stuff you dig up) -// 1 = Oceanic (Stuff in the oceans) -// 2 = Atmospheric (Stuff in the air, varies with pressure) -// 3 = Interplanetary (Stuff you find between planets) MODULE { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName:NEEDS[!FarFutureTechnologies] = Explodium - ResourceName:NEEDS[FarFutureTechnologies] = NuclearSaltWater - ConverterName = Explodium Filter - StartActionName = Start Explodium Filter - StopActionName = Stop Explodium Filter - ToggleActionName = Start/Stop Explodium Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 + name = WBIProspector + ConverterName = Atmosphere Processor + StartActionName = Start Atmosphere Processor + StopActionName = Stop Atmosphere Processor + AutoShutdown = false + GeneratesHeat = false + guiVisible = true + harvestTypes = Atmospheric + outputsGuiName = Show Processor Outputs + + INPUT_RESOURCE + { + ResourceName = Atmosphere + Ratio = 0.1 + } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 1.5 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill + Ratio = 5 + } + } + + MODULE + { + name = WBIProspector + ConverterName = Liquid Distiller + StartActionName = Start Liquid Distiller + StopActionName = Stop Liquid Distiller + AutoShutdown = false + GeneratesHeat = false + guiVisible = true + harvestTypes = Oceanic + outputsGuiName = Show Distiller Outputs + + INPUT_RESOURCE + { + ResourceName = IntakeLqd + Ratio = 0.1 + } + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 5 + } } MODULE @@ -267,4 +300,11 @@ PART amount = 2 maxAmount = 2 } + + RESOURCE + { + name = IntakeLqd + amount = 2 + maxAmount = 2 + } } diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize2.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize2.cfg index b8dd6f2..d060f73 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize2.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize2.cfg @@ -43,48 +43,81 @@ PART intakeTransformName = Intake } + MODULE + { + name = ModuleResourceHarvester + HarvesterType = 2 //Atmospheric + AutoShutdown = true + ResourceName = Atmosphere + ConverterName = Atmosphere Scoop + StartActionName = Open Atmosphere Scoop + StopActionName = Close Atmosphere Scoop + ToggleActionName = Toggle Atmosphere Scoop + intakeTransformName = Intake + intakeSpeed = 30 + airStaticSpeed = 30 + AlwaysActive = true + } + MODULE { name = ModuleResourceIntake - resourceName = Atmosphere + resourceName = IntakeLqd checkForOxygen = false area = 0.03 intakeSpeed = 30 + underwaterOnly = true intakeTransformName = Intake } -//Resource types: -// 0 = Crustal (Stuff you dig up) -// 1 = Oceanic (Stuff in the oceans) -// 2 = Atmospheric (Stuff in the air, varies with pressure) -// 3 = Interplanetary (Stuff you find between planets) MODULE { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName:NEEDS[!FarFutureTechnologies] = Explodium - ResourceName:NEEDS[FarFutureTechnologies] = NuclearSaltWater - ConverterName = Explodium Filter - StartActionName = Start Explodium Filter - StopActionName = Stop Explodium Filter - ToggleActionName = Start/Stop Explodium Filter - intakeTransformName = Intake - intakeSpeed = 30 - airStaticSpeed = 30 + name = WBIProspector + ConverterName = Atmosphere Processor + StartActionName = Start Atmosphere Processor + StopActionName = Stop Atmosphere Processor + AutoShutdown = false + GeneratesHeat = false + guiVisible = true + harvestTypes = Atmospheric + outputsGuiName = Show Processor Outputs + + INPUT_RESOURCE + { + ResourceName = Atmosphere + Ratio = 0.1 + } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 1.5 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill + Ratio = 5 + } + } + + MODULE + { + name = WBIProspector + ConverterName = Liquid Distiller + StartActionName = Start Liquid Distiller + StopActionName = Stop Liquid Distiller + AutoShutdown = false + GeneratesHeat = false + guiVisible = true + harvestTypes = Oceanic + outputsGuiName = Show Distiller Outputs + + INPUT_RESOURCE + { + ResourceName = IntakeLqd + Ratio = 0.1 + } + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 5 + } } MODULE @@ -268,4 +301,11 @@ PART amount = 8 maxAmount = 8 } + + RESOURCE + { + name = IntakeLqd + amount = 8 + maxAmount = 8 + } } diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize3.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize3.cfg new file mode 100644 index 0000000..ec5f792 --- /dev/null +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize3.cfg @@ -0,0 +1,340 @@ +PART +{ + name = wbiLassoSize3 + module = Part + author = Angel-125 + MODEL + { + model = WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize3 + } + rescaleFactor = 1 + + node_stack_bottom = 0, 0, 0, 0, -1, 0, 2 + node_attach = 0.0, 0.0, 0.0, 0.0, 0.0, -1.0 + + TechRequired = heavyAerodynamics + entryCost = 24000 + cost = 16000 + category = Aero + subcategory = 0 + title = Lasso-300 Aero/Hydro/Exo Scoop + manufacturer = Wild Blue Industries + description = Not your typical turbofan intake, the Lasso can separate atmospheric gasses and oceanic liquids into useful resources. Unlike the smaller versions, this version also has the ability to scoop up exo-atmospheric gasses as well. + attachRules = 1,1,0,1,0 + mass = 3.2 + heatConductivity = 0.06 // half default + skinInternalConductionMult = 4.0 + emissiveConstant = 0.8 // engine nozzles are good at radiating. + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 2 + crashTolerance = 7 + maxTemp = 2000 // = 3600 + bulkheadProfiles = size1 + + MODULE + { + name = ModuleResourceIntake + resourceName = IntakeAir + checkForOxygen = true + area = 0.06 + intakeSpeed = 60 + intakeTransformName = Intake + } + + MODULE + { + name = ModuleResourceHarvester + HarvesterType = 2 //Atmospheric + AutoShutdown = true + ResourceName = Atmosphere + ConverterName = Atmosphere Scoop + StartActionName = Open Atmosphere Scoop + StopActionName = Close Atmosphere Scoop + ToggleActionName = Toggle Atmosphere Scoop + intakeTransformName = Intake + intakeSpeed = 60 + airStaticSpeed = 60 + AlwaysActive = true + } + + MODULE + { + name = ModuleResourceHarvester + HarvesterType = 3 //Exo + AutoShutdown = true + Efficiency = 0.02 + ResourceName = Atmosphere + ConverterName = Exosphere Scoop + StartActionName = Start Exospheric Scoop + StopActionName = Stop Exospheric Scoop + ToggleActionName = Toggle Exosphere Scoop + AlwaysActive = true + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 60 + } + } + + MODULE + { + name = ModuleResourceIntake + resourceName = IntakeLqd + checkForOxygen = false + area = 0.06 + intakeSpeed = 60 + underwaterOnly = true + intakeTransformName = Intake + } + + MODULE + { + name = WBIProspector + ConverterName = Atmosphere Processor + StartActionName = Start Atmosphere Processor + StopActionName = Stop Atmosphere Processor + AutoShutdown = false + GeneratesHeat = false + guiVisible = true + harvestTypes = Atmospheric;Exospheric + outputsGuiName = Show Processor Outputs + + INPUT_RESOURCE + { + ResourceName = Atmosphere + Ratio = 0.1 + } + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 5 + } + } + + MODULE + { + name = WBIProspector + ConverterName = Liquid Distiller + StartActionName = Start Liquid Distiller + StopActionName = Stop Liquid Distiller + AutoShutdown = false + GeneratesHeat = false + guiVisible = true + harvestTypes = Oceanic + outputsGuiName = Show Distiller Outputs + + INPUT_RESOURCE + { + ResourceName = IntakeLqd + Ratio = 0.1 + } + + INPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 5 + } + } + + MODULE + { + name = ModuleResourceScanner + MaxAbundanceAltitude = 5000000 + RequiresUnlock = true + ScannerType = 3 + ResourceName = Atmosphere + } + + MODULE + { + name = WBIScoopTurbine + rotationTransform = TurbineFan + rotationRate = 180 + rotationAxis = 0,1,0 + } + + MODULE:NEEDS[BARIS] + { + name = ModuleQualityControl + mtbf = 400 + } + + MODULE + { + name = ModuleTestSubject + useStaging = True + useEvent = True + situationMask = 15 + CONSTRAINT + { + type = OXYGEN + value = True + } + CONSTRAINT + { + type = SPEEDENV + test = LT + value = 200 + prestige = Trivial + } + CONSTRAINT + { + type = SPEEDENV + test = GT + value = 100 + prestige = Trivial + } + CONSTRAINT + { + type = SPEEDENV + test = LT + value = 100 + prestige = Significant + } + CONSTRAINT + { + type = SPEEDENV + test = GT + value = 50 + prestige = Significant + } + CONSTRAINT + { + type = SPEEDENV + test = LT + value = 50 + prestige = Exceptional + } + CONSTRAINT + { + type = SPEEDENV + test = GT + value = 20 + prestige = Exceptional + } + CONSTRAINT + { + type = SPEED + test = LT + value = 300 + situationMask = 8 + } + CONSTRAINT + { + type = SPEED + test = GT + value = 50 + situationMask = 8 + } + CONSTRAINT + { + type = DENSITY + test = GT + value = 0.3 + situationMask = 8 + prestige = Trivial + } + CONSTRAINT + { + type = DENSITY + test = GT + value = 0.1 + situationMask = 8 + prestige = Significant + } + CONSTRAINT + { + type = DENSITY + test = GT + value = 0.05 + situationMask = 8 + prestige = Exceptional + } + CONSTRAINT + { + type = ALTITUDEENV + test = GT + value = 4000 + prestige = Trivial + } + CONSTRAINT + { + type = ALTITUDEENV + test = LT + value = 8000 + prestige = Trivial + } + CONSTRAINT + { + type = ALTITUDEENV + test = GT + value = 1000 + prestige = Significant + } + CONSTRAINT + { + type = ALTITUDEENV + test = LT + value = 2000 + prestige = Significant + } + CONSTRAINT + { + type = ALTITUDEENV + test = GT + value = 500 + prestige = Exceptional + } + CONSTRAINT + { + type = ALTITUDEENV + test = LT + value = 1000 + prestige = Exceptional + } + CONSTRAINT + { + type = REPEATABILITY + value = ALWAYS + prestige = Trivial + } + CONSTRAINT + { + type = REPEATABILITY + value = BODYANDSITUATION + prestige = Significant + } + CONSTRAINT + { + type = REPEATABILITY + value = ONCEPERPART + prestige = Exceptional + } + } + + RESOURCE + { + name = IntakeAir + amount = 20 + maxAmount = 20 + } + + + RESOURCE + { + name = Atmosphere + amount = 20 + maxAmount = 20 + } + + RESOURCE + { + name = IntakeLqd + amount = 20 + maxAmount = 20 + } +} diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize3.mu b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize3.mu new file mode 100644 index 0000000..7e3315c Binary files /dev/null and b/GameData/WildBlueIndustries/Pathfinder/Parts/Aero/Lasso/LassoSize3.mu differ diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Command/Ponderosa.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Command/Ponderosa.cfg index 6f46f16..916f410 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Command/Ponderosa.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Command/Ponderosa.cfg @@ -272,10 +272,10 @@ PART animationName = Deploy //GUI name of deploy animation - startEventGUIName = Inflate + startEventGUIName = Assemble //GUI name of retract animation - endEventGUIName = Deflate + endEventGUIName = Disassemble //Some containers don't hold as much resources as the template specifies, while others hold more. //Since the resource templates specify base amounts, the capacity factor specifies a multiplier to diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Science/DocSciLab.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Science/DocSciLab.cfg index 5f37d17..c09ecc3 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Science/DocSciLab.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Science/DocSciLab.cfg @@ -139,10 +139,10 @@ PART animationName = Deploy //GUI name of deploy animation - startEventGUIName = Inflate + startEventGUIName = Assemble //GUI name of retract animation - endEventGUIName = Deflate + endEventGUIName = Disassemble //Some containers don't hold as much resources as the template specifies, while others hold more. //Since the resource templates specify base amounts, the capacity factor specifies a multiplier to diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Casa.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Casa.cfg index 3b16920..bbf85d1 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Casa.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Casa.cfg @@ -221,10 +221,10 @@ PART animationName = Deploy //GUI name of deploy animation - startEventGUIName = Inflate + startEventGUIName = Assemble //GUI name of retract animation - endEventGUIName = Deflate + endEventGUIName = Disassemble //Some containers don't hold as much resources as the template specifies, while others hold more. //Since the resource templates specify base amounts, the capacity factor specifies a multiplier to diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Chuckwagon.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Chuckwagon.cfg index aba0feb..a4779fd 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Chuckwagon.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Chuckwagon.cfg @@ -85,10 +85,10 @@ PART flightAnimationOnly = True //GUI name of deploy animation - startEventGUIName = Inflate + startEventGUIName = Assemble //GUI name of retract animation - endEventGUIName = Deflate + endEventGUIName = Disassemble //Determines if the module allows in-field reconfiguring fieldReconfigurable = True diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Hacienda.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Hacienda.cfg index ff1ca67..7a26b2a 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Hacienda.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/Hacienda.cfg @@ -235,10 +235,10 @@ PART animationName = Deploy //GUI name of deploy animation - startEventGUIName = Inflate + startEventGUIName = Assemble //GUI name of retract animation - endEventGUIName = Deflate + endEventGUIName = Disassemble //Some containers don't hold as much resources as the template specifies, while others hold more. //Since the resource templates specify base amounts, the capacity factor specifies a multiplier to diff --git a/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/OldFaithful.cfg b/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/OldFaithful.cfg index 108b8e2..3f58dca 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/OldFaithful.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Parts/Utility/OldFaithful.cfg @@ -100,9 +100,9 @@ PART { name = WBICoolingTower animationName = Deploy - startEventGUIName = Inflate - endEventGUIName = Deflate - actionGUIName = Toggle Inflation + startEventGUIName = Assemble + endEventGUIName = Disassemble + actionGUIName = Toggle Assembly isInflatable = True } diff --git a/GameData/WildBlueIndustries/Pathfinder/Pathfinder.version b/GameData/WildBlueIndustries/Pathfinder/Pathfinder.version index 36a3634..9acfe02 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Pathfinder.version +++ b/GameData/WildBlueIndustries/Pathfinder/Pathfinder.version @@ -11,7 +11,7 @@ "VERSION": { "MAJOR":1, - "MINOR":19, + "MINOR":21, "PATCH":0, "BUILD":0 }, diff --git a/GameData/WildBlueIndustries/Pathfinder/Readme.txt b/GameData/WildBlueIndustries/Pathfinder/Readme.txt index aba3a32..254d4b9 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Readme.txt +++ b/GameData/WildBlueIndustries/Pathfinder/Readme.txt @@ -8,6 +8,16 @@ Copy the contents of the mod's GameData directory into your KSP's GameData folde ---REVISION HISTORY--- +1.21 Gigawatts +This release focuses on resource harvesting by making quality of life improvements in the Lasso parts and adding the ability to collect exoatmospheric resources via a new part. Thanks for your help, JadeOfMaar and Rock3tman! :) + +Lasso +- Cleaned up the available converters. Now there is an Atmosphere Processor to extract all available atmospheric resources from intake Atmosphere, and a Liquid Distiller to do the same for oceanic resources. +- Added a new 3.75m Lasso-300. It can extract both atmospheric and exospheric resources via its Atmosphere Processor in addition to the standard Liquid Distiller. Be sure to start the Exospheric Scoop to gather up resources just above a planet's tangible atmosphere. + +Resources Definitions +- Added exospheric definitions for Atmosphere, Water, Minerite, and Nitronite. With enough time and the proper equipment, you can skim the atmosphere of worlds like Kerbin, Laythe, Duna, Eve, and Jool to make LiquidFuel and Oxidizer! + 1.20 - WBT update - Module Manager update diff --git a/GameData/WildBlueIndustries/Pathfinder/Templates/CRP/Lasso.cfg b/GameData/WildBlueIndustries/Pathfinder/Templates/CRP/Lasso.cfg index 3ba8f2b..63c6a76 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Templates/CRP/Lasso.cfg +++ b/GameData/WildBlueIndustries/Pathfinder/Templates/CRP/Lasso.cfg @@ -1,44 +1,5 @@ -@PART[LassoSize0] +@PART[wbiLassoSize0] { - MODULE - { - name = ModuleResourceIntake - resourceName = IntakeLqd - checkForOxygen = false - area = 0.001 - intakeSpeed = 10 - underwaterOnly = true - intakeTransformName = Intake - } - - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 0.5 - EfficiencyBonus = 1 - ResourceName = Water - ConverterName = Water Filter - StartActionName = Start Water Filter - StopActionName = Stop Water Filter - ToggleActionName = Start/Stop Water Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 1.5 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - MODULE { name = ModuleResourceConverter @@ -74,56 +35,10 @@ DumpExcess = false } } - - RESOURCE - { - name = IntakeLqd - amount = 1 - maxAmount = 1 - } } -@PART[LassoSize1] +@PART[wbiLassoSize1] { - MODULE - { - name = ModuleResourceIntake - resourceName = IntakeLqd - checkForOxygen = false - area = 0.0075 - intakeSpeed = 10 - underwaterOnly = true - intakeTransformName = Intake - } - - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName = Water - ConverterName = Water Filter - StartActionName = Start Water Filter - StopActionName = Stop Water Filter - ToggleActionName = Start/Stop Water Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 1.5 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - MODULE { name = ModuleResourceConverter @@ -158,56 +73,48 @@ DumpExcess = false } } - - RESOURCE - { - name = IntakeLqd - amount = 2 - maxAmount = 2 - } } -@PART[LassoSize2] +@PART[wbiLassoSize2] { MODULE { - name = ModuleResourceIntake - resourceName = IntakeLqd - checkForOxygen = false - area = 0.03 - intakeSpeed = 10 - underwaterOnly = true - intakeTransformName = Intake - } + name = ModuleResourceConverter + ConverterName = Oxygen Compressor + StartActionName = Start Oxygen Compressor + StopActionName = Stop Oxygen Compressor + AutoShutdown = false + GeneratesHeat = false + UseSpecialistBonus = true + SpecialistEfficiencyFactor = 0.2 + SpecialistBonusBase = 0.05 + ExperienceEffect = ConverterSkill + EfficiencyBonus = 1.2 - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName = Water - ConverterName = Water Filter - StartActionName = Start Water Filter - StopActionName = Stop Water Filter - ToggleActionName = Start/Stop Water Filter - intakeTransformName = Intake - intakeSpeed = 30 - airStaticSpeed = 30 + + INPUT_RESOURCE + { + ResourceName = IntakeAir + Ratio = 1 + } INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 3 } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill + + OUTPUT_RESOURCE + { + ResourceName = Oxygen + Ratio = 100 + DumpExcess = false + } } +} +@PART[wbiLassoSize3] +{ MODULE { name = ModuleResourceConverter @@ -226,27 +133,20 @@ INPUT_RESOURCE { ResourceName = IntakeAir - Ratio = 1 + Ratio = 2 } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 3 + Ratio = 6 } OUTPUT_RESOURCE { ResourceName = Oxygen - Ratio = 100 + Ratio = 200 DumpExcess = false } } - - RESOURCE - { - name = IntakeLqd - amount = 4 - maxAmount = 4 - } } \ No newline at end of file diff --git a/GameData/WildBlueIndustries/Pathfinder/Templates/ClassicStock/Lasso.txt b/GameData/WildBlueIndustries/Pathfinder/Templates/ClassicStock/Lasso.txt index d4f6835..b7c292e 100644 --- a/GameData/WildBlueIndustries/Pathfinder/Templates/ClassicStock/Lasso.txt +++ b/GameData/WildBlueIndustries/Pathfinder/Templates/ClassicStock/Lasso.txt @@ -1,89 +1,5 @@ -@PART[wbiLassoSize1] +@PART[wbiLassoSize0] { - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 0.5 - EfficiencyBonus = 1 - ResourceName = GrayWater - ConverterName = GrayWater Filter - StartActionName = Start GrayWater Filter - StopActionName = Stop GrayWater Filter - ToggleActionName = Start/Stop GrayWater Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 0.75 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 2 //Atmospheric - AutoShutdown = true - Efficiency = 0.5 - EfficiencyBonus = 1 - ResourceName = Hexagen - ConverterName = Hexagen Filter - StartActionName = Start Hexagen Filter - StopActionName = Stop Hexagen Filter - ToggleActionName = Start/Stop Hexagen Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 0.75 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 2 //Atmospheric - AutoShutdown = true - Efficiency = 0.5 - EfficiencyBonus = 1 - ResourceName = Zeonium - ConverterName = Zeonium Filter - StartActionName = Start Zeonium Filter - StopActionName = Stop Zeonium Filter - ToggleActionName = Start/Stop Zeonium Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 0.75 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - MODULE { name = ModuleResourceConverter @@ -123,90 +39,6 @@ @PART[wbiLassoSize1] { - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName = GrayWater - ConverterName = GrayWater Filter - StartActionName = Start GrayWater Filter - StopActionName = Stop GrayWater Filter - ToggleActionName = Start/Stop GrayWater Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 1.5 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 2 //Atmospheric - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName = Hexagen - ConverterName = Hexagen Filter - StartActionName = Start Hexagen Filter - StopActionName = Stop Hexagen Filter - ToggleActionName = Start/Stop Hexagen Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 1.5 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 2 //Atmospheric - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName = Zeonium - ConverterName = Zeonium Filter - StartActionName = Start Zeonium Filter - StopActionName = Stop Zeonium Filter - ToggleActionName = Start/Stop Zeonium Filter - intakeTransformName = Intake - intakeSpeed = 10 - airStaticSpeed = 10 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 1.5 - } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - MODULE { name = ModuleResourceConverter @@ -248,88 +80,42 @@ { MODULE { - name = ModuleResourceHarvester - HarvesterType = 1 //Oceanic - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName = GrayWater - ConverterName = GrayWater Filter - StartActionName = Start GrayWater Filter - StopActionName = Stop GrayWater Filter - ToggleActionName = Start/Stop GrayWater Filter - intakeTransformName = Intake - intakeSpeed = 30 - airStaticSpeed = 30 - - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 3 - } - + name = ModuleResourceConverter + ConverterName = Oxium Compressor + StartActionName = Start Oxium Compressor + StopActionName = Stop Oxium Compressor + AutoShutdown = false + GeneratesHeat = false UseSpecialistBonus = true SpecialistEfficiencyFactor = 0.2 SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 2 //Atmospheric - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName = Hexagen - ConverterName = Hexagen Filter - StartActionName = Start Hexagen Filter - StopActionName = Stop Hexagen Filter - ToggleActionName = Start/Stop Hexagen Filter - intakeTransformName = Intake - intakeSpeed = 30 - airStaticSpeed = 30 + ExperienceEffect = ConverterSkill + EfficiencyBonus = 1.2 + INPUT_RESOURCE { - ResourceName = ElectricCharge - Ratio = 3 + ResourceName = IntakeAir + Ratio = 1 } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill - } - - MODULE - { - name = ModuleResourceHarvester - HarvesterType = 2 //Atmospheric - AutoShutdown = true - Efficiency = 1.0 - EfficiencyBonus = 1 - ResourceName = Zeonium - ConverterName = Zeonium Filter - StartActionName = Start Zeonium Filter - StopActionName = Stop Zeonium Filter - ToggleActionName = Start/Stop Zeonium Filter - intakeTransformName = Intake - intakeSpeed = 30 - airStaticSpeed = 30 INPUT_RESOURCE { ResourceName = ElectricCharge Ratio = 3 } - - UseSpecialistBonus = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - ExperienceEffect = DrillSkill + + OUTPUT_RESOURCE + { + ResourceName = Oxium + Ratio = 1 + DumpExcess = false + } } +} +@PART[wbiLassoSize3] +{ MODULE { name = ModuleResourceConverter @@ -348,19 +134,19 @@ INPUT_RESOURCE { ResourceName = IntakeAir - Ratio = 1 + Ratio = 2 } INPUT_RESOURCE { ResourceName = ElectricCharge - Ratio = 3 + Ratio = 6 } OUTPUT_RESOURCE { ResourceName = Oxium - Ratio = 1 + Ratio = 2 DumpExcess = false } } diff --git a/Pathfinder/Industry/WBIBuckboardGenerator.cs b/Pathfinder/Industry/WBIBuckboardGenerator.cs index 4646d04..22ccfaf 100644 --- a/Pathfinder/Industry/WBIBuckboardGenerator.cs +++ b/Pathfinder/Industry/WBIBuckboardGenerator.cs @@ -47,15 +47,15 @@ public void ShowParticleEffect(bool isVisible) } } - public override void StartConverter() + public override void StartResourceConverter() { - base.StartConverter(); + base.StartResourceConverter(); ShowParticleEffect(IsActivated); } - public override void StopConverter() + public override void StopResourceConverter() { - base.StopConverter(); + base.StopResourceConverter(); ShowParticleEffect(IsActivated); } } diff --git a/Pathfinder/Industry/WBIPowerGenerator.cs b/Pathfinder/Industry/WBIPowerGenerator.cs index f49d43a..30051aa 100644 --- a/Pathfinder/Industry/WBIPowerGenerator.cs +++ b/Pathfinder/Industry/WBIPowerGenerator.cs @@ -106,9 +106,9 @@ protected override void PostProcess(ConverterResults result, double deltaTime) } } - public override void StopConverter() + public override void StopResourceConverter() { - base.StopConverter(); + base.StopResourceConverter(); powerOutputDisplay = "n/a"; } @@ -152,12 +152,12 @@ public virtual void DrawOpsWindow(string buttonLabel) if (ModuleIsActive()) { if (GUILayout.Button(StopActionName)) - StopConverter(); + StopResourceConverter(); } else if (GUILayout.Button(StartActionName)) { - StartConverter(); + StartResourceConverter(); } GUILayout.EndVertical();