diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 3 | ||||
| -rw-r--r-- | src/map/mob.h | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 016453592..8cd05f646 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3147,9 +3147,6 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, wd = battle_calc_weapon_attack(src,target, 0, 0,0);
- if (sd && sd->state.arrow_atk) //Consume arrow.
- battle_consume_ammo(sd, 0, 0);
-
damage = wd.damage + wd.damage2;
if (damage > 0 && src != target) {
rdamage = battle_calc_return_damage(target, &damage, wd.flag);
diff --git a/src/map/mob.h b/src/map/mob.h index 26fbb4875..3eea67ec4 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -10,7 +10,7 @@ #define MAX_RANDOMMONSTER 3
#define MAX_MOB_RACE_DB 6
#define MAX_MOB_DB 10000
-#define MAX_MOB_DROP 15
+#define MAX_MOB_DROP 10
/* Change this to increase the table size in your mob_db to accomodate
a larger mob database. Be sure to note that IDs 4001 to 4048 are reserved for advanced/baby/expanded classes.
*/
diff --git a/src/map/skill.c b/src/map/skill.c index 409cbcb4c..d5ec79977 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2013,9 +2013,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds skill_blown(dsrc,bl,dmg.blewcount);
//Delayed damage must be dealt after the knockback (it needs to know actual position of target)
- if (dmg.amotion) { // do not really deal damage for ASC_BREAKER's 1st attack
+ if (dmg.amotion)
battle_delay_damage(tick+dmg.amotion,src,bl,attack_type,skillid,skilllv,damage,dmg.dmg_lv,dmg.dmotion,0);
- }
if(skillid == RG_INTIMIDATE && damage > 0 && !(status_get_mode(bl)&MD_BOSS)/* && !map_flag_gvg(src->m)*/) {
int s_lv = status_get_lv(src),t_lv = status_get_lv(bl);
@@ -2575,7 +2574,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s if (skillid == TK_JUMPKICK)
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
if (unit_movepos(src, bl->x, bl->y, 0, 0))
- clif_slide(src,src->x,src->y);
+ clif_slide(src,bl->x,bl->y);
break;
case ASC_BREAKER: /* ソウルブレ?カ? */ // [DracoRPG]
// Separate weapon and magic attacks
@@ -9412,6 +9411,7 @@ struct skill_unit_group *skill_initunitgroup(struct block_list *src, skill_unit_group_newid = MAX_SKILL_DB;
group->unit=(struct skill_unit *)aCalloc(count,sizeof(struct skill_unit));
group->unit_count=count;
+ group->alive_count=0;
group->val1=group->val2=group->val3=0;
group->skill_id=skillid;
group->skill_lv=skilllv;
|