Replace shield from Natural Regen to Artificial Regen

2 files changed, 14 insertions, 12 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 9db06e603..cb6e7f68e 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -8665,7 +8665,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2701
 	Script: <"
-		bonus bHPrecovRate,1;
+		bonus bHPRegenRate, 1, 1000;
 		bonus bSPrecovRate,-1;
 		bonus bFleeRate, -3;
 		bonus bCriticalDef, 6;
@@ -8687,7 +8687,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2702
 	Script: <"
-		bonus bHPrecovRate,3;
+		bonus bHPRegenRate, 3, 1000;
 		bonus bSPrecovRate,-3;
 		bonus bFleeRate, -6;
 		bonus bCriticalDef, 12;
@@ -8709,7 +8709,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2703
 	Script: <"
-		bonus bHPrecovRate,6;
+		bonus bHPRegenRate, 6, 1000;
 		bonus bSPrecovRate,-6;
 		bonus bFleeRate, -12;
 		bonus bCriticalDef, 23;
@@ -8731,7 +8731,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2704
 	Script: <"
-		bonus bHPrecovRate,4;
+		bonus bHPRegenRate, 4, 1000;
 		bonus bSPrecovRate,-4;
 		bonus bFleeRate, -9;
 		bonus bCriticalDef, 17;
@@ -8753,7 +8753,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2705
 	Script: <"
-		bonus bHPrecovRate,8;
+		bonus bHPRegenRate, 8, 1000;
 		bonus bSPrecovRate,-8;
 		bonus bFleeRate, -17;
 		bonus bCriticalDef, 34;
@@ -8775,7 +8775,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2706
 	Script: <"
-		bonus bHPrecovRate,5;
+		bonus bHPRegenRate, 5, 1000;
 		bonus bSPrecovRate,-5;
 		bonus bFleeRate, -10;
 		bonus bCriticalDef, 20;
@@ -8797,7 +8797,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2707
 	Script: <"
-		bonus bHPrecovRate,1;
+		bonus bHPRegenRate, 1, 1000;
 		bonus bSPrecovRate,-1;
 		bonus bFleeRate, -2;
 		bonus bCriticalDef, 3;
@@ -8818,7 +8818,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2708
 	Script: <"
-		bonus bHPrecovRate,4;
+		bonus bHPRegenRate, 4, 1000;
 		bonus bSPrecovRate,-4;
 		bonus bFleeRate, -8;
 		bonus bCriticalDef, 12;
@@ -8840,7 +8840,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2709
 	Script: <"
-		bonus bHPrecovRate,4;
+		bonus bHPRegenRate, 4, 1000;
 		bonus bSPrecovRate,-4;
 		bonus bFleeRate, -8;
 		bonus bCriticalDef, 15;
@@ -8862,7 +8862,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2710
 	Script: <"
-		bonus bHPrecovRate,2;
+		bonus bHPRegenRate, 2, 1000;
 		bonus bSPrecovRate,-2;
 		bonus bFleeRate, -5;
 		bonus bCriticalDef, 9;
@@ -8884,7 +8884,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2711
 	Script: <"
-		bonus bHPrecovRate,7;
+		bonus bHPRegenRate, 7, 1000;
 		bonus bSPrecovRate,-7;
 		bonus bFleeRate, -14;
 		bonus bCriticalDef, 27;
@@ -8906,7 +8906,7 @@ item_db: (
 	Refine: true
 	ViewSprite: 2712
 	Script: <"
-		bonus bHPrecovRate,8;
+		bonus bHPRegenRate, 8, 1000;
 		bonus bSPrecovRate,-8;
 		bonus bFleeRate, -16;
 		bonus bCriticalDef, 31;
diff --git a/npc/018-6-0/main.txt b/npc/018-6-0/main.txt
index 683c21239..8ea6a6644 100644
--- a/npc/018-6-0/main.txt
+++ b/npc/018-6-0/main.txt
@@ -79,9 +79,11 @@ OnTouch:
         setq1 LoFQuest_Barbara, 3;
         setq3 LoFQuest_Barbara, 0;
     }
+    if (!is_staff()) {
     // TODO stop here FIXME
     mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
     close;
+    }
     // Execute the warp
     warp BarbaraInstCheck(3), 31, 151;
     end;