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

- Corrected setting slaves_inherit_mode to not apply to morphosis skills.

Browse Source 
- Added define OPTION_CART which holds the 5 cart option values.
- Corrected pc_setoption to invoke status_calc_pc when getting/removing the cart.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6914 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-06-01 19:21:04 +00:00
parent 0d344b6bb1
commit bbe820d3e3
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -4,6 +4,10 @@ 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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/06/01 2006/06/01
* Corrected setting slaves_inherit_mode to not apply to morphosis skills.
[Skotlex]
* Corrected pc_setoption to invoke status_calc_pc when getting/removing the
cart. [Skotlex]
* Fixed @mobinfo displaying the wrong element. [Skotlex] * Fixed @mobinfo displaying the wrong element. [Skotlex]
* Fixed Autoblitz taking into account target's luck rather than attacker's * Fixed Autoblitz taking into account target's luck rather than attacker's
[Skotlex] [Skotlex]

2
src/map/mob.c
View File

@ -2416,7 +2416,7 @@ int mob_summonslave(struct mob_data *md2,int *value,int amount,int skill_id)
md->status.hp = md->status.max_hp*hp_rate/100; md->status.hp = md->status.max_hp*hp_rate/100;
//Inherit the aggressive mode of the master. //Inherit the aggressive mode of the master.
if (battle_config.slaves_inherit_mode) { if (battle_config.slaves_inherit_mode && md->master_id) {
if (md2->status.mode&MD_AGGRESSIVE) if (md2->status.mode&MD_AGGRESSIVE)
sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 0); sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 0);
else else

12
src/map/pc.c
View File

@ -5399,6 +5399,16 @@ int pc_setoption(struct map_session_data *sd,int type)
clif_status_load(&sd->bl,SI_RIDING,0); clif_status_load(&sd->bl,SI_RIDING,0);
status_calc_pc(sd,0); //Mounting/Umounting affects walk and attack speeds. status_calc_pc(sd,0); //Mounting/Umounting affects walk and attack speeds.
} }
if(type&OPTION_CART && !(p_type&OPTION_CART))
{ //Cart On
if(pc_checkskill(sd, MC_PUSHCART) < 10)
status_calc_pc(sd,0); //Apply speed penalty.
} else
if(!(type&OPTION_CART) && p_type&OPTION_CART)
{ //Cart Off
if(pc_checkskill(sd, MC_PUSHCART) < 10)
status_calc_pc(sd,0); //Remove speed penalty.
}
if (type&OPTION_FALCON && !(p_type&OPTION_FALCON)) //Falcon ON if (type&OPTION_FALCON && !(p_type&OPTION_FALCON)) //Falcon ON
clif_status_load(&sd->bl,SI_FALCON,1); clif_status_load(&sd->bl,SI_FALCON,1);
@ -5437,7 +5447,7 @@ int pc_setcart(struct map_session_data *sd,int type)
if(pc_checkskill(sd,MC_PUSHCART)>0){ // プッシュカ?トスキル所持 if(pc_checkskill(sd,MC_PUSHCART)>0){ // プッシュカ?トスキル所持
option = sd->sc.option; option = sd->sc.option;
//This should preserve the current option, only modifying the cart bit. //This should preserve the current option, only modifying the cart bit.
option&=~(OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5); option&=~OPTION_CART;
option|=cart[type]; option|=cart[type];
if(!pc_iscarton(sd)){ // カ?トを付けていない if(!pc_iscarton(sd)){ // カ?トを付けていない
pc_setoption(sd,option); pc_setoption(sd,option);

2
src/map/status.h
View File

@ -472,6 +472,8 @@ enum {
//TODO: Get these Missing options... //TODO: Get these Missing options...
#define OPTION_SIGHTTRASHER 0x0001 #define OPTION_SIGHTTRASHER 0x0001
#define OPTION_CART (OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5)
//Define flags for the status_calc_bl function. [Skotlex] //Define flags for the status_calc_bl function. [Skotlex]
#define SCB_NONE 0x00000000 #define SCB_NONE 0x00000000
#define SCB_BASE 0x00000001 #define SCB_BASE 0x00000001