Merge remote-tracking branch 'origin/main'

2025-09-22 11:26:43 +02:00
parent bf9ae5f01f 83fad59878
commit f27a1df90f
789 changed files with 14011 additions and 16477 deletions
@@ -31,7 +31,13 @@ export enum ConsequenceType {
    MOVE_BACKWARD = 1,
    LOSE_TURN = 2,
    EXTRA_TURN = 3,
+<<<<<<< HEAD
    GO_TO_START = 5
+=======
+    SWAP_POSITION = 4,
+    GO_TO_START = 5,
+    TURN_AGAIN = 6
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 }

 export interface Consequence {