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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
CoderTim 2014-08-26 20:27:51 -04:00
parent 7d6572ff4d 8e89dfa1ab
commit 5ef2772abd
9 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
View File

@ -184,7 +184,7 @@ public enum Achievement
AchievementCategory.CASTLE_SIEGE),
CASTLE_SIEGE_KINGSLAYER("Kingslayer", 800,
new String[] {"Castle Siege.Kingslayer"},
new String[] {"Castle Siege.KingSlayer"},
new String[] {"Get the killing blow on the King"},
new int[] {1},
AchievementCategory.CASTLE_SIEGE),
@ -372,7 +372,7 @@ public enum Achievement
//Death Tag
DEATH_TAG_WINS("Death Proof", 600,
new String[] {"Death Tag.Wins"},
new String[] {"Win 50 games of Turf Wars"},
new String[] {"Win 50 games of Death Tag"},
new int[] {50},
AchievementCategory.DEATH_TAG),

4
Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java
View File

@ -70,7 +70,7 @@ public class AchievementPage extends ShopPageBase<AchievementManager, Achievemen
}
{
Material material = hasUnlocked ? Material.EMERALD : Material.INK_SACK;
Material material = hasUnlocked ? Material.EXP_BOTTLE : Material.GLASS_BOTTLE;
String itemName = (hasUnlocked ? C.cGreen : C.cRed) + achievement.getName();
if (!singleLevel)
@ -103,7 +103,7 @@ public class AchievementPage extends ShopPageBase<AchievementManager, Achievemen
}
AddItem(currentIndex, new ShopItem(material, (byte) (hasUnlocked ? 0 : 8), itemName, lore.toArray(new String[0]), 1, false, false));
AddItem(currentIndex, new ShopItem(material, (byte) (hasUnlocked ? 0 : 0), itemName, lore.toArray(new String[0]), 1, false, false));
}
masterAchievementLore.add((hasUnlocked ? C.cGreen : C.cRed) + achievement.getName());

9
Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java
View File

@ -85,6 +85,9 @@ public class PollManager extends MiniClientPlugin<PlayerPollData>
if (event.getType() != UpdateType.SLOW)
return;
if (_polls.size() == 0)
return;
for (Player player : _plugin.getServer().getOnlinePlayers())
{
PlayerPollData pollData = Get(player);
@ -147,7 +150,7 @@ public class PollManager extends MiniClientPlugin<PlayerPollData>
}
}
player.sendMessage("");
player.sendMessage("Click an answer to receive " + C.cYellow + poll.getCoinReward() + " Coins");
player.sendMessage("Click an answer to receive " + C.cGreen + poll.getCoinReward() + " Gems");
player.sendMessage(C.cGold + C.Bold + "--------------------------");
player.playSound(player.getEyeLocation(), Sound.ORB_PICKUP, 2f, 0f);
@ -173,7 +176,7 @@ public class PollManager extends MiniClientPlugin<PlayerPollData>
if (_repository.addPollAnswer(uuid, poll.getId(), answer))
{
// Poll response successful, give coins
_donationManager.RewardCoins(new Callback<Boolean>()
_donationManager.RewardGems(new Callback<Boolean>()
{
@Override
public void run(Boolean completed)
@ -184,7 +187,7 @@ public class PollManager extends MiniClientPlugin<PlayerPollData>
@Override
public void run()
{
UtilPlayer.message(player, F.main("Coin", "You received " + F.elem(poll.getCoinReward() + "") + " coins!"));
UtilPlayer.message(player, F.main("Gem", "You received " + F.elem(poll.getCoinReward() + "") + " Gems!"));
}
});
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -207,6 +207,8 @@ public abstract class Game implements Listener
public boolean EloRanking = false;
public int EloStart = 1000;
public boolean CanAddStats = true;
public ArrayList<String> GemBoosters = new ArrayList<String>();
private final Set<StatTracker<? extends Game>> _statTrackers = new HashSet<>();

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java
View File

@ -101,7 +101,7 @@ public class Micro extends TeamGame
if (_blocks.isEmpty())
return;
TimingManager.start("Block Fall");
//TimingManager.start("Block Fall");
for (int i = 0 ; i < 3 ; i++)
{
@ -134,7 +134,7 @@ public class Micro extends TeamGame
}
}
TimingManager.stop("Block Fall");
//TimingManager.stop("Block Fall");
}
@EventHandler

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameAchievementManager.java
View File

@ -93,11 +93,11 @@ public class GameAchievementManager implements Listener
String progress = F.elem(C.cGreen + "+" + log.get(type).Amount);
boolean displayDesc = true;
//Completed Achievement
if (data.getLevel() == type.getMaxLevel())
if (data.getLevel() >= type.getMaxLevel())
{
//Finishing for the first time
//Finishing for the first time
if (!Manager.GetTaskManager().hasCompletedTask(player, type.getName()))
{
UtilPlayer.message(player, nameLevel + " " + F.elem(C.cAqua + C.Bold + "Completed!") +

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
View File

@ -271,6 +271,20 @@ public class GameManager implements Listener
event.GetGame().DeregisterKits();
}
@EventHandler
public void StatEnableDisable(GameStateChangeEvent event)
{
if (event.GetState() != GameState.Live)
return;
int requirement = (int)((double)event.GetGame().Manager.GetPlayerFull() * 0.75d);
event.GetGame().CanAddStats = (double)event.GetGame().GetPlayers(true).size() >= requirement;
if (!event.GetGame().CanAddStats)
event.GetGame().Announce(C.Bold + "Stats/Achievements Disabled. Requires " + requirement + " Players.");
}
@EventHandler
public void StatRegister(GameStateChangeEvent event)
{

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/OneVThreeStatTracker.java
View File

@ -63,11 +63,7 @@ public class OneVThreeStatTracker extends StatTracker<Game>
{
if (event.GetState() == Game.GameState.End)
{
List<Player> players = getGame().GetPlayers(false);
if (players.size() >= 4)
return;
for (Player player : players)
for (Player player : getGame().GetPlayers(false))
{
Integer killCount = _killCount.get(player.getUniqueId());

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/StatTracker.java
View File

@ -21,7 +21,7 @@ public class StatTracker<G extends Game> implements Listener
public boolean canAddStats()
{
return getGame().GetPlayers(false).size() * 4 >= 3 * getGame().Manager.GetPlayerFull();
return getGame().CanAddStats;
}
public void addStat(Player player, String stat, int value, boolean limitTo1, boolean global)