- Follow-up to r15923: fixed renamed file not being svn-copied (and lacking svn history).

- Added svn:eol-style=native property for some recently added text files.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15924 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 77 insertions, 51 deletions

diff --git a/npc/custom/healers/heal.txt b/npc/custom/healers/heal.txt
index 09f14cb60..3c4e136e9 100644
--- a/npc/custom/healers/heal.txt
+++ b/npc/custom/healers/heal.txt
@@ -1,54 +1,53 @@
 //===== rAthena Script =======================================
 //= Healer
 //===== By: ==================================================
-//= lots of people
+//= rAthena Dev Team
 //===== Current Version: =====================================
-//= 3.1
+//= 3.2
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
 //= Healer NPC Which Heals For Free
 //===== Additional Comments: =================================
-//= 2.0 Duplicates And Changed A Bit you can replace this script file by 
-//= heal_payment.txt if you want that players have to pay their healings. [Darkchild]
-//= 3.0 Changed and edited the script added other warp points of maps. [massdriller]
-//= 3.1 Optimized for the greater good. [Kisuka]
+//= 
 //============================================================
 
--	script	Healer#h1-1::Healer	742,{
+-	script	healer	-1,{
 	callfunc "F_ClearGarbage",0;
-	
 	mes "[Healer]";
 	mes "I have amazing healing powers!!";
 	mes "You look like a person who needs them";
 	mes "Want some?";
 	next;
-	if (select("Heal:No thanks") == 1) {
+	switch(select("Heal:No thanks")) {
+	case 1:
 		percentheal 100,100;
 		mes "[Healer]";
 		mes "Wonderfull, You are now healed!.";
 		mes "Have fun adventuring!!";
-	} else {
+		break;
+	case 2:
 		mes "[Healer]";
 		mes "Alright, come back if you need a heal.";
+		break;
 	}
 	close;
 }
 
-// --------- NPC Clones ---------
-prontera,150,184,5	duplicate(Healer)	Healer#h1-1	742
-morocc,159,96,5	duplicate(Healer)	Healer#h1-2	742
-ayothaya,155,111,5	duplicate(Healer)	Healer#h1-3	742
-geffen,121,61,5	duplicate(Healer)	Healer#h1-4	742
-umbala,94,162,5	duplicate(Healer)	Healer#h1-5	742
-payon,180,105,5	duplicate(Healer)	Healer#h1-6	742
-alberta,185,144,5	duplicate(Healer)	Healer#h1-7	742
-aldebaran,134,123,5	duplicate(Healer)	Healer#h1-8	742
-izlude,125,118,5	duplicate(Healer)	Healer#h1-9	742
-xmas,149,136,5	duplicate(Healer)	Healer#h1-10	742
-comodo,188,162,5	duplicate(Healer)	Healer#h1-11	742
-amatsu,200,80,5	duplicate(Healer)	Healer#h1-12	742
-gonryun,164,130,5	duplicate(Healer)	Healer#h1-13	742
-yuno,152,186,5	duplicate(Healer)	Healer#h1-14	742
-niflheim,188,180,5	duplicate(Healer)	Healer#h1-15	742
-louyang,225,103,5	duplicate(Healer)	Healer#h1-16	742
+// NPC Duplicates
+alberta,185,144,5	duplicate(healer)	Healer#alb	742
+aldebaran,134,123,5	duplicate(healer)	Healer#alde	742
+amatsu,200,80,5	duplicate(healer)	Healer#ama	742
+ayothaya,155,111,5	duplicate(healer)	Healer#ayo	742
+comodo,188,162,5	duplicate(healer)	Healer#com	742
+geffen,121,61,5	duplicate(healer)	Healer#gef	742
+gonryun,164,130,5	duplicate(healer)	Healer#gon	742
+izlude,125,118,5	duplicate(healer)	Healer#izl	742
+louyang,225,103,5	duplicate(healer)	Healer#lou	742
+morocc,159,96,5	duplicate(healer)	Healer#mor	742
+niflheim,188,180,5	duplicate(healer)	Healer#nif	742
+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
diff --git a/npc/custom/healers/heal_payment.txt b/npc/custom/healers/heal_payment.txt
index 0cc30e6f6..4bcbd5d4e 100644
--- a/npc/custom/healers/heal_payment.txt
+++ b/npc/custom/healers/heal_payment.txt
@@ -1,9 +1,9 @@
 //===== rAthena Script =======================================
-//= Healer (/w payments)
+//= Healer (with payment)
 //===== By: ==================================================
-//= Yor & abunch of other people
+//= rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.3
+//= 2.0
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -13,12 +13,39 @@
 //= each HP need 1 zeny
 //= each SP need (baselevel / 5) zenys
 //= calculation is done at start of the script
-//= Added Duplicates And Correct payon Loc [Darkchild]
-//= Some modifications. Added NPC locations. [massdriller]
-//= Removed Duplicates [Silent]
 //============================================================
 
--	script	Healer#h2-1::Healer2	742,{
+-	script	healer2	-1,{
+	set .@hp, MaxHp - Hp;
+	set .@sp, MaxSp - Sp;
+	
+	
+	
+	
+	
+	mes "[Healer]";
+	mes "I have amazing healing powers!!";
+	mes "You look like a person who needs them";
+	mes "Want some?";
+	next;
+	switch(select("Heal:No thanks")) {
+	case 1:
+		percentheal 100,100;
+		mes "[Healer]";
+		mes "Wonderfull, You are now healed!.";
+		mes "Have fun adventuring!!";
+		break;
+	case 2:
+		mes "[Healer]";
+		mes "Alright, come back if you need a heal.";
+		break;
+	}
+	close;
+}
+
+
+
+
 	set @tempHp, MaxHp-Hp;
 	set @tempSpReal, MaxSp-Sp;
 	set @tempSp, ((MaxSp-Sp) * BaseLevel) / 5;
@@ -89,20 +116,20 @@ CANCEL:
 	close;
 }
 
