Skip to content

Commit

Permalink
Mk2 Expansion 1.7.01 PRE
Browse files Browse the repository at this point in the history
dev fixes to 1.7 prerelease
  • Loading branch information
SuicidalInsanity committed Jan 1, 2016
1 parent f6c6091 commit 026a854
Show file tree
Hide file tree
Showing 21 changed files with 463 additions and 147 deletions.
19 changes: 18 additions & 1 deletion Mk2Expansion/Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
Version 1.7
Version 1.7.01 prerelease
================================
new part: mk2 inline drill, for real this time
New part: mk2 ISRu refinery, ditto
AASRBs now have increased intakeAtm storage and intakes now have mach curves buffing their intake ability at low speed
tweaked AASRB intakeAtm consumption, should be a bit easier to use
tweaked AASRB thrust down slightly to improve burn time
tweaked Sledgehammer AARE, shouldfunction properly now switching engine modes
Air Augmented engines now have max thrust/ISP listed in their part descriptions
Tweaked Banshee, now uses FanIntakeAir to prevent Banshee from acting as a 2m intake for any other jets on the craft
Vector turbojet alternator now functions during afterburner operation

Version 1.7 prerelease
==============================
-New part: Mk2 Inline ISRU drill
-New Part: Mk2 ISRU refinery
Expand Down Expand Up @@ -27,6 +39,11 @@ Version 1.7
-Model retextures: changed model textures on some models to remove depeciated SQUAD texture references
-J. Edgar fuselage VTOL engine now uses the BDAnimation module rather than AnimateGeneric

=rework model for ISRU refinery
=add custom FX for all airaugmented engines
==auto detach when empty for AASRBs?
=shrouded deployable radiator

Version 1.6.10
==============================
-KSP 1.05 update
Expand Down
37 changes: 26 additions & 11 deletions Mk2Expansion/GameData/Mk2Expansion/Parts/Engines/AASRB/Radial.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PART
subcategory = 0
title = SP-R1 "Boost-O-Tron" Air-Augmented Solid Booster
manufacturer = Insanity Aerospace
description = Noting that jet engines work by compressing a bunch of air, heating it, and expelling it out a hole, our eengineers wondered if something similar could be done to improve the efficiency of rockets in atmospheric flight. The AASRB was the result. Featuring an integrated ram air-intake and modified combustion chamber, this SRB, while more expenisve and heavier than a standard SRB, benefits from dynamic thrust and ISP while in an atmosphere. The higher the mach number, the better the thrust and ISP of this engine, topping off at about 250kN and 500 ISp at mach 3.
description = Noting that jet engines work by compressing a bunch of air, heating it, and expelling it out a hole, our eengineers wondered if something similar could be done to improve the efficiency of rockets in atmospheric flight. The AASRB was the result. Featuring an integrated ram air-intake and modified combustion chamber, this SRB, while more expenisve and heavier than a standard SRB, benefits from dynamic thrust and ISP while in an atmosphere. The higher the mach number, the better the thrust and ISP of this engine, topping off at about 200kN and 425 ISP at mach 3.
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,1,1,0

