Skip to content

Commit

Permalink
* FIX - Null-ref on CustomUpperStage when reloading the part in editor
Browse files Browse the repository at this point in the history
* FIX - MEC - Mount sizing for rescaled engine models
* FIX - Missing texture-set definitions for SC-GEN-FR-N
* FIX - Incorrect location of texture-set config definitions for SC-GEN-PDC
* FIX - Incorrect texture-set config setup for ISDC, IPA, FR parts
* FIX - Incorrect texture-set config setup for NodeFairing enabled parts
* UPDATE - Add new shroud mounts to MFT-A/B/D
* UPDATE - Add a simple patch to update part descriptions for engine-cluster enabled parts for consistency.
* UPDATE - Restore the disabling of size-adjust buttons for MEC for 'None' mount type.
* UPDATE - Fix the spec mask of MFT-D green texture
* UPDATE - Simplify/shorten MJ patch syntax for command pods
* UPDATE - Texture-set config setup for NodeFairing enabled parts -- now use a patch to add additional texture sets to -all- node-fairing enabled parts/modules.  Also remove all of the hard-coded texture-sets aside from the default (white) from all node-fairing enabled parts (lots).
* UPDATE - Add additional decoupler texture colors -- blue, green
* UPDATE - Add additional fairing texture colors -- blue, green
* UPDATE - Add texture set to Shroud2 mount type
  • Loading branch information
shadowmage45 committed Mar 29, 2016
1 parent e07cc9c commit c4c12fb
Show file tree
Hide file tree
Showing 56 changed files with 396 additions and 1,953 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,20 @@
}
}
}
@SSTU_MODEL[Mount-Shroud2]:FOR[SSTU]
{
varMesh = SC-ENG-MOUNT-SHROUD2
TEXTURESET
{
name = Mount-Saturn
TEXTURE
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-ENG-MOUNTS4-SATURN-DIFF
normalTexture = SSTU-TextureSets/TextureSets/SC-ENG-MOUNTS4-SATURN-NRM
mesh = #$../../varMesh$
}
}
}
@SSTU_MODEL[Mount-Shroud]:FOR[SSTU]
{
varMesh = SC-ENG-MOUNT-SHROUD
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
@PART[SSTU_LanderCore_LC-DC]:FOR[SSTU]
{
@MODULE[SSTUProceduralDecoupler]
{
TEXTURESET
{
name = Stripes
TEXTUREDATA
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Decoupler-Stripes-DIFF
normalTexture = SSTU/Assets/SC-GEN-Decoupler-NRM
}
}
TEXTURESET
{
name = White
TEXTUREDATA
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Decoupler-White-DIFF
normalTexture = SSTU/Assets/SC-GEN-Decoupler-NRM
}
}
TEXTURESET
{
name = Gray
TEXTUREDATA
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Decoupler-Gray-DIFF
normalTexture = SSTU/Assets/SC-GEN-Decoupler-NRM
}
}
TEXTURESET
{
name = Black
TEXTUREDATA
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Decoupler-Black-DIFF
normalTexture = SSTU/Assets/SC-GEN-Decoupler-NRM
}
}
TEXTURESET
{
name = Green
TEXTUREDATA
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Decoupler-Green-DIFF
normalTexture = SSTU/Assets/SC-GEN-Decoupler-NRM
}
}
TEXTURESET
{
name = Blue
TEXTUREDATA
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Decoupler-Blue-DIFF
normalTexture = SSTU/Assets/SC-GEN-Decoupler-NRM
}
}
}
}
209 changes: 209 additions & 0 deletions GameData/SSTU-TextureSets/Configs/TextureSets-Fairings.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,196 @@
@PART[*]:HAS[@MODULE[SSTUNodeFairing]]:FOR[SSTU]
{
@MODULE[SSTUNodeFairing]
{
TEXTURESET
{
name = Fairings-Stripes1
}
TEXTURESET
{
name = Fairings-Stripes2
}
TEXTURESET
{
name = Fairings-Stripes4
}
TEXTURESET
{
name = Fairings-Checks1
}
TEXTURESET
{
name = Fairings-Checks2
}
TEXTURESET
{
name = Fairings-Checks4
}
TEXTURESET
{
name = Fairings-Gray
}
TEXTURESET
{
name = Fairings-Gray2
}
TEXTURESET
{
name = Fairings-Black
}
TEXTURESET
{
name = Fairings-Orange
}
TEXTURESET
{
name = Fairings-Green
}
TEXTURESET
{
name = Fairings-Blue
}
}
}
@PART[*]:HAS[@MODULE[SSTUResizableFairing]]:FOR[SSTU]
{
@MODULE[SSTUResizableFairing]
{
TEXTURESET
{
name = Fairings-Gray
}
TEXTURESET
{
name = Fairings-Gray2
}
TEXTURESET
{
name = Fairings-Black
}
TEXTURESET
{
name = Fairings-Orange
}
TEXTURESET
{
name = Fairings-Green
}
TEXTURESET
{
name = Fairings-Blue
}
}
}
@PART[*]:HAS[@MODULE[SSTUInterstageFairing]]:FOR[SSTU]
{
@MODULE[SSTUInterstageFairing]
{
TEXTURESET
{
name = Fairings-Stripes1
}
TEXTURESET
{
name = Fairings-Stripes2
}
TEXTURESET
{
name = Fairings-Stripes4
}
TEXTURESET
{
name = Fairings-Checks1
}
TEXTURESET
{
name = Fairings-Checks2
}
TEXTURESET
{
name = Fairings-Checks4
}
TEXTURESET
{
name = Fairings-Gray
}
TEXTURESET
{
name = Fairings-Gray2
}
TEXTURESET
{
name = Fairings-Black
}
TEXTURESET
{
name = Fairings-Orange
}
TEXTURESET
{
name = Fairings-Green
}
TEXTURESET
{
name = Fairings-Blue
}
}
}
@PART[*]:HAS[@MODULE[SSTUInterstageDecoupler]]:FOR[SSTU]
{
@MODULE[SSTUInterstageDecoupler]
{
TEXTURESET
{
name = Fairings-Stripes1
}
TEXTURESET
{
name = Fairings-Stripes2
}
TEXTURESET
{
name = Fairings-Stripes4
}
TEXTURESET
{
name = Fairings-Checks1
}
TEXTURESET
{
name = Fairings-Checks2
}
TEXTURESET
{
name = Fairings-Checks4
}
TEXTURESET
{
name = Fairings-Gray
}
TEXTURESET
{
name = Fairings-Gray2
}
TEXTURESET
{
name = Fairings-Black
}
TEXTURESET
{
name = Fairings-Orange
}
TEXTURESET
{
name = Fairings-Green
}
TEXTURESET
{
name = Fairings-Blue
}
}
}

