Merge branch 'resource' into develop

Distribution/Restock/GameData/ReStock/Localization/en-us.cfg

@@ -8,6 +8,12 @@ Localization
 {
   en-us
   {
+
+    // Actions and buttons
+    #LOC_Restock_scanner_screen_on = Screen On
+    #LOC_Restock_scanner_screen_off = Screen Off
+    #LOC_Restock_scanner_screen_toggle = Toggle Screen
+
     #LOC_Restock_variant-engine_size0 = 0.625m
     #LOC_Restock_variant-engine_size1 = 1.25m
     #LOC_Restock_variant-engine_size1p5 = 1.875m
@@ -69,5 +75,7 @@ Localization
     #LOC_Restock_variant-radiator_basic = Basic
     #LOC_Restock_variant-radiator_flat = Flat
     #LOC_Restock_variant-radiator_compact = Compact
+
+    #LOC_Restock_description-FuelCellArray = Why have just one small fuel cell when you can have three large ones?  The fuel cell array is ideal for situations where you need a large source of reliable power.  Like the smaller fuel cells, this array operates by converting fuel and oxidizer into energy. 
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claw.cfg

@@ -0,0 +1,133 @@
+// Patches applying art changes to the asteroid claw
+// Contents:
+// - Advanced Grabbing Unit (GrapplingDevice)
+
+// Advanced Grabbing Unit
+@PART[GrapplingDevice]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Coupling/restock-claw-125
+  }
+
+  %rescaleFactor = 1
+  %node_stack_top = 0.0, -0.14082675, 0.00, 0.0, -1.0, 0.0, 1
+
+  @MODULE[ModuleGrappleNode] 
+  {
+    nodeTransformName = Pivot
+  }
+
+  @MODULE[ModuleAnimateGeneric] 
+  {
+    animationName = Deploy
+  }
+
+  @MODULE[FlagDecal]
+  {
+    textureQuadName = flagTransform
+  }
+
+  !MODULE[FXModuleLookAtConstraint]
+
+  MODULE 
+  {
+    name = FXModuleLookAtConstraint
+
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylU.001
+      targetName = act_cylL.001
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylL.001
+      targetName = act_cylU.001
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylU.002
+      targetName = act_cylL.002
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylL.002
+      targetName = act_cylU.002
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylU.003
+      targetName = act_cylL.003
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylL.003
+      targetName = act_cylU.003
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylU.004
+      targetName = act_cylL.004
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylL.004
+      targetName = act_cylU.004
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylU.005
+      targetName = act_cylL.005
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylL.005
+      targetName = act_cylU.005
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylU.006
+      targetName = act_cylL.006
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylL.006
+      targetName = act_cylU.006
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylU.007
+      targetName = act_cylL.007
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylL.007
+      targetName = act_cylU.007
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylU.008
+      targetName = act_cylL.008
+    }
+    CONSTRAINLOOKFX
+    {
+      rotatorsName = act_cylL.008
+      targetName = act_cylU.008
+    }
+  }
+
+  MODULE
+  {
+    name = ModuleLight
+    lightName = Lamp
+    useAnimationDim = true
+    lightBrightenSpeed = 2.5
+    lightDimSpeed = 2.5
+    resourceAmount = 0.02
+    useResources = true
+    animationName = RestockClawLamp_On
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg

@@ -0,0 +1,29 @@
+// Patches applying art changes to fuel cells
+// Contents:
+// - Fuel Cell (FuelCell)
+// - Fuel Cell Array (FuelCellArray)
+
+// Fuel Cell
+@PART[FuelCell]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-fuelcell-radial-1
+  }
+}
+
+// Fuel Cell Array
+@PART[FuelCellArray]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-fuelcell-radial-2
+  }
+}
+

Distribution/Restock/GameData/ReStock/Patches/Resource/restock-drills.cfg

