improvements: strings won't glitch, poop indicator is orange, autosav…

…es are every 8 mutations
delanni · Jul 23, 2024 · 4ab39c4 · 4ab39c4
1 parent de2bbe3
commit 4ab39c4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 27 deletions.
diff --git a/amakit.js b/amakit.js
@@ -16,20 +16,23 @@ class Amakit {
     constructor() {
         this.table = "hydralisk-drafts";
         this.AWS = window.AWS;
-        this.AWS.config.update({ region: 'eu-west-1' });
-        this.docClient = new this.AWS.DynamoDB.DocumentClient({
-            apiVersion: '2012-08-10',
-            region: 'eu-west-1'
-        });
+        if (this.AWS) {
+            this.AWS.config.update({ region: 'eu-west-1' });
+            this.docClient = new this.AWS.DynamoDB.DocumentClient({
+                apiVersion: '2012-08-10',
+                region: 'eu-west-1'
+            });
+        }
     }
 
-    loadDrafts = () => {
-        return this.getAllDrafts().then((drafts) => {
+    loadDrafts = async () => {
+        try {
+            const drafts = await this.getAllDrafts();
             this.draftCache = drafts;
             return drafts;
-        }).catch((err) => {
+        } catch (err) {
             console.error("Error loading drafts: ", err);
-        });
+        }
     }
 
     getCredentials = () => {

diff --git a/bundle.min.js b/bundle.min.js
@@ -47149,7 +47149,7 @@
    const memory = {
     saveSlot: null,
     autoSaves: [],
-    _autosaveCulling: 10,
+    _autosaveCulling: 8,
     _autosaveIndex: 0,
 
     quickSave: (code) => {
@@ -47292,7 +47292,7 @@
       - 4: turn on at 1/4x speed
       - 8: turn on at 1/8x speed
     */
-    let automutateInterval = null
+    state.automutateInterval = null;
     emitter.on('editor:toggleAutomutate', (evt, e) => {
       // Turn off
       const guessedMsPerBeat = (60000/(bpm||120));
@@ -47303,17 +47303,17 @@
 
       let mutateTimeout = guessedMsPerBeat;
       if (automutateMode === 'X' || !automutateMode) {
-        if (automutateInterval) {
-          clearInterval(automutateInterval);
-          automutateInterval = null;
-          return;
+        if (state.automutateInterval) {
+          clearInterval(state.automutateInterval);
+          state.automutateInterval = null;
+          return emitter.emit('render');
         } else {
           mutateTimeout = Number(prompt("How fast would you like to go? (in milliseconds)", guessedMsPerBeat)) || guessedMsPerBeat;
         }
       } else if (automutateMode === '0') {
-        clearInterval(automutateInterval);
-        automutateInterval = null;
-        return;
+        clearInterval(state.automutateInterval);
+        state.automutateInterval = null;
+        return emitter.emit('render');
       } else if (automutateMode === '1') {
         mutateTimeout = guessedMsPerBeat;
       } else if (automutateMode === '2') {
@@ -47325,19 +47325,20 @@
       } else if (automutateMode === '5') {
         mutateTimeout = guessedMsPerBeat * 16;
       } else {
-        return;
+        return emitter.emit('render')
       }
 
       const editor = state.editor.editor
       const changeTransformChance = 1 - (evt.metaKey ? 0.25 : 0);
-      clearInterval(automutateInterval);
-      automutateInterval = setInterval(() => {
+      clearInterval(state.automutateInterval);
+      state.automutateInterval = setInterval(() => {
         const changeTransform = Math.random() > changeTransformChance;
         editor.mutator.mutate({ reroll: false, changeTransform });
         editor.formatCode();
         memory.autoSave(editor.getValue());
       }, mutateTimeout);
       memory.autoSave(editor.getValue(), true);
+      return emitter.emit('render');
     });
 
     // TODO: these could be replaced by codemirror combos
@@ -47541,10 +47542,12 @@
         }
       }
 
-      repl.eval(editor.getValue())
+      const code = editor.getValue();
+      repl.eval(code)
       document.title = sketch.name;
-      sketches.saveLocally(editor.getValue());
+      sketches.saveLocally(code);
       memory.resetAutosaves();
+      memory.autoSave(code, true);
     })
 
     // TODO: Copy
@@ -48364,6 +48367,10 @@
       let traveler = makeTraveler({
     go: function(node, state) {
           if (node.type === 'Literal') {
+              // we don't want strings to be glitched
+              if (typeof node.value === 'string')
+                return;
+
               state.literalTab.push(node);
           } else if (node.type === 'MemberExpression') {
               if (node.property && node.property.type === 'Literal') {
@@ -48398,8 +48405,9 @@
       if (options.changeTransform) {
         this.glitchTrans(state, options);
       }
-      else this.glitchLiteral(state, options);
-
+      else {
+        this.glitchLiteral(state, options);
+      }
   }
 
     glitchLiteral(state, options)
@@ -48437,7 +48445,8 @@
     glitchRelToInit(num, initVal) {
       if (initVal === undefined) {
           return glitchNumber(num);
-      } if (initVal === 0) {
+      } 
+      if (initVal === 0) {
           initVal = 0.5;
       }
 
@@ -49836,7 +49845,7 @@
           ${icon("myimport", `fa-file-import ${hidden}`, "Import", 'gallery:import')}
           ${icon("myexport", `fa-file-export ${hidden}`, "Export", 'gallery:export')}
           ${icon("mutator", `fa-dice ${hidden}`, t('toolbar.random'), 'editor:randomize')}
-          ${icon("automutate", `fa-poo ${hidden}`, "toggle automutate", 'editor:toggleAutomutate')}
+          ${icon("automutate", `fa-poo ${hidden}`, "toggle automutate", 'editor:toggleAutomutate', state.automutateInterval ? 'color: orange' : 'color: white' )}
           ${icon("mylogin", `fa-key ${hidden}`, "Log in", 'remote:login', isAuthenticated ? 'color: lime' : 'color: white')}
           ${toggleInfo}
       </div>`