redo/Brick_LuaLogic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add cdata size and cfunc

Browse Source
This commit is contained in:
Redo 2022-11-05 12:59:40 -06:00
parent 949aeaa2c8
commit 57087d728f
8 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bricks/gates/NOT.cs
View File

@ -13,6 +13,7 @@ datablock fxDTSBrickData(LogicGate_NOT_Data : LogicGate_Diode_Data)
logicForcePrint = "ARROW"; logicForcePrint = "ARROW";
logicUpdate = "return function(gate) Gate.setportstate(gate, 2, 1-Gate.getportstate(gate, 1)) end"; logicUpdate = "return function(gate) Gate.setportstate(gate, 2, 1-Gate.getportstate(gate, 1)) end";
logicCFunction = 2;
numLogicPorts = 2; numLogicPorts = 2;
}; };

1
bricks/gates/diode.cs
View File

@ -17,6 +17,7 @@ datablock fxDTSBrickData(LogicGate_Diode_Data)
logicForcePrint = "ARROW"; logicForcePrint = "ARROW";
logicUpdate = "return function(gate) Gate.setportstate(gate, 2, Gate.getportstate(gate, 1)) end"; logicUpdate = "return function(gate) Gate.setportstate(gate, 2, Gate.getportstate(gate, 1)) end";
logicCFunction = 1;
numLogicPorts = 2; numLogicPorts = 2;

2
bricks/gates/verticalDiode.cs
View File

@ -20,6 +20,7 @@ datablock fxDTSBrickData(LogicGate_DiodeUp_Data)
logicForcePrint = "UPARROW"; logicForcePrint = "UPARROW";
logicUpdate = "return function(gate) Gate.setportstate(gate, 2, Gate.getportstate(gate, 1)) end"; logicUpdate = "return function(gate) Gate.setportstate(gate, 2, Gate.getportstate(gate, 1)) end";
logicCFunction = 1;
numLogicPorts = 2; numLogicPorts = 2;
@ -47,6 +48,7 @@ datablock fxDTSBrickData(LogicGate_DiodeDown_Data : LogicGate_DiodeUp_Data)
logicForcePrint = "DOWNARROW"; logicForcePrint = "DOWNARROW";
logicUpdate = "return function(gate) Gate.setportstate(gate, 2, Gate.getportstate(gate, 1)) end"; logicUpdate = "return function(gate) Gate.setportstate(gate, 2, Gate.getportstate(gate, 1)) end";
logicCFunction = 1;
logicPortDir[0] = 4; logicPortDir[0] = 4;
logicPortDir[1] = 5; logicPortDir[1] = 5;

2
bricks/gates/verticalNOT.cs
View File

@ -13,6 +13,7 @@ datablock fxDTSBrickData(LogicGate_NotUp_Data : LogicGate_DiodeUp_Data)
logicForcePrint = "UPARROW"; logicForcePrint = "UPARROW";
logicUpdate = "return function(gate) Gate.setportstate(gate, 2, 1-Gate.getportstate(gate, 1)) end"; logicUpdate = "return function(gate) Gate.setportstate(gate, 2, 1-Gate.getportstate(gate, 1)) end";
logicCFunction = 2;
}; };
lualogic_registergatedefinition("LogicGate_NotUp_Data"); lualogic_registergatedefinition("LogicGate_NotUp_Data");
@ -28,6 +29,7 @@ datablock fxDTSBrickData(LogicGate_NotDown_Data : LogicGate_DiodeDown_Data)
logicForcePrint = "DOWNARROW"; logicForcePrint = "DOWNARROW";
logicUpdate = "return function(gate) Gate.setportstate(gate, 2, 1-Gate.getportstate(gate, 1)) end"; logicUpdate = "return function(gate) Gate.setportstate(gate, 2, 1-Gate.getportstate(gate, 1)) end";
logicCFunction = 2;
}; };
lualogic_registergatedefinition("LogicGate_NotDown_Data"); lualogic_registergatedefinition("LogicGate_NotDown_Data");

4
bricks/outputs/text2-global.lua
View File

