diff options
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | conf-tmpl/script_athena.conf | 7 | ||||
| -rw-r--r-- | sql-files/upgrade_svn6533.sql | 4 | ||||
| -rw-r--r-- | src/map/battle.c | 13 |
4 files changed, 21 insertions, 8 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index fb74d5669..9e13165bb 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,11 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/05/11
+ * Added the missing semi-comma from the upgrade_svn6533.sql file. Thanks to
+ Tanaous [Skotlex]
+ * Added back the missing code that substracts arrows when normal-attacking.
+ [Skotlex]
2006/05/10
* Changed the state of Asura back to explosionspirits, added a hardcoded
move_enable check when invoking Asura and NOT while in BladeStop or a
diff --git a/conf-tmpl/script_athena.conf b/conf-tmpl/script_athena.conf index 17ec34f1f..bb06371ee 100644 --- a/conf-tmpl/script_athena.conf +++ b/conf-tmpl/script_athena.conf @@ -18,6 +18,11 @@ // When choosing those which it refines setting the letter which is indicated. (Those for word use other than Japanese?)
refine_posword: Head,Body,Left hand,Right hand,Robe,Shoes,Accessory 1,Accessory 2,Head 2,Head 3,Not Equipped
+//If you are getting crashes during script loading, you can set this to yes
+//to find out which script causes it. Otherwise leave it as no since the amount
+//of extra console output is staggering.
+verbose_mode: no
+
warn_func_no_comma: yes
warn_cmd_no_comma: yes
@@ -63,4 +68,4 @@ loadmap_event_name: PCLoadMapEvent baselvup_event_name: PCBaseLvUpEvent
// Name of event when a player levels up (job lv)
-joblvup_event_name: PCJobLvUpEvent
\ No newline at end of file +joblvup_event_name: PCJobLvUpEvent
diff --git a/sql-files/upgrade_svn6533.sql b/sql-files/upgrade_svn6533.sql index 5dffe0293..60550dbe6 100644 --- a/sql-files/upgrade_svn6533.sql +++ b/sql-files/upgrade_svn6533.sql @@ -1,2 +1,2 @@ -ALTER TABLE `loginlog` CHANGE `ip` `ip` CHAR( 15 ) NOT NULL
-ALTER TABLE `loginlog` ADD INDEX ( `ip` ( 15 ) )
+ALTER TABLE `loginlog` CHANGE `ip` `ip` CHAR( 15 ) NOT NULL;
+ALTER TABLE `loginlog` ADD INDEX ( `ip` ( 15 ) );
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;
|