From 75bd081a67a2ac52b8a0eea1e051a456d288c71d Mon Sep 17 00:00:00 2001
From: Jeija <norrepli@gmail.com>
Date: Fri, 20 Nov 2015 20:13:59 +0100
Subject: [PATCH] Gates: Add OR and NOR gate

---
 mesecons_gates/init.lua                    |  10 ++++++++++
 mesecons_gates/textures/jeija_gate_nor.png | Bin 0 -> 251 bytes
 mesecons_gates/textures/jeija_gate_or.png  | Bin 0 -> 243 bytes
 3 files changed, 10 insertions(+)
 create mode 100644 mesecons_gates/textures/jeija_gate_nor.png
 create mode 100644 mesecons_gates/textures/jeija_gate_or.png

diff --git a/mesecons_gates/init.lua b/mesecons_gates/init.lua
index 78a3e83..dde85bf 100644
--- a/mesecons_gates/init.lua
+++ b/mesecons_gates/init.lua
@@ -122,3 +122,13 @@ register_gate("xor", 2, function (val1, val2) return (val1 or val2) and not (val
 	{{"mesecons:mesecon", "", ""},
 	 {"", "mesecons_materials:silicon", "mesecons_materials:silicon"},
 	 {"mesecons:mesecon", "", ""}})
+
+register_gate("nor", 2, function (val1, val2) return not (val1 or val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons_materials:mesecon_torch_on", "mesecons_materials:silicon"},
+	 {"mesecons:mesecon", "", ""}})
+
+register_gate("or", 2, function (val1, val2) return (val1 or val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons:mesecon", "mesecons:mesecon"},
+	 {"mesecons:mesecon", "", ""}})
diff --git a/mesecons_gates/textures/jeija_gate_nor.png b/mesecons_gates/textures/jeija_gate_nor.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4298e384217b29d1a92c33c71417ea2bd2465b6
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE<hRxemd{22U45`9+AZi
z4BWyX%*Zfnjs#GUy~NYkmHj>!AHSs7!)Sv&Kq1-8kcblJ{M_8syb>Unfx)>bHL)Z$
zMWH;iBtya7(>EYRFO?lA9`EVm7-Dhy?4*NS2Mjoz7ytOb|Barmh~bqDho=P#e(G6r
z;QFS&C(caiNn>NU$Sb;{ye($c0qq4@OdnUCoVJ8TeZt(Q`Pn_5vCp5~@-c8O@4Ca(
le38Xkt-G3a#r>c1RSZ*oU8L4~aNh#C!PC{xWt~$(699<bQJw$*

literal 0
HcmV?d00001

diff --git a/mesecons_gates/textures/jeija_gate_or.png b/mesecons_gates/textures/jeija_gate_or.png
new file mode 100644
index 0000000000000000000000000000000000000000..09f06613ebfe20d5d39243fc05daeedb83b580be
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE<hRxemd{22U45`9+AZi
z4BWyX%*Zfnjs#GUy~NYkmHj>!AHS-u^5O;QKq1-8kcblJ{M_8syb>Unfx)>bHL)Z$
zMWH;iBtya7(>EYRFO?lA9`5Pl7-Dhy>?A`j2SX0$<QIR}&+(I&F-frglO}Y<-GHfH
zd!N%Jw{Ag3hSk|AmKM7cRYNa`1)OxWh_xtsuwYN`#K|{SnOI2Ll|5*9tNgUt(meZ9
bX?_-SytIYT<@uHOL3Vq(`njxgN@xNAj#)<E

literal 0
HcmV?d00001