Merge pull request #14 from post-kerbin-mining-corporation/dev

Release 0.2.0
post-kerbin-mining-corporation · Feb 25, 2021 · 8507731 · 8507731
2 parents b8362d6 + 6ae7fa3
commit 8507731
Show file tree

Hide file tree

Showing 37 changed files with 1,330 additions and 850 deletions.
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -11,7 +11,7 @@ dependencies:  # Configure dependencies
     version: 4.1.4
     location: s3
   Waterfall:
-    tag: 0.3.0
+    tag: 0.5.0
     location: github
     repository: post-kerbin-mining-corporation/Waterfall
 deploy:

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusBoar.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusBoar.cfg
@@ -120,16 +120,59 @@
     TEMPLATE
     {
       // This is the name of the template to use
-      templateName = waterfall-kerolox-lower-2
+      templateName = waterfall-kerolox-lower-5
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0.04,0.056
+      position = 0,0,-0.002
       rotation = 0, 0, 0
-      scale = 1, 1, 1
+      scale = 2.6, 2.6, 1
     }
 
 
 
 
+  }
+  MODULE
+  {
+    name = ModuleWaterfallFX
+    // This is a custom name
+    moduleID = twinBoarTurboFX
+    // This links the effects to a given ModuleEngines
+    engineID = basicEngine
+
+    // List out all controllers we want available
+    // This controller scales with atmosphere depth
+    CONTROLLER
+    {
+      name = atmosphereDepth
+      linkedTo = atmosphere_density
+    }
+    // This controller scales with effective throttle
+    CONTROLLER
+    {
+      name = throttle
+      linkedTo = throttle
+    }
+    // this controller generates a random value in the range specified
+    CONTROLLER
+    {
+      name = random
+      linkedTo = random
+      range = -1,1
+    }
+    // -----------------------------------------------------
+    // Past here should be generated with the ingame editor!
+    // -----------------------------------------------------
+
+    TEMPLATE
+    {
+      // This is the name of the template to use
+      templateName = waterfall-kerolox-exhaust-1
+      // This field allows you to override the parentTransform name in the EFFECTS contained in the template
+      overrideParentTransform = fxTransformTurbo
+      position = 0,0.05,0
+      rotation = 0, 0, 0
+      scale = 1, 1, 1
+    }
   }
 }
diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCaravel.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCaravel.cfg
@@ -92,9 +92,9 @@
       templateName = waterfall-hydrolox-upper-1
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0,-0.1
+      position = 0,0,-0.05
 rotation = 0, 0, 0
-scale = 1, 1, 1
+scale = 1.1, 1.1, 1
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCorgi.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCorgi.cfg
@@ -48,7 +48,7 @@
   {
     name = ModuleWaterfallFX
     // This is a custom name
-    moduleID = reliantEngine
+    moduleID = corgiFX
     // This links the effects to a given ModuleEngines
     engineID = basicEngine
 
@@ -81,11 +81,12 @@
       templateName = waterfall-hydrolox-upper-1
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0,0
+      position = 0,0,0.02
 rotation = 0, 0, 0
-scale = 0.8, 0.8, 1
+scale = 0.85, 0.85, 1
 
 
+    }
   }
 }
 
diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusGalleon.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusGalleon.cfg
@@ -96,7 +96,7 @@
       overrideParentTransform = thrustTransform
       position = 0,0.04,0.056
 rotation = 0, 0, 0
