From f30ff6ab51437866d33642a4b0c6329598b366d8 Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Mon, 26 Aug 2019 22:19:59 +0200 Subject: [PATCH] pillar added minor bugfixes --- basic_machines/electronic_fab.lua | 2 +- init.lua | 1 + logic/signallamp.lua | 10 +-- mod.conf | 2 +- models/techage_pillar.obj | 124 ++++++++++++++++++++++++++++++ nodes/pillar.lua | 31 ++++++++ oil/drillbox.lua | 2 +- oil/pumpjack.lua | 2 +- textures/techage_concrete.png | Bin 575 -> 477 bytes 9 files changed, 165 insertions(+), 9 deletions(-) create mode 100644 models/techage_pillar.obj create mode 100644 nodes/pillar.lua diff --git a/basic_machines/electronic_fab.lua b/basic_machines/electronic_fab.lua index c512fbd..cdfad9b 100644 --- a/basic_machines/electronic_fab.lua +++ b/basic_machines/electronic_fab.lua @@ -272,7 +272,7 @@ minetest.register_craft({ }) minetest.register_craftitem("techage:vacuum_tube", { - description = S("TA3 Vacuum Tubes"), + description = S("TA3 Vacuum Tube"), inventory_image = "techage_vacuum_tube.png", }) diff --git a/init.lua b/init.lua index d27fdaa..6d2c024 100644 --- a/init.lua +++ b/init.lua @@ -149,6 +149,7 @@ else end dofile(MP.."/nodes/gateblock.lua") dofile(MP.."/nodes/doorblock.lua") + dofile(MP.."/nodes/pillar.lua") -- Logic dofile(MP.."/logic/lib.lua") diff --git a/logic/signallamp.lua b/logic/signallamp.lua index 9eca781..3d8bb55 100644 --- a/logic/signallamp.lua +++ b/logic/signallamp.lua @@ -61,8 +61,8 @@ minetest.register_node("techage:signal_lamp_off", { end end, - on_construct = COLORED and unifieddyes.on_construct, - on_dig = COLORED and unifieddyes.on_dig, + on_construct = COLORED and unifieddyes.on_construct or nil, + on_dig = COLORED and unifieddyes.on_dig or nil, paramtype = "light", paramtype2 = "color", @@ -94,8 +94,8 @@ minetest.register_node("techage:signal_lamp_on", { palette = COLORED and "unifieddyes_palette_extended.png" or 'techage_color16.png', groups = {choppy=2, cracky=1, not_in_creative_inventory=1, ud_param2_colorable = 1}, - on_construct = COLORED and unifieddyes.on_construct, - after_place_node = COLORED and unifieddyes.recolor_on_place, + on_construct = COLORED and unifieddyes.on_construct or nil, + after_place_node = COLORED and unifieddyes.recolor_on_place or nil, after_dig_node = function(pos, oldnode, oldmetadata, digger) techage.remove_node(pos) @@ -105,7 +105,7 @@ minetest.register_node("techage:signal_lamp_on", { end end, - on_dig = COLORED and unifieddyes.on_dig, + on_dig = COLORED and unifieddyes.on_dig or nil, light_source = 10, is_ground_content = false, drop = "techage:signal_lamp_off" diff --git a/mod.conf b/mod.conf index 53ee3a8..2c34908 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = techage depends = default,tubelib2,basic_materials,bucket,stairs -optional_depends = unified_inventory,wielded_light,minecart +optional_depends = unified_inventory,wielded_light,minecart,unifieddyes description = Techage, go through 4 tech ages in search of wealth and power! \ No newline at end of file diff --git a/models/techage_pillar.obj b/models/techage_pillar.obj new file mode 100644 index 0000000..2bd0f8a --- /dev/null +++ b/models/techage_pillar.obj @@ -0,0 +1,124 @@ +# Blender v2.78 (sub 0) OBJ File: 'oven.blend' +# www.blender.org +o Cylinder +v 0.000000 -0.500000 -0.360000 +v 0.000000 0.500000 -0.360000 +v 0.137766 -0.500000 -0.332597 +v 0.137766 0.500000 -0.332597 +v 0.254558 -0.500000 -0.254558 +v 0.254558 0.500000 -0.254558 +v 0.332597 -0.500000 -0.137766 +v 0.332597 0.500000 -0.137766 +v 0.360000 -0.500000 0.000000 +v 0.360000 0.500000 0.000000 +v 0.332597 -0.500000 0.137766 +v 0.332597 0.500000 0.137766 +v 0.254558 -0.500000 0.254558 +v 0.254558 0.500000 0.254558 +v 0.137766 -0.500000 0.332597 +v 0.137766 0.500000 0.332597 +v 0.000000 -0.500000 0.360000 +v 0.000000 0.500000 0.360000 +v -0.137766 -0.500000 0.332597 +v -0.137766 0.500000 0.332597 +v -0.254558 -0.500000 0.254559 +v -0.254558 0.500000 0.254559 +v -0.332597 -0.500000 0.137766 +v -0.332597 0.500000 0.137766 +v -0.360000 -0.500000 -0.000000 +v -0.360000 0.500000 -0.000000 +v -0.332597 -0.500000 -0.137766 +v -0.332597 0.500000 -0.137766 +v -0.254558 -0.500000 -0.254559 +v -0.254558 0.500000 -0.254559 +v -0.137766 -0.500000 -0.332597 +v -0.137766 0.500000 -0.332597 +vt 0.5486 0.5000 +vt 0.5486 1.0000 +vt 0.4725 1.0000 +vt 0.4725 0.5000 +vt 0.4142 1.0000 +vt 0.4142 0.5000 +vt 1.0000 0.5000 +vt 1.0000 1.0000 +vt 0.9239 1.0000 +vt 0.9239 0.5000 +vt 0.8415 1.0000 +vt 0.8415 0.5000 +vt 0.7654 1.0000 +vt 0.7654 0.5000 +vt 0.4142 0.5000 +vt 0.4142 0.0000 +vt 0.4725 0.0000 +vt 0.4725 0.5000 +vt 0.5486 0.0000 +vt 0.5486 0.5000 +vt 0.6310 0.0000 +vt 0.6310 0.5000 +vt 0.7071 0.0000 +vt 0.7071 0.5000 +vt 0.7654 0.0000 +vt 0.7654 0.5000 +vt 0.8415 0.0000 +vt 0.8415 0.5000 +vt 0.9239 0.0000 +vt 0.9239 0.5000 +vt 1.0000 0.0000 +vt 1.0000 0.5000 +vt 0.7654 0.5000 +vt 0.7654 1.0000 +vt 0.7071 1.0000 +vt 0.7071 0.5000 +vt 0.3244 0.4749 +vt 0.3827 0.5370 +vt 0.4142 0.6181 +vt 0.4142 0.7059 +vt 0.3827 0.7870 +vt 0.3244 0.8491 +vt 0.2483 0.8827 +vt 0.1659 0.8827 +vt 0.0898 0.8491 +vt 0.0315 0.7870 +vt 0.0000 0.7059 +vt 0.0000 0.6181 +vt 0.0315 0.5370 +vt 0.0898 0.4749 +vt 0.1659 0.4414 +vt 0.2483 0.4414 +vt 0.6310 1.0000 +vt 0.6310 0.5000 +vt 0.0000 0.2646 +vt 0.0000 0.1768 +vt 0.0315 0.0957 +vt 0.0898 0.0336 +vt 0.1659 0.0000 +vt 0.2483 0.0000 +vt 0.3244 0.0336 +vt 0.3827 0.0957 +vt 0.4142 0.1768 +vt 0.4142 0.2646 +vt 0.3827 0.3457 +vt 0.3244 0.4078 +vt 0.2483 0.4414 +vt 0.1659 0.4414 +vt 0.0898 0.4078 +vt 0.0315 0.3457 +s off +f 1/1 2/2 4/3 3/4 +f 3/4 4/3 6/5 5/6 +f 5/7 6/8 8/9 7/10 +f 7/10 8/9 10/11 9/12 +f 9/12 10/11 12/13 11/14 +f 11/15 12/16 14/17 13/18 +f 13/18 14/17 16/19 15/20 +f 15/20 16/19 18/21 17/22 +f 17/22 18/21 20/23 19/24 +f 19/24 20/23 22/25 21/26 +f 21/26 22/25 24/27 23/28 +f 23/28 24/27 26/29 25/30 +f 25/30 26/29 28/31 27/32 +f 27/33 28/34 30/35 29/36 +f 4/37 2/38 32/39 30/40 28/41 26/42 24/43 22/44 20/45 18/46 16/47 14/48 12/49 10/50 8/51 6/52 +f 29/36 30/35 32/53 31/54 +f 31/54 32/53 2/2 1/1 +f 1/55 3/56 5/57 7/58 9/59 11/60 13/61 15/62 17/63 19/64 21/65 23/66 25/67 27/68 29/69 31/70 \ No newline at end of file diff --git a/nodes/pillar.lua b/nodes/pillar.lua new file mode 100644 index 0000000..08e5644 --- /dev/null +++ b/nodes/pillar.lua @@ -0,0 +1,31 @@ +--[[ + + TechAge + ======= + + Copyright (C) 2019 Joachim Stolberg + + GPL v3 + See LICENSE.txt for more information + + pillar + +]]-- + +local S = techage.S + +minetest.register_node("techage:pillar", { + description = S("TA4 Pillar"), + tiles = {"techage_concrete.png"}, + drawtype = "mesh", + mesh = "techage_pillar.obj", + selection_box = { + type = "fixed", + fixed = {-8/32, -16/32, -8/32, 8/32, 16/32, 8/32}, + }, + + groups = {cracky=1}, + on_rotate = screwdriver.disallow, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), +}) diff --git a/oil/drillbox.lua b/oil/drillbox.lua index b2efcbb..c4a656f 100644 --- a/oil/drillbox.lua +++ b/oil/drillbox.lua @@ -251,7 +251,7 @@ local tubing = { } local _, node_name_ta3, _ = - techage.register_consumer("drillbox", S("TA3 Oil Drill Box"), tiles, { + techage.register_consumer("drillbox", S("Oil Drill Box"), tiles, { drawtype = "normal", cycle_time = CYCLE_TIME, standby_ticks = STANDBY_TICKS, diff --git a/oil/pumpjack.lua b/oil/pumpjack.lua index 8b4cd90..632b1be 100644 --- a/oil/pumpjack.lua +++ b/oil/pumpjack.lua @@ -155,7 +155,7 @@ local tubing = { } local _, node_name_ta3, _ = - techage.register_consumer("pumpjack", S("TA3 Oil Pumpjack"), tiles, { + techage.register_consumer("pumpjack", S("Oil Pumpjack"), tiles, { cycle_time = CYCLE_TIME, standby_ticks = STANDBY_TICKS, formspec = formspec, diff --git a/textures/techage_concrete.png b/textures/techage_concrete.png index a74d4092f8d09f63288bcbf7b47f9193a3fe842d..9f2621218caf4a874956349fd853cbe0aa162bf6 100644 GIT binary patch delta 378 zcmV-=0fqj*1lu0B1uF+R4C6~(K~L#FbsfUqUZ%`q zg{-*2Fl6fQrS(0@4bq-Rt;;<40m%)DC?sqWMXDRtCsT@P796>ELtT^`Og2&B%`jBq z6395Q6gRAozsg+b>V}_}O1H1rR+;vdXWvQ^x$izw_O1iMIrU8I4J z|5quHJM9 z2X>(+i+?-N#<_k)CjrHFU~EU)iMulf$NUR|Q5L8B__lw#hqb_OXYVAZc@OL#fxsEV z$P`#JhrCP6O4#WxvGFw74-JwX9ZVM@jwGZD%)&G(4Ac>iIPRC?$ag7m8u5~qf!azN zS=*DlSiar}t|iyW(jt2$##KRVWoyM{47NP!(|<#(EGXq$vVMPZzlY`I>GZF~iE5GH zAiC*JByFwnPs@CPHeJ8aZA-0fOSkAC%dk&N8FuwL^B(5cP@ik8TieRhGtj+Xm$q#! z#}aEMc(D>=S$EQgN8uUzFia`Ott?9}->HG04VQZFV`=y`B?A(3j{XI=q1lg;EKF7E uIw@-RdGy5P_>r6iVs}9R0000