Merge branch 'develop' of github.com:greilberger13/Catblocks into BLO…

…CKS-332
Catrobat · Oct 9, 2023 · 8ecc3a2 · 8ecc3a2
2 parents 2923e59 + 7fba120
commit 8ecc3a2
Show file tree

Hide file tree

Showing 44 changed files with 1,513 additions and 1,428 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -39,12 +39,12 @@
             "internalConsoleOptions": "neverOpen"
         },
         {
+            "name": "Launch Chromium",
             "type": "chrome",
             "request": "launch",
-            "name": "Launch Chromium Ubuntu (http://localhost:8080)",
-            "url": "http://localhost:8080",
+            "cwd": "${workspaceFolder}",
             "webRoot": "${workspaceFolder}",
-            "runtimeExecutable": "/snap/bin/chromium"
+            "url": "http://localhost:8080"
         }
     ]
 }
diff --git a/i18n/catroid_strings/values-en/strings.xml b/i18n/catroid_strings/values-en/strings.xml
@@ -1911,6 +1911,8 @@ needs read and write access to it. You can always change permissions through you
     <string name="formula_editor_sensor_gamepad_down_pressed">gamepad down pressed</string>
     <string name="formula_editor_sensor_gamepad_left_pressed">gamepad left pressed</string>
     <string name="formula_editor_sensor_gamepad_right_pressed">gamepad right pressed</string>
+    <string name="formula_editor_sensor_stage_width">stage width</string>
+    <string name="formula_editor_sensor_stage_height">stage height</string>
     <string name="formula_editor_phiro_sensor_front_left">phiro front left sensor</string>
     <string name="formula_editor_phiro_sensor_front_right">phiro front right sensor</string>
     <string name="formula_editor_phiro_sensor_side_left">phiro side left sensor</string>
@@ -2176,7 +2178,7 @@ needs read and write access to it. You can always change permissions through you
 
     <string name="deletion_alert_title">Delete?</string>
     <string name="deletion_alert_text">Deleting a variable or list that is still in use can cause
-        errors.</string>
+        errors. You can\'t undo this!</string>
 
     <!-- Upload progress dialog -->
     <string name="progress_upload_dialog_message">Your project gets uploaded to the app\’s sharing site where others
@@ -2268,10 +2270,4 @@ needs read and write access to it. You can always change permissions through you
     <string name="undo_sort">Undo sort</string>
     <string name="sort">Sort</string>
     <string name="checkbox">checkbox</string>
-
-    <string name="datalist_undo_rename_duplicate">Cannot undo renaming of variable %1$s. It
-    appears another variable has the same name.</string>
-    <string name="datalist_undo_delete_duplicate">You can no longer restore variable %1$s</string>
-
-
 </resources>
diff --git a/i18n/strings_to_json_mapping.json b/i18n/strings_to_json_mapping.json
@@ -299,9 +299,9 @@
   "LEGOEV3_MOTORSTOP": "${ev3_motor_stop} %1%2",
   "LEGOEV3_PLAYTONE": "${ev3_play_tone} ${ev3_tone_duration_for} %1%2 ${second_plural.one} ${nxt_tone_frequency} %3%4 ${nxt_tone_hundred_hz} ${ev3_tone_volume} %5%6 ${ev3_tone_percent}",
   "LEGOEV3_SETLED": "${ev3_set_led_status} %1%2",
-  "MOTOR_LEFT": "${phiro_motor_left}",
-  "MOTOR_RIGHT": "${phiro_motor_right}",
-  "MOTOR_BOTH": "${phiro_motor_both}",
+  "PHIRO_MOTOR_LEFT": "${phiro_motor_left}",
+  "PHIRO_MOTOR_RIGHT": "${phiro_motor_right}",
+  "PHIRO_MOTOR_BOTH": "${phiro_motor_both}",
   "DRONE_TAKEOFFLAND": "${brick_drone_takeoff_land}",
   "DRONE_EMERGENCY": "${brick_drone_emergency}",
   "DRONE_MOVEUP": "${brick_drone_move_up} %1%2 ${second_plural.one} ${brick_drone_with.} %3%4 ${ev3_tone_percent} ${brick_drone_power}",
@@ -444,6 +444,12 @@
   "EV3_SENSOR_2": "${formula_editor_sensor_lego_ev3_2}",
   "EV3_SENSOR_3": "${formula_editor_sensor_lego_ev3_3}",
   "EV3_SENSOR_4": "${formula_editor_sensor_lego_ev3_4}",
