Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Changed Greed Scroll's type to 11 (all itemskill items should use this)

Browse Source 
- Ignore %MDef bonuses now only reduce target's base MDEF, not MDEF2.
- Updated the 'skills that cause no damage are blocked now if the skill element is blocked by the target' to only apply if the skill has a status change associated (fixes Resurrection/Heal being blocked).
- Reverted the opt_flag2 change in status_change_start (clif_changeoption2) since it never served its purpose.
- Added a warning to prevent loading mobs with IDs that belong to the clone range.
- Changed MAX_MOB_DB to 3000, updated the definitions of the clone range defines so they are updated automatically with the change of MAX_MOB_DB.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11287 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-09-24 17:06:58 +00:00
parent a2f5ddae41
commit 1a91ca358c
9 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog-Trunk.txt
View File

@ -4,6 +4,12 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/09/24
* Ignore %MDef bonuses now only reduce target's base MDEF, not MDEF2.
* Updated the 'skills that cause no damage are blocked now if the skill
element is blocked by the target' to only apply if the skill has a status
change associated (fixes Resurrection/Heal being blocked).
* Added a warning to prevent loading mobs with IDs that belong to the clone
range. [Skotlex]
* Limited manual detection of data truncation to string/enum/blob columns.
* Renamed conf-tmpl to conf. [FlavioJS]
2007/09/23

2
db/Changelog.txt
View File

@ -28,6 +28,8 @@
=======================
09/24
* Changed Greed Scroll's type to 11 (all itemskill items should use this)
[Skotlex]
* Fixed Lever Action Rifle thanks to Cort [Playtester]
09/23
* Fixed some "official bugs" [Playtester]

2
db/item_db.txt
View File

@ -3769,7 +3769,7 @@
14526,Oriental_Pastry,Oriental Pastry,0,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MATKPOTION,180000,10; },{},{}
14527,Dungeon_Teleport_Scroll,Dungeon Teleport Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashDungeon"; },{},{}
14528,PVP_Mobile_Scroll,PVP Mobile Scroll,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
14529,Greed_Scroll,Greed Scroll,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 1013,1; },{},{}
14529,Greed_Scroll,Greed Scroll,11,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 1013,1; },{},{}
14530,Evasion_Scroll,Evasion Scroll,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,1800000,30; },{},{}
14531,Concentration_Power_Scroll,Concentration Power Scroll,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,1800000,30; },{},{}
//14532,±âÃÊ_Field_Manual,±âÃÊ_Field_Manual,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}

2
src/map/battle.c
View File

@ -2340,7 +2340,7 @@ struct Damage battle_calc_magic_attack(
{
if (i > 100) i = 100;
mdef -= mdef * i/100;
mdef2-= mdef2* i/100;
//mdef2-= mdef2* i/100;
}
}
if(battle_config.magic_defense_type)

5
src/map/mob.c
View File

@ -3239,6 +3239,11 @@ static bool mob_parse_dbrow(char** str)
return false;
}
if (class_ >= MOB_CLONE_START && class_ < MOB_CLONE_END) {
ShowWarning("Mob with ID: %d not loaded. That ID is reserved for player clones. Please increase MAX_MOB_DB (%d)\n", MAX_MOB_DB);
return false;
}
if (mob_db_data[class_] == NULL)
mob_db_data[class_] = aCalloc(1, sizeof (struct mob_data));

7
src/map/mob.h
View File

@ -13,7 +13,8 @@
// 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.
#define MAX_MOB_DB 10000
// Notice that the last 1000 entries are used for player clones, so always set this to desired value +1000
#define MAX_MOB_DB 3000
//The number of drops all mobs have and the max drop-slot that the steal skill will attempt to steal from.
#define MAX_MOB_DROP 10
@ -28,8 +29,8 @@
#define MOB_SLAVEDISTANCE 2
// These define the range of available IDs for clones. [Valaris]
#define MOB_CLONE_START 9001
#define MOB_CLONE_END 10000
#define MOB_CLONE_START (MAX_MOB_DB-999)
#define MOB_CLONE_END MAX_MOB_DB
// Scripted Mob AI Constants
#define CALLBACK_NPCCLICK 0x100

