- Fix item that should not be used by Royal Guards (bug:7924)

- Fix Peuz's Set item bonus (bug:8141)
- Add Missing Status Effects for Miming_Card and Sropho_Card (bug:7462)

4 files changed, 26 insertions, 20 deletions

diff --git a/db/const.txt b/db/const.txt
index 3323928b2..8023fc30f 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -641,7 +641,10 @@ Eff_Confusion	7
 Eff_Blind	8
 Eff_Bleeding	9
 Eff_DPoison	10
-Eff_Burning	11
+Eff_Fear	11	
+Eff_Cold	12
+Eff_Burning	13
+Eff_Deepsleep	14
 
 Ele_Neutral	0
 Ele_Water	1
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 811a57cb4..ad7f8fd64 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -117,7 +117,7 @@
 2472:2570:15030:16013,{ bonus2 bAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bSkillAtk,"AB_ADORAMUS",100; }
 2472:2570:15030:16018,{ bonus2 bAddRace,RC_Undead,30; bonus2 bMagicAddRace,RC_Undead,30; bonus2 bSkillAtk,"AB_ADORAMUS",200; bonus bVariableCastrate,-50; }
 2475:2574:2883:15036,{ bonus bMaxHPrate,14; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",50; skill "CR_AUTOGUARD",1; }
-2476:2575:2884:15037,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus2 bSkillAtk,"RK_SONICWAVE",100; bonus2 bSkillAtk,"RK_WINDCUTTER",100; autobonus "{ sc_start SC_LKCONCENTRATION,10000,getskilllv(\"LK_CONCENTRATION\")?getskilllv(\"LK_CONCENTRATION\"):1; bonus bAspd,2; }",1,10000,BF_WEAPON,"{}"; }
+2476:2575:2884:15037,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus2 bSkillAtk,"RK_SONICWAVE",100; bonus2 bSkillAtk,"RK_WINDCUTTER",100; bonus3 bAutoSpell,"RK_STORMBLAST",1,20; autobonus3 "{ bonus bAspd,2; }",1000,10000,"LK_CONCENTRATION","{ specialeffect2 EF_ENHANCE; }"; }
 2477:2577:2886:15038,{ bonus bCritical,15; bonus bFlee,10; bonus bCritAtkRate,40; bonus2 bSkillAtk,"GC_CROSSIMPACT",20; }
 2478:2578:2887:15039,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatk,10; if(readparam(bStr)>119) { bonus bBaseAtk,30; } bonus3 bAutoSpell,"ASC_BREAKER",getskilllv("ASC_BREAKER"),10; bonus bCritical,-20; }
 2479:2580:2890:15042,{ bonus bAspd,2; bonus bLongAtkRate,30; bonus3 bAutoSpell,"AC_DOUBLE",3,10; bonus2 bSkillAtk,"RA_ARROWSTORM",50; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 17412756e..4156f2478 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -6312,7 +6312,7 @@ item_db: (
 	Weight: 3400
 	Atk: 280
 	Range: 2
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 34
 	WeaponLv: 3
@@ -24581,7 +24581,7 @@ item_db: (
 	Weight: 900
 	Def: 32
 	Slots: 1
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 64
 	EquipLv: 100
@@ -24599,7 +24599,7 @@ item_db: (
 	Weight: 900
 	Def: 32
 	Slots: 1
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 64
 	EquipLv: 100
@@ -26158,7 +26158,7 @@ item_db: (
 	Buy: 20
 	Weight: 600
 	Def: 20
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 4
 	EquipLv: 100
@@ -26175,7 +26175,7 @@ item_db: (
 	Buy: 20
 	Weight: 600
 	Def: 16
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 4
 	EquipLv: 100
@@ -31583,7 +31583,7 @@ item_db: (
 	Weight: 200
 	Def: 4
 	Slots: 1
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 136
 	EquipLv: 100
@@ -31603,7 +31603,7 @@ item_db: (
 	Weight: 200
 	Def: 3
 	Slots: 1
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 136
 	EquipLv: 100
@@ -106495,7 +106495,7 @@ item_db: (
 	Buy: 20
 	Weight: 3000
 	Def: 110
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 16
 	EquipLv: 100
@@ -106514,7 +106514,7 @@ item_db: (
 	Buy: 20
 	Weight: 3000
 	Def: 110
-	Job: 0x00004080
+	Job: 0x00000080
 	Upper: 56
 	Loc: 16
 	EquipLv: 100
diff --git a/src/map/status.h b/src/map/status.h
index 670fce3bb..d1b3c6471 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -82,9 +82,12 @@ typedef enum sc_type {
 	SC_CONFUSION,
 	SC_BLIND,
 	SC_BLOODING,
-	SC_DPOISON,
-	SC_BURNING, //11
-	SC_COMMON_MAX = 11, // end
+	SC_DPOISON, //10
+	SC_FEAR,
+	SC_COLD,
+	SC_BURNING,
+	SC_DEEP_SLEEP,
+	SC_COMMON_MAX = 14, // end
 	
 	//Next up, we continue on 20, to leave enough room for additional "common" ailments in the future.
 	SC_PROVOKE = 20,
@@ -381,8 +384,8 @@ typedef enum sc_type {
 	/**
 	 * 3rd
 	 **/
-	SC_FEAR, // 310
-	SC_FROSTMISTY,
+	//SC_FEAR,
+	SC_FROSTMISTY = 311,
 	/**
 	 * Rune Knight
 	 **/
@@ -483,8 +486,8 @@ typedef enum sc_type {
 	 * Sorcerer
 	 **/
 	SC_SPELLFIST,
-	SC_COLD,
-	SC_STRIKING,
+	//SC_COLD,
+	SC_STRIKING = 389,
 	SC_WARMER, // 390
 	SC_VACUUM_EXTREME,
 	SC_PROPERTYWALK,
@@ -498,8 +501,8 @@ typedef enum sc_type {
 	SC_ECHOSONG,
 	SC_HARMONIZE,
 	SC_SIREN,
-	SC_DEEP_SLEEP, // 400
-	SC_SIRCLEOFNATURE,
+	//SC_DEEP_SLEEP, // 400
+	SC_SIRCLEOFNATURE = 401,
 	SC_GLOOMYDAY,
 	//SC_GLOOMYDAY_SK,
 	SC_SONG_OF_MANA = 404,