From ff912d2cc85ddca3b8a730a18b3a98e67e007bb0 Mon Sep 17 00:00:00 2001 From: sayterdarkwynd Date: Wed, 23 Oct 2024 10:02:50 -0400 Subject: [PATCH] updates * centrifuge is smaller and more compact, and centers when placed * Geology tier nodes have new icons * removed unused object --- _FUversioning.config | 4 ++++ .../approved/energywood/nightarritualbench.png | Bin 132 -> 0 bytes objects/power/centrifuge/centrifuge.frames | 2 +- objects/power/centrifuge/centrifuge.object | 3 +-- objects/power/centrifuge/centrifuge.png | Bin 708 -> 234 bytes .../centrifuge/centrifugefullbright.frames | 2 +- .../power/centrifuge/centrifugefullbright.png | Bin 699 -> 742 bytes objects/power/centrifuge/centrifugeicon.png | Bin 111 -> 387 bytes zb/researchTree/fu_geology.config | 10 +++++----- zb/researchTree/icons/1.png | Bin 0 -> 148 bytes zb/researchTree/icons/2.png | Bin 0 -> 157 bytes zb/researchTree/icons/3.png | Bin 0 -> 149 bytes zb/researchTree/icons/4.png | Bin 0 -> 191 bytes zb/researchTree/icons/5.png | Bin 0 -> 154 bytes zb/researchTree/icons/6.png | Bin 0 -> 196 bytes zb/zb_player_init.lua | 4 ---- 16 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 a_notyetadded/objects/approved/energywood/nightarritualbench.png create mode 100644 zb/researchTree/icons/1.png create mode 100644 zb/researchTree/icons/2.png create mode 100644 zb/researchTree/icons/3.png create mode 100644 zb/researchTree/icons/4.png create mode 100644 zb/researchTree/icons/5.png create mode 100644 zb/researchTree/icons/6.png diff --git a/_FUversioning.config b/_FUversioning.config index 2db38d872ef..c483c0588f1 100644 --- a/_FUversioning.config +++ b/_FUversioning.config @@ -16,6 +16,10 @@ * changed the beam-in point for the Science Outpost to the teleporter position instead of the lower Coffee Dock * Troughs give a radiomessage when first picked up * Farm animals now properly mate to produce offspring. Their hunger level directly influences this chance. +* the Lab Centrifuge has had its size adjusted from 33 pixels wide, to 24. It should more properly fit on surfaces now. +* Additionally, the Lab Centrifuage fullbright layer has been corrected. +* updates Lab Centrifuge icon +* Geology Tier nodes have new icons to make it clearer that they are tier progression nodes ^cyan;6.4.6^reset; ------------------ diff --git a/a_notyetadded/objects/approved/energywood/nightarritualbench.png b/a_notyetadded/objects/approved/energywood/nightarritualbench.png deleted file mode 100644 index 58767ffba8162d425a4896490dea8ef641a4ec89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DgFST5LY10ASc0~F3(`4$B-77 zm^wQaD8g70.", + "dualImage" : "centrifugefullbright.png:.", "imagePosition" : [0, 0], "frames" : 1, diff --git a/objects/power/centrifuge/centrifuge.png b/objects/power/centrifuge/centrifuge.png index 72a0f0d04880d74a2c4affe208726b626f4c8bd6..a576d50607f64134d3d06066349cbe26ee41834d 100644 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^l|U@a!3HF^OkGq8q!^2X+?^QKos)S9^o;=4``G4zqbZGmbmm6%|{^jhPrgB%`{nOWn$F+NetL^zO ha{Rpfl$oI+(}wZ4dO1s`m!~>Nv!|<{%Q~loCIC$YVdDS* literal 708 zcmV;#0z3VQP) z_4W4l_V@Sq`1ttu_xJYp_V@Sq_4W1m`1twx`Tzg_`T6jL)SB>-itT!HAYI zE{;kQ%SC!A7Z#cE2Mc+FA{)n!yb+Y(4H01?YZF0La*6u&b)6r7P}N86+RaVf5;ji(%`RrjoUf8T891i2LmC_vCVZU51NUr9EK zIF4=XoSO_OxAO7F_g^7Qr&9=TpL7a@vqI+&7yL@u3EKpcmF8EP=PzEoW2-y0uV23W z)GiQYUAU(4|P)_2!!N8 z%%3YYbt&kk@1LbkF$8sV;( q5QJ>y2+Ru^^#c&F@;mfH5WWHBEol~X(zrDM0000(0r%oTzw! z(R$(|)%yQ9L3prkGEmDLPZ!4!kIt==>Vumc1llfc3a~Uj8$Y%1T+3CSe!sKjo0sb7s&i^>#ovUq*qU&!@H(a^l{&#kh@Arobt(o{$*&fF&zg%pz z?%frS@5gQTxIfR?U#3_qdFk_k?@Q%b4!-9=W&C)~PSG^CwC$(X zi1VdQbe$bq_PY3-h0*P0-BpJy7kh_BA6)&rU`xVUr;X7Uuls#Sdhku=6m#}gKes8L zxJ=Fje~x-{sUvAYqFzsA%Roi0usPFh1YlCzyy%23Gl+86b?+dF?`PF%7i!mhj3#=#~7D{Dig;;cBvK)x$y@J zMS~(A#|fDclwgL4Fp>AEpelvLpxGSo<9`pT`e@Q`wFa&rpa1~{2q?HeTda@yGXH zA#Ar>2ydTUl?e9=SAV!*E9D~WQ%Fu)TQ*`;_o;5B(^FmHVud>^=hwghVk?C*_<`UC10)m=16Lskg!Dn&pDQ$`U*`MyY=*nF z4WqkoCN#kR6kwz?!G2zqu*QEBayKJmzP^EXH*g4o{g$g0?#c;4$XBkwzLeEG00Aq% c!#o7x8&}O^&`wS3NdN!<07*qoM6N<$f{qT^aR2}S diff --git a/objects/power/centrifuge/centrifugeicon.png b/objects/power/centrifuge/centrifugeicon.png index fffb818680a544ad1cba967176f744658000c4d4..c810c72453dfc179a77f964ef1e9a5fd53c9b360 100644 GIT binary patch delta 359 zcmV-t0hs=8g9DHxe*tq+M?wIu&K&6g00BKoL_t(IjjfQqYQj(eg})RbAVmiuL+&Qr z%^^-cff9!fU7QQjp(SvA0Vmgxn5plOJWL&2TDL+nxCjygbxDUd)wHH)+q2x?@7!}P z{88G+nE#U78^m#ZGA)GoWNXFda=BzM7z6-Gk|@vfN|5Wie?c*i<5&qHazLw5p=Psr zQkqJGdcBUW>i{^86I9*1I9zPETLrXD(+mJMn+=9x0Fb7s0@?t@`L_g(MkAQbW~z8S z%QDvMHDMU4R;$Hsx4Rk+hov;71OU_NG`N0x!Eu}}fMFQewoR|s<175*9~5Q>)s9L7 za?7%iQnFgDVOT5{nq^tJl#(zEyTHvcFi8?6gxDwO_xt$1&x3xM1Kho)j7Fo!s+Z^U z`SA+R_qUA4W9W47eZR8aWHKpNI9F0iq9}SdIGg@Yy#ZH7WIiG+^veJM002ovPDHLk FV1ktXrMUnA delta 81 zcmZo>&Yz&-ZRY9X7*cU7IYFZ5fjy(o4F-V&Y94DCCE6yenpwr>^WTiW$DLQ=5}N{Z k5U+z_i_F;gTe~DWM4fF8wsj literal 0 HcmV?d00001 diff --git a/zb/researchTree/icons/2.png b/zb/researchTree/icons/2.png new file mode 100644 index 0000000000000000000000000000000000000000..ec2d94efa44a3ad590949df1e0a4e056f6d5dd3d GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|!aZFaLo9mV zPIlyKFc3Jh=*R!_Xa42eh@4&|cJ%9mgANN>W{FL6nyC5q?~^xkdR211mpjA6gxjov&&(`#h07;byqfqb+uyo}Ld$W7Yl}u+mg(`(vOL44$rjF6*2U FngD^OKB52s literal 0 HcmV?d00001 diff --git a/zb/researchTree/icons/3.png b/zb/researchTree/icons/3.png new file mode 100644 index 0000000000000000000000000000000000000000..3c16e842562044019c60252d00182e420d9731c6 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|{5@S9Lo9mV zPB!E^V8C+&;IN`9T3D6o0a!6z)_61>!5@a-vQ4A29HDE{#xa!?0+9IsW$a) w;YXJG2i%M|%67llQ5?GJRbbuYN6B3?LmEpznk8w>1{%%a>FVdQ&MBb@0L1k-w*UYD literal 0 HcmV?d00001 diff --git a/zb/researchTree/icons/4.png b/zb/researchTree/icons/4.png new file mode 100644 index 0000000000000000000000000000000000000000..88977c0d03037658d60035898107c74dad0ecc25 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Dm`5sLo9la zPLAX{puppzzV!O(%;Ud(?Q@Q_iS6d7RhV_u;TT8Fk#Di)#l`b<3zaxMbHDDJ_a^$o zM2&=ZeL-HPXV&G%h|Fm6@Y?D)_ov^Z&n6XTtvY7!UR}Q{_QA4G|8-e>A2J-@D0=b@ p^8}L)$ErgwjK38|p^JwQh=c)I$ztaD0e0syUKOZNZ( literal 0 HcmV?d00001 diff --git a/zb/researchTree/icons/5.png b/zb/researchTree/icons/5.png new file mode 100644 index 0000000000000000000000000000000000000000..193e273c567ab0da5b2a74b90b2374d9ee6f993b GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|LOfj@Lo9la z_B--5DDbej|NlR`_CeJI2?bH7C53)lRBlK9IC1eT-@nCo58qVxI`pmNyVQnL{}~0R zrQBaSyS&TMi*>~n_g~RGm$V#K9(1t3+i>%%Zp>6$gAT?MA3g%jXYh3Ob6Mw<&;$VR CkUFgZ literal 0 HcmV?d00001 diff --git a/zb/researchTree/icons/6.png b/zb/researchTree/icons/6.png new file mode 100644 index 0000000000000000000000000000000000000000..581b57e4be059d0b2ff6dffcf7dff25e642d8a4a GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|>O5T>Lo9mt zPEO=HYQWL__{LY8+^YS1IrNVnsKi2O{{Fm0PvczurubkgA zc)RcDO_-UnmXSe;$>MnYy9G*!VnxAErjU)mpZ>mE0RUUJY@&j-4M!PC{xWt~$(697*=OfLWc literal 0 HcmV?d00001 diff --git a/zb/zb_player_init.lua b/zb/zb_player_init.lua index a672221b654..c5597c24eb0 100644 --- a/zb/zb_player_init.lua +++ b/zb/zb_player_init.lua @@ -30,10 +30,6 @@ function init(...) sb.logInfo("Re-added 'zb_scaninteraction' quest") player.startQuest("zb_scaninteraction") end - - -- require "/zb/zb_util.lua" - -- zbutil.DeepPrintTable(player) - sb.logInfo("----- end ZB player init -----") end