From f70901acd8144f851b033852ab3ff086edf30497 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 15 Sep 2006 17:28:17 +0000 Subject: - Moved the weapon repair effect to where it belongs (after successfully repairing an item) - Added atcommand.conf entries for @adjgmlvl and @adjcmdlvl git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8770 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ conf-tmpl/Changelog.txt | 2 ++ conf-tmpl/atcommand_athena.conf | 8 ++++++++ src/map/skill.c | 5 ++--- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 450272e6b..f83183c2d 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ 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/09/15 + * Moved the weapon repair effect to where it belongs (after successfully + repairing an item) [Skotlex] * Added config setting "friend_auto_add" (battle/player.conf), if set, when you accept someone as your friend, both characters will show up on each other's friend list. [Skotlex] diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt index 959abfdc5..8fb701757 100644 --- a/conf-tmpl/Changelog.txt +++ b/conf-tmpl/Changelog.txt @@ -1,5 +1,7 @@ Date Added +2006/09/15 + * Added atcommand.conf entries for @adjgmlvl and @adjcmdlvl [Skotlex] 2006/09/14 * Adjusted gvg long damage rate to 80%, magic damage rate to 60% (battle/guild.conf) [Skotlex] diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf index 886f443ea..f956a9ecb 100644 --- a/conf-tmpl/atcommand_athena.conf +++ b/conf-tmpl/atcommand_athena.conf @@ -708,6 +708,14 @@ reloadpcdb: 99 // Re-load the Message of the Day (admin command) reloadmotd: 99 +// Changes the GM level of another character +// (lasts until reboot, or gm list reload) +adjgmlvl: 99 + +// Changes the required GM level of an @ command +// (effect lasts until restart or command reload) +adjcmdlvl: 99 + // [Un]Disguise All Players (admin command) disguiseall: 99 undisguiseall: 99 diff --git a/src/map/skill.c b/src/map/skill.c index 676f05455..34aee2c97 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4308,10 +4308,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in break; case BS_REPAIRWEAPON: - if(sd && dstsd) { - clif_skill_nodamage(src,bl,skillid,skilllv,1); + if(sd && dstsd) clif_item_repair_list(sd,dstsd); - } break; case MC_IDENTIFY: @@ -8817,6 +8815,7 @@ void skill_repairweapon (struct map_session_data *sd, int idx) clif_skill_fail(sd,sd->menuskill_id,0,0); return; } + clif_skill_nodamage(&sd->bl,&target_sd->bl,sd->menuskill_id,1,1); item->attribute=0; clif_equiplist(target_sd); pc_delitem(sd,pc_search_inventory(sd,material),1,0); -- cgit v1.2.3-70-g09d2