Merge pull request #63 from ChrisAdderley/dev

Release 1.0.1
post-kerbin-mining-corporation · Jul 29, 2019 · 8d07252 · 8d07252
2 parents 427cea0 + 016e4d8
commit 8d07252
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 104 deletions.
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -17,15 +17,15 @@ dependencies:  # Configure dependencies
     version: 1.0.0
     location: s3
   DynamicBatteryStorage:
-    tag: 2.0.2
+    tag: 2.0.3
     location: github
     repository: ChrisAdderley/DynamicBatteryStorage
   DeployableEngines:
     tag: 1.1.0
     location: github
     repository: ChrisAdderley/DeployableEngines
   CryoTanks:
-    tag: 1.2.0
+    tag: 1.2.1
     location: github
     repository: ChrisAdderley/CryoTanks
 deploy:

diff --git a/GameData/CryoEngines/Assets/Engine/cryoengine-hecate-1.mu b/GameData/CryoEngines/Assets/Engine/cryoengine-hecate-1.mu
diff --git a/GameData/CryoEngines/Assets/Engine/cryoengine-pavonis-1.mu b/GameData/CryoEngines/Assets/Engine/cryoengine-pavonis-1.mu
diff --git a/GameData/CryoEngines/Patches/RealPlume/CryoEngines1875Lower.cfg b/GameData/CryoEngines/Patches/RealPlume/CryoEngines1875Lower.cfg
@@ -1,25 +1,23 @@
 // Sea level plume for for all SL engines apart from RS68 Etna
 
