summaryrefslogtreecommitdiff
path: root/npc/re/merchants
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-09-18 13:09:16 +0200
committerHaru <haru@dotalux.com>2015-09-25 12:55:36 +0200
commit1aea178ef7cdb76eda5600540b5fbd29fd54ff88 (patch)
tree855d4feafba212d7f36872c1b46814c1f1a85e75 /npc/re/merchants
parente99bf73af31a8b1f09b9ce033c16832ee5cac51d (diff)
downloadhercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.gz
hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.bz2
hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.xz
hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.zip
More aggressive whitespace cleanup. Follow up to 51329e6
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re/merchants')
-rw-r--r--npc/re/merchants/coin_exchange.txt7
-rw-r--r--npc/re/merchants/diamond.txt27
-rw-r--r--npc/re/merchants/ninja_craftsman.txt22
-rw-r--r--npc/re/merchants/shadow_refiner.txt14
4 files changed, 23 insertions, 47 deletions
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index cabd9753b..7b553e0bd 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -1006,7 +1006,7 @@ ecl_in01,33,98,5 script Herb Merchant Plafina#e 4_M_FAIRYKID2,{
delitem Splendide_Coin,.cost[.@item]*.@buy; //Splendide_Coin
getitem .items[.@item],.@buy;
close;
-
+
OnInit:
setarray .items[0],Snow_Flip,Peony_Mommy,Slapping_Herb,Yggdrasil_Dust;
setarray .cost[0],5,5,1,1; //Splendide Coins
@@ -1028,7 +1028,6 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
mes "[Paltu]";
mes "Really? Hmm?";
close;
-
case 2:
mes "[Paltu]";
mes "One can say that there's no one better in Eclage than I at utilizing magic resistance.";
@@ -1124,7 +1123,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
C_Boy's_Cap;
if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10))
.@item_check =1;
-
+
for(.@i = 0; .@i<getarraysize(.@items); .@i++) {
if (.@item_check && countitem(.@items[.@i]))
.@menu$ = .@menu$+getitemname(.@items[.@i])+" (^2502FDAble to Replicate^000000):";
@@ -1213,4 +1212,4 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
mes "Good. This is a satisfying result.";
mes "I'll do even a better job next time. Please tell others about my work. Have a good day~";
close;
-} \ No newline at end of file
+}
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt
index 80fcb88de..73b09802a 100644
--- a/npc/re/merchants/diamond.txt
+++ b/npc/re/merchants/diamond.txt
@@ -27,21 +27,21 @@
mes "The ^FF82FF'17 Carat Diamond'^000000 is currently on sale for a cheap price!!";
mes "If valuable diamonds interest you then listen up!";
next;
-
+
mes .@npc$;
mes "You can give the diamond as a gift to your lover.";
mes "The receiver of the ^FF82FF'17 Carat Diamond'^000000 will cherish it";
mes "and treasure you in their heart.";
emotion e_loud;
next;
-
+
mes .@npc$;
mes "What? You don't have a lover?";
mes "You can still just hang on to it for yourself.";
mes "The enchanting aura of the ^FF82FF'17 Carat Diamond'^000000 is likely";
mes "to bring love into your life.";
next;
-
+
mes .@npc$;
mes "Known as the captivating diamond of diamonds...";
mes "It is the ^FF82FF'17 Carat Diamond'^000000!";
@@ -61,33 +61,28 @@
mes "dug up from Morroc is unspeakable!";
emotion e_omg;
next;
-
mes .@npc$;
mes "Some claim that this is the very same diamond";
mes "that was seen by Kachua in Comodo!";
next;
-
if (select("End Conversation:How much is it?") == 1) {
mes .@npc$;
mes "It's rather inexpensive!";
mes "If you're interested, talk to me any time!";
close;
}
-
mes .@npc$;
mes "Of course! The most important thing is price!";
mes "As I've said earlier, the ^FF82FF'17 Carat Diamond'^000000 has been";
mes "appraised as a 17 carat diamond.";
mes "There aren't many like it in the world.";
next;
-
mes .@npc$;
mes "The price is a mere 500 million zeny!";
mes "There is also a 1,000,000z service fee.";
mes "Compared to the quality of the diamond";
mes "this is a small price to pay.";
next;
-
if (select("^828282It's too expensive.^000000:I'll buy it.") == 1) {
mes .@npc$;
mes "To say that a diamond such as the";
@@ -95,7 +90,6 @@
mes "you leave me speechless.";
close;
}
-
mes .@npc$;
mes "OOOH! I knew from the moment I saw you that you were the rightful";
mes "owner of this wonderful diamond.";
@@ -103,38 +97,31 @@
mes "I believe this diamond will suit you quite well.";
mes "All I need from you is to complete this contract.";
next;
-
while(1) {
if (select("^B9062FI will sign the contract.^000000:^828282Nevermind, I changed my mind.^000000") == 2) {
mes .@npc$;
mes "I see, that's too bad..";
close;
}
-
mes .@npc$;
mes "What is your name?";
next;
-
mes "[" + strcharinfo(0) + "]";
mes "My name is " + strcharinfo(0) + ".";
next;
-
mes .@npc$;
mes "Alright then, please sign here.";
next;
-
input .@charname$;
if (.@charname$ == strcharinfo(0)) {
mes .@npc$;
mes "Okay, good.";
mes "All that is left now is payment.";
next;
-
if (Zeny >= 501000000) {
mes .@npc$;
mes ". . . . . .";
next;
-
mes .@npc$;
mes "Calculating the price and service fee..";
mes "501,000,000 zeny.";
@@ -143,7 +130,6 @@
Zeny -= 501000000;
getitem 6024, 1;
next;
-
mes .@npc$;
mes "You may exchange the diamond back for zeny at any time.";
mes "However, there will be a 1,000,000z service fee.";
@@ -180,32 +166,26 @@
emotion e_dots;
close;
}
-
mes .@npc$;
mes "I see. After I receive your signature, ";
mes "You must offer your ^FF82FF'17 Carat Diamond'^000000.";
mes "Also don't forget there is a 1,000,000z service fee!";
next;
-
mes .@npc$;
mes "What is your name?";
next;
-
mes "[" + strcharinfo(0) + "]";
mes "My name is " + strcharinfo(0) + ".";
next;
-
mes .@npc$;
mes "Alright then, please sign here.";
next;
-
while (1) {
if (select("Sign:Don't Sign") == 2) {
mes .@npc$;
mes "The trade cannot be completed without your signature.";
close;
}
-
input .@charname$;
if (.@charname$ == strcharinfo(0)) {
mes .@npc$;
@@ -213,7 +193,6 @@
mes "I will now take your ^FF82FF'17 Carat Diamond'^000000..";
mes "You will receive ^0000FF499,000,000z^000000 afterwards.";
next;
-
mes .@npc$;
mes "Thank you for your business.";
mes "Whenever you need a ^FF82FF'17 Carat Diamond'^000000,";
diff --git a/npc/re/merchants/ninja_craftsman.txt b/npc/re/merchants/ninja_craftsman.txt
index a88069e99..cb6d47cd9 100644
--- a/npc/re/merchants/ninja_craftsman.txt
+++ b/npc/re/merchants/ninja_craftsman.txt
@@ -1,14 +1,14 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= Ninja Weapon and Armor
-//===== By: ==================================================
+//===== By: ==================================================
//= Dastgir
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
+//===== Description: =========================================
//= Ninja Armor and Weapon Craftsman
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Official Conversion. [Dastgir]
-//============================================================
+//============================================================
que_ng,21,72,6 script Master Craftsman Gyo#arm 4_M_RASWORD,{
mes "[Gyo]";
mes "How would you define victory?";
@@ -55,7 +55,7 @@ que_ng,21,72,6 script Master Craftsman Gyo#arm 4_M_RASWORD,{
mes "Looks like you need more time to decide.";
close;
}
-
+
L_Menu:
.@item_make = getarg(0);
while(1){
@@ -177,7 +177,7 @@ L_Menu:
}
next;
}
-
+
L_Ingredients:
switch(getarg(0)){
case 2172: //Wolf_Armguard
@@ -190,7 +190,6 @@ L_Ingredients:
return "you'll need a Special Ninja Suit with a slot and 10 Dark Pieces";
}
end;
-
}
que_ng,23,70,6 script Master Craftsman Ki#weap 4_DST_SOLDIER,{
@@ -231,7 +230,7 @@ que_ng,23,70,6 script Master Craftsman Ki#weap 4_DST_SOLDIER,{
mes "Think carefully~~";
close;
}
-
+
L_Menu:
.@item_make = getarg(0);
while(1){
@@ -336,7 +335,7 @@ L_Menu:
}
next;
}
-
+
L_Ingredients:
switch(getarg(0)){
case 13076: //Raksasa_Dagger
@@ -347,5 +346,4 @@ L_Ingredients:
return "you need one Huuma Calm Mind Shuriken and 100 Broken Shurikens";
}
end;
-
}
diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt
index 33d23450c..d184af61d 100644
--- a/npc/re/merchants/shadow_refiner.txt
+++ b/npc/re/merchants/shadow_refiner.txt
@@ -1,14 +1,14 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= Shadow Refiner
-//===== By: ==================================================
+//===== By: ==================================================
//= Dastgir
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
+//===== Description: =========================================
//= [Aegis Conversion]
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version [Dastgir]
-//============================================================
+//============================================================
itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
disable_items;
@@ -61,7 +61,7 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
.@mate$[1] = "^8C8C8C"+ getitemname(.@s_weapon2[.@index]) +"^000000";
.@miss[1] = 1;
}
- if (getequiprefinerycnt(.@SelectedPart) > 6 && countitem(.@s_weapon3[.@index]))
+ if (getequiprefinerycnt(.@SelectedPart) > 6 && countitem(.@s_weapon3[.@index]))
.@mate$[2] = getitemname(.@s_weapon3[.@index]);
else {
.@mate$[2] = "^8C8C8C"+ getitemname(.@s_weapon3[.@index]) +"^000000";