summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt31
-rw-r--r--maps/re/020-3.mcachebin0 -> 90 bytes
-rw-r--r--npc/017-2-1/_warps.txt1
-rw-r--r--npc/017-2-2/_mobs.txt1
-rw-r--r--npc/017-2-2/_warps.txt2
-rw-r--r--npc/020-1/_warps.txt1
-rw-r--r--npc/020-3/_import.txt4
-rw-r--r--npc/020-3/_warps.txt3
-rw-r--r--npc/020-3/mede.txt100
-rw-r--r--npc/_import.txt1
11 files changed, 129 insertions, 16 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index ace97c0c4..9207ea1f7 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -113,6 +113,7 @@ map_list: (
"019-4",
"020-1",
"020-2",
+ "020-3",
"021-1",
"021-2",
"021-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 65f824b84..50f39de89 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -110,18 +110,19 @@
019-4 110
020-1 111
020-2 112
-021-1 113
-021-2 114
-021-3 115
-021-4 116
-022-1 117
-023-1 118
-023-2 119
-024-1 120
-boss 121
-botcheck 122
-sec_pri 123
-soren-2 124
-soren 125
-test 126
-testbg 127
+020-3 113
+021-1 114
+021-2 115
+021-3 116
+021-4 117
+022-1 118
+023-1 119
+023-2 120
+024-1 121
+boss 122
+botcheck 123
+sec_pri 124
+soren-2 125
+soren 126
+test 127
+testbg 128
diff --git a/maps/re/020-3.mcache b/maps/re/020-3.mcache
new file mode 100644
index 000000000..2a901ed16
--- /dev/null
+++ b/maps/re/020-3.mcache
Binary files differ
diff --git a/npc/017-2-1/_warps.txt b/npc/017-2-1/_warps.txt
index e93922726..e9ec14c19 100644
--- a/npc/017-2-1/_warps.txt
+++ b/npc/017-2-1/_warps.txt
@@ -2,3 +2,4 @@
// Map 017-2-1: Jack's Basement warps
017-2-1,121,115,0 warp #017-2-1_121_115 0,0,017-2,31,29
017-2-1,27,127,0 warp #017-2-1_27_127 0,0,018-3,114,24
+017-2-1,39,23,0 warp #017-2-1_39_23 0,0,017-2-2,71,77
diff --git a/npc/017-2-2/_mobs.txt b/npc/017-2-2/_mobs.txt
index 65296d888..d40971739 100644
--- a/npc/017-2-2/_mobs.txt
+++ b/npc/017-2-2/_mobs.txt
@@ -1,3 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 017-2-2: Skull Cave mobs
017-2-2,70,57,16,20 monster Shadow Plant 1189,4,60000,10000
+017-2-2,70,55,14,20 monster Dark Lizard 1051,18,25000,25000
diff --git a/npc/017-2-2/_warps.txt b/npc/017-2-2/_warps.txt
index 04f0685aa..7ee8b20fa 100644
--- a/npc/017-2-2/_warps.txt
+++ b/npc/017-2-2/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 017-2-2: Skull Cave warps
-017-2-2,71,78,0 warp #017-2-2_71_78 1,0,018-3,0,0
+017-2-2,71,78,0 warp #017-2-2_71_78 1,0,017-2-1,39,24
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
index 3a904e61a..e22094b0d 100644
--- a/npc/020-1/_warps.txt
+++ b/npc/020-1/_warps.txt
@@ -1,5 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 020-1: Nivalis warps
020-1,47,48,0 warp #020-1_47_48 0,0,020-2,30,36
+020-1,57,91,0 warp #020-1_57_91 0,0,020-3,20,28
020-1,70,128,0 warp #020-1_70_128 3,0,019-1,70,22
020-1,107,55,0 warp #020-1_107_55 0,0,019-2,38,55
diff --git a/npc/020-3/_import.txt b/npc/020-3/_import.txt
new file mode 100644
index 000000000..b45627968
--- /dev/null
+++ b/npc/020-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 020-3: Nivalis Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-3/_warps.txt",
+"npc/020-3/mede.txt",
diff --git a/npc/020-3/_warps.txt b/npc/020-3/_warps.txt
new file mode 100644
index 000000000..c4408f03c
--- /dev/null
+++ b/npc/020-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-3: Nivalis Indoors warps
+020-3,19,28,0 warp #020-3_19_28 0,0,020-1,56,91
diff --git a/npc/020-3/mede.txt b/npc/020-3/mede.txt
new file mode 100644
index 000000000..b7b874f99
--- /dev/null
+++ b/npc/020-3/mede.txt
@@ -0,0 +1,100 @@
+// TMW2 Script
+// Author:
+// Saulc
+// Vasily_Makarov (original from Evol)
+// Jesusalva
+// Description:
+// Status Reset
+
+020-3,26,28,2 script Mede NPC_PLAYER,{
+
+ speech S_LAST_NEXT,
+ l("I am @@, an alchemist specialized in reset potions.", .name$);
+
+L_Menu:
+ .@plush_count = BaseLevel*220-(9*220);
+ // Lv 10: 220 GP
+ // Lv 90: 1.782 GP
+ if (BaseLevel > 10)
+ .@plush_count = .@plush_count/(BaseLevel/9);
+
+ select
+ l("Can you reset my stats please?"),
+ lg("You are weird, I have to go sorry.");
+
+ switch (@menu)
+ {
+ case 1:
+ goto L_ResetStats;
+ case 2:
+ goto L_Quit;
+ }
+
+L_ResetStats:
+ mesn;
+ mesq l("Status point reset can't be undone. Do you really want this?");
+
+L_ConfirmReset:
+ select
+ lg("Yes, I am sure."),
+ lg("I need to think about it...");
+
+ switch (@menu)
+ {
+ case 1:
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+ l("Let me just have a quick look at you. Hm... I will need @@ GP to reset your stats.", .@plush_count);
+
+ select
+ rif(Zeny >= .@plush_count, l("Here, take as much as you need, I have plenty!")),
+ rif(Zeny > 0 && Zeny < .@plush_count, l("I don't have enough money...")),
+ rif(Zeny == 0, l("Oh no, I don't have any money on me right now.")),
+ l("I have to go, sorry.");
+
+ if (@menu > 1) {
+ goto L_Quit;
+ }
+
+ // TODO: I think there were functions to deal with GP
+ set Zeny, Zeny-.@plush_count;
+
+ speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+ l("Thank you."),
+ l("Now stand still... It should not take much time...");
+
+ .@wasSP = StatusPoint;
+ resetstatus;
+ if (StatusPoint == .@wasSP) {
+ speech S_LAST_NEXT,
+ l("It seems that you have no status points to reset!"),
+ l("But the money you brought was really awesome you know."),
+ l("Come back when you will really need me.");
+ } else {
+ speech S_LAST_NEXT,
+ l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP),
+ l("Spend it wisely this time."),
+ l("But you are welcome to reset your stats again! I need the money.");
+ }
+ }
+ goto L_Quit;
+
+
+L_Quit:
+ closedialog;
+ goodbye;
+ close;
+
+OnInit:
+ .@npcId = getnpcid(.name$);
+ setunitdata(.@npcId, UDT_HEADTOP, BrimmedHat);
+ setunitdata(.@npcId, UDT_HEADMIDDLE, TneckSweater);
+ setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants);
+ setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
+ setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
+ setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
+
+ .sex = G_MALE;
+ .distance = 4;
+ npcsit;
+ end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 6597f076c..9cc256031 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -112,6 +112,7 @@
@include "npc/019-4/_import.txt"
@include "npc/020-1/_import.txt"
@include "npc/020-2/_import.txt"
+@include "npc/020-3/_import.txt"
@include "npc/021-1/_import.txt"
@include "npc/021-2/_import.txt"
@include "npc/021-3/_import.txt"
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-03 18:05:14 +0000