Skip to content

introduced if statements - #184

Merged
ItzMassel merged 5 commits into
mainfrom
worktree-if-statements
Oct 20, 2026
Merged

ItzMassel merged 5 commits into
mainfrom
worktree-if-statements

Conversation

@ItzMassel

Copy link
Copy Markdown
Owner

No description provided.

Copilot AI balanced review requested due to automatic review settings October 19, 2026 19:21

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@ItzMassel ItzMassel changed the title introduced it statements introduced if statements Oct 19, 2026
ItzMassel and others added 4 commits October 20, 2026 17:50
# Conflicts:
#	.claude/launch.json
#	client/src/app/[locale]/editor/[projectId]/piece-editor/[id]/logic/PageClient.tsx
…nflicts

main replaced the hand-rolled piece logic canvas with a schema-driven
Blockly editor (PR #186); the old dnd-kit if-block implementation was
dropped by the merge. Re-added 'if' as a schema entry plus two custom
THEN/ELSE statement inputs, with a readIfBranches() helper feeding
thenChildId/elseChildId into the serialized logic JSON. The square
editor's if-block (native Blockly already) and the shared engine
changes (LogicRunner/SquareLogicRunner) merged in cleanly, unaffected.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
# Conflicts:
#	client/src/engine/logic/LogicRunner.ts
initPieceBlock() already prepends the block type name as the leading
field label ("if"), so giving the 'left' socket its own label: 'if'
duplicated it, rendering "if if <value> <op> <value>".

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@ItzMassel
ItzMassel merged commit d460ed4 into main Oct 20, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants