summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c6
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/skill.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 3702dc9d5..7bf119459 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2177,9 +2177,6 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
case PR_SANCTUARY:
ad.damage = (skill_lv>6)?388:skill_lv*50;
break;
- case NPC_EVILLAND:
- ad.damage = (skill_lv>6)?666:skill_lv*100;
- break;
case ALL_RESURRECTION:
case PR_TURNUNDEAD:
//Undead check is on skill_castend_damageid code.
@@ -2552,6 +2549,9 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
md.damage = 200+200*skill_lv;
md.dmotion = 0; //No flinch animation.
break;
+ case NPC_EVILLAND:
+ md.damage = (skill_lv>6)?666:skill_lv*100;
+ break;
}
if (nk&NK_SPLASHSPLIT){ // Divide ATK among targets
diff --git a/src/map/skill.c b/src/map/skill.c
index 5b0a21154..0a6ddcc51 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6781,7 +6781,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
if (!battle_check_undead(tstatus->race, tstatus->def_ele) && tstatus->race!=RC_DEMON)
{ //Damage enemies
if(battle_check_target(&src->bl,bl,BCT_ENEMY)>0)
- skill_attack(BF_MAGIC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0);
+ skill_attack(BF_MISC, ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0);
} else {
int heal = sg->val2;
if (tstatus->hp >= tstatus->max_hp)
diff --git a/src/map/skill.h b/src/map/skill.h
index 70ebefe89..be7f213b6 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -98,7 +98,7 @@ struct skill_name_db {
};
#define MAX_SKILL_UNIT_LAYOUT 50
-#define MAX_SQUARE_LAYOUT 5 // 11*11のユニット配置が最大
+#define MAX_SQUARE_LAYOUT 20 // 11*11のユニット配置が最大
#define MAX_SKILL_UNIT_COUNT ((MAX_SQUARE_LAYOUT*2+1)*(MAX_SQUARE_LAYOUT*2+1))
struct s_skill_unit_layout {
int count;