Skip to content

Commit

Permalink
BETA 5.1 Master
Browse files Browse the repository at this point in the history
  • Loading branch information
Raven45 committed Apr 30, 2015
1 parent ab1caa9 commit b51d62a
Show file tree
Hide file tree
Showing 106 changed files with 269 additions and 215 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,25 @@ folder before installing a new version.

Extract the enclosed files to your GameData folder.

Included is another folder entitled "Compatibility Patch for Distant Object v1.5.1," this is needed
only if you are running Distant Object v1.5.1. The contents of that folder contains a compatibility
patch that makes CactEye 2 fully compatible with Distant Object 1.5.1. If you are not using
Distant Object, then the patch is not needed and will introduce unneccesary log spam.
Included is another folder entitled "Compatibility Patch for Distant Object v1.5.4," this is needed
only if you are running Distant Object v1.5.4. The contents of that folder contains a compatibility
patch that makes CactEye 2 fully compatible with Distant Object 1.5.4. If you are not using
Distant Object, then the patch is not needed and will introduce unnecessary log spam.

To install the Compatibility patch for Distant Object Enhancement, extract the contents of the
"Compatibility Patch for Distant Object v1.5.1" folder to your GameData folder.
"Compatibility Patch for Distant Object v1.5.4" folder to your GameData folder.

******************Change Log******************

CactEye 2 BETA 5.1
-Compatibility update for KSP 1.0
-Compatibility update for Distant Object Enhancement 1.5.4
-Added support for Outer Planets Mod, thanks to ImAHungryMan!
-Removed the CactEye agency, for now. This was to prevent KSP from breaking if CactEye is removed.
This could break existing save games, you have been warned. The agency will be added back in a future
update as other modders and I figure out a better way to manage custom agencies without ruining
people's save games.

CactEye 2 BETA 5
-Fixed an issue where the telescope would throw an incorrect "out of power" message when the telescope was
equipped with both an asteroid and a wide field processor.
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"NAME":"CactEye 2 Orbital Telescope","URL":"http://ksp-avc.cybutek.net/version.php?id=115","DOWNLOAD":"http://kerbal.curseforge.com/ksp-mods/226554-cacteye-2-orbital-telescope","CHANGE_LOG_URL":"https://github.com/Raven45/CactEye-2","VERSION":{"MAJOR":0,"MINOR":0,"PATCH":5,"BUILD":0},"KSP_VERSION":{"MAJOR":0,"MINOR":90,"PATCH":0},"KSP_VERSION_MIN":{"MAJOR":0,"MINOR":90,"PATCH":0},"KSP_VERSION_MAX":{"MAJOR":0,"MINOR":90,"PATCH":0}}
{"NAME":"CactEye 2 Orbital Telescope","URL":"http://ksp-avc.cybutek.net/version.php?id=115","DOWNLOAD":"http://kerbal.curseforge.com/ksp-mods/226554-cacteye-2-orbital-telescope","CHANGE_LOG_URL":"https://github.com/Raven45/CactEye-2","VERSION":{"MAJOR":0,"MINOR":0,"PATCH":5,"BUILD":1},"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":0},"KSP_VERSION_MIN":{"MAJOR":0,"MINOR":90,"PATCH":0},"KSP_VERSION_MAX":{"MAJOR":0,"MINOR":90,"PATCH":0}}
26 changes: 26 additions & 0 deletions CactEye 2 BETA 5.1/GameData/CactEye/Resources/OPMScienceDefs.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//This file adds support for the Outer Planets Mod by CaptRobau and Eudae55.
//Note that Eeloo's default science report is replaced with a different one because this mod turns into one of Sarnus' moons.

