Skip to content

Commit 1de3ac5

Browse files
RedMan13RedMan13
committed
Merge branch 'develop' of https://github.com/PenguinMod/penguinmod.github.io into develop
2 parents 7f81a8f + ba06009 commit 1de3ac5

File tree

13 files changed

+1768
-271
lines changed

13 files changed

+1768
-271
lines changed

‎.github/workflows/node.js.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install dependencies and build site
3030
run: npm i -g pnpm@v6 && pnpm up && pnpm i --shamefully-hoist --force && NODE_ENV=production webpack --bail
3131
- name: Upload artifact
32-
uses: actions/upload-pages-artifact@v1
32+
uses: actions/upload-pages-artifact@v3
3333
with:
3434
path: ./build/
3535

@@ -42,4 +42,4 @@ jobs:
4242
steps:
4343
- name: Deploy to GitHub Pages
4444
id: deployment
45-
uses: actions/deploy-pages@v1
45+
uses: actions/deploy-pages@v4

‎src/addons/addons-l10n/en.json

+7
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
"block-switching/control_if": "if",
157157
"block-switching/control_if_else": "if... else",
158158
"block-switching/control_repeat_until": "repeat until",
159+
"block-switching/control_while": "while",
159160
"block-switching/control_wait_until": "wait until",
160161
"block-switching/data_changevariableby": "change variable",
161162
"block-switching/data_deletealloflist": "delete all",
@@ -204,12 +205,18 @@
204205
"block-switching/operator_and": "and",
205206
"block-switching/operator_divide": "/",
206207
"block-switching/operator_equals": "=",
208+
"block-switching/operator_notequal": "≠",
207209
"block-switching/operator_gt": ">",
208210
"block-switching/operator_lt": "<",
211+
"block-switching/operator_gtorequal": "≥",
212+
"block-switching/operator_ltorequal": "≤",
209213
"block-switching/operator_mod": "mod",
210214
"block-switching/operator_multiply": "*",
211215
"block-switching/operator_or": "or",
212216
"block-switching/operator_subtract": "-",
217+
"block-switching/operator_trueBoolean": "true",
218+
"block-switching/operator_falseBoolean": "false",
219+
"block-switching/operator_power": "^",
213220
"block-switching/pen_changePenColorParamBy": "change parameter",
214221
"block-switching/pen_changePenHueBy": "change hue",
215222
"block-switching/pen_changePenShadeBy": "change shade",

‎src/addons/addons/block-switching/userscript.js

