Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
* centrifuge is smaller and more compact, and centers when placed
* Geology tier nodes have new icons
* removed unused object
  • Loading branch information
sayterdarkwynd committed Oct 23, 2024
1 parent 5c7ab30 commit ff912d2
Show file tree
Hide file tree
Showing 16 changed files with 12 additions and 13 deletions.
4 changes: 4 additions & 0 deletions _FUversioning.config
Original file line number Diff line number Diff line change
Expand Up @@ -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;
------------------
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion objects/power/centrifuge/centrifuge.frames
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down
3 changes: 1 addition & 2 deletions objects/power/centrifuge/centrifuge.object
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
"category" : "^orange;Centrifuge^reset;",
"price" : 1200,
"objectType" : "container",
// "learnBlueprintsOnPickup" : [ "centrifuge2" ],
"hydrophobic" : false,

"inventoryIcon" : "centrifugeicon.png",
"orientations" : [
{
"dualImage" : "centrifuge.png:<color>.<frame>",
"dualImage" : "centrifugefullbright.png:<color>.<frame>",

"imagePosition" : [0, 0],
"frames" : 1,
Expand Down
Binary file modified objects/power/centrifuge/centrifuge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion objects/power/centrifuge/centrifugefullbright.frames
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down
Binary file modified objects/power/centrifuge/centrifugefullbright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified objects/power/centrifuge/centrifugeicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions zb/researchTree/fu_geology.config
Original file line number Diff line number Diff line change
Expand Up @@ -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]],
Expand Down Expand Up @@ -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]],
Expand Down Expand Up @@ -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" ],
Expand Down Expand Up @@ -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]],
Expand Down Expand Up @@ -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]],
Expand Down
Binary file added zb/researchTree/icons/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zb/researchTree/icons/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zb/researchTree/icons/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zb/researchTree/icons/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zb/researchTree/icons/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zb/researchTree/icons/6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions zb/zb_player_init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit ff912d2

Please sign in to comment.