Skip to content

Commit

Permalink
Merge pull request #60 from DMagic1/dev
Browse files Browse the repository at this point in the history
Version 1.3
  • Loading branch information
DMagic1 committed May 18, 2016
2 parents 1e529ba + c3cafa9 commit 246a967
Show file tree
Hide file tree
Showing 28 changed files with 897 additions and 254 deletions.
30 changes: 29 additions & 1 deletion GameData/DMagicOrbitalScience/Change Log.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,32 @@
v1.2.4
v1.3
- Update for KSP 1.1.2

- Added new versions of SIGINT dish
- The standard version is now 1.25m
- A new version is added that fits on the top of a rocket and acts as a nose cone
- The existing part is still included, but cannot be researched or purchased
- All parts use the same experiment
- The smaller dish can only collect 50% of the total science

- Combined the two reconnaissance telescope experiments
- Both parts use the same experiment
- The small telescope can only gather 50% of the total science; through either transmission or recovery
- The large telescope can gather 100% of the total science through recovering the data

- The total amount of science each experiment can collect is indicated in the VAB extra info tab

- Asteroid spectral types have been switched to those used by Custom Asteroids
- Only five types are now included; down from nine
- Science results have been updated accordingly
- Asteroid type will be pulled from Custom Asteroids if it is installed

- Fix TweakScale bugs with stack attached parts
- Add new science experiment function to TweakScale definitions
- Increases the cost as science part size is decreased
- Fix some bugs in the API
- Fix some bugs in the anomaly sensor caused by null strings

v1.2.4
- Updated for KSP 1.1.1

