From f2bd04efb929fe3878d9368488442fed37c8d7ca Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Thu, 12 Sep 2019 22:56:19 -0700 Subject: [PATCH] Move srb-tiny-core-1 fx into restock core for LES --- Assets/CineboxAndrew | 2 +- .../ReStock}/FX/restock-fx-srb-tiny-core-1.mu | Bin .../Patches/Engine/restock-engines-les-125.cfg | 2 +- .../Parts/Engine/0625/restock-srb-mallet-1.cfg | 2 +- .../Parts/Engine/0625/restock-srb-striker-1.cfg | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename Distribution/{RestockPlus/GameData/ReStockPlus => Restock/GameData/ReStock}/FX/restock-fx-srb-tiny-core-1.mu (100%) diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index 305047d0..9c3d5595 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit 305047d0621b0697d21395771e58628364104d0d +Subproject commit 9c3d5595a90a6d6d539575f33c416f3b7018bdb1 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-fx-srb-tiny-core-1.mu b/Distribution/Restock/GameData/ReStock/FX/restock-fx-srb-tiny-core-1.mu similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-fx-srb-tiny-core-1.mu rename to Distribution/Restock/GameData/ReStock/FX/restock-fx-srb-tiny-core-1.mu diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-les-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-les-125.cfg index 07322c2f..b6efe11d 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-les-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-les-125.cfg @@ -74,7 +74,7 @@ MODEL_MULTI_PARTICLE { name = core - modelName = ReStockPlus/FX/restock-fx-srb-tiny-core-1 + modelName = ReStock/FX/restock-fx-srb-tiny-core-1 transformName = fxLower emission = 0.0 0.0 emission = 0.01 0.1 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg index 5266ce45..b87961c8 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg @@ -61,7 +61,7 @@ PART MODEL_MULTI_PARTICLE { name = core - modelName = ReStockPlus/FX/restock-fx-srb-tiny-core-1 + modelName = ReStock/FX/restock-fx-srb-tiny-core-1 transformName = fxTransformCore emission = 0.0 0.0 emission = 0.01 0.1 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg index 17ee09bf..7b4f3654 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg @@ -58,7 +58,7 @@ PART MODEL_MULTI_PARTICLE { name = core - modelName = ReStockPlus/FX/restock-fx-srb-tiny-core-1 + modelName = ReStock/FX/restock-fx-srb-tiny-core-1 transformName = fxTransformCore emission = 0.0 0.0 emission = 0.01 0.1