-
-prontera,150,184,5	duplicate(Healer2)	Healer#h2-1	742
-morocc,159,96,5	duplicate(Healer2)	Healer#h2-2	742
-ayothaya,155,111,5	duplicate(Healer2)	Healer#h2-3	742
-geffen,121,61,5	duplicate(Healer2)	Healer#h2-4	742
-umbala,94,162,5	duplicate(Healer2)	Healer#h2-5	742
-payon,180,105,5	duplicate(Healer2)	Healer#h2-6	742
-alberta,185,144,5	duplicate(Healer2)	Healer#h2-7	742
-aldebaran,134,123,5	duplicate(Healer2)	Healer#h2-8	742
-izlude,125,118,5	duplicate(Healer2)	Healer#h2-9	742
-xmas,149,136,5	duplicate(Healer2)	Healer#h2-10	742
-comodo,188,162,5	duplicate(Healer2)	Healer#h2-11	742
-amatsu,200,80,5	duplicate(Healer2)	Healer#h2-12	742
-gonryun,164,130,5	duplicate(Healer2)	Healer#h2-13	742
-yuno,152,186,5	duplicate(Healer2)	Healer#h2-14	742
-niflheim,188,180,5	duplicate(Healer2)	Healer#h2-15	742
-louyang,225,103,5	duplicate(Healer2)	Healer#h2-16	742
+// NPC Duplicates
+alberta,185,144,5	duplicate(healer2)	Healer#alb	742
+aldebaran,134,123,5	duplicate(healer2)	Healer#alde	742
+amatsu,200,80,5	duplicate(healer2)	Healer#ama	742
+ayothaya,155,111,5	duplicate(healer2)	Healer#ayo	742
+comodo,188,162,5	duplicate(healer2)	Healer#com	742
+geffen,121,61,5	duplicate(healer2)	Healer#gef	742
+gonryun,164,130,5	duplicate(healer2)	Healer#gon	742
+izlude,125,118,5	duplicate(healer2)	Healer#izl	742
+louyang,225,103,5	duplicate(healer2)	Healer#lou	742
+morocc,159,96,5	duplicate(healer2)	Healer#mor	742
+niflheim,188,180,5	duplicate(healer2)	Healer#nif	742
+payon,180,105,5	duplicate(healer2)	Healer#pay	742
+prontera,150,184,5	duplicate(healer2)	Healer#pront	742
+umbala,94,162,5	duplicate(healer2)	Healer#umb	742
+xmas,149,136,5	duplicate(healer2)	Healer#xmas	742
+yuno,152,186,5	duplicate(healer2)	Healer#yuno	742