-@PART[*]:HAS[@PLUME[CryoEngines1875Lower]:HAS[~processed[*]]]:AFTER[zRealPlume]:NEEDS[SmokeScreen]
+@PART[*]:HAS[@PLUME[CryoEngines1875Lower]]:AFTER[zRealPlume]:NEEDS[SmokeScreen]
 {
     %EFFECTS
     {
         CryoEngines1875Lower
         {
-            plumeIdentifier = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plumeIdentifier$
-
             //Shock cone type effect
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/corePosition$
-                fixedScale    = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/coreScale$
+                transformName = #$/PLUME[CryoEngines1875Lower]/transformName$
+                localRotation = #$/PLUME[CryoEngines1875Lower]/localRotation$
+                localPosition = #$/PLUME[CryoEngines1875Lower]/corePosition$
+                fixedScale    = #$/PLUME[CryoEngines1875Lower]/coreScale$
                 //
                 name = core
                 modelName =  CryoEngines/FX/fx-erebus-core-1
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
                 xyForce = 0
                 emission
@@ -73,15 +71,15 @@
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plumePosition$
-                fixedScale    = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plumeScale$
+                transformName = #$/PLUME[CryoEngines1875Lower]/transformName$
+                localRotation = #$/PLUME[CryoEngines1875Lower]/localRotation$
+                localPosition = #$/PLUME[CryoEngines1875Lower]/plumePosition$
+                fixedScale    = #$/PLUME[CryoEngines1875Lower]/plumeScale$
                 //
-                name = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plumeIdentifier$-plume
+                name = plume
                 modelName = CryoEngines/FX/fx-fuji-plume-1 //CryoEngines/FX/fx-erebus-plume-1
                 sizeClamp = 50
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
                 xyForce
                 {
@@ -152,15 +150,15 @@
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plumePosition$
-                fixedScale    = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plume2Scale$
+                transformName = #$/PLUME[CryoEngines1875Lower]/transformName$
+                localRotation = #$/PLUME[CryoEngines1875Lower]/localRotation$
+                localPosition = #$/PLUME[CryoEngines1875Lower]/plumePosition$
+                fixedScale    = #$/PLUME[CryoEngines1875Lower]/plume2Scale$
                 //
-                name = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plumeIdentifier$-plume2
+                name = #$/PLUME[CryoEngines1875Lower]/plumeIdentifier$-plume2
                 modelName = CryoEngines/FX/fx-etna-plume-2-red
                 sizeClamp = 50
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
                 xyForce
                 {
@@ -229,11 +227,11 @@
             }
             AUDIO
             {
-                name = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plumeIdentifier$-audio
+                name = audio
                 channel = Ship
                 clip = RealPlume/KW_Sounds/sound_altloop
                 volume = 0.0 0.0
-                volume = #$/PLUME[CryoEngines1875Lower]:HAS[~processed[*]]/plumeScale$
+                volume = #$../../../PLUME[CryoEngines1875Lower]/plumeScale$
                 @volume,1 ^= :^:1.0 :
                 pitch = 0.0 1.0
                 pitch = 1.0 1.0
@@ -275,9 +273,5 @@
         }
     }
 
-    @PLUME[CryoEngines1875Lower]:HAS[~processed[*]]
-    {
-        processed = true
-    }
-    MM_PATCH_LOOP { }
+
 }
diff --git a/GameData/CryoEngines/Patches/RealPlume/CryoEngines375LowerRed_Prefab.cfg b/GameData/CryoEngines/Patches/RealPlume/CryoEngines375LowerRed_Prefab.cfg
@@ -1,22 +1,22 @@
 //Red ablative plume prefab for Etna (RS68)
-@PART[*]:HAS[@PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]]:AFTER[zRealPlume]:NEEDS[SmokeScreen]
+@PART[*]:HAS[@PLUME[CryoEngines375LowerRed]]:AFTER[zRealPlume]:NEEDS[SmokeScreen]
 {
     %EFFECTS
     {
         CryoEngines375LowerRed
         {
-            plumeIdentifier = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumeIdentifier$
-
             //Flare inside the engine bell
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/flarePosition$
-                fixedScale    = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/flareScale$
+                transformName = #$/PLUME[CryoEngines375LowerRed]/transformName$
+                localRotation = #$/PLUME[CryoEngines375LowerRed]/localRotation$
+                localPosition = #$/PLUME[CryoEngines375LowerRed]/flarePosition$
+                fixedScale    = #$/PLUME[CryoEngines375LowerRed]/flareScale$
+
+
                 //
-                name = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumeIdentifier$-flare
+                name = flare
                 modelName = CryoEngines/FX/fx-etna-flare-1
                 emission
                 {
@@ -35,14 +35,14 @@
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/corePosition$
-                fixedScale    = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/coreScale$
+                transformName = #$/PLUME[CryoEngines375LowerRed]/transformName$
+                localRotation = #$/PLUME[CryoEngines375LowerRed]/localRotation$
+                localPosition = #$/PLUME[CryoEngines375LowerRed]/corePosition$
+                fixedScale    = #$/PLUME[CryoEngines375LowerRed]/coreScale$
                 //
                 name = core
         				modelName = CryoEngines/FX/fx-etna-core-1
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
 
                 emission
@@ -95,15 +95,15 @@
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumePosition$
-                fixedScale    = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumeScale$
+                transformName = #$/PLUME[CryoEngines375LowerRed]/transformName$
+                localRotation = #$/PLUME[CryoEngines375LowerRed]/localRotation$
+                localPosition = #$/PLUME[CryoEngines375LowerRed]/plumePosition$
+                fixedScale    = #$/PLUME[CryoEngines375LowerRed]/plumeScale$
                 //
-                name = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumeIdentifier$-plume
+                name = plume
                 modelName = CryoEngines/FX/fx-etna-plume-1
                 sizeClamp = 50
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
                 xyForce
                 {
@@ -175,15 +175,15 @@
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumePosition$
-                fixedScale    = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumeScale$
+                transformName = #$/PLUME[CryoEngines375LowerRed]/transformName$
+                localRotation = #$/PLUME[CryoEngines375LowerRed]/localRotation$
+                localPosition = #$/PLUME[CryoEngines375LowerRed]/plumePosition$
+                fixedScale    = #$/PLUME[CryoEngines375LowerRed]/plumeScale$
                 //
-                name = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumeIdentifier$-plume2
+                name = plume2
                 modelName = CryoEngines/FX/fx-etna-plume-2
                 sizeClamp = 50
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
                 xyForce
                 {
@@ -252,15 +252,15 @@
             }
             AUDIO
             {
-                name = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumeIdentifier$-audio
-                channel = Ship
-                clip = RealPlume/KW_Sounds/sound_altloop
-                volume = 0.0 0.0
-                volume = #$/PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]/plumeScale$
-                @volume,1 ^= :^:1.0 :
-                pitch = 0.0 1.0
-                pitch = 1.0 1.0
-                loop = true
+              name = audio
+              channel = Ship
+              clip = RealPlume/KW_Sounds/sound_altloop
+              volume = 0.0 0.0
+              volume = #$../../../PLUME[CryoEngines375LowerRed]/plumeScale$
+              @volume,1 ^= :^:1.0 :
+              pitch = 0.0 1.0
+              pitch = 1.0 1.0
+              loop = true
             }
         }
         &engage
@@ -297,10 +297,4 @@
             }
         }
     }
-
-    @PLUME[CryoEngines375LowerRed]:HAS[~processed[*]]
-    {
-        processed = true
-    }
-    MM_PATCH_LOOP { }
 }
diff --git a/GameData/CryoEngines/Patches/RealPlume/CryoEnginesUpperBlue.cfg b/GameData/CryoEngines/Patches/RealPlume/CryoEnginesUpperBlue.cfg
@@ -2,27 +2,25 @@
 
 // Sea level plume for Erebus and Vesuvius
 
-@PART[*]:HAS[@PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]]:AFTER[zRealPlume]:NEEDS[SmokeScreen]
+@PART[*]:HAS[@PLUME[CryoEnginesUpperBlue]]:AFTER[zRealPlume]:NEEDS[SmokeScreen]
 {
     %EFFECTS
     {
         CryoEnginesUpperBlue
         {
-            plumeIdentifier = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumeIdentifier$
-
             //Shock cone type effect
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/corePosition$
-                fixedScale    = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/coreScale$
+                transformName = #$/PLUME[CryoEnginesUpperBlue]/transformName$
+                localRotation = #$/PLUME[CryoEnginesUpperBlue]/localRotation$
+                localPosition = #$/PLUME[CryoEnginesUpperBlue]/corePosition$
+                fixedScale    = #$/PLUME[CryoEnginesUpperBlue]/coreScale$
                 //
-                name = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumeIdentifier$-core
+                name = core
                 modelName = CryoEngines/FX/fx-ulysses-core-1
 
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
 
                 emission
@@ -60,15 +58,15 @@
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumePosition$
-                fixedScale    = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumeScale$
+                transformName = #$/PLUME[CryoEnginesUpperBlue]/transformName$
+                localRotation = #$/PLUME[CryoEnginesUpperBlue]/localRotation$
+                localPosition = #$/PLUME[CryoEnginesUpperBlue]/plumePosition$
+                fixedScale    = #$/PLUME[CryoEnginesUpperBlue]/plumeScale$
                 //
-                name = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumeIdentifier$-plume
+                name = plume
                 modelName = CryoEngines/FX/fx-ulysses-plume-1
                 sizeClamp = 50
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
                 xyForce
                 {
@@ -144,15 +142,15 @@
             MODEL_MULTI_SHURIKEN_PERSIST
             {
                 //Get the inputs from the other config.
-                transformName = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/transformName$
-                localRotation = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/localRotation$
-                localPosition = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumePosition$
-                fixedScale    = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plume2Scale$
+                transformName = #$/PLUME[CryoEnginesUpperBlue]/transformName$
+                localRotation = #$/PLUME[CryoEnginesUpperBlue]/localRotation$
+                localPosition = #$/PLUME[CryoEnginesUpperBlue]/plumePosition$
+                fixedScale    = #$/PLUME[CryoEnginesUpperBlue]/plume2Scale$
                 //
-                name = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumeIdentifier$-plume2
+                name = plume2
                 modelName = CryoEngines/FX/fx-etna-plume-2-blue
                 sizeClamp = 50
-                decluster = flase
+                decluster = false
                 emitOnUpdate = true
                 xyForce
                 {
@@ -225,11 +223,11 @@
             }
             AUDIO
             {
-                name = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumeIdentifier$-audio
+                name = audio
                 channel = Ship
                 clip = RealPlume/KW_Sounds/sound_altloop
                 volume = 0.0 0.0
-                volume = #$/PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]/plumeScale$
+                volume = #$../../../PLUME[CryoEnginesUpperBlue]/plumeScale$
                 @volume,1 ^= :^:1.0 :
                 pitch = 0.0 1.0
                 pitch = 1.0 1.0
@@ -270,10 +268,4 @@
             }
         }
     }
-
-    @PLUME[CryoEnginesUpperBlue]:HAS[~processed[*]]
-    {
-        processed = true
-    }
-    MM_PATCH_LOOP { }
 }
diff --git a/GameData/CryoEngines/Versioning/CryoEngines.version b/GameData/CryoEngines/Versioning/CryoEngines.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":0,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/README.md b/README.md
@@ -30,8 +30,8 @@ These components are required for the mod to function and are bundled as part of
 * [ModuleManager (4.0.2)](https://github.com/sarbian/ModuleManager)
 * [B9PartSwitch (2.8.1)](https://github.com/blowfishpro/B9PartSwitch)
 * [Community Resource Pack (1.0.1)](https://github.com/BobPalmer/CommunityResourcePack)
-* [CryoTanks (1.2.0)](https://github.com/ChrisAdderley/CryoTanks)
-* [DynamicBatteryStorage (2.0.2)](https://github.com/ChrisAdderley/DynamicBatteryStorage)
+* [CryoTanks (1.2.1)](https://github.com/ChrisAdderley/CryoTanks)
+* [DynamicBatteryStorage (2.0.3)](https://github.com/ChrisAdderley/DynamicBatteryStorage)
 * [DeployableEngines (1.1.0)](https://github.com/ChrisAdderley/DeployableEngines)
 
 ## Installation

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,10 @@
+v1.0.1
+------
+- Updated DynamicBatteryStorage to 2.0.3
+- Updated CryoTanks to 1.2.1
+- Changed RealPlume compatibility patch to use old syntax (Zorg)
+- Changed method used to render inner engine glows to be less visible in the editor
+
 v1.0.0
 ------
 - Updated B9PartSwitch to 2.8.1