Unlock refine up to +15 after MK is slain.

2 files changed, 43 insertions, 44 deletions

diff --git a/db/re/refine_db.conf b/db/re/refine_db.conf
index 364c9a412..3c567f7ca 100644
--- a/db/re/refine_db.conf
+++ b/db/re/refine_db.conf
@@ -75,7 +75,7 @@ Armors/WeaponLevel1~4: {                                       // Specifies weap
 	}
 }
 
-IMPORTANT: On TMW2, max refine level set by scripts is 10
+IMPORTANT: On TMW2, max refine level set by scripts is 10~15
 **************************************************************************/
 
 Armors: {
@@ -141,22 +141,22 @@ Armors: {
 			EnrichedChance: 20
 			Bonus: 600
 		}
-        // Anything below this line was NOT MAINTENANED
 		Lv13: {
 			NormalChance: 16
 			EnrichedChance: 10
-			Bonus: 400
+			Bonus: 600
 		}
 		Lv14: {
-			NormalChance: 0
-			EnrichedChance: 0
-			Bonus: 400
+			NormalChance: 12
+			EnrichedChance: 8
+			Bonus: 600
 		}
 		Lv15: {
-			NormalChance: 0
-			EnrichedChance: 0
-			Bonus: 400
+			NormalChance: 8
+			EnrichedChance: 6
+			Bonus: 700
 		}
+		// Anything below this line was NOT MAINTENANED
 		Lv16: {
 			NormalChance: 0
 			EnrichedChance: 0
@@ -242,27 +242,24 @@ WeaponLevel1: {
 		Lv11: {
 			NormalChance: 30
 			EnrichedChance: 30
-			Bonus: 600
 		}
 		Lv12: {
 			NormalChance: 23
 			EnrichedChance: 20
-			Bonus: 600
 		}
-        // Anything below this line was NOT MAINTENANED
 		Lv13: {
 			NormalChance: 16
 			EnrichedChance: 10
-			Bonus: 400
 		}
 		Lv14: {
-			NormalChance: 0
-			EnrichedChance: 0
+			NormalChance: 12
+			EnrichedChance: 8
 		}
 		Lv15: {
-			NormalChance: 0
-			EnrichedChance: 0
+			NormalChance: 8
+			EnrichedChance: 6
 		}
+		// Anything below this line was NOT MAINTENANED
 		Lv16: {
 			NormalChance: 0
 			EnrichedChance: 0
@@ -363,27 +360,24 @@ WeaponLevel2: {
 		Lv11: {
 			NormalChance: 30
 			EnrichedChance: 30
-			Bonus: 600
 		}
 		Lv12: {
 			NormalChance: 23
 			EnrichedChance: 20
-			Bonus: 600
 		}
-        // Anything below this line was NOT MAINTENANED
 		Lv13: {
 			NormalChance: 16
 			EnrichedChance: 10
-			Bonus: 400
 		}
 		Lv14: {
-			NormalChance: 0
-			EnrichedChance: 0
+			NormalChance: 12
+			EnrichedChance: 8
 		}
 		Lv15: {
-			NormalChance: 0
-			EnrichedChance: 0
+			NormalChance: 8
+			EnrichedChance: 6
 		}
+		// Anything below this line was NOT MAINTENANED
 		Lv16: {
 			NormalChance: 0
 			EnrichedChance: 0
@@ -466,27 +460,24 @@ WeaponLevel3: {
 		Lv11: {
 			NormalChance: 30
 			EnrichedChance: 30
-			Bonus: 600
 		}
 		Lv12: {
 			NormalChance: 23
 			EnrichedChance: 20
-			Bonus: 600
 		}
-        // Anything below this line was NOT MAINTENANED
 		Lv13: {
 			NormalChance: 16
 			EnrichedChance: 10
-			Bonus: 400
 		}
 		Lv14: {
-			NormalChance: 0
-			EnrichedChance: 0
+			NormalChance: 12
+			EnrichedChance: 8
 		}
 		Lv15: {
-			NormalChance: 0
-			EnrichedChance: 0
+			NormalChance: 8
+			EnrichedChance: 6
 		}
+		// Anything below this line was NOT MAINTENANED
 		Lv16: {
 			NormalChance: 0
 			EnrichedChance: 0
@@ -569,27 +560,24 @@ WeaponLevel4: {
 		Lv11: {
 			NormalChance: 30
 			EnrichedChance: 30
-			Bonus: 600
 		}
 		Lv12: {
 			NormalChance: 23
 			EnrichedChance: 20
-			Bonus: 600
 		}
-        // Anything below this line was NOT MAINTENANED
 		Lv13: {
 			NormalChance: 16
 			EnrichedChance: 10
-			Bonus: 400
 		}
 		Lv14: {
-			NormalChance: 0
-			EnrichedChance: 0
+			NormalChance: 12
+			EnrichedChance: 8
 		}
 		Lv15: {
-			NormalChance: 0
-			EnrichedChance: 0
+			NormalChance: 8
+			EnrichedChance: 6
 		}
+		// Anything below this line was NOT MAINTENANED
 		Lv16: {
 			NormalChance: 0
 			EnrichedChance: 0
diff --git a/npc/functions/refine.txt b/npc/functions/refine.txt
index 3baa477ea..fe10d8403 100644
--- a/npc/functions/refine.txt
+++ b/npc/functions/refine.txt
@@ -84,7 +84,11 @@ function	script	refineMaster	{
         .@savior = true;
 
     // Max refining level: 10
-	if (getequiprefinerycnt(.@it) >= (.@savior ? 12 : 10)) {
+    if ($WORLD_STORYLINE >= 5)
+        .@maxlv = (.@savior ? 12 : 10);
+    else
+        .@maxlv = (.@savior ? 15 : 12);
+	if (getequiprefinerycnt(.@it) >= .@maxlv) {
 		mesn;
 		mesq l("This item cannot be refined further.");
         return;
@@ -94,13 +98,13 @@ function	script	refineMaster	{
     .@price=(.@rlv+1)*1000;
     .@price-=min(.@price, getiteminfo(.@item, ITEMINFO_ELV) * 10);
 	.@price=POL_AdjustPrice(.@price);
-    .@amount=(.@rlv/2)+1;
     // required item
     switch (.@rlv) {
         case 0:
         case 1:
         case 2:
         case 3:
+            .@amount=(.@rlv/2)+1;
             .@rg=Wurtzite; break;
         case 4:
         case 5:
@@ -111,9 +115,16 @@ function	script	refineMaster	{
         case 8:
         case 9:
         case 10:
-        default:
             .@amount=((.@rlv-8)/2)+1;
             .@rg=Arcanum; break;
+        case 11:
+        case 12:
+        case 13:
+        case 14:
+        case 15:
+        default:
+            .@amount=((.@rlv-8)/2)+2;
+            .@rg=Arcanum; break;
     }
     mesn;
     mesq l("This @@ is a nice stuff. I can refine it for @@ GP and @@ @@.", getitemlink(.@item), .@price, .@amount, getitemlink(.@rg));