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 58767ffba81..00000000000 Binary files a/a_notyetadded/objects/approved/energywood/nightarritualbench.png and /dev/null differ diff --git a/objects/power/centrifuge/centrifuge.frames b/objects/power/centrifuge/centrifuge.frames index a5a61d42a8c..d771e728fe2 100644 --- a/objects/power/centrifuge/centrifuge.frames +++ b/objects/power/centrifuge/centrifuge.frames @@ -1,7 +1,7 @@ { "frameGrid" : { - "size" : [33, 19], + "size" : [24, 19], "dimensions" : [5, 1], "names" : [ [ "default.1", "default.2", "default.3", "default.4", "default.5" ] diff --git a/objects/power/centrifuge/centrifuge.object b/objects/power/centrifuge/centrifuge.object index a8fde8a28c8..b78ef22839d 100644 --- a/objects/power/centrifuge/centrifuge.object +++ b/objects/power/centrifuge/centrifuge.object @@ -10,13 +10,12 @@ "category" : "^orange;Centrifuge^reset;", "price" : 1200, "objectType" : "container", - // "learnBlueprintsOnPickup" : [ "centrifuge2" ], "hydrophobic" : false, "inventoryIcon" : "centrifugeicon.png", "orientations" : [ { - "dualImage" : "centrifuge.png:.", + "dualImage" : "centrifugefullbright.png:.", "imagePosition" : [0, 0], "frames" : 1, diff --git a/objects/power/centrifuge/centrifuge.png b/objects/power/centrifuge/centrifuge.png index 72a0f0d0488..a576d50607f 100644 Binary files a/objects/power/centrifuge/centrifuge.png and b/objects/power/centrifuge/centrifuge.png differ diff --git a/objects/power/centrifuge/centrifugefullbright.frames b/objects/power/centrifuge/centrifugefullbright.frames index a5a61d42a8c..d771e728fe2 100644 --- a/objects/power/centrifuge/centrifugefullbright.frames +++ b/objects/power/centrifuge/centrifugefullbright.frames @@ -1,7 +1,7 @@ { "frameGrid" : { - "size" : [33, 19], + "size" : [24, 19], "dimensions" : [5, 1], "names" : [ [ "default.1", "default.2", "default.3", "default.4", "default.5" ] diff --git a/objects/power/centrifuge/centrifugefullbright.png b/objects/power/centrifuge/centrifugefullbright.png index e50ec5ddd68..b0772958388 100644 Binary files a/objects/power/centrifuge/centrifugefullbright.png and b/objects/power/centrifuge/centrifugefullbright.png differ diff --git a/objects/power/centrifuge/centrifugeicon.png b/objects/power/centrifuge/centrifugeicon.png index fffb818680a..c810c72453d 100644 Binary files a/objects/power/centrifuge/centrifugeicon.png and b/objects/power/centrifuge/centrifugeicon.png differ diff --git a/zb/researchTree/fu_geology.config b/zb/researchTree/fu_geology.config index bfede2a974f..6daa5ef028b 100644 --- a/zb/researchTree/fu_geology.config +++ b/zb/researchTree/fu_geology.config @@ -68,7 +68,7 @@ }, "metals_tier2" : { - "icon" : "/items/generic/crafting/tungstenore.png", + "icon" : "/zb/researchTree/icons/2.png", "children" : [ "metals_tier3","metals_telebrium","metals_tungsten", "metals_alloy1" ], "position" : [80, 0], "price" : [["fuscienceresource", 800]], @@ -104,7 +104,7 @@ }, "metals_tier3" : { - "icon" : "/items/generic/crafting/titaniumore.png", + "icon" : "/zb/researchTree/icons/3.png", "children" : [ "metals_tier4", "metals_alloy2", "metals_titanium", "metals_protocite", "metals_zerchesium", "metals_penumbrite" ], "position" : [170, 0], "price" : [["fuscienceresource", 1400]], @@ -140,7 +140,7 @@ }, "metals_tier4" : { - "icon" : "/items/generic/crafting/durasteelore.png", + "icon" : "/zb/researchTree/icons/4.png", "position" : [260, 0], "children" : [ "metals_tier5", "metals_alloy3","metals_durasteel","metals_lasombrium", "metals_quietus", "metals_trianglium", "metals_irradium" ], @@ -184,7 +184,7 @@ }, "metals_tier5" : { - "icon" : "/items/generic/crafting/aegisaltore.png", + "icon" : "/zb/researchTree/icons/5.png", "position" : [350, 0], "children" : [ "metals_tier6", "metals_alloy4", "metals_effigium", "metals_aegisalt", "metals_violium", "metals_ferozium" ],//"metals_alloy5", "price" : [["fuscienceresource", 6400]], @@ -220,7 +220,7 @@ }, "metals_tier6" : { - "icon" : "/items/generic/crafting/solariumore.png", + "icon" : "/zb/researchTree/icons/6.png", "position" : [440, 0], "children" : [ "metals_tier8", "metals_solarium", "metals_isogen", "metals_pyreite", "metals_densinium"],//"metals_tier7" nocxium is only in Madness where it belongs "price" : [["fuscienceresource", 9000]], diff --git a/zb/researchTree/icons/1.png b/zb/researchTree/icons/1.png new file mode 100644 index 00000000000..24a9977df11 Binary files /dev/null and b/zb/researchTree/icons/1.png differ diff --git a/zb/researchTree/icons/2.png b/zb/researchTree/icons/2.png new file mode 100644 index 00000000000..ec2d94efa44 Binary files /dev/null and b/zb/researchTree/icons/2.png differ diff --git a/zb/researchTree/icons/3.png b/zb/researchTree/icons/3.png new file mode 100644 index 00000000000..3c16e842562 Binary files /dev/null and b/zb/researchTree/icons/3.png differ diff --git a/zb/researchTree/icons/4.png b/zb/researchTree/icons/4.png new file mode 100644 index 00000000000..88977c0d030 Binary files /dev/null and b/zb/researchTree/icons/4.png differ diff --git a/zb/researchTree/icons/5.png b/zb/researchTree/icons/5.png new file mode 100644 index 00000000000..193e273c567 Binary files /dev/null and b/zb/researchTree/icons/5.png differ diff --git a/zb/researchTree/icons/6.png b/zb/researchTree/icons/6.png new file mode 100644 index 00000000000..581b57e4be0 Binary files /dev/null and b/zb/researchTree/icons/6.png differ 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