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 2989f48..0000000 Binary files a/icons/Visual Wire 1x1f.png and /dev/null differ diff --git a/icons/Visual Wire 1x1x15.png b/icons/Visual Wire 1x1x15.png deleted file mode 100644 index 71d131f..0000000 Binary files a/icons/Visual Wire 1x1x15.png and /dev/null differ diff --git a/icons/Visual Wire 1x1x2.png b/icons/Visual Wire 1x1x2.png deleted file mode 100644 index bc12b18..0000000 Binary files a/icons/Visual Wire 1x1x2.png and /dev/null differ diff --git a/icons/Visual Wire 1x1x3.png b/icons/Visual Wire 1x1x3.png deleted file mode 100644 index d353cb9..0000000 Binary files a/icons/Visual Wire 1x1x3.png and /dev/null differ diff --git a/icons/Visual Wire 1x2x5.png b/icons/Visual Wire 1x2x5.png deleted file mode 100644 index 6f28377..0000000 Binary files a/icons/Visual Wire 1x2x5.png and /dev/null differ 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 0000000..6cdbf4f Binary files /dev/null and b/icons/Wire 4x4f.png differ