From 406cfae0f510cdb6fc13324112c3b2ae383bbe48 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Fri, 6 Dec 2019 15:41:44 +0100
Subject: [PATCH] ZoneCode: Fix Commands for FxEffectDef GameWorldSp and
 MaterialTechniqueSet

---
 src/ZoneCode/Game/T6/T6_Commands.txt | 57 ++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/ZoneCode/Game/T6/T6_Commands.txt b/src/ZoneCode/Game/T6/T6_Commands.txt
index 312aaa8e..7c850829 100644
--- a/src/ZoneCode/Game/T6/T6_Commands.txt
+++ b/src/ZoneCode/Game/T6/T6_Commands.txt
@@ -349,9 +349,9 @@ set count GfxPixelShaderLoadDef::program programSize;
 
 // MaterialShaderArgument
 use MaterialShaderArgument;
-set condition u::literalConst type == MTL_ARG_LITERAL_VERTEX_CONST || type == MTL_ARG_LITERAL_PIXEL_CONST;
+set condition u::literalConst type == MTL_ARG_LITERAL_VERTEX_CONST 
+|| type == MTL_ARG_LITERAL_PIXEL_CONST;
 set reusable u::literalConst;
-set count u::literalConst 1;
 
 // =========================================
 // GfxImage
@@ -496,6 +496,18 @@ set count pathVis visBytes;
 set count smoothCache smoothBytes;
 set count nodeTree nodeTreeCount;
 
+// pathnode_t
+set condition pathnode_t::transient never;
+
+// pathnode_constant_t
+use pathnode_constant_t;
+set scriptstring targetname;
+set scriptstring script_linkName;
+set scriptstring script_noteworthy;
+set scriptstring target;
+set scriptstring animscript;
+set count Links totalLinkCount;
+
 // pathnode_tree_t
 use pathnode_tree_t;
 set condition u::s axis < 0;
@@ -976,14 +988,52 @@ set count futzes futzCount;
 use FxEffectDef;
 set string name;
 set name name;
+set count elemDefs elemDefCountLooping + elemDefCountOneShot + elemDefCountEmission;
+
+// FxElemDef
+use FxElemDef;
+set count velSamples velIntervalCount + 1;
+set count visSamples visStateIntervalCount + 1;
+
+// FxElemDefVisuals
+use FxElemDefVisuals;
+set condition markArray FxElemDef::elemType == FX_ELEM_TYPE_DECAL;
+set count markArray FxElemDef::visualCount;
+set condition array FxElemDef::visualCount > 1;
+set count array FxElemDef::visualCount;
 
 // FxElemVisuals
 use FxElemVisuals;
 set condition anonymous never;
+set condition model FxElemDef::elemType == FX_ELEM_TYPE_MODEL;
+set condition effectDef FxElemDef::elemType == FX_ELEM_TYPE_RUNNER;
+set condition soundName FxElemDef::elemType == FX_ELEM_TYPE_SOUND;
+set condition lightDef FxElemDef::elemType == FX_ELEM_TYPE_SPOT_LIGHT;
+set condition material FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_BILLBOARD
+|| FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_ORIENTED
+|| FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_ROTATED
+|| FxElemDef::elemType == FX_ELEM_TYPE_TAIL
+|| FxElemDef::elemType == FX_ELEM_TYPE_LINE
+|| FxElemDef::elemType == FX_ELEM_TYPE_TRAIL
+|| FxElemDef::elemType == FX_ELEM_TYPE_CLOUD;
+
+// FxEffectDefRef
+use FxEffectDefRef;
+set condition handle never;
+set string name;
 
 // FxElemExtendedDefPtr
 use FxElemExtendedDefPtr;
-set condition unknownDef never;
+set condition trailDef FxElemDef::elemType == FX_ELEM_TYPE_TRAIL;
+set condition spotLightDef FxElemDef::elemType == FX_ELEM_TYPE_SPOT_LIGHT;
+
+// FxTrailDef
+use FxTrailDef;
+set count verts vertCount;
+set count inds indCount;
+
+// FxElemSpawnSound
+set string FxElemSpawnSound::spawnSound;
 
 // =========================================
 // FxImpactTable
@@ -991,6 +1041,7 @@ set condition unknownDef never;
 use FxImpactTable;
 set string name;
 set name name;
+set count table 21;
 
 // =========================================
 // RawFile