@ -98,9 +98,9 @@ textbrick2_idxToPrint = {
[0x58] = "X", [0x58] = "X",
[0x59] = "Y", [0x59] = "Y",
[0x5A] = "Z", [0x5A] = "Z",
[0x5B] = "squarebracketright", [0x5B] = "squarebracketleft",
[0x5C] = "slashleft", [0x5C] = "slashleft",
[0x5D] = "squarebracketleft", [0x5D] = "squarebracketright",
[0x5E] = "caret", [0x5E] = "caret",
[0x5F] = "underscore", [0x5F] = "underscore",

40
bricks/special/robot.cs
View File

@ -180,26 +180,28 @@ function LogicGate_RobotController_Data::LuaLogic_Callback(%this, %brick, %data)
} else if(%first $= "P") { // plant brick } else if(%first $= "P") { // plant brick
LogicRobot_CreateBrickGroup(); LogicRobot_CreateBrickGroup();
%nbrick = new fxDTSBrick() { if(!isObject(%tbrick)) {
datablock = brick1x1fData; %nbrick = new fxDTSBrick() {
position = %pos; datablock = brick1x1fData;
colorId = getWord(%field, 1); position = %pos;
colorFxId = getWord(%field, 2); colorId = getWord(%field, 1);
shapeFxId = getWord(%field, 3); colorFxId = getWord(%field, 2);
isPlanted = 1; shapeFxId = getWord(%field, 3);
}; isPlanted = 1;
%nbrick.setTransform(%pos SPC "0 0 1 0"); };
%nbrick.setTransform(%pos SPC "0 0 1 0");
%err = %nbrick.plant();
if(%err != 0 && %err != 2 && %err != 3) {
%nbrick.delete();
} else {
%nbrick.setRaycasting(getWord(%field, 4));
%nbrick.setColliding (getWord(%field, 5));
%nbrick.setRendering (getWord(%field, 6));
BrickGroup_12345678.add(%nbrick); %err = %nbrick.plant();
%nbrick.setTrusted(1); if(%err != 0 && %err != 2 && %err != 3) {
%nbrick.delete();
} else {
%nbrick.setRaycasting(getWord(%field, 4));
%nbrick.setColliding (getWord(%field, 5));
%nbrick.setRendering (getWord(%field, 6));
BrickGroup_12345678.add(%nbrick);
%nbrick.setTrusted(1);
}
} }
} else if(%first $= "M") { // move } else if(%first $= "M") { // move
%pos = getWords(%field, 1, 3); %pos = getWords(%field, 1, 3);

6
bricks/special/rom.cs
View File

@ -27,6 +27,12 @@ package lualogic_rom_update {
parent::setRaycasting(%brick, %val); parent::setRaycasting(%brick, %val);
lualogic_rom_updatebrick(%brick); lualogic_rom_updatebrick(%brick);
} }
function fxDtsBrickData::Logic_onAdd(%data, %brick) {
parent::onAdd(%data, %brick);
if(%data.isLogicRom) {
schedule(5000, 0, lualogic_rom_updatedata, %brick);
}
}
}; };
schedule(0, 0, activatePackage, lualogic_rom_update); schedule(0, 0, activatePackage, lualogic_rom_update);

8
scripts/utilities.cs
View File

@ -27,11 +27,13 @@ function lualogic_registergatedefinition_auto(%data){
%def = %id @ ";" @ %def = %id @ ";" @
lualogic_expandescape(%data.logicUIName) @ ";" @ lualogic_expandescape(%data.logicUIName) @ ";" @
lualogic_expandescape(%data.logicUIDesc) @ ";" @ lualogic_expandescape(%data.logicUIDesc) @ ";" @
lualogic_expandescape(%data.logicInit) @ ";" @ lualogic_expandescape(%data.logicInit ) @ ";" @
lualogic_expandescape(%data.logicUpdate) @ ";" @ lualogic_expandescape(%data.logicUpdate) @ ";" @
lualogic_expandescape(%data.logicInput) @ ";" @ lualogic_expandescape(%data.logicInput ) @ ";" @
lualogic_expandescape(%data.logicGlobal) @ ";" @ lualogic_expandescape(%data.logicGlobal) @ ";" @
%numports %numports @ ";" @
(%data.logicCFunction || 0) @ ";" @
(%data.logicCDataSize || 0)
; ;
for(%i = 0; %i < %numports; %i++) for(%i = 0; %i < %numports; %i++)