- Added enums for trap type, damage type, and monster type

- Changed something that may have been a bug in which an undead monster attacking another monster would do demonic damage (and vice versa).

git-svn-id: http://openexile.googlecode.com/svn/trunk@35 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
2009-04-27 02:08:58 +00:00
parent 440eb5a765
commit fa528023e7
14 changed files with 364 additions and 280 deletions

View File

@@ -928,17 +928,17 @@ void monst_inflict_fields(short which_monst)
where_check.y = univ.town.monst.dudes[which_monst].m_loc.y + j;
if (is_quickfire(where_check.x,where_check.y)) {
r1 = get_ran(2,1,8);
damage_monst(which_monst,7,r1,0,1);
damage_monst(which_monst,7,r1,0,DAMAGE_FIRE,0);
break;
}
if (is_blade_wall(where_check.x,where_check.y)) {
r1 = get_ran(6,1,8);
damage_monst(which_monst,7,r1,0,0);
damage_monst(which_monst,7,r1,0,DAMAGE_WEAPON,0);
break;
}
if (is_force_wall(where_check.x,where_check.y)) {
r1 = get_ran(3,1,6);
damage_monst(which_monst,7,r1,0,3);
damage_monst(which_monst,7,r1,0,DAMAGE_MAGIC,0);
break;
}
if (is_sleep_cloud(where_check.x,where_check.y)) {
@@ -948,7 +948,7 @@ void monst_inflict_fields(short which_monst)
if (is_ice_wall(where_check.x,where_check.y)) {
r1 = get_ran(3,1,6);
if (univ.town.monst.dudes[which_monst].m_d.spec_skill != 23)
damage_monst(which_monst,7,r1,0,5);
damage_monst(which_monst,7,r1,0,DAMAGE_COLD,0);
break;
}
if (is_scloud(where_check.x,where_check.y)) {
@@ -966,7 +966,7 @@ void monst_inflict_fields(short which_monst)
if (is_fire_wall(where_check.x,where_check.y)) {
r1 = get_ran(2,1,6);
if (univ.town.monst.dudes[which_monst].m_d.spec_skill != 22)
damage_monst(which_monst,7,r1,0,1);
damage_monst(which_monst,7,r1,0,DAMAGE_FIRE,0);
break;
}
}
@@ -985,7 +985,7 @@ void monst_inflict_fields(short which_monst)
take_barrel(where_check.x,where_check.y);
if (is_fire_barrier(where_check.x,where_check.y)) {
r1 = get_ran(2,1,10);
damage_monst(which_monst,7,r1,0,1);
damage_monst(which_monst,7,r1,0,DAMAGE_FIRE,0);
}
}