summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-09 14:42:08 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-09 14:42:08 +0000
commite53a0dc7cb588a1e0ec85afb87c402e30dc3773b (patch)
tree301835b01ce8cba9c8b1d34e655a77b310c05f93
parent3f19df2cb549db3635e6638285b39d66f507616c (diff)
downloadhercules-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
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--conf-tmpl/Changelog.txt4
-rw-r--r--conf-tmpl/battle/battle.conf2
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/clif.c13
-rw-r--r--src/map/pc.c2
6 files changed, 20 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8c4d5de58..3f69afe72 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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.
2006/08/09
+ * Trade requests will now fail when either character is unable to act
+ (character in storage, vending, interacting with an npc, petrified, etc)
+ [Skotlex]
* Heard skotlex voice, changed all msg_table[] into msg_txt() in atcommand.c [Toms]
2006/08/08
* Fixed the char-server not invoking the party_calc_state function when the
diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index c00c57702..638b01200 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,4 +1,8 @@
Date Added
+2006/08/09
+ * 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) [Skotlex]
2006/08/08
* Removed config settings display_delay_skill_fail and
display_snatcher_skill_fail, replaced them with display_skill_fail, which
diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index 4f2b75273..edc447636 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -133,7 +133,7 @@ vit_penalty_count_lv: 3
attack_direction_change: 15
// Remove elemental modifiers from normal attacks (skills will always have elemental modifiers)? (Note 4)
-attack_attr_none: 0
+attack_attr_none: 14
// Rate at which equipment can break (base rate before it's modified by any skills)
// 1 = 0.01% chance. Default for official servers: 0
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)