yolinlin/mod-individual-progression
1
0
Fork 0
mirror of https://github.com/ZhengPeiRu21/mod-individual-progression synced 2025-11-29 23:44:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix pvp Items requiring Honor Ranks

Browse Source 
You were only able to equip pvp items requiring your exact rank 
because the player's pvp title is checked and previously earned pvp titles are overwritten. This resulted in the player not being able to equip items that require a lower pvp rank.

Now higher ranks are also checked.

The required rank text on the items remains red
no solution for that yet.
This commit is contained in:
Grimfeather
2025-04-20 01:30:25 +02:00
committed by GitHub
parent 6477221268
commit 9750ef230b
1 changed files with 104 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/IndividualProgressionPlayer.cpp
View File

@@ -396,55 +396,146 @@ public:
switch (pItem->GetTemplate()->RequiredHonorRank)
{
case 5:
if (!(player->HasTitle(PRIVATE) || player->HasTitle(SCOUT)))
if (!(player->HasTitle(PRIVATE) || player->HasTitle(SCOUT) ||
(player->HasTitle(CORPORAL) || player->HasTitle(GRUNT) ||
(player->HasTitle(SERGEANT) || player->HasTitle(SERGEANT_H) ||
(player->HasTitle(MASTER_SERGEANT) || player->HasTitle(SENIOR_SERGEANT) ||
(player->HasTitle(SERGEANT_MAJOR) || player->HasTitle(FIRST_SERGEANT) ||
(player->HasTitle(KNIGHT) || player->HasTitle(STONE_GUARD) ||
(player->HasTitle(KNIGHT_LIEUTENANT) || player->HasTitle(BLOOD_GUARD) ||
(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE) ||
(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 6:
if (!(player->HasTitle(CORPORAL) || player->HasTitle(GRUNT)))
if (!(player->HasTitle(CORPORAL) || player->HasTitle(GRUNT) ||
(player->HasTitle(SERGEANT) || player->HasTitle(SERGEANT_H) ||
(player->HasTitle(MASTER_SERGEANT) || player->HasTitle(SENIOR_SERGEANT) ||
(player->HasTitle(SERGEANT_MAJOR) || player->HasTitle(FIRST_SERGEANT) ||
(player->HasTitle(KNIGHT) || player->HasTitle(STONE_GUARD) ||
(player->HasTitle(KNIGHT_LIEUTENANT) || player->HasTitle(BLOOD_GUARD) ||
(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE) ||
(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 7:
if (!(player->HasTitle(SERGEANT) || player->HasTitle(SERGEANT_H)))
if (!(player->HasTitle(SERGEANT) || player->HasTitle(SERGEANT_H) ||
(player->HasTitle(MASTER_SERGEANT) || player->HasTitle(SENIOR_SERGEANT) ||
(player->HasTitle(SERGEANT_MAJOR) || player->HasTitle(FIRST_SERGEANT) ||
(player->HasTitle(KNIGHT) || player->HasTitle(STONE_GUARD) ||
(player->HasTitle(KNIGHT_LIEUTENANT) || player->HasTitle(BLOOD_GUARD) ||
(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE) ||
(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 8:
if (!(player->HasTitle(MASTER_SERGEANT) || player->HasTitle(SENIOR_SERGEANT)))
if (!(player->HasTitle(MASTER_SERGEANT) || player->HasTitle(SENIOR_SERGEANT) ||
(player->HasTitle(SERGEANT_MAJOR) || player->HasTitle(FIRST_SERGEANT) ||
(player->HasTitle(KNIGHT) || player->HasTitle(STONE_GUARD) ||
(player->HasTitle(KNIGHT_LIEUTENANT) || player->HasTitle(BLOOD_GUARD) ||
(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE) ||
(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 9:
if (!(player->HasTitle(SERGEANT_MAJOR) || player->HasTitle(FIRST_SERGEANT)))
if (!(player->HasTitle(SERGEANT_MAJOR) || player->HasTitle(FIRST_SERGEANT) ||
(player->HasTitle(KNIGHT) || player->HasTitle(STONE_GUARD) ||
(player->HasTitle(KNIGHT_LIEUTENANT) || player->HasTitle(BLOOD_GUARD) ||
(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE) ||
(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 10:
if (!(player->HasTitle(KNIGHT) || player->HasTitle(STONE_GUARD)))
if (!(player->HasTitle(KNIGHT) || player->HasTitle(STONE_GUARD) ||
(player->HasTitle(KNIGHT_LIEUTENANT) || player->HasTitle(BLOOD_GUARD) ||
(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE) ||
(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 11:
if (!(player->HasTitle(KNIGHT_LIEUTENANT) || player->HasTitle(BLOOD_GUARD)))
if (!(player->HasTitle(KNIGHT_LIEUTENANT) || player->HasTitle(BLOOD_GUARD) ||
(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE) ||
(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 12:
if (!(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE)))
if (!(player->HasTitle(KNIGHT_CAPTAIN) || player->HasTitle(LEGIONNAIRE) ||
(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 13:
if (!(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION)))
if (!(player->HasTitle(KNIGHT_CHAMPION) || player->HasTitle(CENTURION) ||
(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 14:
if (!(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION)))
if (!(player->HasTitle(LIEUTENANT_COMMANDER) || player->HasTitle(CHAMPION) ||
(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 15:
if (!(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL)))
if (!(player->HasTitle(COMMANDER) || player->HasTitle(LIEUTENANT_GENERAL) ||
(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 16:
if (!(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL)))
if (!(player->HasTitle(MARSHAL) || player->HasTitle(GENERAL) ||
(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 17:
if (!(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD)))
if (!(player->HasTitle(FIELD_MARSHAL) || player->HasTitle(WARLORD) ||
(player->HasTitle(GRAND_MARSHAL) || player->HasTitle(HIGH_WARLORD)))
return false;
break;
case 18: