diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-11 13:38:30 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-11 13:38:30 +0000 |
| commit | 0fa978f156779e2f8f8d7e7b0f04d3973ab97c0a (patch) | |
| tree | 0f94f520efe85208752a3016e4059b95d080870e /src | |
| parent | ef96dc4ab24074431b4d7463cfc0a6077fcd311e (diff) | |
| download | hercules-0fa978f156779e2f8f8d7e7b0f04d3973ab97c0a.tar.gz hercules-0fa978f156779e2f8f8d7e7b0f04d3973ab97c0a.tar.bz2 hercules-0fa978f156779e2f8f8d7e7b0f04d3973ab97c0a.tar.xz hercules-0fa978f156779e2f8f8d7e7b0f04d3973ab97c0a.zip | |
- Added the missing semi-comma from the upgrade_svn6533.sql file. Thanks to Tanaous
- Added back the missing code that substracts arrows when normal-attacking.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6554 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 8cd05f646..e3f479e2f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3147,6 +3147,9 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, wd = battle_calc_weapon_attack(src,target, 0, 0,0);
+ if (sd && sd->state.arrow_atk) //Consume arrow.
+ battle_consume_ammo(sd, 0, 0);
+
damage = wd.damage + wd.damage2;
if (damage > 0 && src != target) {
rdamage = battle_calc_return_damage(target, &damage, wd.flag);
@@ -4156,15 +4159,15 @@ void battle_set_defaults() { // eAthena additions
battle_config.item_rate_mvp=100;
battle_config.item_rate_common = 100;
- battle_config.item_rate_common_boss = battle_config.item_rate_common; // [Reddozen]
+ battle_config.item_rate_common_boss = 100; // [Reddozen]
battle_config.item_rate_equip = 100;
- battle_config.item_rate_equip_boss = battle_config.item_rate_equip; // [Reddozen]
+ battle_config.item_rate_equip_boss = 100; // [Reddozen]
battle_config.item_rate_card = 100;
- battle_config.item_rate_card_boss = battle_config.item_rate_card; // [Reddozen]
+ battle_config.item_rate_card_boss = 100; // [Reddozen]
battle_config.item_rate_heal = 100; // Added by Valaris
- battle_config.item_rate_heal_boss = battle_config.item_rate_heal; // [Reddozen]
+ battle_config.item_rate_heal_boss = 100; // [Reddozen]
battle_config.item_rate_use = 100; // End
- battle_config.item_rate_use_boss = battle_config.item_rate_use; // [Reddozen]
+ battle_config.item_rate_use_boss = 100; // [Reddozen]
battle_config.item_rate_adddrop = 100;
battle_config.item_rate_treasure = 100;
battle_config.logarithmic_drops = 0;
|