diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/atcommand.c | 10 | ||||
| -rw-r--r-- | src/map/skill.c | 12 | ||||
| -rw-r--r-- | src/map/status.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 09886dfad..192956bd3 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9329,7 +9329,7 @@ int atcommand_mobinfo( char atcmd_output2[200];
struct item_data *item_data;
struct mob_db *mob, *mob_array[MAX_SEARCH];
- int mob_id, count;
+ int count;
int i, j, k;
memset(atcmd_output, '\0', sizeof(atcmd_output));
@@ -9341,9 +9341,9 @@ int atcommand_mobinfo( }
// If monster identifier/name argument is a name
- if ((mob_id = mobdb_checkid(atoi(message))))
+ if ((i = mobdb_checkid(atoi(message))))
{
- mob_array[0] = mob_db(mob_id);
+ mob_array[0] = mob_db(i);
count = 1;
} else
count = mobdb_searchname_array(mob_array, MAX_SEARCH, message);
@@ -9363,9 +9363,9 @@ int atcommand_mobinfo( // stats
if (mob->mexp)
- sprintf(atcmd_output, "MVP Monster: '%s'/'%s'/'%s' (%d)", mob->name, mob->jname, mob->sprite, mob_id);
+ sprintf(atcmd_output, "MVP Monster: '%s'/'%s'/'%s' (%d)", mob->name, mob->jname, mob->sprite, mob->vd.class_);
else
- sprintf(atcmd_output, "Monster: '%s'/'%s'/'%s' (%d)", mob->name, mob->jname, mob->sprite, mob_id);
+ sprintf(atcmd_output, "Monster: '%s'/'%s'/'%s' (%d)", mob->name, mob->jname, mob->sprite, mob->vd.class_);
clif_displaymessage(fd, atcmd_output);
sprintf(atcmd_output, " Level:%d HP:%d SP:%d Base EXP:%d Job EXP:%d", mob->lv, mob->status.max_hp, mob->status.max_sp, mob->base_exp, mob->job_exp);
clif_displaymessage(fd, atcmd_output);
diff --git a/src/map/skill.c b/src/map/skill.c index 21e76cfe1..aa55ea971 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7233,16 +7233,14 @@ static int skill_moonlit_sub(struct block_list *bl, va_list ap) { */ static void skill_moonlit (struct block_list* src, struct block_list* partner, int skilllv) { - int range = skill_get_range2(src, CG_MOONLIT, skilllv); + int range = skill_get_splash(CG_MOONLIT, skilllv); int blowcount = range+1, time = skill_get_time(CG_MOONLIT,skilllv); map_foreachinrange(skill_moonlit_sub,src, - skill_get_splash(CG_MOONLIT, skilllv), - BL_CHAR,src,partner,blowcount); + range, BL_CHAR,src,partner,blowcount); if(partner) map_foreachinrange(skill_moonlit_sub,partner, - skill_get_splash(CG_MOONLIT, skilllv), - BL_CHAR,src,partner,blowcount); + range, BL_CHAR,src,partner,blowcount); sc_start4(src,SC_DANCING,100,CG_MOONLIT,0,0,partner?partner->id:BCT_SELF,time+1000); sc_start4(src,SkillStatusChangeTable(CG_MOONLIT),100,skilllv,0,0,0,time); @@ -8744,12 +8742,12 @@ void skill_unitsetmapcell (struct skill_unit *src, int skill_num, int skill_lv, } /*========================================== - * Sets a map cell around the caster, according to the skill's range. + * Sets a map cell around the caster, according to the skill's splash range. *------------------------------------------ */ void skill_setmapcell (struct block_list *src, int skill_num, int skill_lv, int flag) { - int i,x,y,range = skill_get_range2(src, skill_num, skill_lv); + int i,x,y,range = skill_get_splash(skill_num, skill_lv); int size = range*2+1; for (i=0;i<size*size;i++) { diff --git a/src/map/status.c b/src/map/status.c index 9fa7982d5..08aeb291a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -116,7 +116,7 @@ void initChangeTables(void) { // StatusChangeFlagTable[SC_CONFUSION] = SCB_NONE; StatusChangeFlagTable[SC_BLIND] = SCB_HIT|SCB_FLEE; // StatusChangeFlagTable[SC_BLEEDING] = SCB_NONE; -// StatusChangeFlagTable[SC_DPOISON] = SCB_NONE; + StatusChangeFlagTable[SC_DPOISON] = SCB_DEF2; //The icons for the common ailments // StatusIconChangeTable[SC_STONE] = SI_BLANK; @@ -3156,6 +3156,8 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change def2 -= def2 * sc->data[SC_CONCENTRATION].val4/100; if(sc->data[SC_POISON].timer!=-1) def2 -= def2 * 25/100; + if(sc->data[SC_DPOISON].timer!=-1) + def2 -= def2 * 25/100; if(sc->data[SC_SKE].timer!=-1) def2 -= def2 * 50/100; if(sc->data[SC_PROVOKE].timer!=-1) |