From ba94172cc855eb8290736cdc89892d1728597bcd Mon Sep 17 00:00:00 2001 From: Redo Date: Fri, 24 Apr 2020 01:17:30 -0500 Subject: [PATCH] removed visual wires; added more wire sizes --- bricks/blb/wires/1x1x18.blb | 2 + bricks/blb/wires/1x1x32.blb | 2 + bricks/blb/wires/1x1x36.blb | 2 + bricks/blb/wires/1x1x64.blb | 2 + bricks/blb/wires/1x1x72.blb | 2 + bricks/outputs/text2-global.lua | 4 +- bricks/outputs/text2-update.lua | 2 +- bricks/wires.cs | 98 +++++++++--------- icons/Visual Wire 1x1f.png | Bin 660 -> 0 bytes icons/Visual Wire 1x1x15.png | Bin 993 -> 0 bytes icons/Visual Wire 1x1x2.png | Bin 705 -> 0 bytes icons/Visual Wire 1x1x3.png | Bin 729 -> 0 bytes icons/Visual Wire 1x2x5.png | Bin 1106 -> 0 bytes icons/{Visual Wire 2x2f.png => Wire 2x2f.png} | Bin icons/Wire 4x4f.png | Bin 0 -> 4527 bytes 15 files changed, 63 insertions(+), 51 deletions(-) create mode 100644 bricks/blb/wires/1x1x18.blb create mode 100644 bricks/blb/wires/1x1x32.blb create mode 100644 bricks/blb/wires/1x1x36.blb create mode 100644 bricks/blb/wires/1x1x64.blb create mode 100644 bricks/blb/wires/1x1x72.blb delete mode 100644 icons/Visual Wire 1x1f.png delete mode 100644 icons/Visual Wire 1x1x15.png delete mode 100644 icons/Visual Wire 1x1x2.png delete mode 100644 icons/Visual Wire 1x1x3.png delete mode 100644 icons/Visual Wire 1x2x5.png rename icons/{Visual Wire 2x2f.png => Wire 2x2f.png} (100%) create mode 100644 icons/Wire 4x4f.png diff --git a/bricks/blb/wires/1x1x18.blb b/bricks/blb/wires/1x1x18.blb new file mode 100644 index 0000000..0056276 --- /dev/null +++ b/bricks/blb/wires/1x1x18.blb @@ -0,0 +1,2 @@ +1 1 18 +BRICK \ No newline at end of file diff --git a/bricks/blb/wires/1x1x32.blb b/bricks/blb/wires/1x1x32.blb new file mode 100644 index 0000000..5a63aee --- /dev/null +++ b/bricks/blb/wires/1x1x32.blb @@ -0,0 +1,2 @@ +1 1 32 +BRICK \ No newline at end of file diff --git a/bricks/blb/wires/1x1x36.blb b/bricks/blb/wires/1x1x36.blb new file mode 100644 index 0000000..0e5caf8 --- /dev/null +++ b/bricks/blb/wires/1x1x36.blb @@ -0,0 +1,2 @@ +1 1 36 +BRICK \ No newline at end of file diff --git a/bricks/blb/wires/1x1x64.blb b/bricks/blb/wires/1x1x64.blb new file mode 100644 index 0000000..d4655b1 --- /dev/null +++ b/bricks/blb/wires/1x1x64.blb @@ -0,0 +1,2 @@ +1 1 64 +BRICK \ No newline at end of file diff --git a/bricks/blb/wires/1x1x72.blb b/bricks/blb/wires/1x1x72.blb new file mode 100644 index 0000000..22b24d0 --- /dev/null +++ b/bricks/blb/wires/1x1x72.blb @@ -0,0 +1,2 @@ +1 1 72 +BRICK \ No newline at end of file diff --git a/bricks/outputs/text2-global.lua b/bricks/outputs/text2-global.lua index 532407c..cc964c9 100644 --- a/bricks/outputs/text2-global.lua +++ b/bricks/outputs/text2-global.lua @@ -44,8 +44,8 @@ textbrick2_idxToPrint = { [0x25] = "percent", [0x26] = "and", [0x27] = "apostrophe", - [0x28] = "roundbracketleft", - [0x29] = "roundbracketright", + [0x28] = "roundbracketright", + [0x29] = "roundbracketleft", [0x2A] = "asterisk", [0x2B] = "plus", [0x2C] = "comma", diff --git a/bricks/outputs/text2-update.lua b/bricks/outputs/text2-update.lua index 8f00170..83e323c 100644 --- a/bricks/outputs/text2-update.lua +++ b/bricks/outputs/text2-update.lua @@ -19,7 +19,7 @@ local function getBit(gate, val) end elseif gate.listenState=="terminate" then if val==1 then - print("", "terminate") + --print("", "terminate") local printid = gate.valReceived local printname = textbrick2_idxToPrint[printid] diff --git a/bricks/wires.cs b/bricks/wires.cs index aab05e4..dbc5e76 100644 --- a/bricks/wires.cs +++ b/bricks/wires.cs @@ -280,6 +280,41 @@ datablock fxDTSBrickData(LogicWire1x1x17Data : LogicWire1x64fData) brickFile = $LuaLogic::Path @ "bricks/blb/wires/1x1x17.blb"; }; +datablock fxDTSBrickData(LogicWire1x1x18Data : LogicWire1x64fData) +{ + uiName = "Wire 1x1x18"; + iconName = $LuaLogic::Path @ "icons/Wire 1x1x18"; + brickFile = $LuaLogic::Path @ "bricks/blb/wires/1x1x18.blb"; +}; + +datablock fxDTSBrickData(LogicWire1x1x32Data : LogicWire1x64fData) +{ + uiName = "Wire 1x1x32"; + iconName = $LuaLogic::Path @ "icons/Wire 1x1x32"; + brickFile = $LuaLogic::Path @ "bricks/blb/wires/1x1x32.blb"; +}; + +datablock fxDTSBrickData(LogicWire1x1x36Data : LogicWire1x64fData) +{ + uiName = "Wire 1x1x36"; + iconName = $LuaLogic::Path @ "icons/Wire 1x1x36"; + brickFile = $LuaLogic::Path @ "bricks/blb/wires/1x1x36.blb"; +}; + +datablock fxDTSBrickData(LogicWire1x1x64Data : LogicWire1x64fData) +{ + uiName = "Wire 1x1x64"; + iconName = $LuaLogic::Path @ "icons/Wire 1x1x64"; + brickFile = $LuaLogic::Path @ "bricks/blb/wires/1x1x64.blb"; +}; + +datablock fxDTSBrickData(LogicWire1x1x72Data : LogicWire1x64fData) +{ + uiName = "Wire 1x1x72"; + iconName = $LuaLogic::Path @ "icons/Wire 1x1x72"; + brickFile = $LuaLogic::Path @ "bricks/blb/wires/1x1x72.blb"; +}; + datablock fxDTSBrickData(LogicWire1x1x128Data : LogicWire1x64fData) { uiName = "Wire 1x1x128"; @@ -305,55 +340,22 @@ datablock fxDTSBrickData(LogicWire64x64fData : brick64x64fData) isLogicWire = true; }; -//VISUAL -datablock fxDTSBrickData(LogicWire1x1fVisualData : LogicWire1x1fData) -{ - subCategory = "Wires - Special"; - uiName = "Visual Wire 1x1f"; - iconName = $LuaLogic::Path @ "icons/Visual Wire 1x1f"; - isLogicVisual = true; -}; - -datablock fxDTSBrickData(LogicWire1x1x2VisualData : LogicWire1x1x2Data) -{ - subCategory = "Wires - Special"; - uiName = "Visual Wire 1x1x2"; - iconName = $LuaLogic::Path @ "icons/Visual Wire 1x1x2"; - isLogicVisual = true; -}; - -datablock fxDTSBrickData(LogicWire1x1x3VisualData : LogicWire1x1x3Data) -{ - subCategory = "Wires - Special"; - uiName = "Visual Wire 1x1x3"; - iconName = $LuaLogic::Path @ "icons/Visual Wire 1x1x3"; - isLogicVisual = true; -}; - -datablock fxDTSBrickData(LogicWire1x1x15VisualData : LogicWire1x1x15Data) -{ - subCategory = "Wires - Special"; - uiName = "Visual Wire 1x1x15"; - iconName = $LuaLogic::Path @ "icons/Visual Wire 1x1x15"; - isLogicVisual = true; -}; - -datablock fxDTSBrickData(LogicWire1x2x5VisualData : LogicWire1x2x5Data) -{ - subCategory = "Wires - Special"; - uiName = "Visual Wire 1x2x5"; - iconName = $LuaLogic::Path @ "icons/Visual Wire 1x2x5"; - isLogicVisual = true; -}; - -datablock fxDTSBrickData(LogicWire2x2fVisualData : brick2x2fData) -{ +datablock fxDTSBrickData(LogicWire2x2fData : brick2x2fData){ category = "Logic Bricks"; - subCategory = "Wires - Special"; - uiName = "Visual Wire 2x2f"; - iconName = $LuaLogic::Path @ "icons/Visual Wire 2x2f"; - + subCategory = "Wires"; + uiName = "Wire 2x2f"; + iconName = $LuaLogic::Path @ "icons/Wire 2x2f"; + + isLogic = true; + isLogicWire = true; +}; + +datablock fxDTSBrickData(LogicWire4x4fData : brick4x4fData){ + category = "Logic Bricks"; + subCategory = "Wires"; + uiName = "Wire 4x4f"; + iconName = $LuaLogic::Path @ "icons/Wire 4x4f"; + isLogic = true; isLogicWire = true; - isLogicVisual = true; }; diff --git a/icons/Visual Wire 1x1f.png b/icons/Visual Wire 1x1f.png deleted file mode 100644 index 2989f48317118cb1c3ac0875fb134ef763afd78c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 zcmV;F0&D$=P)M#%00EpyL_t(|obA$UZ-OuwhT#o`F<~IG11fev zIfw_4gZ%%WwoG;O{dkvBMtvn+14 zGR$_qdIi!I!!UGRSM{NN2VvL4*vFpl+Fil40~foP%(eIX!GPlg;UNqUWFc-5G>@zN z@i-hf5y7!(pAvz2Ctq$baH0gd5gsA>`SW=c5Je@i^}~j6`}xs8MW|jygud6yGXN^W z!Ql;P=a~RC;gT=q_w$T^+6V{`#GO0=E<=GNX#*vZrgj|1o%}hwi~y3PBSdMM5}=dM zvcdg3M4op6lFvrue-nA0w*UtDKG6mk0|IfsEzQl%ZEbCdiHS^1OdK2>Q>ILr zFk!-i1q&7~TsV97Y@kM;@!J<@87?F z+qP{$E#2MS`}XYv`UvRS88c?goH-L{vbwtZ)~#DpQ&Y3DvNmnnl#`Q_k&ywkLP0?R zXw-%c8?v*r4Gj%zYHEN^0!pQ&r6naL0bRav<3^wqGc&V}jt($n=FFM1cI{fAtgEZ5 zkdTn2rDao76VL=%j>A^KFfAwv@(X5Q6vzMu?!6QXAPELFOdK!3jMPUU>N<#64k91` z%tYctg}*QVzdY~%{|Zg0TBVl%|1D-b`@X#B>Hq7@`ev8^{|^_oU3#zkc$^t9UN3mM zIEGZrd3!4|xG6xUt?+iv!82mhzcF<=DI4`@7%rKz<;|40;Jhwj~07v7ySLlIKN*~=99R&&7-p2a~Jun4kR-9Vaj?{8S~Yn1gqMg4og0IqmE|#xpCJ zr(Al#XyRQdFX*tCfmOqSBSMvTiAF#$!_4oFTE2{23`|6w*3JYrOrkV z#;>`*1vd1TmFOH3P>gV6{95ksm-x9N{W-hk>0Jk|=f@vLcK4v#Ez6%ze?RvF*UDwDBpC0%O9rMZ22WQ%mvv4FO#m`M>~sJC diff --git a/icons/Visual Wire 1x1x2.png b/icons/Visual Wire 1x1x2.png deleted file mode 100644 index bc12b18b86b3517521c1a7c6d4371f4ecfab0386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 705 zcmV;y0zUnTP)BZ?v?ub8~aI zx3{*owrOc;W@cuyv$L+Qu5E2?ETVcv00002bW%=J009A%{jLB20lG;5hE!Fc=I5gTY`h7{C1h2H(kFA2KA`00000NkvXXu0mjfk%3QE diff --git a/icons/Visual Wire 1x1x3.png b/icons/Visual Wire 1x1x3.png deleted file mode 100644 index d353cb97d12e212b4fd10dda0ce325f306927ae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 729 zcmV;~0w(>5P)}TgM)*Sk&&LB zo|Kf7goK2enwp%PoRX4~o12@TpP!+jp`xOqot>STnVF!VpqQALii(P(qoZwYZN0s{ zyu7@nrKP8*r>Ll?rlzK(q@-|gaJaa*si~=MZfM#%00GHK zL_t(|obA_bQ-VMghGEKtBvdpdT?|7-5H!GyUNryz&uZC4i=`QCU8b4lJbrcVYuxim zNh;e#={I077z_r3!G68V+EtbLx~yC`)SIgES6Z{#x^C-wqfd#lM!0`zoUZ!3MV zdE-u|ySq$(0$xuQc#J`Z*0uT&A#)^CLfA|7wJd*cAqx+o;cbHw?bhJz{5Z>Z`ZRA* zW31v+^zhXBS@}AC98J^Y&H#Po31J#FrKPr%hh~lc-b2F}rR!Q|K2HSOHt`3~nsD}~ zGsBs?blw6n`GrHaFnymFn9YJ9aNH%CJ6{}sMn3Pa9(jRjkj~DCrRxxa&9D5B8;Bx8 zpd;bg#k|iC%p$xX#>8-bcqz|e^ZbBBfQ%S-7_x7YJZtvwmjtLV+mR6!LFN!*_0Ay-ku5APjdqZa|W@TZUkOG{57||3Ksb0r>*)4G@%Ph$A2{pCb-{*!(ww z0^;*WA_dad5ueY9&Bx26syrd~`w8!V$`iM*HV=crU@#aA_GkM9JFpN7Bd%Uw00000 LNkvXXu0mjf#|vJ8 diff --git a/icons/Visual Wire 1x2x5.png b/icons/Visual Wire 1x2x5.png deleted file mode 100644 index 6f28377533552e40024d5023a18edde310ac5087..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1106 zcmV-Y1g-mtP)1Fl#PvzgM)*HhK7-m zk(-;FkB^Uvii(+;nV+AZp`oFbm6ey5m!P1aqN1Xno}QeXoS2xHlarH@l9HsPq@|^$ zr>Cc;rlzQzEM{c1p(y~3`i39Dbpv#;yjvqv!${%4hs@5 zw6n@tuD3&iml*>Qt`C6TFqS6<#Itaz>W$5rRMn2ahZjS)W&6NR zo)ECY`%LLt+ebcFT22wNtxC!h0XHMd33nDPRGf(Abk`tZQqmnQ@!n81b}-3m^)wBG(aF%S`^9qg<_ zmZtzB0$*-;XMsVGrvf5k1o2ml=iMF769G4q*aXDX5WKrPf;`bxu>}Ogl>b7OPXl1$ z>$iKtekx!x$sL$Z3*b)!<9`geE`S2a1-Lq#E`S0k016=C3*mPFq<2LD;`TVH?(tP4waTu7*Nb{)xntUQK-wV*?sR7zNEkOQm_X6`@04egN(&&j4 zNR=;@=1=nl36L_6faPkwLyX@8^zSw{tJP|;SnLCi$|n#zz|nc1cz)gxTR@~ diff --git a/icons/Visual Wire 2x2f.png b/icons/Wire 2x2f.png similarity index 100% rename from icons/Visual Wire 2x2f.png rename to icons/Wire 2x2f.png diff --git a/icons/Wire 4x4f.png b/icons/Wire 4x4f.png new file mode 100644 index 0000000000000000000000000000000000000000..6cdbf4fc5649fa591aa038c2b00bd8e2e7de778b GIT binary patch literal 4527 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 literal 0 HcmV?d00001