Fix tabulations. Presenting Platinum 4 Leaf Amulet, the yet-to-be final advancement

of the useless Crozenite 4 leaf amulet and the useless 4 leaf clover.

1 files changed, 146 insertions, 126 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 26b423202..c23833224 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -452,9 +452,9 @@ item_db: (
 		@min = 35;
 		@max = 100;
 		if ($@SEASON == WINTER) {
-		    @min = 105;
-		    @max = 300;
-        }
+			@min = 105;
+			@max = 300;
+		}
 		@delay = 4;
 		@type = 1;
 		doevent "rand_sc_heal::OnUse";
@@ -1141,9 +1141,9 @@ item_db: (
 		@min = 4;
 		@max = 240;
 		if ($@SEASON == WINTER) {
-		    @min = 12;
-		    @max = 720;
-        }
+			@min = 12;
+			@max = 720;
+		}
 		@delay = 4;
 		@type = 1;
 		doevent "rand_sc_heal::OnUse";
@@ -1507,10 +1507,10 @@ item_db: (
 	Script: <"
 		@min = 100;
 		@max = 400;
-        if ($EVENT$ == "Christmas") {
-            @min=300;
-            @max=1200;
-        }
+		if ($EVENT$ == "Christmas") {
+			@min=300;
+			@max=1200;
+		}
 		@delay = 3;
 		@type = 1;
 		doevent "rand_sc_heal::OnUse";
@@ -1531,10 +1531,10 @@ item_db: (
 	Script: <"
 		@min = 80;
 		@max = 350;
-        if ($EVENT$ == "Christmas") {
-            @min=240;
-            @max=1050;
-        }
+		if ($EVENT$ == "Christmas") {
+			@min=240;
+			@max=1050;
+		}
 		@delay = 4;
 		@type = 1;
 		doevent "rand_sc_heal::OnUse";
@@ -1855,10 +1855,10 @@ item_db: (
 		@max = 1400;
 		@delay = 3;
 		@type = 1;
-        // Effect up on Aeros
-        getmapxy(.@ma$,.@xa,.@ya,0);
-        if (.@ma$ ~= "001-*")
-            @min+=400;
+		// Effect up on Aeros
+		getmapxy(.@ma$,.@xa,.@ya,0);
+		if (.@ma$ ~= "001-*")
+			@min+=400;
 		doevent "rand_sc_heal::OnUse";
 		getitem EmptyBottle, 1;
 	">
@@ -2233,9 +2233,9 @@ item_db: (
 			getitem .@it, rand(2,3);
 			dispbottom l("Dear @@, I send you this gift in hopes you do well in TMW2.", strcharinfo(0));
 			//rodex_sendmail_acc(#REFERRAL_PROG, "TMW2 Team", "Invite Accepted", strcharinfo(0)+" accepted your invite and got level 5!\nThe one who invites most will win the recruitment event!", rand(50,150));
-            $REFERRAL_IDS[#REFERRAL_PROG]=$REFERRAL_IDS[#REFERRAL_PROG]+1;
-            // I can't warrant this won't break stuff so I left commented out
-            //message(#REFERRAL_PROG, strcharinfo(0)+" accepted your invite to play TMW2.");
+			$REFERRAL_IDS[#REFERRAL_PROG]=$REFERRAL_IDS[#REFERRAL_PROG]+1;
+			// I can't warrant this won't break stuff so I left commented out
+			//message(#REFERRAL_PROG, strcharinfo(0)+" accepted your invite to play TMW2.");
 		}
 	">
 },
@@ -2492,8 +2492,8 @@ item_db: (
 	Script: <"
 			if (!getmapxy(.@map$, .@x, .@y, 0)) {
 				monster(.@map$, .@x, .@y, l("Pumpkandy"), Pumpkandy, 1);
-                if ($EVENT$ == "Halloween")
-    				monster(.@map$, .@x, .@y, l("Pumpkandy"), Pumpkandy, 1);
+				if ($EVENT$ == "Halloween")
+					monster(.@map$, .@x, .@y, l("Pumpkandy"), Pumpkandy, 1);
 				//$TREE_PLANTED=$TREE_PLANTED+1; // Not a tree.
 			}
 			">
@@ -2537,19 +2537,19 @@ item_db: (
 		setarray .@s, SantaGlobe, SnowmanGlobe, UglyChristmasSweater, MercBoxB, IceGladius;
 		setarray .@r, SantaGlobe, SnowmanGlobe, UglyChristmasSweater, TneckSweater, MercBoxA, MercBoxA, MercBoxB, ElixirOfLife, NoviceWand, LeadOre, DarkDesertMushroom;
 		setarray .@c, BronzeGift, IcedBottle, TneckSweater, MercBoxA, MercBoxA, ClothoLiquor, Dagger, Dagger, HastePotion, HerbalTea, StrengthPotion, TrainingWand;
-        .@al=rand(0,100);
-        // 1% super rare chance
-        if (.@al < 1) {
-		    .@n=rand(getarraysize(.@s));
-		    getitem .@s[.@n], 1;
-        // 26% rare chance
-        } else if (rand(0,100) < 27) {
-		    .@n=rand(getarraysize(.@r));
-		    getitem .@r[.@n], 1;
-        } else {
-		    .@n=rand(getarraysize(.@c));
-		    getitem .@c[.@n], 1;
-        }
+		.@al=rand(0,100);
+		// 1% super rare chance
+		if (.@al < 1) {
+			.@n=rand(getarraysize(.@s));
+			getitem .@s[.@n], 1;
+		// 26% rare chance
+		} else if (rand(0,100) < 27) {
+			.@n=rand(getarraysize(.@r));
+			getitem .@r[.@n], 1;
+		} else {
+			.@n=rand(getarraysize(.@c));
+			getitem .@c[.@n], 1;
+		}
 	">
 },
 {
@@ -4666,17 +4666,22 @@ item_db: (
 },
 {
 	Id: 1004
-	AegisName: "HeartNecklace"
-	Name: "Heart Necklace"
+	AegisName: "PlatinumFourLeafAmulet"
+	Name: "Platinum Four-Leaf Amulet"
 	Type: "IT_ARMOR"
-	Buy: 75000
-	Sell: 10000
-	Weight: 100
-	Def: 1
+	Buy: 1000000
+	Sell: 30000
+	Weight: 35
 	Loc: 1024
-	EquipLv: 90
+	EquipLv: 45
 	Refine: false
 	ViewSprite: 1004
+	Script: <"
+		bonus bCriticalDef,12;
+		bonus bDef2Rate,10;
+		bonus bLuk,5;
+		bonus bCritical,2;
+	">
 },
 {
 	Id: 1005
@@ -4943,6 +4948,21 @@ item_db: (
 	">
 },
 {
+	Id: 1021
+	AegisName: "HeartNecklace"
+	Name: "Heart Necklace"
+	Type: "IT_ARMOR"
+	Buy: 75000
+	Sell: 10000
+	Weight: 100
+	Def: 1
+	Loc: 1024
+	EquipLv: 90
+	Refine: false
+	ViewSprite: 1004
+},
+// <!-- Charms -->
+{
 	Id: 1150
 	AegisName: "FourLeafClover"
 	Name: "Four Leaf Clover"
@@ -9947,7 +9967,7 @@ item_db: (
 	EquipLv: 1
 	Refine: true
 	Subtype: "W_1HSWORD"
-    // Equipment level is 1 on purpose. Less level = less worthy = more damage by wielding
+	// Equipment level is 1 on purpose. Less level = less worthy = more damage by wielding
 	Trade: {
 		nodrop: true
 		notrade: true
@@ -9964,13 +9984,13 @@ item_db: (
 		bonus bAtkEle,Ele_Holy;
 
 		if (strcharinfo(0) != "Jesus Saves" && BaseLevel < 255) {
-    		bonus bNoRegen,1;
+			bonus bNoRegen,1;
 			bonus2 bSPLossRate,(255-BaseLevel)/30,(1000-(BaseLevel*2));
 			bonus2 bHPLossRate,(255-BaseLevel)/40,(1000-(BaseLevel*2));
 		}
 		if (strcharinfo(2) == "Monster King") {
 			bonus2 bSubEle,Ele_Holy,-40;
-    		bonus bNoRegen,2;
+			bonus bNoRegen,2;
 		}
 	">
 },
@@ -11119,29 +11139,29 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-        .@seed=rand(0, 10000);
+		.@seed=rand(0, 10000);
 
-        // 0.5%
-        if (.@seed < 50) {
-    		setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
-    		.@n=rand(getarraysize(.@r));
-        // 2.0%
-        } else if (.@seed < 250) {
-    		setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne;
-    		.@n=rand(getarraysize(.@r));
-        // 10.0%
-        } else if (.@seed < 1250) {
-    		setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable;
-    		.@n=rand(getarraysize(.@r));
-        // 25.0%
-        } else if (.@seed < 3750) {
-    		setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure;
-    		.@n=rand(getarraysize(.@r));
-        // 62.5%
-        } else {
-    		setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_GonzoDark;
-    		.@n=rand(getarraysize(.@r));
-        }
+		// 0.5%
+		if (.@seed < 50) {
+			setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
+			.@n=rand(getarraysize(.@r));
+		// 2.0%
+		} else if (.@seed < 250) {
+			setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne;
+			.@n=rand(getarraysize(.@r));
+		// 10.0%
+		} else if (.@seed < 1250) {
+			setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable;
+			.@n=rand(getarraysize(.@r));
+		// 25.0%
+		} else if (.@seed < 3750) {
+			setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure;
+			.@n=rand(getarraysize(.@r));
+		// 62.5%
+		} else {
+			setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_GonzoDark;
+			.@n=rand(getarraysize(.@r));
+		}
 
 		getitem .@r[.@n], 1;
 	">
@@ -11164,29 +11184,29 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-        .@seed=rand(0, 10000);
+		.@seed=rand(0, 10000);
 
-        // 1.0%
-        if (.@seed < 100) {
-    		setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
-    		.@n=rand(getarraysize(.@r));
-        // 5.0%
-        } else if (.@seed < 600) {
-    		setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne;
-    		.@n=rand(getarraysize(.@r));
-        // 20.0%
-        } else if (.@seed < 2100) {
-    		setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable;
-    		.@n=rand(getarraysize(.@r));
-        // 35.0%
-        } else if (.@seed < 5600) {
-    		setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure;
-    		.@n=rand(getarraysize(.@r));
-        // 44.0%
-        } else {
-    		setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_GonzoDark;
-    		.@n=rand(getarraysize(.@r));
-        }
+		// 1.0%
+		if (.@seed < 100) {
+			setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
+			.@n=rand(getarraysize(.@r));
+		// 5.0%
+		} else if (.@seed < 600) {
+			setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne;
+			.@n=rand(getarraysize(.@r));
+		// 20.0%
+		} else if (.@seed < 2100) {
+			setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable;
+			.@n=rand(getarraysize(.@r));
+		// 35.0%
+		} else if (.@seed < 5600) {
+			setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure;
+			.@n=rand(getarraysize(.@r));
+		// 44.0%
+		} else {
+			setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_GonzoDark;
+			.@n=rand(getarraysize(.@r));
+		}
 
 		getitem .@r[.@n], 1;
 	">
@@ -11209,29 +11229,29 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-        .@seed=rand(0, 10000);
+		.@seed=rand(0, 10000);
 
-        // 2.0%
-        if (.@seed < 200) {
-    		setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
-    		.@n=rand(getarraysize(.@r));
-        // 10.0%
-        } else if (.@seed < 1200) {
-    		setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne;
-    		.@n=rand(getarraysize(.@r));
-        // 30.0%
-        } else if (.@seed < 4200) {
-    		setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable;
-    		.@n=rand(getarraysize(.@r));
-        // 50.0%
-        } else if (.@seed < 9200) {
-    		setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure;
-    		.@n=rand(getarraysize(.@r));
-        // 8.0%
-        } else {
-    		setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_GonzoDark;
-    		.@n=rand(getarraysize(.@r));
-        }
+		// 2.0%
+		if (.@seed < 200) {
+			setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
+			.@n=rand(getarraysize(.@r));
+		// 10.0%
+		} else if (.@seed < 1200) {
+			setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne;
+			.@n=rand(getarraysize(.@r));
+		// 30.0%
+		} else if (.@seed < 4200) {
+			setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable;
+			.@n=rand(getarraysize(.@r));
+		// 50.0%
+		} else if (.@seed < 9200) {
+			setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure;
+			.@n=rand(getarraysize(.@r));
+		// 8.0%
+		} else {
+			setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_GonzoDark;
+			.@n=rand(getarraysize(.@r));
+		}
 
 		getitem .@r[.@n], 1;
 	">
@@ -11250,7 +11270,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1192, 300000;
+		mercenary_create 1192, 300000;
 	">
 },
 {
@@ -11266,7 +11286,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1193, 300000;
+		mercenary_create 1193, 300000;
 	">
 },
 
@@ -11283,7 +11303,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1194, 300000;
+		mercenary_create 1194, 300000;
 	">
 },
 {
@@ -11299,7 +11319,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1195, 300000;
+		mercenary_create 1195, 300000;
 	">
 },
 {
@@ -11315,7 +11335,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1205, 300000;
+		mercenary_create 1205, 300000;
 	">
 },
 
@@ -11332,7 +11352,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1196, 300000;
+		mercenary_create 1196, 300000;
 	">
 },
 {
@@ -11348,7 +11368,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1197, 300000;
+		mercenary_create 1197, 300000;
 	">
 },
 {
@@ -11364,7 +11384,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1198, 300000;
+		mercenary_create 1198, 300000;
 	">
 },
 
@@ -11381,7 +11401,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1200, 300000;
+		mercenary_create 1200, 300000;
 	">
 },
 {
@@ -11397,7 +11417,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1201, 300000;
+		mercenary_create 1201, 300000;
 	">
 },
 {
@@ -11413,7 +11433,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1199, 300000;
+		mercenary_create 1199, 300000;
 	">
 },
 
@@ -11430,7 +11450,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1203, 300000;
+		mercenary_create 1203, 300000;
 	">
 },
 {
@@ -11446,7 +11466,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1204, 300000;
+		mercenary_create 1204, 300000;
 	">
 },
 {
@@ -11462,7 +11482,7 @@ item_db: (
 	Delay: 500
 	UseEffect: 23 // TODO FIXME: We should add to db/constants.conf instead of using numbers
 	Script: <"
-        mercenary_create 1202, 300000;
+		mercenary_create 1202, 300000;
 	">
 },