Skip to content
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

Jump to bottom

Economy added #66

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Economy added #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f6c7ed
- economy features added
Jul 31, 2013
2be7f0a
kit costs reduction added
Jul 31, 2013
d9dda64
Better Handling of kits
Jul 31, 2013
b15fb92
oops
Jul 31, 2013
37803bb
- scoreboard implemented
Aug 1, 2013
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
79 changes: 75 additions & 4 deletions src/main/java/org/mcsg/survivalgames/Game.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.Plugin;
import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
import org.bukkit.scoreboard.Score;
import org.bukkit.scoreboard.Scoreboard;
import org.mcsg.survivalgames.MessageManager.PrefixType;
import org.mcsg.survivalgames.api.PlayerJoinArenaEvent;
import org.mcsg.survivalgames.api.PlayerKilledEvent;
import org.mcsg.survivalgames.api.PlayerLeaveArenaEvent;
import org.mcsg.survivalgames.events.JoinEvent;
import org.mcsg.survivalgames.hooks.HookManager;
import org.mcsg.survivalgames.logging.QueueManager;
import org.mcsg.survivalgames.stats.StatsManager;
Expand Down Expand Up @@ -233,7 +238,22 @@ public boolean addPlayer(Player p) {
p.teleport(SettingsManager.getInstance().getLobbySpawn());
saveInv(p);clearInv(p);
p.teleport(SettingsManager.getInstance().getSpawnPoint(gameID, a));

Scoreboard board = SurvivalGames.playerBoards.get(p.getName());
board.getObjective(DisplaySlot.SIDEBAR).unregister();
Objective obj = board.registerNewObjective("SG Stats", "dummy");
obj.setDisplaySlot(DisplaySlot.SIDEBAR);
obj.setDisplayName(ChatColor.DARK_GREEN + "S.G. Stats");
Score players = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Remaining:"));
players.setScore(activePlayers.size());
Score kills = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Kills:"));
kills.setScore(0);
Score wins = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Kill Streak:"));
wins.setScore(0);
if (SurvivalGames.econOn){
Score kill = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Coins:"));
kill.setScore((int)SurvivalGames.econ.getBalance(p.getName()));
}
p.setScoreboard(board);
p.setHealth(p.getMaxHealth());p.setFoodLevel(20);clearInv(p);

activePlayers.add(p);sm.addPlayer(p, gameID);
Expand Down Expand Up @@ -291,7 +311,7 @@ public boolean addPlayer(Player p) {

public void showMenu(Player p){
GameManager.getInstance().openKitMenu(p);
Inventory i = Bukkit.getServer().createInventory(p, 90, ChatColor.RED+""+ChatColor.BOLD+"Kit Selection");
Inventory i = Bukkit.getServer().createInventory(p, 45, ChatColor.RED+""+ChatColor.BOLD+"Kit Selection");

int a = 0;
int b = 0;
Expand Down Expand Up @@ -365,6 +385,19 @@ public void vote(Player pl) {
msgmgr.sendMessage(PrefixType.WARNING, "You already voted!", pl);
return;
}
if (SurvivalGames.econOn && SurvivalGames.econPoints.containsKey("vote")){
if (SurvivalGames.econ.getBalance(pl.getName()) <= SurvivalGames.econPoints.get("vote") -0.01){
msgmgr.sendMessage(PrefixType.WARNING, "You can not afford to vote!", pl);
return;
}
SurvivalGames.econ.withdrawPlayer(pl.getName(), SurvivalGames.econPoints.get("vote"));
msgmgr.sendMessage(PrefixType.INFO, SurvivalGames.econPoints.get("vote") + " have been withdrawn from your funds.", pl);
Scoreboard board = SurvivalGames.playerBoards.get(pl.getName());
Objective obj = board.getObjective(DisplaySlot.SIDEBAR);
Score kill = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Coins:"));
kill.setScore((int)SurvivalGames.econ.getBalance(pl.getName()));
pl.setScoreboard(board);
}
vote++;
voted.add(pl);
msgmgr.sendFMessage(PrefixType.INFO, "game.playervote", pl, "player-"+pl.getName());
Expand Down Expand Up @@ -503,7 +536,8 @@ public void run() {

public void removePlayer(Player p, boolean b) {
p.teleport(SettingsManager.getInstance().getLobbySpawn());
///$("Teleporting to lobby");
JoinEvent.playerBoardSetter(p);
///$("Teleporting to lobby");
if (mode == GameMode.INGAME) {
killPlayer(p, b);
} else {
Expand All @@ -512,6 +546,13 @@ public void removePlayer(Player p, boolean b) {
restoreInv(p);
activePlayers.remove(p);
inactivePlayers.remove(p);
for (Player pl1 : activePlayers){
Scoreboard board = SurvivalGames.playerBoards.get(pl1.getName());
Objective obj = board.getObjective(DisplaySlot.SIDEBAR);
Score players = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Remaining:"));
players.setScore(activePlayers.size());
pl1.setScoreboard(board);
}
for (Object in : spawns.keySet().toArray()) {
if (spawns.get(in) == p) spawns.remove(in);
}
Expand Down Expand Up @@ -560,6 +601,21 @@ public void killPlayer(Player p, boolean left) {
case ENTITY_ATTACK:
if(p.getLastDamageCause().getEntityType() == EntityType.PLAYER){
Player killer = p.getKiller();
int i = SurvivalGames.playerKills.get(killer.getName()) + 1;
SurvivalGames.playerKills.remove(killer.getName());
SurvivalGames.playerKills.put(killer.getName(), i);
Scoreboard board = SurvivalGames.playerBoards.get(killer.getName());
Objective obj = board.getObjective(DisplaySlot.SIDEBAR);
Score kills = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Kills:"));
kills.setScore(i);
if (SurvivalGames.econOn && SurvivalGames.econPoints.containsKey("kill")){
SurvivalGames.econ.depositPlayer(killer.getName(), SurvivalGames.econPoints.get("kill"));
msgmgr.sendMessage(PrefixType.INFO, SurvivalGames.econPoints.get("kill") + " has been added yo your funds for killing " + p.getName() + ".", killer);

Score kill = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Coins:"));
kill.setScore((int)SurvivalGames.econ.getBalance(killer.getName()));
}
killer.setScoreboard(board);
msgFall(PrefixType.INFO, "death."+p.getLastDamageCause().getEntityType(),
"player-"+(SurvivalGames.auth.contains(p.getName()) ? ChatColor.DARK_RED + "" + ChatColor.BOLD : "") + p.getName(),
"killer-"+((killer != null)?(SurvivalGames.auth.contains(killer.getName()) ? ChatColor.DARK_RED + "" + ChatColor.BOLD : "")
Expand Down Expand Up @@ -645,7 +701,22 @@ public void playerWin(Player p) {
win.setFoodLevel(20);
win.setFireTicks(0);
win.setFallDistance(0);

if (SurvivalGames.econOn && SurvivalGames.econPoints.containsKey("win")){
SurvivalGames.econ.depositPlayer(win.getName(), SurvivalGames.econPoints.get("win"));
msgmgr.sendMessage(PrefixType.INFO, SurvivalGames.econPoints.get("win") + " has been added to your funds for winning the game.", win);
Scoreboard board = SurvivalGames.playerBoards.get(win.getName());
Objective obj = board.getObjective(DisplaySlot.SIDEBAR);
Score kill = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Coins:"));
kill.setScore((int)SurvivalGames.econ.getBalance(win.getName()));
}
int i = SurvivalGames.playerWins.get(win.getName()) + 1;
SurvivalGames.playerWins.remove(win.getName());
SurvivalGames.playerWins.put(win.getName(), i);
Scoreboard board = SurvivalGames.playerBoards.get(p.getName());
Objective obj = board.getObjective(DisplaySlot.SIDEBAR);
Score kills = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Wins:"));
kills.setScore(i);
win.setScoreboard(board);
sm.playerWin(win, gameID, new Date().getTime() - startTime);
sm.saveGame(gameID, win, getActivePlayers() + getInactivePlayers(), new Date().getTime() - startTime);

Expand Down
31 changes: 30 additions & 1 deletion src/main/java/org/mcsg/survivalgames/GameManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
import org.bukkit.scoreboard.Score;
import org.bukkit.scoreboard.Scoreboard;
import org.mcsg.survivalgames.Game.GameMode;
import org.mcsg.survivalgames.MessageManager.PrefixType;
import org.mcsg.survivalgames.api.PlayerLeaveArenaEvent;
Expand Down Expand Up @@ -164,7 +168,32 @@ public void leaveKitMenu(Player p){
public void openKitMenu(Player p){
kitsel.add(p);
}

public boolean kitCheck(Player p, int i){
ArrayList<Kit>kits = getKits(p);
if(i <= kits.size()){
Kit k = getKits(p).get(i);
if(k!=null){
if (k.getCost() > 0){
if (SurvivalGames.econOn){
if (SurvivalGames.econ.getBalance(p.getName()) < k.getCost()){
msgmgr.sendMessage(MessageManager.PrefixType.WARNING, "You can not afford to buy this kit!", p);
return false;
}
SurvivalGames.econ.withdrawPlayer(p.getName(), k.getCost());
msgmgr.sendMessage(MessageManager.PrefixType.INFO, k.getCost() + " have been withdrawn from your funds.", p);
Scoreboard board = SurvivalGames.playerBoards.get(p.getName());
Objective obj = board.getObjective(DisplaySlot.SIDEBAR);
Score kill = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Coins:"));
kill.setScore((int)SurvivalGames.econ.getBalance(p.getName()));
return true;
}
} else {
return true;
}
}
}
return false;
}
@SuppressWarnings("deprecation")
public void selectKit(Player p, int i) {
p.getInventory().clear();
Expand Down
63 changes: 58 additions & 5 deletions src/main/java/org/mcsg/survivalgames/SurvivalGames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,24 @@
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;

import net.milkbowl.vault.economy.Economy;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.scoreboard.ScoreboardManager;
import org.mcsg.survivalgames.events.*;
import org.mcsg.survivalgames.hooks.HookManager;
import org.mcsg.survivalgames.logging.LoggingManager;
Expand All @@ -31,6 +38,14 @@ public class SurvivalGames extends JavaPlugin {
public static boolean dbcon = false;
public static boolean config_todate = false;
public static int config_version = 3;
public static Economy econ = null;
public static boolean econOn = false;
public static Map<String, Double> econPoints = new HashMap<String, Double>();
public static Map<String, Scoreboard> playerBoards = new HashMap<String, Scoreboard>();
public static ScoreboardManager manager;
public static YamlConfiguration playStats;
public static Map<String, Integer> playerKills = new HashMap<String, Integer>();
public static Map<String, Integer> playerWins = new HashMap<String, Integer>();

public static List < String > auth = Arrays.asList(new String[] {
"Double0negative", "iMalo", "Medic0987", "alex_markey", "skitscape", "AntVenom", "YoshiGenius", "pimpinpsp", "WinryR", "Jazed2011",
Expand All @@ -52,13 +67,13 @@ public void onDisable() {
}
QueueManager.getInstance().rollback(g.getID(), true);
}

econPoints.clear();
logger.info(pdfFile.getName() + " version " + pdfFile.getVersion() + " has now been disabled and reset");
}

public void onEnable() {
logger = p.getLogger();

manager = Bukkit.getScoreboardManager();
//ensure that all worlds are loaded. Fixes some issues with Multiverse loading after this plugin had started
getServer().getScheduler().scheduleSyncDelayedTask(this, new Startup(), 10);
try {
Expand All @@ -67,10 +82,41 @@ public void onEnable() {
// TODO Auto-generated catch block
e.printStackTrace();
}


econOn = setupEconomy();
loadYmlStats();
}

public void loadYmlStats(){
File f = new File("plugins/SurvivalGames/PlayerStats/Players.yml");
if (!f.exists()){
try{
f.createNewFile();
} catch (IOException e){
e.printStackTrace();
}
}
playStats = YamlConfiguration.loadConfiguration(f);
if (playStats.get("Players") == null){
playStats.set("Players.Test.Kills", 0);
playStats.set("Players.Test.Wins", 0);
try {
playStats.save(f);
} catch (IOException e){
e.printStackTrace();
}
}

}
private boolean setupEconomy() {
if (getServer().getPluginManager().getPlugin("Vault") == null) {
return false;
}
RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
if (rsp == null) {
return false;
}
econ = rsp.getProvider();
return econ != null;
}
class Startup implements Runnable {
public void run() {
datafolder = p.getDataFolder();
Expand All @@ -84,6 +130,13 @@ public void run() {

try { // try loading everything that uses SQL.
FileConfiguration c = SettingsManager.getInstance().getConfig();

if (econOn && c.getBoolean("Econ.Enabled")){
if (c.getBoolean("Econ.Join Cost.Enabled"))econPoints.put("join", c.getDouble("Econ.Join Cost.Price"));
if (c.getBoolean("Econ.Player Kill Payout.Enabled"))econPoints.put("kill", c.getDouble("Econ.Player Kill Payout.Reward"));
if (c.getBoolean("Econ.Winner Payout.Enabled"))econPoints.put("win", c.getDouble("Econ.Winner Payout.Reward"));
if (c.getBoolean("Econ.Vote Cost.Enabled"))econPoints.put("vote", c.getDouble("Econ.Vote Cost.Price"));
}
if (c.getBoolean("stats.enabled")) DatabaseManager.getInstance().setup(p);
QueueManager.getInstance().setup();
StatsManager.getInstance().setup(p, c.getBoolean("stats.enabled"));
Expand Down
22 changes: 21 additions & 1 deletion src/main/java/org/mcsg/survivalgames/commands/Join.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
package org.mcsg.survivalgames.commands;


import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
import org.bukkit.scoreboard.Score;
import org.bukkit.scoreboard.Scoreboard;
import org.mcsg.survivalgames.GameManager;
import org.mcsg.survivalgames.MessageManager;
import org.mcsg.survivalgames.SettingsManager;
import org.mcsg.survivalgames.MessageManager.PrefixType;
import org.mcsg.survivalgames.SurvivalGames;


public class Join implements SubCommand{

private MessageManager msgmgr = MessageManager.getInstance();
public boolean onCommand(Player player, String[] args) {
if(args.length == 1){
if(player.hasPermission(permission())){

try {
int a = Integer.parseInt(args[0]);
GameManager.getInstance().addPlayer(player, a);
Expand All @@ -32,6 +39,19 @@ public boolean onCommand(Player player, String[] args) {
return true;
}
player.teleport(SettingsManager.getInstance().getLobbySpawn());
if (SurvivalGames.econOn && SurvivalGames.econPoints.containsKey("join")){
if (SurvivalGames.econ.getBalance(player.getName()) <= SurvivalGames.econPoints.get("join") -0.01){
msgmgr.sendMessage(MessageManager.PrefixType.WARNING, "You can not afford to join this game!", player);
return true;
}
SurvivalGames.econ.withdrawPlayer(player.getName(), SurvivalGames.econPoints.get("join"));
msgmgr.sendMessage(MessageManager.PrefixType.INFO, SurvivalGames.econPoints.get("join") + " have been withdrawn from your funds.", player);
Scoreboard board = SurvivalGames.playerBoards.get(player.getName());
Objective obj = board.getObjective(DisplaySlot.SIDEBAR);
Score kill = obj.getScore(Bukkit.getOfflinePlayer(ChatColor.DARK_RED + "Coins:"));
kill.setScore((int)SurvivalGames.econ.getBalance(player.getName()));
player.setScoreboard(board);
}
return true;
}
else{
Expand Down
Loading