@EXPERIMENT_DEFINITION[*]:HAS[#id[CactEyePlanetary]]:NEEDS[OPM]
{
%RESULTS
{
SarnusInSpaceHigh = Early astronomers believed Sarnus were in fact multiple planets, closely orbiting together. When they cleaned their telescopes, they realized that those extra planets were in fact thin rings orbiting Sarnus. Regular cleaning of telescope lenses became mandatory after that.

HaleInSpaceHigh = This small moonlet orbiting in the rings of Sarnus is named after Hale, a female shepherd from Kerbal mythology who saved the galaxy from certain destruction. Its location in Sarnus' rings results in some of the finest views in the Kerbol system.
OvokInSpaceHigh = Ovok's characteristic smooth shape is caused by the tidal force exerted by Sarnus and Ovok's gravity. This has led scientists to believe that the moon must consist of an icy fluff, that easily contracts and expands, resulting in a landscape that is free of deep impact craters. The moon was named for Ovok, a mythological beast known for its soft fur and razor-like claws.
%EelooInSpaceHigh = Until recently astronomers thought Eeloo was a dwarf planet beyond Neidon's orbit. It actually turned out to be a moon of Sarnus and they all this time it had for some reason been confused with the distant dwarf planet Plock. Scientists think the moon might harbor a liquid ocean beneath its frozen crust.

SlateInSpaceHigh = Evidence suggests that Slate was very much like Kerbin until only a few hundred thousand years ago. An unknown cataclysm seems to have stripped the moon of its atmosphere and leaving nothing but a dead husk behind. Its vibrant orange and brown color palette has inspired painters ever since its discovery, including the world-renowned Vincent van Kerman.

TektoInSpaceHigh = This moon has a very dense atmosphere for a body its size. Combined with the low gravity, this means that a Kerbal with wings attached to his arms could lift off from the surface of the moon under his own power. Those wings would have to be made of some sturdy materials though, as Tekto's atmosphere appears to very violent.
UrlumInSpaceHigh = It took a while for Kerbal astronomers to realize Urlum was not a far away star, but in fact another planet. Since then scientists have been weary of making claims about Urlum, for fear of being wrong yet again. The ice giant is unusual in that it rotates around its axis in a clockwise fashion, unlike the anti-clockwise rotation of the other planets.
NeidonInSpaceHigh = Due to its distance from Kerbin, it wasn't until fairly recently that Kerbalkind discovered the Kerbol system's most distant planet. At first scientists thought Neidon might a purple, rocky planet like Eve, but they quickly realized they were in fact looking at an ice giant similar to Urlum.
PlockInSpaceHigh = There’s been a considerable amount of controversy status of Plock as being a proper planet or just a lump of ice going around the Sun. The debate is still ongoing, as most academic summits held to address the issue have devolved into, on good days, petty name calling, and on worse ones, all-out brawls.
}
}
210 changes: 210 additions & 0 deletions CactEye 2 BETA 5.1/GameData/CactEye/Resources/ScienceDefs.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
EXPERIMENT_DEFINITION
{
id = CactEyePlanetary
title = Wide Field Camera Observation
baseValue = 16
scienceCap = 16
dataScale = 1
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = You make an observation of the body.

KerbinInSpaceHigh = A unique world, Kerbin has flat plains, soaring mountains and wide, blue oceans. Home to the Kerbals, it has just the right conditions to support a vast, seemingly undepletable population of the eager green creatures.

MunInSpaceHigh = The Mun, is a large satellite orbiting Kerbin. It is mostly grey in appearance, with craters of various sizes dotting its otherwise smooth surface.

MinmusInSpaceHigh = Minmus is the smallest moon orbiting Kerbin. From the surface of Kerbin, it can be seen on clear days as a tiny blue speck in the sky. It is often mistaken as dirt on the telescope lenses or dead pixels but the top minds at the Kerbal Astronomical Society assure us that it is a real moon never the less.

DunaInSpaceHigh = Also known as the red dot that you can see if you squint at it really hard, Duna has long been a wonder to Kerbalkind.

IkeInSpaceHigh = Ike is a relatively large, grey object occasionally seen orbiting Duna. Scientists have postulated that Ike is seemingly perfectly positioned to sneakily interfere with any object that presumes to come orbiting near its parent.

DresInSpaceHigh = Dres is a very small planet. It was the first planet considered to be a dwarf. Its orbit is highly irregular and, together with its size, it took a long time to discover since half the time it was not where scientists expected to find a planet. Due to its nature of frequenting the bad parts of space. This dwarf planet was officially labeled as Not to be trusted by the scientific community.

JoolInSpaceHigh = Jool is particularly known for being a rather large, predominantly green planet. Kerbalkind has longed to visit it since it was first spotted in the sky. Philosophers reason that the swirling green planet must be a really nice place to visit, on account of its wholesome coloration. If you look at Jool through a telescope, it is fuzzy.

VallInSpaceHigh = Vall was one of the last Moons of Jool to be discovered. Frustrated scientists kept trying to wipe it off the lenses of their telescopes. Eventually after a rash of returned telescopes, Advanced Optics Co. finally decided to just tell them it was an actual object in the sky.

TyloInSpaceHigh = Tylo was the first moon of Jool to be discovered by the Kerbal Astronomical Society. After many failed attempts to take a flawless picture of Jool to hang on the office walls, it was finally discovered that the wandering white smear was indeed a moon. Scientists speculate that the view from the surface with Laythe, Vall, and Jool overhead must be quite something.

BopInSpaceHigh = Bop is a small moon in the vicinity of Jool. In Kerbal mythology, Bop is believed to be the home of the Kraken, a mischievous creature said to play with the ships of hapless explorers by spinning them out of control until torn asunder, then casting them into oblivion.

PolInSpaceHigh = This moon was especially hard to spot, as it looks just like a pollen grain, particularly when observed through telescopes based near dusty fields. Pol was finally discovered when someone decided to write down the location of the pollen, after given up on yet another failed attempt to be rid of the smudge.

EelooInSpaceHigh = There’s been a considerable amount of controversy status of Eeloo as being a proper planet or just a lump of ice going around the sun. The debate is still ongoing, as most academic summits held to address the issue have devolved into, on good days, petty name calling, and on worse ones, all-out brawls.

MohoInSpaceHigh = Moho figures in Kerbal mythology as a fiery place with oceans of flowing lava. In reality, however, it's much less interesting. Scientists speculate about possible ways to make it awesome like in the stories. Some of those ideas have led to new breakthroughs in aerospace technology.
EveInSpaceHigh = Eve is certainly the purplest object in the solar system. Its one of the larger, most visible objects, mainly because of its very, very purple tint. It is considered by some to be an almost sister planet to Kerbin. Well, despite the purple, and the toxic atmosphere, and the extreme pressures and temperatures… Actually, it’s not very similar at all is it? Who are these people?
GillyInSpaceHigh = Gilly is a lumpy rock wandering around the orbit of Eve. Its by far the smallest natural satellite that the Kerbal Astronomical Society has discovered. Due to the large amount of squinting and eye strain associated with its discovery, wearing glasses has now become synonymous with becoming an accomplished Astronomer.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeOccultation
title = Star Occultation Observation
baseValue = 64
scienceCap = 64
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = You make an observation of the planetary occultation.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeAsteroid_A
title = Class A Asteroid Observation
baseValue = 64
scienceCap = 64
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = Class A asteroids are really rather small. This particular subject seems to measure about 3 metres across and maaaybe 10 tons soaking wet. You can almost put it in your pocket! Well, if you had a pocket that was 3 metres across...they have those, right?
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeOccultationAsteroid_A
title = Class A Star Occultation Asteroid Observation
baseValue = 768
scienceCap = 768
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = You make an observation of the asteroid occultation.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeAsteroid_B
title = Class B Asteroid Observation
baseValue = 64
scienceCap = 64
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = These B-class asteroids are a step up from the A-class in both size and mass. This one appears to adhere to that guideline, if only slightly. It's gonna take a bit of finagling if you want to bring this one home.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeOccultationAsteroid_B
title = Class B Star Occultation Asteroid Observation
baseValue = 768
scienceCap = 768
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = You make an observation of the asteroid occultation.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeAsteroid_C
title = Class C Asteroid Observation
baseValue = 64
scienceCap = 64
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = Ah, if it isn't a Class C! Pretty standard space rock, not too big, not too small. Definitely something to keep an eye out for though. An asteroid this size could knock out KSC if it was in the wrong place at the wrong time.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeOccultationAsteroid_C
title = Class C Star Occultation Asteroid Observation
baseValue = 768
scienceCap = 768
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = You make an observation of the asteroid occultation.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeAsteroid_D
title = Class D Asteroid Observation
baseValue = 64
scienceCap = 64
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = On the larger end of the scale, class-D asteroids can mass up to several hundred tons of rock and ice. This one would make an excellent addition to any space station.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeOccultationAsteroid_D
title = Class D Star Occultation Asteroid Observation
baseValue = 768
scienceCap = 768
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = You make an observation of the asteroid occultation.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeAsteroid_E
title = Class E Asteroid Observation
baseValue = 64
scienceCap = 64
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = Look at the size of that monstrosity! You're quite certain that Class E stands for Enormous. Because it is. You can't wait to show this to the other guys...it's gonna rock their world, hahaha. Hopefully not literally. That would be bad.
}
}
EXPERIMENT_DEFINITION
{
id = CactEyeOccultationAsteroid_E
title = Class E Star Occultation Asteroid Observation
baseValue = 768
scienceCap = 768
dataScale = 0.5
requireAtmosphere = False
situationMask = 32
biomeMask = 0
RESULTS
{
default = You make an observation of the asteroid occultation.
}
}
15 changes: 0 additions & 15 deletions CactEye 2 BETA 5/GameData/CactEye/Resources/Agency.cfg

This file was deleted.

0 comments on commit b51d62a

Please sign in to comment.