pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into wp_master

Browse Source
This commit is contained in:
Akkadius 2018-05-28 00:32:39 -05:00
commit b84b98dd7c
9 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/patches/rof2_structs.h
View File

@ -2346,7 +2346,6 @@ struct AltCurrencySelectItem_Struct
/*064*/ uint32 unknown064; /*064*/ uint32 unknown064;
/*068*/ uint32 unknown068; /*068*/ uint32 unknown068;
/*072*/ uint32 unknown072; /*072*/ uint32 unknown072;
/*076*/ uint32 unknown076;
}; };
//Server -> Client //Server -> Client

1
utils/patches/patch_RoF.conf
View File

@ -562,6 +562,7 @@ OP_AvaliableTask=0x2bf8 # Was 0x2377
OP_TaskHistoryRequest=0x6cf6 OP_TaskHistoryRequest=0x6cf6
OP_TaskHistoryReply=0x25eb OP_TaskHistoryReply=0x25eb
OP_DeclineAllTasks=0x0000 OP_DeclineAllTasks=0x0000
OP_TaskRequestTimer=0x4b76
# Title opcodes # Title opcodes
OP_NewTitlesAvailable=0x45d1 OP_NewTitlesAvailable=0x45d1

1
utils/patches/patch_RoF2.conf
View File

@ -567,6 +567,7 @@ OP_AvaliableTask=0x36e8
OP_TaskHistoryRequest=0x5f1c OP_TaskHistoryRequest=0x5f1c
OP_TaskHistoryReply=0x3d05 OP_TaskHistoryReply=0x3d05
OP_DeclineAllTasks=0x0000 OP_DeclineAllTasks=0x0000
OP_TaskRequestTimer=0x7a48
# Title opcodes # Title opcodes
OP_NewTitlesAvailable=0x0d32 OP_NewTitlesAvailable=0x0d32

3
utils/patches/patch_SoD.conf
View File

@ -533,6 +533,9 @@ OP_TaskHistoryRequest=0x29d7 # C
OP_TaskHistoryReply=0x3d2a # C OP_TaskHistoryReply=0x3d2a # C
OP_CancelTask=0x726b # C OP_CancelTask=0x726b # C
OP_DeclineAllTasks=0x0000 # OP_DeclineAllTasks=0x0000 #
OP_TaskRequestTimer=0x2e70
OP_Shroud=0x6d1f OP_Shroud=0x6d1f
OP_ShroudRemove=0x17f6 OP_ShroudRemove=0x17f6
OP_ShroudUnknown1=0x169a OP_ShroudUnknown1=0x169a

1
utils/patches/patch_SoF.conf
View File

@ -509,6 +509,7 @@ OP_TaskAddPlayer=0x5d1d
OP_TaskRemovePlayer=0x516f OP_TaskRemovePlayer=0x516f
OP_TaskPlayerList=0x0ad6 OP_TaskPlayerList=0x0ad6
OP_TaskQuit=0x2c8c OP_TaskQuit=0x2c8c
OP_TaskRequestTimer=0x0b08
#Title opcodes #Title opcodes
OP_NewTitlesAvailable=0x179c # OP_NewTitlesAvailable=0x179c #

1
utils/patches/patch_Titanium.conf
View File

@ -474,6 +474,7 @@ OP_TaskAddPlayer=0x6bc4
OP_TaskRemovePlayer=0x37b9 OP_TaskRemovePlayer=0x37b9
OP_TaskPlayerList=0x3961 OP_TaskPlayerList=0x3961
OP_TaskQuit=0x35dd OP_TaskQuit=0x35dd
OP_TaskRequestTimer=0x6a1d
#task complete related: 0x0000 (24 bytes), 0x0000 (8 bytes), 0x0000 (4 bytes) #task complete related: 0x0000 (24 bytes), 0x0000 (8 bytes), 0x0000 (4 bytes)

1
utils/patches/patch_UF.conf
View File

@ -556,6 +556,7 @@ OP_TaskHistoryRequest=0x547c # C
OP_TaskHistoryReply=0x4524 # C OP_TaskHistoryReply=0x4524 # C
OP_CancelTask=0x3bf5 # C OP_CancelTask=0x3bf5 # C
OP_DeclineAllTasks=0x0000 # OP_DeclineAllTasks=0x0000 #
OP_TaskRequestTimer=0x719e
# Title opcodes # Title opcodes
OP_NewTitlesAvailable=0x4b49 # C OP_NewTitlesAvailable=0x4b49 # C

1
utils/scripts/linux_installer/install.sh
View File

@ -120,6 +120,7 @@ if [[ "$OS" == "Debian" ]]; then
apt-get $apt_options install libsodium-dev apt-get $apt_options install libsodium-dev
apt-get $apt_options install libsodium18 apt-get $apt_options install libsodium18
apt-get $apt_options install libjson-perl apt-get $apt_options install libjson-perl
apt-get $apt_options install libssl-dev
# Install libsodium # Install libsodium
wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium-dev_1.0.11-1~bpo8+1_amd64.deb -O /home/eqemu/libsodium-dev.deb wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium-dev_1.0.11-1~bpo8+1_amd64.deb -O /home/eqemu/libsodium-dev.deb

2
zone/mob.cpp
View File

@ -2088,7 +2088,7 @@ bool Mob::IsPlayerRace(uint16 in_race) {
uint8 Mob::GetDefaultGender(uint16 in_race, uint8 in_gender) { uint8 Mob::GetDefaultGender(uint16 in_race, uint8 in_gender) {
if (Mob::IsPlayerRace(in_race) || in_race == 15 || in_race == 50 || in_race == 57 || in_race == 70 || in_race == 98 || in_race == 118 || in_race == 23) { if (Mob::IsPlayerRace(in_race) || in_race == 15 || in_race == 50 || in_race == 57 || in_race == 70 || in_race == 98 || in_race == 118 || in_race == 562) {
if (in_gender >= 2) { if (in_gender >= 2) {
// Male default for PC Races // Male default for PC Races
return 0; return 0;