+145-2
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,9 @@ export default async function ({ addon, console, msg }) {
384384
];
385385
blockSwitches["control_repeat_until"] = [
386386
noopSwitch,
387+
{
388+
opcode: "control_while",
389+
},
387390
{
388391
opcode: "control_wait_until",
389392
splitInputs: ["SUBSTACK"],
@@ -397,6 +400,9 @@ export default async function ({ addon, console, msg }) {
397400
{
398401
opcode: "control_repeat_until",
399402
},
403+
{
404+
opcode: "control_while",
405+
},
400406
noopSwitch,
401407
];
402408
blockSwitches["control_wait_until"] = [
@@ -405,35 +411,127 @@ export default async function ({ addon, console, msg }) {
405411
},
406412
noopSwitch,
407413
];
414+
415+
blockSwitches["control_while"] = [
416+
{
417+
opcode: "control_repeat_until",
418+
},
419+
noopSwitch,
420+
{
421+
opcode: "control_forever",
422+
splitInputs: ["CONDITION"],
423+
},
424+
];
408425
}
409426

410427
if (addon.settings.get("operator")) {
411428
blockSwitches["operator_equals"] = [
412429
{
413430
opcode: "operator_gt",
414431
},
415-
noopSwitch,
432+
{
433+
opcode: "operator_gtorequal",
434+
},
416435
{
417436
opcode: "operator_lt",
418437
},
438+
{
439+
opcode: "operator_ltorequal",
440+
},
441+
noopSwitch,
442+
{
443+
opcode: "operator_notequal",
444+
},
419445
];
420446
blockSwitches["operator_gt"] = [
421447
noopSwitch,
422448
{
423-
opcode: "operator_equals",
449+
opcode: "operator_gtorequal",
424450
},
425451
{
426452
opcode: "operator_lt",
427453
},
454+
{
455+
opcode: "operator_ltorequal",
456+
},
457+
{
458+
opcode: "operator_equals",
459+
},
460+
{
461+
opcode: "operator_notequal",
462+
},
428463
];
429464
blockSwitches["operator_lt"] = [
430465
{
431466
opcode: "operator_gt",
432467
},
468+
{
469+
opcode: "operator_gtorequal",
470+
},
471+
noopSwitch,
472+
{
473+
opcode: "operator_ltorequal",
474+
},
475+
{
476+
opcode: "operator_equals",
477+
},
478+
{
479+
opcode: "operator_notequal",
480+
},
481+
];
482+
blockSwitches["operator_notequal"] = [
483+
{
484+
opcode: "operator_gt",
485+
},
486+
{
487+
opcode: "operator_gtorequal",
488+
},
489+
{
490+
opcode: "operator_lt",
491+
},
492+
{
493+
opcode: "operator_ltorequal",
494+
},
495+
{
496+
opcode: "operator_equals",
497+
},
498+
noopSwitch,
499+
];
500+
blockSwitches["operator_gtorequal"] = [
501+
{
502+
opcode: "operator_gt",
503+
},
504+
noopSwitch,
505+
{
506+
opcode: "operator_lt",
507+
},
508+
{
509+
opcode: "operator_ltorequal",
510+
},
433511
{
434512
opcode: "operator_equals",
435513
},
514+
{
515+
opcode: "operator_notequal",
516+
},
517+
];
518+
blockSwitches["operator_ltorequal"] = [
519+
{
520+
opcode: "operator_gt",
521+
},
522+
{
523+
opcode: "operator_gtorequal",
524+
},
525+
{
526+
opcode: "operator_lt",
527+
},
436528
noopSwitch,
529+
{
530+
opcode: "operator_equals",
531+
},
532+
{
533+
opcode: "operator_notequal",
534+
},
437535
];
438536
blockSwitches["operator_add"] = [
439537
noopSwitch,
@@ -446,6 +544,9 @@ export default async function ({ addon, console, msg }) {
446544
{
447545
opcode: "operator_divide",
448546
},
547+
{
548+
opcode: "operator_power",
549+
},
449550
{
450551
opcode: "operator_mod",
451552
},
@@ -461,6 +562,9 @@ export default async function ({ addon, console, msg }) {
461562
{
462563
opcode: "operator_divide",
463564
},
565+
{
566+
opcode: "operator_power",
567+
},
464568
{
465569
opcode: "operator_mod",
466570
},
@@ -476,6 +580,9 @@ export default async function ({ addon, console, msg }) {
476580
{
477581
opcode: "operator_divide",
478582
},
583+
{
584+
opcode: "operator_power",
585+
},
479586
{
480587
opcode: "operator_mod",
481588
},
@@ -491,6 +598,27 @@ export default async function ({ addon, console, msg }) {
491598
opcode: "operator_multiply",
492599
},
493600
noopSwitch,
601+
{
602+
opcode: "operator_power",
603+
},
604+
{
605+
opcode: "operator_mod",
606+
},
607+
];
608+
blockSwitches["operator_power"] = [
609+
{
610+
opcode: "operator_add",
611+
},
612+
{
613+
opcode: "operator_subtract",
614+
},
615+
{
616+
opcode: "operator_multiply",
617+
},
618+
{
619+
opcode: "operator_divide",
620+
},
621+
noopSwitch,
494622
{
495623
opcode: "operator_mod",
496624
},
@@ -508,6 +636,9 @@ export default async function ({ addon, console, msg }) {
508636
{
509637
opcode: "operator_divide",
510638
},
639+
{
640+
opcode: "operator_power",
641+
},
511642
noopSwitch,
512643
];
513644
blockSwitches["operator_and"] = [
@@ -522,6 +653,18 @@ export default async function ({ addon, console, msg }) {
522653
},
523654
noopSwitch,
524655
];
656+
blockSwitches["operator_trueBoolean"] = [
657+
noopSwitch,
658+
{
659+
opcode: "operator_falseBoolean",
660+
},
661+
];
662+
blockSwitches["operator_falseBoolean"] = [
663+
{
664+
opcode: "operator_trueBoolean",
665+
},
666+
noopSwitch,
667+
];
525668
}
526669

527670
if (addon.settings.get("sensing")) {

‎src/addons/addons/custom-block-shape/userscript.js

+37-62
Original file line numberDiff line numberDiff line change
@@ -45,70 +45,45 @@ export default async function ({ addon, console }) {
4545
BlockSvg.NOTCH_HEIGHT = 2 * GRID_UNIT * multiplier * notchSize;
4646
BlockSvg.NOTCH_START_PADDING = 3 * GRID_UNIT; //* multiplier
4747
BlockSvg.ICON_SEPARATOR_HEIGHT = 10 * GRID_UNIT * multiplier;
48+
4849
BlockSvg.NOTCH_PATH_LEFT =
49-
"c 2,0 3," +
50-
1 * notchSize +
51-
" 4," +
52-
2 * notchSize +
53-
" l " +
54-
4 * multiplier * notchSize +
55-
"," +
56-
4 * multiplier * notchSize +
57-
" c 1," +
58-
1 * notchSize +
59-
" 2," +
60-
2 * notchSize +
61-
" 4," +
62-
2 * notchSize +
63-
" h " +
64-
24 * (multiplier - 0.5) +
65-
" c 2,0 3,-" +
66-
1 * notchSize +
67-
" 4,-" +
68-
2 * notchSize +
69-
" l " +
70-
4 * multiplier * notchSize +
71-
"," +
72-
-4 * multiplier * notchSize +
73-
"c 1,-" +
74-
1 * notchSize +
75-
" 2,-" +
76-
2 * notchSize +
77-
" 4,-" +
78-
2 * notchSize;
50+
`c 2 0 3 ${1 * notchSize} 4 ${2 * notchSize} ` +
51+
`l ${4 * multiplier * notchSize} ${4 * multiplier * notchSize} ` +
52+
`c 1 ${1 * notchSize} 2 ${2 * notchSize} 4 ${2 * notchSize} ` +
53+
`h ${24 * (multiplier - 0.5)} ` +
54+
`c 2 0 3 ${-1 * notchSize} 4 ${-2 * notchSize} ` +
55+
`l ${4 * multiplier * notchSize} ${-4 * multiplier * notchSize} ` +
56+
`c 1 ${-1 * notchSize} 2 ${-2 * notchSize} 4 ${-2 * notchSize} `
7957
BlockSvg.NOTCH_PATH_RIGHT =
80-
"h " +
81-
(-4 * (cornerSize - 1) - 5 * (1 - notchSize)) +
82-
"c -2,0 -3," +
83-
1 * notchSize +
84-
" -4," +
85-
2 * notchSize +
86-
" l " +
87-
-4 * multiplier * notchSize +
88-
"," +
89-
4 * multiplier * notchSize +
90-
" c -1," +
91-
1 * notchSize +
92-
" -2," +
93-
2 * notchSize +
94-
" -4," +
95-
2 * notchSize +
96-
" h " +
97-
-24 * (multiplier - 0.5) +
98-
" c -2,0 -3,-" +
99-
1 * notchSize +
100-
" -4,-" +
101-
2 * notchSize +
102-
" l " +
103-
-4 * multiplier * notchSize +
104-
"," +
105-
-4 * multiplier * notchSize +
106-
"c -1,-" +
107-
1 * notchSize +
108-
" -2,-" +
109-
2 * notchSize +
110-
" -4,-" +
111-
2 * notchSize;
58+
`h ${(-4 * (cornerSize - 1) - 5 * (1 - notchSize))} ` +
59+
`c -2 0 -3 ${1 * notchSize} -4 ${2 * notchSize} ` +
60+
`l ${-4 * multiplier * notchSize} ${4 * multiplier * notchSize} ` +
61+
`c -1 ${1 * notchSize} -2 ${2 * notchSize} -4 ${2 * notchSize} ` +
62+
`h ${-24 * (multiplier - 0.5)} ` +
63+
`c -2 0 -3 ${-1 * notchSize} -4 ${-2 * notchSize} ` +
64+
`l ${-4 * multiplier * notchSize} ${-4 * multiplier * notchSize} ` +
65+
`c -1 ${-1 * notchSize} -2 ${-2 * notchSize} -4 ${-2 * notchSize} `
66+
67+
BlockSvg.NOTCH_SWITCH_PATH_LEFT =
68+
`c 2 0 3 ${1 * notchSize} 4 ${2 * notchSize} ` +
69+
`l ${4 * multiplier * notchSize} ${4 * multiplier * notchSize} ` +
70+
`c 1 ${1 * notchSize} 2 ${2 * notchSize} 4 ${2 * notchSize} ` +
71+
`c ${4 * (multiplier - 0.5)} 0 ${8 * (multiplier - 0.5)} ${-8 * (multiplier - 0.5) * notchSize} ${12 * (multiplier - 0.5)} ${-8 * (multiplier - 0.5) * notchSize} ` +
72+
`c ${4 * (multiplier - 0.5)} 0 ${8 * (multiplier - 0.5)} ${8 * (multiplier - 0.5) * notchSize} ${12 * (multiplier - 0.5)} ${8 * (multiplier - 0.5) * notchSize} ` +
73+
`c 2 0 3 ${-1 * notchSize} 4 ${-2 * notchSize} ` +
74+
`l ${4 * multiplier * notchSize} ${-4 * multiplier * notchSize} ` +
75+
`c 1 ${-1 * notchSize} 2 ${-2 * notchSize} 4 ${-2 * notchSize} `
76+
BlockSvg.NOTCH_SWITCH_PATH_RIGHT =
77+
`h ${(-4 * (cornerSize - 1) - 5 * (1 - notchSize))} ` +
78+
`c -2 0 -3 ${1 * notchSize} -4 ${2 * notchSize} ` +
79+
`l ${-4 * multiplier * notchSize} ${4 * multiplier * notchSize} ` +
80+
`c -1 ${1 * notchSize} -2 ${2 * notchSize} -4 ${2 * notchSize} ` +
81+
`c ${-4 * (multiplier - 0.5)} 0 ${-8 * (multiplier - 0.5)} ${-8 * (multiplier - 0.5) * notchSize} ${-12 * (multiplier - 0.5)} ${-8 * (multiplier - 0.5) * notchSize} ` +
82+
`c ${-4 * (multiplier - 0.5)} 0 ${-8 * (multiplier - 0.5)} ${8 * (multiplier - 0.5) * notchSize} ${-12 * (multiplier - 0.5)} ${8 * (multiplier - 0.5) * notchSize} ` +
83+
`c -2 0 -3 ${-1 * notchSize} -4 ${-2 * notchSize} ` +
84+
`l ${-4 * multiplier * notchSize} ${-4 * multiplier * notchSize} ` +
85+
`c -1 ${-1 * notchSize} -2 ${-2 * notchSize} -4 ${-2 * notchSize} `
86+
11287
BlockSvg.INPUT_SHAPE_HEXAGONAL =
11388
"M " +
11489
4 * GRID_UNIT * multiplier +

‎src/containers/home-communication.jsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class HomeCommunication extends React.Component {
5151
}
5252
if (!data.type) return;
5353
if (!data.packet) return;
54-
console.log(data);
55-
54+
5655
switch (data.type) {
5756
case 'login': {
5857
if (data.packet.loggedIn !== true) return;

0 commit comments

Comments
 (0)