Restores all spells. Buddies can cast spells on themselves #6

TODO.txt

@@ -4,25 +4,22 @@ We have many issues open and welcomed for first time contributors!
 
     1/2 - show .console_send_message_form in console so buddy can send /bs without login
     1/2 - clean up /bs
+      - ensure that all /bs commands can be sent and have correct context ( paint / sound / snaps / etc )
+
+    - add `App.Download` for downloading buddypond
 
     - play sound alert if buddypond.me is mentioned in chat
-
-    - Flags need to show for memes and snaps and sounds, etc
-    - Flag mouseover should show alt title of locale
-
     - add static picture of merlin in /help
       - if you click merlin it launches /merlin app
 
-\party
 
+\party
 Party mode v1
   - turn on hard-coded mp3 song ( something banging )
   - /play party-song.mp3
   - /av
   - /wallpaper rainbow
 
-- ensure that all /bs commands can be sent and have correct context ( paint / sound / snaps / etc )
-- add `App.Download` for downloading buddypond
 - drag and drop should work on entire document and use context based on active window
 
 Mobile Issues
@@ -96,6 +93,8 @@ Chat Windows
 - create icons for data pulse ( drop in and drop out)
 - create icons for connected / disconnected
 - add spell for making user unable to say, cause echo back
+- Flag mouseover should show alt title of locale
+  - requires simple JSON list of locale names to local keys
 
 Apps
 
@@ -182,6 +181,7 @@ Post Beta
 
 ++++++++++++WELL++++++++++
 
+X - Flags need to show for memes and snaps and sounds, etc
 X - add "Score" and "Distance" to meme cards / Mnemosyne
 X - fix padding for mobile top window bar
 X - put back traffic lights to upper right on mobile

desktop/appstore/desktop.merlin/desktop.merlin.js

@@ -18,6 +18,7 @@ desktop.app.merlin.load = function loadmerlinGames (params, next) {
     if (!desktop.settings.agent_merlin_active) {
       return next();
     }
+
     clippy.load('Merlin', function (agent) {
       desktop.app.merlin.agent = agent;
       agent.show();
@@ -35,9 +36,10 @@ desktop.app.merlin.load = function loadmerlinGames (params, next) {
         agent.speak('Welcome to Buddy Pond! I am Merlin. Please click around and enjoy.');
       }
 
+      next();
+
     });
 
-    next();
   });
 };
 

desktop/based/desktop.spellbook/desktop.spellbook.js

@@ -1,10 +1,13 @@
+buddypond.MATRIX_AGENTS = ['Marak']; // do you wish to be added to this array? are you a bad enough dude to love yourself?
+
 desktop.app.spellbook = {};
 desktop.app.spellbook.label = 'Spellbook';
 desktop.app.spellbook.spells = [
   // 'ebublio',
   'zalgo',
   'babel.js',
   'riddikulus',
+  'ebublio',
   'episkey',
   'rickroll',
   'forbiddenRickRoll',
@@ -101,22 +104,36 @@ desktop.app.spellbook.rickroll = function rickroll () {
 desktop.app.spellbook.forbiddenRickRoll = function forbiddenRickRoll () {
   desktop.set('audio_enabled', true);
   desktop.play('FORBIDDEN_RICKROLL.mp3', true);
+  desktop.app.wallpaper.stop();
   $('#wallpaper').attr('src', 'desktop/assets/images/misc/forbidden-rickroll.gif');
+  $('#wallpaper').show();
   $('#c').hide();
 };
 
 desktop.app.spellbook.ebublio = function lightingBolt () {
   // summon Merlin
   $('#loaderHolder').show();
   $('#mainOverlay').hide();
-
-  desktop.app.merlin.agent.show();
-  desktop.app.merlin.agent.speak('Ebublio!');
-  desktop.app.merlin.agent.play('DoMagic1', 4444, function () {
-    desktop.app.merlin.agent.speak('Be cool my dude.');
+  $('#wallpaper').show();
+
+  if (desktop.app.merlin.agent) {
+    desktop.app.merlin.agent.show();
+    desktop.app.merlin.agent.speak('Ebublio!');
+    desktop.app.merlin.agent.play('DoMagic1', 4444, function () {
+      desktop.app.merlin.agent.speak('Be cool my Buddy.');
+      shakeItOff()
+    });
+  } else {
+    shakeItOff();
+  }
+
+  function shakeItOff() {
     $( '#wallpaper' ).effect('shake', { direction: 'left', distance: 112, times: 111 }, function () {
       $( '#wallpaper' ).effect('shake', { direction: 'down', distance: 112, times: 111 }, function () {
-        desktop.app.merlin.agent.speak('Would you like to learn Magic with Merlin?');
+        if (desktop.app.merlin.agent) {
+          // TODO: Event Emitter insted of conditional check for merlin
+          desktop.app.merlin.agent.speak('Would you like to learn Magic with Merlin?');
+        }
         $( '#wallpaper' ).effect('shake', { direction: 'right', distance: 112, times: 111 }, function () {
           $( '#wallpaper' ).effect('shake', { direction: 'up', distance: 112, times: 111 }, function () {
             $('#loaderHolder').fadeOut({
@@ -127,20 +144,21 @@ desktop.app.spellbook.ebublio = function lightingBolt () {
               easing: 'linear',
               duration: 777,
               complete: function () {
-              // desktop should already be started and running
+                $('#wallpaper').fadeOut();
               }
             });
           });
         });
       });
     });
-  });
+  }
+
 };
 
 
 // please no
 desktop.app.spellbook.zalgo = function castZalgoSpell (params, next) {
-  $('span, label, a').each(function (i, item) {
+  $('span, label, a, .message').each(function (i, item) {
     if ($(this).css('display') === 'block') {
       $(this).attr('data-og-zalgo', $(this).html());
       $(this).html(desktop.app.spellbook._zalgo($(this).html()));
@@ -149,15 +167,15 @@ desktop.app.spellbook.zalgo = function castZalgoSpell (params, next) {
   });
   let count = 0;
   let zalgoInt = setInterval(function () {
-    $('span, label, a').each(function (i, item) {
+    $('span, label, a, .message').each(function (i, item) {
       if ($(this).css('display') === 'block') {
         $(this).html(desktop.app.spellbook._zalgo($(this).attr('data-og-zalgo')));
       }
     });
     count++;
-    if (count > 13) {
+    if (count > 7) {
       clearInterval(zalgoInt);
-      $('span, label, a').each(function (i, item) {
+      $('span, label, a, .message').each(function (i, item) {
         if ($(this).css('display') === 'block') {
           $(this).html($(this).attr('data-og-zalgo'));
           $(this).removeClass('rainbowFast');