From 20d1173d86615e8877cfe26e61f5c5458de83e9b Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Thu, 28 Feb 2019 23:14:07 -0800 Subject: [PATCH] Fix errors when migrating saves to Restock - the game keeps track of the orientation of the antenna pivot object in the save. This makes sense for solar panels, or antennas if they tracked, but some deployed antennas ended up pointed random directions and looking weird when migrating an existing save - This commit rotates the root segment of the communotron 16 to match the stock orientation, and adds dummy pivot transforms matching the stock deployed pivot transforms so nothing changes when the game rotates them on load. --- .../Communication/restock-antenna-radial-2.mu | Bin 242147 -> 242698 bytes .../Communication/restock-antenna-radial-3.mu | Bin 899973 -> 899103 bytes .../Communication/restock-antenna-stack-1.mu | Bin 31439 -> 31801 bytes .../Communication/restock-antennas.cfg | 32 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu index e4bbc645246cbea78e650557a5b7a7c684af501a..a252f16afcba5c69a3f648c00d4c284c390bec69 100644 GIT binary patch delta 1896 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 diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-1.mu index e5a630322f773e6dda6d8368ca14692390e5059c..20f31cb1d4d22486b31854a6b60e8079387a71f8 100644 GIT binary patch delta 2934 zcmaKuYfKzf6vr9eZ*3l_5+Qnu_4x)*jkGcJpVg)w!_ZCBsY8i zzdiSy{qH?@W`4Mn@cBOp;fjp*-*%p6j?4IQOK$I*nI*4&TdeLo&&Hph{zxqvpHTny ze4rxCM`PvYH`?B6stk6t1cS{bFSc#p)?qXzK5kq~NiFx@&!yAU9?Ud*u-?}Aq$@0# zaUv-*q?5Dr?slN(K6-%Kd`D=xo-P3UvROqcUz#J=?m0kC2{> z#+d;%vTFwiI4l#wX=b>GLl;+Dh2b>+l>=OA-6}jG7|o$E7BQL^H90UdJtAX8Joe9K zjSX2576l18CxudF$VD3}a?5gLX5y{K6*?B?v8H{vaBKDi|t zMi=qp=J|V;PLbG8mmNO)Hz7A3yG8hw`Zw$^}#(6$ZFBzxfj&IK^VHz5)tiyTWBU2c5;(EXFyefZ3RlL@mntG?ADPA1H5%=IYHdY^SNVfMdw zyACWP6QUA-JSC=0`Eu=*f} zzA>+k*=E~`In9>FZCZbHM;)=cm1EMmUNF;~aWRT@bv&6BE@=Wqr25Yg5)~Gg1WS2!B!CEQhlUk=3x^e`g zi7p2tYXKL8H7rI@noNjh@)3i+H$Rm}-wC5&GMNsxm{Dh=jt&ehXjB-rS!?Q6(Wo$* zH+aVn{p9gt{MESB&#Ja5(3Lyi7Ys%(t^Zkp);fn|T#hX!(I|4p1Ny z!swc;4>@#`EDWQexr1D49aVAr*+Yz`&={;DZlh)!UwOr=z@iO1Y?_M9fjk(voVj%X z+8Gz4lj>sh$Z;`xF$lOIV_&-%{&}i}g7%2pzKfg9OYjz}VPSVx#xqz;Ox!TZg2)HGTE@Wv;-Kv~>7blRpyL-{zo_sK z63VgUemR?S@5R##niKnFv+8fGyC~)4cgK<~L z@;#BDM-KT0O0tv1`>FhjJ{Y^5B<@>cZjAVHAHyu=rIy#*TY?=;;%SN3IlS!{M}0++ zkUufqqvP2{&k|#kzbf+GhFfVK9d{f$w1OnR41z@TPZ4=8^6b_}(~Y&ANyhrlQ;FWG Kj}1@Px&Hwro!Qs` delta 2467 zcmdT`O-NKx7`?ABXLQtR%uQgDn>5H2gACtKqX@zT7CeM9!bMOsHAJ|GTFirXZc;A& zK#L|-`|ssck21CPT>&Czl%(D`D^E9oy%`siG1$T zd?+|6GtANXwz^@xh#nK{1)U%K`bj^EFc9SEeCp(gaSx#($kF+M*OSILY6vo}^FNwz z8n>|-K@!6vhY!o***&bCq2P2eG`)YiXRxZWlfxYVNZR3Y@@{QBMZ)oc$*NLqD_r#` zsuxRGYySq(*(HPbNGTKt*kpz|db%HRc!H7GuZPb&z2td+gkBKv0>d#5qQU)WEc{#C|-U}9w^>Qw=~Jw%TG7sCz-r><>hY%^3Q$% diff --git a/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg b/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg index 72a61778..c7d6351d 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg @@ -42,7 +42,7 @@ @MODULE[ModuleDeployableAntenna] { @animationName = Deploy - @pivotName = Dish + @pivotName = Pivot !raycastTransformName = DELETE } } @@ -58,7 +58,7 @@ @MODULE[ModuleDeployableAntenna] { @animationName = Deploy_Radial - @pivotName = Dish_Radial + @pivotName = Pivot !secondaryTransformName = DELETE } @@ -66,20 +66,6 @@ name = ModulePartVariants baseVariant = Axial - VARIANT { - name = Radial - displayName = #LOC_Restock_variant-antenna_radial - themeName = Gold - - primaryColor = #fccb0a - secondaryColor = #707070 - - GAMEOBJECTS { - Dish_Normal = true - Dish_Axial = false - } - } - VARIANT { name = Axial displayName = #LOC_Restock_variant-antenna_axial @@ -93,6 +79,20 @@ Dish_Axial = true } } + + VARIANT { + name = Radial + displayName = #LOC_Restock_variant-antenna_radial + themeName = Gold + + primaryColor = #fccb0a + secondaryColor = #707070 + + GAMEOBJECTS { + Dish_Normal = true + Dish_Axial = false + } + } } }