Merge pull request #9 from AzisabaNetwork/issues-8

Issues 8 - コマンドによって報酬を配布する際、確率を指定して抽選を行えるようにする

Author: aburaagetarou

multiserverreward/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.aburaagetarou</groupId>
     <artifactId>MultiServerReward</artifactId>
-    <version>1.0.2</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>MultiServerReward</name>
@@ -25,6 +25,9 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>

multiserverreward/src/main/java/com/github/aburaagetarou/command/MSRCommand.java

@@ -1,13 +1,16 @@
 package com.github.aburaagetarou.command;
 
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
+import com.github.aburaagetarou.MultiServerReward;
 import com.github.aburaagetarou.config.ConfigManager;
 import com.github.aburaagetarou.config.MSRConfig;
 import com.github.aburaagetarou.reward.config.category.killstreak.KillStreakLevelReward;
@@ -17,6 +20,7 @@
 import com.github.aburaagetarou.reward.config.category.match.MatchWinReward;
 import com.github.aburaagetarou.reward.config.type.IReward;
 import com.github.aburaagetarou.reward.config.type.RewardCommand;
+import com.github.aburaagetarou.reward.config.universal.UniversalRewardManager;
 import com.github.aburaagetarou.reward.manage.RewardManager;
 import com.github.aburaagetarou.util.MessageUtils;
 
@@ -27,8 +31,10 @@
 import co.aikar.commands.annotation.Default;
 import co.aikar.commands.annotation.Dependency;
 import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Flags;
 import co.aikar.commands.annotation.HelpCommand;
 import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 
 @CommandAlias("msr")
 @Description("MultiServerRewardのコマンド")
@@ -225,6 +231,65 @@ public void onMatchLose(Player player) {
         }
     }
 
+    @Subcommand("give")
+    @CommandPermission("msr.give")
+    @Description("指定テーブルの汎用報酬を配布します")
+    public void onGive(Player player, String key, @Flags("target") OnlinePlayer target, @Default("100") double argChance, @Default("true") boolean isOverLottery) {
+
+        // 登録されていないテーブルの場合は警告
+        if(!UniversalRewardManager.exists(key)) {
+            MultiServerReward.getInstance().getLogger().warning("コマンドで未定義の報酬テーブル[" + key + "]が指定されました。");
+            return;
+        }
+
+        // 報酬を取得
+        List<IReward> rewards = UniversalRewardManager.getReward(key).getRewards();
+
+        // 抽選
+        Random lottery = new SecureRandom();
+        double chance = (!isOverLottery ? Math.min(argChance, 100.0d) : argChance);
+        while(chance > 0.0d) {
+            double random = lottery.nextDouble() * 100.0d;
+            if(random <= chance) {
+                RewardManager.getManager(target.player).addRewards(rewards);
+            }
+            chance -= 100.0d;
+        }
+    }
+
+    @Subcommand("debug")
+    @CommandPermission("msr.debug")
+    @Description("開発者向け機能")
+    public class Debug extends BaseCommand {
+        
+        @Subcommand("give")
+        @CommandPermission("msr.debug.give")
+        @Description("指定テーブルの汎用報酬を配布します")
+        public void onGive(Player player, String key, @Flags("target") OnlinePlayer target, @Default("100") double argChance, @Default("true") boolean isOverLottery) {
+
+            // 登録されていないテーブルの場合は警告
+            if(!UniversalRewardManager.exists(key)) {
+                MessageUtils.sendColoredMessage(player, "&c未定義の報酬テーブルです。");
+                return;
+            }
+
+            // 報酬を取得
+            List<IReward> rewards = UniversalRewardManager.getReward(key).getRewards();
+
+            // 抽選
+            Random lottery = new SecureRandom();
+            double chance = (!isOverLottery ? Math.min(argChance, 100.0d) : argChance);
+            while(chance > 0.0d) {
+                double random = lottery.nextDouble() * 100.0d;
+                MessageUtils.sendColoredMessage(player, "random: " + random + " <= chance: " + chance);
+                if(random <= chance) {
+                    RewardManager.getManager(target.player).addRewards(rewards);
+                }
+                chance -= 100.0d;
+            }
+        }
+    }
+
     @Subcommand("reward")
     //@CommandPermission("msr.reward")
     @Description("報酬を受け取ります")

multiserverreward/src/main/java/com/github/aburaagetarou/config/ConfigManager.java

@@ -13,6 +13,7 @@
 import com.github.aburaagetarou.reward.config.category.match.MatchEndReward;
 import com.github.aburaagetarou.reward.config.category.match.MatchLoseReward;
 import com.github.aburaagetarou.reward.config.category.match.MatchWinReward;