2
src/map/pet.c
View File

@ -215,7 +215,7 @@ int pet_sc_check(struct map_session_data *sd, int type)
if( pd == NULL
|| (battle_config.pet_equip_required && pd->pet.equip == 0)
|| pd->recovery == NULL
|| pd->recovery == NULL
|| pd->recovery->timer != -1
|| pd->recovery->type != type )
return 1;

16
src/map/skill.c
View File

@ -3417,7 +3417,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
struct status_change *tsc;
struct mob_data *md = NULL;
struct mob_data *dstmd = NULL;
int i,type=-1;
int i,type;
if(skillid > 0 && skilllv <= 0) return 0; // celest
@ -3445,16 +3445,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
return 1;
if(status_isdead(src))
return 1;
if(src!=bl && status_isdead(bl) && skillid != ALL_RESURRECTION && skillid != PR_REDEMPTIO)
return 1;
tstatus = status_get_status_data(bl);
sstatus = status_get_status_data(src);
if(src!=bl && (i = skill_get_pl(skillid, skilllv)) > ELE_NEUTRAL &&
battle_attr_fix(NULL, NULL, 100, i, tstatus->def_ele, tstatus->ele_lv) <= 0)
return 1; //Skills with an element should be blocked if the target element absorbs it.
//Check for undead skills that convert a no-damage skill into a damage one. [Skotlex]
switch (skillid) {
case HLIF_HEAL: //[orn]
@ -3483,11 +3480,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
return skill_castend_pos2(src,bl->x,bl->y,skillid,skilllv,tick,0);
}
if (skillid > 0)
type = SkillStatusChangeTable(skillid);
type = SkillStatusChangeTable(skillid);
tsc = status_get_sc(bl);
if (src!=bl && type > -1 &&
(i = skill_get_pl(skillid, skilllv)) > ELE_NEUTRAL &&
battle_attr_fix(NULL, NULL, 100, i, tstatus->def_ele, tstatus->ele_lv) <= 0)
return 1; //Skills that cause an status should be blocked if the target element blocks its element.
map_freeblock_lock();
switch(skillid)
{

68
src/map/status.c
View File

@ -5900,18 +5900,18 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
case SC_SPEARQUICKEN:
case SC_CONCENTRATION:
sc->opt3 |= 0x1;
opt_flag = 2;
opt_flag = 0;
break;
case SC_MAXOVERTHRUST:
case SC_OVERTHRUST:
case SC_SWOO: //Why does it shares the same opt as Overthrust? Perhaps we'll never know...
sc->opt3 |= 0x2;
opt_flag = 2;
opt_flag = 0;
break;
case SC_ENERGYCOAT:
case SC_SKE:
sc->opt3 |= 0x4;
opt_flag = 2;
opt_flag = 0;
break;
case SC_INCATKRATE:
//Simulate Explosion Spirits effect for NPC_POWERUP [Skotlex]
@ -5921,39 +5921,39 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
}
case SC_EXPLOSIONSPIRITS:
sc->opt3 |= 0x8;
opt_flag = 2;
opt_flag = 0;
break;
case SC_STEELBODY:
case SC_SKA:
sc->opt3 |= 0x10;
opt_flag = 2;
opt_flag = 0;
break;
case SC_BLADESTOP:
sc->opt3 |= 0x20;
opt_flag = 2;
opt_flag = 0;
break;
//0x40 missing?
case SC_BERSERK:
sc->opt3 |= 0x80;
opt_flag = 2;
opt_flag = 0;
break;
//0x100, 0x200 missing?
case SC_MARIONETTE:
case SC_MARIONETTE2:
sc->opt3 |= 0x400;
opt_flag = 2;
opt_flag = 0;
break;
case SC_ASSUMPTIO:
sc->opt3 |= 0x800;
opt_flag = 2;
opt_flag = 0;
break;
case SC_WARM: //SG skills [Komurka]
sc->opt3 |= 0x1000;
opt_flag = 2;
opt_flag = 0;
break;
case SC_KAITE:
sc->opt3 |= 0x2000;
opt_flag = 2;
opt_flag = 0;
break;
//OPTION
case SC_HIDING:
@ -5989,12 +5989,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
//On Aegis, when turning on a status change, first goes the option packet,
// then the sc packet.
if(opt_flag) {
if (opt_flag == 2)
clif_changeoption2(bl);
else
clif_changeoption(bl);
}
if(opt_flag)
clif_changeoption(bl);
if (calc_flag&SCB_DYE)
{ //Reset DYE color
@ -6412,15 +6408,15 @@ int status_change_end( struct block_list* bl , int type,int tid )
case SC_HIDING:
sc->option &= ~OPTION_HIDE;
opt_flag|= 8|4; //Check for warp trigger + AoE trigger
opt_flag|= 2|4; //Check for warp trigger + AoE trigger
break;
case SC_CLOAKING:
sc->option &= ~OPTION_CLOAK;
opt_flag|= 8;
opt_flag|= 2;
break;
case SC_CHASEWALK:
sc->option &= ~(OPTION_CHASEWALK|OPTION_CLOAK);
opt_flag|= 8;
opt_flag|= 2;
break;
case SC_SIGHT:
sc->option &= ~OPTION_SIGHT;
@ -6446,55 +6442,55 @@ int status_change_end( struct block_list* bl , int type,int tid )
case SC_SPEARQUICKEN:
case SC_CONCENTRATION:
sc->opt3 &= ~0x1;
opt_flag = 2;
opt_flag = 0;
break;
case SC_OVERTHRUST:
case SC_MAXOVERTHRUST:
case SC_SWOO:
sc->opt3 &= ~0x2;
opt_flag = 2;
opt_flag = 0;
break;
case SC_ENERGYCOAT:
case SC_SKE:
sc->opt3 &= ~0x4;
opt_flag = 2;
opt_flag = 0;
break;
case SC_INCATKRATE: //Simulated Explosion spirits effect.
if (bl->type != BL_MOB)
break;
case SC_EXPLOSIONSPIRITS:
sc->opt3 &= ~0x8;
opt_flag = 2;
opt_flag = 0;
break;
case SC_STEELBODY:
case SC_SKA:
sc->opt3 &= ~0x10;
opt_flag = 2;
opt_flag = 0;
break;
case SC_BLADESTOP:
sc->opt3 &= ~0x20;
opt_flag = 2;
opt_flag = 0;
break;
case SC_BERSERK:
sc->opt3 &= ~0x80;
opt_flag = 2;
opt_flag = 0;
break;
case SC_MARIONETTE:
case SC_MARIONETTE2:
sc->opt3 &= ~0x400;
opt_flag = 2;
opt_flag = 0;
break;
case SC_ASSUMPTIO:
sc->opt3 &= ~0x800;
opt_flag = 2;
opt_flag = 0;
break;
case SC_WARM: //SG skills [Komurka]
sc->opt3 &= ~0x1000;
opt_flag = 2;
opt_flag = 0;
break;
case SC_KAITE:
sc->opt3 &= ~0x2000;
opt_flag = 2;
opt_flag = 0;
break;
default:
opt_flag = 0;
@ -6513,12 +6509,8 @@ int status_change_end( struct block_list* bl , int type,int tid )
else if (sd)
clif_status_load(bl,StatusIconChangeTable[type],0);
if(opt_flag) {
if (opt_flag & 2)
clif_changeoption2(bl);
else
clif_changeoption(bl);
}
if(opt_flag)
clif_changeoption(bl);
if (calc_flag)
status_calc_bl(bl,calc_flag);
@ -6526,7 +6518,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
if(opt_flag&4) //Out of hiding, invoke on place.
skill_unit_move(bl,gettick(),1);
if(opt_flag&8 && sd && map_getcell(bl->m,bl->x,bl->y,CELL_CHKNPC))
if(opt_flag&2 && sd && map_getcell(bl->m,bl->x,bl->y,CELL_CHKNPC))
npc_touch_areanpc(sd,bl->m,bl->x,bl->y); //Trigger on-touch event.
return 1;