From 0193c397fb5aa1ee7611044c5e3682234ced8792 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Wed, 12 Nov 2014 19:20:41 -0800 Subject: [PATCH] Added Kit unlocks to staff server Added password persistence in db. --- .../core/donation/DonationManager.java | 10 +- .../repository/DonationRepository.java | 6 + .../src/mineplex/staffServer/StaffServer.java | 2 +- .../customerSupport/CustomerSupport.java | 4 +- .../staffServer/password/Password.java | 67 ++- .../staffServer/password/PasswordCommand.java | 2 +- .../salespackage/SalesPackageManager.java | 6 +- .../salespackage/command/BoosterCommand.java | 2 +- .../salespackage/command/CoinCommand.java | 2 +- .../command/GemHunterCommand.java | 2 +- .../salespackage/command/RankCommand.java | 2 +- .../salespackage/command/Sales.java | 1 + .../command/TreasureChestCommand.java | 2 +- .../command/TreasureKeyCommand.java | 2 +- .../Models/AccountAdministrator.cs | 76 +++ .../Models/IAccountAdministrator.cs | 1 + .../Controllers/PlayerAccountController.cs | 6 + .../LOC.Website.Web.Publish.xml | 434 +++++++++--------- Website/LOCWebsite.suo | Bin 474624 -> 474624 bytes 19 files changed, 388 insertions(+), 239 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java index 95ae0a980..0b559f9ba 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java @@ -15,6 +15,7 @@ import mineplex.core.common.util.Callback; import mineplex.core.common.util.NautHashMap; import mineplex.core.donation.repository.DonationRepository; import mineplex.core.donation.repository.token.DonorTokenWrapper; +import mineplex.core.server.remotecall.JsonWebCall; import mineplex.core.server.util.TransactionResponse; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -42,8 +43,8 @@ public class DonationManager extends MiniPlugin @Override public void AddCommands() { - AddCommand(new GemCommand(this)); - AddCommand(new CoinCommand(this)); + addCommand(new GemCommand(this)); + addCommand(new CoinCommand(this)); } @EventHandler @@ -300,4 +301,9 @@ public class DonationManager extends MiniPlugin //Clean _coinQueue.clear(); } + + public void applyKits(String playerName) + { + _repository.applyKits(playerName); + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java index 9523c2e06..71c8129ec 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java @@ -13,6 +13,7 @@ import mineplex.core.database.column.ColumnVarChar; import mineplex.core.donation.repository.token.GemRewardToken; import mineplex.core.donation.repository.token.PurchaseToken; import mineplex.core.donation.repository.token.UnknownPurchaseToken; +import mineplex.core.server.remotecall.AsyncJsonWebCall; import mineplex.core.server.remotecall.JsonWebCall; import mineplex.core.server.util.TransactionResponse; @@ -184,4 +185,9 @@ public class DonationRepository extends RepositoryBase } }), "Error updating player's null gems and coins DonationRepository : "); } + + public void applyKits(String playerName) + { + new AsyncJsonWebCall(_webAddress + "PlayerAccount/ApplyKits").Execute(playerName); + } } \ No newline at end of file diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java index 01541b259..8df18e496 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java @@ -56,7 +56,7 @@ public class StaffServer extends JavaPlugin new FileUpdater(this, portal); new CustomerSupport(this, clientManager, donationManager, new SalesPackageManager(this, clientManager, donationManager, new InventoryManager(this), new StatsManager(this))); - new Password(this); + new Password(this, serverStatusManager.getCurrentServerName()); //Updates getServer().getScheduler().scheduleSyncRepeatingTask(this, new Updater(this), 1, 1); diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java index 0ed25b7e4..b57adc03b 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java @@ -77,12 +77,12 @@ public class CustomerSupport extends MiniPlugin @Override public void AddCommands() { - AddCommand(new checkCommand(this)); + addCommand(new checkCommand(this)); } public void Help(Player caller) { - caller.sendMessage(F.main(GetName(), "Usage : /check defek7")); + caller.sendMessage(F.main(getName(), "Usage : /check defek7")); } public void addAgentMapping(Player caller, String playerName) diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/password/Password.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/password/Password.java index 8836fdb8f..db26f98bb 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/password/Password.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/password/Password.java @@ -9,30 +9,41 @@ import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.MiniPlugin; import mineplex.core.common.util.F; -import mineplex.core.recharge.Recharge; public class Password extends MiniPlugin { + private PasswordRepository _repository; private HashSet _accepted = new HashSet(); - private String _password = "ClothStarRust"; + private String _serverName; + private String _password = null; - public Password(JavaPlugin plugin) + public Password(JavaPlugin plugin, String serverName) { super("Password", plugin); + + _serverName = serverName; + + _repository = new PasswordRepository(plugin, serverName); + _password = _repository.retrievePassword(); } @Override public void AddCommands() { - AddCommand(new PasswordCommand(this)); - AddCommand(new ChangePasswordCommand(this)); + addCommand(new PasswordCommand(this)); + addCommand(new ChangePasswordCommand(this)); + addCommand(new RemovePasswordCommand(this)); + addCommand(new CreatePasswordCommand(this)); } @EventHandler public void promptForPassword(final PlayerJoinEvent event) { - event.getPlayer().sendMessage(F.main(GetName(), "Please enter the server password within 10 seconds.")); + if (_password == null) + return; + + event.getPlayer().sendMessage(F.main(getName(), "Please enter the server password within 10 seconds.")); GetPlugin().getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable() { @@ -46,16 +57,56 @@ public class Password extends MiniPlugin public void checkPassword(Player caller, String attempt) { + if (_password == null) + return; + if (attempt.equals(_password)) { _accepted.add(caller); - caller.sendMessage(F.main(GetName(), "I guess you get to stay.")); + caller.sendMessage(F.main(getName(), "That is correct, enjoy your time here...and GET TO WORK ;)")); } } public void changePassword(Player caller, String password) { _password = password; - caller.sendMessage(F.main(GetName(), "Password changed to " + _password)); + + runAsync(new Runnable() + { + public void run() + { + _repository.updatePassword(_password); + } + }); + + caller.sendMessage(F.main(getName(), "Password changed to " + _password)); + } + + public void removePassword(Player caller) + { + runAsync(new Runnable() + { + public void run() + { + _password = null; + _repository.removePassword(); + } + }); + caller.sendMessage(F.main(getName(), "Password removed for " + _serverName)); + } + + public void createPassword(Player caller, String password) + { + _password = password; + + runAsync(new Runnable() + { + public void run() + { + _repository.createPassword(_password); + } + }); + + caller.sendMessage(F.main(getName(), "Password created : " + _password)); } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/password/PasswordCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/password/PasswordCommand.java index 908e15d48..f24d88d40 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/password/PasswordCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/password/PasswordCommand.java @@ -9,7 +9,7 @@ public class PasswordCommand extends CommandBase { public PasswordCommand(Password plugin) { - super(plugin, Rank.MODERATOR, "password"); + super(plugin, Rank.MODERATOR, "pass", "password"); } @Override diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/SalesPackageManager.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/SalesPackageManager.java index 2efc6a980..973ff09cf 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/SalesPackageManager.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/SalesPackageManager.java @@ -12,6 +12,7 @@ import mineplex.core.inventory.InventoryManager; import mineplex.core.stats.StatsManager; import mineplex.staffServer.salespackage.command.DisplayPackageCommand; import mineplex.staffServer.salespackage.command.Sales; +import mineplex.staffServer.salespackage.salespackages.ApplyKits; import mineplex.staffServer.salespackage.salespackages.Coins; import mineplex.staffServer.salespackage.salespackages.GemHunter; import mineplex.staffServer.salespackage.salespackages.LifetimeHero; @@ -47,6 +48,7 @@ public class SalesPackageManager extends MiniPlugin AddSalesPackage(new LifetimeHero(this)); AddSalesPackage(new GemHunter(this, 4)); AddSalesPackage(new GemHunter(this, 8)); + AddSalesPackage(new ApplyKits(this)); } private void AddSalesPackage(SalesPackageBase salesPackage) @@ -57,8 +59,8 @@ public class SalesPackageManager extends MiniPlugin @Override public void AddCommands() { - AddCommand(new DisplayPackageCommand(this)); - AddCommand(new Sales(this)); + addCommand(new DisplayPackageCommand(this)); + addCommand(new Sales(this)); } public DonationManager getDonationManager() diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/BoosterCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/BoosterCommand.java index 492f78307..aaeee75a9 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/BoosterCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/BoosterCommand.java @@ -30,6 +30,6 @@ public class BoosterCommand extends CommandBase Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, uuid, "Gem Booster " + amount, false, 0, false); Plugin.getInventoryManager().addItemToInventoryForOffline(uuid.toString(), "Utility", "Gem Booster", amount); - caller.sendMessage(F.main(Plugin.GetName(), "Added " + amount + " boosters to " + playerName + "'s account!")); + caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " boosters to " + playerName + "'s account!")); } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/CoinCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/CoinCommand.java index 117db806c..8367ce2ae 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/CoinCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/CoinCommand.java @@ -29,6 +29,6 @@ public class CoinCommand extends CommandBase UUID uuid = UUIDFetcher.getUUIDOf(playerName); Plugin.getDonationManager().RewardCoins(null, caller.getName(), playerName, uuid, amount); - caller.sendMessage(F.main(Plugin.GetName(), "Added " + amount + " coins to " + playerName + "'s account!")); + caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " coins to " + playerName + "'s account!")); } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java index 00a277c64..76f257b67 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java @@ -35,6 +35,6 @@ public class GemHunterCommand extends CommandBase Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, uuid, "Gem Hunter Level " + amount, false, 0, false); Plugin.getStatsManager().incrementStat(uuid.toString(), "Global.GemsEarned", experience); - caller.sendMessage(F.main(Plugin.GetName(), "Added Level " + amount + " Gem Hunter to " + playerName + "'s account!")); + caller.sendMessage(F.main(Plugin.getName(), "Added Level " + amount + " Gem Hunter to " + playerName + "'s account!")); } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/RankCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/RankCommand.java index 70afd046b..bd155a57f 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/RankCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/RankCommand.java @@ -29,7 +29,7 @@ public class RankCommand extends CommandBase if (rankEnum == Rank.HERO || rankEnum == Rank.ULTRA) { Plugin.getClientManager().SaveRank(playerName, mineplex.core.common.Rank.valueOf(rank), perm); - caller.sendMessage(F.main(Plugin.GetName(), playerName + "'s rank has been updated to " + rank + "!")); + caller.sendMessage(F.main(Plugin.getName(), playerName + "'s rank has been updated to " + rank + "!")); } } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/Sales.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/Sales.java index 47bb4faf3..8d6a4be3a 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/Sales.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/Sales.java @@ -22,6 +22,7 @@ public class Sales extends MultiCommandBase AddCommand(new HeroCommand(plugin)); AddCommand(new LifetimeUltraCommand(plugin)); AddCommand(new LifetimeHeroCommand(plugin)); + AddCommand(new KitsCommand(plugin)); } @Override diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureChestCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureChestCommand.java index 939544ead..8f49792ae 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureChestCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureChestCommand.java @@ -30,6 +30,6 @@ public class TreasureChestCommand extends CommandBase Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, uuid, "Treasure Chest " + amount, false, 0, false); Plugin.getInventoryManager().addItemToInventoryForOffline(uuid.toString(), "Utility", "Treasure Chest", amount); - caller.sendMessage(F.main(Plugin.GetName(), "Added " + amount + " treasure chests to " + playerName + "'s account!")); + caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " treasure chests to " + playerName + "'s account!")); } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureKeyCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureKeyCommand.java index bbd479bd1..077b4fc28 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureKeyCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureKeyCommand.java @@ -30,6 +30,6 @@ public class TreasureKeyCommand extends CommandBase Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, uuid, "Treasure Key " + amount, false, 0, false); Plugin.getInventoryManager().addItemToInventoryForOffline(uuid.toString(), "Treasure", "Treasure Key", amount); - caller.sendMessage(F.main(Plugin.GetName(), "Added " + amount + " treasure Keys to " + playerName + "'s account!")); + caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " treasure Keys to " + playerName + "'s account!")); } } diff --git a/Website/LOC.Website.Common/Models/AccountAdministrator.cs b/Website/LOC.Website.Common/Models/AccountAdministrator.cs index a95d73dad..6ea1af528 100644 --- a/Website/LOC.Website.Common/Models/AccountAdministrator.cs +++ b/Website/LOC.Website.Common/Models/AccountAdministrator.cs @@ -568,6 +568,82 @@ } } + public void ApplyKits(String name) + { + using (var repository = _repositoryFactory.CreateRepository()) + { + var account = repository.Where(x => String.Equals(x.Name, name)).Include(x => x.Rank).FirstOrDefault(); + account.LoadNavigationProperties(repository.Context); + + addAccountTransaction(repository, account, "Bacon Brawl Bebe Piggles", 0, 0); + addAccountTransaction(repository, account, "Bacon Brawl `Pig`", 0, 0); + addAccountTransaction(repository, account, "A Barbarians Life Barbarian Archer", 0, 0); + addAccountTransaction(repository, account, "A Barbarians Life Bomber", 0, 0); + addAccountTransaction(repository, account, "The Bridges Archer", 0, 0); + addAccountTransaction(repository, account, "The Bridges Bomber", 0, 0); + addAccountTransaction(repository, account, "The Bridges Brawler", 0, 0); + addAccountTransaction(repository, account, "The Bridges Miner", 0, 0); + addAccountTransaction(repository, account, "Castle Siege Castle Assassin", 0, 0); + addAccountTransaction(repository, account, "Castle Siege Castle Brawler", 0, 0); + addAccountTransaction(repository, account, "Castle Siege Castle Knight", 0, 0); + addAccountTransaction(repository, account, "Castle Siege Undead Archer", 0, 0); + addAccountTransaction(repository, account, "Castle Siege Undead Zombie", 0, 0); + addAccountTransaction(repository, account, "Death Tag Runner Archer", 0, 0); + addAccountTransaction(repository, account, "Death Tag Runner Traitor", 0, 0); + addAccountTransaction(repository, account, "Dragon Escape Disruptor", 0, 0); + addAccountTransaction(repository, account, "Dragon Escape Warper", 0, 0); + addAccountTransaction(repository, account, "Dragons Marksman", 0, 0); + addAccountTransaction(repository, account, "Dragons Pyrotechnic", 0, 0); + addAccountTransaction(repository, account, "Block Hunt Instant Hider", 0, 0); + addAccountTransaction(repository, account, "Block Hunt Shocking Hider", 0, 0); + addAccountTransaction(repository, account, "Block Hunt Radar Hunter", 0, 0); + addAccountTransaction(repository, account, "Block Hunt TNT Hunter", 0, 0); + addAccountTransaction(repository, account, "Super Paintball Machine Gun", 0, 0); + addAccountTransaction(repository, account, "Super Paintball Shotgun", 0, 0); + addAccountTransaction(repository, account, "One in the Quiver Brawler", 0, 0); + addAccountTransaction(repository, account, "One in the Quiver Enchanter", 0, 0); + addAccountTransaction(repository, account, "Runner Archer", 0, 0); + addAccountTransaction(repository, account, "Runner Frosty", 0, 0); + addAccountTransaction(repository, account, "Sheep Quest Archer", 0, 0); + addAccountTransaction(repository, account, "Sheep Quest Brute", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Blaze", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Chicken", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Mad Cow", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Creeper", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Enderman", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Undead Knight", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Magma Cube", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Pig", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Skeletal Horse", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Sky Squid", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Snowman", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Witch", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Wither", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Wither Skeleton", 0, 0); + addAccountTransaction(repository, account, "Super Smash Mobs Wolf", 0, 0); + addAccountTransaction(repository, account, "Snake Super Snake", 0, 0); + addAccountTransaction(repository, account, "Snake Other Snake", 0, 0); + addAccountTransaction(repository, account, "Sneaky Assassins Ranged Assassin", 0, 0); + addAccountTransaction(repository, account, "Sneaky Assassins Revealer", 0, 0); + addAccountTransaction(repository, account, "Super Spleef Archer", 0, 0); + addAccountTransaction(repository, account, "Super Spleef Brawler", 0, 0); + addAccountTransaction(repository, account, "Squid Shooter Squid Blaster", 0, 0); + addAccountTransaction(repository, account, "Squid Shooter Squid Sniper", 0, 0); + addAccountTransaction(repository, account, "Survival Games Archer", 0, 0); + addAccountTransaction(repository, account, "Survival Games Assassin", 0, 0); + addAccountTransaction(repository, account, "Survival Games Beastmaster", 0, 0); + addAccountTransaction(repository, account, "Survival Games Bomber", 0, 0); + addAccountTransaction(repository, account, "Survival Games Brawler", 0, 0); + addAccountTransaction(repository, account, "Survival Games Necromancer", 0, 0); + addAccountTransaction(repository, account, "Turf Wars Infiltrator", 0, 0); + addAccountTransaction(repository, account, "Turf Wars Shredder", 0, 0); + addAccountTransaction(repository, account, "Zombie Survival Survivor Archer", 0, 0); + addAccountTransaction(repository, account, "Zombie Survival Survivor Rogue", 0, 0); + + repository.CommitChanges(); + } + } + public string UpdateRank(RankUpdateToken token) { Rank rank = null; diff --git a/Website/LOC.Website.Common/Models/IAccountAdministrator.cs b/Website/LOC.Website.Common/Models/IAccountAdministrator.cs index 9f1dfccd5..e798162b6 100644 --- a/Website/LOC.Website.Common/Models/IAccountAdministrator.cs +++ b/Website/LOC.Website.Common/Models/IAccountAdministrator.cs @@ -21,6 +21,7 @@ void ApplySalesPackage(SalesPackage salesPackage, int accountId, decimal gross, decimal fee); Account Login(LoginRequestToken loginToken); void Logout(string name); + void ApplyKits(string name); PunishmentResponse Punish(PunishToken punish); PunishmentResponse RemovePunishment(RemovePunishmentToken ban); diff --git a/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs b/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs index 6713bef16..820a8212a 100644 --- a/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs +++ b/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs @@ -82,6 +82,12 @@ _accountAdministrator.AddTask(token); } + [HttpPost] + public void ApplyKits(string name) + { + _accountAdministrator.ApplyKits(name); + } + [HttpPost] public void Logout(string name) { diff --git a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml index 23627865d..5ef6315c7 100644 --- a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml +++ b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml @@ -1,12 +1,12 @@  + - @@ -19,14 +19,17 @@ - + + + + @@ -40,16 +43,17 @@ - + - + + @@ -58,8 +62,7 @@ - - + @@ -70,23 +73,22 @@ - + + - + - - - + @@ -94,7 +96,7 @@ - + @@ -102,41 +104,44 @@ - - + - + - + + + - + + - + + - + @@ -150,51 +155,45 @@ - - - - + - - - + + - - + - + - - + - - + + @@ -203,72 +202,75 @@ - - + + - + - + - + - - + - + + - + + - + - + - - + + - + - - + + - - + + - + + + @@ -281,17 +283,13 @@ - - + - - - @@ -305,25 +303,26 @@ - + + - + - + @@ -334,28 +333,30 @@ - - + - + + + - + + @@ -363,43 +364,42 @@ + - + + - + - + - - - - + + - - - + + @@ -410,31 +410,34 @@ - + - + + + + + + - - - + + - @@ -442,29 +445,28 @@ - + - - + - + - + @@ -472,66 +474,66 @@ - - + + - + - - - - + + + - + - - + - - + + - - + + - + - - - - - + + + + + - + + + @@ -542,40 +544,39 @@ - + - + - - - + - + + + - @@ -584,9 +585,8 @@ - - + @@ -597,42 +597,44 @@ - - - + - - + + + + - + - + - + + + @@ -645,23 +647,22 @@ + - + - - - + @@ -672,62 +673,63 @@ - + - + + + + + + - - - - - + + + - - - + - + - - + + - - + + - + - + @@ -735,66 +737,66 @@ - + - + - + - - + - + - - + - - + + - - + + - + - - - - - + + + + + - + + + @@ -805,40 +807,39 @@ - + - + - - - + - + + + - @@ -847,9 +848,8 @@ - - + @@ -860,29 +860,29 @@ - - - + - - + + + + @@ -891,11 +891,13 @@ - + - + + + @@ -908,23 +910,22 @@ + - + - - - + @@ -935,62 +936,63 @@ - + - + + + + + + - - - + - - - + - + - - + + - - + + - + - + @@ -998,58 +1000,56 @@ - + - + - + - - + - + - - + - - + + - - + + - + - - - - - + + + + + - + \ No newline at end of file diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 8a659d60e7b77976795f40580fd30f0400c71794..8bfe187473081cf482bd444e3ab2a07dfeec48ba 100644 GIT binary patch delta 81 zcmZqpBh&ClW(5 gv^*uaQ|Ex7>g0v$!qW@XnFXdNNH8ibd&3q400