Expand Down Expand Up @@ -201,7 +201,7 @@ PART
exhaustDamage = True
ignitionThreshold = 0.1
minThrust = 0
maxThrust = 100
maxThrust = 80
heatProduction = 300
allowShutdown = False
fxOffset = 0, 0, 0
Expand All @@ -216,8 +216,9 @@ PART
PROPELLANT
{
name = IntakeAtm
ratio = 7
ignoreForIsp = True
ratio = 3.5
}
atmosphereCurve
{
Expand Down Expand Up @@ -304,18 +305,26 @@ PART
}
MODULE
{
name = ModuleResourceIntake
resourceName = IntakeAtm
checkForOxygen = False
area = 0.00040
intakeTransformName = Intake
name = ModuleResourceIntake
resourceName = IntakeAtm
checkForOxygen = False
area = 0.001
intakeSpeed = 10
intakeTransformName = Intake
machCurve
{
key = 0 1.1 0 0 //technically this should be lower, but lets make sure the engine has enough air to start
key = 1 1 0 0
key = 2 0.95 -0.08751557 -0.08751557
key = 4 0.5 -0.4034287 -0.4034287
key = 8 0.01 0 0
}
}
RESOURCE
{
name = IntakeAtm
amount = 0
maxAmount = 0.2
amount = 0.5
maxAmount = 0.5
isTweakable = false
hideFlow = true
}
Expand Down Expand Up @@ -508,4 +517,10 @@ PART
falloff = 1.8
thrustTransformName = thrustTransform
}
MODULE
{
name = USI_DropTank
explode = false
threshold = 0.01
}
}
35 changes: 25 additions & 10 deletions Mk2Expansion/GameData/Mk2Expansion/Parts/Engines/AASRB/RadialL.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PART
subcategory = 0
title = SP-R7 "Mallet" Air-Augmented Solid Booster
manufacturer = Insanity Aerospace
description = Noting that jet engines work by compressing a bunch of air, heating it, and expelling it out a hole, our eengineers wondered if something similar could be done to improve the efficiency of rockets in atmospheric flight. The AASRB was the result. Featuring an integrated ram air-intake and modified combustion chamber, this SRB, while more expenisve and heavier than a standard SRB, benefits from dynamic thrust and ISP while in an atmosphere. The higher the mach number, the better the thrust and ISP of this engine, topping off at about 375kN and 500 ISP at mach 3.
description = Noting that jet engines work by compressing a bunch of air, heating it, and expelling it out a hole, our eengineers wondered if something similar could be done to improve the efficiency of rockets in atmospheric flight. The AASRB was the result. Featuring an integrated ram air-intake and modified combustion chamber, this SRB, while more expenisve and heavier than a standard SRB, benefits from dynamic thrust and ISP while in an atmosphere. The higher the mach number, the better the thrust and ISP of this engine, topping off at about 312kN and 425 ISP at mach 3.
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,1,1,0

