Config and texture changes

2024-09-01 17:34:42 +00:00 · 2020-04-14 20:40:05 -07:00 · 2020-04-14 20:40:05 -07:00 · a1fce3a887
commit a1fce3a887
parent 1995c50835
9 changed files with 111 additions and 55 deletions
--- a/Assets/CineboxAndrew
+++ b/Assets/CineboxAndrew
@ -1 +1 @@
-Subproject commit 697c6a7171967a3a751846fa79980d30e4885bd4
+Subproject commit c35fe3e94098a3e255248be79264c7903130661b
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-25-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-25-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-375-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-375-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1.dds
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-engineplates.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-engineplates.cfg
@ -19,7 +19,7 @@
    baseCost = 0
    VARIANT
    {
-      name = Boattail
+      name = Boattail-White
      mass = -0.015
      cost = 50
      displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
@ -509,46 +509,6 @@
    baseVariant = Long
    baseMass = 0
    baseCost = 0
-    VARIANT
-    {
-      name = Boattail
-      mass = -0.03
-      cost = 60
-      displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
-      primaryColor = #ffffff
-      secondaryColor = #ffffff
-      themeName = White
-      sizeGroup = GroupB
-      GAMEOBJECTS
-      {
-        Engineplate-25-White = false
-        Engineplate-25-Metal = false
-
-        Boattail-25-Colliders = true
-        Boattail-25-White = true
-        Boattail-25-Dark = false
-        Boattail-25-Metal = false
-        Boattail-25-Orange = false
-
-        Shroud2xDummy = true
-
-        Shroud2x0 = false
-        Shroud2x1 = false
-        Shroud2x2 = false
-        Shroud2x3 = false
-        Shroud2x4 = false
-
-        Shroud2x0-Metal = false
-        Shroud2x1-Metal = false
-        Shroud2x2-Metal = false
-        Shroud2x3-Metal = false
-        Shroud2x4-Metal = false
-      }
-      NODES
-      {
-        node_stack_bottom = 0.0, -1.25, 0.0, 0.0, -1.0, 0.0, 2
-      }
-    }

    VARIANT
    {
@ -593,13 +553,13 @@

    VARIANT
    {
-      name = Boattail-Metal
+      name = Boattail-White
      mass = -0.03
      cost = 60
-      displayName = #LOC_Restock_variant-engine_boattail_metal // Boattail (Metal)
-      primaryColor = #6f6e6d
-      secondaryColor = #6f6e6d
-      themeName = Metal
+      displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      themeName = White
      sizeGroup = GroupB
      GAMEOBJECTS
      {
@ -607,9 +567,9 @@
        Engineplate-25-Metal = false

        Boattail-25-Colliders = true
-        Boattail-25-White = false
+        Boattail-25-White = true
        Boattail-25-Dark = false
-        Boattail-25-Metal = true
+        Boattail-25-Metal = false
        Boattail-25-Orange = false

        Shroud2xDummy = true
@ -673,6 +633,47 @@
      }
    }

+    VARIANT
+    {
+      name = Boattail-Metal
+      mass = -0.03
+      cost = 60
+      displayName = #LOC_Restock_variant-engine_boattail_metal // Boattail (Metal)
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      themeName = Metal
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-25-White = false
+        Engineplate-25-Metal = false
+
+        Boattail-25-Colliders = true
+        Boattail-25-White = false
+        Boattail-25-Dark = false
+        Boattail-25-Metal = true
+        Boattail-25-Orange = false
+
+        Shroud2xDummy = true
+
+        Shroud2x0 = false
+        Shroud2x1 = false
+        Shroud2x2 = false
+        Shroud2x3 = false
+        Shroud2x4 = false
+
+        Shroud2x0-Metal = false
+        Shroud2x1-Metal = false
+        Shroud2x2-Metal = false
+        Shroud2x3-Metal = false
+        Shroud2x4-Metal = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.25, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+
    VARIANT
    {
      name = Short
@ -1111,7 +1112,7 @@
    baseCost = 0
    VARIANT
    {
-      name = Boattail
+      name = Boattail-White
      mass = -0.075
      cost = 100
      displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
@ -1604,7 +1605,7 @@
    baseCost = 0
    VARIANT
    {
-      name = Boattail
+      name = Boattail-White
      mass = -0.1125
      cost = 140
      displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/125/restock-engineplate-125-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/125/restock-engineplate-125-1.cfg
@ -10,7 +10,7 @@ PART
    model = ReStock/Assets/Coupling/restock-engineplate-125-1
  }
  rescaleFactor = 1.0
-  node_stack_top = 0.0, 0.01, 0.0, 0.0, 1.0, 0.0, 1
+  node_stack_top = 0.0, 0.1, 0.0, 0.0, 1.0, 0.0, 1
  node_stack_bottom = 0.0, 0, 0.0, 0.0, -1.0, 0.0, 1

  TechRequired = advConstruction
@ -371,9 +371,51 @@ PART
    baseVariant = Long
    baseMass = 0
    baseCost = 0
+
    VARIANT
    {
-      name = Boattail
+      name = Boattail-Dark
+      mass = -0.015
+      cost = 50
+      displayName = #LOC_Restock_variant-engine_boattail_dark // Boattail (Dark)
+
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      themeName = Dark
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Engineplate-125-White = false
+        Engineplate-125-Orange = false
+
+        Boattail-125-Colliders = true
+        Boattail-125-Dark = true
+        Boattail-125-White = false
+        Boattail-125-Orange = false
+
+        Shroud1xDummy = true
+
+        Shroud1x0 = false
+        Shroud1x1 = false
+        Shroud1x2 = false
+        Shroud1x3 = false
+        Shroud1x4 = false
+
+        Shroud1x0-Orange = false
+        Shroud1x1-Orange = false
+        Shroud1x2-Orange = false
+        Shroud1x3-Orange = false
+        Shroud1x4-Orange = false
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.30, 0.0, 0.0, -1.0, 0.0, 1
+      }
+    }
+
+    VARIANT
+    {
+      name = Boattail-White
      mass = -0.015
      cost = 50
      displayName = #LOC_Restock_variant-engine_boattail_white // Boattail (White)
@ -387,6 +429,7 @@ PART
        Engineplate-125-Orange = false

        Boattail-125-Colliders = true
+        Boattail-125-Dark = false
        Boattail-125-White = true
        Boattail-125-Orange = false

@ -426,6 +469,7 @@ PART
        Engineplate-125-Orange = false

        Boattail-125-Colliders = true
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = true

@ -465,6 +509,7 @@ PART
        Engineplate-125-Orange = false

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

@ -504,6 +549,7 @@ PART
        Engineplate-125-Orange = false

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

@ -543,6 +589,7 @@ PART
        Engineplate-125-Orange = false

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

@ -582,6 +629,7 @@ PART
        Engineplate-125-Orange = false

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

@ -621,6 +669,7 @@ PART
        Engineplate-125-Orange = false

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

@ -660,9 +709,11 @@ PART
        Engineplate-125-Orange = true

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

+
        Shroud1xDummy = false

        Shroud1x0 = false
@ -699,6 +750,7 @@ PART
        Engineplate-125-Orange = true

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

@ -738,6 +790,7 @@ PART
        Engineplate-125-Orange = true

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

@ -777,6 +830,7 @@ PART
        Engineplate-125-Orange = true

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false

@ -816,6 +870,7 @@ PART
        Engineplate-125-Orange = true

        Boattail-125-Colliders = false
+        Boattail-125-Dark = false
        Boattail-125-White = false
        Boattail-125-Orange = false