[Fixed] Adding item

KizahashiLuca · Aug 3, 2020 · 7bdb41c · 7bdb41c
1 parent 5bc9cdd
commit 7bdb41c
Show file tree

Hide file tree

Showing 297 changed files with 776 additions and 735 deletions.
diff --git a/data/mwj/functions/onload.mcfunction b/data/mwj/functions/onload.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Change gamerules always
@@ -13,7 +13,7 @@ gamerule doMobSpawning false
 
 ## Send Title Message
 tellraw @a ["",{"text":"\n----------------------------------","color":"white"}]
-tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2","color":"red","bold":true}]
+tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2.1","color":"red","bold":true}]
 tellraw @a ["",{"text":"  - Thank you for Downloading","color":"white"}]
 tellraw @a ["",{"text":"----------------------------------","color":"white"}]
 tellraw @a ["",{"text":"  ゲームの詳しいルールなどは、","color":"white"},{"text":"こちら","bold":true,"color":"blue","underlined":true,"clickEvent":{"action":"open_url","value":"https://github.com/KizahashiLuca/minecraft_werewolf_light_japanese/wiki"}},{"text":"\n","color":"white"}]

diff --git a/data/mwj/functions/ontick.mcfunction b/data/mwj/functions/ontick.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Login with en route

diff --git a/data/mwj/functions/start.mcfunction b/data/mwj/functions/start.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Detect Gamemode

diff --git a/data/mwj/functions/stop.mcfunction b/data/mwj/functions/stop.mcfunction
@@ -3,12 +3,12 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Quit the game
 execute if score #MWL Phase matches 0..100 run tellraw @a ["",{"text":"\n----------------------------------","color":"white"}]
-execute if score #MWL Phase matches 0..100 run tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2","color":"red","bold":true}]
+execute if score #MWL Phase matches 0..100 run tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2.1","color":"red","bold":true}]
 execute if score #MWL Phase matches 0..100 run tellraw @a ["",{"text":"                    ","color":"white"},{"text":"Aborted","color":"red","bold":true}]
 execute if score #MWL Phase matches 0..100 run tellraw @a ["",{"text":"----------------------------------","color":"white"}]
 execute if score #MWL Phase matches 0..100 run tellraw @a ["",{"text":"  ゲームが中断されました。","color":"white"}]

diff --git a/data/mwj/functions/system/en_route.mcfunction b/data/mwj/functions/system/en_route.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Leave midtime of preparation

diff --git a/data/mwj/functions/system/finish/decide_winner/decide_winner_extinction.mcfunction b/data/mwj/functions/system/finish/decide_winner/decide_winner_extinction.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Winner is Nobody

diff --git a/data/mwj/functions/system/finish/decide_winner/decide_winner_main.mcfunction b/data/mwj/functions/system/finish/decide_winner/decide_winner_main.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 execute if score #MWL GameMode matches 1 run function mwj:system/finish/decide_winner/decide_winner_wolf_prior

diff --git a/data/mwj/functions/system/finish/decide_winner/decide_winner_two_r_alive.mcfunction b/data/mwj/functions/system/finish/decide_winner/decide_winner_two_r_alive.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Winner is Nobody

diff --git a/data/mwj/functions/system/finish/decide_winner/decide_winner_wolf_prior.mcfunction b/data/mwj/functions/system/finish/decide_winner/decide_winner_wolf_prior.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Winner is Nobody

