Skip to content

Commit

Permalink
work on new engines
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisAdderley committed Jul 12, 2019
1 parent 4dcd577 commit 3cf4338
Show file tree
Hide file tree
Showing 17 changed files with 2,429 additions and 42 deletions.
6 changes: 3 additions & 3 deletions .mod_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ dependencies: # Configure dependencies
version: 4.0.2
location: s3
B9PartSwitch:
version: 2.6.0
version: 2.8.0
location: s3
CommunityResourcePack:
version: 1.0.0
location: s3
DynamicBatteryStorage:
tag: 1.4.2
tag: 2.0.0
location: github
repository: ChrisAdderley/DynamicBatteryStorage
DeployableEngines:
tag: 1.0.1
location: github
repository: ChrisAdderley/DeployableEngines
CryoTanks:
tag: 1.1.2
tag: 1.1.4
location: github
repository: ChrisAdderley/CryoTanks
deploy:
Expand Down
27 changes: 27 additions & 0 deletions CKAN/CryoEngines-Restock.netkan
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"spec_version": "v1.4",
"identifier": "CryoEngines-Restock",
"$kref": "#/ckan/spacedock/709",
"$vref": "#/ckan/ksp-avc/GameData/CryoEngines/Versioning/CryoEngines.version",
"x_netkan_epoch": 1,
"name": "Cryogenic Engines - Restock",
"abstract": "Optional patch to convert some engines in Restock and ReStock+ to use cryogenic fuel, improving efficiency",
"license": "MIT",
"resources": {
"homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/106089-16x-cryogenic-engines-high-isp-chemical-rockets-january-21/",
"repository": "https://github.com/ChrisAdderley/CryoEngines"
},
"depends": [
{ "name" : "CryoEngines" },
{ "name" : "ReStock" }
],
"conflicts": [
{"name": "CryoEngines-LFO" }
],
"recommends": [
{ "name": "ReStockPlus" }
],
"install": [
{ "find" : "CryoEnginesRestock", "install_to" : "GameData" }
]
}
102 changes: 101 additions & 1 deletion Extras/CryoEnginesLFO/CryoEnginesLFO.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,105 @@
// Sets cryoEngines to use lFO at 30 lower Isp
// Sets all CryoEngines parts to use LFO instead of LH2O at 30s lower Isp

// Revised (post 0.7.0) parts
@PART[cryoengine-vesuvius-1]
{
@MODULE[ModuleEnginesFX]
{

!atmosphereCurve {}
atmosphereCurve
{
key = 0 380
key = 1 330
key = 4 0.001
}

@PROPELLANT[LqdHydrogen]
{
@name = LiquidFuel
@ratio = 0.9
}
@PROPELLANT[Oxidizer]
{
@ratio = 1.1
}

}
}
@PART[cryoengine-hecate-1]
{
@MODULE[ModuleEnginesFX]
{

!atmosphereCurve {}
atmosphereCurve
{
key = 0 425
key = 1 110
key = 4 0.001
}
@PROPELLANT[LqdHydrogen]
{
@name = LiquidFuel
@ratio = 0.9
}
@PROPELLANT[Oxidizer]
{
@ratio = 1.1
}
}
}

@PART[cryoengine-erebus-1]
{
@MODULE[ModuleEnginesFX]
{

!atmosphereCurve {}
atmosphereCurve
{
key = 0 380
key = 1 330
key = 4 0.001
}

@PROPELLANT[LqdHydrogen]
{
@name = LiquidFuel
@ratio = 0.9
}
@PROPELLANT[Oxidizer]
{
@ratio = 1.1
}

}
}
@PART[cryoengine-pavonis-1]
{
@MODULE[ModuleEnginesFX]
{

!atmosphereCurve {}
atmosphereCurve
{
key = 0 425
key = 1 110
key = 4 0.001
}
@PROPELLANT[LqdHydrogen]
{
@name = LiquidFuel
@ratio = 0.9
}
@PROPELLANT[Oxidizer]
{
@ratio = 1.1
}
}
}