-scale = 1, 1, 1
+scale = 2.9, 2.9, 2.9
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusPug.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusPug.cfg
@@ -48,7 +48,7 @@
   {
     name = ModuleWaterfallFX
     // This is a custom name
-    moduleID = terrierFX
+    moduleID = pugFX
     // This links the effects to a given ModuleEngines
     engineID = basicEngine
 
@@ -81,9 +81,9 @@
       templateName = waterfall-kerolox-upper-1
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0,-0.13
-      rotation = -90,0,0
-      scale = 0.9,0.7,0.9
+      position = 0,0,0
+rotation = 0, 0, 0
+scale = 0.48, 0.48, 0.4
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusRCS.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusRCS.cfg
@@ -1,4 +1,119 @@
 
+@PART[restock-rcs-block-multi-2]:AFTER[ReStockPlus]
+{
+  // Removes the stock effect block, and replace it with one that has no particles
+  !EFFECTS {}
+  EFFECTS
+  {
+    running
+    {
+      AUDIO_MULTI_POOL
+      {
+        channel = Ship
+        transformName = RCSjet
+        clip = sound_rocket_mini
+        volume = 0.0 0.0
+        volume = 0.1 0.0
+        volume = 0.5 0.025
+        volume = 1.0 0.1
+        pitch = 1.0
+        loop = true
+      }
+    }
+  }
+  MODULE
+  {
+    name = ModuleWaterfallFX
+    // This is a custom name
+    moduleID = rcsFX
+    // This links the effects to a given ModuleEngines
+    engineID = basicEngine
+
+    // List out all controllers we want available
+    CONTROLLER
+    {
+      name = atmosphereDepth
+      linkedTo = atmosphere_density
+    }
+    CONTROLLER
+    {
+      name = rcs
+      linkedTo = rcs
+    }
+
+    TEMPLATE
+    {
+      // This is the name of the template to use
+      templateName = waterfall-rcs-jet-1
+      // This field allows you to override the parentTransform name in the EFFECTS contained in the template
+      overrideParentTransform = RCSjet
+      scale = .95,1,.95
+      rotation = 0,0,180
+      position = 0,0.015,0
+    }
+  }
+
+}
+
+
+@PART[restock-rcs-block-multi-mini-2]:AFTER[ReStockPlus]
+{
+  // Removes the stock effect block, and replace it with one that has no particles
+  !EFFECTS {}
+  EFFECTS
+  {
+    running
+    {
+      AUDIO_MULTI_POOL
+      {
+        channel = Ship
+        transformName = RCSjet
+        clip = sound_rocket_mini
+        volume = 0.0 0.0
+        volume = 0.1 0.0
+        volume = 0.5 0.025
+        volume = 1.0 0.1
+        pitch = 1.0
+        loop = true
+      }
+    }
+  }
+  MODULE
+  {
+    name = ModuleWaterfallFX
+    // This is a custom name
+    moduleID = rcsFX
+    // This links the effects to a given ModuleEngines
+    engineID = basicEngine
+
+    // List out all controllers we want available
+    CONTROLLER
+    {
+      name = atmosphereDepth
+      linkedTo = atmosphere_density
+    }
+    CONTROLLER
+    {
+      name = rcs
+      linkedTo = rcs
+    }
+
+    TEMPLATE
+    {
+      // This is the name of the template to use
+      templateName = waterfall-rcs-jet-1
+      // This field allows you to override the parentTransform name in the EFFECTS contained in the template
+      overrideParentTransform = RCSjet
+      position = 0,0.007,0
+rotation = 0, 0, 180
+scale = 0.3, 0.4, 0.3
+    }
+  }
+
+}
+
+
+
 
 @PART[restock-rcs-block-dual-1]:AFTER[ReStockPlus]
 {

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusSchnauzer.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusSchnauzer.cfg
@@ -81,10 +81,10 @@
       // This is the name of the template to use
       templateName = waterfall-kerolox-upper-2
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
-      overrideParentTransform = thrustTransform
-     position = 0,0,0
-rotation = -90, 0, 0
-scale = 0.9, 0.7, 0.9
+      overrideParentTransform = waterfall-hypergolic-aerozine50-upper-1
+     position = 0,0,0.23
+rotation = 0, 0, 0
+scale = 1, 1, 0.9
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTorch.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTorch.cfg
@@ -60,7 +60,7 @@
   {
     name = ModuleWaterfallFX
     // This is a custom name
-    moduleID = torchEngine
+    moduleID = torchFX
     // This links the effects to a given ModuleEngines
     engineID = basicEngine
 
@@ -90,12 +90,12 @@
     TEMPLATE
     {
       // This is the name of the template to use
-      templateName = waterfall-kerolox-lower-2
+      templateName = waterfall-kerolox-lower-1
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0,-0.4
-      rotation = 0, 0, 0
-      scale = 0.6, 0.6, 0.5
+      position = 0,0,-0.02
+rotation = 0, 0, 0
+scale = 0.68, 0.68, 0.5
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTrashPanda.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTrashPanda.cfg
@@ -87,12 +87,12 @@
     TEMPLATE
     {
       // This is the name of the template to use
-      templateName = waterfall-kerolox-lower-1
+      templateName = waterfall-kerolox-vernier-2
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0,-0.45
+      position = 0,0,-0.02
 rotation = 0, 0, 0
-scale = 0.4, 0.4, 0.55
+scale = 2, 2, 2
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusUrsa.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusUrsa.cfg
@@ -92,9 +92,9 @@
       templateName = waterfall-kerolox-lower-1
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0,-0.8
-      rotation = 0, 0, 0
-      scale = 0.7, 0.7, 0.9
+      pposition = 0,0,-0.1
+rotation = 0, 0, 0
+scale = 0.8, 0.8, 0.9
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusValiant.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusValiant.cfg
@@ -77,7 +77,7 @@
   {
     name = ModuleWaterfallFX
     // This is a custom name
-    moduleID = reliantEngine
+    moduleID = valiantFX
     // This links the effects to a given ModuleEngines
     engineID = basicEngine
 
@@ -110,9 +110,9 @@
       templateName = waterfall-kerolox-lower-1
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0,-0.4
+      position = 0,0,-0.07
       rotation = 0, 0, 0
-      scale = 0.6, 0.6, 0.5
+      scale = 0.8, 0.8, 0.8
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineKE-1.cfg b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineKE-1.cfg
@@ -90,12 +90,12 @@
     TEMPLATE
     {
       // This is the name of the template to use
-      templateName = waterfall-kerolox-lower-3
+      templateName = waterfall-kerolox-lower-5-film-cooled
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
       position = 0,0.04,0.056
 rotation = 0, 0, 0
-scale = 1, 1, 1
+scale = 2.9, 2.9, 2.9
     }
 
 

diff --git a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-I2.cfg b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-I2.cfg
@@ -28,7 +28,7 @@
         loop = false
       }
     }
-    fx-caravel-running
+    fx-skiff-running
     {
       AUDIO
       {
@@ -92,9 +92,9 @@
       templateName = waterfall-hydrolox-upper-1
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
-      position = 0,0,-0.1
+      position = 0,0,-0.05
 rotation = 0, 0, 0
-scale = 1, 1, 1
+scale = 1.1, 1.1, 1
     }