projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-12 22:45:18 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #732 from madsboddum/Holocore-730

Browse Source 
XP flytext not showing the multiplied XP correctly
This commit is contained in:
Josh Larson
2022-08-19 21:03:22 -05:00
committed by GitHub
parent f16ef84782 bb3c5a8bf9
commit d13e97aa55
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/services/gameplay/player/experience/ExperiencePointService.java
+11 -11
View File
@@ -38,12 +38,20 @@ public class ExperiencePointService extends Service {
SWGObject flytextTarget = ei.getFlytextTarget();
boolean xpMultiplied = ei.isXpMultiplied();
awardExperience(creatureObject, flytextTarget, playerObject, xpType, experienceGained, xpMultiplied);
if (xpMultiplied) {
experienceGained *= xpMultiplier;
}
awardExperience(creatureObject, flytextTarget, playerObject, xpType, experienceGained);
}
}
private void awardExperience(CreatureObject creatureObject, SWGObject flytextTarget, PlayerObject playerObject, String xpType, int xpGained, boolean xpMultiplied) {
incrementExperience(creatureObject, playerObject, xpType, xpGained, xpMultiplied);
private void awardExperience(CreatureObject creatureObject, SWGObject flytextTarget, PlayerObject playerObject, String xpType, int xpGained) {
int currentXp = playerObject.getExperiencePoints(xpType);
int newXpTotal = currentXp + xpGained;
playerObject.setExperiencePoints(xpType, newXpTotal);
Log.d("%s gained %d %s XP", creatureObject, xpGained, xpType);
if (!Objects.equals("combat_general", xpType)) {
showFlytext(creatureObject, flytextTarget, xpGained);
@@ -58,14 +66,6 @@ public class ExperiencePointService extends Service {
SystemMessageIntent.broadcastPersonal(creatureObject.getOwner(), message, ChatSystemMessage.SystemChatType.CHAT_BOX);
}
private void incrementExperience(CreatureObject creatureObject, PlayerObject playerObject, String xpType, int xpGained, boolean xpMultiplied) {
int currentXp = playerObject.getExperiencePoints(xpType);
int newXpTotal = xpMultiplied ? (currentXp + (int) (xpGained * xpMultiplier)) : (currentXp + xpGained);
playerObject.setExperiencePoints(xpType, newXpTotal);
Log.d("%s gained %d %s XP", creatureObject, xpGained, xpType);
}
private void showFlytext(CreatureObject creatureObject, SWGObject flytextTarget, int xpGained) {
OutOfBandPackage message = new OutOfBandPackage(new ProsePackage(new StringId("base_player", "prose_flytext_xp"), "DI", xpGained));
ShowFlyText packet = new ShowFlyText(flytextTarget.getObjectId(), message, Scale.MEDIUM, SWGColor.Violets.INSTANCE.getMagenta());