SI updates

4 files changed, 102 insertions, 16 deletions

diff --git a/db/constants.conf b/db/constants.conf
index ee32fce4..0302207d 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3480,6 +3480,62 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	FX_GATE_OPENING:300
 	FX_CASKET_LID:301
 	FX_CASKET_MONSTER:302
+	FX_MAGIC_DISCHARGE: 500 // 15
+	FX_MAGIC_WAND_CAST: 501 // 2
+	//FX_MAGIC_WAND_ATK: 502 // 5
+	FX_MAGIC_AGGRAVATE_CAST: 503 // 6
+	FX_MAGIC_AGGRAVATE_HIT: 504 // 10
+	FX_MAGIC_DETECT_CAST: 505 // 2
+	FX_MAGIC_DETECT_HIT: 506 // 10
+	FX_MAGIC_EXP_CAST: 507 // 10
+	FX_MAGIC_DART_CAST: 508 // 10
+	//FX_MAGIC_DART_ATK: 509 // 4
+	FX_MAGIC_GROW_CAST: 510 // 6, 21
+	FX_MAGIC_GROW_SPAWN: 511 // 22
+	FX_MAGIC_HEAL_CAST: 512 // 3
+	FX_MAGIC_HEAL_HIT: 513 // 3
+	FX_MAGIC_BLADE_CAST: 514 // 4
+	//FX_MAGIC_BLADE_HIT: 515 // 4
+	FX_MAGIC_SULPHUR_CAST: 516 // 5
+	FX_MAGIC_MAGGOT_CAST: 517 // 7, 21
+	FX_MAGIC_MAGGOT_SPAWN: 518 // 22
+	FX_MAGIC_WOOD_CAST: 519 // 5
+	FX_MAGIC_AHAIL_CAST: 520 // 4
+	FX_MAGIC_BARRIER_CAST: 521 // 7
+	FX_MAGIC_BARRIER_HIT: 522 // 10
+	FX_MAGIC_BARRIER_END: 523 // 10
+	FX_MAGIC_WHO_CAST: 524 // 2
+	FX_MAGIC_STONE_CAST: 525 // 2
+	FX_MAGIC_FLYING_CAST: 526 // 6
+	FX_MAGIC_FLYING_HIT: 527 // 2
+	FX_MAGIC_FLYING_END: 528 // 2
+	FX_MAGIC_JOY_CAST: 529 // 6
+	FX_MAGIC_HIDE_CAST: 530 // 7
+	FX_MAGIC_HIDE_HIT: 531 // 10
+	FX_MAGIC_HIDE_END: 532 // 2
+	FX_MAGIC_LAY_CAST: 533 // 3
+	FX_MAGIC_LAY_HIT: 534 // 3
+	FX_MAGIC_BOLT_CAST: 535 // 4
+	FX_MAGIC_KNUCKLE_CAST: 536 // 4
+	FX_MAGIC_ARROW_CAST: 537 // 5
+	FX_MAGIC_IRONP_CAST: 538 // 5
+	FX_MAGIC_SHIRT_CAST: 539 // 5
+	FX_MAGIC_SHIELD_CAST: 540 // 6
+	FX_MAGIC_RAIN_CAST: 541 // 6
+	FX_MAGIC_SHEAR_CAST: 542 // 6
+	FX_MAGIC_FLUFFY_CAST: 543 // 7, 21
+	FX_MAGIC_FLUFFY_SPAWN: 544 // 22
+	FX_MAGIC_MOUBOO_CAST: 545 // 7, 21
+	FX_MAGIC_MOUBOO_SPAWN: 546 // 22
+	FX_MAGIC_PINKY_CAST: 547 // 7, 21
+	FX_MAGIC_PINKY_SPAWN: 548 // 22
+	FX_MAGIC_SNAKE_CAST: 549 // 8, 21
+	FX_MAGIC_SNAKE_SPAWN: 550 // 22
+	FX_MAGIC_SPIKY_CAST: 551 // 7, 21
+	FX_MAGIC_SPIKY_SPAWN: 552 // 22
+	FX_MAGIC_WICKED_CAST: 553 // 8, 21
+	FX_MAGIC_WICKED_SPAWN: 554 // 22
+	FX_MAGIC_TDART_CAST: 555 // 8
 	FX_EMOTE_DISGUST:10000
 	FX_EMOTE_SURPRISE:10001
 	FX_EMOTE_HAPPY:10002
