Minor improvements for previous commit.

This commit is contained in:
MobiusDevelopment 2019-05-10 02:47:00 +00:00
parent 78ca86fd09
commit 62cba84978
12 changed files with 45 additions and 45 deletions

View File

@ -51,7 +51,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
} }
if (player.getObjectId() != clan.getLeaderId()) if (player.getObjectId() != clan.getLeaderId())
{ {
player.sendMessage("You do not have enough privilages to take this action."); player.sendMessage("You do not have enough privileges to take this action.");
return; return;
} }

View File

@ -55,7 +55,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
} }
if (player.getObjectId() != clan.getLeaderId()) if (player.getObjectId() != clan.getLeaderId())
{ {
player.sendMessage("You do not have enough privilages to take this action."); player.sendMessage("You do not have enough privileges to take this action.");
return; return;
} }
@ -67,7 +67,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
} }
// Check if it can be learned. // Check if it can be learned.
if (clan.getTotalDevelopmentPoints() < (clan.getUsedDevelopmentPoints() + 1)) if (clan.getTotalDevelopmentPoints() <= clan.getUsedDevelopmentPoints())
{ {
player.sendMessage("Your clan develpment points are not sufficient."); player.sendMessage("Your clan develpment points are not sufficient.");
return; return;

View File

@ -63,10 +63,8 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket
{ {
available = false; available = false;
} }
if (clan.getReputationScore() < mastery.getClanReputation()) else
{ {
available = false;
}
final int previous = mastery.getPreviousMastery(); final int previous = mastery.getPreviousMastery();
final int previousAlt = mastery.getPreviousMasteryAlt(); final int previousAlt = mastery.getPreviousMasteryAlt();
if (previousAlt > 0) if (previousAlt > 0)
@ -77,6 +75,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket
{ {
available = clan.hasMastery(previous); available = clan.hasMastery(previous);
} }
}
packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability.
} }

View File

@ -87,6 +87,7 @@ Grand Crusade:
Salvation: Salvation:
-Parsed new items from client -Parsed new items from client
-New Agathion item support -New Agathion item support
-New clan system support
Events: Events:
-Birth of Draco -Birth of Draco

View File

@ -51,7 +51,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
} }
if (player.getObjectId() != clan.getLeaderId()) if (player.getObjectId() != clan.getLeaderId())
{ {
player.sendMessage("You do not have enough privilages to take this action."); player.sendMessage("You do not have enough privileges to take this action.");
return; return;
} }

View File

@ -55,7 +55,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
} }
if (player.getObjectId() != clan.getLeaderId()) if (player.getObjectId() != clan.getLeaderId())
{ {
player.sendMessage("You do not have enough privilages to take this action."); player.sendMessage("You do not have enough privileges to take this action.");
return; return;
} }
@ -67,7 +67,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
} }
// Check if it can be learned. // Check if it can be learned.
if (clan.getTotalDevelopmentPoints() < (clan.getUsedDevelopmentPoints() + 1)) if (clan.getTotalDevelopmentPoints() <= clan.getUsedDevelopmentPoints())
{ {
player.sendMessage("Your clan develpment points are not sufficient."); player.sendMessage("Your clan develpment points are not sufficient.");
return; return;

View File

@ -63,10 +63,8 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket
{ {
available = false; available = false;
} }
if (clan.getReputationScore() < mastery.getClanReputation()) else
{ {
available = false;
}
final int previous = mastery.getPreviousMastery(); final int previous = mastery.getPreviousMastery();
final int previousAlt = mastery.getPreviousMasteryAlt(); final int previousAlt = mastery.getPreviousMasteryAlt();
if (previousAlt > 0) if (previousAlt > 0)
@ -77,6 +75,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket
{ {
available = clan.hasMastery(previous); available = clan.hasMastery(previous);
} }
}
packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability.
} }

View File

@ -86,6 +86,7 @@ Grand Crusade:
Salvation: Salvation:
-New Agathion item support -New Agathion item support
-New clan system support
Etina's Fate: Etina's Fate:
-Parsed new items from client -Parsed new items from client

View File

@ -51,7 +51,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
} }
if (player.getObjectId() != clan.getLeaderId()) if (player.getObjectId() != clan.getLeaderId())
{ {
player.sendMessage("You do not have enough privilages to take this action."); player.sendMessage("You do not have enough privileges to take this action.");
return; return;
} }

View File

@ -55,7 +55,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
} }
if (player.getObjectId() != clan.getLeaderId()) if (player.getObjectId() != clan.getLeaderId())
{ {
player.sendMessage("You do not have enough privilages to take this action."); player.sendMessage("You do not have enough privileges to take this action.");
return; return;
} }
@ -67,7 +67,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
} }
// Check if it can be learned. // Check if it can be learned.
if (clan.getTotalDevelopmentPoints() < (clan.getUsedDevelopmentPoints() + 1)) if (clan.getTotalDevelopmentPoints() <= clan.getUsedDevelopmentPoints())
{ {
player.sendMessage("Your clan develpment points are not sufficient."); player.sendMessage("Your clan develpment points are not sufficient.");
return; return;

View File

@ -63,10 +63,8 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket
{ {
available = false; available = false;
} }
if (clan.getReputationScore() < mastery.getClanReputation()) else
{ {
available = false;
}
final int previous = mastery.getPreviousMastery(); final int previous = mastery.getPreviousMastery();
final int previousAlt = mastery.getPreviousMasteryAlt(); final int previousAlt = mastery.getPreviousMasteryAlt();
if (previousAlt > 0) if (previousAlt > 0)
@ -77,6 +75,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket
{ {
available = clan.hasMastery(previous); available = clan.hasMastery(previous);
} }
}
packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability.
} }

View File

@ -86,6 +86,7 @@ Grand Crusade:
Salvation: Salvation:
-New Agathion item support -New Agathion item support
-New clan system support
Etina's Fate: Etina's Fate:
-Parsed new items from client -Parsed new items from client