Browse Source

fixed repairsman

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5354 54d463be-8e91-2dee-dedb-b68131a5f0ec
Lupus 19 years ago
parent
commit
31a767e17c
3 changed files with 15 additions and 13 deletions
  1. 2 0
      npc/Changelog.txt
  2. 1 0
      npc/kafras/functions_kafras.txt
  3. 12 13
      npc/merchants/refine.txt

+ 2 - 0
npc/Changelog.txt

@@ -28,6 +28,8 @@ Nexon
 Date		Added
 Date		Added
 ======
 ======
 
 
+02/21
+	* Fixed wrong indication of Repairsman, thanks to NeoSaro [Lupus]
 02/17
 02/17
 	* Added Kafra Storage Password (some official severs use it as an additional protection) [Lupus]
 	* Added Kafra Storage Password (some official severs use it as an additional protection) [Lupus]
 	- Read functions_kafras.txt comments if you want to disable this feature
 	- Read functions_kafras.txt comments if you want to disable this feature

+ 1 - 0
npc/kafras/functions_kafras.txt

@@ -29,6 +29,7 @@
 //= 3.2 Fixed an exploit [Lupus]
 //= 3.2 Fixed an exploit [Lupus]
 //= 4.0 Added Kafra storage password protection. [Lupus]
 //= 4.0 Added Kafra storage password protection. [Lupus]
 //=	to block Kafra Password, read comments at 350 line
 //=	to block Kafra Password, read comments at 350 line
+//=	Note: You can change '1337' value to another to raise password protection
 //============================================================ 
 //============================================================ 
 
 
 
 

+ 12 - 13
npc/merchants/refine.txt

@@ -1,11 +1,9 @@
 //===== Freya Script =========================================
 //===== Freya Script =========================================
 //= Refining NPCs
 //= Refining NPCs
 //===== By: ==================================================
 //===== By: ==================================================
-//= Syrus22 (1.1)
-//= dafide18 (1.4)
-//= Skotlex (1.5)
+//= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8a
 //===== Compatible With: =====================================
 //===== Compatible With: =====================================
 //= Any Freya Version
 //= Any Freya Version
 //===== Description: =========================================
 //===== Description: =========================================
@@ -34,6 +32,7 @@
 //= 1.6	- Replaced all breaks for ends as per the new script engine [Skotlex]
 //= 1.6	- Replaced all breaks for ends as per the new script engine [Skotlex]
 //= 1.7 - Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3]
 //= 1.7 - Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3]
 //= 1.8 - Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3]
 //= 1.8 - Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3]
+//= 1.8a fixed wrong indication thanks to NeoSaro [Lupus]
 //============================================================
 //============================================================
 
 
 
 
@@ -800,7 +799,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR2:
 	REPAIR2:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken2) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;
@@ -812,7 +811,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR3:
 	REPAIR3:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken3) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;
@@ -824,7 +823,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR4:
 	REPAIR4:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken4) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;
@@ -836,7 +835,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR5:
 	REPAIR5:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken5) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;
@@ -848,7 +847,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR6:
 	REPAIR6:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken6) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;
@@ -860,7 +859,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR7:
 	REPAIR7:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken7) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;
@@ -872,7 +871,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR8:
 	REPAIR8:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken8) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;
@@ -884,7 +883,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR9:
 	REPAIR9:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken9) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;
@@ -896,7 +895,7 @@ function	script	repairmain	{
 			goto L_CLOSE;
 			goto L_CLOSE;
 	REPAIR10:
 	REPAIR10:
 		mes "[" + @name$ + "]";
 		mes "[" + @name$ + "]";
-		mes "You're gonna repair " + getitemname(@broken1) + ".";
+		mes "You're gonna repair " + getitemname(@broken10) + ".";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny.";
 		mes "Continue?";
 		mes "Continue?";
 		next;
 		next;