+import com.github.aburaagetarou.reward.config.universal.UniversalRewardManager;
 import com.github.aburaagetarou.util.MessageUtils;
 
 /**
@@ -84,6 +85,7 @@ public static void reload(boolean observe) {
         MatchEndReward.loadAll();
         MatchWinReward.loadAll();
         MatchLoseReward.loadAll();
+        UniversalRewardManager.loadAll();
 
         MessageUtils.broadcastColoredMessage("&a&l設定の再読み込みが完了しました。");
         MessageUtils.broadcastColoredMessage("&a&lご協力ありがとうございました。");

multiserverreward/src/main/java/com/github/aburaagetarou/reward/config/category/RewardUtil.java

@@ -12,7 +12,6 @@
 import com.github.aburaagetarou.MultiServerReward;
 import com.github.aburaagetarou.config.MSRConfig;
 import com.github.aburaagetarou.reward.config.category.RewardTrigger;
-import com.github.aburaagetarou.reward.config.category.RewardUtil;
 import com.github.aburaagetarou.reward.config.type.IReward;
 
 /**
@@ -99,14 +98,14 @@ public static void loadAll() {
 
         // 通常報酬の読み込み
         AssistStreakLevelReward reward = new AssistStreakLevelReward();
-        allRewards.add(RewardUtil.loadKillStreakReward(reward, yml, null));
+        allRewards.add(KillStreakRewardBase.loadKillStreakReward(reward, yml, null));
 
         // 期間限定報酬の読み込み
         ConfigurationSection section = yml.getConfigurationSection("limited-time-streak");
         if(section != null) {
             for(String key : section.getKeys(false)) {
                 reward = new AssistStreakLevelReward();
-                allRewards.add(RewardUtil.loadKillStreakReward(reward, yml, "limited-time-streak." + key));
+                allRewards.add(KillStreakRewardBase.loadKillStreakReward(reward, yml, "limited-time-streak." + key));
             }
         }
     }

multiserverreward/src/main/java/com/github/aburaagetarou/reward/config/category/killstreak/AssistStreakLevelReward.java

@@ -12,7 +12,6 @@
 import com.github.aburaagetarou.MultiServerReward;
 import com.github.aburaagetarou.config.MSRConfig;
 import com.github.aburaagetarou.reward.config.category.RewardTrigger;
-import com.github.aburaagetarou.reward.config.category.RewardUtil;
 import com.github.aburaagetarou.reward.config.type.IReward;
 
 /**
@@ -88,14 +87,14 @@ public static void loadAll() {
 
         // 通常報酬の読み込み
         AssistStreakReward reward = new AssistStreakReward();
-        allRewards.add(RewardUtil.loadKillStreakReward(reward, yml, null));
+        allRewards.add(KillStreakRewardBase.loadKillStreakReward(reward, yml, null));
 
         // 期間限定報酬の読み込み
         ConfigurationSection section = yml.getConfigurationSection("limited-time-streak");
         if(section != null) {
             for(String key : section.getKeys(false)) {
                 reward = new AssistStreakReward();
-                allRewards.add(RewardUtil.loadKillStreakReward(reward, yml, "limited-time-streak." + key));
+                allRewards.add(KillStreakRewardBase.loadKillStreakReward(reward, yml, "limited-time-streak." + key));
             }
         }
     }

multiserverreward/src/main/java/com/github/aburaagetarou/reward/config/category/killstreak/AssistStreakReward.java

@@ -12,7 +12,6 @@
 import com.github.aburaagetarou.MultiServerReward;
 import com.github.aburaagetarou.config.MSRConfig;
 import com.github.aburaagetarou.reward.config.category.RewardTrigger;
-import com.github.aburaagetarou.reward.config.category.RewardUtil;
 import com.github.aburaagetarou.reward.config.type.IReward;
 
 /**
@@ -99,14 +98,14 @@ public static void loadAll() {
 
         // 通常報酬の読み込み
         KillStreakLevelReward reward = new KillStreakLevelReward();
-        allRewards.add(RewardUtil.loadKillStreakReward(reward, yml, null));
+        allRewards.add(KillStreakRewardBase.loadKillStreakReward(reward, yml, null));
 
         // 期間限定報酬の読み込み
         ConfigurationSection section = yml.getConfigurationSection("limited-time-streak");
         if(section != null) {
             for(String key : section.getKeys(false)) {
                 reward = new KillStreakLevelReward();
-                allRewards.add(RewardUtil.loadKillStreakReward(reward, yml, "limited-time-streak." + key));
+                allRewards.add(KillStreakRewardBase.loadKillStreakReward(reward, yml, "limited-time-streak." + key));
             }
         }
     }

multiserverreward/src/main/java/com/github/aburaagetarou/reward/config/category/killstreak/KillStreakLevelReward.java

@@ -12,7 +12,6 @@
 import com.github.aburaagetarou.MultiServerReward;
 import com.github.aburaagetarou.config.MSRConfig;
 import com.github.aburaagetarou.reward.config.category.RewardTrigger;
-import com.github.aburaagetarou.reward.config.category.RewardUtil;
 import com.github.aburaagetarou.reward.config.type.IReward;
 
 /**
@@ -88,14 +87,14 @@ public static void loadAll() {
 
         // 通常報酬の読み込み
         KillStreakReward reward = new KillStreakReward();
-        allRewards.add(RewardUtil.loadKillStreakReward(reward, yml, null));
+        allRewards.add(KillStreakRewardBase.loadKillStreakReward(reward, yml, null));
 
         // 期間限定報酬の読み込み
         ConfigurationSection section = yml.getConfigurationSection("limited-time-streak");
         if(section != null) {
             for(String key : section.getKeys(false)) {
                 reward = new KillStreakReward();
-                allRewards.add(RewardUtil.loadKillStreakReward(reward, yml, "limited-time-streak." + key));
+                allRewards.add(KillStreakRewardBase.loadKillStreakReward(reward, yml, "limited-time-streak." + key));
             }
         }
     }