build 1.0.2

iamtakagi-lab · May 21, 2020 · 94e4e1f · 94e4e1f
1 parent d06c624
commit 94e4e1f
Show file tree

Hide file tree

Showing 104 changed files with 36 additions and 16 deletions.
diff --git a/.gradle/5.2.1/executionHistory/executionHistory.bin b/.gradle/5.2.1/executionHistory/executionHistory.bin
diff --git a/.gradle/5.2.1/executionHistory/executionHistory.lock b/.gradle/5.2.1/executionHistory/executionHistory.lock
diff --git a/.gradle/5.2.1/fileHashes/fileHashes.bin b/.gradle/5.2.1/fileHashes/fileHashes.bin
diff --git a/.gradle/5.2.1/fileHashes/fileHashes.lock b/.gradle/5.2.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin'
 apply plugin: 'application'
 
 group 'me.notsmatch.teambot'
-version '1.0.1-SNAPSHOT'
+version '1.0.2-SNAPSHOT'
 mainClassName = "me.notsmatch.teambot.Main"
 
 repositories {

diff --git a/build/classes/kotlin/main/me/notsmatch/teambot/command/ChooseCommand.class b/build/classes/kotlin/main/me/notsmatch/teambot/command/ChooseCommand.class
diff --git a/build/classes/kotlin/main/me/notsmatch/teambot/command/TeamCommand.class b/build/classes/kotlin/main/me/notsmatch/teambot/command/TeamCommand.class
diff --git a/build/kotlin/compileKotlin/build-history.bin b/build/kotlin/compileKotlin/build-history.bin
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-18
-10
+31
+23
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s
@@ -0,0 +1 @@
+�C�.�*�!��
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/build/kotlin/compileKotlin/last-build.bin b/build/kotlin/compileKotlin/last-build.bin
diff --git a/build/kotlin/compileTestKotlin/build-history.bin b/build/kotlin/compileTestKotlin/build-history.bin
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
diff --git a/.../kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/.../kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
diff --git a/.../kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/.../kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/counters.tab
@@ -0,0 +1,2 @@
+17
+16
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i.len
diff --git a/build/kotlin/compileTestKotlin/last-build.bin b/build/kotlin/compileTestKotlin/last-build.bin
diff --git a/build/libs/mk8dx-teambot-1.0.2-SNAPSHOT.jar b/build/libs/mk8dx-teambot-1.0.2-SNAPSHOT.jar
diff --git a/build/tmp/fatJar/MANIFEST.MF b/build/tmp/fatJar/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 Implementation-Title: mk8dx-teambot
-Implementation-Version: 1.0.1-SNAPSHOT
+Implementation-Version: 1.0.2-SNAPSHOT
 Main-Class: me.notsmatch.teambot.Main
 
diff --git a/src/main/kotlin/me/notsmatch/teambot/command/TeamCommand.kt b/src/main/kotlin/me/notsmatch/teambot/command/TeamCommand.kt
@@ -8,20 +8,22 @@ import me.notsmatch.teambot.util.TeamUtils
 import net.dv8tion.jda.api.EmbedBuilder
 import org.apache.commons.lang3.StringUtils
 import java.awt.Color
+import kotlin.math.ceil
+import kotlin.math.round
 
 class TeamCommand : Command() {
 
     init {
         this.name = "t"
-        this.help = "チーム分けをします"
-        this.arguments = "<チーム数> <name1> <name2> <name3>..."
+        this.help = "チーム分けをします\nチーム形式\n2: 2v2\n3: 3v3\n4: 4v4\n5: 5v5\n6: 6v6"
+        this.arguments = "<チーム形式> <name1> <name2> <name3>..."
     }
 
     override fun execute(event: CommandEvent?) {
         event?.apply {
             val args = StringUtils.split(args)
 
-            var makeTeamSize: Int = 0
+            var teamType: Int = 0
             if (args.isNotEmpty()) {
 
                 if(!NumberUtils.isInteger(args[0])){
@@ -32,21 +34,33 @@ class TeamCommand : Command() {
                             null,
                             null
                         )
-                        setDescription("チーム数は1~6で指定してください\n``_t <チーム数> <name1> <name2> <name3>...``")
+                        setDescription("チーム形式は2~6で指定してください\n``_t <チーム形式> <name1> <name2> <name3>...``\n" +
+                                "チーム形式\n" +
+                                "2: 2v2\n" +
+                                "3: 3v3\n" +
+                                "4: 4v4\n" +
+                                "5: 5v5\n" +
+                                "6: 6v6")
                     }.build())
                 }
 
-                makeTeamSize = args[0].toInt()
+                teamType = args[0].toInt()
 
-                if(makeTeamSize > 6 || makeTeamSize < 1){
+                if(teamType > 6 || teamType < 2){
                     return reply(EmbedBuilder().apply {
                         setColor(Color.RED)
                         setAuthor(
                             "Error",
                             null,
                             null
                         )
-                        setDescription("チーム数は1~6で指定してください\n``_t <チーム数> <name1> <name2> <name3>...``")
+                        setDescription("チーム形式は2~6で指定してください\n``_t <チーム形式> <name1> <name2> <name3>...``\n" +
+                                "チーム形式\n" +
+                                "2: 2v2\n" +
+                                "3: 3v3\n" +
+                                "4: 4v4\n" +
+                                "5: 5v5\n" +
+                                "6: 6v6")
                     }.build())
                 }
             }
@@ -73,20 +87,23 @@ class TeamCommand : Command() {
                 }.build())
             }
 
-            // 格納用
+
+            val makeTeamSize = (players.size + teamType - 1 ) / teamType
+
             val teams = TeamUtils.compose(players, makeTeamSize)
 
             //結果出力
             reply(EmbedBuilder().apply {
                 setColor(Color.YELLOW)
                 setAuthor(
-                    "チーム分け結果",
+                    "チーム分け結果" + "(" + teamType + "v" + teamType + ")",
                     null,
                     null
                 )
-                for(i in teams.indices){
-                    val team = teams[i]
-                    addField(AlphabetUtils.getAlphabet(i).toUpperCase() + " (" + team.size + ")", team.toString().replace("[", "").replace("]", ""), true);
+                var i = 0
+                teams.filter { team -> team.isNotEmpty() }.forEach{ team ->
+                    addField(AlphabetUtils.getAlphabet(i).toUpperCase() + " (" + team.size + ")", team.toString().replace("[", "").replace("]", ""), true)
+                    i++
                 }
             }.build())
         }