Expand Down Expand Up @@ -200,7 +200,7 @@ PART
exhaustDamage = True
ignitionThreshold = 0.1
minThrust = 0
maxThrust = 150
maxThrust = 125
heatProduction = 300
allowShutdown = False
fxOffset = 0, 0, 0
Expand All @@ -215,7 +215,7 @@ PART
PROPELLANT
{
name = IntakeAtm
ratio = 7
ratio = 4
ignoreForIsp = True
}
atmosphereCurve
Expand Down Expand Up @@ -303,18 +303,27 @@ PART
}
MODULE
{
name = ModuleResourceIntake
resourceName = IntakeAtm
checkForOxygen = False
area = 0.0025
intakeTransformName = Intake
name = ModuleResourceIntake
resourceName = IntakeAtm
checkForOxygen = False
area = 0.003
intakeSpeed = 10
intakeTransformName = Intake
machCurve
{
key = 0 1.1 0 0 //technically this should be lower, but lets make sure the engine has enough air to start
key = 1 1 0 0
key = 2 0.95 -0.08751557 -0.08751557
key = 4 0.5 -0.4034287 -0.4034287
key = 8 0.01 0 0
}
}
RESOURCE
{
name = IntakeAtm
amount = 3
maxAmount = 3
amount = 5
maxAmount = 5
isTweakable = false
hideFlow = true
}
Expand Down Expand Up @@ -507,4 +516,10 @@ PART
falloff = 1.8
thrustTransformName = thrustTransform
}
MODULE
{
name = USI_DropTank
explode = false
threshold = 0.01
}
}
Binary file modified Mk2Expansion/GameData/Mk2Expansion/Parts/Engines/AASRB/RadialL.mu
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PART
subcategory = 0
title = SP-x4 "Sledgehammer" Air-Augmented Rocket Engine
manufacturer = Insanity Aerospace
description = In an attempt to improve atmospheric efficiency of rocket engines, our engineers took lessons from jet engine design principles. By arranging a cluster of rockets within a combustion manifold, then ducting intake air through it, the result is functionally similar to a jet engine, greatly improving engine efficiency while in an atmosphere. While it heavier and powerful than a standard rocket engine of the same size, because it uses rocket fuel rather than jet fuel, it will also function in non-oxygenated atmospheres where jets cannot.
description = In an attempt to improve atmospheric efficiency of rocket engines, our engineers took lessons from jet engine design principles. By arranging a cluster of rockets within a combustion manifold, then ducting intake air through it, the result is functionally similar to a jet engine, greatly improving engine efficiency while in an atmosphere. While it heavier and powerful than a standard rocket engine of the same size, because it uses rocket fuel rather than jet fuel, it will also function in non-oxygenated atmospheres where jets cannot. As with AASRBs, the higher the mach number, the better the thrust and ISP of this engine, topping off at about 500kN and 670 ISP at mach 3.

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,1,1,0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ description = A 2 meter internal fuselage mounted lift fan for vertical propulsi
MODULE
{
name = ModuleResourceIntake
resourceName = IntakeAtm
checkForOxygen = true
resourceName = FanIntakeAir
checkForOxygen = false
area = 0.04
intakeSpeed = 30
intakeTransformName = Intake
Expand Down Expand Up @@ -80,7 +80,7 @@ MODULE
}
PROPELLANT
{
name = IntakeAtm
name = FanIntakeAir
ratio = 200
ignoreForIsp = True
}
Expand Down Expand Up @@ -162,7 +162,7 @@ MODULE
}
RESOURCE
{
name = IntakeAir
name = FanIntakeAir
amount = 3.4
maxAmount = 3.4
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,24 @@ PART
enableSmoothGimbal = true
responseSpeed = 60
}
MODULE
{
name = ModuleAlternator
engineName = Wet
RESOURCE
{
name = ElectricCharge
rate = 5.0
}
}
MODULE
{
name = ModuleAlternator
engineName = Dry
RESOURCE
{
name = ElectricCharge
rate = 4
rate = 3.0
}
}
RESOURCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ category = Utility
subcategory = 0
title = Mk2 Multi-Fuel Generator
manufacturer = Insanity Aerospace
description = A Mk2 fuselage mounted heavy-duty electric generator for when fuelcells just simply aren't enough to meet a vessel's power requirements. This unit fills the middle ground between fuelcells and nuclear reactors, producing more power than the former without the eight and cost of the latter. Like its smaller bretheren, this unit uses LiquidFuel/Oxidizer to produce power, but unlike them, it can alsouse raw Ore, though at reduced efficiency.
description = A Mk2 fuselage mounted heavy-duty electric generator for when fuelcells just simply aren't enough to meet a vessel's power requirements. This unit fills the middle ground between fuelcells and nuclear reactors, producing more power than the former without the weight and cost of the latter. Like its smaller bretheren, this unit uses LiquidFuel/Oxidizer to produce power, but unlike them, it can alsouse raw Ore, though at reduced efficiency.
attachRules = 1,1,1,1,0

// --- standard part parameters ---
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ category = Utility
subcategory = 0
title = 'Driller Jr.' Aerospace Mining Excavator
manufacturer = Insanity Aerospace
description = A compact mining drill designed to extract usable materials from asteriods and planetary regolith. When not deployed, it fits within a mk2 fuselage compatible aeroshell housing.This unit can be operated by an engineer for better efficiency.
attachRules = 1,1,1,0,0
description = A compact mining drill designed to extract usable materials from asteriods and planetary regolith. When not deployed, it fits within a mk2 fuselage compatible aeroshell housing. When operated by a skilled engineer, you will be able to operate with better efficiency. These modules operate best at their ideal operating temperatures, and features auto-shutdown in the event of excessive overheating. Radiators can be used to help manage excessive heat.

