2 files changed, 69 insertions, 24 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index ea08825cb..95503ee11 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -1757,7 +1757,7 @@ item_db: (
 	Buy: 0
 	Weight: 20
 	BuyingStore: true
-	Script: <" set Zeny,Zeny+rand(1000,10000); ">
+	Script: <" Zeny += rand(1000,10000); ">
 },
 {
 	Id: 669
@@ -1780,10 +1780,22 @@ item_db: (
 {
 	Id: 671
 	AegisName: "Gold_Coin"
-	Name: "Gold Coin"
-	Type: 3
-	Buy: 10000
-	Weight: 40
+	Name: "Gold Roulette Coin"
+	Type: 2
+	Buy: 0
+	Weight: 0
+	Upper: 63
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" set TmpRouletteGold,TmpRouletteGold + 1; ">
 },
 {
 	Id: 672
@@ -1812,10 +1824,22 @@ item_db: (
 {
 	Id: 675
 	AegisName: "Silver_Coin"
-	Name: "Silver Coin"
-	Type: 3
-	Buy: 5000
-	Weight: 40
+	Name: "Silver Roulette Coin"
+	Type: 2
+	Buy: 0
+	Weight: 0
+	Upper: 63
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" set TmpRouletteSilver,TmpRouletteSilver + 1; ">
 },
 {
 	Id: 676
@@ -5957,8 +5981,8 @@ item_db: (
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
-			bonus3 bAutoSpell,LK_CONCENTRATION,getskilllv(LK_CONCENTRATION)>1?getskilllv(LK_CONCENTRATION):1,30;
-			bonus3 bAutoSpell,LK_AURABLADE,getskilllv(LK_AURABLADE)>1?getskilllv(LK_AURABLADE):1,30;
+			bonus3 bAutoSpell,LK_CONCENTRATION,max(getskilllv(LK_CONCENTRATION),1),30;
+			bonus3 bAutoSpell,LK_AURABLADE,max(getskilllv(LK_AURABLADE),1),30;
 		}
 
 	">
@@ -13061,7 +13085,7 @@ item_db: (
 		bonus bAtkEle,Ele_Holy;
 		bonus bMatkRate,15;
 		bonus bInt,4;
-		bonus4 bAutoSpellOnSkill,AL_HEAL,AL_BLESSING,getskilllv(AL_BLESSING)>1?getskilllv(AL_BLESSING):1,20;
+		bonus4 bAutoSpellOnSkill,AL_HEAL,AL_BLESSING,max(getskilllv(AL_BLESSING),1),20;
 	">
 },
 {
@@ -14713,7 +14737,7 @@ item_db: (
 		bonus bInt,1;
 		bonus2 bAddRace,RC_DemiHuman,95;
 		bonus2 bCastrate,MO_EXTREMITYFIST,-25;
-		autobonus "{ bonus2 bCastrate,\"MO_EXTREMITYFIST\",-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus2 bCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -21442,7 +21466,7 @@ item_db: (
 	EquipLv: 70
 	Script: <"
 		bonus bMdef,3;
-		bonus3 bAutoSpellWhenHit,AL_HEAL,getskilllv(AL_HEAL)?getskilllv(AL_HEAL):1,20;
+		bonus3 bAutoSpellWhenHit,AL_HEAL,max(getskilllv(AL_HEAL),1),20;
 	">
 },
 {
@@ -40983,10 +41007,10 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		bonus2 bSkillAtk, "WZ_HEAVENDRIVE", 15 + getequiprefinerycnt(EQI_HAND_R);
-		bonus2 bSkillAtk, "WZ_EARTHSPIKE", 15 + getequiprefinerycnt(EQI_HAND_R);
-		bonus2 bCastrate, "WZ_HEAVENDRIVE", -25;
-		bonus2 bCastrate, "WZ_EARTHSPIKE", -25;
+		bonus2 bSkillAtk, WZ_HEAVENDRIVE, 15 + getequiprefinerycnt(EQI_HAND_R);
+		bonus2 bSkillAtk, WZ_EARTHSPIKE, 15 + getequiprefinerycnt(EQI_HAND_R);
+		bonus2 bCastrate, WZ_HEAVENDRIVE, -25;
+		bonus2 bCastrate, WZ_EARTHSPIKE, -25;
 		;
 	">
 },
@@ -63116,7 +63140,7 @@ item_db: (
 	Weight: 80
 	Script: <"
 		if(gettime(5)!=MDiceCone) {
-			set MDiceCone,gettime(5);
+			MDiceCone = gettime(5);
 			percentheal 50,50;
 		}
 
@@ -63129,7 +63153,7 @@ item_db: (
 	Type: 2
 	Buy: 1
 	Weight: 10
-	Script: <" set Zeny,Zeny+rand(1000,10000); ">
+	Script: <" Zeny += rand(1000,10000); ">
 },
 {
 	Id: 12135
@@ -64431,7 +64455,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		set .@type,getiteminfo(getequipid(EQI_HAND_R),11);
+		.@type = getiteminfo(getequipid(EQI_HAND_R),11);
 		if (.@type==6||.@type==7||.@type==8) {
 			skilleffect BS_ADRENALINE,0;
 			sc_start SC_ADRENALINE,150000,5;
@@ -69852,14 +69876,14 @@ item_db: (
 	AegisName: "Change_Slot_Card"
 	Name: "Character Position Change Coupon"
 	Type: 2
-	Script: <" set SlotChange, SlotChange + 1; ">
+	Script: <" SlotChange += 1; ">
 },
 {
 	Id: 12790
 	AegisName: "Change_Name_Card"
 	Name: "Name Change Coupon"
 	Type: 2
-	Script: <" set CharRename, CharRename + 1; ">
+	Script: <" CharRename += 1; ">
 },
 {
 	Id: 12848
@@ -89203,4 +89227,25 @@ item_db: (
 	Stack: [20, 1]
 	Script: <" itemskill RK_LUXANIMA,1; ">
 },
+{
+	Id: 22837
+	AegisName: "Integer_Time"
+	Name: "Integer Time"
+	Type: 2
+	Buy: 0
+	Weight: 0
+	Upper: 63
+	EquipLv: 50
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" set TmpRouletteBronze,TmpRouletteBronze + 1; ">
+},
 )
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
index 95a402c4f..8b901e602 100644
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -158,7 +158,7 @@
 //-- WZ_FIREPILLAR
 80,3000:2700:2400:2100:1800:1500:1200:900:600:300,1000,0,30000,600:800:1000:1200:1400:1600:1800:2000:2200:2400,0
 //-- WZ_SIGHTRASHER
-81,700,2000,0,500,0,0
+81,500,2000,0,500,0,0
 //-- WZ_METEOR
 83,15000,2000:3000:3000:4000:4000:5000:5000:6000:6000:7000,0,500,5000,0
 //-- WZ_JUPITEL