+  "EV3_MOTOR_A": "${ev3_motor_a}",
+  "EV3_MOTOR_B": "${ev3_motor_b}",
+  "EV3_MOTOR_C": "${ev3_motor_c}",
+  "EV3_MOTOR_D": "${ev3_motor_d}",
+  "EV3_MOTOR_MOTOR_B_C": "${ev3_motor_b_anc_d}",
+  "EV3_MOTOR_ALL_MOTORS": "${ev3_motor_all}",
   "COLOR_AT_XY": "${formula_editor_sensor_color_at_x_y}",
   "COLOR_TOUCHES_COLOR": "${formula_editor_function_color_touches_color}",
   "COLOR_EQUALS_COLOR": "${formula_editor_sensor_color_equals_color}",
@@ -493,14 +499,14 @@
   "ALIGNMENTS_0": "${brick_show_variable_aligned_left}",
   "ALIGNMENTS_1": "${brick_show_variable_aligned_centered}",
   "ALIGNMENTS_2": "${brick_show_variable_aligned_right}",
-  "SPINNER_0": "${brick_stop_this_script}",
-  "SPINNER_1": "${brick_stop_all_scripts}",
-  "SPINNER_2": "${brick_stop_other_scripts}",
+  "STOP_SCRIPT_0": "${brick_stop_this_script}",
+  "STOP_SCRIPT_1": "${brick_stop_all_scripts}",
+  "STOP_SCRIPT_2": "${brick_stop_other_scripts}",
   "SPEECH_RECOGNITION_LANGUAGE": "${preference_title_ai_speech_recognition}",
-  "CAMSPINNER_0": "${video_brick_camera_off}",
-  "CAMSPINNER_1": "${video_brick_camera_on}",
-  "CAMCHOOSESPINNER_0": "${choose_camera_back}",
-  "CAMCHOOSESPINNER_1": "${choose_camera_front}",
+  "CAMSPINNER_FALSE": "${video_brick_camera_off}",
+  "CAMSPINNER_TRUE": "${video_brick_camera_on}",
+  "CAMCHOOSESPINNER_FALSE": "${choose_camera_back}",
+  "CAMCHOOSESPINNER_TRUE": "${choose_camera_front}",
   "FLASHSPINNER_0": "${brick_flash_off}",
   "FLASHSPINNER_1": "${brick_flash_on}",
   "FADESPINNER_0": "${particle_effects_fade_in}",
@@ -564,27 +570,27 @@
   "CLOSE": "${close}",
   "SHOW_VARIABLE": "${brick_show_variable}",
   "SWITCH_TO_1D": "${switch_to_1d}",
-  "GO_TO_TOUCH_POSITION": "${brick_go_to_touch_position}",
-  "GO_TO_RANDOM_POSITION": "${brick_go_to_random_position}",
-  "MOTOR_A": "${nxt_motor_a}",
-  "MOTOR_B": "${nxt_motor_b}",
-  "MOTOR_C": "${nxt_motor_c}",
-  "MOTOR_B_C": "${nxt_motor_b_and_c}",
-  "MOTOR_D": "${ev3_motor_d}",
-  "LED_OFF": "${ev3_led_status_off}",
-  "LED_GREEN": "${ev3_led_status_green}",
-  "LED_RED": "${ev3_led_status_red}",
-  "LED_ORANGE": "${ev3_led_status_orange}",
-  "LED_GREEN_FLASHING": "${ev3_led_status_green_flashing}",
-  "LED_RED_FLASHING": "${ev3_led_status_red_flashing}",
-  "LED_ORANGE_FLASHING": "${ev3_led_status_orange_flashing}",
-  "LED_GREEN_PULSE": "${ev3_led_status_green_pulse}",
-  "LED_RED_PULSE": "${ev3_led_status_red_pulse}",
-  "LED_ORANGE_PULSE": "${ev3_led_status_orange_pulse}", 
-  "DEFAULT": "${sound_default}",
-  "MONSTER": "${sound_monster}",
-  "INSECT": "${sound_insect}", 
-  "ROBOT": "${sound_robot}",
+  "GO_TO_POSITION_80": "${brick_go_to_touch_position}",
+  "GO_TO_POSITION_81": "${brick_go_to_random_position}",
+  "NXT_MOTOR_A": "${nxt_motor_a}",
+  "NXT_MOTOR_B": "${nxt_motor_b}",
+  "NXT_MOTOR_C": "${nxt_motor_c}",
+  "NXT_MOTOR_B_C": "${nxt_motor_b_and_c}",
+  "NXT_ALL_MOTORS": "${nxt_motor_all}",
+  "EV3_LED_OFF": "${ev3_led_status_off}",
+  "EV3_LED_GREEN": "${ev3_led_status_green}",
+  "EV3_LED_RED": "${ev3_led_status_red}",
+  "EV3_LED_ORANGE": "${ev3_led_status_orange}",
+  "EV3_LED_GREEN_FLASHING": "${ev3_led_status_green_flashing}",
+  "EV3_LED_RED_FLASHING": "${ev3_led_status_red_flashing}",
+  "EV3_LED_ORANGE_FLASHING": "${ev3_led_status_orange_flashing}",
+  "EV3_LED_GREEN_PULSE": "${ev3_led_status_green_pulse}",
+  "EV3_LED_RED_PULSE": "${ev3_led_status_red_pulse}",
+  "EV3_LED_ORANGE_PULSE": "${ev3_led_status_orange_pulse}", 
+  "JUMPING_SUMO_SOUND_DEFAULT": "${sound_default}",
+  "JUMPING_SUMO_SOUND_MONSTER": "${sound_monster}",
+  "JUMPING_SUMO_SOUND_INSECT": "${sound_insect}", 
+  "JUMPING_SUMO_SOUND_ROBOT": "${sound_robot}",
   "SECONDS_PLURAL": "${second_plural.other}",
   "STEPS_PLURAL": "${brick_move_n_step_plural.other}",
   "LAYERS_PLURAL": "${brick_go_back_layer_plural.other}",
