Michael Cook (mackal)
cdc82f0ba7
Merge pull request #968 from EQEmu/feature/aa_timer_reset_on_death
...
Implement AA timers reset on death
2020-02-06 16:30:10 -05:00
Uleat
78756f27b6
Merge branch 'master' of https://github.com/EQEmu/Server into eqemu_server_db_updates
2020-02-06 16:23:25 -05:00
Michael Cook (mackal)
2f5909d4cb
Implement AA timers reset on death
...
This is a field in the packet, live only uses this for Lay on Hands
Currently I didn't add this to the packet since it has 0 effect on the
client.
We could move this field to aa_ranks which would give more flexibility
for custom servers, but no one said they wanted it there.
2020-02-06 14:20:18 -05:00
Michael Cook (mackal)
13c2df7eb1
Merge pull request #967 from EQEmu/feature/global_loot_hot_zone
...
Add hot_zone filtering for global loot
2020-02-06 12:56:20 -05:00
Michael Cook (mackal)
16ac6f624b
Remove extra whitespace
2020-02-06 01:59:18 -05:00
Michael Cook (mackal)
501204a4d2
Add hot_zone filtering for global loot
...
We do this in GlobalLootEntry::PassesRules since we want to check if the
hot zone status changes during run time
Value can be null, if null it's not checked. If the value is 0 the zone
must not be a hot zone (I guess one might want that) and if it's not 0,
the zone must be a hot zone
2020-02-06 01:52:35 -05:00
Michael Cook (mackal)
8bcef6c2e7
Fix BodyType bug in GlobalLoot
2020-02-06 01:08:53 -05:00
Michael Cook (mackal)
2db47adf7b
Merge pull request #966 from noudess/master
...
Idle NPC mana regen
2020-02-05 21:17:23 -05:00
Uleat
916c88939c
Added missing 'return'
2020-02-05 21:05:51 -05:00
Paul Coene
1528e7cb09
Update npc.cpp
2020-02-05 16:28:07 -05:00
Paul Coene
8dacadb4f9
Update ruletypes.h
2020-02-05 16:26:46 -05:00
Paul Coene
e19db3b7f4
Update npc.cpp
2020-02-05 16:25:24 -05:00
Paul Coene
e1adffc4be
Update npc.cpp
2020-02-05 15:32:07 -05:00
Chris Miles
7eb71c5902
Merge pull request #953 from noudess/patch-5
...
_GetRunSpeed did not correctly report aa mods for Clients.
2020-02-05 14:10:47 -06:00
Chris Miles
da397606b6
Merge pull request #965 from noudess/master
...
Added RuleI(Combat, LevelToStopACTwinkControl)
2020-02-05 14:10:25 -06:00
Paul Coene
6b27e88315
Update attack.cpp
2020-02-05 14:42:37 -05:00
Paul Coene
4accb4ea2a
Update ruletypes.h
2020-02-05 14:41:36 -05:00
Paul Coene
c419df52ff
Merge pull request #2 from EQEmu/master
...
Get up to date
2020-02-05 14:40:12 -05:00
Alex
46ff09f438
Merge pull request #962 from noudess/patch-8
...
Implement DefaultGuild Rule
2020-02-05 13:05:07 -05:00
Paul Coene
b4f42c150f
Update database.cpp
...
Change variable_name and use LastInsertedID() to remove unneeded call.
2020-02-05 12:31:29 -05:00
Akkadius
49134644bc
Update dbcore logging to use aliases
2020-02-05 01:56:39 -06:00
Akkadius
861b879a94
Add GetCharacterTables() with table - key pair. Use in character hard deletes https://gist.github.com/Akkadius/f10e3757a0b52b971076643eccf9c5d0
2020-02-05 01:34:29 -06:00
Akkadius
929e4c1317
Adjust verbiage [skip ci]
2020-02-04 23:52:18 -06:00
Chris Miles
138cb80b19
Merge pull request #958 from hgtw/feat/autoconsent
...
Implement consent for group/raid/guild and add Auto Consent support
2020-02-04 18:22:05 -06:00
Uleat
86b6f543b9
Reworked the update cycle of eqemu_server.pl to process each update cumulatively [skip ci]
2020-02-04 19:07:55 -05:00
hg
d7138e84c0
Make consent variable names more descriptive and replace char pointer parameters with std::string
...
Use fmt::format for SQL statement when updating corpse guild id
2020-02-04 18:54:43 -05:00
Michael Cook (mackal)
2d24cdf5e4
Merge pull request #963 from noudess/patch-10
...
Update command.cpp
2020-02-04 13:24:49 -05:00
Akkadius
4416e774c2
Merge branch 'master' of https://github.com/EQEmu/Server into feature/hot-reload
2020-02-04 00:25:23 -06:00
Akkadius
342012c4f4
Fix compile issue
2020-02-04 00:24:43 -06:00
Akkadius
34005cd2ed
Merge branch 'master' of https://github.com/EQEmu/Server into feature/hot-reload
2020-02-04 00:12:51 -06:00
KimLS
6bc6b659d5
Merge branch 'master' of github.com:EQEmu/Server
2020-02-03 17:17:26 -08:00
Paul Coene
ad1f18306b
Update command.cpp
...
Fix #size command to be useful for anyone using the model field in npc_types.
All will remain the same for everyone else.
2020-02-03 13:47:16 -05:00
Paul Coene
6a984a53b5
Merge pull request #1 from noudess/patch-9
...
Implement DefaultGuild rule
2020-02-03 13:02:55 -05:00
Paul Coene
f9b3b7aecf
Implement DefaultGuild rule
2020-02-03 12:54:26 -05:00
Paul Coene
5fefdfcc17
Added new DefaultGuild rule to Character
2020-02-03 12:50:05 -05:00
Uleat
00f118cfb4
Removed bot rule and command update code from setup because of auto-injection/removal feature added to server code [skip ci]
2020-02-03 08:36:14 -05:00
Uleat
a7633f4ddf
Massaged database update code [skip ci]
2020-02-03 08:18:55 -05:00
regneq
f742d6427b
Merge pull request #3 from EQEmu/master
...
Update
2020-02-02 20:48:05 -08:00
KimLS
d65a97e556
Rule for setting max navmesh nodes, default set higher than current to improve accuracy
2020-02-02 20:19:37 -08:00
hg
b8229c8459
Update CURRENT_BINARY_DATABASE_VERSION for consent sql update
2020-02-02 22:57:59 -05:00
Michael Cook (mackal)
424b669cbb
Target not required for newer clients in QuestReward
2020-02-02 16:39:46 -05:00
hg
e09b0ae1e9
Let client handle consent confirmation messages to corpse owner
2020-02-02 14:37:12 -05:00
KimLS
c2300d514c
Packet warnings
2020-02-01 20:49:04 -08:00
Michael Cook (mackal)
f195820854
Merge pull request #959 from hgtw/fix/raid-invite-crash
...
Fix zone crash when a group member raid invites own group leader
2020-02-01 22:59:33 -05:00
Michael Cook (mackal)
59903313e4
Expand Lua's Client QuestReward function
...
You can now use it to summon up to 8 items ex:
`e.other:QuestReward(e.self, {items = {28745, 28092}, exp = 250})`
This expands the version that takes a table. The new item is a table (in
the main table) called items, which needs to be auto keyed like the
example above. If you also provide the old itemid key, it will be
ignored if the items is there.
2020-02-01 22:48:39 -05:00
Michael Cook (mackal)
b351d3718a
Merge pull request #961 from noudess/patch-7
...
Fix FixZ regarding the use of model in npc_types
2020-02-01 21:55:53 -05:00
Paul Coene
ab3d65b2ea
Fix FixZ regarding the use of model in npc_types
...
This fix only impacts those that use the model field in npc_types to override race on the client.
GetModel() returns model if set, otherwise race.
As a refresher, the model field is there so the server can still see a mob as its base race for things like bane, while the client can use a new model.
FixZ needs to know about this.
2020-02-01 20:29:48 -05:00
Michael Cook (mackal)
b02e87cce7
Fix Client::QuestReward for struct adjustment
2020-02-01 19:54:26 -05:00
Michael Cook (mackal)
50a39057e4
Update QuestReward_Struct
2020-02-01 19:27:15 -05:00
Akkadius
c8e6d031cf
Add more rule-driven behavior
2020-01-31 21:51:05 -06:00
