Commit Graph

7383 Commits

Author SHA1 Message Date
MitchesD 776103cfea Merge pull request #15995 from ShinDarth/mmr
Core/Arena: more arena configs
2015-12-19 11:46:32 +01:00
Francesco Borzì 850a4468b4 Merge pull request #15956 from ShinDarth/questdef
Core/Quest: code style
2015-12-16 18:58:33 +01:00
rockz1152 60311e0aae Core/Player: Fixed Weapon Skillup on low level mobs
Closes #15998

Removed block for skill up on grey level mobs.
2015-12-15 14:47:59 -05:00
jackpoz b96704774b Merge pull request #15919 from Treeston/3.3.5-razuvious 2015-12-14 20:34:12 +01:00
treeston 54d583b0fb Scripts/Naxxramas: Instructor Razuvious rework:
- Fix missing yells
- Rearrange existing yells to match live
- Sniffed positions for adds
- Improve add respawn handling
- Make adds not fight the player for control (don't use their spells on their own etc.)
- Update adds' hotbar keys to match live (this will affect other creatures with nonsequential possess keys as well)
- Fix adds' movement when mind controlled, they no longer move automatically when right-clicking (this affects all mind-controlled creatures)
- Blizzlike timers
2015-12-14 20:11:57 +01:00
ShinDarth 3d1614b622 Core/Arena: create more arena configs
- made rating modifiers configurable
- made arena points rate configurable
2015-12-14 20:09:07 +01:00
pete318 0ac442f19f Improved Auction house deposit handling.
Including the weird quirks.

Changes:
* Deposit caculated according to same rule as client. (detailed below). Should always match client deposit now
* Deposit for multiple auctions now only collected once. Deferred calculation of deposit until all auctions listed.

Deposit calculation is as follows:

Base deposit calculation = MSV x 15/75% (depending on AH). However this is not rounded. Case to int is used (so always round down)
The remainder is held in a float.
The base is then multiplied by number of items, and the time multiplier (x2 for 24 hour, x4 for 48 hour)
The nearest (no of items or lower) no of items when multiplied by the remainder that creates a whole number is then multiplied by the time multiplier (x1/x2/x4) and then added to deposit.

Example:

Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 1 = 36c. Remainder = 0.75 (n) Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 2 = 72c. Remainder = 1.50 (n)  Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 3 = 108c. Remainder = 2.25 (n) Min = 1s. Deposit 1s08c
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 4 = 144c. Remainder = 3.00 (n) Min = 1s. Deposit 1s50c (144c + (3c * 2))

Horrible kludge, to re-create a very weird deposit method.

Closes #15674 (PR)
Closes #15643 (Issue)
2015-12-14 19:54:58 +01:00
Shauren b3e718dcca Removed unneeded loop from previous commit, copypaste fail from 6.x 2015-12-12 00:06:59 +01:00
Shauren f72795240a Core/Creatures: Implemented automatic detection of trigger models, their order in creature_template no longer matters
(cherry picked from commit c488fb219a)
2015-12-11 23:51:04 +01:00
ShinDarth 4a532a71b6 Core/Quest: code style:
- Removed 11 useless for iterations (for each quest loaded)
2015-12-10 22:03:19 +01:00
jackpoz 80ed03a84d Merge pull request #15402 from chaodhib/taunt_player 2015-12-09 22:08:43 +01:00
Shauren cc685ac334 Core/Items: Fixed a possible crash with soulbound tradable items
Closes #15700

(cherry picked from commit 094f505e40)
2015-12-08 18:02:43 +01:00
jackpoz 2cb54d5606 Core/Player: Fix crash related to vehicles
Fix assertion triggered when entering a vehicle while channelling a shared vision spell.
Fix #15953
2015-12-07 23:34:00 +01:00
jackpoz 3267c90102 Core/Unit: Add Unit::KillSelf() overload
Add Unit::KillSelf() function as overload of Unit::Kill(this) . Use KillSelf() whenever the killer and the victim are the same to clearly state the Unit is going to kill itself.
2015-12-07 20:06:02 +01:00
jackpoz 1ddf44caf3 Core/Quest: Fix issues reported by static analysis 2015-12-07 18:31:53 +01:00
jackpoz bffaa92633 Core/Quest: Fix issues reported by static analysis 2015-12-06 22:43:15 +01:00
jackpoz f1f4005ad8 Core/Quest: Fix issues reported by static analysis 2015-12-06 21:37:58 +01:00
ShinDarth 03215a2eb7 Core/Spell: fixed possible exploit in Duel Reset script
- thanks @Runico for reporting it
2015-12-06 03:44:12 +01:00
MitchesD ab831507c6 Core/Conditions: extended CONDITION_NEAR_CREATURE, condition value 3 is now used to check for dead creature entries (0 - alive, 1 - dead)
* I used 0 for alive to avoid touching all conditions with this type

(cherry picked from commit cdb5bd3eb7)
2015-12-03 21:41:03 +01:00
Shauren 94e4bddb90 Scripts/Icecrown Citadel: Professor Putricide - fixed Expunged Gas damage formula
Closes #6396
2015-12-01 19:27:17 +01:00
jackpoz c703e01471 Merge pull request #15920 from Treeston/3.3.5-MCHotkeyPos
Unit/PossessBar: Fix spell ordering on possess bar
2015-11-30 20:24:15 +01:00
treeston 1be635a025 Unit/PossessBar: Fix spell ordering on possess bar to reflect spell position in DB. Fixes Razuvious adds et al. 2015-11-29 18:41:36 +01:00
Shauren 3ab108c8ea Core/Spells: Fixed passibe talent auras targeting pets instead of player
Closes #1543
Closes #15918
2015-11-29 14:13:30 +01:00
jackpoz f8a3fa28bb Merge pull request #15907 from ShinDarth/fix
Core/Spells: Fix Arcane Missiles
2015-11-28 21:55:45 +01:00
jackpoz a67f378f10 Merge pull request #15904 from 'ForesterDev/instance_login_cleanup' 2015-11-28 21:45:41 +01:00
ShinDarth 5fae63804c Core/Spells fix Arcane Missiles
- close #15902
2015-11-28 00:23:34 +01:00
Vincent-Michael e266278f7d Core/Players: Fixed warning 2015-11-27 22:10:21 +01:00
Shauren ba1e00399d Core/Players: Use constant gender from PLAYER_BYTES_3 where appropriate.
Closes #15895
2015-11-27 18:30:01 +01:00
ForesterDev 9573ec52f0 Core/Player: cleanup function CheckInstanceLoginValid 2015-11-27 12:53:48 +04:00
jackpoz 5f917e2286 Core/Player: Always allow accounts with RBAC_PERM_COMMAND_GM to enter instances on login
Always allow accounts with RBAC_PERM_COMMAND_GM to enter instances on login even if player had .gm off .
Send an ingame message to notify the user about the avoided kick.
2015-11-26 21:54:22 +01:00
MitchesD 3b90b0368a Core/Misc: fix warning and misc codestyle fixes 2015-11-26 19:28:53 +01:00
Shauren e9bd786351 Merge pull request #15763 from ShinDarth/channeled
[3.3.5] Fix conflicts between duration and cast time of channeled spells
2015-11-25 18:31:33 +01:00
ShinDarth 246e568bbd Core/Spells: fix conflicts between duration and cast time of channeled spells 2015-11-25 18:21:52 +01:00
sirikfoll 5d155895a7 Core/Creature: Flying vehicles able to fly again
by @sirikfoll, closes #15861

Flying vehicles could no longer leave the ground after commit 52692c3.
This is a modification of commit 52692c3 to make flying vehicles work again.
2015-11-22 17:14:58 +01:00
jackpoz 1511855fea Merge PR #14824 'tkrokli/spell_mod_stealth_stand_state' into 3.3.5 2015-11-22 15:37:32 +01:00
jackpoz 0e9f714a09 Core/Items: Fix crash
Fix crash happening if item_template.StatsCount field in the database was higher than 10.
Fixes #15868
2015-11-19 20:23:09 +01:00
Shauren f012800751 Core/Spells: Fixed typo in ecbbcc8972 2015-11-17 17:51:09 +01:00
Shauren 071ede8a93 Core/Misc: Fixed memory leak in trade handler
(cherry picked from commit fc852181c5)

CID 1339313
CID 1339312
2015-11-16 00:11:50 +01:00
jackpoz fbaed38b5e Core/Quest: Fix issues reported by static analysis
Coverity defect IDs: 1339309, 1339310
2015-11-15 16:17:12 +01:00
jackpoz 63f2675076 Core/Player: Fix issue reported by static analysis
Coverity defect IDs: 1010154
2015-11-15 16:01:14 +01:00
Shauren ecbbcc8972 Core/Spells: Fixed Raise Dead cooldown
Closes #15862
2015-11-15 00:31:17 +01:00
Vincent-Michael 145b0b27da Core/Battleground: Fix issue reported by static analysis
Coverity defect ID: 1339311
2015-11-14 18:26:20 +01:00
Carbenium b292321798 Core/Player: Move KillRewarder to its own file
(cherry picked from commit 4e76974ce5)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
2015-11-14 15:06:47 +01:00
Carbenium 1438c841ed Core/Player: Move TradeData to its own file
(cherry picked from commit 2d7d6f505c)

Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Spells/Spell.cpp
2015-11-14 13:40:32 +01:00
Vincent-Michael d0c28c66eb Core: Fix warning 2015-11-14 01:23:28 +01:00
Vincent-Michael d188960216 Core/Condition: Fix issue reported by static analysis
Coverity defect ID: 1339314
2015-11-14 00:56:44 +01:00
MitchesD a1150ce20f Merge pull request #15732 from ShinDarth/reset-health-mana
Scripts/Duel: implement duel reset of health and mana and improve duel reset
2015-11-12 19:40:26 +01:00
Carbenium c5f635b689 Core/Creature: Remove duplicate call to LoadCreatureAddons in Creature::Create
* Add error log for duplicated aura entries in creature_(template_)addon
2015-11-11 00:13:43 +01:00
jackpoz abd4e2e0f1 Core/Commands: Fix NULL dereference crash
Closes #15833
2015-11-10 21:14:18 +01:00
robinsch 5f24fd6c51 [3.3.5] Core/Spells: break Stealth and modify Stand State
by @robinsch; closes #14819

Currently (562da2e), only harmful CC spells will break stealth and modify the unit stand state.
This behaviour is wrong. Any harmful spell hit should break stealth and modify the stand state.

There are a few exceptions for this mechanic, such as:
- Mass Dispel (priest spell ID 32375, 32592, 39897)
- Earthbind Totem (Pulse) (spell ID 3600)
- Distract (rogue spell ID 1725)
2015-11-10 05:33:53 +01:00