First cut at fairings.

2024-09-01 17:34:42 +00:00 · 2020-08-01 21:10:58 -07:00
parent f7dc43cb44
commit 380fa1c489
37 changed files with 998 additions and 102 deletions
--- a/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-fairing-bases.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-fairing-bases.cfg
@ -16,7 +16,7 @@
  }
  @MODULE[ModuleProceduralFairing]
  {
-    @nSides = 36
+    @nSides = 30
    @pivot = 0,0.15, 0
    @TextureURL = ReStock/Assets/Payload/restock-fairing-125-1
    @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
@ -38,6 +38,9 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+        _Color= 1,1,1,1
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
@ -45,10 +48,15 @@
        FairingBase125BlackWhite = false
        FairingBase125Orange = false
        FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = false
      }
    }
-    @VARIANT[Grey]
+    @VARIANT[BlackAndWhite]
    {
+
      !TEXTURE {}
      !EXTRA_INFO {}
      TEXTURE
@ -61,6 +69,9 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-blackwhite
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 1,1,1,1
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
@ -68,9 +79,13 @@
        FairingBase125BlackWhite = true
        FairingBase125Orange = false
        FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = false
      }
    }
-    @VARIANT[Dark?Grey]
+    @VARIANT[Orange]
    {
      !TEXTURE {}
      !EXTRA_INFO {}
@ -84,6 +99,9 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
+        _Color= 1,1,1,1
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
@ -91,6 +109,10 @@
        FairingBase125BlackWhite = false
        FairingBase125Orange = true
        FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = false
      }
    }
    VARIANT
@ -110,6 +132,10 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-dark
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 1,1,1,1
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.3
+        _Color= 1,1,1,1
      }
      GAMEOBJECTS
      {
@ -117,6 +143,116 @@
        FairingBase125BlackWhite = false
        FairingBase125Orange = false
        FairingBase125Dark = true
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = false
+      }
+    }
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1-metal
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-metal
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 0,0,0,0
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.07
+      }
+      GAMEOBJECTS
+      {
+        FairingBase125White = false
+        FairingBase125BlackWhite = false
+        FairingBase125Orange = false
+        FairingBase125Dark = false
+        FairingBase125Metal = true
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = true
+      }
+    }
+     @VARIANT[Gold]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1-gold
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-125-1-gold
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-125-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+        
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase125White = false
+        FairingBase125BlackWhite = false
+        FairingBase125Orange = false
+        FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = true
+        FairingBase125Silver = false
+        FairingBase125Inner = true
+      }
+    }
+  
+    @VARIANT[Silver]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1-silver
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-125-1-silver
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-125-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_silverSpecular
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_silverSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase125White = false
+        FairingBase125BlackWhite = false
+        FairingBase125Orange = false
+        FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = true
+        FairingBase125Inner = true
      }
    }
  }
@ -133,11 +269,6 @@
      name = _SpecColor
      color = 0.753, 0.753, 0.753, 1.0
    }
-    FLOAT_PROPERTY
-    {
-      name = _Shininess
-      value = 0.3
-    }
  }
 }

@ -153,7 +284,7 @@
  }
  @MODULE[ModuleProceduralFairing]
  {
-    @nSides = 24
+    @nSides = 30
    @pivot = 0,0.15, 0
    @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
    @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
@ -175,15 +306,20 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
        FairingBase25White = true
        FairingBase25BlackWhite = false
        FairingBase25Orange = false
+        FairingBase25Metal = false
+        FairingBase25Gold = false
+        FairingBase25Silver = false
+        FairingBase25Inner = false
      }
    }
-    @VARIANT[Grey]
+    @VARIANT[BlackAndWhite]
    {
      !TEXTURE {}
      !EXTRA_INFO {}
@ -197,15 +333,20 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
        FairingBase25White = false
        FairingBase25BlackWhite = true
        FairingBase25Orange = false
+        FairingBase25Metal = false
+        FairingBase25Gold = false
+        FairingBase25Silver = false
+        FairingBase25Inner = false
      }
    }
