summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-01 04:06:10 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-01 04:06:10 +0000
commitb87430245ee4dad7dbeb0e2ee54ae0ff2f782fd2 (patch)
tree917e34433bac016ae64465214e4432f85c9f0a97 /npc/custom
parent74b92bb34163160e59e24dd6a07c16e30e9743be (diff)
downloadhercules-b87430245ee4dad7dbeb0e2ee54ae0ff2f782fd2.tar.gz
hercules-b87430245ee4dad7dbeb0e2ee54ae0ff2f782fd2.tar.bz2
hercules-b87430245ee4dad7dbeb0e2ee54ae0ff2f782fd2.tar.xz
hercules-b87430245ee4dad7dbeb0e2ee54ae0ff2f782fd2.zip
- Replaced more -> rAthena (follow up to r15251).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16195 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/breeder.txt10
-rw-r--r--npc/custom/etc/bank.txt2
-rw-r--r--npc/custom/etc/mvp_arena.txt2
-rw-r--r--npc/custom/healer.txt12
-rw-r--r--npc/custom/itemmall.txt4
-rw-r--r--npc/custom/resetnpc.txt2
-rw-r--r--npc/custom/stylist.txt2
-rw-r--r--npc/custom/warper.txt2
8 files changed, 18 insertions, 18 deletions
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index 580042b45..d03928ad2 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -25,29 +25,27 @@ prontera,124,201,1 script Universal Rental Npc 726,{
case 1:
if((BaseClass == Job_Merchant || BaseJob == Job_SuperNovice) && checkcart() == 0 && getskilllv("MC_PUSHCART")>0) {
setcart;
- close;
} else {
mes "[Universal Rental Npc]";
mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
- close;
}
+ break;
case 2:
if(BaseJob != Job_Archer && BaseClass == Job_Archer && checkfalcon() == 0 && getskilllv("HT_FALCON")>0) {
setfalcon;
- close;
} else {
mes "[Universal Rental Npc]";
mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
- close;
}
+ break;
case 3:
if (BaseJob != Job_Swordman && BaseClass == Job_Swordman && checkriding() == 0 && getskilllv("KN_RIDING")>0) {
setriding;
- close;
} else {
mes "[Universal Rental Npc]";
mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
- close;
}
+ break;
}
+ close;
}
diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt
index 33fc558f9..ed514c901 100644
--- a/npc/custom/etc/bank.txt
+++ b/npc/custom/etc/bank.txt
@@ -116,4 +116,4 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
mes "Very well... come again soon.";
close;
}
-} // EOF \ No newline at end of file
+}
diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt
index 7047eaa21..2cc3fb36d 100644
--- a/npc/custom/etc/mvp_arena.txt
+++ b/npc/custom/etc/mvp_arena.txt
@@ -319,4 +319,4 @@ pvp_n_4-5 mapflag pvp_nightmaredrop off
pvp_n_5-5 mapflag pvp_nightmaredrop off
pvp_n_6-5 mapflag pvp_nightmaredrop off
pvp_n_7-5 mapflag pvp_nightmaredrop off
-pvp_n_8-5 mapflag pvp_nightmaredrop off \ No newline at end of file
+pvp_n_8-5 mapflag pvp_nightmaredrop off
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt
index 9b1bacfbe..b8873d6b9 100644
--- a/npc/custom/healer.txt
+++ b/npc/custom/healer.txt
@@ -16,19 +16,21 @@
set .@Buffs,0; // Also buff players? (1: yes / 0: no)
set .@Delay,0; // Heal delay, in seconds
+ callfunc "F_ClearGarbage",0;
if (@HD > gettimetick(2)) end;
if (.@Price) {
message strcharinfo(0),"Healing costs "+.@Price+" Zeny.";
if (Zeny < .@Price) end;
if(select("^0055FFHeal^000000:^777777Cancel^000000")==2) close;
- set Zeny, Zeny-.@Price; }
+ set Zeny, Zeny-.@Price;
+ }
specialeffect2 313; percentheal 100,100;
if (.@Buffs) {
specialeffect2 37; sc_start SC_INCREASEAGI,240000,10;
- specialeffect2 42; sc_start SC_BLESSING,240000,10; }
+ specialeffect2 42; sc_start SC_BLESSING,240000,10;
+ }
if (.@Delay) set @HD, gettimetick(2)+.@Delay;
- if (.@Price) close;
- end;
+ close;
}
alberta,185,144,5 duplicate(Healer) Healer#alb 742
@@ -46,4 +48,4 @@ payon,180,105,5 duplicate(Healer) Healer#pay 742
prontera,150,184,5 duplicate(Healer) Healer#pront 742
umbala,94,162,5 duplicate(Healer) Healer#umb 742
xmas,149,136,5 duplicate(Healer) Healer#xmas 742
-yuno,152,186,5 duplicate(Healer) Healer#yuno 742 \ No newline at end of file
+yuno,152,186,5 duplicate(Healer) Healer#yuno 742
diff --git a/npc/custom/itemmall.txt b/npc/custom/itemmall.txt
index bbc20420d..aeff0e1fd 100644
--- a/npc/custom/itemmall.txt
+++ b/npc/custom/itemmall.txt
@@ -5,7 +5,7 @@
//===== Current Version: =====================================
//= 1.0 [Masao]
//===== Compatible With: =====================================
-//= Any rA SVN
+//= rAthena SVN
//===== Description: =========================================
//= A Shopstreet in Prontera where players can buy some Equipment.
//============================================================
@@ -41,4 +41,4 @@ prontera,164,238,4 shop Headgear 05 832,5340:50000,5341:50000,5342:50000,5343:50
prontera,151,284,4 shop Ammunition 880,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
prontera,153,284,4 shop Alchemist Dealer 880,715:600,716:600,717:600,1025:200,7136:500,7135:500,7136:500,7137:500,7138:500,7139:500
prontera,155,284,4 shop Street Dealer 880,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
-prontera,157,284,4 shop Sheepy Gonzales 895,12028:1000,12262:500,12016:750 \ No newline at end of file
+prontera,157,284,4 shop Sheepy Gonzales 895,12028:1000,12262:500,12016:750
diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt
index 6d630a41f..bc7132651 100644
--- a/npc/custom/resetnpc.txt
+++ b/npc/custom/resetnpc.txt
@@ -59,4 +59,4 @@ prontera,150,193,4 script Reset Girl 124,{
case 4:
close;
}
-} \ No newline at end of file
+}
diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt
index 3bcb04c9e..73c20a206 100644
--- a/npc/custom/stylist.txt
+++ b/npc/custom/stylist.txt
@@ -30,4 +30,4 @@ prontera,170,180,1 script Stylist#custom_stylist 122,{
break;
case 4: set .@Style, .@Revert; setlook .@Look[.@s], .@Revert; break; }
} end;
-} \ No newline at end of file
+}
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index 7980f6ccd..8c85997e5 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -382,4 +382,4 @@ veins,214,123,4 duplicate(Warper) Warper#43 811
dewata,194,178,6 duplicate(Warper) Warper#44 811
eclage,107,37,4 duplicate(Warper) Warper#45 811
malaya,210,205,4 duplicate(Warper) Warper#46 811
-malangdo,220,188,6 duplicate(Warper) Warper#47 811 \ No newline at end of file
+malangdo,220,188,6 duplicate(Warper) Warper#47 811