@@ -0,0 +1,113 @@
+// Patches applying art changes to ore drills
+// Contents:
+// - Drill-O-Matic' Mining Excavator (RadialDrill)
+// - Drill-O-Matic Junior' Mining Excavator (MiniDrill)
+
+// Drill-O-Matic' Mining Excavator
+@PART[RadialDrill]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-drill-radial-2
+  }
+
+  @MODULE[ModuleAnimationGroup] 
+  {
+    @deployAnimationName = Deploy
+    @activeAnimationName = Drill
+    deployEffectName = Deploy
+    activeEffectName = Active
+    retractEffectName = Retract
+    stopActiveAnimIfDisabled = true
+  }
+
+  EFFECTS
+  {
+    drill
+    {
+      MODEL_MULTI_PARTICLE
+      {
+        name = dust
+        modelName = ReStock/FX/restock-fx-drill-dust
+        transformName = fxTransformDust
+        emission = 1.0 1.1
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = rocks
+        modelName = ReStock/FX/restock-fx-drill-rocks
+        transformName = fxTransformRocks
+        emission = 1.0 1.0
+        speed = 1.0 1.0
+      }
+    }
+    Deploy {
+      AUDIO
+      {
+        channel = Ship
+        clip = ReStock/Sounds/drill-start
+      }
+    }
+    Active {
+      AUDIO
+      {
+        channel = Ship
+        clip = ReStock/Sounds/drill-loop
+        volume = 0.0 0.0
+        volume = 1.0 1.0
+      }
+    }
+    Retract {
+      AUDIO
+      {
+        channel = Ship
+        clip = ReStock/Sounds/drill-end
+      }
+    }
+  }
+}
+
+// Drill-O-Matic Junior' Mining Excavator
+@PART[MiniDrill]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-drill-radial-1
+  }
+
+  @MODULE[ModuleAnimationGroup] 
+  {
+    @deployAnimationName = Deploy
+    @activeAnimationName = Drill
+  }
+
+  EFFECTS
+  {
+    drill
+    {
+      MODEL_MULTI_PARTICLE
+      {
+        name = dust
+        modelName = ReStock/FX/restock-fx-minidrill-dust
+        transformName = fxTransformDust
+        emission = 1.0 1.1
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = rocks
+        modelName = ReStock/FX/restock-fx-minidrill-rocks
+        transformName = fxTransformRocks
+        emission = 1.0 1.0
+        speed = 1.0 1.0
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Resource/restock-isrus.cfg

@@ -0,0 +1,111 @@
+// Patches applying art changes to ISRUs
+// Contents:
+// - Convert-O-Tron 125 (MiniISRU)
+// - Convert-O-Tron 250 (ISRU)
+
+// Convert-O-Tron 125
+@PART[MiniISRU]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-isru-125-1
+    scale = 1.0, 1.0, 1.0
+  }
+
+  MODULE
+  {
+    name = ModuleRestockISRUAnimation
+    deployAnimationName = heater
+    needsEC = true
+  }
+
+  MODULE
+  {
+    name = ModuleRestockHeatEffects
+    enableHeatEmissive = true
+    useCoreTemp = true
+    shaderProperty = _EmissiveColor
+    excludedRenderer = ISRU-125_heater
+    lerpMax = 2700
+    redCurve
+    {
+      key = 0 0 2 2
+      key = 1 1 0 0
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 1 0 0
+      key = 1 1 0 0
+    }
+    disableBlackbody = true
+  }
+}
+
+// Convert-O-Tron 250
+@PART[ISRU]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-isru-25-1
+    scale = 1.0, 1.0, 1.0
+  }
+
+  !MODULE[ModuleAnimationGroup] {}
+
+  MODULE
+  {
+    name = ModuleRestockISRUAnimation
+    deployAnimationName = Deploy
+    activeAnimationName = Run
+    retractAnimationName = Retract
+    needsEC = true
+    waitForComplete = true
+  }
+
+  MODULE
+  {
+    name = ModuleRestockHeatEffects
+    enableHeatEmissive = true
+    useCoreTemp = true
+    shaderProperty = _EmissiveColor
+    excludedRenderer = ISRU-25_heater
+    lerpMax = 2700
+    redCurve
+    {
+      key = 0 0 2 2
+      key = 1 1 0 0
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 1 0 0
+      key = 1 1 0 0
+    }
+    disableBlackbody = true
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg

@@ -0,0 +1,41 @@
+// Patches applying art changes to ore tanks
+// Contents:
+// - Radial Holding Tank (RadialOreTank)
+// - Small Holding Tank (SmallTank)
+// - Large Holding Tank (LargeTank)
+
+// Radial Holding Tank
+@PART[RadialOreTank]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-oretank-radial-1
+  }
+}
+
+// Small Holding Tank
+@PART[SmallTank]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-oretank-125-1
+  }
+}
+
+// Large Holding Tank
+@PART[LargeTank]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-oretank-25-1
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg

