Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 28 insertions, 0 deletions

diff --git a/npc/051-3/jailslimes.txt b/npc/051-3/jailslimes.txt
new file mode 100644
index 00000000..169fe7a3
--- /dev/null
+++ b/npc/051-3/jailslimes.txt
@@ -0,0 +1,28 @@
+051-3,57,104,1,1	monster	CopperSlime	1098,1,60000,30000,IlliaCMobs051-3::On1098
+051-3,62,104,1,1	monster	CopperSlime	1098,1,60000,30000,IlliaCMobs051-3::On1098
+051-3,63,104,1,1	monster	CopperSlime	1098,1,60000,30000,IlliaCMobs051-3::On1098
+051-3,70,111,1,1	monster	CopperSlime	1098,1,60000,30000,IlliaCMobs051-3::On1098
+
+051-3,0,0,0	script	IlliaCMobs051-3	NPC32767,{
+    end;
+
+On1098:
+    if (rand(100) < 80 && $@illia_progress == 2 && ($@illia_level_2_progress == 1 || $@illia_level_2_progress == 2))
+        goto L_LockPicks;
+    goto L_End;
+
+L_LockPicks:
+    if (countitem ("LockPicks") == 0)
+        goto L_GiveLockPicks;
+    goto L_End;
+
+L_GiveLockPicks:
+    message strcharinfo(0), "Hey nice, someone left behind these rusty lock picks.";
+    getitem "LockPicks", 1;
+    goto L_End;
+
+L_End:
+    fix_mobkill(1098);
+    end;
+
+}