KimLS
7fd3cc3483
Merge from master
2015-02-05 23:24:51 -08:00
Trevius
f26d303ee1
Fixed Environmental Damage for RoF2.
2015-02-05 22:34:55 -06:00
JJ
b96e5a7f4d
Group leader is not always member 0.
2015-02-05 19:18:51 -05:00
Akkadius
dce6ccf4de
GetTaskActivityDoneCountFromTaskID crash fix
2015-02-05 05:43:36 -06:00
KayenEQ
b169544711
Merge pull request #365 from KayenEQ/Development
...
Calc focus effects from worn slots, for an additive foci bonus [NOT LIVE LIKE]
2015-02-05 06:24:43 -05:00
KayenEQ
dd17597c92
Implemented non-live like feature to allow focus effects to be placed in worn slot
...
to provide an additive focus bonus that stacks with regular focus effects.
This is opposed to how regular focus effects work in which the highest
value is always taken. Please note, focus calculated from worn slot
will only use only the focuses base value (ie ignores all limit checks).
Example (Hypothetical).
Improved Heal I (10 pct focus) in Helm Worn Slot
Improved Heal I (10 pct focus) in Glove Worn Slot
Improved Heal V (50 pct focus) in Glove Focus Slot
Total Heal Focus would be 50 + 10 + 10
Added optional rule which is OFF by default.
UseAdditiveFocusFromWornSlot
2015-02-05 04:27:33 -05:00
KimLS
ecd05d821e
Merge and fix the loot update branch, ready for merge I think
2015-02-04 23:13:02 -08: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
bfa6bd3458
Merge pull request #362 from KayenEQ/Development
...
Improvements to the pet type (5) code.
2015-02-03 08:01:15 -05:00
KayenEQ
33767aeb91
Improvements to the pet type (5) code.
2015-02-03 07:59:29 -05:00
KayenEQ
ff8a19b1cb
Merge pull request #361 from KayenEQ/Development
...
Implemented pet type 5 (petTargetLock)
2015-02-03 07:10:41 -05:00
KayenEQ
379219aff1
Implemented new pet type (5) which summons a regular pet that locks onto
...
the casters target exclusively until the target dies, when target dies
the pet is killed. (Pets don't respond to commands except get lost).
This does not stack with regular pets.
Note: On live these pets cast an actual spell (Unsummon) that kills them for 20k damage,
due to how limiting that is to be hard coded, the pets will simply just
kill themselves instead.
Pending, will needd to add an optional SQL to update pet tables to convert
known live spells that use this.
2015-02-03 06:40:51 -05:00
KayenEQ
a677d40f6d
Merge pull request #360 from KayenEQ/Development
...
Fix to allow for PBAE/Targeted AE spells to check the 'npc_no_los' field...
2015-02-02 03:02:14 -05:00
KayenEQ
aed3d9ef85
Fix to allow for PBAE/Targeted AE spells to check the 'npc_no_los' field in spell file
...
to disable LOS checks.
2015-02-02 03:01:37 -05:00
Akkadius
f2667cee23
Implement Packet logs with dumps
...
- Category: 41: Packet: Server -> Client With Dump
- Category: 42: Packet: Server -> Client With Dump
See: http://wiki.eqemulator.org/p?Logging_System_Overhaul#packet-logging-levels
2015-02-02 00:10:22 -06:00
Michael Cook (mackal)
e1c49f93e2
Out of bounds bandoleer fix
2015-02-02 00:18:29 -05:00
Akkadius
5daa29aa3f
Merge branch 'master' of https://github.com/EQEmu/Server
2015-02-01 21:42:53 -06:00
JJ
6c982179bc
Merge pull request #358 from noudess/master
...
Repair min/max faction issues.
2015-02-01 20:59:23 -05:00
Akkadius
02e56331ec
Have is_category_enabled update appropriately when settings are set via #logs
2015-02-01 19:57:02 -06:00
Akkadius
774e429d87
Get Logs::Client_Server_Packet_Unhandled to show raw opcodes
2015-02-01 19:56:32 -06:00
Kinglykrab
180612bb21
Added new rule to make the UnmemSpellAll on death optional.
...
- New Rule: Character:UnmemSpellsOnDeath (default true)
2015-02-01 18:57:26 -05:00
Michael Cook (mackal)
8649ed1dcb
Add quest debugging to lua
2015-02-01 17:25:16 -05:00
Akkadius
f9ba99e99f
Merge branch 'master' of https://github.com/EQEmu/Server
...
Conflicts:
common/eqemu_logsys.h
2015-02-01 15:56:05 -06:00
Paul Coene
1d40f20da0
Remove incorrect use of before_hit
2015-02-01 16:14:05 -05:00
Michael Cook (mackal)
cced57f56a
Fix lua events
2015-02-01 15:11:27 -05:00
Paul Coene
614014a238
Faction update
2015-02-01 15:02:14 -05:00
Paul Coene
1ff2a043f4
Merge branch 'master' of https://github.com/EQEmu/Server
2015-02-01 09:34:04 -05:00
Paul Coene
115d0d14ac
Fix issues with faction where chars were not allowed to earn faction to
...
offset starting faction values.
2015-02-01 09:31:07 -05:00
KayenEQ
73ac566c17
remove debug...
2015-02-01 06:32:56 -05:00
KayenEQ
cc4c6b6339
Fix/Implemented - Pets who cast group spells (Target Type 43) will now have the spell
...
affect entire group instead of just the pet.
This used to work at some point, no clue when it broke...
2015-02-01 06:31:53 -05:00
Akkadius
b3ea1a9da7
Some changes
2015-02-01 04:05:32 -06:00
Akkadius
d75c632d73
Chnage netcode logging check to use is_category_enabled instead of just checking for console
2015-02-01 02:10:18 -06:00
Akkadius
d9c47fcd41
Add a category check pre Logs::Client_Server_Packet trigger
2015-02-01 02:09:24 -06:00
Akkadius
5c729e65c9
Add sanity checks to GMSayHookCallBackProcess
2015-02-01 01:05:39 -06:00
KimLS
444b652c4f
Working working working on adding profiling, also switched to multi-threaded profiler (slower but need it).
2015-01-31 19:06:14 -08:00
Michael Cook (mackal)
b590eb2dc4
Send item recast timestamps picking up ground spawns
2015-01-31 20:54:56 -05:00
KimLS
2acf84ce4a
Merge branch 'master' into profiler
2015-01-31 14:54:10 -08:00
Michael Cook (mackal)
5be1bd2ffb
Make items with long reuse timers show the timer after zone
...
This adds a new table to store the timers in. This may seem
odd but the timers are associated with the player, not the
item, they're just included in the item header in the packet
Currently trading still needs to be handled
2015-01-31 17:53:50 -05:00
KimLS
e135f46711
Added profiler to loginserver as initial work cause it's the smallest service or one of the smallest
2015-01-31 14:52:27 -08:00
Michael Cook (mackal)
b5d45effec
Fix some zone/npc.cpp functions
2015-01-31 17:33:41 -05:00
JJ
96925f0dde
Some minor cleanup. [skip ci]
2015-01-31 17:03:44 -05:00
Russell Kinasz
2763fe36a3
RoF+ can send 200 items in merchantlist
2015-01-31 11:17:28 -08:00
Russell Kinasz
1e8916ee98
RoF+ can send 200 items in merchantlist
2015-01-31 11:11:06 -08: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
Akkadius
a6b95aeceb
At point in which Client -> Server packet logging is working, will do more prechecking to declare that anything actually is subscribed to this category before outputting
2015-01-31 02:23:58 -06:00
Akkadius
7a3399e510
WOOPS! (That's what he said)
2015-01-30 23:17:11 -06:00
Akkadius
39a47ceb93
Implemented LUA counterpart of EVENT_ENVIRONMENTAL_DAMAGE
2015-01-30 23:15:48 -06:00
Akkadius
8229a578ee
Implemented event type "EVENT_ENVIRONMENTAL_DAMAGE"
...
- This event triggers when taking any sort of environmental damage. Example use:
sub EVENT_ENVIRONMENTAL_DAMAGE{
quest::debug("EVENT_ENVIRONMENTAL_DAMAGE");
quest::debug("env_damage is " . $env_damage);
quest::debug("env_damage_type is " . $env_damage_type);
quest::debug("env_final_damage is " . $env_final_damage);
}
Result: (Test falling in Velks): http://i.imgur.com/tPRL7yL.png
2015-01-30 23:01:31 -06:00