// Old (pre-0.7.0 parts)
@PART[cryoengine-125-1]
{
@MODULE[ModuleEnginesFX]
Expand Down
95 changes: 95 additions & 0 deletions Extras/CryoEnginesRestock/CryoEnginesRestock.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
// Modifies the relevant Restock engines that are cryo-like to be actually cryo

// Vector (RS-25)
@PART[SSME]:NEEDS[ReStock]:AFTER[ReStock]
{
@MODULE[ModuleEnginesFX]
{
@maxThrust = 470
@PROPELLANT[LiquidFuel]
{
@name = LqdHydrogen
@ratio = 0.1
}
@PROPELLANT[Oxidizer]
{
@ratio = 0.1
}
!atmosphereCurve {}
atmosphereCurve
{
key = 0 4800 0 0
}
}
}

// Skipper (LE-7)
@PART[engineLargeSkipper]:NEEDS[ReStock]:AFTER[ReStock]
{
// TODO: ADJUST EFFECTS

@MODULE[ModuleEnginesFX]
{
@maxThrust = 470
@PROPELLANT[LiquidFuel]
{
@name = LqdHydrogen
@ratio = 0.1
}
@PROPELLANT[Oxidizer]
{
@ratio = 0.1
}
!atmosphereCurve {}
atmosphereCurve
{
key = 0 4800 0 0
}
}
}

// Rhino (M-1)
@PART[Size3AdvancedEngine]:NEEDS[ReStock]:AFTER[ReStock]
{
@MODULE[ModuleEnginesFX]
{
@maxThrust = 470
@PROPELLANT[LiquidFuel]
{
@name = LqdHydrogen
@ratio = 0.1
}
@PROPELLANT[Oxidizer]
{
@ratio = 0.1
}
!atmosphereCurve {}
atmosphereCurve
{
key = 0 4800 0 0
}
}
}

// Mammoth (RS-25x4)
@PART[Size3EngineCluster]:NEEDS[ReStock]:AFTER[ReStock]
{
@MODULE[ModuleEnginesFX]
{
@maxThrust = 470
@PROPELLANT[LiquidFuel]
{
@name = LqdHydrogen
@ratio = 0.1
}
@PROPELLANT[Oxidizer]
{
@ratio = 0.1
}
!atmosphereCurve {}
atmosphereCurve
{
key = 0 4800 0 0
}
}
}
26 changes: 26 additions & 0 deletions Extras/CryoEnginesRestock/CryoEnginesRestockMH.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Modifies the relevant Restock MH engines that are cryo-like to be actually cryo

// Skiff (J-2)
@PART[LiquidEngineRE-I2]:NEEDS[ReStock]:AFTER[ReStock]
{
// TODO: ADJUST EFFECTS

@MODULE[ModuleEnginesFX]
{
@maxThrust = 470
@PROPELLANT[LiquidFuel]
{
@name = LqdHydrogen
@ratio = 0.1
}
@PROPELLANT[Oxidizer]
{
@ratio = 0.1
}
!atmosphereCurve {}
atmosphereCurve
{
key = 0 4800 0 0
}
}
}
48 changes: 48 additions & 0 deletions Extras/CryoEnginesRestock/CryoEnginesRestockPlus.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Modifies the relevant Restock+ engines that are cryo-like to be actually cryo

// Corgi (RL-10-C2x4)
@PART[restock-engine-375-corgi]:NEEDS[ReStockPlus]:AFTER[ReStockPlus]
{
@MODULE[ModuleEnginesFX]
{
@maxThrust = 470
@PROPELLANT[LiquidFuel]
{
@name = LqdHydrogen
@ratio = 0.1
}
@PROPELLANT[Oxidizer]
{
@ratio = 0.1
}
!atmosphereCurve {}
atmosphereCurve
{
key = 0 4800 0 0
}
}
}

// Caravel (J-2)
@PART[restock-engine-caravel-1]:NEEDS[ReStockPlus]:AFTER[ReStockPlus]
{
// TODO: ADJUST EFFECTS
@MODULE[ModuleEnginesFX]
{
@maxThrust = 470
@PROPELLANT[LiquidFuel]
{
@name = LqdHydrogen
@ratio = 0.1
}
@PROPELLANT[Oxidizer]
{
@ratio = 0.1
}
!atmosphereCurve {}
atmosphereCurve
{
key = 0 4800 0 0
}
}
}
51 changes: 46 additions & 5 deletions GameData/CryoEngines/Localization/en-us.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,61 @@ Localization
// VARIANTS
#LOC_CryoEngines_engine_switcher_mount_title = Mount
#LOC_CryoEngines_engine_switcher_mount_variant1 = 0.625m
#LOC_CryoEngines_engine_switcher_mount_variant7 = 1.875m
#LOC_CryoEngines_engine_switcher_mount_variant2 = 1.25m
#LOC_CryoEngines_engine_switcher_mount_variant3 = 2.5m
#LOC_CryoEngines_engine_switcher_mount_variant4 = 3.75m
#LOC_CryoEngines_engine_switcher_mount_variant5 = Compact
#LOC_CryoEngines_engine_switcher_mount_variant6 = Boattail


// PARTS

// 1.25m
#LOC_CryoEngines_cryoengine-vesuvius-1_title = CR-2 'Vesuvius' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-vesuvius-1_description = A high power sustainer engine in a small footprint. Like most sustainer-type cryogenic engines, it is well-balanced for launch and mid-energy stage applications.
#LOC_CryoEngines_cryoengine-vesuvius-1_tags = propuls rocket sustain hydrogen hydrolox cryo vesuvius ariane vulcain

#LOC_CryoEngines_cryoengine-hecate-1_title = CE-10 'Hecate' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-hecate-1_description = A venerable kitchen appliance - er, rocket engine, efficiently burning liquid hydrogen and oxidizer for your orbital vehicles. Stowed nozzle extension allows a compact footprint.
#LOC_CryoEngines_cryoengine-hecate-1_tags = orbit propuls rocket vacuum hydrogen hydrolox exten cryo rl10

// 1.875m
#LOC_CryoEngines_cryoengine-erebus-1_title = CR-0120 'Erebus' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-erebus-1_description = The flame-spewing Erebus pushes our launch vehicles to great heights, but only when paired with an appropriate amount of boosters. Because it's a sustainer.
#LOC_CryoEngines_cryoengine-erebus-1_tags = propuls rocket sustain hydrogen hydrolox cryo erebus buran energ

#LOC_CryoEngines_cryoengine-pavonis-1_title = CE-60 'Pavonis' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-pavonis-1_description = An industrial kitchen appliance! Delivers great specific impulse with better thrust in vacuum than its predecessor. Stowed nozzle extension allows a compact footprint.
#LOC_CryoEngines_cryoengine-pavonis-1_tags = orbit propuls rocket vacuum hydrogen hydrolox exten cryo rl60

// 2.5m
#LOC_CryoEngines_cryoengine-fuji-1_title = CR-9B 'Fuji' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-fuji-1_description = An advanced sustainer engine designed to deliver well-priced and efficient thrust at all atmospheric regimes.
#LOC_CryoEngines_cryoengine-fuji-1_tags = propuls rocket sustain hydrogen hydrolox cryo vesuvius ariane vulcain

#LOC_CryoEngines_cryoengine-ulysses-1_title = CE-2X 'Ulysses' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-ulysses-1_description = The 'X' suffix refers to the eXtra efficiency delivered by this powerful vacuum engine. KADB is very excited that we might be making use of it, because they spent a lot of R&D money on it only to have the rocket they were building it for cancelled.
#LOC_CryoEngines_cryoengine-ulysses-1_tags = orbit propuls rocket vacuum hydrogen hydrolox cryo j2x constellation

//3.75m
#LOC_CryoEngines_cryoengine-mars-1_title = CR-68 'Etna' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-mars-1_description = The largest hydrogen-fuelled engine available we have available in stock. We can't even order bigger ones, they just roll their eyes and sigh. Might not even need boosters with this one...
#LOC_CryoEngines_cryoengine-mars-1_tags = propuls rocket sustain hydrogen hydrolox cryo delta iv

#LOC_CryoEngines_cryoengine-tharsis-1_title = CE-60 'Tharsis' Cryogenic Rocket Engine Cluster
#LOC_CryoEngines_cryoengine-tharsis-1_description = A pair of engines mounted on a robust structure, pushing your spacecraft to new and exciting heights. A stowed nozzle extension allows a compact footprint.
#LOC_CryoEngines_cryoengine-tharsis-1_tags = orbit propuls rocket vacuum hydrogen hydrolox exten cryo rl60 clust

// OLD
// GONE SOON
#LOC_CryoEngines_cryoengine-125-1_title = KL-1 'Volcano' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-125-1_description = A high power sustainer engine in a small footprint. Well balanced for launch and mid-energy stage applications.
#LOC_CryoEngines_cryoengine-125-1_tags = propuls rocket sustain hydrogen hydrolox cryo volcano
#LOC_CryoEngines_cryoengine-125-1_description = Deprecated
#LOC_CryoEngines_cryoengine-125-1_tags = deprecated
#LOC_CryoEngines_cryoengine-125-2_title = CT10 'Chelyabinsk' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-125-2_description = A venerable upper stage engine, efficiently burning liquid hydrogen and oxidizer. Nozzle extends when activated for better stowage. Not great for takeoff.
#LOC_CryoEngines_cryoengine-125-2_tags = orbit propuls rocket vacuum hydrogen hydrolox extensible cryo chelyabinsk
#LOC_CryoEngines_cryoengine-125-2_description = Deprecated
#LOC_CryoEngines_cryoengine-125-2_tags = deprecated

// YOUR TIME WIL COME
#LOC_CryoEngines_cryoengine-25-1_title = KL-21 'Odin' Cryogenic Rocket Engine
#LOC_CryoEngines_cryoengine-25-1_description = A mild, well-balanced engine that has a somewhat chequered service record. Hence the manufacturer's discount.
#LOC_CryoEngines_cryoengine-25-1_tags = propuls rocket sustain hydrogen hydrolox cryo odin
Expand Down
Loading

0 comments on commit 3cf4338

Please sign in to comment.