diff --git a/db/sc_config.conf b/db/sc_config.conf
index b6cf8530..145e991a 100644
--- a/db/sc_config.conf
+++ b/db/sc_config.conf
@@ -2931,34 +2931,44 @@ SC_SERVICEFORYOU: {
 }
 /*SC_INCSTR: {
 	// TODO: add this SC to Hercules upstream
-	Icon: "SI_EVOL_INCSTR"
+	Visible: true
+	Icon: "SI_INCSTR"
 }*/
 SC_INCAGI: {
-	Icon: "SI_EVOL_INCAGI"
+	Visible: true
+	Icon: "SI_INCAGI"
 }
 SC_INCVIT: {
-	Icon: "SI_EVOL_INCVIT"
+	Visible: true
+	Icon: "SI_INCVIT"
 }
 SC_INCINT: {
-	Icon: "SI_EVOL_INCINT"
+	Visible: true
+	Icon: "SI_INCINT"
 }
 SC_INCDEX: {
-	Icon: "SI_EVOL_INCDEX"
+	Visible: true
+	Icon: "SI_INCDEX"
 }
 SC_INCLUK: {
-	Icon: "SI_EVOL_INCLUK"
+	Visible: true
+	Icon: "SI_INCLUK"
 }
 SC_INCFLEE: {
-	Icon: "SI_EVOL_INCFLEE"
+	Visible: true
+	Icon: "SI_INCFLEE"
 }
 SC_WALKSPEED: {
-	Icon: "SI_EVOL_INCWALKSPEED"
+	Visible: true
+	Icon: "SI_INCWALKSPEED"
 }
 SC_INCMHPRATE: {
-	Icon: "SI_EVOL_INCMHPRATE"
+	Visible: true
+	Icon: "SI_INCMHPRATE"
 }
 SC_INCMSPRATE: {
-	Icon: "SI_EVOL_INCMSPRATE"
+	Visible: true
+	Icon: "SI_INCMSPRATE"
 }
 SC_INCHIT: {
 	Flags: {
@@ -2967,7 +2977,7 @@ SC_INCHIT: {
 		NoClearanceReset: true
 		NoMadoReset: true
 	}
-    Icon: "SI_EVOL_INCHIT"
+    Icon: "SI_INCHIT"
 }
 SC_PUSH_CART: {
 	Visible: true
@@ -3773,6 +3783,16 @@ SC_PHYSICAL_SHIELD: {
 	Visible: true
 	Flags: {
 		NoSave: true
+		Buff: true
 	}
     Icon: "SI_PHYSICAL_SHIELD"
 }
+SC_MDEFSET: {
+	Visible: true
+	Flags: {
+		NoSave: true
+		Buff: true
+	}
+    Icon: "SI_MDEFSET"
+}
+
diff --git a/db/si_config.conf b/db/si_config.conf
index e5c1cc2e..dc772eae 100644
--- a/db/si_config.conf
+++ b/db/si_config.conf
@@ -680,8 +680,18 @@
 	SI_SUHIDE:                                    933
 	SI_SPRITEMABLE:                               937
 	SI_MADOGEAR:                                 1149
-	// Hercules SI end at 1150 and our start right after
-	// (Which is annoying because they may be saved to SQL)
-	// So expect we jumping from 1151 to 1500 in future
-	SI_CONFUSION:                                1151
+	// Custom Status Icons
+	SI_PHYSICAL_SHIELD:                          1500
+	SI_INCAGI:                                   1501
+	SI_INCVIT:                                   1502
+	SI_INCINT:                                   1503
+	SI_INCDEX:                                   1504
+	SI_INCLUK:                                   1505
+	SI_INCHIT:                                   1506
+	SI_INCFLEE:                                  1507
+	SI_INCWALKSPEED:                             1508
+	SI_INCMHPRATE:                               1509
+	SI_INCMSPRATE:                               1510
+	SI_CONFUSION:                                1511
+	SI_MDEFSET:                                  1512
 
diff --git a/npc/magic/level2-protect.txt b/npc/magic/level2-protect.txt
index 19682245..f005a07c 100644
--- a/npc/magic/level2-protect.txt
+++ b/npc/magic/level2-protect.txt
@@ -44,7 +44,7 @@ function	script	SK_Asorm	{
     // SC, Time, MDEF+
     sc_start(SC_MDEFSET, .@time, .@PX*2, 10000,
              SCFLAG_NOAVOID|SCFLAG_FIXEDTICK|SCFLAG_FIXEDRATE, @skillTarget);
-    specialeffect FX_MAGIC_BARRIER_HIT, AREA, @skillTarget;
+    specialeffect FX_MAGIC_BARRIER_CAST, AREA, @skillTarget;
     GetManaExp(@skillId, 2);
     return;
 }