summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.tools/reapply.patch432
-rw-r--r--npc/017-1/drowned_man.txt3
2 files changed, 33 insertions, 2 deletions
diff --git a/.tools/reapply.patch4 b/.tools/reapply.patch4
index 40b8ccc62..d4efce5ac 100644
--- a/.tools/reapply.patch4
+++ b/.tools/reapply.patch4
@@ -42,7 +42,34 @@ e22d44e708d37923dcb57fd382e38b12bbc10a75
## v2019.09.22
############
-## v2020.06.xx
+## v2019.10.20
+
+############
+## v2019.11.17+1
+
+############
+## v2019.12.15
+
+############
+## v2020.01.12
+
+############
+## v2020.02.09
+
+############
+## v2020.03.08+2
+
+############
+## v2020.04.05+1
+
+############
+## v2020.05.03
+
+############
+## v2020.05.31+1
+
+############
+## v2020.06.28
## Changed logic of skill_get_index
#1042e9919f18d4aac21583a675d28758ba233e03
@@ -50,3 +77,6 @@ e22d44e708d37923dcb57fd382e38b12bbc10a75
## Added ifdef on mmo.h to allow change it with CPPFLAGS
#8a4667a265227587dcc288f75dfe948f5df46034
+############
+## v2020.07.26
+
diff --git a/npc/017-1/drowned_man.txt b/npc/017-1/drowned_man.txt
index ec808ef73..9f0cda495 100644
--- a/npc/017-1/drowned_man.txt
+++ b/npc/017-1/drowned_man.txt
@@ -120,12 +120,13 @@ OnInit:
if (askyesno() == ASK_YES) {
// Can't jump with pets
// FIXME: Move it elsewhere - resist pet_Detective updates
- for (.@i=PiouEgg; .@i <= BatEgg ; .@i++) {
+ for (.@i=0+PiouEgg; .@i <= 0+MoggunEgg ; .@i++) {
if (countitem(.@i) >= 0) {
mesc l("Can't bring pets with you..."), 1;
next;
mesc l("Do you really think the poor creature should jump a bridge in water and DIE?"), 1;
@nojump=gettimetick(2);
+ mesc l("* Put the %s safely in storage before jumping.", getitemlink(.@i));
close;
}
}