diff --git a/data/mwj/functions/system/finish/end_game.mcfunction b/data/mwj/functions/system/finish/end_game.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Send a Display of Breakdown of Roles
@@ -29,7 +29,7 @@ tellraw @a ["",{"text":"\n    ","color":"white"},{"text":"生 存 者","color":"
 
 ## Send a Thief Log
 scoreboard players set #MWL TempVariable 5
-scoreboard players set #MWL STEAL_NUM 1
+scoreboard players set #MWL NumberOfStolen 1
 execute if score #MWL NumOfThieves matches 1.. run tellraw @a ["",{"text":"----------------------------------","color":"white"}]
 execute if score #MWL NumOfThieves matches 1.. run tellraw @a ["",{"text":"  怪盗記録","color":"white"}]
 execute if score #MWL NumOfThieves matches 1.. run function mwj:system/finish/thief_log
@@ -39,8 +39,8 @@ tellraw @a ["",{"text":"----------------------------------","color":"white"}]
 
 ## Send a Kill Log
 tellraw @a ["",{"text":"  死亡記録","color":"white"}]
-scoreboard players operation #MWL KILLER_NUM = #MWL KILLLOG_NUM
-scoreboard players set #MWL KILLLOG_NUM 1
+scoreboard players operation #MWL CountOfKiller = #MWL NumberOfKillLog
+scoreboard players set #MWL NumberOfKillLog 1
 scoreboard players set #MWL TempVariable 5
 scoreboard players operation #MWL Tick *= #MWL TempVariable
 

diff --git a/data/mwj/functions/system/finish/error_game_player.mcfunction b/data/mwj/functions/system/finish/error_game_player.mcfunction
@@ -3,12 +3,12 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Send a Message
 tellraw @a ["",{"text":"\n----------------------------------","color":"white"}]
-tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2","color":"red","bold":true}]
+tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2.1","color":"red","bold":true}]
 tellraw @a ["",{"text":"  - Minecraft version 1.","color":"green","bold":true},{"score":{"name":"#MWL","objective":"Version"},"color":"green","bold":true}]
 tellraw @a ["",{"text":" ","color":"white"},{"text":"Error","color":"yellow","bold":true}]
 tellraw @a ["",{"text":"----------------------------------","color":"white"}]

diff --git a/data/mwj/functions/system/finish/error_game_version.mcfunction b/data/mwj/functions/system/finish/error_game_version.mcfunction
@@ -3,12 +3,12 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Send a Message
 tellraw @a ["",{"text":"\n----------------------------------","color":"white"}]
-tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2","color":"red","bold":true}]
+tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2.1","color":"red","bold":true}]
 tellraw @a ["",{"text":"  - Minecraft version 1.","color":"green","bold":true},{"score":{"name":"#MWL","objective":"Version"},"color":"green","bold":true}]
 tellraw @a ["",{"text":" ","color":"white"},{"text":"Error","color":"yellow","bold":true}]
 tellraw @a ["",{"text":"----------------------------------","color":"white"}]

diff --git a/data/mwj/functions/system/finish/exit_game.mcfunction b/data/mwj/functions/system/finish/exit_game.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Send a Common Message

diff --git a/data/mwj/functions/system/finish/finish_game_title.mcfunction b/data/mwj/functions/system/finish/finish_game_title.mcfunction
@@ -3,12 +3,12 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Title
 tellraw @a ["",{"text":"\n----------------------------------","color":"white"}]
-tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2","color":"red","bold":true}]
+tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2.1","color":"red","bold":true}]
 tellraw @a ["",{"text":"  - Minecraft version 1.","color":"green","bold":true},{"score":{"name":"#MWL","objective":"Version"},"color":"green","bold":true}]
 tellraw @a ["",{"text":" ","color":"white"},{"text":"Game Finished","color":"green","bold":true}]
 tellraw @a ["",{"text":"----------------------------------","color":"white"}]
diff --git a/data/mwj/functions/system/finish/kill_log.mcfunction b/data/mwj/functions/system/finish/kill_log.mcfunction
@@ -3,37 +3,37 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Find Killer
-execute as @a[team=Player] if score @s VICTIM = #MWL KILLLOG_NUM run scoreboard players set @s VICTIM_FLAG 1
-execute as @a[team=Player] if score @s NUM = @p[scores={VICTIM_FLAG=1}] KILLER run scoreboard players set @s KILLER_FLAG 1
+execute as @a[team=Player] if score @s NumberOfVictim = #MWL NumberOfKillLog run scoreboard players set @s FlagOfVictim 1
+execute as @a[team=Player] if score @s NUM = @p[scores={FlagOfVictim=1}] NumberOfKiller run scoreboard players set @s FlagOfKiller 1
 
-scoreboard players operation @p[scores={VICTIM_FLAG=1}] Tick *= #MWL TempVariable
+scoreboard players operation @p[scores={FlagOfVictim=1}] Tick *= #MWL TempVariable
 
 ## 1000 sec. -
-execute as @p[scores={VICTIM_FLAG=1,Second=1000..,Tick=0..5}] if entity @p[scores={KILLER_FLAG=1}] run tellraw @a ["",{"text":"    ","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".0","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={KILLER_FLAG=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
-execute as @p[scores={VICTIM_FLAG=1,Second=1000..,Tick=6..}] if entity @p[scores={KILLER_FLAG=1}] run tellraw @a ["",{"text":"    ","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={KILLER_FLAG=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
+execute as @p[scores={FlagOfVictim=1,Second=1000..,Tick=0..5}] if entity @p[scores={FlagOfKiller=1}] run tellraw @a ["",{"text":"    ","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".0","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={FlagOfKiller=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
+execute as @p[scores={FlagOfVictim=1,Second=1000..,Tick=6..}] if entity @p[scores={FlagOfKiller=1}] run tellraw @a ["",{"text":"    ","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={FlagOfKiller=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
 
 ## 100 sec. - 999 sec.
-execute as @p[scores={VICTIM_FLAG=1,Second=100..999,Tick=0..5}] if entity @p[scores={KILLER_FLAG=1}] run tellraw @a ["",{"text":"    0","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".0","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={KILLER_FLAG=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
-execute as @p[scores={VICTIM_FLAG=1,Second=100..999,Tick=6..}] if entity @p[scores={KILLER_FLAG=1}] run tellraw @a ["",{"text":"    0","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={KILLER_FLAG=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
+execute as @p[scores={FlagOfVictim=1,Second=100..999,Tick=0..5}] if entity @p[scores={FlagOfKiller=1}] run tellraw @a ["",{"text":"    0","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".0","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={FlagOfKiller=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
+execute as @p[scores={FlagOfVictim=1,Second=100..999,Tick=6..}] if entity @p[scores={FlagOfKiller=1}] run tellraw @a ["",{"text":"    0","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={FlagOfKiller=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
 
 ## 10 sec. - 99 sec.
-execute as @p[scores={VICTIM_FLAG=1,Second=10..99,Tick=0..5}] if entity @p[scores={KILLER_FLAG=1}] run tellraw @a ["",{"text":"    00","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".0","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={KILLER_FLAG=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
-execute as @p[scores={VICTIM_FLAG=1,Second=10..99,Tick=6..}] if entity @p[scores={KILLER_FLAG=1}] run tellraw @a ["",{"text":"    00","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={KILLER_FLAG=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
+execute as @p[scores={FlagOfVictim=1,Second=10..99,Tick=0..5}] if entity @p[scores={FlagOfKiller=1}] run tellraw @a ["",{"text":"    00","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".0","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={FlagOfKiller=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
+execute as @p[scores={FlagOfVictim=1,Second=10..99,Tick=6..}] if entity @p[scores={FlagOfKiller=1}] run tellraw @a ["",{"text":"    00","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={FlagOfKiller=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
 
 ## 0 sec. - 9.sec.
-execute as @p[scores={VICTIM_FLAG=1,Second=1..9,Tick=0..5}] if entity @p[scores={KILLER_FLAG=1}] run tellraw @a ["",{"text":"    000","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".0","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={KILLER_FLAG=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
-execute as @p[scores={VICTIM_FLAG=1,Second=1..9,Tick=6..}] if entity @p[scores={KILLER_FLAG=1}] run tellraw @a ["",{"text":"    000","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={KILLER_FLAG=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
+execute as @p[scores={FlagOfVictim=1,Second=1..9,Tick=0..5}] if entity @p[scores={FlagOfKiller=1}] run tellraw @a ["",{"text":"    000","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".0","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={FlagOfKiller=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
+execute as @p[scores={FlagOfVictim=1,Second=1..9,Tick=6..}] if entity @p[scores={FlagOfKiller=1}] run tellraw @a ["",{"text":"    000","color":"white"},{"score":{"name":"@s","objective":"Second"},"color":"white"},{"text":".","color":"white"},{"score":{"name":"@s","objective":"Tick"},"color":"white"},{"text":" sec.  :  ","color":"white"},{"selector":"@p[scores={FlagOfKiller=1}]","color":"red"},{"text":" --> ","color":"white"},{"selector":"@s","color":"green"}]
 
 ## Increment Kill Number by 1
-scoreboard players add #MWL KILLLOG_NUM 1
+scoreboard players add #MWL NumberOfKillLog 1
 
 ## Reset a Flag
-scoreboard players set @a VICTIM_FLAG 0
-scoreboard players set @a KILLER_FLAG 0
+scoreboard players reset @a FlagOfVictim
+scoreboard players reset @a FlagOfKiller
 
 ## Loop
-execute if score #MWL KILLLOG_NUM < #MWL KILLER_NUM run function mwj:system/finish/kill_log
+execute if score #MWL NumberOfKillLog < #MWL CountOfKiller run function mwj:system/finish/kill_log
diff --git a/data/mwj/functions/system/finish/reject_game.mcfunction b/data/mwj/functions/system/finish/reject_game.mcfunction
@@ -3,12 +3,12 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Send a Message
 tellraw @a ["",{"text":"\n----------------------------------","color":"white"}]
-tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2","color":"red","bold":true}]
+tellraw @a ["",{"text":"Minecraft Werewolf Light v.1.2.1","color":"red","bold":true}]
 tellraw @a ["",{"text":"  - Minecraft version 1.","color":"green","bold":true},{"score":{"name":"#MWL","objective":"Version"},"color":"green","bold":true}]
 tellraw @a ["",{"text":" ","color":"white"},{"text":"Error","color":"yellow","bold":true}]
 tellraw @a ["",{"text":"----------------------------------","color":"white"}]

diff --git a/data/mwj/functions/system/finish/remove_bossbars.mcfunction b/data/mwj/functions/system/finish/remove_bossbars.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Remove bossbar

diff --git a/data/mwj/functions/system/finish/remove_entities.mcfunction b/data/mwj/functions/system/finish/remove_entities.mcfunction
@@ -3,7 +3,7 @@
 ## Minecraft Werewolf Light
 ## Author : KizahashiLuca
 ## Date   : 03 Aug 2020
-## Version: v.1.2
+## Version: v.1.2.1
 ###############################
 
 ## Kill entities