diff options
| author | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-04-11 08:31:17 -0400 | 
|---|---|---|
| committer | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-04-11 08:48:16 -0400 | 
| commit | 54004f495137b3daaa2f882b47c36fb238335d04 (patch) | |
| tree | 4303bf05f7ca8f3219398abd885c4f132301857a | |
| parent | 8479a8c984b20160e6e85573449f540f7e16a700 (diff) | |
redo top/bottom textures for supply converter
delete back/bottom texture for power monitor
use "machine bottom" for bottom of force field generator
add cable connection overlay, use it on various machines' bottoms/sides, as appropriate
| -rw-r--r-- | technic/machines/HV/forcefield.lua | 20 | ||||
| -rw-r--r-- | technic/machines/HV/quarry.lua | 9 | ||||
| -rw-r--r-- | technic/machines/LV/water_mill.lua | 13 | ||||
| -rw-r--r-- | technic/machines/power_monitor.lua | 6 | ||||
| -rw-r--r-- | technic/machines/supply_converter.lua | 13 | ||||
| -rw-r--r-- | technic/machines/switching_station.lua | 12 | ||||
| -rw-r--r-- | technic/textures/technic_cable_connection_overlay.png | bin | 0 -> 293 bytes | |||
| -rw-r--r-- | technic/textures/technic_power_monitor_bottom_back.png | bin | 506 -> 0 bytes | |||
| -rw-r--r-- | technic/textures/technic_supply_converter_bottom.png | bin | 738 -> 0 bytes | |||
| -rw-r--r-- | technic/textures/technic_supply_converter_tb.png | bin | 0 -> 656 bytes | |||
| -rw-r--r-- | technic/textures/technic_supply_converter_top.png | bin | 738 -> 0 bytes | 
11 files changed, 56 insertions, 17 deletions
| diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua index 1d46bcf..3bb8d03 100644 --- a/technic/machines/HV/forcefield.lua +++ b/technic/machines/HV/forcefield.lua @@ -12,6 +12,8 @@ local forcefield_power_drain   = 10  local S = technic.getter +local cable_entry = "^technic_cable_connection_overlay.png" +  minetest.register_craft({  	output = "technic:forcefield_emitter_off",  	recipe = { @@ -258,7 +260,14 @@ end  minetest.register_node("technic:forcefield_emitter_off", {  	description = S("%s Forcefield Emitter"):format("HV"), -	tiles = {"technic_forcefield_emitter_off.png"}, +	tiles = { +		"technic_forcefield_emitter_off.png", +		"technic_machine_bottom.png"..cable_entry, +		"technic_forcefield_emitter_off.png", +		"technic_forcefield_emitter_off.png", +		"technic_forcefield_emitter_off.png", +		"technic_forcefield_emitter_off.png" +	},  	groups = {cracky = 1, technic_machine = 1, technic_hv = 1},  	on_receive_fields = forcefield_receive_fields,  	on_construct = function(pos) @@ -282,7 +291,14 @@ minetest.register_node("technic:forcefield_emitter_off", {  minetest.register_node("technic:forcefield_emitter_on", {  	description = S("%s Forcefield Emitter"):format("HV"), -	tiles = {"technic_forcefield_emitter_on.png"}, +	tiles = { +		"technic_forcefield_emitter_on.png", +		"technic_machine_bottom.png"..cable_entry, +		"technic_forcefield_emitter_on.png", +		"technic_forcefield_emitter_on.png", +		"technic_forcefield_emitter_on.png", +		"technic_forcefield_emitter_on.png" +	},  	groups = {cracky = 1, technic_machine = 1, technic_hv = 1,  			not_in_creative_inventory=1},  	drop = "technic:forcefield_emitter_off", diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index 131ba42..c1ee1bb 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -2,6 +2,7 @@  local S = technic.getter  local tube_entry = "^pipeworks_tube_connection_metallic.png" +local cable_entry = "^technic_cable_connection_overlay.png"  minetest.register_craft({  	recipe = { @@ -211,11 +212,11 @@ minetest.register_node("technic:quarry", {  	description = S("%s Quarry"):format("HV"),  	tiles = {  		"technic_carbon_steel_block.png"..tube_entry, -		"technic_carbon_steel_block.png", -		"technic_carbon_steel_block.png", -		"technic_carbon_steel_block.png", +		"technic_carbon_steel_block.png"..cable_entry, +		"technic_carbon_steel_block.png"..cable_entry, +		"technic_carbon_steel_block.png"..cable_entry,  		"technic_carbon_steel_block.png^default_tool_mesepick.png", -		"technic_carbon_steel_block.png" +		"technic_carbon_steel_block.png"..cable_entry  	},  	paramtype2 = "facedir",  	groups = {cracky=2, tubedevice=1, technic_machine=1, technic_hv=1}, diff --git a/technic/machines/LV/water_mill.lua b/technic/machines/LV/water_mill.lua index d291332..5d871f0 100644 --- a/technic/machines/LV/water_mill.lua +++ b/technic/machines/LV/water_mill.lua @@ -4,6 +4,8 @@  local S = technic.getter +local cable_entry = "^technic_cable_connection_overlay.png" +  minetest.register_alias("water_mill", "technic:water_mill")  minetest.register_craft({ @@ -68,9 +70,14 @@ end  minetest.register_node("technic:water_mill", {  	description = S("Hydro %s Generator"):format("LV"), -	tiles = {"technic_water_mill_top.png",  "technic_machine_bottom.png", -	         "technic_water_mill_side.png", "technic_water_mill_side.png", -	         "technic_water_mill_side.png", "technic_water_mill_side.png"}, +	tiles = { +		"technic_water_mill_top.png", +		"technic_machine_bottom.png"..cable_entry, +		"technic_water_mill_side.png", +		"technic_water_mill_side.png", +		"technic_water_mill_side.png", +		"technic_water_mill_side.png" +	},  	paramtype2 = "facedir",  	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,  		technic_machine=1, technic_lv=1}, diff --git a/technic/machines/power_monitor.lua b/technic/machines/power_monitor.lua index 8c5bed6..4d722a2 100644 --- a/technic/machines/power_monitor.lua +++ b/technic/machines/power_monitor.lua @@ -4,6 +4,8 @@  local S = technic.getter +local cable_entry = "^technic_cable_connection_overlay.png" +  minetest.register_craft({  	output = "technic:power_monitor",  	recipe = { @@ -17,10 +19,10 @@ minetest.register_node("technic:power_monitor",{  	description = S("Power Monitor"),  	tiles  = {  		"technic_power_monitor_sides.png", -		"technic_power_monitor_bottom_back.png", +		"technic_power_monitor_sides.png"..cable_entry,  		"technic_power_monitor_sides.png",  		"technic_power_monitor_sides.png", -		"technic_power_monitor_bottom_back.png", +		"technic_power_monitor_sides.png"..cable_entry,  		"technic_power_monitor_front.png"  	},  	paramtype2 = "facedir", diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index 8ae4dd4..aa41791 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -11,6 +11,8 @@ local digilines_path = minetest.get_modpath("digilines")  local S = technic.getter +local cable_entry = "^technic_cable_connection_overlay.png" +  local function set_supply_converter_formspec(meta)  	local formspec = "size[5,2.25]"..  		"field[0.3,0.5;2,1;power;"..S("Input Power")..";"..meta:get_int("power").."]" @@ -158,9 +160,14 @@ end  minetest.register_node("technic:supply_converter", {  	description = S("Supply Converter"), -	tiles  = {"technic_supply_converter_top.png", "technic_supply_converter_bottom.png", -	          "technic_supply_converter_side.png", "technic_supply_converter_side.png", -	          "technic_supply_converter_side.png", "technic_supply_converter_side.png"}, +	tiles  = { +		"technic_supply_converter_tb.png"..cable_entry, +		"technic_supply_converter_tb.png"..cable_entry, +		"technic_supply_converter_side.png", +		"technic_supply_converter_side.png", +		"technic_supply_converter_side.png", +		"technic_supply_converter_side.png" +		},  	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,  		technic_machine=1, technic_all_tiers=1},  	connect_sides = {"top", "bottom"}, diff --git a/technic/machines/switching_station.lua b/technic/machines/switching_station.lua index be5f6c0..9c6f32c 100644 --- a/technic/machines/switching_station.lua +++ b/technic/machines/switching_station.lua @@ -39,6 +39,8 @@ local digilines_path = minetest.get_modpath("digilines")  local S = technic.getter +local cable_entry = "^technic_cable_connection_overlay.png" +  minetest.register_craft({  	output = "technic:switching_station",  	recipe = { @@ -57,9 +59,13 @@ end  minetest.register_node("technic:switching_station",{  	description = S("Switching Station"), -	tiles  = {"technic_water_mill_top_active.png", "technic_water_mill_top_active.png", -                  "technic_water_mill_top_active.png", "technic_water_mill_top_active.png", -	          "technic_water_mill_top_active.png", "technic_water_mill_top_active.png"}, +	tiles  = { +		"technic_water_mill_top_active.png", +		"technic_water_mill_top_active.png"..cable_entry, +		"technic_water_mill_top_active.png", +		"technic_water_mill_top_active.png", +		"technic_water_mill_top_active.png", +		"technic_water_mill_top_active.png"},  	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_all_tiers=1},  	connect_sides = {"bottom"},  	sounds = default.node_sound_wood_defaults(), diff --git a/technic/textures/technic_cable_connection_overlay.png b/technic/textures/technic_cable_connection_overlay.pngBinary files differ new file mode 100644 index 0000000..122cad2 --- /dev/null +++ b/technic/textures/technic_cable_connection_overlay.png diff --git a/technic/textures/technic_power_monitor_bottom_back.png b/technic/textures/technic_power_monitor_bottom_back.pngBinary files differ deleted file mode 100644 index c857039..0000000 --- a/technic/textures/technic_power_monitor_bottom_back.png +++ /dev/null diff --git a/technic/textures/technic_supply_converter_bottom.png b/technic/textures/technic_supply_converter_bottom.pngBinary files differ deleted file mode 100644 index a610660..0000000 --- a/technic/textures/technic_supply_converter_bottom.png +++ /dev/null diff --git a/technic/textures/technic_supply_converter_tb.png b/technic/textures/technic_supply_converter_tb.pngBinary files differ new file mode 100644 index 0000000..053b3d8 --- /dev/null +++ b/technic/textures/technic_supply_converter_tb.png diff --git a/technic/textures/technic_supply_converter_top.png b/technic/textures/technic_supply_converter_top.pngBinary files differ deleted file mode 100644 index a610660..0000000 --- a/technic/textures/technic_supply_converter_top.png +++ /dev/null | 
