WowAce

------------------------------------------------------------------------
r1247 | gagorian | 2010-01-27 17:28:05 +0000 (Wed, 27 Jan 2010) | 1 line
Changed paths:
   M /trunk/Aura.lua
   M /trunk/Data/Druid.lua
   M /trunk/Data/Shaman.lua
   M /trunk/Data/Warlock.lua
   M /trunk/Data/Warrior.lua
   M /trunk/DrDamage.lua

- Patch 3.3.2 changes
------------------------------------------------------------------------
r1246 | gagorian | 2010-01-27 17:02:48 +0000 (Wed, 27 Jan 2010) | 1 line
Changed paths:
   M /trunk/Caster.lua
   M /trunk/DrDamage.lua
   M /trunk/Melee.lua

- Added crit depression option to apply to melee type attacks calculated in the caster module
------------------------------------------------------------------------
r1244 | gagorian | 2010-01-26 13:45:58 +0000 (Tue, 26 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Rogue.lua

- Blade Flurry extra hit is now only calculated and displayed when the manually selected target amount is 2 or higher.
------------------------------------------------------------------------
r1243 | gagorian | 2010-01-26 00:54:38 +0000 (Tue, 26 Jan 2010) | 1 line
Changed paths:
   M /trunk/Aura.lua

- Added mana cost reduction for manually enabled Power Infusion
------------------------------------------------------------------------
r1242 | gagorian | 2010-01-26 00:37:45 +0000 (Tue, 26 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Hunter.lua
   M /trunk/Data/Rogue.lua
   M /trunk/Melee.lua

- Added rounding to melee tooltip hasted duration values
------------------------------------------------------------------------
r1241 | gagorian | 2010-01-26 00:24:27 +0000 (Tue, 26 Jan 2010) | 1 line
Changed paths:
   M /trunk/Aura.lua
   M /trunk/Data/Hunter.lua
   M /trunk/Data/Mage.lua
   M /trunk/Data/Rogue.lua
   M /trunk/DrDamage.lua
   M /trunk/Melee.lua

- Added Slice and Dice to manually applicable buffs. Bloodlust now correctly applies to all attacks.
------------------------------------------------------------------------
r1240 | gagorian | 2010-01-25 23:19:40 +0000 (Mon, 25 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Rogue.lua
   M /trunk/Melee.lua

- Added 20% speed increase for Blade Flurry
------------------------------------------------------------------------
r1238 | gagorian | 2010-01-25 15:48:14 +0000 (Mon, 25 Jan 2010) | 1 line
Changed paths:
   M /trunk/DrDamage.lua

- Added two description strings to options menu
------------------------------------------------------------------------
r1237 | gagorian | 2010-01-25 15:33:41 +0000 (Mon, 25 Jan 2010) | 2 lines
Changed paths:
   M /trunk/DrDamage.lua
   M /trunk/Melee.lua

- Fixed one case of global pollution
- Fixed one case of typo'd variable getglobal
------------------------------------------------------------------------
r1236 | gagorian | 2010-01-25 15:18:57 +0000 (Mon, 25 Jan 2010) | 2 lines
Changed paths:
   M /trunk/DrDamage.lua

- Fixed error on line 457
- Further improvements to options menu
------------------------------------------------------------------------
r1235 | gagorian | 2010-01-25 02:55:33 +0000 (Mon, 25 Jan 2010) | 1 line
Changed paths:
   M /trunk/DrDamage.lua

- Fixed Gift of the Naaru calculation, that I accidentally broke a few commits ago
------------------------------------------------------------------------
r1234 | gagorian | 2010-01-25 02:03:28 +0000 (Mon, 25 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Mage.lua
   M /trunk/DrDamage.lua

- Set the actionbar and calculation multiselect boxes to full width to prevent text from being cut off.
------------------------------------------------------------------------
r1233 | gagorian | 2010-01-25 01:08:22 +0000 (Mon, 25 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Mage.lua

- Corrected blastwave base increase values.
------------------------------------------------------------------------
r1231 | gagorian | 2010-01-25 00:41:52 +0000 (Mon, 25 Jan 2010) | 1 line
Changed paths:
   M /trunk/DrDamage.lua

- Commented out the base value harvesting script
------------------------------------------------------------------------
r1230 | gagorian | 2010-01-25 00:28:01 +0000 (Mon, 25 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Mage.lua

- Added correct base value increases for Pyroblast, Ice Barrier, Dragon's breath and Arcane Barrage
------------------------------------------------------------------------
r1229 | gagorian | 2010-01-24 23:43:12 +0000 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Priest.lua

- Corrected Penance downranking coefficients
------------------------------------------------------------------------
r1228 | gagorian | 2010-01-24 23:34:43 +0000 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Mage.lua
   M /trunk/Data/Priest.lua

- Twin Discplines affects Penance
------------------------------------------------------------------------
r1227 | gagorian | 2010-01-24 22:24:44 +0000 (Sun, 24 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/Druid.lua
   M /trunk/Data/Paladin.lua
   M /trunk/Data/Priest.lua
   M /trunk/Data/Shaman.lua

- Empowered Healing on priests is in fact additive, not multiplicative.
- Merged Divine Hymn 10% increase into tooltip
------------------------------------------------------------------------
r1226 | gagorian | 2010-01-24 21:10:01 +0000 (Sun, 24 Jan 2010) | 5 lines
Changed paths:
   M /trunk/Data/Priest.lua
   M /trunk/DrDamage.lua

- Corrected a lot of things concerning Power Word: Shield. First I adjusted the coefficient ever so slightly. It seems that: Focused Power and Twin Disciplines are additive, Improved Power Word: Shield is multiplicative. While this is all fine and dandy, Divine Aegis which is supposed to be a simple 20% absorption heal, works unlike Power Word: Shield. Divine Aegis has Improved Power Word: Shield and Twin Disciplines additive, and is multiplied by Focused Power. Confused yet? No? Good. Also made Spiritual Healing apply to PW:S.
- Focused Power is multiplicative, except on Power Word: Shield where it's additive with Twin Disciplines
- Prayer of Mending doesn't downrank. Also corrected the coefficient by a tiny bit.
- Twin Disciplines doesn't affect the direct heal part of empowered renew.
- Corrected the base damages and heals for Priest abilities, plus added the downranking coefficients for most heals.
------------------------------------------------------------------------
r1225 | gagorian | 2010-01-24 17:57:22 +0000 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Melee.lua

- Doubled the effects of Resilience on damage reduction
------------------------------------------------------------------------
r1224 | gagorian | 2010-01-24 17:43:48 +0000 (Sun, 24 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Aura.lua
   M /trunk/Data/DeathKnight.lua
   M /trunk/Data/Druid.lua
   M /trunk/Data/Warrior.lua
   M /trunk/DrDamage.lua
   M /trunk/Melee.lua

- Added Blood Gorged talent armor penetration
- Corrected Sunder Armor to apply before instead of the same time as armor penetration
------------------------------------------------------------------------
r1223 | gagorian | 2010-01-24 03:25:25 +0000 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk/Melee.lua

- Added translation for Runic Power
------------------------------------------------------------------------
r1222 | gagorian | 2010-01-24 03:13:10 +0000 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/DeathKnight.lua

- *poke* to update locales
------------------------------------------------------------------------
r1221 | gagorian | 2010-01-24 02:59:16 +0000 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Melee.lua

- Now correcly feeds 0 as the powercost of auto attack and auto shot on the actionbar
------------------------------------------------------------------------
r1220 | gagorian | 2010-01-24 02:32:06 +0000 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk/Caster.lua
   M /trunk/DrDamage.lua
   M /trunk/Melee.lua

- Massive options overhaul. The options screen makes more sense now and is less cluttered as I've merged the artificial division of melee/caster sections.
------------------------------------------------------------------------
r1219 | gagorian | 2010-01-23 05:25:57 +0000 (Sat, 23 Jan 2010) | 1 line
Changed paths:
   M /trunk/Caster.lua

- Adjusted tick period calculation
------------------------------------------------------------------------
r1218 | gagorian | 2010-01-23 05:07:20 +0000 (Sat, 23 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Paladin.lua
   M /trunk/Data/Warrior.lua

- Fixed error with Hammer of the Righteous and Cleave glyphs
------------------------------------------------------------------------
r1217 | gagorian | 2010-01-23 02:53:39 +0000 (Sat, 23 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Paladin.lua

- Added AB text for heal/mana proc for Seal of Wisdom/Seal of Light
------------------------------------------------------------------------
r1216 | gagorian | 2010-01-23 02:15:59 +0000 (Sat, 23 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/Mage.lua

- Improved Water Elemental calculation (now correctly double dips from raid buffs, uses the Water Elemental's 1.98% crit rate + possible buffs).
- Improved the tooltip of Water Elemental when glyphed with Glyph of Eternal Water (removed DPM, DPSC, DOOM and tick displays)
------------------------------------------------------------------------
r1215 | gagorian | 2010-01-23 01:32:38 +0000 (Sat, 23 Jan 2010) | 3 lines
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/DeathKnight.lua
   M /trunk/Data/Druid.lua
   M /trunk/Data/Hunter.lua
   M /trunk/Data/Mage.lua
   M /trunk/Data/Paladin.lua
   M /trunk/Data/Priest.lua
   M /trunk/Data/Rogue.lua
   M /trunk/Data/Shaman.lua
   M /trunk/Data/Warrior.lua
   M /trunk/DrDamage.lua
   M /trunk/Melee.lua

- Fixed Starfall and Death and Decay DPS calculation
- Removed erroneous Period displays from a few abilities
- Finished work on the AoE target amount calculation, all AoE spells should behave correctly now. I also added Blade Flurry calculation.
------------------------------------------------------------------------
r1214 | karzon13 | 2010-01-22 21:40:25 +0000 (Fri, 22 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Mage.lua

Mage coefficients updated.
------------------------------------------------------------------------
r1213 | karzon13 | 2010-01-22 21:17:44 +0000 (Fri, 22 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Shaman.lua

Shaman coefficients updated.
------------------------------------------------------------------------
r1212 | gagorian | 2010-01-22 20:40:16 +0000 (Fri, 22 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/DeathKnight.lua
   M /trunk/Data/Druid.lua
   M /trunk/Data/Hunter.lua
   M /trunk/Data/Mage.lua
   M /trunk/Data/Paladin.lua
   M /trunk/Data/Priest.lua
   M /trunk/Data/Rogue.lua
   M /trunk/Data/Shaman.lua
   M /trunk/Data/Warlock.lua
   M /trunk/Data/Warrior.lua
   M /trunk/Melee.lua

- Fixed incorrect period display on Starfall and Death and decay
- Added option to select the amount of targets to assume in AoE calculations. This is a work in progress and don't expect it to work on everything yet.
------------------------------------------------------------------------
r1211 | gagorian | 2010-01-22 13:25:06 +0000 (Fri, 22 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Druid.lua
   M /trunk/Data/Mage.lua
   M /trunk/Data/Paladin.lua
   M /trunk/Data/Priest.lua

- Added a no downranking tag for spells that probably don't downrank
------------------------------------------------------------------------
r1210 | gagorian | 2010-01-22 03:50:28 +0000 (Fri, 22 Jan 2010) | 1 line
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/Warlock.lua

- Modified base damage/heal increase formula to fit the new method (Something like this was actually in place earlier, then Blizzard changed it and now changed it back to what it was)
------------------------------------------------------------------------
r1209 | gagorian | 2010-01-22 01:55:39 +0000 (Fri, 22 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Data/Druid.lua
   M /trunk/Data/Mage.lua
   M /trunk/Data/Priest.lua
   M /trunk/Data/Shaman.lua
   M /trunk/Data/Warrior.lua

- 4p T10 Moonkin ticks 2 times
- 4p T9 Elemental ticks 3 times
------------------------------------------------------------------------
r1208 | gagorian | 2010-01-22 01:18:27 +0000 (Fri, 22 Jan 2010) | 1 line
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/Paladin.lua

- Added Flash of Light and Holy Light downrank modifiers
------------------------------------------------------------------------
r1207 | gagorian | 2010-01-22 00:38:28 +0000 (Fri, 22 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Data/Paladin.lua
   M /trunk/DrDamage.lua

- Updated base value retrieval script
- Fixed Paladin base healing/damage increase values
------------------------------------------------------------------------
r1206 | gagorian | 2010-01-21 23:48:29 +0000 (Thu, 21 Jan 2010) | 5 lines
Changed paths:
   M /trunk/Aura.lua
   M /trunk/Caster.lua
   M /trunk/Data/Druid.lua
   M /trunk/Data/Mage.lua
   M /trunk/Data/Warlock.lua
   M /trunk/DrDamage.lua
   M /trunk/Melee.lua

- Added back downranking effects estimates (inaccurate at the moment) and added a tooltip hint for spells that suffer from downranking effects
- Added Deep Freeze
- Corrected base damage/heal increases for druids and warlocks
- Added option to disable tooltip hints
- Added Hopelessness
------------------------------------------------------------------------
r1205 | gagorian | 2010-01-21 16:45:58 +0000 (Thu, 21 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Druid.lua

- 2p T10 resto multiplies Wild Growth total base heal by 79/70 ~= 12.85%
------------------------------------------------------------------------
r1203 | gagorian | 2010-01-18 21:16:05 +0000 (Mon, 18 Jan 2010) | 1 line
Changed paths:
   M /trunk/.pkgmeta
   M /trunk/Data/Druid.lua

- Reverted changes in last commit
------------------------------------------------------------------------
r1202 | zarquan | 2010-01-18 20:20:09 +0000 (Mon, 18 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Druid.lua

Fix Rejuvenation duration
------------------------------------------------------------------------
r1201 | gagorian | 2010-01-16 05:38:32 +0000 (Sat, 16 Jan 2010) | 1 line
Changed paths:
   M /trunk/DrDamage.toc

- Removed AceDBOptions-3.0 from .toc as well
------------------------------------------------------------------------
r1199 | gagorian | 2010-01-16 05:10:32 +0000 (Sat, 16 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Paladin.lua

- 4p T10 retri 10% bonus only applies to SoV/SoC's dd portion
------------------------------------------------------------------------
r1198 | gagorian | 2010-01-16 04:57:33 +0000 (Sat, 16 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Paladin.lua

- Apprently SoC can be parried and dodged
------------------------------------------------------------------------
r1197 | gagorian | 2010-01-16 04:44:03 +0000 (Sat, 16 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Data/Paladin.lua
   M /trunk/Melee.lua

- Paladin 2p T8 retri bonus is in fact additive
- The Judgement text in the tooltips is now properly localized
------------------------------------------------------------------------
r1196 | gagorian | 2010-01-16 04:14:11 +0000 (Sat, 16 Jan 2010) | 3 lines
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/Paladin.lua
   M /trunk/Melee.lua

- Glyph of Judgement is in fact additive. I'll assume that T10 4 part bonus is also additive.
- Fixed Paladin 2h weapon spec to now apply correctly to several abilities
- Apparently the Art of War is bugged and double stacks additively on Judgement of Light/Justice/Wisdom
------------------------------------------------------------------------
r1195 | gagorian | 2010-01-15 16:19:35 +0000 (Fri, 15 Jan 2010) | 3 lines
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/Druid.lua
   M /trunk/Data/Paladin.lua

- Added Thorns calculation
- Added flag to core to disable MPS display for Retribution Aura and Thorns

------------------------------------------------------------------------
r1194 | gagorian | 2010-01-15 15:20:12 +0000 (Fri, 15 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Paladin.lua

- Apparently 2h weapon spec doesn't increase Retribution Aura damage - talent effect removed
------------------------------------------------------------------------
r1193 | gagorian | 2010-01-15 13:47:38 +0000 (Fri, 15 Jan 2010) | 2 lines
Changed paths:
   M /trunk/.pkgmeta
   M /trunk/DrDamage.lua

- Added option to reset options to defaults
- Removed AceDBOptions-3.0 from .pkgmeta
------------------------------------------------------------------------
r1192 | gagorian | 2010-01-14 20:30:55 +0000 (Thu, 14 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Rogue.lua

- Fixed Turn the Tables proc
------------------------------------------------------------------------
r1191 | gagorian | 2010-01-14 15:48:43 +0000 (Thu, 14 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Paladin.lua

- Added 2h weapon spec bonus for Retribution Aura
------------------------------------------------------------------------
r1190 | gagorian | 2010-01-14 15:36:38 +0000 (Thu, 14 Jan 2010) | 1 line
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/Paladin.lua
   M /trunk/DrDamage.lua

- Added calculation for Retribution Aura
------------------------------------------------------------------------
r1189 | gagorian | 2010-01-13 21:52:05 +0000 (Wed, 13 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Shaman.lua

- Fixed Shaman error introduced in the last version
------------------------------------------------------------------------
r1188 | gagorian | 2010-01-13 21:08:08 +0000 (Wed, 13 Jan 2010) | 4 lines
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/DeathKnight.lua
   M /trunk/Data/Druid.lua
   M /trunk/Data/Mage.lua
   M /trunk/Data/Paladin.lua
   M /trunk/Data/Shaman.lua
   M /trunk/Data/Warlock.lua
   M /trunk/DrDamage.lua

- Added innervate actionbar text, only works for level 80 players though as I cba to figure out the base mana for other levels
- The pure actionbar text abilities (like mana spring totem, evocation, arcane torrent, melee class lifebloom/gift of the naaru etc.) now use the text colors set in the options screen
- Added option to modify mana text color

------------------------------------------------------------------------
r1187 | gagorian | 2010-01-13 14:41:34 +0000 (Wed, 13 Jan 2010) | 1 line
Changed paths:
   M /trunk/DrDamage.lua

- Forgot to add Cat form check for Nurturing Instincts Lifeblood bonus
------------------------------------------------------------------------
r1186 | gagorian | 2010-01-13 14:31:56 +0000 (Wed, 13 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Druid.lua
   M /trunk/Data/Paladin.lua
   M /trunk/DrDamage.lua

- Added Nurturing Instinct, Imp. Devotion Aura and Divinity bonuses to Lifeblood calculation
------------------------------------------------------------------------
r1185 | gagorian | 2010-01-13 14:17:51 +0000 (Wed, 13 Jan 2010) | 1 line
Changed paths:
   M /trunk/Aura.lua
   M /trunk/Caster.lua
   M /trunk/Data/DeathKnight.lua
   M /trunk/Data/Paladin.lua
   M /trunk/Data/Rogue.lua
   M /trunk/Data/Shaman.lua
   M /trunk/Data/Warlock.lua
   M /trunk/DrDamage.lua

- Lifeblood should now be boosted by most talents and buffs, what applies and doesn't apply is purely guesswork though
------------------------------------------------------------------------
r1184 | gagorian | 2010-01-13 13:27:43 +0000 (Wed, 13 Jan 2010) | 1 line
Changed paths:
   M /trunk/DrDamage.lua

- Added Lifeblood healing actionbar text. Currently no buffs or talents are taken into account.
------------------------------------------------------------------------
r1183 | gagorian | 2010-01-13 13:06:33 +0000 (Wed, 13 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Warlock.lua

- Curse of Doom now correctly receives bonus from school type talents like Shadow Mastery but not from Shadow Embrace, Haunt or Spellstones
------------------------------------------------------------------------
r1181 | gagorian | 2010-01-12 01:53:23 +0000 (Tue, 12 Jan 2010) | 1 line
Changed paths:
   M /trunk/Data/Rogue.lua

- Rogue poison AP coefficients updated to 3.3 hotfix values
------------------------------------------------------------------------
r1180 | gagorian | 2010-01-12 01:32:33 +0000 (Tue, 12 Jan 2010) | 1 line
Changed paths:
   M /trunk/DrDamage.lua

- Added remove all talents option to configuration screen
------------------------------------------------------------------------
r1179 | gagorian | 2010-01-12 01:05:37 +0000 (Tue, 12 Jan 2010) | 1 line
Changed paths:
   M /trunk/Aura.lua
   M /trunk/Data/Warlock.lua

- Capped Soul Siphon effects to 4 instead of 3. Thanks goes to SunTsu
------------------------------------------------------------------------
r1178 | gagorian | 2010-01-11 23:47:55 +0000 (Mon, 11 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Caster.lua
   M /trunk/Data/DeathKnight.lua
   M /trunk/Data/Mage.lua
   M /trunk/Data/Priest.lua
   M /trunk/Data/Warlock.lua

- Added Demonic Pact talent
- Altered haste calculation in core
------------------------------------------------------------------------
r1176 | gagorian | 2009-12-30 06:12:58 +0000 (Wed, 30 Dec 2009) | 1 line
Changed paths:
   M /trunk/Data/Hunter.lua

- Fixed Ranged Weapon Specialization applying incorrectly to a few abilities
------------------------------------------------------------------------
r1175 | gagorian | 2009-12-30 05:30:52 +0000 (Wed, 30 Dec 2009) | 1 line
Changed paths:
   M /trunk/Data/Paladin.lua
   M /trunk/Melee.lua

- Corrected an error with Death Knight and possibly warrior Two-Handed Weapon Specialization as they seem to behave different than the pally one on some abilities
------------------------------------------------------------------------
r1174 | gagorian | 2009-12-30 00:37:38 +0000 (Wed, 30 Dec 2009) | 1 line
Changed paths:
   M /trunk/Data/Druid.lua

- Rend and Tear now correctly applies crit chance instead of damage to Ferocious Bite
------------------------------------------------------------------------
r1173 | gagorian | 2009-12-26 19:15:29 +0000 (Sat, 26 Dec 2009) | 1 line
Changed paths:
   M /trunk/Data/DeathKnight.lua
   M /trunk/DrDamage.lua

- Bloody Strikes now correctly applies 15% per level to Heart Strike instead of 5%
------------------------------------------------------------------------