Skip to content

feat. implement reward modifiers for job calculations #1984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nivcoo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat. implement reward modifiers for job calculations #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package com.gamingmesh.jobs.Gui;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.*;

import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
Expand Down Expand Up @@ -392,6 +388,7 @@ public void openJobsGUI(Player player, Job job, int page, List<actionList> actio

int level = prog != null ? prog.getLevel() : 1;
int numjobs = jPlayer.getJobProgression().size();
Location previewLocation = player.getLocation();
int nextButton = (rows * 9) - 1;
int backButton = ((rows - 1) * 9);

Expand Down Expand Up @@ -439,17 +436,32 @@ public void openJobsGUI(Player player, Job job, int page, List<actionList> actio
}
}

double income = jInfo.getIncome(level, numjobs, jPlayer.maxJobsEquation);

income = boost.getFinalAmount(CurrencyType.MONEY, income);
Material material = Material.matchMaterial(jInfo.getName());
Map<CurrencyType, Double> rewards = Jobs.calculateRewards(
jPlayer,
job,
jInfo,
level,
numjobs,
null,
null,
null,
null,
action.getType(),
material,
material == null ? jInfo.getName() : null,
previewLocation,
boost,
true,
false
);
double income = rewards.getOrDefault(CurrencyType.MONEY, 0D);
String incomeColor = income >= 0 ? "" : CMIChatColor.DARK_RED.toString();

double xp = jInfo.getExperience(level, numjobs, jPlayer.maxJobsEquation);
xp = boost.getFinalAmount(CurrencyType.EXP, xp);
double xp = rewards.getOrDefault(CurrencyType.EXP, 0D);
String xpColor = xp >= 0 ? "" : CMIChatColor.GRAY.toString();

double points = jInfo.getPoints(level, numjobs, jPlayer.maxJobsEquation);
points = boost.getFinalAmount(CurrencyType.POINTS, points);
double points = rewards.getOrDefault(CurrencyType.POINTS, 0D);
String pointsColor = points >= 0 ? "" : CMIChatColor.RED.toString();

if (income == 0D && points == 0D && xp == 0D)
Expand Down
Loading