diff --git a/steam_engine/firebox.lua b/steam_engine/firebox.lua index 354b143..0554ae6 100644 --- a/steam_engine/firebox.lua +++ b/steam_engine/firebox.lua @@ -16,6 +16,8 @@ local S = function(pos) if pos then return minetest.pos_to_string(pos) end end local P = minetest.string_to_pos local M = minetest.get_meta +-- Techage Related Data +local TRD = function(pos) return (minetest.registered_nodes[minetest.get_node(pos).name] or {}).techage end -- Load support for intllib. local MP = minetest.get_modpath("tubelib2") @@ -103,9 +105,9 @@ end local function node_timer(pos, elapsed) local mem = tubelib2.get_mem(pos) if mem.running then - local this = TP({x=pos.x, y=pos.y+2, z=pos.z}) - if this and this.trigger_boiler then - this.trigger_boiler({x=pos.x, y=pos.y+2, z=pos.z}) + local trd = TRD({x=pos.x, y=pos.y+2, z=pos.z}) + if trd and trd.trigger_boiler then + trd.trigger_boiler({x=pos.x, y=pos.y+2, z=pos.z}) end mem.burn_cycles = (mem.burn_cycles or 0) - 1 if mem.burn_cycles <= 0 then diff --git a/steam_engine/flywheel.lua b/steam_engine/flywheel.lua index c6da90f..d47d5e8 100644 --- a/steam_engine/flywheel.lua +++ b/steam_engine/flywheel.lua @@ -193,23 +193,23 @@ minetest.register_node("techage:flywheel_on", { }, "techage_filling_ta2.png^techage_appl_open.png^techage_frame_ta2.png", { - image = "techage_filling4_ta2.png^techage_frame4_ta2.png^techage_flywheel4.png", + image = "techage_filling8_ta2.png^techage_frame8_ta2.png^techage_flywheel8.png", backface_culling = false, animation = { type = "vertical_frames", aspect_w = 32, aspect_h = 32, - length = 0.6, + length = 1.2, }, }, { - image = "techage_filling4_ta2.png^techage_frame4_ta2.png^techage_flywheel4.png^[transformFX]", + image = "techage_filling8_ta2.png^techage_frame8_ta2.png^techage_flywheel8.png^[transformFX]", backface_culling = false, animation = { type = "vertical_frames", aspect_w = 32, aspect_h = 32, - length = 0.6, + length = 1.2, }, }, }, diff --git a/textures/techage_appl_compressor.png b/textures/techage_appl_compressor.png index 1d6c586..2e934f0 100644 Binary files a/textures/techage_appl_compressor.png and b/textures/techage_appl_compressor.png differ diff --git a/textures/techage_appl_compressor4.png b/textures/techage_appl_compressor4.png index 862ec5c..3ed9fa9 100644 Binary files a/textures/techage_appl_compressor4.png and b/textures/techage_appl_compressor4.png differ diff --git a/textures/techage_appl_filler4.png b/textures/techage_appl_filler4.png index e1c9ee8..19751dd 100644 Binary files a/textures/techage_appl_filler4.png and b/textures/techage_appl_filler4.png differ diff --git a/textures/techage_appl_hole_biogas.png b/textures/techage_appl_hole_biogas.png index 4cf887a..65bac92 100644 Binary files a/textures/techage_appl_hole_biogas.png and b/textures/techage_appl_hole_biogas.png differ diff --git a/textures/techage_appl_sieve4.png b/textures/techage_appl_sieve4.png index f8cad63..242b85e 100644 Binary files a/textures/techage_appl_sieve4.png and b/textures/techage_appl_sieve4.png differ diff --git a/textures/techage_axle4.png b/textures/techage_axle4.png index 8bcdab8..defe71c 100644 Binary files a/textures/techage_axle4.png and b/textures/techage_axle4.png differ diff --git a/textures/techage_axle4R.png b/textures/techage_axle4R.png index 33af2a6..5ebd69b 100644 Binary files a/textures/techage_axle4R.png and b/textures/techage_axle4R.png differ diff --git a/textures/techage_axle_clutch4.png b/textures/techage_axle_clutch4.png index c5c7e59..c351647 100644 Binary files a/textures/techage_axle_clutch4.png and b/textures/techage_axle_clutch4.png differ diff --git a/textures/techage_axle_gearbox4.png b/textures/techage_axle_gearbox4.png index 8846cd4..3d1dd66 100644 Binary files a/textures/techage_axle_gearbox4.png and b/textures/techage_axle_gearbox4.png differ diff --git a/textures/techage_biomass.png b/textures/techage_biomass.png index f7fd217..61e493f 100644 Binary files a/textures/techage_biomass.png and b/textures/techage_biomass.png differ diff --git a/textures/techage_boiler2.png b/textures/techage_boiler2.png index d0476ef..8de4a51 100644 Binary files a/textures/techage_boiler2.png and b/textures/techage_boiler2.png differ diff --git a/textures/techage_cylinder.png b/textures/techage_cylinder.png index 09ad565..74ef778 100644 Binary files a/textures/techage_cylinder.png and b/textures/techage_cylinder.png differ diff --git a/textures/techage_cylinder4.png b/textures/techage_cylinder4.png index 2ef66b6..31fd5da 100644 Binary files a/textures/techage_cylinder4.png and b/textures/techage_cylinder4.png differ diff --git a/textures/techage_defect.png b/textures/techage_defect.png index 5cb0b7c..9469894 100644 Binary files a/textures/techage_defect.png and b/textures/techage_defect.png differ diff --git a/textures/techage_electric_button.png b/textures/techage_electric_button.png index a3e6959..2271d7f 100644 Binary files a/textures/techage_electric_button.png and b/textures/techage_electric_button.png differ diff --git a/textures/techage_electric_cable.png b/textures/techage_electric_cable.png index de4f505..263da27 100644 Binary files a/textures/techage_electric_cable.png and b/textures/techage_electric_cable.png differ diff --git a/textures/techage_electric_cable_end.png b/textures/techage_electric_cable_end.png index bb92b04..c50757e 100644 Binary files a/textures/techage_electric_cable_end.png and b/textures/techage_electric_cable_end.png differ diff --git a/textures/techage_electric_plug.png b/textures/techage_electric_plug.png index dc3e0a4..24ebe34 100644 Binary files a/textures/techage_electric_plug.png and b/textures/techage_electric_plug.png differ diff --git a/textures/techage_fermenter_foil.png b/textures/techage_fermenter_foil.png index c867ab1..446d8d9 100644 Binary files a/textures/techage_fermenter_foil.png and b/textures/techage_fermenter_foil.png differ diff --git a/textures/techage_filling4_ta2.png b/textures/techage_filling4_ta2.png index 14beb40..2bb382e 100644 Binary files a/textures/techage_filling4_ta2.png and b/textures/techage_filling4_ta2.png differ diff --git a/textures/techage_filling4_ta4.png b/textures/techage_filling4_ta4.png index ace57ec..7f03588 100644 Binary files a/textures/techage_filling4_ta4.png and b/textures/techage_filling4_ta4.png differ diff --git a/textures/techage_filling8_ta2.png b/textures/techage_filling8_ta2.png new file mode 100644 index 0000000..a8e8dc3 Binary files /dev/null and b/textures/techage_filling8_ta2.png differ diff --git a/textures/techage_filling_ta2.png b/textures/techage_filling_ta2.png index 38ab367..f96be09 100644 Binary files a/textures/techage_filling_ta2.png and b/textures/techage_filling_ta2.png differ diff --git a/textures/techage_filling_ta4.png b/textures/techage_filling_ta4.png index 73234bc..a208d8b 100644 Binary files a/textures/techage_filling_ta4.png and b/textures/techage_filling_ta4.png differ diff --git a/textures/techage_firebox.png b/textures/techage_firebox.png index f57de4c..7bf2040 100644 Binary files a/textures/techage_firebox.png and b/textures/techage_firebox.png differ diff --git a/textures/techage_firebox4.png b/textures/techage_firebox4.png index 31dc55f..e566fee 100644 Binary files a/textures/techage_firebox4.png and b/textures/techage_firebox4.png differ diff --git a/textures/techage_flame_animated.png b/textures/techage_flame_animated.png index 05ef6f6..baca69b 100644 Binary files a/textures/techage_flame_animated.png and b/textures/techage_flame_animated.png differ diff --git a/textures/techage_flywheel.png b/textures/techage_flywheel.png index 840651a..ccaa876 100644 Binary files a/textures/techage_flywheel.png and b/textures/techage_flywheel.png differ diff --git a/textures/techage_flywheel4.png b/textures/techage_flywheel4.png deleted file mode 100644 index 5463b7d..0000000 Binary files a/textures/techage_flywheel4.png and /dev/null differ diff --git a/textures/techage_flywheel8.png b/textures/techage_flywheel8.png new file mode 100644 index 0000000..0f3bd11 Binary files /dev/null and b/textures/techage_flywheel8.png differ diff --git a/textures/techage_form_gear_bg.png b/textures/techage_form_gear_bg.png index ce2bc64..1d502e0 100644 Binary files a/textures/techage_form_gear_bg.png and b/textures/techage_form_gear_bg.png differ diff --git a/textures/techage_form_level_bg.png b/textures/techage_form_level_bg.png index f77ee21..30c42f6 100644 Binary files a/textures/techage_form_level_bg.png and b/textures/techage_form_level_bg.png differ diff --git a/textures/techage_form_level_fg.png b/textures/techage_form_level_fg.png index f5969b1..cd31c5b 100644 Binary files a/textures/techage_form_level_fg.png and b/textures/techage_form_level_fg.png differ diff --git a/textures/techage_form_temp_bg.png b/textures/techage_form_temp_bg.png index c252965..ff44b0e 100644 Binary files a/textures/techage_form_temp_bg.png and b/textures/techage_form_temp_bg.png differ diff --git a/textures/techage_form_temp_fg.png b/textures/techage_form_temp_fg.png index 8c30d1c..a7800c5 100644 Binary files a/textures/techage_form_temp_fg.png and b/textures/techage_form_temp_fg.png differ diff --git a/textures/techage_frame4_ta2.png b/textures/techage_frame4_ta2.png index 1100752..52f3a95 100644 Binary files a/textures/techage_frame4_ta2.png and b/textures/techage_frame4_ta2.png differ diff --git a/textures/techage_frame8_ta2.png b/textures/techage_frame8_ta2.png new file mode 100644 index 0000000..291b00d Binary files /dev/null and b/textures/techage_frame8_ta2.png differ diff --git a/textures/techage_frame_ta2.png b/textures/techage_frame_ta2.png index 593a37a..cc722dd 100644 Binary files a/textures/techage_frame_ta2.png and b/textures/techage_frame_ta2.png differ diff --git a/textures/techage_frame_ta2_top.png b/textures/techage_frame_ta2_top.png index 593a37a..cc722dd 100644 Binary files a/textures/techage_frame_ta2_top.png and b/textures/techage_frame_ta2_top.png differ diff --git a/textures/techage_gasflare.png b/textures/techage_gasflare.png index b9d9609..562c5eb 100644 Binary files a/textures/techage_gasflare.png and b/textures/techage_gasflare.png differ diff --git a/textures/techage_gaspipe_junction.png b/textures/techage_gaspipe_junction.png index e347ed5..0e839b0 100644 Binary files a/textures/techage_gaspipe_junction.png and b/textures/techage_gaspipe_junction.png differ diff --git a/textures/techage_gaspipe_knee.png b/textures/techage_gaspipe_knee.png index 5d4077d..b5a0d16 100644 Binary files a/textures/techage_gaspipe_knee.png and b/textures/techage_gaspipe_knee.png differ diff --git a/textures/techage_gaspipe_knee2.png b/textures/techage_gaspipe_knee2.png index 68abdf5..cf3507e 100644 Binary files a/textures/techage_gaspipe_knee2.png and b/textures/techage_gaspipe_knee2.png differ diff --git a/textures/techage_steam_hole.png b/textures/techage_steam_hole.png index 4946dac..d8c5fae 100644 Binary files a/textures/techage_steam_hole.png and b/textures/techage_steam_hole.png differ diff --git a/textures/techage_steam_pipe.png b/textures/techage_steam_pipe.png index e3eb641..65aff56 100644 Binary files a/textures/techage_steam_pipe.png and b/textures/techage_steam_pipe.png differ