- Add a new API for better mod compatibility
Expand Down
10 changes: 5 additions & 5 deletions GameData/DMagicOrbitalScience/DMagicOrbitalScience.version
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"NAME":"DMagic Orbital Science",
"URL":"https://raw.githubusercontent.com/DMagic1/Orbital-Science/master/GameData/DMagicOrbitalScience/DMagicOrbitalScience.version",
"DOWNLOAD":"https://spacedock.info/mod/128/DMagic%20Orbital%20Science/download/1.2.4",
"DOWNLOAD":"https://spacedock.info/mod/128/DMagic%20Orbital%20Science/download/1.3",
"GITHUB":{
"USERNAME":"DMagic1",
"REPOSITORY":"Orbital-Science",
"ALLOW_PRE_RELEASE":false,
},
"VERSION":{
"MAJOR":1,
"MINOR":2,
"PATCH":4,
"MINOR":3,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":1,
"PATCH":1
"PATCH":2
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":1,
"PATCH":1
"PATCH":2
},
"KSP_VERSION_MAX":{
"MAJOR":1,
Expand Down
2 changes: 1 addition & 1 deletion GameData/DMagicOrbitalScience/Installation ReadMe.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Version 1.2.4
Version 1.3
KSP Forum thread: http://forum.kerbalspaceprogram.com/index.php?/topic/59009-1
Installation:

Expand Down
4 changes: 3 additions & 1 deletion GameData/DMagicOrbitalScience/OversizeScience/LargeRecon.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ MODULE
openDoorsOnly = false

filmCannisterName = cannister

totalScienceLevel = 1

customFailMessage = The recon telescope is meant to operate in low orbit.
animSpeed = 1
Expand All @@ -80,7 +82,7 @@ MODULE
showToggleEvent = true
toggleEventGUIName = Toggle Recon

experimentID = dmStereoRecon
experimentID = dmReconScan
experimentLimit = 4
xmitDataScalar = 0.75

Expand Down
8 changes: 4 additions & 4 deletions GameData/DMagicOrbitalScience/OversizeScience/SIGINT.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ NODE
scale = 1
rescaleFactor = 1.0

TechRequired = electronics
TechRequired = Unresearcheable
entryCost = 19000
cost = 14000
category = Science
category = none
subcategory = 0
title = Oversize Signals Intelligence Satellite
manufacturer = DMagic
Expand All @@ -45,8 +45,6 @@ maxTemp = 2500
emissiveConstant = 0.95
thermalMassModifier = 2.0
heatConductivity = 0.04
tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos (recon spy film aerial antenna deploy direct dish extend radio signal transmi
angularDrag = 2
dragModelType = default
Expand All @@ -73,6 +71,8 @@ DRAG_CUBE
customFailMessage = The dish is meant to operate in low orbit.
animSpeed = 1
totalScienceLevel = 1
oneShot = true
experimentAnimation = true
experimentWaitForAnimation = true
Expand Down
147 changes: 147 additions & 0 deletions GameData/DMagicOrbitalScience/OversizeScience/SIGINT_End.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
PART
{
name = dmSIGINT.End
module = Part
author = DMagic

MODEL
{
model = DMagicOrbitalScience/OversizeScience/SIGINT_End
scale = 1, 1, 1
}
NODE
{
name = bottom
transform = Node.Stack.Bottom
size = 2
method = FIXED_JOINT
}

scale = 1
rescaleFactor = 1.0

TechRequired = electronics
entryCost = 19000
cost = 14000
category = Science
subcategory = 0
title = Oversize Signals Intelligence Satellite
manufacturer = DMagic
description = A grossly oversized radio signals intelligence dish that can be used for listening in to every imaginable from of communication, discovering radio anomalies on a planet's surface, or just impressing your neighbor. This instrument also servers as a nose cone, and uses deployable fairing shrouds. Warning: Dish is FRAGILE; it is NOT for use in the atmosphere; CANNOT be retracted! Can be used at up to five times the normal low orbit altitude.
attachRules = 1,0,1,1,0
// --- standard part parameters ---
mass = 4
bulkheadProfiles = size2
crashTolerance = 10
maxTemp = 2500
emissiveConstant = 0.95
thermalMassModifier = 2.0
heatConductivity = 0.04
tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos (recon spy film aerial antenna deploy direct dish extend radio signal transmi aero )cap cone drag fairing nose protect shroud stage
angularDrag = 2
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
DRAG_CUBE
{
cube = Fairing, 20.38,0.7591,1.558, 20.38,0.7593,1.558, 6.665,0.4144,4.341, 6.665,0.7975,1.029, 20.33,0.7648,1.558, 20.33,0.763,1.558, -1.192E-07,-4.768E-07,1.192E-07, 2.929,8,2.929
cube = Clean, 13.58,0.7449,1.546, 13.58,0.7452,1.546, 6.665,0.9836,5.636, 6.665,0.7975,1.049, 13.58,0.7247,1.546, 13.58,0.7213,1.546, 2.384E-07,-0.7577,4.768E-07, 2.929,6.485,2.929
}
MODULE
{
name = DMSIGINT
animationName = dishDeploy
totalScienceLevel = 1
breakable = true
breakingForce = 0.25
fixable = true
fixLevel = 2
forwardTransformName = armBase.001
customFailMessage = The dish is meant to operate in low orbit.
animSpeed = 1
useFairings = true
stagingDeploy = true
oneShot = true
experimentAnimation = true
experimentWaitForAnimation = true
waitForAnimationTime = -1
keepDeployedMode = 2
startEventGUIName = Deploy Dish
showStartEvent = true
endEventGUIName = Retract Dish
showEndEvent = false
showEditorEvents = false
showToggleEvent = false
experimentID = dmSIGINT
experimentLimit = 1
xmitDataScalar = 1
experimentActionName = Collect Radio Data
useStaging = False
useActionGroups = True
hideUIwhenUnavailable = False
rerunnable = True
dataIsCollectable = True
collectActionName = Take Data
interactionRange = 4
externalDeploy = True
usageReqMaskExternal = 8
asteroidReports = False
}
MODULE
{
name = ModuleDataTransmitter
packetInterval = 0.08
packetSize = 4
packetResourceCost = 55.0
requiredResource = ElectricCharge
DeployFxModules = 0
}
MODULE
{
name = ModuleJettison
jettisonName = Fairing.000
bottomNodeName = bottom
allowShroudToggle = False
hideJettisonMenu = True
isFairing = False
jettisonedObjectMass = 0.1
jettisonForce = 15
jettisonDirection = 1 0 0.5
stagingEnable = False
stagingToggleEnabledEditor = False
stagingToggleEnabledFlight = False
}
MODULE
{
name = ModuleJettison
jettisonName = Fairing.001
bottomNodeName = bottom
allowShroudToggle = False
hideJettisonMenu = True
isFairing = False
jettisonedObjectMass = 0.1
jettisonForce = 15
jettisonDirection = -1 0 0.5
stagingEnable = False
stagingToggleEnabledEditor = False
stagingToggleEnabledFlight = False
}
}
Binary file not shown.
119 changes: 119 additions & 0 deletions GameData/DMagicOrbitalScience/OversizeScience/SIGINT_Small.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
PART
{
name = dmSIGINT.Small
module = Part
author = DMagic

MODEL
{
model = DMagicOrbitalScience/OversizeScience/SIGINT
scale = 0.5, 0.5, 0.5
}
NODE
{
name = top
transform = Node.Stack.Top
size = 2
method = FIXED_JOINT
}
NODE
{
name = bottom
transform = Node.Stack.Bottom
size = 2
method = FIXED_JOINT
}

scale = 1
rescaleFactor = 1.0

TechRequired = miniaturization
entryCost = 10000
cost = 7000
category = Science
subcategory = 0
title = Undersize Signals Intelligence Satellite
manufacturer = DMagic
description = A mildly oversized radio signals intelligence dish that can be used for listening in to every imaginable from of communication, discovering radio anomalies on a planet's surface, or just impressing your neighbor. Warning: Dish is FRAGILE; it is NOT for use in the atmosphere; CANNOT be retracted! Can be used at up to five times the normal low orbit altitude.
attachRules = 1,0,1,1,0
// --- standard part parameters ---
mass = 1
bulkheadProfiles = size1
crashTolerance = 10
maxTemp = 2500
emissiveConstant = 0.95
thermalMassModifier = 2.0
heatConductivity = 0.04
tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos (recon spy film aerial antenna deploy direct dish extend radio signal transmi
angularDrag = 2
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
DRAG_CUBE
{
cube = Default, 5.76416,0.39205515,0.675995, 5.76416,0.39205515,0.675995, 1.702934,0.39057,0.535, 1.702934,0.39057,0.535, 5.76416,0.39205515,0.675995, 5.76416,0.39205515,0.675995, -0.01584899,0.001224995,0.01347995, 1.46708,4.034092,1.46708
}
MODULE
{
name = DMSIGINT
animationName = dishDeploy
breakable = true
breakingForce = 0.25
fixable = true
fixLevel = 2
forwardTransformName = armPivot.005
customFailMessage = The dish is meant to operate in low orbit.
animSpeed = 1
totalScienceLevel = 0.4
oneShot = true
experimentAnimation = true
experimentWaitForAnimation = true
waitForAnimationTime = -1
keepDeployedMode = 2
startEventGUIName = Deploy Dish
showStartEvent = true
endEventGUIName = Retract Dish
showEndEvent = false
showEditorEvents = true
showToggleEvent = false
experimentID = dmSIGINT
experimentLimit = 1
xmitDataScalar = 1
experimentActionName = Collect Radio Data
useStaging = False
useActionGroups = True
hideUIwhenUnavailable = False
rerunnable = True
dataIsCollectable = True
collectActionName = Take Data
interactionRange = 3
externalDeploy = True
usageReqMaskExternal = 8
asteroidReports = False
}
MODULE
{
name = ModuleDataTransmitter
packetInterval = 0.1
packetSize = 2
packetResourceCost = 20.0
requiredResource = ElectricCharge
DeployFxModules = 0
}
}
Loading

0 comments on commit 246a967

Please sign in to comment.