diff --git a/CactEye 2 BETA 3/CactEye 2 README.txt b/CactEye 2 BETA 3/CactEye 2 README.txt new file mode 100644 index 0000000..31fbb57 --- /dev/null +++ b/CactEye 2 BETA 3/CactEye 2 README.txt @@ -0,0 +1,30 @@ +******************Installation Instructions****************** +If you are currently using an older version of CactEye, then please delete CactEye from your GameData +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. + +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. + +******************Change Log****************** + +CactEye 2 BETA 3 +-Fixed an issue where running a science experiment with either the "Wide Field Camera 1" or +"Wide Field Camera 2" would produce a "NullReferenceException." +-Fixed an issue where attempting to switch to another processor would grey the GUI out with the error +message that the telescope was out of power, even with full batteries. +-Fixed a "ArgumentOutOfRange" exception that would be thrown while switching to another processor. +-Fixed an issue with both the Wide Field Camera processors and the Asteroid Camera processors where an +incorrect amount of science points would be awarded. + +CactEye 2 BETA 2 +-Completely rewritten code base for CactEye. +-Completely redesigned GUI for the Telescope controls. +-Asteroid telescopes should no longer be restricted to Kerbin orbit. +-Occulation experiments are not yet available. \ No newline at end of file diff --git a/GameData/CactEye/Plugins/DistantObjectHook.dll b/CactEye 2 BETA 3/Compatibility Patch for Distant Object v1.5.1/GameData/CactEye/Plugins/DistantObjectHook.dll similarity index 96% rename from GameData/CactEye/Plugins/DistantObjectHook.dll rename to CactEye 2 BETA 3/Compatibility Patch for Distant Object v1.5.1/GameData/CactEye/Plugins/DistantObjectHook.dll index 4ac1344..42ed9a8 100644 Binary files a/GameData/CactEye/Plugins/DistantObjectHook.dll and b/CactEye 2 BETA 3/Compatibility Patch for Distant Object v1.5.1/GameData/CactEye/Plugins/DistantObjectHook.dll differ diff --git a/GameData/CactEye/Icons/CactEyeOptics.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/CactEyeOptics.png similarity index 100% rename from GameData/CactEye/Icons/CactEyeOptics.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/CactEyeOptics.png diff --git a/GameData/CactEye/Icons/CactEyeOptics_scaled.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/CactEyeOptics_scaled.png similarity index 100% rename from GameData/CactEye/Icons/CactEyeOptics_scaled.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/CactEyeOptics_scaled.png diff --git a/GameData/CactEye/Icons/ExperimentGUIBackground.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/ExperimentGUIBackground.png similarity index 100% rename from GameData/CactEye/Icons/ExperimentGUIBackground.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/ExperimentGUIBackground.png diff --git a/GameData/CactEye/Icons/atom6.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/atom6.png similarity index 100% rename from GameData/CactEye/Icons/atom6.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/atom6.png diff --git a/GameData/CactEye/Icons/back19.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/back19.png similarity index 100% rename from GameData/CactEye/Icons/back19.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/back19.png diff --git a/GameData/CactEye/Icons/crosshair.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/crosshair.png similarity index 100% rename from GameData/CactEye/Icons/crosshair.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/crosshair.png diff --git a/GameData/CactEye/Icons/forward19.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/forward19.png similarity index 100% rename from GameData/CactEye/Icons/forward19.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/forward19.png diff --git a/GameData/CactEye/Icons/preview.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/preview.png similarity index 100% rename from GameData/CactEye/Icons/preview.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/preview.png diff --git a/GameData/CactEye/Icons/save.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/save.png similarity index 100% rename from GameData/CactEye/Icons/save.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/save.png diff --git a/GameData/CactEye/Icons/target.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/target.png similarity index 100% rename from GameData/CactEye/Icons/target.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/target.png diff --git a/GameData/CactEye/Icons/toolbar.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/toolbar.png similarity index 100% rename from GameData/CactEye/Icons/toolbar.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/toolbar.png diff --git a/GameData/CactEye/Icons/toolbar_disabled.png b/CactEye 2 BETA 3/GameData/CactEye/Icons/toolbar_disabled.png similarity index 100% rename from GameData/CactEye/Icons/toolbar_disabled.png rename to CactEye 2 BETA 3/GameData/CactEye/Icons/toolbar_disabled.png diff --git a/GameData/CactEye/Parts/Processors/Asteroid1/base.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid1/base.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid1/base.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid1/base.png diff --git a/GameData/CactEye/Parts/Processors/Asteroid1/processorAsteroid1.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid1/processorAsteroid1.cfg similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid1/processorAsteroid1.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid1/processorAsteroid1.cfg diff --git a/GameData/CactEye/Parts/Processors/Asteroid1/processorAsteroid1.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid1/processorAsteroid1.mu similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid1/processorAsteroid1.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid1/processorAsteroid1.mu diff --git a/GameData/CactEye/Parts/Processors/Asteroid1/processor_asteroid1.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid1/processor_asteroid1.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid1/processor_asteroid1.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid1/processor_asteroid1.png diff --git a/GameData/CactEye/Parts/Processors/Asteroid2/base.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid2/base.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid2/base.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid2/base.png diff --git a/GameData/CactEye/Parts/Processors/Asteroid2/processorAsteroid2.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid2/processorAsteroid2.cfg similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid2/processorAsteroid2.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid2/processorAsteroid2.cfg diff --git a/GameData/CactEye/Parts/Processors/Asteroid2/processorAsteroid2.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid2/processorAsteroid2.mu similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid2/processorAsteroid2.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid2/processorAsteroid2.mu diff --git a/GameData/CactEye/Parts/Processors/Asteroid2/processor_asteroid2.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid2/processor_asteroid2.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid2/processor_asteroid2.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid2/processor_asteroid2.png diff --git a/GameData/CactEye/Parts/Processors/Asteroid3/base.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid3/base.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid3/base.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid3/base.png diff --git a/GameData/CactEye/Parts/Processors/Asteroid3/processorAsteroid3.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid3/processorAsteroid3.cfg similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid3/processorAsteroid3.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid3/processorAsteroid3.cfg diff --git a/GameData/CactEye/Parts/Processors/Asteroid3/processorAsteroid3.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid3/processorAsteroid3.mu similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid3/processorAsteroid3.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid3/processorAsteroid3.mu diff --git a/GameData/CactEye/Parts/Processors/Asteroid3/processor_asteroid3.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid3/processor_asteroid3.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Asteroid3/processor_asteroid3.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Asteroid3/processor_asteroid3.png diff --git a/GameData/CactEye/Parts/Processors/Planetary1/base.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/base.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary1/base.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/base.png diff --git a/GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.cfg similarity index 97% rename from GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.cfg index a95d14d..f138e6e 100644 --- a/GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.cfg +++ b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.cfg @@ -53,6 +53,6 @@ MODULE maxScience = 0.10 consumeRate = 2.0 MinimumFOV = 0.01 - experimentID = CactEyePlanetary + ExperimentID = CactEyePlanetary } } \ No newline at end of file diff --git a/GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.mu similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/processorPlanetary1.mu diff --git a/GameData/CactEye/Parts/Processors/Planetary1/processor_planetary1.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/processor_planetary1.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary1/processor_planetary1.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary1/processor_planetary1.png diff --git a/GameData/CactEye/Parts/Processors/Planetary2/base.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/base.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary2/base.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/base.png diff --git a/GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.cfg similarity index 96% rename from GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.cfg index 4dfe0a9..a3bedab 100644 --- a/GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.cfg +++ b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.cfg @@ -52,7 +52,7 @@ MODULE Type = Wide Field Camera 2 maxScience = 0.30 consumeRate = 6.0 - minFOV = 0.005 - experimentID = CactEyePlanetary + MinimumFOV = 0.005 + ExperimentID = CactEyePlanetary } } \ No newline at end of file diff --git a/GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.mu similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/processorPlanetary2.mu diff --git a/GameData/CactEye/Parts/Processors/Planetary2/processor_planetary2.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/processor_planetary2.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary2/processor_planetary2.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary2/processor_planetary2.png diff --git a/GameData/CactEye/Parts/Processors/Planetary3/base.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary3/base.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary3/base.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary3/base.png diff --git a/GameData/CactEye/Parts/Processors/Planetary3/processorPlanetary3.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary3/processorPlanetary3.cfg similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary3/processorPlanetary3.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary3/processorPlanetary3.cfg diff --git a/GameData/CactEye/Parts/Processors/Planetary3/processorPlanetary3.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary3/processorPlanetary3.mu similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary3/processorPlanetary3.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary3/processorPlanetary3.mu diff --git a/GameData/CactEye/Parts/Processors/Planetary3/processor_planetary3.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary3/processor_planetary3.png similarity index 100% rename from GameData/CactEye/Parts/Processors/Planetary3/processor_planetary3.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/Processors/Planetary3/processor_planetary3.png diff --git a/GameData/CactEye/Parts/probeCoreSlim/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/probeCoreSlim/model.mu similarity index 100% rename from GameData/CactEye/Parts/probeCoreSlim/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/probeCoreSlim/model.mu diff --git a/GameData/CactEye/Parts/probeCoreSlim/model000.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/probeCoreSlim/model000.png similarity index 100% rename from GameData/CactEye/Parts/probeCoreSlim/model000.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/probeCoreSlim/model000.png diff --git a/GameData/CactEye/Parts/probeCoreSlim/model001_NRM.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/probeCoreSlim/model001_NRM.png similarity index 100% rename from GameData/CactEye/Parts/probeCoreSlim/model001_NRM.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/probeCoreSlim/model001_NRM.png diff --git a/GameData/CactEye/Parts/probeCoreSlim/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/probeCoreSlim/part.cfg similarity index 100% rename from GameData/CactEye/Parts/probeCoreSlim/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/probeCoreSlim/part.cfg diff --git a/GameData/CactEye/Parts/tele_bay/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model.mu similarity index 100% rename from GameData/CactEye/Parts/tele_bay/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model.mu diff --git a/GameData/CactEye/Parts/tele_bay/model000.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model000.png similarity index 100% rename from GameData/CactEye/Parts/tele_bay/model000.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model000.png diff --git a/GameData/CactEye/Parts/tele_bay/model001_NRM.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model001_NRM.png similarity index 100% rename from GameData/CactEye/Parts/tele_bay/model001_NRM.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model001_NRM.png diff --git a/GameData/CactEye/Parts/tele_bay/model002.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model002.png similarity index 100% rename from GameData/CactEye/Parts/tele_bay/model002.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model002.png diff --git a/GameData/CactEye/Parts/tele_bay/model003.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model003.png similarity index 100% rename from GameData/CactEye/Parts/tele_bay/model003.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/model003.png diff --git a/GameData/CactEye/Parts/tele_bay/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/part.cfg similarity index 100% rename from GameData/CactEye/Parts/tele_bay/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_bay/part.cfg diff --git a/GameData/CactEye/Parts/tele_body/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model.mu similarity index 100% rename from GameData/CactEye/Parts/tele_body/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model.mu diff --git a/GameData/CactEye/Parts/tele_body/model000.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model000.png similarity index 100% rename from GameData/CactEye/Parts/tele_body/model000.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model000.png diff --git a/GameData/CactEye/Parts/tele_body/model001_NRM.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model001_NRM.png similarity index 100% rename from GameData/CactEye/Parts/tele_body/model001_NRM.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model001_NRM.png diff --git a/GameData/CactEye/Parts/tele_body/model002.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model002.png similarity index 100% rename from GameData/CactEye/Parts/tele_body/model002.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model002.png diff --git a/GameData/CactEye/Parts/tele_body/model003.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model003.png similarity index 100% rename from GameData/CactEye/Parts/tele_body/model003.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/model003.png diff --git a/GameData/CactEye/Parts/tele_body/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/part.cfg similarity index 100% rename from GameData/CactEye/Parts/tele_body/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body/part.cfg diff --git a/GameData/CactEye/Parts/tele_body2/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body2/model.mu similarity index 100% rename from GameData/CactEye/Parts/tele_body2/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body2/model.mu diff --git a/GameData/CactEye/Parts/tele_body2/model000.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body2/model000.png similarity index 100% rename from GameData/CactEye/Parts/tele_body2/model000.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body2/model000.png diff --git a/GameData/CactEye/Parts/tele_body2/model001_NRM.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body2/model001_NRM.png similarity index 100% rename from GameData/CactEye/Parts/tele_body2/model001_NRM.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body2/model001_NRM.png diff --git a/GameData/CactEye/Parts/tele_body2/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body2/part.cfg similarity index 100% rename from GameData/CactEye/Parts/tele_body2/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_body2/part.cfg diff --git a/GameData/CactEye/Parts/tele_gru1/gru1.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru1/gru1.png similarity index 100% rename from GameData/CactEye/Parts/tele_gru1/gru1.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru1/gru1.png diff --git a/GameData/CactEye/Parts/tele_gru1/gru_NRM.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru1/gru_NRM.png similarity index 100% rename from GameData/CactEye/Parts/tele_gru1/gru_NRM.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru1/gru_NRM.png diff --git a/GameData/CactEye/Parts/tele_gru1/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru1/model.mu similarity index 100% rename from GameData/CactEye/Parts/tele_gru1/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru1/model.mu diff --git a/GameData/CactEye/Parts/tele_gru1/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru1/part.cfg similarity index 100% rename from GameData/CactEye/Parts/tele_gru1/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru1/part.cfg diff --git a/GameData/CactEye/Parts/tele_gru2/gru2.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru2/gru2.png similarity index 100% rename from GameData/CactEye/Parts/tele_gru2/gru2.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru2/gru2.png diff --git a/GameData/CactEye/Parts/tele_gru2/gru_NRM.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru2/gru_NRM.png similarity index 100% rename from GameData/CactEye/Parts/tele_gru2/gru_NRM.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru2/gru_NRM.png diff --git a/GameData/CactEye/Parts/tele_gru2/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru2/model.mu similarity index 100% rename from GameData/CactEye/Parts/tele_gru2/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru2/model.mu diff --git a/GameData/CactEye/Parts/tele_gru2/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru2/part.cfg similarity index 100% rename from GameData/CactEye/Parts/tele_gru2/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_gru2/part.cfg diff --git a/GameData/CactEye/Parts/tele_ladder/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_ladder/model.mu similarity index 100% rename from GameData/CactEye/Parts/tele_ladder/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_ladder/model.mu diff --git a/GameData/CactEye/Parts/tele_ladder/model000.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_ladder/model000.png similarity index 100% rename from GameData/CactEye/Parts/tele_ladder/model000.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_ladder/model000.png diff --git a/GameData/CactEye/Parts/tele_ladder/model001_NRM.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_ladder/model001_NRM.png similarity index 100% rename from GameData/CactEye/Parts/tele_ladder/model001_NRM.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_ladder/model001_NRM.png diff --git a/GameData/CactEye/Parts/tele_ladder/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_ladder/part.cfg similarity index 100% rename from GameData/CactEye/Parts/tele_ladder/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_ladder/part.cfg diff --git a/GameData/CactEye/Parts/tele_mount/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_mount/model.mu similarity index 100% rename from GameData/CactEye/Parts/tele_mount/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_mount/model.mu diff --git a/GameData/CactEye/Parts/tele_mount/model000.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_mount/model000.png similarity index 100% rename from GameData/CactEye/Parts/tele_mount/model000.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_mount/model000.png diff --git a/GameData/CactEye/Parts/tele_mount/model001_NRM.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_mount/model001_NRM.png similarity index 100% rename from GameData/CactEye/Parts/tele_mount/model001_NRM.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_mount/model001_NRM.png diff --git a/GameData/CactEye/Parts/tele_mount/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_mount/part.cfg similarity index 100% rename from GameData/CactEye/Parts/tele_mount/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_mount/part.cfg diff --git a/GameData/CactEye/Parts/tele_solarpanels/model.mu b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_solarpanels/model.mu similarity index 100% rename from GameData/CactEye/Parts/tele_solarpanels/model.mu rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_solarpanels/model.mu diff --git a/GameData/CactEye/Parts/tele_solarpanels/model000.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_solarpanels/model000.png similarity index 100% rename from GameData/CactEye/Parts/tele_solarpanels/model000.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_solarpanels/model000.png diff --git a/GameData/CactEye/Parts/tele_solarpanels/model001.png b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_solarpanels/model001.png similarity index 100% rename from GameData/CactEye/Parts/tele_solarpanels/model001.png rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_solarpanels/model001.png diff --git a/GameData/CactEye/Parts/tele_solarpanels/part.cfg b/CactEye 2 BETA 3/GameData/CactEye/Parts/tele_solarpanels/part.cfg similarity index 100% rename from GameData/CactEye/Parts/tele_solarpanels/part.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Parts/tele_solarpanels/part.cfg diff --git a/GameData/CactEye/Plugins/CET_FSanimateGeneric.dll b/CactEye 2 BETA 3/GameData/CactEye/Plugins/CET_FSanimateGeneric.dll similarity index 100% rename from GameData/CactEye/Plugins/CET_FSanimateGeneric.dll rename to CactEye 2 BETA 3/GameData/CactEye/Plugins/CET_FSanimateGeneric.dll diff --git a/CactEye 2 BETA 3/GameData/CactEye/Plugins/CactEye2.dll b/CactEye 2 BETA 3/GameData/CactEye/Plugins/CactEye2.dll new file mode 100644 index 0000000..07c117b Binary files /dev/null and b/CactEye 2 BETA 3/GameData/CactEye/Plugins/CactEye2.dll differ diff --git a/GameData/CactEye/Resources/Agency.cfg b/CactEye 2 BETA 3/GameData/CactEye/Resources/Agency.cfg similarity index 100% rename from GameData/CactEye/Resources/Agency.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Resources/Agency.cfg diff --git a/GameData/CactEye/Resources/ScienceDefs.cfg b/CactEye 2 BETA 3/GameData/CactEye/Resources/ScienceDefs.cfg similarity index 100% rename from GameData/CactEye/Resources/ScienceDefs.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Resources/ScienceDefs.cfg diff --git a/GameData/CactEye/Resources/windowPos.cfg b/CactEye 2 BETA 3/GameData/CactEye/Resources/windowPos.cfg similarity index 100% rename from GameData/CactEye/Resources/windowPos.cfg rename to CactEye 2 BETA 3/GameData/CactEye/Resources/windowPos.cfg diff --git a/CactEye2.v11.suo b/CactEye2.v11.suo index 475aeb6..f80b9a4 100644 Binary files a/CactEye2.v11.suo and b/CactEye2.v11.suo differ diff --git a/CactEye2/CactEyeAsteroidProcessor.cs b/CactEye2/CactEyeAsteroidProcessor.cs index f6959d1..8b71198 100644 --- a/CactEye2/CactEyeAsteroidProcessor.cs +++ b/CactEye2/CactEyeAsteroidProcessor.cs @@ -85,7 +85,7 @@ public override string DoScience(Vector3 TargetPosition, bool IsSmallOptics, flo SciencePoints *= 0.1f; } - ScienceData Data = new ScienceData(AsteroidExperiment.baseValue, 1f, 0f, AsteroidSubject.id, Type + " " + TargetName + " Observation"); + ScienceData Data = new ScienceData(SciencePoints, 1f, 0f, AsteroidSubject.id, Type + " " + TargetName + " Observation"); StoredData.Add(Data); ReviewData(Data, Screenshot); return ""; diff --git a/CactEye2/CactEyeWideField.cs b/CactEye2/CactEyeWideField.cs index d47a058..a68b70f 100644 --- a/CactEye2/CactEyeWideField.cs +++ b/CactEye2/CactEyeWideField.cs @@ -68,27 +68,39 @@ public override string DoScience(Vector3 TargetPosition, bool IsSmallOptics, flo else { + float SciencePoints = 0f; string TargetName = Target.name; - ScienceExperiment WideFieldExperiment = ResearchAndDevelopment.GetExperiment(ExperimentID); - ScienceSubject WideFieldSubject = ResearchAndDevelopment.GetExperimentSubject(WideFieldExperiment, ExperimentSituations.InSpaceHigh, Target, ""); + ScienceExperiment WideFieldExperiment; + ScienceSubject WideFieldSubject; + + try + { + WideFieldExperiment = ResearchAndDevelopment.GetExperiment(ExperimentID); + WideFieldSubject = ResearchAndDevelopment.GetExperimentSubject(WideFieldExperiment, ExperimentSituations.InSpaceHigh, Target, ""); - SciencePoints += WideFieldExperiment.baseValue * WideFieldExperiment.dataScale * maxScience; + SciencePoints += WideFieldExperiment.baseValue * WideFieldExperiment.dataScale * maxScience; - //These two lines cause a bug where the experiment gives an infinite supply of science points. - //WideFieldSubject.scientificValue = 1f; - //WideFieldSubject.science = 0f; + Debug.Log("CactEye 2: SciencePoints: " + SciencePoints.ToString()); - Debug.Log("CactEye 2: SciencePoints: " + SciencePoints.ToString()); + if (IsSmallOptics) + { + SciencePoints *= 0.1f; + } - if (IsSmallOptics) + ScienceData Data = new ScienceData(SciencePoints, 1f, 0f, WideFieldSubject.id, Type + " " + TargetName + " Observation"); + StoredData.Add(Data); + ReviewData(Data, Screenshot); + } + + catch (Exception e) { - SciencePoints *= 0.1f; + Debug.Log("CactEye 2: Excpetion #: Was not able to find Experiment with ExperimentID: " + ExperimentID.ToString()); + Debug.Log(e.ToString()); + + return "An error occurred. Please post on the Official CactEye 2 thread on the Kerbal Forums."; } - ScienceData Data = new ScienceData(WideFieldExperiment.baseValue, 1f, 0f, WideFieldSubject.id, Type + " " + TargetName + " Observation"); - StoredData.Add(Data); - ReviewData(Data, Screenshot); return ""; } } diff --git a/CactEye2/TelescopeMenu.cs b/CactEye2/TelescopeMenu.cs index 68f1a65..2c64103 100644 --- a/CactEye2/TelescopeMenu.cs +++ b/CactEye2/TelescopeMenu.cs @@ -45,6 +45,7 @@ class TelescopeMenu: MonoBehaviour //private ModuleReactionWheel[] ReactionWheels; private List Processors = new List(); private CactEyeProcessor ActiveProcessor; + private int CurrentProcessorIndex = 0; private List ReactionWheels = new List(); private List ReactionWheelPitchTorques = new List(); private List ReactionWheelYawTorques = new List(); @@ -374,7 +375,17 @@ private void DrawProcessorControls() { //DisplayText("Saved screenshot to " + opticsModule.GetTex(true, targetName)); //ActiveProcessor.GenerateScienceReport(TakeScreenshot(ActiveProcessor.GetType())); - Notification = ActiveProcessor.DoScience(GetTargetPos(FlightGlobals.fetch.VesselTarget.GetTransform().position, 500f), false, CameraModule.FieldOfView, CameraModule.TakeScreenshot(ActiveProcessor)); + try + { + Notification = ActiveProcessor.DoScience(GetTargetPos(FlightGlobals.fetch.VesselTarget.GetTransform().position, 500f), false, CameraModule.FieldOfView, CameraModule.TakeScreenshot(ActiveProcessor)); + } + catch (Exception e) + { + Notification = "An error occured. Please post that you're having this error on the official CactEye 2 thread on the Kerbal Forums."; + Debug.Log("CactEye 2: Exception #: An error occured producing a science report!"); + Debug.Log(e.ToString()); + } + timer = 0f; } } @@ -386,13 +397,17 @@ private void DrawProcessorControls() //Previous button if (GUI.Button(new Rect(ScopeRect.xMin + ((0.5f * ScopeRect.width) - 72), ScopeRect.yMin + (ScopeRect.height - 48f), 32, 32), Back9Icon)) { + ActiveProcessor.Active = false; ActiveProcessor = GetPrevious(Processors, ActiveProcessor); + ActiveProcessor.Active = true; } //Next Button if (GUI.Button(new Rect(ScopeRect.xMin + ((0.5f * ScopeRect.width) + 72), ScopeRect.yMin + (ScopeRect.height - 48f), 32, 32), Forward9Icon)) { + ActiveProcessor.Active = false; ActiveProcessor = GetNext(Processors, ActiveProcessor); + ActiveProcessor.Active = true; } } } @@ -467,6 +482,7 @@ private void GetProcessors() if (Processors.Count() > 0) { ActiveProcessor = Processors.First(); + CurrentProcessorIndex = 0; //if (ActiveProcessor.GetProcessorType().Contains("Wide Field")) //{ @@ -492,27 +508,59 @@ private void SetTorgue() } - private static CactEyeProcessor GetNext(IEnumerable list, CactEyeProcessor current) + private CactEyeProcessor GetNext(IEnumerable list, CactEyeProcessor current) { try { - return list.SkipWhile(x => !x.Equals(current)).Skip(1).First(); + //return list.SkipWhile(x => !x.Equals(current)).Skip(1).First(); + //lastAgentIDAarhus = agents[ index == -1 ? 0 : index % ( agents.Count - 1 ) ]; + if ((CurrentProcessorIndex + 1) < Processors.Count) + { + CurrentProcessorIndex++; + } + else + { + CurrentProcessorIndex = 0; + } + + //return Processors[CurrentProcessorIndex == -1 ? 0 : CurrentProcessorIndex % (Processors.Count - 1)]; + Debug.Log("CactEye 2: CurrentProcessorIndex: " + CurrentProcessorIndex.ToString()); + return Processors[CurrentProcessorIndex]; } - catch + catch (Exception e) { - return default(CactEyeProcessor); + Debug.Log("CactEye 2: Exception #: Was not able to find the next processor, even though there is one."); + Debug.Log(e.ToString()); + + return Processors.FirstOrDefault(); } } - private static CactEyeProcessor GetPrevious(IEnumerable list, CactEyeProcessor current) + private CactEyeProcessor GetPrevious(IEnumerable list, CactEyeProcessor current) { try { - return list.TakeWhile(x => !x.Equals(current)).Last(); + //return list.SkipWhile(x => !x.Equals(current)).Skip(1).First(); + //lastAgentIDAarhus = agents[ index == -1 ? 0 : index % ( agents.Count - 1 ) ]; + if (CurrentProcessorIndex == 0) + { + CurrentProcessorIndex = Processors.Count - 1; + } + else + { + CurrentProcessorIndex--; + } + + //return Processors[CurrentProcessorIndex == -1 ? 0 : CurrentProcessorIndex % (Processors.Count - 1)]; + Debug.Log("CactEye 2: CurrentProcessorIndex: " + CurrentProcessorIndex.ToString()); + return Processors[CurrentProcessorIndex]; } - catch + catch (Exception e) { - return default(CactEyeProcessor); + Debug.Log("CactEye 2: Exception #: Was not able to find the next processor, even though there is one."); + Debug.Log(e.ToString()); + + return Processors.FirstOrDefault(); } } diff --git a/CactEye2/bin/Release/CactEye2.dll b/CactEye2/bin/Release/CactEye2.dll index e936ca6..07c117b 100644 Binary files a/CactEye2/bin/Release/CactEye2.dll and b/CactEye2/bin/Release/CactEye2.dll differ diff --git a/CactEye2/bin/Release/CactEye2.pdb b/CactEye2/bin/Release/CactEye2.pdb index bf0918c..5689efd 100644 Binary files a/CactEye2/bin/Release/CactEye2.pdb and b/CactEye2/bin/Release/CactEye2.pdb differ diff --git a/CactEye2/obj/Release/CactEye2.dll b/CactEye2/obj/Release/CactEye2.dll index e936ca6..07c117b 100644 Binary files a/CactEye2/obj/Release/CactEye2.dll and b/CactEye2/obj/Release/CactEye2.dll differ diff --git a/CactEye2/obj/Release/CactEye2.pdb b/CactEye2/obj/Release/CactEye2.pdb index bf0918c..5689efd 100644 Binary files a/CactEye2/obj/Release/CactEye2.pdb and b/CactEye2/obj/Release/CactEye2.pdb differ diff --git a/DistantObjectHook/bin/Release/CactEye2.dll b/DistantObjectHook/bin/Release/CactEye2.dll index e936ca6..bac72ad 100644 Binary files a/DistantObjectHook/bin/Release/CactEye2.dll and b/DistantObjectHook/bin/Release/CactEye2.dll differ diff --git a/DistantObjectHook/bin/Release/CactEye2.pdb b/DistantObjectHook/bin/Release/CactEye2.pdb index bf0918c..06b112c 100644 Binary files a/DistantObjectHook/bin/Release/CactEye2.pdb and b/DistantObjectHook/bin/Release/CactEye2.pdb differ diff --git a/DistantObjectHook/bin/Release/DistantObjectHook.dll b/DistantObjectHook/bin/Release/DistantObjectHook.dll index 4ac1344..42ed9a8 100644 Binary files a/DistantObjectHook/bin/Release/DistantObjectHook.dll and b/DistantObjectHook/bin/Release/DistantObjectHook.dll differ diff --git a/DistantObjectHook/bin/Release/DistantObjectHook.pdb b/DistantObjectHook/bin/Release/DistantObjectHook.pdb index ca488cc..41bb714 100644 Binary files a/DistantObjectHook/bin/Release/DistantObjectHook.pdb and b/DistantObjectHook/bin/Release/DistantObjectHook.pdb differ diff --git a/DistantObjectHook/obj/Release/DistantObjectHook.csprojResolveAssemblyReference.cache b/DistantObjectHook/obj/Release/DistantObjectHook.csprojResolveAssemblyReference.cache index 3be813f..2d26685 100644 Binary files a/DistantObjectHook/obj/Release/DistantObjectHook.csprojResolveAssemblyReference.cache and b/DistantObjectHook/obj/Release/DistantObjectHook.csprojResolveAssemblyReference.cache differ diff --git a/DistantObjectHook/obj/Release/DistantObjectHook.dll b/DistantObjectHook/obj/Release/DistantObjectHook.dll index 4ac1344..42ed9a8 100644 Binary files a/DistantObjectHook/obj/Release/DistantObjectHook.dll and b/DistantObjectHook/obj/Release/DistantObjectHook.dll differ diff --git a/DistantObjectHook/obj/Release/DistantObjectHook.pdb b/DistantObjectHook/obj/Release/DistantObjectHook.pdb index ca488cc..41bb714 100644 Binary files a/DistantObjectHook/obj/Release/DistantObjectHook.pdb and b/DistantObjectHook/obj/Release/DistantObjectHook.pdb differ diff --git a/GameData/CactEye/Plugins/CactEye2.dll b/GameData/CactEye/Plugins/CactEye2.dll deleted file mode 100644 index e936ca6..0000000 Binary files a/GameData/CactEye/Plugins/CactEye2.dll and /dev/null differ diff --git a/README.md b/README.md index dc49cb2..31fbb57 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,30 @@ -CactEye -====== +******************Installation Instructions****************** +If you are currently using an older version of CactEye, then please delete CactEye from your GameData +folder before installing a new version. -CactEye mod for Kerbal Space Program. +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. + +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. + +******************Change Log****************** + +CactEye 2 BETA 3 +-Fixed an issue where running a science experiment with either the "Wide Field Camera 1" or +"Wide Field Camera 2" would produce a "NullReferenceException." +-Fixed an issue where attempting to switch to another processor would grey the GUI out with the error +message that the telescope was out of power, even with full batteries. +-Fixed a "ArgumentOutOfRange" exception that would be thrown while switching to another processor. +-Fixed an issue with both the Wide Field Camera processors and the Asteroid Camera processors where an +incorrect amount of science points would be awarded. + +CactEye 2 BETA 2 +-Completely rewritten code base for CactEye. +-Completely redesigned GUI for the Telescope controls. +-Asteroid telescopes should no longer be restricted to Kerbin orbit. +-Occulation experiments are not yet available. \ No newline at end of file