SSTU_TEXTURESET
{
name = Fairings-Stripes1
Expand Down Expand Up @@ -77,4 +270,20 @@ SSTU_TEXTURESET
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Fairing-Orange-DIFF
}
}
SSTU_TEXTURESET
{
name = Fairings-Green
TEXTUREDATA
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Fairing-Green-DIFF
}
}
SSTU_TEXTURESET
{
name = Fairings-Blue
TEXTUREDATA
{
diffuseTexture = SSTU-TextureSets/TextureSets/SC-GEN-Fairing-Blue-DIFF
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions GameData/SSTU/Data/TextureSets/TextureSets-Fairings.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//the default fairing texture set included with the base mod... plain white
SSTU_TEXTURESET
{
name = Fairings-White
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@PART[*]:HAS[@MODULE[SSTUModularEngineCluster]]:AFTER[SSTU]
{
@description ^= :$: Using the patented SSTU Engine-Clustering technology the number of engines, engine layout, mounting or shroud type, and mount/shroud size are configurable, and each set of engines are built to your specifications.:
}
43 changes: 1 addition & 42 deletions GameData/SSTU/Parts/ShipCore/engines/SC-ENG-AJ10-137-New.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ category = Engine
subcategory = 0
title = SSTU - SC-ENG-AJ10-137
manufacturer = SSTU
description = The AJ10-137 is a pressure fed hypergolic service propulsion engine, capable of multiple restarts. Engine mount geometry and size, and cluster configuration (number of engines and layout) can be set while in the editor.
description = The AJ10-137 is a pressure fed hypergolic service propulsion engine, capable of multiple restarts.

MODEL
{
Expand Down Expand Up @@ -113,7 +113,6 @@ MODULE
engineHeight = 2.45626
engineYOffset = 0
engineScale = 1
engineMass =0.4096
engineCost = 400
partTopY = 0.5
smokeTransformName = SmokeTransform
Expand Down Expand Up @@ -194,46 +193,6 @@ MODULE
{
name = Fairings-White
}
TEXTURESET
{
name = Fairings-Stripes1
}
TEXTURESET
{
name = Fairings-Stripes2
}
TEXTURESET
{
name = Fairings-Stripes4
}
TEXTURESET
{
name = Fairings-Checks1
}
TEXTURESET
{
name = Fairings-Checks2
}
TEXTURESET
{
name = Fairings-Checks4
}
TEXTURESET
{
name = Fairings-Gray
}
TEXTURESET
{
name = Fairings-Gray2
}
TEXTURESET
{
name = Fairings-Black
}
TEXTURESET
{
name = Fairings-Orange
}
}
MODULE
{
Expand Down
Loading

0 comments on commit c4c12fb

Please sign in to comment.