KimLS
ff3cb9fc54
Merge branch 'master' into inv2
2015-04-07 16:29:07 -07:00
Natedog2012
7662eaf983
All animation structs were backwards and poorly named.. RoF+ animations work properly
2015-04-06 03:11:04 -07:00
Alex
a569e20110
Merge pull request #388 from iequalshane/master
...
Enable multiple NPC equipment materials
2015-03-28 23:34:43 -07:00
KimLS
279ed8d86c
Merge branch 'master' into inv2
2015-03-25 15:55:16 -07:00
KayenEQ
202c59eb48
More sympathetic proc fixes
2015-03-24 07:13:22 -04:00
Shane Lynch
13743caf19
Enable multiple NPC equipment materials
...
This change allows #npcedit
armtexture/bracertexture/handtexture/legtexture/feettexture to work
properly and sets individual armor slot materials for NPCs.
2015-03-10 21:33:44 -07:00
KimLS
14b5a8d817
Merge from master
2015-02-28 17:59:32 -08:00
KimLS
20cbe4af44
More work on swapping, almost there just need to write code for stack split/move/combining
2015-02-28 17:56:01 -08:00
KimLS
7870bf103a
Working on can equip, putting it in the general inventory class.
2015-02-27 02:40:44 -08:00
KayenEQ
7851f272e5
Fix for ModSkillDmgTaken to once again work with (-1 = ALL skills)
...
Fix for perl GetModSkillDmgTaken
2015-02-27 03:11:04 -05:00
Uleat
1f0b86a0d5
Changes to how valid light sources are critiqued
2015-02-26 18:46:12 -05:00
KimLS
a90e9cf4c6
Refactoring
2015-02-20 20:15:58 -08:00
KimLS
fc2492a859
Merge from master, fixed conflicts
2015-02-18 13:18:21 -08:00
KimLS
701e194ece
Renamed Item_Struct to ItemData
2015-02-17 18:06:22 -08:00
KimLS
b75e6308dd
Renamed Inventory to InventoryOld
2015-02-17 13:42:21 -08:00
Uleat
e4be4d6895
Pre-purposed clean-up
2015-02-17 13:58:26 -05:00
KayenEQ
0521cae8d0
Implemented npc specialability (44) COUNTER_AVOID_DAMAGE which when applied to the ATTACKING NPC will make their attacks more difficult to be avoided by riposte/dodge/parry/block.
...
Parama0: Negative modifer value that affects ALL avoid damage types dodge/parry/riposte/block) chance on defender. Ie (44,50 = 50 pct reduction to ALL)
Parama1: Negative modifer value that affects RIPOSTE chance on defender. Ie (44,1,0,50 = 50 pct reduction to riposte chance)
Parama2: Negative modifer value that affects PARRY chance on defender. Ie (44,1,0,0,50 = 50 pct reduction to parry chance)
Parama3: Negative modifer value that affects BLOCK chance on defender. Ie (44,1,0,0,0,50 = 50 pct reduction to block chance)
Parama4: Negative modifer value that affects DODGE chance on defender. e (44,1,0,0,0,0,50 = 50 pct reduction to dodge chance)
Example of usage: Player has Improved Dodge V (+50 pct dodge chance), you want to negate this bonus you would set 44,1,0,0,0,0,50 on your NPC.
Clean up and minor fixes to AvoidDamage function.
Added support to a few AA bonuses there.
2015-02-08 20:17:51 -05:00
KayenEQ
4bd2e04482
Merge pull request #363 from KayenEQ/Development
...
Added perl function function: CanClassEquipItem(item_id)
2015-02-04 22:46:47 -05:00
KayenEQ
cafd0eaba1
Added perl function function: CanClassEquipItem(item_id)
...
Returns a bool if can equip or not.
2015-02-04 22:46:02 -05:00
Trevius
8bc5e5eee1
Crashfix for TempName() when numbers are passed at the end of the name.
2015-02-03 17:23:29 -06:00
KayenEQ
33767aeb91
Improvements to the pet type (5) code.
2015-02-03 07:59:29 -05:00
JJ
96925f0dde
Some minor cleanup. [skip ci]
2015-01-31 17:03:44 -05:00
Trevius
fe6fa75385
Fixed FindGroundZ() and GetGroundZ() to once again utilize the X and Y arguments that are passed to them.
2015-01-31 11:44:25 -06:00
Uleat
cc1d7d54c2
Implemented mob equipment light sources
2015-01-24 22:00:06 -05:00
KimLS
669bca8da8
Fix for bots compile
2015-01-23 18:24:53 -08:00
KimLS
17af9e3808
Merge fixes, hopefully didn't break anything.
2015-01-23 13:36:27 -08:00
KimLS
269d56e1d0
Switched out our kinda juryrigged vector types for glm::vec types since we use that as a 3d math library already but never switched out the types
2015-01-23 00:01:10 -08:00
Michael Cook (mackal)
f702e953e7
Some std::abs usage and a bit of clang-formatting
2015-01-22 22:59:52 -05:00
Akkadius
c5447778a6
Merge remote-tracking branch 'remotes/origin/master' into logging_changes
...
Conflicts:
world/client.cpp
world/worlddb.cpp
zone/aggro.cpp
zone/bot.cpp
zone/client.cpp
zone/client_packet.cpp
zone/client_process.cpp
zone/doors.cpp
zone/entity.cpp
zone/inventory.cpp
zone/mob_ai.cpp
zone/perl_client.cpp
zone/spells.cpp
zone/waypoints.cpp
zone/zone.cpp
zone/zonedb.cpp
zone/zoning.cpp
2015-01-21 17:29:30 -06:00
Akkadius
fb5e988ed8
Remove commented std::cout : Tlevel:
2015-01-20 01:30:56 -06:00
Akkadius
47b0f6ca9e
Remove commented std::cout : Gender in:
2015-01-20 01:30:53 -06:00
JJ
8cde35ca88
Merge pull request #342 from addtheice/data_bundling2
...
Looks fine on initial review.
2015-01-18 18:04:33 -05:00
Arthur Ice
53862713f9
Switched to position based GetReciprocalHeading instead of Mob::GetReciprocalHeading
2015-01-18 12:38:27 -08:00
Arthur Ice
0aefc0453d
Removed Mob::DistNoRootNoZ
2015-01-18 03:54:49 -08:00
Arthur Ice
4431aa0197
Removed Mob::DistNoRootNoZ
2015-01-18 01:39:17 -08:00
Arthur Ice
3ed365cd43
Removed mob:DistNoRoot
2015-01-18 01:22:59 -08:00
Akkadius
467b359d0c
Moved all EQEmuLogSys:: enum references used in Log.Out to a namespace 'Logs' for shortening of syntax
2015-01-18 02:20:16 -06:00
Akkadius
c025765283
Renamed DoLog to Out as the aggregate logging function for simplicity of use and shortened syntax of Log.Out
2015-01-18 02:00:15 -06:00
Akkadius
1c048cb1d1
Renamed DebugCategory to DoLog as the aggregate logging function for simplicity of use and shortened syntax of Log.DoLog
2015-01-18 01:54:09 -06:00
Akkadius
7dbde36b03
Rename reference logger to Log
2015-01-18 00:41:18 -06:00
Arthur Ice
1e2198f5f4
Removed Mob::DistNoZ
2015-01-17 17:53:41 -08:00
Arthur Ice
ee0b9edc21
Removed Mob::Dist
2015-01-17 17:49:16 -08:00
Michael Cook (mackal)
6e06110b75
Remove more extra and incorrect memsets
2015-01-17 19:03:13 -05:00
Arthur Ice
f1759421d1
Removed Mob::DistNoRoot(x,y,z)
2015-01-17 15:51:26 -08:00
Michael Cook (mackal)
fd77fbf163
Merge pull request #313 from addtheice/data_bundling
...
Data bundling
2015-01-17 17:30:14 -05:00
Michael Cook (mackal)
f9a7da61b8
Switch NUMHIT_ enum to a strongly typed enum
2015-01-17 16:18:09 -05:00
Akkadius
1405d9e114
port mlog 'CLIENT__SPELLS' category to new log system
2015-01-17 02:28:25 -06:00
Akkadius
6a567288ae
port mlog 'Combat' category to new log system
2015-01-17 02:22:53 -06:00
Arthur Ice
cd9ca65587
merge upstream
2015-01-08 19:40:00 -08:00
JJ
cde406a496
Add PhR to #showstats and a few places that can/should be implemented in the future.
2015-01-06 13:51:36 -05:00
