Oscar series improvements

Includes fix for #626
2024-09-01 17:34:42 +00:00 · 2019-10-26 23:10:09 -07:00 · 2019-10-26 23:10:09 -07:00 · 31de344ede
commit 31de344ede
parent 819dc8a500
12 changed files with 32 additions and 20 deletions
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-3.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-3.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-4.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-4.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-5.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-5.mu
--- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-0625.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-0625.cfg
@ -23,9 +23,10 @@
      themeName = Metal
      primaryColor = #6f6e6d
      secondaryColor = #6f6e6d
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1
+        Tank0625_8 = true
+        Tank0625_8_White = false
      }
    }
    VARIANT
@ -35,9 +36,10 @@
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1-white
+        Tank0625_8 = false
+        Tank0625_8_White = true
      }
    }
  }
--- a/Distribution/Restock/changelog.txt
+++ b/Distribution/Restock/changelog.txt
@ -118,6 +118,7 @@
  - Tweaked Nerv plume to be prettier
  - Tweaked mesh normals on Nerv shroud to be prettier
  - Tweaked 2.5m battery to work with new 1.8 node layout
+  - Improved metal and white shaders for Oscar-B
  - 0.625m engine revisions
    - Engines now have White and Metal surface variants that affect shrouds and boattails
  - 1.25m engine revisions
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-1.cfg
@ -51,9 +51,10 @@ PART
      themeName = Metal
      primaryColor = #6f6e6d
      secondaryColor = #6f6e6d
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1
+        Tank0625 = true
+        Tank0625_White = false
      }
    }
    VARIANT
@ -63,9 +64,10 @@ PART
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1-white
+        Tank0625 = false
+        Tank0625_White = true
      }
    }
  }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-2.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-2.cfg
@ -51,9 +51,10 @@ PART
      themeName = Metal
      primaryColor = #6f6e6d
      secondaryColor = #6f6e6d
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1
+        Tank0625_2 = true
+        Tank0625_2_White = false
      }
    }
    VARIANT
@ -63,9 +64,10 @@ PART
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1-white
+        Tank0625_2 = false
+        Tank0625_2_White = true
      }
    }
  }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-3.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-3.cfg
@ -51,9 +51,10 @@ PART
      themeName = Metal
      primaryColor = #6f6e6d
      secondaryColor = #6f6e6d
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1
+        Tank0625_4 = true
+        Tank0625_4_White = false
      }
    }
    VARIANT
@ -63,9 +64,10 @@ PART
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1-white
+        Tank0625_4 = false
+        Tank0625_4_White = true
      }
    }
  }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-4.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-4.cfg
@ -64,9 +64,10 @@ PART
      themeName = Metal
      primaryColor = #6f6e6d
      secondaryColor = #6f6e6d
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1
+        Tank0625_16 = true
+        Tank0625_16_White = false
      }
    }
    VARIANT
@ -76,9 +77,10 @@ PART
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
-      TEXTURE
+      GAMEOBJECTS
      {
-        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-0625-1-white
+        Tank0625_16 = false
+        Tank0625_16_White = true
      }
    }
  }
--- a/Distribution/RestockPlus/changelog.txt
+++ b/Distribution/RestockPlus/changelog.txt
@ -67,6 +67,7 @@ v1.0.0
 - Pegasus II Mobility Enhancer (Nertea): 2x size static ladder
 - Pegasus III Mobility Enhancer (Nertea): 4x size static ladder
 - Fixes and improvements
+ - Improved metal and white shaders for Oscar-series tanks
 - 0.625m engine revisions
  - Engines now have White and Metal surface variants that affect shrouds and boattails
 - 1.25m engine revisions