attachRules = 1,1,1,1,0

// --- standard part parameters ---
mass = 0.5
mass = 0.65
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
Expand All @@ -40,27 +41,46 @@ maxTemp = 2000 // = 3000
{
name = ModuleResourceHarvester
HarvesterType = 0
Efficiency = 0.75
Efficiency = 0.85
ResourceName = Ore
ConverterName = Surface Harvester
StartActionName = Start Surface Harvester
StopActionName = Stop Surface Harvester
ImpactTransform = ImpactTransform
ImpactRange = 3
AutoShutdown = false
GeneratesHeat = false
ImpactRange = 5
AutoShutdown = true
UseSpecialistBonus = true
SpecialistEfficiencyFactor = 0.2
SpecialistBonusBase = 0.05
Specialty = Engineer
EfficiencyBonus = 0.75


EfficiencyBonus = 1
GeneratesHeat = true
INPUT_RESOURCE
{
ResourceName = ElectricCharge
Ratio = 15
}
TemperatureModifier
{
key = 0 10000
key = 250 7500
key = 500 5000
key = 750 500
key = 1000 0
}
UseSpecialistBonus = true
SpecialistEfficiencyFactor = 0.2
SpecialistBonusBase = 0.05
Specialty = Engineer
EfficiencyBonus = 1
ThermalEfficiency
{
key = 0 0.1
key = 250 .1
key = 500 1
key = 750 .1
key = 1000 0
}
}

MODULE
Expand All @@ -70,26 +90,57 @@ maxTemp = 2000 // = 3000
StartActionName = Start Asteroid Harvester
StopActionName = Stop Asteroid Harvester
PowerConsumption = 1.5
Efficiency = 7.5
ImpactRange = 3
Efficiency = 3.5
ImpactRange = 5
ImpactTransform = ImpactTransform
UseSpecialistBonus = true
AutoShutdown = false
GeneratesHeat = false
AutoShutdown = true
GeneratesHeat = true
TemperatureModifier
{
key = 0 10000
key = 250 5000
key = 500 2500
key = 750 500
key = 1000 0
}
UseSpecialistBonus = true
SpecialistEfficiencyFactor = 0.2
SpecialistBonusBase = 0.05
Specialty = Engineer
EfficiencyBonus = 0.75


EfficiencyBonus = 1
ThermalEfficiency
{
key = 0 0.1
key = 250 .1
key = 500 1
key = 750 .1
key = 1000 0
}
}

MODULE
{
name = ModuleAnimationGroup
deployAnimationName = Deploy_Drill
activeAnimationName =
activeAnimationName = Drill_Running
moduleType = Drill
}
MODULE
{
name = ModuleCoreHeat
CoreTempGoal = 500 //Internal temp goal - we don't transfer till we hit this point
CoreToPartRatio = 0.1 //Scale back cooling if the part is this % of core temp
CoreTempGoalAdjustment = 0 //Dynamic goal adjustment
CoreEnergyMultiplier = 0.1 //What percentage of our core energy do we transfer to the part
HeatRadiantMultiplier = 0.25 //If the core is hotter, how much heat radiates?
CoolingRadiantMultiplier = 0 //If the core is colder, how much radiates?
HeatTransferMultiplier = 0 //If the part is hotter, how much heat transfers in?
CoolantTransferMultiplier = 0.01 //If the part is colder, how much of our energy can we transfer?
radiatorCoolingFactor = 1 //How much energy we pull from core with an active radiator? >= 1
radiatorHeatingFactor = 0.05 //How much energy we push to the active radiator
MaxCalculationWarp = 1000 //Based on how dramatic the changes are, this is the max rate of change
CoreShutdownTemp = 1000 //At what core temperature do we shut down all generators on this part?
MaxCoolant = 100 //Maximum amount of radiator capacity we can consume - 50 = 1 small
}
}
Loading

0 comments on commit 026a854

Please sign in to comment.