summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/pre-re/item_db.txt2
-rw-r--r--db/re/item_db.txt2
-rw-r--r--npc/guild/payg_cas02.txt33
-rw-r--r--npc/guild/payg_cas04.txt33
-rw-r--r--npc/re/cities/izlude.txt4
5 files changed, 38 insertions, 36 deletions
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index 44237ee80..501e657cc 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -5203,7 +5203,7 @@
12772,Cool_Hat_Box2,Cool Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12773,Victory_Hat_Box2,Victory Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set SlotChange, SlotChange + 1; },{},{}
-12790,Char_Rename_Card,Character Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{}
+12790,Change_Name_Card,Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{}
12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } } },{},{}
12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{}
12901,Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{}
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index a28fbd711..5dccc5442 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -5984,7 +5984,7 @@
12775,Ancient_Spirit_Amulet,Ancient Spirit Amulet,2,20,,600,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//
12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set SlotChange, SlotChange + 1; },{},{}
-12790,Char_Rename_Card,Character Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{}
+12790,Change_Name_Card,Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{}
//
12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } } },{},{}
12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{}
diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt
index 4ada2da53..27e5fc4f0 100644
--- a/npc/guild/payg_cas02.txt
+++ b/npc/guild/payg_cas02.txt
@@ -3,20 +3,21 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Description: =========================================
-//= NPCs that relate to Payon Guild Castle 1
+//= NPCs that relate to Payon Guild Castle 2
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//= 1.2 Removed dialog from interior flags. [L0ne_W0lf]
//= Fixed position of Guild dungeon switch.
//= 1.3 Partially rewrote Script. [Masao]
+//= 1.4 Fixed names [Streusel]
//============================================================
// Guild Flags (Outside Castle)
//============================================================
-- script Sacred Palace#1::OutsideFlagsPA2 722,{
+- script Scarlet Palace#1::OutsideFlagsPA2 722,{
set .@GID, GetCastleData("payg_cas02",1);
@@ -66,14 +67,14 @@ OnRecvCastlePy02:
end;
}
-pay_gld,292,112,6 duplicate(OutsideFlagsPA2) Sacred Palace#1-2 722
-pay_gld,292,120,6 duplicate(OutsideFlagsPA2) Sacred Palace#2 722
-pay_gld,291,135,6 duplicate(OutsideFlagsPA2) Sacred Palace#3 722
-pay_gld,271,163,0 duplicate(OutsideFlagsPA2) Sacred Palace#4 722
+pay_gld,292,112,6 duplicate(OutsideFlagsPA2) Scarlet Palace#1-2 722
+pay_gld,292,120,6 duplicate(OutsideFlagsPA2) Scarlet Palace#2 722
+pay_gld,291,135,6 duplicate(OutsideFlagsPA2) Scarlet Palace#3 722
+pay_gld,271,163,0 duplicate(OutsideFlagsPA2) Scarlet Palace#4 722
// Guild Flags (Inside Castle)
//============================================================
-- script Sacred Palace#5::InsideFlagsPA2 722,{
+- script Scarlet Palace#5::InsideFlagsPA2 722,{
end;
OnRecvCastlePy02:
@@ -81,17 +82,17 @@ OnRecvCastlePy02:
end;
}
-payg_cas02,254,40,6 duplicate(InsideFlagsPA2) Sacred Palace#5-2 722
-payg_cas02,254,48,6 duplicate(InsideFlagsPA2) Sacred Palace#6 722
-payg_cas02,202,49,0 duplicate(InsideFlagsPA2) Sacred Palace#7 722
-payg_cas02,209,49,0 duplicate(InsideFlagsPA2) Sacred Palace#8 722
-payg_cas02,59,282,4 duplicate(InsideFlagsPA2) Sacred Palace#9 722
-payg_cas02,70,282,4 duplicate(InsideFlagsPA2) Sacred Palace#10 722
+payg_cas02,254,40,6 duplicate(InsideFlagsPA2) Scarlet Palace#5-2 722
+payg_cas02,254,48,6 duplicate(InsideFlagsPA2) Scarlet Palace#6 722
+payg_cas02,202,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#7 722
+payg_cas02,209,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#8 722
+payg_cas02,59,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#9 722
+payg_cas02,70,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#10 722
// Guild Flag (Town)
//============================================================
-payon,97,322,4 duplicate(InsideFlagsPA2) Sacred Altar#11 722
-payon,166,173,3 duplicate(InsideFlagsPA2) Sacred Altar#12 722
+payon,97,322,4 duplicate(InsideFlagsPA2) Scarlet Palace#11 722
+payon,166,173,3 duplicate(InsideFlagsPA2) Scarlet Palace#12 722
// Kafra Employee
//============================================================
diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt
index b3ddce797..4f584e368 100644
--- a/npc/guild/payg_cas04.txt
+++ b/npc/guild/payg_cas04.txt
@@ -3,20 +3,21 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Description: =========================================
-//= NPCs that relate to Payon Guild Castle 1
+//= NPCs that relate to Payon Guild Castle 4
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//= 1.2 Removed dialog from interior flags. [L0ne_W0lf]
//= Fixed position of Guild dungeon switch.
//= 1.3 Partially rewrote Script. [Masao]
+//= 1.4 Fixed named [Streusel]
//============================================================
// Guild Flags (Outside Castle)
//============================================================
-- script Scarlet Palace#1::OutsideFlagsPA4 722,{
+- script Sacred Altar#1::OutsideFlagsPA4 722,{
set .@GID, GetCastleData("payg_cas04",1);
@@ -66,14 +67,14 @@ OnRecvCastlePy04:
end;
}
-pay_gld,137,160,0 duplicate(OutsideFlagsPA4) Scarlet Palace#1-2 722
-pay_gld,143,160,0 duplicate(OutsideFlagsPA4) Scarlet Palace#2 722
-pay_gld,133,151,2 duplicate(OutsideFlagsPA4) Scarlet Palace#3 722
-pay_gld,153,166,1 duplicate(OutsideFlagsPA4) Scarlet Palace#4 722
+pay_gld,137,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#1-2 722
+pay_gld,143,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#2 722
+pay_gld,133,151,2 duplicate(OutsideFlagsPA4) Sacred Altar#3 722
+pay_gld,153,166,1 duplicate(OutsideFlagsPA4) Sacred Altar#4 722
// Guild Flags (Inside Castle)
//============================================================
-- script Scarlet Palace#5::InsideFlagsPA4 722,{
+- script Sacred Altar#5::InsideFlagsPA4 722,{
end;
OnRecvCastlePy04:
@@ -81,17 +82,17 @@ OnRecvCastlePy04:
end;
}
-payg_cas04,255,259,0 duplicate(InsideFlagsPA4) Scarlet Palace#5-2 722
-payg_cas04,248,259,0 duplicate(InsideFlagsPA4) Scarlet Palace#6 722
-payg_cas04,248,168,6 duplicate(InsideFlagsPA4) Scarlet Palace#7 722
-payg_cas04,248,160,6 duplicate(InsideFlagsPA4) Scarlet Palace#8 722
-payg_cas04,232,181,4 duplicate(InsideFlagsPA4) Scarlet Palace#9 722
-payg_cas04,239,181,4 duplicate(InsideFlagsPA4) Scarlet Palace#10 722
+payg_cas04,255,259,0 duplicate(InsideFlagsPA4) Sacred Altar#5-2 722
+payg_cas04,248,259,0 duplicate(InsideFlagsPA4) Sacred Altar#6 722
+payg_cas04,248,168,6 duplicate(InsideFlagsPA4) Sacred Altar#7 722
+payg_cas04,248,160,6 duplicate(InsideFlagsPA4) Sacred Altar#8 722
+payg_cas04,232,181,4 duplicate(InsideFlagsPA4) Sacred Altar#9 722
+payg_cas04,239,181,4 duplicate(InsideFlagsPA4) Sacred Altar#10 722
// Guild Flag (Town)
//============================================================
-payon,118,322,4 duplicate(InsideFlagsPA4) Scarlet Palace#11 722
-payon,166,165,3 duplicate(InsideFlagsPA4) Scarlet Palace#12 722
+payon,118,322,4 duplicate(InsideFlagsPA4) Sacred Altar#11 722
+payon,166,165,3 duplicate(InsideFlagsPA4) Sacred Altar#12 722
// Kafra Employee
//============================================================
diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt
index d2ac40e80..24390f070 100644
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -26,7 +26,7 @@ izlude,58,156,2 duplicate(Cebalis_izlude) Cebalis#izlude 98
izlude,165,156,2 duplicate(Soldier_izlude) Soldier#izlude 105
izlude,158,130,3 duplicate(bdt) Bullet Dealer Tony#iz 86
izlude,155,132,3 duplicate(mdk) Magazine Dealer Kenny 83
-izlude,198,213,4 duplicate(Captain_Carew) Captain Carew#izlude 873
+//izlude,198,213,4 duplicate(Captain_Carew) Captain Carew#izlude 873
izlude_in,57,92,3 duplicate(Dorian) Dorian#izlude 878
izlude,147,131,6 script Blacksmith#izlude 726,{
end;
@@ -95,4 +95,4 @@ izlude,146,205,7 script Magpies Adventurer#iz-02 706,{
izlude,120,254,0 script Siege Monument#izlude 111,{
end;
-} \ No newline at end of file
+}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-02 09:13:01 +0000