Implemented SH_SANDY_FESTIVAL_OF_KI_SUL (2nd rebalance)

MAX Lv: 5
Skill Requirement: Mystical Creature Mastery 3, Kisul Water Spraying 3
Skill Form: Active
Type: Buff
Target: Instant Casting
Recovery: AP 4
Description: With the power of the sea by Kisul, increases SPL, WIS and STA to self and nearby party member around the user.
If the user learned Commune With Kisul, increases area of effect and doubles the skill duration.
Doesn't stack with Cardinal's Religio.
_
[Level 1]: SPL, WIS, STA + 2 / duration: 60 seconds / area of effect: 5 x 5 cells.
Commune With Kisul: area of effect: 9 x 9 cells.
[Level 2]: SPL, WIS, STA + 4 / duration: 75 seconds / area of effect: 7 x 7 cells.
Commune With Kisul: area of effect: 11 x 11 cells.
[Level 3]: SPL, WIS, STA + 6 / duration: 90 seconds / area of effect: 9 x 9 cells.
Commune With Kisul: area of effect: 13 x 13 cells.
[Level 4]: SPL, WIS, STA + 8 / duration: 105 seconds / area of effect: 11 x 11 cells.
Commune With Kisul: area of effect: 15 x 15 cells.
[Level 5]: SPL, WIS, STA + 10 / duration: 120 seconds / area of effect: 13 x 13 cells.
Commune With Kisul: area of effect: 17 x 17 cells.

1st rebalance :
- Increases AP recovery rate from 2 to 4.

2nd rebalance :
(nothing)

db/re/skill_db.yml

@@ -41625,6 +41625,56 @@ Body:
         - Level: 5
           Amount: 120
     Status: Marine_Festival
+  - Id: 5441
+    Name: SH_SANDY_FESTIVAL_OF_KI_SUL
+    Description: Sandy Festival of Kisul
+    MaxLevel: 5
+    Type: Magic
+    TargetType: Self
+    DamageFlags:
+      NoDamage: true
+      Splash: true
+    GiveAp: 4
+    SplashArea:
+      - Level: 1
+        Area: 2
+      - Level: 2
+        Area: 3
+      - Level: 3
+        Area: 4
+      - Level: 4
+        Area: 5
+      - Level: 5
+        Area: 6
+    Duration1: 
+     - Level: 1
+       Time: 60000
+     - Level: 2
+       Time: 75000
+     - Level: 3
+       Time: 90000
+     - Level: 4
+       Time: 105000
+     - Level: 5
+       Time: 120000
+    CastCancel: true
+    CastTime: 1700
+    AfterCastActDelay: 1000
+    FixedCastTime: 1000
+    Cooldown: 2000
+    Requires:
+      SpCost:
+        - Level: 1
+          Amount: 80
+        - Level: 2
+          Amount: 90
+        - Level: 3
+          Amount: 100
+        - Level: 4
+          Amount: 110
+        - Level: 5
+          Amount: 120
+    Status: Sandy_Festival
   - Id: 5443
     Name: SH_COMMUNE_WITH_HYUN_ROK
     Description: Commune with Hyunrok

db/re/status.yml

@@ -7823,6 +7823,8 @@ Body:
     Flags:
       BlEffect: true
       DisplayPc: true
+    EndOnStart:
+      Sandy_Festival: true
   - Status: Benedictum
     Icon: EFST_BENEDICTUM
     DurationLookup: CD_BENEDICTUM
@@ -8776,3 +8778,12 @@ Body:
       Crt: true
     EndOnStart:
       Benedictum: true
+  - Status: Sandy_Festival
+    Icon: EFST_SANDY_FESTIVAL
+    DurationLookup: SH_SANDY_FESTIVAL_OF_KI_SUL
+    CalcFlags:
+      Spl: true
+      Wis: true
+      Sta: true
+    EndOnStart:
+      Religio: true

src/map/skill.cpp

@@ -12853,6 +12853,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 		}
 		break;
 	case SH_MARINE_FESTIVAL_OF_KI_SUL:
+	case SH_SANDY_FESTIVAL_OF_KI_SUL:
 		if (flag & 1) {	
 			int time = skill_get_time(skill_id, skill_lv);
 			if ((sd && pc_checkskill(sd, SH_COMMUNE_WITH_KI_SUL)) || (sc && sc->getSCE(SC_TEMPORARY_COMMUNION)))

src/map/status.cpp

@@ -6886,6 +6886,8 @@ static unsigned short status_calc_sta(struct block_list *bl, status_change *sc,
 
 	if (sc->getSCE(SC_RELIGIO))
 		sta += sc->getSCE(SC_RELIGIO)->val2;
+	if (sc->getSCE(SC_SANDY_FESTIVAL))
+		sta += sc->getSCE(SC_SANDY_FESTIVAL)->val2;
 
 	return (unsigned short)cap_value(sta, 0, USHRT_MAX);
 }
@@ -6904,6 +6906,8 @@ static unsigned short status_calc_wis(struct block_list *bl, status_change *sc,
 
 	if (sc->getSCE(SC_RELIGIO))
 		wis += sc->getSCE(SC_RELIGIO)->val2;
+	if (sc->getSCE(SC_SANDY_FESTIVAL))
+		wis += sc->getSCE(SC_SANDY_FESTIVAL)->val2;
 
 	return (unsigned short)cap_value(wis, 0, USHRT_MAX);
 }
@@ -6922,6 +6926,8 @@ static unsigned short status_calc_spl(struct block_list *bl, status_change *sc,
 
 	if (sc->getSCE(SC_RELIGIO))
 		spl += sc->getSCE(SC_RELIGIO)->val2;
+	if (sc->getSCE(SC_SANDY_FESTIVAL))
+		spl += sc->getSCE(SC_SANDY_FESTIVAL)->val2;
 
 	return (unsigned short)cap_value(spl, 0, USHRT_MAX);
 }
@@ -12710,6 +12716,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 			val2 = val1 * 3;
 			break;
 		case SC_MARINE_FESTIVAL:
+		case SC_SANDY_FESTIVAL:
 			val2 = 2 * val1;
 			break;