summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2013-06-16 09:36:49 -0400
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2013-06-16 09:36:49 -0400
commitada718fc4211d89d1c00c353252ba4ef7f728fa0 (patch)
treec29805b1505e520071e2f27caada50296e9ab1de
parent0002d713afd3dd8fcd567382e2464a10b25f88fe (diff)
downloadpipeworks-ada718fc4211d89d1c00c353252ba4ef7f728fa0.tar
pipeworks-ada718fc4211d89d1c00c353252ba4ef7f728fa0.tar.gz
pipeworks-ada718fc4211d89d1c00c353252ba4ef7f728fa0.tar.bz2
pipeworks-ada718fc4211d89d1c00c353252ba4ef7f728fa0.tar.xz
pipeworks-ada718fc4211d89d1c00c353252ba4ef7f728fa0.zip
Added appropriate textures for mesecon conductor tubes
-rw-r--r--textures/pipeworks_conductor_tube_end.pngbin0 -> 2805 bytes
-rw-r--r--textures/pipeworks_conductor_tube_inv.pngbin0 -> 2067 bytes
-rw-r--r--textures/pipeworks_conductor_tube_noctr.pngbin0 -> 2133 bytes
-rw-r--r--textures/pipeworks_conductor_tube_on_end.pngbin0 -> 2778 bytes
-rw-r--r--textures/pipeworks_conductor_tube_on_noctr.pngbin0 -> 2113 bytes
-rw-r--r--textures/pipeworks_conductor_tube_on_plain.pngbin0 -> 2657 bytes
-rw-r--r--textures/pipeworks_conductor_tube_plain.pngbin0 -> 2596 bytes
-rw-r--r--textures/pipeworks_conductor_tube_short.pngbin0 -> 1192 bytes
-rw-r--r--tubes.lua24
9 files changed, 20 insertions, 4 deletions
diff --git a/textures/pipeworks_conductor_tube_end.png b/textures/pipeworks_conductor_tube_end.png
new file mode 100644
index 0000000..a0d6915
--- /dev/null
+++ b/textures/pipeworks_conductor_tube_end.png
Binary files differ
diff --git a/textures/pipeworks_conductor_tube_inv.png b/textures/pipeworks_conductor_tube_inv.png
new file mode 100644
index 0000000..5db1153
--- /dev/null
+++ b/textures/pipeworks_conductor_tube_inv.png
Binary files differ
diff --git a/textures/pipeworks_conductor_tube_noctr.png b/textures/pipeworks_conductor_tube_noctr.png
new file mode 100644
index 0000000..cc03245
--- /dev/null
+++ b/textures/pipeworks_conductor_tube_noctr.png
Binary files differ
diff --git a/textures/pipeworks_conductor_tube_on_end.png b/textures/pipeworks_conductor_tube_on_end.png
new file mode 100644
index 0000000..a70d988
--- /dev/null
+++ b/textures/pipeworks_conductor_tube_on_end.png
Binary files differ
diff --git a/textures/pipeworks_conductor_tube_on_noctr.png b/textures/pipeworks_conductor_tube_on_noctr.png
new file mode 100644
index 0000000..30edb60
--- /dev/null
+++ b/textures/pipeworks_conductor_tube_on_noctr.png
Binary files differ
diff --git a/textures/pipeworks_conductor_tube_on_plain.png b/textures/pipeworks_conductor_tube_on_plain.png
new file mode 100644
index 0000000..1aaa15b
--- /dev/null
+++ b/textures/pipeworks_conductor_tube_on_plain.png
Binary files differ
diff --git a/textures/pipeworks_conductor_tube_plain.png b/textures/pipeworks_conductor_tube_plain.png
new file mode 100644
index 0000000..b432dc4
--- /dev/null
+++ b/textures/pipeworks_conductor_tube_plain.png
Binary files differ
diff --git a/textures/pipeworks_conductor_tube_short.png b/textures/pipeworks_conductor_tube_short.png
new file mode 100644
index 0000000..0c4b1d2
--- /dev/null
+++ b/textures/pipeworks_conductor_tube_short.png
Binary files differ
diff --git a/tubes.lua b/tubes.lua
index 735a85a..4bd1d77 100644
--- a/tubes.lua
+++ b/tubes.lua
@@ -432,15 +432,31 @@ register_tube("pipeworks:detector_tube_off","Detector tube segment",detector_pla
mesecons={receptor={state="off",
rules=mesecons_rules}}})
-register_tube("pipeworks:conductor_tube_off","Conductor tube segment",detector_plain_textures,noctr_textures,
- end_textures,short_texture,detector_inv_texture,
+conductor_plain_textures={"pipeworks_conductor_tube_plain.png","pipeworks_conductor_tube_plain.png","pipeworks_conductor_tube_plain.png",
+ "pipeworks_conductor_tube_plain.png","pipeworks_conductor_tube_plain.png","pipeworks_conductor_tube_plain.png"}
+conductor_noctr_textures={"pipeworks_conductor_tube_noctr.png","pipeworks_conductor_tube_noctr.png","pipeworks_conductor_tube_noctr.png",
+ "pipeworks_conductor_tube_noctr.png","pipeworks_conductor_tube_noctr.png","pipeworks_conductor_tube_noctr.png"}
+conductor_end_textures={"pipeworks_conductor_tube_end.png","pipeworks_conductor_tube_end.png","pipeworks_conductor_tube_end.png",
+ "pipeworks_conductor_tube_end.png","pipeworks_conductor_tube_end.png","pipeworks_conductor_tube_end.png"}
+conductor_short_texture="pipeworks_conductor_tube_short.png"
+conductor_inv_texture="pipeworks_conductor_tube_inv.png"
+
+register_tube("pipeworks:conductor_tube_off","Conductor tube segment",conductor_plain_textures,conductor_noctr_textures,
+ conductor_end_textures,conductor_short_texture,conductor_inv_texture,
{groups={mesecon=2},
mesecons={conductor={state="off",
rules=mesecons_rules,
onstate="pipeworks:conductor_tube_on_#id"}}})
-register_tube("pipeworks:conductor_tube_on","Conductor tube segment on (you hacker you)",detector_plain_textures,noctr_textures,
- end_textures,short_texture,detector_inv_texture,
+conductor_on_plain_textures={"pipeworks_conductor_tube_on_plain.png","pipeworks_conductor_tube_on_plain.png","pipeworks_conductor_tube_on_plain.png",
+ "pipeworks_conductor_tube_on_plain.png","pipeworks_conductor_tube_on_plain.png","pipeworks_conductor_tube_on_plain.png"}
+conductor_on_noctr_textures={"pipeworks_conductor_tube_on_noctr.png","pipeworks_conductor_tube_on_noctr.png","pipeworks_conductor_tube_on_noctr.png",
+ "pipeworks_conductor_tube_on_noctr.png","pipeworks_conductor_tube_on_noctr.png","pipeworks_conductor_tube_on_noctr.png"}
+conductor_on_end_textures={"pipeworks_conductor_tube_on_end.png","pipeworks_conductor_tube_on_end.png","pipeworks_conductor_tube_on_end.png",
+ "pipeworks_conductor_tube_on_end.png","pipeworks_conductor_tube_on_end.png","pipeworks_conductor_tube_on_end.png"}
+
+register_tube("pipeworks:conductor_tube_on","Conductor tube segment on (you hacker you)",conductor_on_plain_textures,conductor_on_noctr_textures,
+ conductor_on_end_textures,conductor_short_texture,conductor_inv_texture,
{groups={mesecon=2,not_in_creative_inventory=1},
drop="pipeworks:conductor_tube_off_000000",
mesecons={conductor={state="on",