From 17a02df998aeb2dfe5046f5aaf24f9d027883c90 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 12 Nov 2022 18:47:09 -0300 Subject: This is the minimum necessary for the sword quests. --- tools | 2 +- world/map/data/resnametable.txt | 2 ++ world/map/npc/043-1/_import.txt | 1 + world/map/npc/043-1/pyramid.txt | 12 ++++++++++++ world/map/npc/045-1/_import.txt | 1 + world/map/npc/045-1/pyramid.txt | 12 ++++++++++++ world/map/npc/058-1/_import.txt | 1 + world/map/npc/058-1/_warps.txt | 2 +- world/map/npc/058-1/griffen.txt | 8 ++++++++ world/map/npc/058-2/_import.txt | 1 + world/map/npc/058-2/_warps.txt | 2 +- world/map/npc/058-2/griffen.txt | 8 ++++++++ 12 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 world/map/npc/043-1/pyramid.txt create mode 100644 world/map/npc/045-1/pyramid.txt create mode 100644 world/map/npc/058-1/griffen.txt create mode 100644 world/map/npc/058-2/griffen.txt diff --git a/tools b/tools index 58a23dda..243f612b 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit 58a23ddadfc9afc4573601d9b950a38c1607e1e4 +Subproject commit 243f612b787142780a8ac072ba775edbe2fec353 diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index 80749643..cfebd318 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -115,6 +115,8 @@ 055-3#055-3.wlk# 056-2#056-2.wlk# 057-1#057-1.wlk# +058-1#058-1.wlk# +058-2#058-2.wlk# 069-2#069-2.wlk# 070-1#070-1.wlk# 070-3#070-3.wlk# diff --git a/world/map/npc/043-1/_import.txt b/world/map/npc/043-1/_import.txt index 79f05acf..1d46f4ee 100644 --- a/world/map/npc/043-1/_import.txt +++ b/world/map/npc/043-1/_import.txt @@ -5,3 +5,4 @@ npc: npc/043-1/_mobs.txt npc: npc/043-1/_nodes.txt npc: npc/043-1/_warps.txt npc: npc/043-1/mapflags.txt +npc: npc/043-1/pyramid.txt diff --git a/world/map/npc/043-1/pyramid.txt b/world/map/npc/043-1/pyramid.txt new file mode 100644 index 00000000..a3f35ccc --- /dev/null +++ b/world/map/npc/043-1/pyramid.txt @@ -0,0 +1,12 @@ +// Author: Jesusalva + +043-1,68,113,0|script|Pyramid#T|32767,0,0 +{ + if (countitem(SandCutter) < 1) goto L_Warrior; + warp "058-1", 65, 198; + end; + +L_Warrior: + message strcharinfo(0), "To enter this pyramid, you must obtain the weapon of a true warrior."; + end; +} diff --git a/world/map/npc/045-1/_import.txt b/world/map/npc/045-1/_import.txt index 591b3e37..cfeef2df 100644 --- a/world/map/npc/045-1/_import.txt +++ b/world/map/npc/045-1/_import.txt @@ -5,3 +5,4 @@ npc: npc/045-1/_mobs.txt npc: npc/045-1/_nodes.txt npc: npc/045-1/_warps.txt npc: npc/045-1/mapflags.txt +npc: npc/045-1/pyramid.txt diff --git a/world/map/npc/045-1/pyramid.txt b/world/map/npc/045-1/pyramid.txt new file mode 100644 index 00000000..7944954e --- /dev/null +++ b/world/map/npc/045-1/pyramid.txt @@ -0,0 +1,12 @@ +// Author: Jesusalva + +045-1,99,33,0|script|Pyramid#N|32767,0,0 +{ + if (countitem(SandCutter) < 1) goto L_Warrior; + warp "058-2", 65, 198; + end; + +L_Warrior: + message strcharinfo(0), "To enter this pyramid, you must obtain the weapon of a true warrior."; + end; +} diff --git a/world/map/npc/058-1/_import.txt b/world/map/npc/058-1/_import.txt index 5c67f5c1..f20d8766 100644 --- a/world/map/npc/058-1/_import.txt +++ b/world/map/npc/058-1/_import.txt @@ -4,3 +4,4 @@ map: 058-1 npc: npc/058-1/_mobs.txt npc: npc/058-1/_nodes.txt npc: npc/058-1/_warps.txt +npc: npc/058-1/griffen.txt diff --git a/world/map/npc/058-1/_warps.txt b/world/map/npc/058-1/_warps.txt index 58196d47..bfbf011c 100644 --- a/world/map/npc/058-1/_warps.txt +++ b/world/map/npc/058-1/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Pyramid B1F warps -058-1,65,199|warp|-1,-1,001-1,99,99 +058-1,65,199|warp|-1,-1,043-1,68,114 diff --git a/world/map/npc/058-1/griffen.txt b/world/map/npc/058-1/griffen.txt new file mode 100644 index 00000000..f98a5ecb --- /dev/null +++ b/world/map/npc/058-1/griffen.txt @@ -0,0 +1,8 @@ +// Author: Jesusalva + +058-1,67,20,0|script|Griffen#T|194 +{ + mes "[Griffen]"; + mes "\"Grark!\""; + close; +} diff --git a/world/map/npc/058-2/_import.txt b/world/map/npc/058-2/_import.txt index 559a6acf..4eda6315 100644 --- a/world/map/npc/058-2/_import.txt +++ b/world/map/npc/058-2/_import.txt @@ -4,3 +4,4 @@ map: 058-2 npc: npc/058-2/_mobs.txt npc: npc/058-2/_nodes.txt npc: npc/058-2/_warps.txt +npc: npc/058-2/griffen.txt diff --git a/world/map/npc/058-2/_warps.txt b/world/map/npc/058-2/_warps.txt index 958f67b4..a115e5a8 100644 --- a/world/map/npc/058-2/_warps.txt +++ b/world/map/npc/058-2/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Pyramid B1F warps -058-2,65,199|warp|-1,-1,001-1,99,99 +058-2,65,199|warp|-1,-1,045-1,99,34 diff --git a/world/map/npc/058-2/griffen.txt b/world/map/npc/058-2/griffen.txt new file mode 100644 index 00000000..2301784d --- /dev/null +++ b/world/map/npc/058-2/griffen.txt @@ -0,0 +1,8 @@ +// Author: Jesusalva + +058-2,67,20,0|script|Griffen#K|194 +{ + mes "[Griffen]"; + mes "\"Grark!\""; + close; +} -- cgit v1.2.3-60-g2f50