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, 22 insertions, 0 deletions

diff --git a/npc/051-1/forestmonsters.txt b/npc/051-1/forestmonsters.txt
new file mode 100644
index 00000000..b6a6c102
--- /dev/null
+++ b/npc/051-1/forestmonsters.txt
@@ -0,0 +1,22 @@
+051-1,52,32,10,8	monster	GreenSlime	1005,20,100000,30000,IlliaFMobs051-1::On1005
+
+051-1,0,0,0	script	IlliaFMobs051-1	NPC32767,{
+    end;
+
+On1005:
+    if ($@illia_level_1_progress == 1)
+        goto L_RockFinding;
+    end;
+
+L_RockFinding:
+    $@illia_level_1_num_deaths = $@illia_level_1_num_deaths + 1;
+    @p = 50 - $@illia_level_1_num_deaths;
+    if (@p < 0)
+        @p = 0;
+    if ($@illia_progress != 1 || $@iLLIA_STATUS != 4 || rand(@p) != 0)
+        end;
+    message strcharinfo(0), "This slime released a rock with a weird shape, that seems to fit in the mechanism!";
+    $@illia_level_1_progress = 2;
+    end;
+
+}