summaryrefslogtreecommitdiff
path: root/conf-tmpl
AgeCommit message (Collapse)AuthorFilesLines
2006-06-30Fixed a typo in msg_athena.conf, "This item cannot be drop" -> "This item ↵MasterOfMuppets1-1/+1
cannot be dropped" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7435 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-30- Added mapflag "nochat" to prevent chatting rooms from being created.skotlex1-0/+1
- Corrected some of the sleep checks when the char id does not matches with the char-id expected by the script engine. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7423 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-28changed:musashiden1-2/+2
dynamic_pass_failure_ban_how_many:from 3 to 7 dynamic_pass_failure_ban_how_long:from 60 to 5 as in official servers. [Musashiden] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7383 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-28- Cleaned up a bit the code for @itemskotlex1-0/+12
- Fixed character/storage being sent to be saved TWICE when you logged out while the storage is opened. - Added save_settings map config. Specifies after which events do characters get saved (defaults to all): 1 - Trade successful, 2 - Vending transaction, 4 - Closing storage/guild storage, 8 - hatching a pet. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7375 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-27- Cleaned up the IP sync code to...skotlex1-0/+4
- Use charif_sendallwos rather than manually altering the buffers of each server. - Use the id variable for identifying current char-server instead of scanning the connected servers for it (it's doing the same work twice) - Added config setting sync_ip_interval to specify how long to go before updating ip. Defaults to 0 (disabled) - Sending ip update packets will only be done when the ip changed now. - Removed dns_str variables, and now char_ip_str/login_ip_str/map_ip_str will hold the unresolved dns address (as these variables have no use otherwise) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7360 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-27- Fixed indentation on int_pet.c (how did it got messed up?)skotlex1-0/+1
- Added mapflag "loadevent", now load-map script events will ONLY trigger on maps with this mapflag on, rather than every map. - High Jump can now be used in all versus maps. - Added Kaite's opt3 value, taken from jA - Added state dirty == 2 to storages. Signals when a storage was sent for final saving. Said storage is removed from memory after the ack from the char-server, and they are sent to save if the map/char servers reconnect before the act arrives. In short: they are guaranteed to be saved after a char logs out. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7358 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-27Put pay_arche.gat in the "no experience lost" mapflag file.MasterOfMuppets1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7355 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-26- Merged Mitternacht's max_heal/max_heal_lv config settings.skotlex1-0/+5
- Removed support of packet 0xc3 on the new packet versions. Thanks to Meruru for pointing out they aren't being used anymore. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7343 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-23- Standarized PF_MEMORIZE to be 50% cast time on all skills (instead of -50% ↵skotlex1-1/+4
for targetted skills and -66% for ground skills >.>) - Cleared up the comment on what item_check does and how it works. - Changed the pointer dummy_item to a normal struct variable. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7316 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-23- Updated BD_INTOABYSS's unit flag to not affect mobs.skotlex1-1/+1
- Changed setting for skill_nocast flag 16. It is no longer a "pk-mode map" setting, it's now a clone-forbidden skill. That is, skills with the flag 16 will never be copied by clones. If you use a PK-mode server, use flag 2 now to forbid skills from common maps. - Default skills from not being cloned are Magnus Exorcism and Turn Undead. - The map search free cell will now use the size of the map # of tries before giving up when the spawn area is the whole map. Added a check to inmediately give up when the number of spawn retries has reached the max specified (no_spawn_onplayer = 100). - Cleaned up a bit the clone code to account for the unit flags UF_NOPC/UF_NOMOB when the skill is not ground-based (accounts for self skill that causes a ground-tile to be placed, like Dances). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7315 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-21- Added function parse_hostbyname() which takes a hostname and a char[4]. ↵skotlex1-1/+0
The hostname is resolved to an ip, whose individual components are stored in char[], the return value of the function is the inet_addr result of the lookup (or returns 0 when failed). Meant to be used in the rest of the code without the need to do socket/network related includes. - Applied use of parse_hostbyname() in chrif.c to fix compilation errors. - status_percent_change will now account for when the target's max hp/sp is above INT_MAX. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7281 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-20added ayothaya to nopvp and nopenalty mapflagsevera2-1/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7261 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-19- Switched drop_rate0item to NO according to iRO.musashiden1-1/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7257 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-19git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7245 ↵MasterOfMuppets1-2/+0
54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-19Added missing Arunafeltz mapflagsevera12-5/+111
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7244 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-17Some mapflag and item restriction changes/additions according to the eye of ↵MasterOfMuppets3-0/+3
hellion quest. Also made Hellion revenant heal for 9999. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7224 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16- Modified the bNoMagicDamage/bNoWeaponDamage bonuses to be a 0-100 setting. ↵skotlex1-4/+4
Meaning you can do bonus bNoMagicDamage,50; To make all magic damage be reduced by half. This bonus stack, so two cards with bNoMagicDamage,50 will give magic immunity. - Removed setting gtb_pvp_only and replaced it with gtb_sc_immunity which specifies the threshold before the bNoMagicDamage starts blocking support statuses as well. ie: gtb_sc_imunity: 75 will mean that "bonus bNoMagicDamage,70;" reduces magic damage by 70%, but does not blocks heal or support status, while "bonus bNoMagicDamage,80;" does. - Updated GTB's card script to be "bonus bNoMagicDamage,100;" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7212 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16- Merged Adam's patch to let the char-server handle validation of ↵skotlex1-0/+1
pet-name-change requests through the allowed char letters config. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7192 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-14- Modified how luk reduces status changes by reducing the gap. Eg: resist = ↵skotlex1-2/+10
vit; resist += (max - resist)*luk/300; - Added battle settings pc_max_sc_luk/mob_max_sc_luk to handle which is the luk threshold at which you gain inmunity (defaults to 300). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7168 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-13- Added irc_channel_pass setting and prevent crashing when irc server lookup ↵skotlex1-0/+3
by host fails. Thanks to Trancid for the details. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7133 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-13- Updated clif_disp_onlyself to not use dynamic memory and write directly to ↵skotlex1-0/+6
the player's buffer. - Updated @noask to also tell the rejected what he has just rejected (added msg_athena entries for each of the different requests) - Since noask already does a player lookup, updated the corresponding parsing functions to take the player rather than the player id (prevents double lookups) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7117 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-13Implemented a missing npc in Amatsu and the momotaro event.MasterOfMuppets9-1/+11
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7114 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-09- Fixed @mapinfo displaying incorrectly maps with nosave which send you back ↵skotlex2-4/+6
to your last savepoint. - Moved guild_exp_rate from a mapserver battle config setting to a char server config. It no longer modifies the total taxed exp as seen on the guild information window, but directly modifies the exp that the guild earns. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-08- Updated mob_npc_warp to a three-state config switch. 0 disables. 1 enable ↵skotlex1-3/+5
only on warps that don't lead to nobranch maps. 2 - enable on all warps. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7048 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-07- Added config setting mob_npc_warp, when set to yes, enables mobs to be ↵skotlex1-0/+6
warped between maps when stepping on a npc-warp. - Added monster_ai setting &64, when enabled makes a mob run to any nearby npc-warp when their current target has switched maps. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7039 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-02- Altered status_calc_pc so that equipment scripts are ran before card-scripts.skotlex1-0/+2
- Fixed pc_bonus to not underflow/overflow when adjusting def/mdef. - These two together, should fix Tao Gunka Card. - npc_debug_warps() will now be invoked if warp_point_debug is set. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6925 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-31- Made the char_name_option char_athena.conf setting apply to parties and ↵skotlex1-0/+1
guilds as well. It cannot be applied to pets yet without adding a change-name-request interserver packet. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6897 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30- Fixed Absorb Spirit Spheresskotlex1-0/+4
- Added battle_config min_chat_delay (default 0) specifies in ms what is the min delay between player sent chats (whisper/global/party/guild). Messages that exceed this threshold are silently ignored for now (perhaps need to add a "DON'T SPAM" reply to the player?) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6859 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-29Added the Arunafeltz maps, not tested yetPlaytester1-0/+31
- someone with an up-to-date client should test them git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6829 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-29- Updated max_def parameter to not apply to mdef if magic_defense_type is ↵skotlex1-1/+3
set (rather than weapon_defense_type) - Updated comment description for config setting max_def - Fixed battle_check_target check on BCT_ALL to check versus BL_CHAR instead of BL_PC and BL_MOB git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6826 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-28Changed undeads to by default always sustain 100% of the damage from firewalls.MasterOfMuppets1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6805 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-27- Added structure status_data which holds status-related information (str, ↵skotlex1-19/+7
agi, etc, speed, amotion, adelay, dmotion, weapon-damage, race, size, etc) and weapon_atk structure with the weapon specific info (atk, atk2, element) to be used by all combat structures (TODO: Homun needs to be updated to use it) - Cleaned up TBL_PC, TBL_MOB, TBL_PC and mob_db structures to use status_data. - Set the NPC-Change Attribute duration on Time1, updated their max to 1 in the db. - Berserk's HP cost interval is now defined as time2. - Split damage received functions into pc_damage/pc_dead and mob_damage/mob_dead - Rewrote the @heal related functions to use the new status_* healing functions. - Added status functions to deal with damage and healing (status_damage, status_heal, status_percent_change) and a bunch of defines for easier handling of them (status_percent_heal, status_percent_damage, status_fix_damage, status_kill, etc) - Splitted mob_once_spawn into two. mob_once_spawn_sub creates the mob instance without spawning it. - Added defines for Elements (ELE_*) - Modified battle_calc_(weapon/magic/misc)_attack to use the status data structure. - Rewrote and cleaned up battle_calc_misc_attack - Merged config options pc_attack_attr_none, mob_attack_attr_none, pet_attack_attr_none into attack_attr_none (type 4) - Removed config options player_defense_type, monster_defense_type, pet_defense_type in favor of weapon_defense_type - Cleaned up pet.c to stop invoking status_calc_pc when unnecessary - Modified skill_calc_heal to take into account the MEDITATION bonus. - Cleaned up code of Adjustment, Madness Cancel and other GS/NJ skills inside skill_check_condition - Added status change SC_MODECHANGE which handles mob state changes (this SC is continous until manually ended, eg: like Weight50) - Modified Slim Pitcher so it will work when casted by non-players. Will now also work with SP-healing items. - Rewrote Freedom of Cast code to use function status_freecast_switch to switch adelay/speed when cast begins/ends. - Modified Magic Power to store amplified MATK/MATK2 in val3/val4 for easier updating when used in conjunction with ground skills. - Fixed Asura Strike being usable from within a combo regardless of combo skill. - Modifed SC_DANCING to store speed-change in val3 (it is shared with skill duration...) - Added StatusChangeFlagTable to store which statuses are changed by each SC - Added SCB_* constants to specify the different stats that each sc changes. SCB_PC is the only one that means a change hardcoded in status_calc_pc, the rest are handled by status_calc_bl - Added some helper functions to simplify with basic status calculations (status_base_atk, status_calc_misc, status_base_pc_maxhp, status_base_pc_maxsp) - Added status_calc_mob which calculates initial status and special base status alterations (HP changes, stat changes due to big/small mobs, etc) - Made all the status_calc functions static. - Added status_calc_bl_sub_pc for PC related calculations that must happen after status-change adjustments. - Added status_calc_bl which does status-change related calculations using as base the base_status of the bl object and the SCB_* flag passed. - Added status_get_status_data and status_get_base_status to retrieve the bl objects current status_data and basic status_data (current never returns null, instead it returns a dummy structure with basic data) - The main switch in status_change_start now only sets the tick and val values, therefore it is skipped when loading (flag&4) - Cleaned up status_change_start and replaced many of the ex-japanese comments for english ones. - Changed Hiding to store the speed penalty on val3. val4 stores interval SP cost. - Changed Chase Walk to store Speed adjustment on val3, sp cost in val4 - Changed Cloaking to store speed penalty on val3, val4&2 signals wall-present, val4&1 is infinite cloaking. - Changed Wind walk to store speed bonus on val3 - Rewrote Marionette Control to store the status to add/substract in val3/val4, it now works on anyone (players/mobs) - Changed Improve concentration to store Card bonuses (which are not counted for total % increase) on val3/val4 - Changed SC_ADRENALINE, SC_CONCENTRATION, SC_ANGELUS, SC_IMPOSITIO, SC_MELTDOWN, SC_TRUESIGHT, SC_SUN_COMFORT, SC_MOON_COMFORT, SC_STAR_COMFORT, SC_QUAGMIRE, SC_GATLINGFEVER to store the bonus modifiers in their val values rather than calculate them in status_calc_* - Status_change_start/end will use clif_status_load rather than clif_status_change when related bl is not on a map. - Modified status_change_timer to use the status_charge function rather than directly substracting SP - Added SC_ELEMENTALCHANGE to modify someone's base defense element. - pc_clean_skilltree will now also remove item-granted skills. - Learning skills will now only invoke status_calc_pc when the skill is passive. - Cleaned up pc_steal_coin - Cleaned up pc_check_base/job_lvup to only invoke the lv-up related packets and functions ONCE regardless of skill-levls earned. - Cleaned up pc_ regen related functions. - Made player-sprite mobs have item pickup animation and walkdelay when taking items. - Cleaned up mob_dead code. - Removed paramb, parame from struct map_session_data, replaced them by param_bonus[6],param_equip[6] - mob special ai state 3 signals summon flora. - Moved petDB pet_hungry_timer vars from TBL_PC to TBL_PET - Cleaned up some pet functions, made the menu functions receive as argument both pet and master. - Clones will copy a player's base status rather than battle status (so status-change alterations are not cloned) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6791 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-26updated descLupus1-3/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6774 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-25added noVending mapflag. Tested. + custom Market Place NPC, fixed MSG stringsLupus1-3/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6755 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-18- Added 5 config settings to adjust damage in pk-mode servers (misc.conf)skotlex1-0/+8
- Corrected LoV's effect range for levels 11+ to range 8. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6646 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-18- Some code cleaning of the skill reiteration/nofootset code.skotlex1-2/+3
- skill reiteration code now does not checks for the trigger-area of the skill in the case of non-players, which means mobs can now place traps in cells adjacent to each other. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6640 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-15More Amon Ra related changesPlaytester1-6/+3
- Dark Blessing and Blood Sucker now have a range of 9 tiles - Small fixes on his skills again - G_Khalitzburg is a bit slower now Changes to skill.conf: -mobs now can stack ground skills by default -mobs can place unlimited ground skills -format for land_skill_limit changed git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6614 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-15- Added SC_BLADESTOP to the switch listing in status_change_startskotlex1-1/+1
- Characters in vending are now always considered "idle" if the idle_no_share setting is active. - Corrected 10 Geminis spawning in Lhz1 rather than 2. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6595 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-11- Added the missing semi-comma from the upgrade_svn6533.sql file. Thanks to ↵skotlex1-1/+6
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
2006-05-10Finished DNSBL, Although untested, It's simple code and should work fine.Zido1-0/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6543 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-10- Rewrote/cleaned up trade.c for a more clean trading implementation.skotlex2-1/+6
- Added @request commands, sends a request to all connected GMs of lowest_gm_level or above as a whisper message. Defaults to gm level 20 users. - Made SC_COMBO status start delay attackabletime and walkdelay by sc's duration regardless of skill used (previously it was only for TK kicks, now it's for both those and Monk combos) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6542 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-08- Fixed compilation error.skotlex1-1/+1
- idletime will now be updated on attack-request, not on sit/standup - Party members sitting will no longer be considered idle. - hide_gvg_damage will now send 1 instead of -1 as damage. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6517 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-07removed old logsLupus1-61/+0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6510 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-06- Changed @deletemail's default level 0. NO ATCOMMAND SHOULD HAVE A DEFAULT ↵skotlex1-1/+1
OF 0 >.< git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6503 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-05- Being in Enjoyable Rest state will now also trigger the HP/SP Time skills ↵skotlex1-0/+8
(even if there's no other TK around). - Renamed SC_TKDORI to SC_TKREST (makes more sense if you ask me) - Added battle config settings view_range_rate and chase_range_rate to adjust the view-range and chase-range (range2/range3) of the mob_db without having to manually change them. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6490 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-04- Stun time for using ES magic on non-mobs reduced to 0.5 secs.skotlex1-2/+3
- Eska is now usable on bosses. - Swoo will stun you if attempted on an already 'swooned' enemy. - clif_skill_failed will print out a debug line with the skill_id (since the current null_po does not helps at all to fix it) - Applied TheUltraMage's suggested fixes to the grfio module. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6467 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-02added support to regulate MVP drops [Reddozen]reddozen1-0/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6439 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-29fixed STEAL. now workingLupus1-5/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6378 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-29Added @noask command: enable/disable deals/invites autorejecting.LuzZza2-0/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-29Updated STEAL skill (WIP), added a battle config option: ↵Lupus1-0/+7
'skill_steal_max_tries' to set max number of stealing tries. It could help to fix stealing exploit on mobs with few drops git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6367 54d463be-8e91-2dee-dedb-b68131a5f0ec