summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c7
-rw-r--r--src/map/pc.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 360fe997a..ca04db941 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -603,6 +603,9 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
damage += (skill * 3);
break;
case W_FIST:
+ if((skill = pc_checkskill(sd,TK_RUN)) > 0)
+ damage += (skill * 10);
+ // No break, fallthrough to Knuckles
case W_KNUCKLE:
if((skill = pc_checkskill(sd,MO_IRONHAND)) > 0)
damage += (skill * 3);
@@ -612,12 +615,10 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
damage += (skill * 3);
break;
case W_WHIP:
- // Dance Lesson Skill Effect(+3 damage for every lvl = +30)
if((skill = pc_checkskill(sd,DC_DANCINGLESSON)) > 0)
damage += (skill * 3);
break;
case W_BOOK:
- // Advance Book Skill Effect(+3 damage for every lvl = +30)
if((skill = pc_checkskill(sd,SA_ADVANCEDBOOK)) > 0)
damage += (skill * 3);
break;
@@ -625,7 +626,7 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
if((skill = pc_checkskill(sd,AS_KATAR)) > 0)
damage += (skill * 3);
break;
- case W_HUUMA: // Added Tobidougu bonus if wearing a Fuuma Shuriken
+ case W_HUUMA:
if((skill = pc_checkskill(sd,NJ_TOBIDOUGU)) >0)
damage += (skill * 3);
break;
diff --git a/src/map/pc.c b/src/map/pc.c
index bde039c83..781d434f8 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4038,10 +4038,10 @@ int pc_checkbaselevelup(struct map_session_data *sd)
sc_start(&sd->bl,SkillStatusChangeTable(PR_GLORIA),100,1,skill_get_time(PR_GLORIA,1));
sc_start(&sd->bl,SkillStatusChangeTable(PR_SUFFRAGIUM),100,1,skill_get_time(PR_SUFFRAGIUM,1));
} else
- if((sd->class_&MAPID_UPPERMASK) == MAPID_TAEKWON)
+ if((sd->class_&MAPID_UPPERMASK) == MAPID_TAEKWON || (sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR)
{
- sc_start(&sd->bl,SkillStatusChangeTable(AL_INCAGI),100,10,skill_get_time(AL_INCAGI,10));
- sc_start(&sd->bl,SkillStatusChangeTable(AL_BLESSING),100,10,skill_get_time(AL_BLESSING,10));
+ sc_start(&sd->bl,SkillStatusChangeTable(AL_INCAGI),100,10,600000);
+ sc_start(&sd->bl,SkillStatusChangeTable(AL_BLESSING),100,10,600000);
}
clif_misceffect(&sd->bl,0);
//LORDALFA - LVLUPEVENT