diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index 4e8fd3b0..5d07681e 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit 4e8fd3b0ce692e186bc08119bbd023a976cb2c0d +Subproject commit 5d07681e75ba406abbc756eeb32795b9363758e1 diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-apu-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-apu-radial-1.mu new file mode 100644 index 00000000..9e61efd9 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-apu-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-1.mu new file mode 100644 index 00000000..9483a4e3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-2.mu new file mode 100644 index 00000000..507d8d86 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-e.dds new file mode 100644 index 00000000..dfce699e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-n.dds new file mode 100644 index 00000000..54997057 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1.dds new file mode 100644 index 00000000..7342fceb Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg index f37e5be4..de7e0100 100644 --- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg +++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg @@ -49,5 +49,7 @@ Localization #LOC_Restock_variant-probe-gold = Gold #LOC_Restock_variant-probe-silver = Silver #LOC_Restock_variant-probe-bare = Basic + + #LOC_Restock_description-FuelCellArray = Why have just one small fuel cell when you can have three large ones? The fuel cell array is ideal for situations where you need a large source of reliable power. Like the smaller fuel cells, this array operates by converting fuel and oxidizer into energy. } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg new file mode 100644 index 00000000..605ba240 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg @@ -0,0 +1,29 @@ +// Patches applying art changes to fuel cells +// Contents: +// - Fuel Cell (FuelCell) +// - Fuel Cell Array (FuelCellArray) + +// Fuel Cell +@PART[FuelCell] +{ + @author = Andrew Cassidy + + !MODEL {} + MODEL + { + model = ReStock/Assets/Electrical/restock-fuelcell-radial-1 + } +} + +// Fuel Cell Array +@PART[FuelCellArray] +{ + @author = Andrew Cassidy + + !MODEL {} + MODEL + { + model = ReStock/Assets/Electrical/restock-fuelcell-radial-2 + } +} + diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 454810c6..3cdb9b59 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -113,4 +113,5 @@ Squad/Parts/Utility/spotLightMk1/ Squad/Parts/Utility/spotLightMk2/ Squad/Parts/Resources/RadialTank/ Squad/Parts/Resources/SmallTank/ -Squad/Parts/Resources/LargeTank/ \ No newline at end of file +Squad/Parts/Resources/LargeTank/ +Squad/Parts/Resources/FuelCell/ \ No newline at end of file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index e780dd68..37c4903f 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -149,6 +149,15 @@ Localization #LOC_RestockPlus_restock-battery-375-1_description = A gigantic battery pack for the largest rockets. Special on this model, Zaltronic includes mishap insurance - the first time your drop your battery, it will be replaced for free! However, the battery is not user-serviceable. #LOC_RestockPlus_restock-battery-375-1_tags = capacitor cell charge e/c elect pack power volt watt restock 10k battery + #LOC_RestockPlus_restock-apu-radial-1_title = NH-24 Monopropellant APU + #LOC_RestockPlus_restock-apu-radial-1_description = After playing with a children's pinwheel toy and asking themselves "how could this become more awesome", one engineer tried pointing a small rocket engine at it. The engineering team immediately got to work using it to generate electricity, and the Monopropellant APU was born + #LOC_RestockPlus_restock-apu-radial-1_tags = APU backup turbine array bank charge convert e/c elect energ pack power volt watt + + #LOC_RestockPlus_restock-apu_name = APU turbine + #LOC_RestockPlus_restock-apu_start = Start turbine + #LOC_RestockPlus_restock-apu_stop = Stop turbine + #LOC_RestockPlus_restock-apu_toggle = Toggle turbine + // Payload #LOC_RestockPlus_restock-fairing-base-0625-1_title = AE-FF0 Airstream Protective Shell (0.625m) #LOC_RestockPlus_restock-fairing-base-0625-1_description = While the Kerbals at Mission Control were still figuring out how to get their rockets back down to Kerbin safely, the research engineers at FLOOYD were quickly realising that protecting parts on ascent was just as important. Heavy research into two-dimensional-input driven procedural construction was then funded with the hopes of making protective shells for important payloads and interstage areas of the crafts. The protective shells also have the benefit of making the craft more aerodynamic, hopefully saving on precious rocket fuel! This protective shell is an even tinier size available from FLOOYD. diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Electrical/radial/restock-apu-radial-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Electrical/radial/restock-apu-radial-1.cfg new file mode 100644 index 00000000..615e61e8 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Electrical/radial/restock-apu-radial-1.cfg @@ -0,0 +1,77 @@ +// ReStock+ 0.2.0 +// monopropellant APU/"Fuel Cell" +PART +{ + // --- general parameters --- + name = restock-apu-radial-1 + module = Part + author = Andrew Cassidy + // --- asset parameters --- + MODEL + { + model = ReStock/Assets/Electrical/restock-apu-radial-1 + } + scale = 1.0 + rescaleFactor = 1 + // --- node definitions --- + node_attach = 0, 0, 0, 1, 0, 0, 0 + // --- editor parameters --- + TechRequired = specializedElectrics + entryCost = 2000 + cost = 700 + category = Electrical + subcategory = 0 + title = #LOC_RestockPlus_restock-apu-radial-1_title //NH-24 Monopropellant APU + manufacturer = #autoLOC_501636 //#autoLOC_501636 = Zaltonic Electronics + description = #LOC_RestockPlus_restock-apu-radial-1_description + // After playing with a children's pinwheel toy and asking themselves "how could this become more awesome", one engineer tried pointing a small rocket engine at it. The engineering team immediately got to work using it to generate electricity, and the Monopropellant APU was born + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 0,1,0,0,0 + bulkheadProfiles = surf + // --- standard part parameters --- + mass = 0.075 + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 2 + crashTolerance = 7 + maxTemp = 2000 + breakingForce = 5000 + breakingTorque = 5000 + tags = #LOC_RestockPlus_restock-apu-radial-1_tags //APU backup turbine array bank charge convert e/c elect energ pack power volt watt + + MODULE + { + name = ModuleResourceConverter + ConverterName = #LOC_RestockPlus_restock-apu_name //APU turbine + StartActionName = #LOC_RestockPlus_restock-apu_start //Start turbine + StopActionName = #LOC_RestockPlus_restock-apu_stop //Stop turbine + ToggleActionName = #LOC_RestockPlus_restock-apu_toggle //Toggle turbine + + FillAmount = 0.95 + AutoShutdown = false + GeneratesHeat = false + UseSpecialistBonus = false + + INPUT_RESOURCE + { + ResourceName = MonoPropellant + Ratio = 0.006 + FlowMode = STAGE_PRIORITY_FLOW + } + OUTPUT_RESOURCE + { + ResourceName = ElectricCharge + Ratio = 1.5 + DumpExcess = false + } + } + + RESOURCE + { + name = ElectricCharge + amount = 40 + maxAmount = 40 + } +}