summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/cities/manuk.txt13
-rw-r--r--npc/merchants/coin_exchange.txt87
-rw-r--r--npc/merchants/manuk.txt68
-rw-r--r--npc/merchants/socket_enchant.txt2
-rw-r--r--npc/merchants/splendide.txt117
-rw-r--r--npc/scripts_athena.conf3
6 files changed, 95 insertions, 195 deletions
diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt
index 1b33799f1..07bf61ccf 100644
--- a/npc/cities/manuk.txt
+++ b/npc/cities/manuk.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 1.0 First Version.
//= 1.1 Added more town NPCs
//= 1.2 Added more town NPCs
+//= 1.3 Enabled an NPC
//============================================================
// cat_enhance
@@ -63,14 +64,13 @@ manuk,107,233,5 script Soldier#ep13_3 454,{
}
// ep13_2_hiki
-/*
manuk,100,100,3 script Piom 454,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Piom]";
- mes "�?����?�������?�����Fairy��";
- mes "??���?�����Fairy��";
- mes "�?������?j��?�������";
- mes "?�?��?�����?�?";
+ mes "You are... tiny. But you don't seem like a Fairy.";
+ mes "As long as you are not a damned Fairy,";
+ mes "then you are not our foe!";
+ mes "In this world, there are only friends or foe!";
close;
}
else {
@@ -82,7 +82,6 @@ manuk,100,100,3 script Piom 454,{
close;
}
}
-*/
manuk,188,216,3 script Benknee#ep13_2_1 449,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
new file mode 100644
index 000000000..8603383ad
--- /dev/null
+++ b/npc/merchants/coin_exchange.txt
@@ -0,0 +1,87 @@
+//===== rAthena Script =======================================
+//= Manuk & Splendide Coin Merchants
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Coin redemption NPCs.
+//===== Additional Comments: =================================
+//= 1.0 First version
+//= 1.1 Fixed checkweight. [Gepard]
+//= 1.2 Optimized and merged into one file. [Euphy]
+//============================================================
+
+- script ::merchant_13_2 -1,{
+ set .@n$, "["+strnpcinfo(1)+"]";
+ mes .@n$;
+ if (isequipped(2782) && ep13_2_rhea == 100) {
+ if (!checkweight(1201,1)) {
+ mes "It looks like you're carrying too many things.";
+ mes "Why not put some of your items in storage and come back?";
+ close;
+ }
+ mes "Hello.";
+ mes "What are you looking for?";
+ next;
+ if (strnpcinfo(1) == "Merchant of Manuk") {
+ setarray .@Items[2],12342,12343,12348;
+ set .@Book,11019; //Manuk_Selling_Item
+ set .@Coin,6080; //Manuk_Coin
+ set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel");
+ }
+ else {
+ setarray .@Items[2],12344,12345,12349;
+ set .@Book,11018; //Splendide_Selling_Item
+ set .@Coin,6081; //Splendide_Coin
+ set .@i, select("View item description:Buy Pinguicula's Fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing");
+ }
+ mes .@n$;
+ if (.@i == 1) {
+ mes "Here are the item descriptions.";
+ close2;
+ ReadBook .@Book,1;
+ end;
+ }
+ else if (.@i < 5) {
+ mes "I can sell you 3 "+getitemname(.@Items[.@i])+" for ^3131FF1 coin^000000.";
+ next;
+ switch(select("Purchase:Do not purchase")) {
+ case 1:
+ if (countitem(.@Coin)) {
+ mes .@n$;
+ mes "Thank you for coming.";
+ delitem .@Coin,1;
+ getitem .@Items[.@i],3;
+ close;
+ }
+ else {
+ mes .@n$;
+ mes "You don't have enough coins.";
+ close;
+ }
+ case 2:
+ mes .@n$;
+ break;
+ }
+ }
+ mes "Come again if you change your mind.";
+ close;
+ }
+ else {
+ if (strnpcinfo(1) == "Merchant of Manuk") {
+ mes "Rtt od d";
+ mes "Qwo hd is d irr";
+ }
+ else {
+ mes "BurWehAla";
+ mes "tasnarAndu Ie Ru";
+ }
+ close;
+ }
+}
+man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 454
+spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 439 \ No newline at end of file
diff --git a/npc/merchants/manuk.txt b/npc/merchants/manuk.txt
deleted file mode 100644
index 9500a7eb2..000000000
--- a/npc/merchants/manuk.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-//===== rAthena Script =======================================
-//= Manuk Merchant
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= [Aegis Conversion]
-//= Manuk coin redemption NPC.
-//===== Additional Comments: =================================
-//= 1.0 First version
-//= 1.1 Fixed checkweight. [Gepard]
-//= 1.2 Optimized. [Euphy]
-//============================================================
-
-man_in01,286,16,1 script Merchant of Manuk 454,{
- mes "[Merchant of Manuk]";
- if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
- if (!checkweight(1201,1)) {
- mes "It looks like you're carrying too many things.";
- mes "Why not put some of your items in storage and come back?";
- close;
- }
- mes "Hello.";
- mes "What are you looking for?";
- next;
- setarray .@Items[2],12342,12343,12348;
- set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel");
- mes "[Merchant of Manuk]";
- if (.@i == 1) {
- mes "Here are the item descriptions.";
- close2;
- ReadBook 11019,1;
- end;
- }
- else if (.@i < 5) {
- mes "I can sell you 3 "+getitemname(.@Items[.@i])+" for^3131FF 1 coin^000000.";
- next;
- switch(select("Purchase:Do not purchase")) {
- case 1:
- if (countitem(6080)) {
- mes "[Merchant of Manuk]";
- mes "Thank you for coming.";
- delitem 6080,1;
- getitem .@Items[.@i],3;
- close;
- }
- else {
- mes "[Merchant of Manuk]";
- mes "You don't have enough coins.";
- close;
- }
- case 2:
- mes "[Merchant of Manuk]";
- break;
- }
- }
- mes "Come again if you change your mind.";
- close;
- }
- else {
- mes "Rtt od d";
- mes "Qwo hd is d irr";
- close;
- }
-} \ No newline at end of file
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 836644a5f..acd3b2fe6 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -1,7 +1,7 @@
//===== rAthena Script =======================================
//= Episode 11.1 Socket Enchant NPC
//===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
//===== Current Version: =====================================
//= 2.0
//===== Compatible With: =====================================
diff --git a/npc/merchants/splendide.txt b/npc/merchants/splendide.txt
deleted file mode 100644
index b8d4f8f71..000000000
--- a/npc/merchants/splendide.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-//===== rAthena Script =======================================
-//= Splendide Merchant
-//===== By: ==================================================
-//= rAthena dev team
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= [Aegis Conversion]
-//= Splendide coin redemption NPC.
-//===== Additional Comments: =================================
-//= 1.0 First version
-//= 1.1 Fixed checkweight. [Gepard]
-//============================================================
-
-spl_in01,110,326,5 script Merchant of Splendide 439,{
- if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
- if (checkweight(1201,1) == 0) {
- mes "[Merchant of Splendide]";
- mes "It looks like you're carrying too many things.";
- mes "Why not put some of your items in storage and come back?";
- close;
- }
- mes "[Merchant of Splendide]";
- mes "Hello.";
- mes "What are you looking for?";
- next;
- switch(select("View item description:Buy Pinguicula's fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing")) {
- case 1:
- mes "[Merchant of Splendide]";
- mes "Would you like to see the item description?";
- close2;
- ReadBook 11018,1;
- end;
- case 2:
- mes "[Merchant of Splendide]";
- mes "I can sell you 3 Pinguicula's fruit Jam for^3131FF 1 coin^000000";
- next;
- switch(select("Purchase:Do not purchase.")) {
- case 1:
- if (countitem(6081) > 0) {
- mes "[Merchant of Splendide]";
- mes "Thank you for coming.";
- delitem 6081,1; //Splendide_Coin
- getitem 12344,3; //Pinguicula's_fruit_Jam
- close;
- }
- else {
- mes "[Merchant of Splendide]";
- mes "You don't have enough coins.";
- close;
- }
- case 2:
- mes "[Merchant of Splendide]";
- mes "Come again if you change your mind.";
- close;
- }
- case 3:
- mes "[Merchant of Splendide]";
- mes "I can sell you 3 Luciola's Honey Jam for^3131FF 1 coin^000000";
- next;
- switch(select("Purchase:Do not purchase.")) {
- case 1:
- if (countitem(6081) > 0) {
- mes "[Merchant of Splendide]";
- mes "Thank you for coming.";
- delitem 6081,1; //Splendide_Coin
- getitem 12345,3; //Luciola's_Honey_Jam
- close;
- }
- else {
- mes "[Merchant of Splendide]";
- mes "You don't have enough coins.";
- close;
- }
- case 2:
- mes "[Merchant of Splendide]";
- mes "Come again if you change your mind.";
- close;
- }
- case 4:
- mes "[Merchant of Splendide]";
- mes "I can sell you 3 Cornus' Tears for^3131FF 1 coin^000000";
- next;
- switch(select("Purchase:Do not purchase.")) {
- case 1:
- if (countitem(6081) > 0) {
- mes "[Merchant of Splendide]";
- mes "Thank you for coming.";
- delitem 6081,1; //Splendide_Coin
- getitem 12349,3; //Cornus'_Tears
- close;
- }
- else {
- mes "[Merchant of Splendide]";
- mes "You don't have enough coins.";
- close;
- }
- case 2:
- mes "[Merchant of Splendide]";
- mes "Come again if you change your mind.";
- close;
- }
- case 5:
- mes "[Merchant of Splendide]";
- mes "Come again if you change your mind.";
- close;
- }
- }
- else {
- mes "[Merchant of Splendide]";
- mes "BurWehAla";
- mes "tasnarAndu Ie Ru";
- close;
- }
-}
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index ab83fb7df..8b8ce645b 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -126,6 +126,7 @@ npc: npc/merchants/ammo_boxes.txt
npc: npc/merchants/ammo_dealer.txt
npc: npc/merchants/buying_shops.txt
//npc: npc/merchants/clothes_dyer.txt
+npc: npc/merchants/coin_exchange.txt
npc: npc/merchants/dye_maker.txt
npc: npc/merchants/elemental_trader.txt
npc: npc/merchants/enchan_arm.txt
@@ -135,7 +136,6 @@ npc: npc/merchants/hair_style.txt
//npc: npc/merchants/icecream.txt
npc: npc/merchants/inn.txt
npc: npc/merchants/kunai_maker.txt
-npc: npc/merchants/manuk.txt
npc: npc/merchants/milk_trader.txt
npc: npc/merchants/novice_exchange.txt
npc: npc/merchants/old_pharmacist.txt
@@ -145,7 +145,6 @@ npc: npc/merchants/renters.txt
npc: npc/merchants/shops.txt
npc: npc/merchants/socket_enchant.txt
npc: npc/merchants/socket_enchant2.txt
-npc: npc/merchants/splendide.txt
npc: npc/merchants/wander_pet_food.txt
// - Cash Shop
// See file before enabling, as you may wish to change the
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-01 09:32:36 +0000