diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-09 14:42:08 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-09 14:42:08 +0000 |
| commit | e53a0dc7cb588a1e0ec85afb87c402e30dc3773b (patch) | |
| tree | 301835b01ce8cba9c8b1d34e655a77b310c05f93 /src | |
| parent | 3f19df2cb549db3635e6638285b39d66f507616c (diff) | |
| download | hercules-e53a0dc7cb588a1e0ec85afb87c402e30dc3773b.tar.gz hercules-e53a0dc7cb588a1e0ec85afb87c402e30dc3773b.tar.bz2 hercules-e53a0dc7cb588a1e0ec85afb87c402e30dc3773b.tar.xz hercules-e53a0dc7cb588a1e0ec85afb87c402e30dc3773b.zip | |
- Trade requests will now fail when either character is unable to act (character in storage, vending, interacting with an npc, petrified, etc)
- Change the default of attack_attr_none to all classes except players. This means that pet/mobs/homun will always do normal attacks with no-element modifiers (but elemental reduction cards still apply)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8207 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 13 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index e7e7e9a48..5044543bf 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4029,7 +4029,7 @@ void battle_set_defaults() { battle_config.party_share_type = 0; battle_config.party_hp_mode = 0; battle_config.party_show_share_picker = 0; - battle_config.attack_attr_none = 0; + battle_config.attack_attr_none = ~BL_PC; battle_config.mob_ghostring_fix = 1; battle_config.gx_allhit = 1; battle_config.gx_disptype = 1; diff --git a/src/map/clif.c b/src/map/clif.c index 7ada8fceb..00113eaeb 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9556,10 +9556,17 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd) RFIFOHEAD(fd);
t_sd = map_id2sd(RFIFOL(sd->fd,2));
- // @noask [LuzZza]
- if(t_sd && t_sd->state.noask) {
- clif_noask_sub(sd, t_sd, 0);
+ if(clif_cant_act(sd))
return;
+
+ // @noask [LuzZza]
+ if(t_sd) {
+ if (t_sd->state.noask) {
+ clif_noask_sub(sd, t_sd, 0);
+ return;
+ }
+ if(clif_cant_act(t_sd))
+ return;
}
if(battle_config.basic_skill_check == 0 || pc_checkskill(sd,NV_BASIC) >= 1){
diff --git a/src/map/pc.c b/src/map/pc.c index 657254906..2095a8ff0 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1455,7 +1455,7 @@ int pc_bonus(struct map_session_data *sd,int type,int val) break; case SP_ASPD: //Raw increase if(sd->state.lr_flag != 2) - status->adelay -= val*10; + status->amotion -= val*10; break; case SP_ASPD_RATE: //Non stackable increase if(sd->state.lr_flag != 2 && status->aspd_rate > 1000-val*10) |