-    @VARIANT[Dark?Grey]
+    @VARIANT[Orange]
    {
      !TEXTURE {}
      !EXTRA_INFO {}
@ -219,12 +360,121 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
        FairingBase25White = false
        FairingBase25BlackWhite = false
        FairingBase25Orange = true
+        FairingBase25Metal = false
+        FairingBase25Gold = false
+        FairingBase25Silver = false
+        FairingBase25Inner = false
+      }
+    }
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-metal
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-metal
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 0,0,0,0
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.07
+      }
+      GAMEOBJECTS
+      {
+        FairingBase25White = false
+        FairingBase25BlackWhite = false
+        FairingBase25Orange = false
+        FairingBase25Metal = true
+        FairingBase25Gold = false
+        FairingBase25Silver = false
+        FairingBase25Inner = true
+      }
+    }
+     @VARIANT[Gold]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-gold
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-gold
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular25
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+        
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase25White = false
+        FairingBase25BlackWhite = false
+        FairingBase25Orange = false
+        
+        FairingBase25Metal = false
+        FairingBase25Gold = true
+        FairingBase25Silver = false
+        FairingBase25Inner = true
+      }
+    }
+  
+    @VARIANT[Silver]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-silver
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-silver
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_silverSpecular25
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_silverSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase25White = false
+        FairingBase25BlackWhite = false
+        FairingBase25Orange = false
+        FairingBase25Metal = false
+        FairingBase25Gold = false
+        FairingBase25Silver = true
+        FairingBase25Inner = true
      }
    }
  }
@ -241,11 +491,6 @@
      name = _SpecColor
      color = 0.753, 0.753, 0.753, 1.0
    }
-    FLOAT_PROPERTY
-    {
-      name = _Shininess
-      value = 0.3
-    }
  }
 }

@ -261,7 +506,7 @@
  }
  @MODULE[ModuleProceduralFairing]
  {
-    @nSides = 48
+    @nSides = 30
    @pivot = 0,0.15, 0
    @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
    @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
@ -283,15 +528,20 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
        FairingBase375White = true
        FairingBase375BlackWhite = false
        FairingBase375Orange = false
+        FairingBase375Inner = false
+        FairingBase375Metal = false
+        FairingBase375Gold = false
+        FairingBase375Silver = false
      }
    }
-    @VARIANT[Grey]
+    @VARIANT[BlackAndWhite]
    {
      !TEXTURE {}
      !EXTRA_INFO {}
@ -305,15 +555,20 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
        FairingBase375White = false
        FairingBase375BlackWhite = true
        FairingBase375Orange = false
+        FairingBase375Inner = false
+        FairingBase375Metal = false
+        FairingBase375Gold = false
+        FairingBase375Silver = false
      }
    }
-    @VARIANT[Dark?Grey]
+    @VARIANT[Orange]
    {
      !TEXTURE {}
      !EXTRA_INFO {}
@ -327,12 +582,122 @@
        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange
        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
+        _Shininess= 0.3
      }
      GAMEOBJECTS
      {
        FairingBase375White = false
        FairingBase375BlackWhite = false
        FairingBase375Orange = true
+        FairingBase375Inner = false
+        FairingBase375Metal = false
+        FairingBase375Gold = false
+        FairingBase375Silver = false
+      }
+    }
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1-metal
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-metal
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 0,0,0,0
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.07
+      }
+      GAMEOBJECTS
+      {
+        FairingBase375White = false
+        FairingBase375BlackWhite = false
+        FairingBase375Orange = false
+        
+        FairingBase375Metal = true
+        FairingBase375Gold = false
+        FairingBase375Silver = false
+        FairingBase375Inner = true
+      }
+    }
+     @VARIANT[Gold]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-gold
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-gold
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+        
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular25
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase375White = false
+        FairingBase375BlackWhite = false
+        FairingBase375Orange = false
+        FairingBase375Metal = false
+        FairingBase375Gold = true
+        FairingBase375Silver = false
+        FairingBase375Inner = true
+      }
+    }
+  
+    @VARIANT[Silver]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-silver
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-silver
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_silverSpecular
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_silverSpecular25
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase375White = false
+        FairingBase375BlackWhite = false
+        FairingBase375Orange = false
+        
+        FairingBase375Metal = false
+        FairingBase375Gold = false
+        FairingBase375Silver = true
+        FairingBase375Inner = true
      }
    }
  }
@ -349,10 +714,5 @@
      name = _SpecColor
      color = 0.753, 0.753, 0.753, 1.0
    }
-    FLOAT_PROPERTY
-    {
-      name = _Shininess
-      value = 0.3
-    }
  }
 }