JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change crown calculations again

Browse Source
This commit is contained in:
AlexTheCoder 2017-05-12 18:44:05 -04:00
parent ea4f9aee62
commit a42e6ed9e4
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java
View File

@ -454,23 +454,29 @@ public class CastleAssault extends TeamGame
AddGems(player, 10, "Participation", false, false); AddGems(player, 10, "Participation", false, false);
} }
int crowns = 0;
for (GemData data : GetGems(player).values())
{
crowns += data.Gems;
}
{ {
int streak = _streakData.getOrDefault(player, new KillStreakData()).getBestStreak(); int streak = _streakData.getOrDefault(player, new KillStreakData()).getBestStreak();
if (streak >= 2 && streak < 4) if (streak >= 2 && streak < 4)
{ {
AddGems(player, 10, streak + " Player Kill Streak", false, false); AddGems(player, 0.5 * crowns, streak + " Player Kill Streak", false, false);
} }
else if (streak >= 4 && streak < 6) else if (streak >= 4 && streak < 6)
{ {
AddGems(player, 15, streak + " Player Kill Streak", false, false); AddGems(player, 1 * crowns, streak + " Player Kill Streak", false, false);
} }
else if (streak >= 6 && streak < 8) else if (streak >= 6 && streak < 8)
{ {
AddGems(player, 20, streak + " Player Kill Streak", false, false); AddGems(player, 1.5 * crowns, streak + " Player Kill Streak", false, false);
} }
else if (streak >= 8) else if (streak >= 8)
{ {
AddGems(player, 25, streak + " Player Kill Streak", false, false); AddGems(player, 2 * crowns, streak + " Player Kill Streak", false, false);
} }
} }
@ -480,12 +486,6 @@ public class CastleAssault extends TeamGame
int kitLevel = kit.getUpgradeLevel(player.getUniqueId()); int kitLevel = kit.getUpgradeLevel(player.getUniqueId());
if (kitLevel > 0) if (kitLevel > 0)
{ {
int crowns = 0;
for (GemData data : GetGems(player).values())
{
crowns += data.Gems;
}
AddGems(player, (0.5 * kitLevel) * crowns, kit.GetName() + " Kit Level Bonus", false, false); AddGems(player, (0.5 * kitLevel) * crowns, kit.GetName() + " Kit Level Bonus", false, false);
} }
} }
@ -547,37 +547,40 @@ public class CastleAssault extends TeamGame
AddGems(player, 10, "Participation", false, false); AddGems(player, 10, "Participation", false, false);
} }
int crowns = 0;
for (GemData data : GetGems(player).values())
{
crowns += data.Gems;
}
{ {
int streak = _streakData.getOrDefault(player, new KillStreakData()).getBestStreak(); int streak = _streakData.getOrDefault(player, new KillStreakData()).getBestStreak();
if (streak >= 2 && streak < 4) if (streak >= 2 && streak < 4)
{ {
AddGems(player, 10, streak + " Player Kill Streak", false, false); AddGems(player, 0.5 * crowns, streak + " Player Kill Streak", false, false);
} }
else if (streak >= 4 && streak < 6) else if (streak >= 4 && streak < 6)
{ {
AddGems(player, 15, streak + " Player Kill Streak", false, false); AddGems(player, 1 * crowns, streak + " Player Kill Streak", false, false);
} }
else if (streak >= 6 && streak < 8) else if (streak >= 6 && streak < 8)
{ {
AddGems(player, 20, streak + " Player Kill Streak", false, false); AddGems(player, 1.5 * crowns, streak + " Player Kill Streak", false, false);
} }
else if (streak >= 8) else if (streak >= 8)
{ {
AddGems(player, 25, streak + " Player Kill Streak", false, false); AddGems(player, 2 * crowns, streak + " Player Kill Streak", false, false);
} }
} }
KitPlayer kit = (KitPlayer) GetKit(player); if (GetKit(player) != null)
int kitLevel = kit.getUpgradeLevel(player.getUniqueId());
if (kitLevel > 0)
{ {
int crowns = 0; KitPlayer kit = (KitPlayer) GetKit(player);
for (GemData data : GetGems(player).values()) int kitLevel = kit.getUpgradeLevel(player.getUniqueId());
if (kitLevel > 0)
{ {
crowns += data.Gems; AddGems(player, (0.5 * kitLevel) * crowns, kit.GetName() + " Kit Level Bonus", false, false);
} }
AddGems(player, (0.5 * kitLevel) * crowns, kit.GetName() + " Kit Level Bonus", false, false);
} }
} }
} }