From da9761d187eb8ab39dd4a3143697a61053f8732b Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Tue, 4 Jun 2024 20:27:29 -0300
Subject: [PATCH 01/13] Change appearend of the "Add frame" button.

---
 src/components/PlayerEditor.vue | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/PlayerEditor.vue b/src/components/PlayerEditor.vue
index 476b005..0ae2503 100644
--- a/src/components/PlayerEditor.vue
+++ b/src/components/PlayerEditor.vue
@@ -71,6 +71,19 @@
                     </div>
                   </v-list-item>
                 </v-list>
+                <v-btn
+                  class="add-frame-buttom"
+                  color="primary"
+                  title="Add animation frame"
+                  dark
+                  absolute
+                  right
+                  rounded
+                  @click="handleAddFrame"
+                >
+                  <v-icon>mdi-plus</v-icon>
+                  <div>Add frame</div>
+                </v-btn>
             </v-list-item-content>
           </v-list-item>
         </v-list>
@@ -78,18 +91,6 @@
     </v-card>
 
 
-    <v-btn
-      class="add-frame-buttom"
-      color="primary"
-      title="Add animation frame"
-      dark
-      absolute
-      right
-      fab
-      @click="handleAddFrame"
-    >
-      <v-icon>mdi-plus</v-icon>
-    </v-btn>
   </div>
 </template>
 <script>

From f0ed019f4bbc286dee3d43512ddfc8c572672641 Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Tue, 4 Jun 2024 20:46:38 -0300
Subject: [PATCH 02/13] Implement button for adding an animation.

---
 src/components/PlayerEditor.vue | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/PlayerEditor.vue b/src/components/PlayerEditor.vue
index 0ae2503..4b1bb0c 100644
--- a/src/components/PlayerEditor.vue
+++ b/src/components/PlayerEditor.vue
@@ -87,6 +87,19 @@
             </v-list-item-content>
           </v-list-item>
         </v-list>
+
+        <v-btn
+          color="secondary"
+          title="Add animation"
+          dark
+          absolute
+          right
+          rounded
+          @click="handleAddAnimation"
+        >
+          <v-icon>mdi-plus</v-icon>
+          <div>Add animation</div>
+        </v-btn>
       </v-card-text>
     </v-card>
 
@@ -156,7 +169,14 @@ export default defineComponent({
       instance.proxy.$forceUpdate();
     };
 
-    return {state, handleChildChange, handleAddFrame, handleDeleteFrame, props};
+    const handleAddAnimation = () => {
+      const original = state.value.animations[state.value.animations.length-1];
+      state.value.animations.push(structuredClone(original));
+      handleChildChange();
+      instance.proxy.$forceUpdate();
+    };
+
+    return {state, handleChildChange, handleAddFrame, handleDeleteFrame, handleAddAnimation, props};
   },
 });
 </script>

From dab91a211d12e7469003ac7134ab1f76a7387ed3 Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Tue, 4 Jun 2024 20:53:32 -0300
Subject: [PATCH 03/13] Add button for deleting an animation.

Starting to implement #55 and #77
---
 src/components/PlayerEditor.vue | 47 ++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/components/PlayerEditor.vue b/src/components/PlayerEditor.vue
index 4b1bb0c..d503b95 100644
--- a/src/components/PlayerEditor.vue
+++ b/src/components/PlayerEditor.vue
@@ -8,6 +8,45 @@
             <v-list-item-content>
                 <v-list-item-title>
                   <v-text-field label="Animation name" v-model="animation.name" />
+
+                  <v-menu
+                        top
+                      >
+                    <template v-slot:activator="{ on, attrs }">
+                      <v-btn
+                        color="red"
+                        title="Delete this animation"
+                        fab
+                        small
+                        absolute
+                        top
+                        right
+                        v-bind="attrs"
+                        v-on="on"
+                      >
+                        <v-icon>mdi-delete</v-icon>
+                      </v-btn>
+                    </template>
+
+                    <v-card>
+                      <v-card-title>Delete this animation?</v-card-title>
+                      <v-list>
+                        <v-list-item @click="handleDeleteAnimation(animation)">
+                          <v-list-item-icon>
+                            <v-icon>mdi-check</v-icon>
+                          </v-list-item-icon>
+                          <v-list-item-title>Yes, delete</v-list-item-title>
+                        </v-list-item>
+                        <v-list-item>
+                          <v-list-item-icon>
+                            <v-icon>mdi-cancel</v-icon>
+                          </v-list-item-icon>
+                          <v-list-item-title>No, don't delete</v-list-item-title>
+                        </v-list-item>
+                      </v-list>
+                    </v-card>
+                  </v-menu>
+
                 </v-list-item-title>
                 <v-list>
                   <v-list-item
