From 170d3e09c55cf982a6ed180b4bdf755cabbe864c Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Wed, 12 Apr 2017 18:50:50 -0400 Subject: clean-up battery box images, make more consistent added tube or cable entry overlays as appropriate. deleted a couple of obsolete textures --- technic/machines/register/battery_box.lua | 16 +++++++++++----- technic/textures/technic_battery_box_side.png | Bin 576 -> 0 bytes technic/textures/technic_battery_box_side8.png | Bin 639 -> 0 bytes technic/textures/technic_battery_box_side_mv.png | Bin 587 -> 0 bytes technic/textures/technic_hv_battery_box_bottom.png | Bin 653 -> 338 bytes technic/textures/technic_hv_battery_box_front.png | Bin 0 -> 452 bytes technic/textures/technic_hv_battery_box_side.png | Bin 777 -> 475 bytes technic/textures/technic_hv_battery_box_top.png | Bin 792 -> 575 bytes technic/textures/technic_lv_battery_box_bottom.png | Bin 738 -> 591 bytes technic/textures/technic_lv_battery_box_side.png | Bin 594 -> 236 bytes technic/textures/technic_lv_battery_box_top.png | Bin 337 -> 197 bytes technic/textures/technic_mv_battery_box_bottom.png | Bin 738 -> 591 bytes technic/textures/technic_mv_battery_box_front.png | Bin 0 -> 239 bytes technic/textures/technic_mv_battery_box_side.png | Bin 587 -> 159 bytes technic/textures/technic_mv_battery_box_top.png | Bin 337 -> 197 bytes 15 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 technic/textures/technic_battery_box_side.png delete mode 100644 technic/textures/technic_battery_box_side8.png delete mode 100644 technic/textures/technic_battery_box_side_mv.png create mode 100644 technic/textures/technic_hv_battery_box_front.png create mode 100644 technic/textures/technic_mv_battery_box_front.png 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 Binary files a/technic/textures/technic_battery_box_side.png and /dev/null 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 Binary files a/technic/textures/technic_battery_box_side8.png and /dev/null 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 Binary files a/technic/textures/technic_battery_box_side_mv.png and /dev/null 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 Binary files a/technic/textures/technic_hv_battery_box_bottom.png and b/technic/textures/technic_hv_battery_box_bottom.png 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 Binary files /dev/null and b/technic/textures/technic_hv_battery_box_front.png 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 Binary files a/technic/textures/technic_hv_battery_box_side.png and b/technic/textures/technic_hv_battery_box_side.png 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 Binary files a/technic/textures/technic_hv_battery_box_top.png and b/technic/textures/technic_hv_battery_box_top.png 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 Binary files a/technic/textures/technic_lv_battery_box_bottom.png and b/technic/textures/technic_lv_battery_box_bottom.png 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 Binary files a/technic/textures/technic_lv_battery_box_side.png and b/technic/textures/technic_lv_battery_box_side.png 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 Binary files a/technic/textures/technic_lv_battery_box_top.png and b/technic/textures/technic_lv_battery_box_top.png 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 Binary files a/technic/textures/technic_mv_battery_box_bottom.png and b/technic/textures/technic_mv_battery_box_bottom.png 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 Binary files /dev/null and b/technic/textures/technic_mv_battery_box_front.png 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 Binary files a/technic/textures/technic_mv_battery_box_side.png and b/technic/textures/technic_mv_battery_box_side.png 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 Binary files a/technic/textures/technic_mv_battery_box_top.png and b/technic/textures/technic_mv_battery_box_top.png differ -- cgit v1.2.3