@@ -610,5 +616,45 @@
   "PHIRO_TONE_FA": "${phiro_tone_fa}",
   "PHIRO_TONE_SO": "${phiro_tone_so}",
   "PHIRO_TONE_LA": "${phiro_tone_la}",
-  "PHIRO_TONE_TI": "${phiro_tone_ti}"
+  "PHIRO_TONE_TI": "${phiro_tone_ti}",
+  "INSTRUMENT_ELECTRIC_PIANO": "${electric_piano}",
+  "INSTRUMENT_PIANO": "${piano}",
+  "INSTRUMENT_CELLO": "${cello}",
+  "INSTRUMENT_FLUTE": "${flute}",
+  "INSTRUMENT_VIBRAPHONE": "${vibraphone}",
+  "INSTRUMENT_ORGAN": "${organ}",
+  "INSTRUMENT_GUITAR": "${guitar}",
+  "INSTRUMENT_ELECTRIC_GUITAR": "${electric_guitar}",
+  "INSTRUMENT_BASS": "${bass}",
+  "INSTRUMENT_PIZZICATO": "${pizzicato}",
+  "INSTRUMENT_SYNTH_PAD": "${synth_pad}",
+  "INSTRUMENT_CHOIR": "${choir}",
+  "INSTRUMENT_SYNTH_LEAD": "${synth_lead}",
+  "INSTRUMENT_WOODEN_FLUTE": "${wooden_flute}",
+  "INSTRUMENT_TROMBONE": "${trombone}",
+  "INSTRUMENT_SAXOPHONE": "${saxophone}",
+  "INSTRUMENT_BASSOON": "${bassoon}",
+  "INSTRUMENT_CLARINET": "${clarinet}",
+  "INSTRUMENT_MUSIC_BOX": "${music_box}",
+  "INSTRUMENT_STEEL_DRUM": "${steel_drum}",
+  "INSTRUMENT_MARIMBA": "${marimba}",
+  "DRUM_SNARE_DRUM": "${snare_drum}",
+  "DRUM_BASS_DRUM": "${bass_drum}",
+  "DRUM_SIDE_STICK": "${side_stick}",
+  "DRUM_CRASH_CYMBAL": "${crash_cymbal}",
+  "DRUM_OPEN_HI_HAT": "${open_hi_hat}",
+  "DRUM_CLOSED_HI_HAT": "${closed_hi_hat}",
+  "DRUM_TAMBOURINE": "${tambourine}",
+  "DRUM_HAND_CLAP": "${hand_clap}",
+  "DRUM_CLAVES": "${claves}",
+  "DRUM_WOOD_BLOCK": "${wood_block}",
+  "DRUM_COWBELL": "${cowbell}",
+  "DRUM_TRIANGLE": "${triangle}",
+  "DRUM_BONGO": "${bongo}",
+  "DRUM_CONGA": "${conga}",
+  "DRUM_CABASA": "${cabasa}",
+  "DRUM_GUIRO": "${guiro}",
+  "DRUM_VIBRASLAP": "${vibraslap}",
+  "DRUM_OPEN_CUICA": "${open_cuica}",
+  "WHEN_BOUNCE_OFF_ANYTHING": "${collision_with_anything}"
 }
diff --git a/src/common/js/parser/formula.js b/src/common/js/parser/formula.js