@@ -176,7 +215,13 @@ export default defineComponent({
       instance.proxy.$forceUpdate();
     };
 
-    return {state, handleChildChange, handleAddFrame, handleDeleteFrame, handleAddAnimation, props};
+    const handleDeleteAnimation = (animation) => {
+    };
+
+    return {state, handleChildChange,
+      handleAddFrame, handleDeleteFrame,
+      handleAddAnimation, handleDeleteAnimation,
+      props};
   },
 });
 </script>

From e49e16834d146d59366a90e7261311a0e3e00bfd Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Tue, 4 Jun 2024 21:26:28 -0300
Subject: [PATCH 04/13] Fix duplicate ids.

---
 src/components/PlayerEditor.vue | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/PlayerEditor.vue b/src/components/PlayerEditor.vue
index d503b95..d9909e4 100644
--- a/src/components/PlayerEditor.vue
+++ b/src/components/PlayerEditor.vue
@@ -157,11 +157,23 @@ export default defineComponent({
   components: {PixelEditor},
   props: ['storageFactory', 'title', 'fgColor'],
   setup(props) {
+    const getMaxId = (elements) => {
+      return max(elements.map((o) => o.id))||0;
+    };
+
     const playerStorage = props.storageFactory();
     const state = computed({
       get() {
         try {
-          return processPlayerStorageDefaults(playerStorage);
+          const player = processPlayerStorageDefaults(playerStorage);
+          let nextId = getMaxId(player.animations);
+          for (const animation of player.animations) {
+            if (!animation.id) {
+              animation.id = nextId;
+              nextId++;
+            }
+          }
+          return player;
         } catch (e) {
           console.error('Error loading player 0 from local storage', e);
           return DEFAULT_SPRITES;
@@ -180,7 +192,7 @@ export default defineComponent({
     const instance = getCurrentInstance();
     const handleAddFrame = () => {
       const frames = state.value.animations[0].frames;
-      const maxId = max(frames.map((o) => o.id)) || 0;
+      const maxId = getMaxId(frames);
       const newFrame = {
         id: maxId+1,
         duration: 10,
@@ -209,8 +221,12 @@ export default defineComponent({
     };
 
     const handleAddAnimation = () => {
-      const original = state.value.animations[state.value.animations.length-1];
-      state.value.animations.push(structuredClone(original));
+      const newAnimation = structuredClone(state.value.animations[state.value.animations.length-1]);
+      state.value.animations.push({
+        ...newAnimation,
+        id: getMaxId(state.value.animations) + 1,
+      });
+
       handleChildChange();
       instance.proxy.$forceUpdate();
     };

From f3e7a6bacc442193f1c648a5075a8cebc70330f2 Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Tue, 4 Jun 2024 21:36:46 -0300
Subject: [PATCH 05/13] Implement animation deletion.

---
 src/components/PlayerEditor.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/PlayerEditor.vue b/src/components/PlayerEditor.vue
index d9909e4..10aa0c7 100644
--- a/src/components/PlayerEditor.vue
+++ b/src/components/PlayerEditor.vue
@@ -11,6 +11,7 @@
 
                   <v-menu
                         top
+                        v-if="state.animations.length > 1"
                       >
                     <template v-slot:activator="{ on, attrs }">
                       <v-btn
@@ -57,6 +58,7 @@
                     <div class="pixel-editor-container">
                       <v-menu
                         top
+                        v-if="animation.frames.length > 1"
                       >
                         <template v-slot:activator="{ on, attrs }">
                           <v-btn
@@ -232,6 +234,10 @@ export default defineComponent({
     };
 
     const handleDeleteAnimation = (animation) => {
+      state.value.animations = state.value.animations.filter(({id}) => id != animation.id);
+      console.info('Deleted ', animation);
+      handleChildChange();
+      instance.proxy.$forceUpdate();
     };
 
     return {state, handleChildChange,

From 1931139d613bf584f6d8a171e7455fd482c3aea2 Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Wed, 5 Jun 2024 19:32:31 -0300
Subject: [PATCH 06/13] Fix the "Add frame" button to apply to the correct
 animation.

It was always adding frames to the first animation.
---
 src/components/PlayerEditor.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/PlayerEditor.vue b/src/components/PlayerEditor.vue
index 10aa0c7..3936f5e 100644
--- a/src/components/PlayerEditor.vue
+++ b/src/components/PlayerEditor.vue
@@ -120,7 +120,7 @@
                   absolute
                   right
                   rounded
-                  @click="handleAddFrame"
+                  @click="handleAddFrame(animation, frame)"
                 >
                   <v-icon>mdi-plus</v-icon>
                   <div>Add frame</div>
@@ -192,8 +192,9 @@ export default defineComponent({
     };
 
     const instance = getCurrentInstance();
-    const handleAddFrame = () => {
-      const frames = state.value.animations[0].frames;
+
+    const handleAddFrame = (animation, frame) => {
+      const frames = animation.frames;
       const maxId = getMaxId(frames);
       const newFrame = {
         id: maxId+1,
@@ -209,7 +210,7 @@ export default defineComponent({
             '........'),
       };
 
-      state.value.animations[0].frames.push(newFrame);
+      animation.frames.push(newFrame);
 
       handleChildChange();
       instance.proxy.$forceUpdate();

From 68195deb7dbf30d1cec52f8d83776166a6d144d2 Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Wed, 5 Jun 2024 19:59:32 -0300
Subject: [PATCH 07/13] Refactor animation code.

---
 src/generators/bbasic.js | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/generators/bbasic.js b/src/generators/bbasic.js
index 15f63a5..e3f797c 100644
--- a/src/generators/bbasic.js
+++ b/src/generators/bbasic.js
@@ -370,19 +370,7 @@ Blockly.BBasic.generateBackgrounds = function() {
 };
 
 Blockly.BBasic.generateAnimations = function() {
-  const processAnimation = (name, playerStorage) => {
-    let playerData = null;
-    try {
-      playerData = processPlayerStorageDefaults(playerStorage);
-    } catch (e) {
-      console.error(`Failed to load ${name} data`, e);
-    }
-
-    if (!playerData) {
-      return '';
-    }
-
-    const animation = playerData.animations[0];
+  const processAnimation = (name, animation) => {
     if (!animation) {
       return '';
     }
@@ -411,8 +399,23 @@ Blockly.BBasic.generateAnimations = function() {
       `\n\n${name}animationEnd`;
   };
 
-  const player0Code = processAnimation('player0', usePlayer0Storage());
-  const player1Code = processAnimation('player1', usePlayer1Storage());
+  const processAnimations = (name, playerStorage) => {
+    let playerData = null;
+    try {
+      playerData = processPlayerStorageDefaults(playerStorage);
+    } catch (e) {
+      console.error(`Failed to load ${name} data`, e);
+    }
+
+    if (!playerData) {
+      return '';
+    }
+
+    return processAnimation(name, playerData.animations[0]);
+  };
+
+  const player0Code = processAnimations('player0', usePlayer0Storage());
+  const player1Code = processAnimations('player1', usePlayer1Storage());
   return player0Code + '\n\n\n' + player1Code;
 };
 import background from './bbasic/background';

From 827f208ebcc3db2952ccb858e4176eadad919569 Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Wed, 5 Jun 2024 20:13:14 -0300
Subject: [PATCH 08/13] Prepare animation labels.

---
 src/generators/bbasic.bb.hbs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/generators/bbasic.bb.hbs b/src/generators/bbasic.bb.hbs
index 38cdc7d..edacf2b 100644
--- a/src/generators/bbasic.bb.hbs
+++ b/src/generators/bbasic.bb.hbs
@@ -45,7 +45,9 @@ end
  dim player1size = s
  dim player0realcolor = r
  dim player1realcolor = q
- 
+ dim player0animation = p
+ dim player1animation = o
+
  newbackground = 1
 
  player0x = 75 : player0y = 75

From 38345c7b3dabe1dcc511bd03b8e2a5b1afaee27d Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Wed, 5 Jun 2024 20:13:40 -0300
Subject: [PATCH 09/13] Prepare animation labels

---
 src/generators/bbasic.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/generators/bbasic.js b/src/generators/bbasic.js
index e3f797c..781b1bf 100644
--- a/src/generators/bbasic.js
+++ b/src/generators/bbasic.js
@@ -370,33 +370,34 @@ Blockly.BBasic.generateBackgrounds = function() {
 };
 
 Blockly.BBasic.generateAnimations = function() {
-  const processAnimation = (name, animation) => {
+  const processAnimation = (name, animation, animationIndex) => {
     if (!animation) {
       return '';
     }
 
+    const animationLabel = `${name}animation${animationIndex}`;
     const totalDuration = sumBy(animation.frames, (frame) => frame.duration || 0);
 
     let frameLimit = 0;
     const stateMachine = animation.frames.map((frame, frameIndex) => {
       frameLimit += frame.duration || 0;
       const pixelSource = frame.pixels.slice().reverse().map((row) => '  %' + row.join(''));
-      const endLabel = `${name}frame${frameIndex}End`;
+      const endLabel = `${animationLabel}frame${frameIndex}End`;
       const skipCondition = `  if ${name}frame > ${frameLimit} then goto ${endLabel}\n`;
 
       return skipCondition +
         `  ${name}:\n` +
         pixelSource.join('\n') +
         '\nend\n' +
-        `  goto ${name}animationEnd\n` +
+        `  goto ${animationLabel}animationEnd\n` +
         endLabel;
     });
 
-    return `  rem Animation ${animation.name}:\n` +
+    return `  rem Animation ${animationIndex} ${animation.name} for ${name}:\n\n` +
       `  ${name}frame = ${name}frame + 1\n` +
       `  if ${name}frame = ${totalDuration} then ${name}frame = 0\n\n` +
       stateMachine.join('\n\n') +
-      `\n\n${name}animationEnd`;
+      `\n\n${animationLabel}animationEnd`;
   };
 
   const processAnimations = (name, playerStorage) => {
@@ -411,7 +412,7 @@ Blockly.BBasic.generateAnimations = function() {
       return '';
     }
 
-    return processAnimation(name, playerData.animations[0]);
+    return processAnimation(name, playerData.animations[0], 0);
   };
 
   const player0Code = processAnimations('player0', usePlayer0Storage());

From d0c9dfb571be33dcd78e998f02327d207cafd2a6 Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Wed, 5 Jun 2024 20:33:13 -0300
Subject: [PATCH 10/13] Generate code for all animations.

---
 src/generators/bbasic.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/generators/bbasic.js b/src/generators/bbasic.js
index 781b1bf..e2e34ed 100644
--- a/src/generators/bbasic.js
+++ b/src/generators/bbasic.js
@@ -412,7 +412,15 @@ Blockly.BBasic.generateAnimations = function() {
       return '';
     }
 
-    return processAnimation(name, playerData.animations[0], 0);
+    const animationsLabel = `${name}animations`;
+    const animationsEndLabel = `\n\n${animationsLabel}End`;
+
+    return `  rem Animations for ${name}:` +
+      playerData.animations.map((animation, animationIndex) => {
+        debugger;
+        return processAnimation(name, animation, animationIndex) + `\n  rem aaaaa`;
+      }).join('\n\n') +
+      `\n\n${animationsEndLabel}`;
   };
 
   const player0Code = processAnimations('player0', usePlayer0Storage());

From 15f2010fb3234f1120bb61d8f7d9049db06d8125 Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Wed, 5 Jun 2024 20:50:49 -0300
Subject: [PATCH 11/13] Implement code for jumping into the correct animation.

---
 src/generators/bbasic.bb.hbs |  1 +
 src/generators/bbasic.js     | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/generators/bbasic.bb.hbs b/src/generators/bbasic.bb.hbs
index edacf2b..00db0d5 100644
--- a/src/generators/bbasic.bb.hbs
+++ b/src/generators/bbasic.bb.hbs
@@ -60,6 +60,7 @@ end
  player0size = $30
  COLUBK = $C4
  COLUPF = $0E
+ player0animation = 1
 
  rem **************************************************************************
  rem Main loop: 
diff --git a/src/generators/bbasic.js b/src/generators/bbasic.js
index e2e34ed..d6bed24 100644
--- a/src/generators/bbasic.js
+++ b/src/generators/bbasic.js
@@ -413,12 +413,19 @@ Blockly.BBasic.generateAnimations = function() {
     }
 
     const animationsLabel = `${name}animations`;
-    const animationsEndLabel = `\n\n${animationsLabel}End`;
+    const animationsEndLabel = `${animationsLabel}End`;
+    const getAnimationStartLabel = (animationIndex) => `${name}animation${animationIndex}Start`;
 
-    return `  rem Animations for ${name}:` +
+    return `  rem Animations for ${name}:\n` +
       playerData.animations.map((animation, animationIndex) => {
-        debugger;
-        return processAnimation(name, animation, animationIndex) + `\n  rem aaaaa`;
+        if (!animationIndex) return '';
+        return `  if ${name}animation = ${animationIndex} then goto ${getAnimationStartLabel(animationIndex)}`;
+      }).join('\n') +
+      '\n\n' +
+      playerData.animations.map((animation, animationIndex) => {
+        return `${getAnimationStartLabel(animationIndex)}\n\n` +
+          processAnimation(name, animation, animationIndex) +
+          `\n  goto ${animationsEndLabel}`;
       }).join('\n\n') +
       `\n\n${animationsEndLabel}`;
   };

From 9fee7fe6a65196e47b6a07d02a556758fe1dceac Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Wed, 5 Jun 2024 20:58:58 -0300
Subject: [PATCH 12/13] Create block for setting which animation to use.

---
 src/blocks/icon.js    | 1 +
 src/blocks/sprites.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/blocks/icon.js b/src/blocks/icon.js
index 2b6c1ce..263b989 100644
--- a/src/blocks/icon.js
+++ b/src/blocks/icon.js
@@ -10,3 +10,4 @@ export const SCORE_ICON = String.fromCodePoint(0x1F4AF);
 export const BACKGROUND_ICON = String.fromCodePoint(0x1F304);
 export const DICE_ICON = String.fromCodePoint(0x1F3B2);
 export const SOUND_ICON = String.fromCodePoint(0x1F509);
+export const ANIMATION_ICON = String.fromCodePoint(0x1F3AC);
diff --git a/src/blocks/sprites.js b/src/blocks/sprites.js
index 408a98c..30e08de 100644
--- a/src/blocks/sprites.js
+++ b/src/blocks/sprites.js
@@ -1,11 +1,12 @@
 import * as Blockly from 'blockly/core';
 
-import {PLAYER_ICON, MISSILE_ICON, BALL_ICON, COLOR_ICON, HEIGHT_ICON} from './icon';
+import {PLAYER_ICON, MISSILE_ICON, BALL_ICON, COLOR_ICON, HEIGHT_ICON, ANIMATION_ICON} from './icon';
 
 const buildPlayerOptions = (name) => [
   ['\u2195 X', `${name}x`],
   ['\u2195 Y', `${name}y`],
   [COLOR_ICON + ' Color', `${name}realcolor`],
+  [ANIMATION_ICON + ' Animation', `${name}animation`],
 ];
 
 const buildMissileOptions = (name) => [

From 84c13286a7e83ed852a3a0df33e86e97b55b62ae Mon Sep 17 00:00:00 2001
From: Haroldo de Oliveira Pinheiro <haroldo@atsinformatica.com.br>
Date: Wed, 5 Jun 2024 21:03:40 -0300
Subject: [PATCH 13/13] Bump version to 0.19.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 89290b1..6141431 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vcs-game-maker",
-  "version": "0.18.1",
+  "version": "0.19.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",