summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-04-12 18:50:50 -0400
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-04-12 18:50:50 -0400
commit170d3e09c55cf982a6ed180b4bdf755cabbe864c (patch)
treeb8c746221798756a8f8ff0e47552001292acbb0f
parent970f6080789d7c4aa7a97412146834945f05d8d7 (diff)
clean-up battery box images, make more consistent
added tube or cable entry overlays as appropriate. deleted a couple of obsolete textures
-rw-r--r--technic/machines/register/battery_box.lua16
-rw-r--r--technic/textures/technic_battery_box_side.pngbin576 -> 0 bytes
-rw-r--r--technic/textures/technic_battery_box_side8.pngbin639 -> 0 bytes
-rw-r--r--technic/textures/technic_battery_box_side_mv.pngbin587 -> 0 bytes
-rw-r--r--technic/textures/technic_hv_battery_box_bottom.pngbin653 -> 338 bytes
-rw-r--r--technic/textures/technic_hv_battery_box_front.pngbin0 -> 452 bytes
-rw-r--r--technic/textures/technic_hv_battery_box_side.pngbin777 -> 475 bytes
-rw-r--r--technic/textures/technic_hv_battery_box_top.pngbin792 -> 575 bytes
-rw-r--r--technic/textures/technic_lv_battery_box_bottom.pngbin738 -> 591 bytes
-rw-r--r--technic/textures/technic_lv_battery_box_side.pngbin594 -> 236 bytes
-rw-r--r--technic/textures/technic_lv_battery_box_top.pngbin337 -> 197 bytes
-rw-r--r--technic/textures/technic_mv_battery_box_bottom.pngbin738 -> 591 bytes
-rw-r--r--technic/textures/technic_mv_battery_box_front.pngbin0 -> 239 bytes
-rw-r--r--technic/textures/technic_mv_battery_box_side.pngbin587 -> 159 bytes
-rw-r--r--technic/textures/technic_mv_battery_box_top.pngbin337 -> 197 bytes
15 files changed, 11 insertions, 5 deletions
diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua
index 7238d6d..bb9c29d 100644
--- a/technic/machines/register/battery_box.lua
+++ b/technic/machines/register/battery_box.lua
@@ -3,6 +3,7 @@ local digilines_path = minetest.get_modpath("digilines")
local S = technic.getter
local tube_entry = "^pipeworks_tube_connection_metallic.png"
+local cable_entry = "^technic_cable_connection_overlay.png"
local fs_helpers = pipeworks.fs_helpers
@@ -208,20 +209,25 @@ function technic.register_battery_box(data)
groups.tubedevice_receiver = 1
end
+ local front_tex = "technic_"..ltier.."_battery_box_front.png^technic_power_meter"..i..".png"
local tentry = tube_entry
+ local bentry = tube_entry
+
if ltier == "lv" then
+ front_tex = "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"
tentry = ""
+ bentry = cable_entry
end
minetest.register_node("technic:"..ltier.."_battery_box"..i, {
description = S("%s Battery Box"):format(tier),
tiles = {
"technic_"..ltier.."_battery_box_top.png"..tentry,
- "technic_"..ltier.."_battery_box_bottom.png"..tentry,
- "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
- "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
- "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
- "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"},
+ "technic_"..ltier.."_battery_box_bottom.png"..bentry,
+ "technic_"..ltier.."_battery_box_side.png"..tentry,
+ "technic_"..ltier.."_battery_box_side.png"..tentry,
+ "technic_"..ltier.."_battery_box_side.png"..tentry,
+ front_tex},
groups = groups,
connect_sides = {"bottom"},
tube = data.tube and tube or nil,
diff --git a/technic/textures/technic_battery_box_side.png b/technic/textures/technic_battery_box_side.png
deleted file mode 100644
index 98a22d6..0000000
--- a/technic/textures/technic_battery_box_side.png
+++ /dev/null
Binary files differ
diff --git a/technic/textures/technic_battery_box_side8.png b/technic/textures/technic_battery_box_side8.png
deleted file mode 100644
index 65806f4..0000000
--- a/technic/textures/technic_battery_box_side8.png
+++ /dev/null
Binary files differ
diff --git a/technic/textures/technic_battery_box_side_mv.png b/technic/textures/technic_battery_box_side_mv.png
deleted file mode 100644
index 06a4be5..0000000
--- a/technic/textures/technic_battery_box_side_mv.png
+++ /dev/null
Binary files differ
diff --git a/technic/textures/technic_hv_battery_box_bottom.png b/technic/textures/technic_hv_battery_box_bottom.png
index 996b2d4..940dcdb 100644
--- a/technic/textures/technic_hv_battery_box_bottom.png
+++ b/technic/textures/technic_hv_battery_box_bottom.png
Binary files differ
diff --git a/technic/textures/technic_hv_battery_box_front.png b/technic/textures/technic_hv_battery_box_front.png
new file mode 100644
index 0000000..6f23439
--- /dev/null
+++ b/technic/textures/technic_hv_battery_box_front.png
Binary files differ
diff --git a/technic/textures/technic_hv_battery_box_side.png b/technic/textures/technic_hv_battery_box_side.png
index fffd8ea..3e99d8c 100644
--- a/technic/textures/technic_hv_battery_box_side.png
+++ b/technic/textures/technic_hv_battery_box_side.png
Binary files differ
diff --git a/technic/textures/technic_hv_battery_box_top.png b/technic/textures/technic_hv_battery_box_top.png
index 49dee71..aa6fdb6 100644
--- a/technic/textures/technic_hv_battery_box_top.png
+++ b/technic/textures/technic_hv_battery_box_top.png
Binary files differ
diff --git a/technic/textures/technic_lv_battery_box_bottom.png b/technic/textures/technic_lv_battery_box_bottom.png
index a6124e6..0894d5f 100644
--- a/technic/textures/technic_lv_battery_box_bottom.png
+++ b/technic/textures/technic_lv_battery_box_bottom.png
Binary files differ
diff --git a/technic/textures/technic_lv_battery_box_side.png b/technic/textures/technic_lv_battery_box_side.png
index 24d4e4e..4d435ac 100644
--- a/technic/textures/technic_lv_battery_box_side.png
+++ b/technic/textures/technic_lv_battery_box_side.png
Binary files differ
diff --git a/technic/textures/technic_lv_battery_box_top.png b/technic/textures/technic_lv_battery_box_top.png
index b32100f..6050ad0 100644
--- a/technic/textures/technic_lv_battery_box_top.png
+++ b/technic/textures/technic_lv_battery_box_top.png
Binary files differ
diff --git a/technic/textures/technic_mv_battery_box_bottom.png b/technic/textures/technic_mv_battery_box_bottom.png
index a610660..0894d5f 100644
--- a/technic/textures/technic_mv_battery_box_bottom.png
+++ b/technic/textures/technic_mv_battery_box_bottom.png
Binary files differ
diff --git a/technic/textures/technic_mv_battery_box_front.png b/technic/textures/technic_mv_battery_box_front.png
new file mode 100644
index 0000000..63ed41c
--- /dev/null
+++ b/technic/textures/technic_mv_battery_box_front.png
Binary files differ
diff --git a/technic/textures/technic_mv_battery_box_side.png b/technic/textures/technic_mv_battery_box_side.png
index 06a4be5..2528ff8 100644
--- a/technic/textures/technic_mv_battery_box_side.png
+++ b/technic/textures/technic_mv_battery_box_side.png
Binary files differ
diff --git a/technic/textures/technic_mv_battery_box_top.png b/technic/textures/technic_mv_battery_box_top.png
index b32100f..6050ad0 100644
--- a/technic/textures/technic_mv_battery_box_top.png
+++ b/technic/textures/technic_mv_battery_box_top.png
Binary files differ