pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 08:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Final prep for extending skill use range - client patch and database are ready..just need the code in-between

Browse Source
This commit is contained in:
Uleat
2013-10-28 13:06:49 -04:00
parent 28bcf074fc
commit 08706055af
9 changed files with 21 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/eq_packet_structs.h
+3 -5
View File
@@ -802,8 +802,7 @@ struct SuspendedMinion_Struct
static const uint32 MAX_PP_LANGUAGE = 28;
static const uint32 MAX_PP_SPELLBOOK = 480; // Increased to 480 to support SoF
static const uint32 MAX_PP_MEMSPELL = 9;
static const uint32 MAX_PP_SKILL = 75; // still in-use server-side - this must remain 75 until all code and database can be changed
//static const uint32 MAX_PP_SKILL = _SkillPacketArraySize; // 100
static const uint32 MAX_PP_SKILL = _SkillPacketArraySize; // 100 - actual skills buffer size
static const uint32 MAX_PP_AA_ARRAY = 240;
static const uint32 MAX_GROUP_MEMBERS = 6;
static const uint32 MAX_RECAST_TYPES = 20;
@@ -942,9 +941,8 @@ struct PlayerProfile_Struct
/*4764*/ int32 copper_cursor; // Copper on cursor
/*4768*/ int32 platinum_shared; // Platinum shared between characters
/*4772*/ uint8 unknown4808[24];
/*4796*/ uint32 skills[MAX_PP_SKILL]; // currently, 75 dword buffer
/*5096*/ uint8 unknown5132[284]; // this is for 75 dword buffer
///*5196*/ uint8 unknown5132[184]; // this is for 100 dword buffer
/*4796*/ uint32 skills[MAX_PP_SKILL]; // [400] List of skills // 100 dword buffer
/*5196*/ uint8 unknown5132[184];
/*5380*/ uint32 pvp2; //
/*5384*/ uint32 unknown5420; //
/*5388*/ uint32 pvptype; //
common/patches/Client62.cpp
+1 -14
View File
@@ -266,20 +266,7 @@ ENCODE(OP_PlayerProfile) {
OUT(silver_cursor);
OUT(copper_cursor);
//OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
OUT_array(skills, MAX_PP_SKILL); // copy first 75 from server struct
for(r = MAX_PP_SKILL; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; } // zero the rest
/*
// SKILLS TEST
eq->skills[75] = (uint32)5; // SkillRemoveTrap
eq->skills[76] = (uint32)10; // SkillTripleAttack
eq->skills[77] = (uint32)15; // Skill2HPiercing
eq->skills[78] = (uint32)20; // SkillNone
for(r = MAX_PP_SKILL + 4; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; }
// END TEST
*/
OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
OUT(toxicity);
OUT(thirst_level);
common/patches/RoF.cpp
+3 -15
View File
@@ -1020,30 +1020,18 @@ ENCODE(OP_PlayerProfile)
outapp->WriteUInt32(structs::MAX_PP_SKILL);
for(uint32 r = 0; r < MAX_PP_SKILL; r++)
for(uint32 r = 0; r < structs::MAX_PP_SKILL; r++)
{
outapp->WriteUInt32(emu->skills[r]);
}
// deprecated
// Write zeroes for the rest of the skills
/*
for(uint32 r = 0; r < structs::MAX_PP_SKILL - MAX_PP_SKILL; r++)
{
outapp->WriteUInt32(emu->skills[r]);
}
/*
// SKILLS TEST
outapp->WriteUInt32(5); // SkillRemoveTrap
outapp->WriteUInt32(10); // SkillTripleAttack
outapp->WriteUInt32(15); // Skill2HPiercing
outapp->WriteUInt32(20); // SkillNone
// Write zeroes for the rest of the skills
for(uint32 r = 0; r < structs::MAX_PP_SKILL - MAX_PP_SKILL - 4; r++)
{
outapp->WriteUInt32(emu->skills[r]);
}
// END TEST
*/
outapp->WriteUInt32(25); // Unknown count
common/patches/SoD.cpp
+1 -14
View File
@@ -536,20 +536,7 @@ ENCODE(OP_PlayerProfile) {
OUT(silver_cursor);
OUT(copper_cursor);
//OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
OUT_array(skills, MAX_PP_SKILL); // copy first 75 from server struct
for(r = MAX_PP_SKILL; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; } // zero the rest
/*
// SKILLS TEST
eq->skills[75] = (uint32)5; // SkillRemoveTrap
eq->skills[76] = (uint32)10; // SkillTripleAttack
eq->skills[77] = (uint32)15; // Skill2HPiercing
eq->skills[78] = (uint32)20; // SkillNone
for(r = MAX_PP_SKILL + 4; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; }
// END TEST
*/
OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
// OUT(unknown04760[236]);
OUT(toxicity);
common/patches/SoF.cpp
+1 -14
View File
@@ -535,20 +535,7 @@ ENCODE(OP_PlayerProfile) {
OUT(silver_cursor);
OUT(copper_cursor);
//OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
OUT_array(skills, MAX_PP_SKILL); // copy first 75 from server struct
for(r = MAX_PP_SKILL; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; } // zero the rest
/*
// SKILLS TEST
eq->skills[75] = (uint32)5; // SkillRemoveTrap
eq->skills[76] = (uint32)10; // SkillTripleAttack
eq->skills[77] = (uint32)15; // Skill2HPiercing
eq->skills[78] = (uint32)20; // SkillNone
for(r = MAX_PP_SKILL + 4; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; }
// END TEST
*/
OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
// OUT(unknown04760[236]);
OUT(toxicity);
common/patches/Titanium.cpp
+1 -14
View File
@@ -270,20 +270,7 @@ ENCODE(OP_PlayerProfile) {
OUT(silver_cursor);
OUT(copper_cursor);
//OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
OUT_array(skills, MAX_PP_SKILL); // copy first 75 from server struct
for(r = MAX_PP_SKILL; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; } // zero the rest
/*
// SKILLS TEST
eq->skills[75] = (uint32)5; // SkillRemoveTrap
eq->skills[76] = (uint32)10; // SkillTripleAttack
eq->skills[77] = (uint32)15; // Skill2HPiercing
eq->skills[78] = (uint32)20; // SkillNone
for(r = MAX_PP_SKILL + 4; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; }
// END TEST
*/
OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
// OUT(unknown04760[236]);
OUT(toxicity);
common/patches/Underfoot.cpp
+1 -14
View File
@@ -550,20 +550,7 @@ ENCODE(OP_PlayerProfile) {
OUT(silver_cursor);
OUT(copper_cursor);
//OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
OUT_array(skills, MAX_PP_SKILL); // copy first 75 from server struct
for(r = MAX_PP_SKILL; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; } // zero the rest
/*
// SKILLS TEST
eq->skills[75] = (uint32)5; // SkillRemoveTrap
eq->skills[76] = (uint32)10; // SkillTripleAttack
eq->skills[77] = (uint32)15; // Skill2HPiercing
eq->skills[78] = (uint32)20; // SkillNone
for(r = MAX_PP_SKILL + 4; r < structs::MAX_PP_SKILL; r++) { eq->skills[r] = (uint32)0; }
// END TEST
*/
OUT_array(skills, structs::MAX_PP_SKILL); // 1:1 direct copy (100 dword)
// OUT(unknown04760[236]);
OUT(toxicity);