[skip ci] Merge branch 'master' into heroes_hold

2 files changed, 38 insertions, 3 deletions

diff --git a/npc/functions/class.txt b/npc/functions/class.txt
index 09db90013..427e32687 100644
--- a/npc/functions/class.txt
+++ b/npc/functions/class.txt
@@ -8,7 +8,7 @@
 // ClassID, ClassName, OtherClass, sk1, sk2
 function	script	ClassMaster	{
     .@CLASS=getarg(0);
-    .@CNAME$=getarg(1);
+    .@CNAME$=getarg(1, "bug");
     .@OTHER=getarg(2);
     //.name$=strnpcinfo(1);
 
@@ -32,7 +32,7 @@ function	script	ClassMaster	{
 L_SignUp:
     next;
     mesn;
-    mesq l("You have some magic power. Do you want to join the Magic Warriors? ##BThis cannot be undone##b.");
+    mesq l("You have some magic power. Do you want to join the @@? ##BThis cannot be undone##b.", .@CNAME$);
     next;
     mesn;
     mesq l("We use swords and bows to protect the people, and we use magic to spice things up! Because we're strong even without it!");
@@ -78,7 +78,7 @@ L_Tier1Ok:
     skill(.@CLASS,1,0);
     mes "";
     mesn;
-    mesq l("Here, learn the ##BFalkon Punch##b. It is on Physical skills tab. You can drag it to the shortcut list. Use it to protect people!");
+    mesq l("Here, learn this awesome skill. It is on the skills tab. You can drag it to the shortcut list. Use it to protect people!");
     close;
 
 L_NoMagic:
diff --git a/npc/functions/shake.txt b/npc/functions/shake.txt
new file mode 100644
index 000000000..a20fc6b43
--- /dev/null
+++ b/npc/functions/shake.txt
@@ -0,0 +1,35 @@
+// Shake player screen
+
+-	script	shake	32767,{
+    end;
+
+// Loops until @shake is @max_shake
+OnShake:
+    @shake+=1;
+    movecam rand(-20,20), rand(-20,20);
+
+    if (@shake < @max_shake) {
+        addtimer(50, "shake::OnShake");
+    } else {
+        @shake=0;
+        restorecam;
+        closedialog;
+    }
+    end;
+
+// Called by GM Command
+OnGM:
+    @shake=0;
+    @max_shake=rand(6,10);
+    addtimer(50, "shake::OnShake");
+    end;
+
+OnCall:
+    getmapxy(.@m$,.@x,.@y,0);
+    areatimer(.@m$, .@x-15, .@y-15, .@x+15, .@y+15, 10, "shake::OnGM");
+    end;
+
+OnInit:
+    bindatcmd "shake", "shake::OnCall", 80, 80, 1;
+    end;
+}