Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to Lullaby, Pang Voice, and Wink of Charm (#7264)

Browse Source 
* Fixes #6916.
* Corrects the interval of Lullaby to every 4 seconds in pre-renewal.
* Corrects the success chance of Lullaby to INT * 0.2 + rand(10%, 30%) for Sleep.
* Corrects the duration of Lullaby's Sleep to 18 + 2 seconds in renewal and 30 seconds in pre-renewal.
* Corrects the success chance of Pang Voice to 70% for Confusion.
* Corrects the success chance of Wink of Charm versus players to 10% for Confusion.
* Corrects the success chance of Wink of Charm versus monsters to [(srcBaseLevel - tarBaseLevel) + 40]% for Charm.
Thanks to @Playtester and @Lemongrass3110!
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
This commit is contained in:
Aleos 2022-09-22 13:25:30 -04:00 committed by GitHub
parent 1e970ff1af
commit c2e19bcf06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/pre-re/skill_db.yml
View File

@ -8272,7 +8272,7 @@ Body:
Hit: Single Hit: Single
HitCount: 1 HitCount: 1
Duration1: 60000 Duration1: 60000
Duration2: 15000 Duration2: 30000
Requires: Requires:
SpCost: 20 SpCost: 20
Weapon: Weapon:
@ -8281,7 +8281,7 @@ Body:
Unit: Unit:
Id: Lullaby Id: Lullaby
Layout: 4 Layout: 4
Interval: 6000 Interval: 4000
Target: Enemy Target: Enemy
Flag: Flag:
Ensemble: true Ensemble: true

2
db/re/skill_db.yml
View File

@ -8661,7 +8661,7 @@ Body:
SplashArea: 4 SplashArea: 4
CastTime: 1000 CastTime: 1000
Duration1: 60000 Duration1: 60000
Duration2: 15000 Duration2: 18000
Cooldown: 20000 Cooldown: 20000
Requires: Requires:
SpCost: 40 SpCost: 40

8
src/map/skill.cpp
View File

@ -1595,7 +1595,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
break; break;
case BD_LULLABY: case BD_LULLABY:
sc_start(src,bl,SC_SLEEP,15+sstatus->int_/3,skill_lv,skill_get_time2(skill_id,skill_lv)); //(custom chance) "Chance is increased with INT", iRO Wiki status_change_start(src, bl, SC_SLEEP, (sstatus->int_ * 2 + rnd_value(100, 300)) * 10, skill_lv, 0, 0, 0, skill_get_time2(skill_id, skill_lv), SCSTART_NONE);
break; break;
case DC_UGLYDANCE: case DC_UGLYDANCE:
@ -8745,7 +8745,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break; break;
case BA_PANGVOICE: case BA_PANGVOICE:
clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start(src,bl,SC_CONFUSION,50,7,skill_get_time(skill_id,skill_lv))); clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start(src,bl,SC_CONFUSION,70,7,skill_get_time(skill_id,skill_lv)));
#ifdef RENEWAL #ifdef RENEWAL
sc_start(src, bl, SC_BLEEDING, 30, skill_lv, skill_get_time2(skill_id, skill_lv)); // TODO: Confirm success rate sc_start(src, bl, SC_BLEEDING, 30, skill_lv, skill_get_time2(skill_id, skill_lv)); // TODO: Confirm success rate
#endif #endif
@ -8753,7 +8753,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case DC_WINKCHARM: case DC_WINKCHARM:
if( dstsd ) { if( dstsd ) {
clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start(src,bl,SC_CONFUSION,30,7,skill_get_time2(skill_id,skill_lv))); clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start(src,bl,SC_CONFUSION,10,7,skill_get_time2(skill_id,skill_lv)));
#ifdef RENEWAL #ifdef RENEWAL
sc_start(src, bl, SC_HALLUCINATION, 30, skill_lv, skill_get_time(skill_id, skill_lv)); // TODO: Confirm success rate and duration sc_start(src, bl, SC_HALLUCINATION, 30, skill_lv, skill_get_time(skill_id, skill_lv)); // TODO: Confirm success rate and duration
#endif #endif
@ -8763,7 +8763,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
if( status_get_lv(src) > status_get_lv(bl) if( status_get_lv(src) > status_get_lv(bl)
&& (tstatus->race == RC_DEMON || tstatus->race == RC_DEMIHUMAN || tstatus->race == RC_PLAYER_HUMAN || tstatus->race == RC_PLAYER_DORAM || tstatus->race == RC_ANGEL) && (tstatus->race == RC_DEMON || tstatus->race == RC_DEMIHUMAN || tstatus->race == RC_PLAYER_HUMAN || tstatus->race == RC_PLAYER_DORAM || tstatus->race == RC_ANGEL)
&& !status_has_mode(tstatus,MD_STATUSIMMUNE) ) && !status_has_mode(tstatus,MD_STATUSIMMUNE) )
clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start2(src,bl,type,70,skill_lv,src->id,skill_get_time(skill_id,skill_lv))); clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start2(src,bl,type,(status_get_lv(src) - status_get_lv(bl)) + 40, skill_lv, src->id, skill_get_time(skill_id, skill_lv)));
else else
{ {
clif_skill_nodamage(src,bl,skill_id,skill_lv,0); clif_skill_nodamage(src,bl,skill_id,skill_lv,0);

11
src/map/status.cpp
View File

@ -1915,10 +1915,15 @@ bool status_check_skilluse(struct block_list *src, struct block_list *target, ui
return false; return false;
if (sc->data[SC_WINKCHARM] && target && !flag) { // Prevents skill usage if (sc->data[SC_WINKCHARM] && target && !flag) { // Prevents skill usage
if (unit_bl2ud(src) && (unit_bl2ud(src))->walktimer == INVALID_TIMER) block_list *wink_target = map_id2bl(sc->data[SC_WINKCHARM]->val2);
unit_walktobl(src, map_id2bl(sc->data[SC_WINKCHARM]->val2), 3, 1);
if (wink_target != nullptr) {
unit_data *wink_ud = unit_bl2ud(src);
if (wink_ud != nullptr && wink_ud->walktimer == INVALID_TIMER)
unit_walktobl(src, wink_target, 3, 1);
clif_emotion(src, ET_THROB); clif_emotion(src, ET_THROB);
return false; } else
status_change_end(src, SC_WINKCHARM);
} }
if (sc->data[SC_BLADESTOP]) { if (sc->data[SC_BLADESTOP]) {