@@ -0,0 +1,182 @@
+// Patches applying art changes to ore scanners
+// Contents:
+// - Surface Scanning Module (SurfaceScanner)
+// - M700 Survey Scanner (SurveyScanner)
+// - M4435 Narrow-Band Scanner (OrbitalScanner)
+
+// Surface Scanning Module
+@PART[SurfaceScanner]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-surfacescanner-1
+  }
+
+  MODULE
+  {
+    name = ModuleAnimateGeneric
+    animationName = screenon
+    startEventGUIName =  #LOC_Restock_scanner_screen_on // Screen On
+    endEventGUIName =  #LOC_Restock_scanner_screen_off // Screen Off
+    actionGUIName =  #LOC_Restock_scanner_screen_toggle // Screen Toggle
+    evaDistance = 1.5
+  }
+}
+
+// M700 Survey Scanner 
+@PART[SurveyScanner]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-surveyscanner-1
+    scale = 1.0, 1.0, 1.0
+  }
+
+  @MODULE[ModuleAnimationGroup] 
+  {
+    @deployAnimationName = Deploy
+    deployEffectName = Deploy
+    retractEffectName = Retract
+  }
+
+  EFFECTS
+  {
+    Deploy {
+      AUDIO
+      {
+        channel = Ship
+        clip = ReStock/Sounds/scanner-open
+        volume = 0.3
+      }
+    }
+    Retract {
+      AUDIO
+      {
+        channel = Ship
+        clip = ReStock/Sounds/scanner-close
+        volume = 0.3
+      }
+    }
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Size0
+
+    VARIANT
+    {
+      name = Size0
+      displayName = #LOC_Restock_variant-antenna_size0
+      themeName = White
+      primaryColor = #C8C8C8
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        Body_Rad = false
+        Body_625 = true
+        Body_125 = false
+      }
+    }
+
+    VARIANT
+    {
+      name = Size1
+      displayName = #LOC_Restock_variant-antenna_size1
+      themeName = White
+      primaryColor = #C8C8C8
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        Body_Rad = false
+        Body_625 = false
+        Body_125 = true
+      }
+    }
+
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-antenna_compact
+      themeName = White
+      primaryColor = #C8C8C8
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Body_Rad = true
+        Body_625 = false
+        Body_125 = false
+      }
+    }
+  }
+}
+
+// M4435 Narrow-Band Scanner
+@PART[OrbitalScanner]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-orbitalscanner-1
+  }
+
+  @MODULE[ModuleAnimationGroup] 
+  {
+    @activeAnimationName = Spin
+    activeEffectName = Active
+  }
+
+  EFFECTS
+  {
+    Active {
+      AUDIO
+      {
+        channel = Ship
+        clip = ReStock/Sounds/scanner-spin
+        volume = 0.1
+      }
+    }
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Size0
+
+    VARIANT
+    {
+      name = Size0
+      displayName = #LOC_Restock_variant-antenna_size0
+      themeName = White
+      primaryColor = #AC6F54
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        Base_Compact = false
+        Base_625 = true
+      }
+    }
+
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-antenna_compact
+      themeName = White
+      primaryColor = #AC6F54
+      secondaryColor = #545454
+      GAMEOBJECTS
+      {
+        Base_Compact = true
+        Base_625 = false
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -112,3 +112,13 @@ Squad/Parts/Utility/rockomaxAdapters/
 Squad/Parts/Utility/ServiceBay/
 Squad/Parts/Utility/spotLightMk1/
 Squad/Parts/Utility/spotLightMk2/
+Squad/Parts/Resources/RadialTank/
+Squad/Parts/Resources/SmallTank/
+Squad/Parts/Resources/LargeTank/
+Squad/Parts/Resources/FuelCell/
+Squad/Parts/Resources/MiniDrill/
+Squad/Parts/Resources/RadialDrill/
+Squad/Parts/Resources/SurfaceScanner/
+Squad/Parts/Resources/OrbitalScanner/
+Squad/Parts/Resources/SurveyScanner/
+Squad/Parts/Resources/MiniISRU/