Commit Graph

2447 Commits

Author SHA1 Message Date
Akkadius 08e787da59 Replaced atoll with more appropriate macro atoul 2014-11-26 00:24:31 -06:00
Akkadius b43cfa126f Renamed SetPKItem to SetPlayerKillItemID
Renamed AllowMobLoot to AllowPlayerLoot
Renamed DepopCorpse (PC) to DepopPlayerCorpse
Renamed GetPKItem to GetPlayerKillItem
Renamed Corpse class variable 'orgname' to 'corpse_name'
Renamed CompleteRezz to CompleteResurrection
Renamed GetDBID to GetCorpseDBID

Removed CorpseToServerSlot as it is unnecessary
Removed ServerToCorpseSlot as it is unnecessary

Reogrganized corpse.h header
2014-11-25 23:54:59 -06:00
Akkadius fbaae2b1e4 Renamed Corpse::LoadFromDBData to Corpse* Corpse::LoadCharacterCorpseEntity
Corpse Private class descriptors added
General cleanup
2014-11-25 23:17:08 -06:00
Akkadius 0598f7e87c Fixed an issue that has surfaced with new code behaving how it should, breaking old code. Naked corpses were not despawning on their decay timers because of incorrect return logic on a database function
Removed ClearCorpseItems as it is no longer necessary as corpses deleted items appropriately when they are removed from the corpse
General cleanup of functions and variables in corpse code
2014-11-25 22:47:50 -06:00
Trevius b4862dea45 Compile Fix and fix to prevent Mercenaries from being set as Group Leader. 2014-11-25 02:54:02 -06:00
Trevius 09e13d0034 Spells that modify model size are now limited to 2 size adjustments from the base size. 2014-11-25 02:22:58 -06:00
Trevius bee04c1b53 Merge branch 'master' of https://github.com/EQEmu/Server 2014-11-24 02:36:13 -06:00
Trevius 2fbe6b304c Added Rule NPC:EnableMeritBasedFaction (disabled by default) - Allows faction gain to work similar to experience. 2014-11-24 02:32:33 -06:00
Akkadius 02e82f1cfc Fix for bot build 2014-11-24 02:06:51 -06:00
Akkadius a2bef4d999 Merge branch 'master' of https://github.com/EQEmu/Server 2014-11-24 02:02:31 -06:00
Akkadius 50a69a8e20 Finish of automatic corpse convert routine 2014-11-24 01:53:21 -06:00
Akkadius a5207b58e1 Added namespace Convert:: to contain all of the player profile and corpse related structs so that when any of the structs change else where in the code, it does not break the conversion scripts. These are self contained structs just for the conversion scripts. 2014-11-24 01:12:12 -06:00
Akkadius 3c2b8d13b9 Restructure and refactoring of database convert/upgrade check routine, breaking out to individual functions 2014-11-23 23:46:06 -06:00
Trevius 2f1191b263 Fixing my Swarm Pet "fix". 2014-11-23 23:17:57 -06:00
Akkadius e4f45d7b35 Removed DBCore::RunQuery
Converted last corpse.cpp function that mixed database code with corpse code
2014-11-23 22:57:46 -06:00
Akkadius c30850f00a Rest of ZoneDB Corpse functions converted to new API 2014-11-23 22:33:57 -06:00
Akkadius ce248d83d6 Corpse Class Private scope variables renamed for understandability across the source
Removed ThrowDBError from the source
Implemented MySQL query error log at the root of the MySQL API
Readability changes
2014-11-23 21:37:42 -06:00
Akkadius 6b67c3736b Increased Max charge or stack count on corpses to uint16 (Beyond 1k)
Fixed the deletion of items so that they occur immediately when removed from corpse instead of clicking 'Done'
Fixed loading of item tints and other fields since atoi caps at 2147483647
2014-11-23 19:51:01 -06:00
Akkadius 3b51aebb51 More load and delete changes for corpses 2014-11-23 17:49:56 -06:00
Akkadius 12ceac4c02 Corpses properly loading now 2014-11-23 15:55:38 -06:00
Akkadius 7fa1256c5d ... 2014-11-23 01:04:50 -06:00
Akkadius f328853251 More restructures, non-working state 2014-11-22 23:28:20 -06:00
Akkadius d1b0564698 Changing corpse loading structure 2014-11-22 18:43:23 -06:00
Akkadius 111fb84041 Moved zonedatabase functions out of corpse.cpp
Conversion portion mostly complete
Some header readability cleanup
Some function renaming
Struct renaming
Many variable renaming
MySQL error log for all of QueryDatabase
Corpse table renaming
Corpse table field renaming
Most corpse database functions redone
2014-11-22 17:55:48 -06:00
Trevius 79a70271d5 Crash fix for Swarm Pets. 2014-11-22 12:53:49 -06:00
KimLS 1ca397f426 Lua parser: script_init.lua for zones will now follow script_init_v[0-9]+\.lua similar to player quests. 2014-11-22 03:20:39 -08:00
Trevius d49426f763 Merge branch 'master' of https://github.com/EQEmu/Server 2014-11-22 00:27:40 -06:00
Trevius c5a90adb39 Grouping with Mercenaries is considerably less buggy. 2014-11-22 00:22:12 -06:00
Michael Cook (mackal) 3573686976 Fix issue with PendingTranslocateData 2014-11-21 22:50:08 -05:00
Michael Cook (mackal) cab071b544 Merge pull request #299 from KayenEQ/Development
Fix to remove double CastSpell call from use disc function.
2014-11-21 16:51:14 -05:00
KayenEQ f1701aae9f Fix to remove double CastSpell calls from use disc function. 2014-11-20 05:53:59 -05:00
KayenEQ 96a0cc37e0 Merge git://github.com/EQEmu/Server into Development 2014-11-20 05:05:29 -05:00
KayenEQ 2330285b04 revert 2014-11-20 05:05:15 -05:00
Michael Cook (mackal) ac463fe9aa Fix RoF Raid opcodes 2014-11-20 01:10:24 -05:00
Trevius b5c6b47639 Minor Merc Correction. 2014-11-19 22:52:49 -06:00
Trevius 62e22d1aea Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly. 2014-11-19 22:46:15 -06:00
Trevius 1973a065c5 Merge branch 'master' of https://github.com/EQEmu/Server 2014-11-19 22:43:55 -06:00
Trevius 6c5248b9a9 Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly. 2014-11-19 22:43:19 -06:00
Michael Cook (mackal) 1ed9c3082c Add see invis check to tracking packet 2014-11-19 15:00:09 -05:00
Michael Cook (mackal) 37936b63c4 Merge pull request #295 from Leere/getrecipefix
Fix for GetTradeRecipe results variable overload instead of reuse
2014-11-19 14:26:04 -05:00
Akkadius 4a83b4acb9 PEQ AA Download option 4 implemented - http://i.imgur.com/OBrIOCM.png 2014-11-19 02:40:33 -06:00
Leere e7681f1b49 Fix for GetTradeRecipe results variable overload instead of reuse 2014-11-19 09:40:08 +01:00
Akkadius 4f38dba334 Upload of peq_aa_tables.sql for db management interface 2014-11-19 02:30:59 -06:00
Akkadius 67a9779d5b Slight fixes to upgrade logic - If you ran updates manually yourself, and you don't have a local version that matches the binary version yet. It will go through and get you up to date.
Manifest changes - Removed AA 'Required' updates. We will soon have an option to pull them down from PEQ in the prompt menu
2014-11-19 02:16:48 -06:00
KayenEQ 5b85aa6550 Fix to allow discipline reuse timers to be set on client correclty
and therefore have the client return the time remaining instead
of the server.

Hopefully may resolve some bugs reselated to discipline use.
2014-11-19 00:39:42 -05:00
KayenEQ 6a5b3ef4fe Merge git://github.com/EQEmu/Server into Development 2014-11-19 00:19:57 -05:00
KimLS 9570412991 Added special ability functions to perl, removed some of the less used commands (and a few duplicates) 2014-11-18 21:17:03 -08:00
KimLS c506e33018 Fixed merge 2014-11-18 21:12:48 -08:00
Trevius 8f32a9949b Fixed bad formatting of client.h and merc.h caused by my last commit. 2014-11-18 17:32:59 -06:00
Michael Cook (mackal) d7e05de556 Merge pull request #292 from KayenEQ/Development
Updated swarm pet AI to be consistent with live.
2014-11-18 15:04:08 -05:00