Merge remote-tracking branch 'upstream/master'

Signed-off-by: shennetsind <ind@henn.et>

Conflicts:
	src/map/pc.c

3 files changed, 24 insertions, 13 deletions

diff --git a/db/const.txt b/db/const.txt
index 423757090..a90b87356 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -613,6 +613,12 @@ EQI_COSTUME_HEAD_LOW	11
 EQI_COSTUME_HEAD_MID	12
 EQI_COSTUME_HEAD_TOP	13
 EQI_COSTUME_GARMENT	14
+EQI_SHADOW_ARMOR	15
+EQI_SHADOW_WEAPON	16
+EQI_SHADOW_SHIELD	17
+EQI_SHADOW_SHOES	18
+EQI_SHADOW_ACC_R	19
+EQI_SHADOW_ACC_L	20
 
 LOOK_BASE	0
 LOOK_HAIR	1
@@ -1239,6 +1245,8 @@ SC_KINGS_GRACE	557
 SC_TELEKINESIS_INTENSE	558
 SC_OFFERTORIUM	559
 SC_FRIGG_SONG	560
+SC_ALL_RIDING	561
+SC_HANBOK	562
 SC_MONSTER_TRANSFORM 563
 SC_ANGEL_PROTECT 564
 SC_ILLUSIONDOPING 565
diff --git a/db/re/refine_db.txt b/db/re/refine_db.txt
index a9b7fedd1..2b78a9d44 100644
--- a/db/re/refine_db.txt
+++ b/db/re/refine_db.txt
@@ -27,15 +27,14 @@
 // Chance:
 // 100 = 100%
 //
-// Note: Chances for +11 and higher are not verified - 10% is a rumor from iRO wiki.
 // A note about renewal Armors, there may or may not be another bonus, according to iRO wiki: Every upgrade gives floor[( 3 + current upgrade ) / 4] equipment DEF)
 
-0,0,0,0,100:100,100:100,100:100,100:100,60:200,40:200,40:200,20:200,20:300,10:300,100:300,100:300,100:400,100:400,90:400,60:400,60:500,30:500,30:500,10:500
+0,0,0,0,100:100,100:100,100:100,100:100,60:200,40:200,40:200,20:200,20:300,10:300,8:300,8:300,8:400,8:400,7:400,7:400,7:500,7:500,5:500,5:500
 // Level 1 weapons
-1,200,8,300,100:0,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,100:0,100:0,100:0,100:0,100:0,100:300,100:300,90:300,60:300,20:300
+1,200,8,300,100:0,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,18:0,18:0,18:0,18:0,18:0,17:300,17:300,17:300,15:300,15:300
 // Level 2 weapons
-2,300,7,500,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,20:0,100:0,100:0,100:0,100:0,100:0,100:600,90:600,60:600,30:600,20:600
+2,300,7,500,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,20:0,18:0,18:0,18:0,18:0,18:0,17:600,17:600,17:600,15:600,15:600
 // Level 3 weapons
-3,500,6,800,100:0,100:0,100:0,100:0,100:0,60:0,50:0,20:0,20:0,20:0,100:0,100:0,100:0,100:0,100:0,90:900,75:900,30:900,30:900,20:900
+3,500,6,800,100:0,100:0,100:0,100:0,100:0,60:0,50:0,20:0,20:0,20:0,18:0,18:0,18:0,18:0,18:0,17:900,17:900,17:900,15:900,15:900
 // Level 4 weapons
-4,700,5,1400,100:0,100:0,100:0,100:0,60:0,40:0,40:0,20:0,20:0,10:0,100:0,100:0,100:0,100:0,90:0,60:1200,60:1200,30:1200,30:1200,10:1200
+4,700,5,1400,100:0,100:0,100:0,100:0,60:0,40:0,40:0,20:0,20:0,10:0,8:0,8:0,8:0,8:0,8:0,7:1200,7:1200,7:1200,5:1200,5:1200
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 9e0b8b268..38e10e4c2 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -10,6 +10,7 @@
 //         16 - SC considered as buff and be removed by Hermode and etc.
 //         32 - SC considered as debuff and be removed by Gospel and etc.
 //         64 - SC cannot be reset when MADO Gear is taken off.
+//        128 - SC cannot be reset by sc_end and change clear.
 //Example:
 //SC_ENDURE, 21 //SC_ENDURE: cannot be removed by death and dispell and cosidered as buff. (16 + 4 + 1 = 21)
 
@@ -395,12 +396,12 @@ SC_SOULCOLD,78
 SC_HAWKEYES,78
 
 // Unremovable
-SC_WEIGHTOVER50, 79
-SC_WEIGHTOVER90, 79
+SC_WEIGHTOVER50, 207
+SC_WEIGHTOVER90, 207
 SC_WEDDING, 77
 SC_XMAS, 77
 SC_SUMMER, 77
-SC_NOCHAT, 77
+SC_NOCHAT, 205
 SC_FUSION, 77
 SC_EARTHSCROLL, 77
 SC_STORMKICK_READY, 77
@@ -408,7 +409,7 @@ SC_DOWNKICK_READY, 77
 SC_COUNTERKICK_READY, 77
 SC_TURNKICK_READY, 77
 SC_DODGE_READY, 77
-SC_JAILED, 77
+SC_JAILED, 205
 SC_AUTOTRADE, 77
 SC_WHISTLE, 79
 SC_ASSNCROS, 79
@@ -419,6 +420,9 @@ SC_DONTFORGETME, 79
 SC_FORTUNE, 79
 SC_SERVICEFORYOU, 79
 SC_INCHIT, 77
-SC_PUSH_CART, 0x4D
-SC_MOONSTAR, 79
-SC_SUPER_STAR, 79
+SC_PUSH_CART, 205
+SC_MOONSTAR, 207
+SC_SUPER_STAR, 207
+
+//Cant Clear
+SC_ALL_RIDING, 128
\ No newline at end of file