Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KabanFriends/fueoni_in_minecraft
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.0
Choose a base ref
...
head repository: KabanFriends/fueoni_in_minecraft
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 1,084 additions and 659 deletions.
  1. +165 −0 LICENSE
  2. +42 −17 README.md
  3. +16 −0 data/fueoni/advancements/item/ender_eye.json
  4. +7 −0 data/fueoni/advancements/root.json
  5. +16 −0 data/fueoni/advancements/spawn_egg/game_settings.json
  6. +16 −0 data/fueoni/advancements/spawn_egg/set_lobby.json
  7. +30 −0 data/fueoni/advancements/spawn_egg/start_game.json
  8. +4 −0 data/fueoni/functions/admin.mcfunction
  9. +1 −1 data/fueoni/functions/bossbar/add_bossbar.mcfunction
  10. +7 −0 data/fueoni/functions/entity/iterate_random_tp.mcfunction
  11. +8 −258 data/fueoni/functions/entity/random_tp.mcfunction
  12. +6 −0 data/fueoni/functions/entity/tplobby.mcfunction
  13. +10 −0 data/fueoni/functions/game/add_item/arrow.mcfunction
  14. +10 −0 data/fueoni/functions/game/add_item/eye.mcfunction
  15. +10 −0 data/fueoni/functions/game/add_item/invis.mcfunction
  16. +10 −0 data/fueoni/functions/game/add_item/speed.mcfunction
  17. +14 −0 data/fueoni/functions/game/default_settings.mcfunction
  18. +7 −0 data/fueoni/functions/game/end_game.mcfunction
  19. +47 −0 data/fueoni/functions/game/gamemodes/1_validate.mcfunction
  20. +62 −0 data/fueoni/functions/game/gamemodes/2_pre_oni_select.mcfunction
  21. +48 −0 data/fueoni/functions/game/gamemodes/3_oni_waiting.mcfunction
  22. +124 −0 data/fueoni/functions/game/gamemodes/4_game_main.mcfunction
  23. +16 −0 data/fueoni/functions/game/gamemodes/5_ending.mcfunction
  24. +23 −0 data/fueoni/functions/game/generate_random.mcfunction
  25. +10 −0 data/fueoni/functions/game/iterate_select_oni.mcfunction
  26. +25 −0 data/fueoni/functions/game/prepare.mcfunction
  27. +1 −1 data/fueoni/functions/{ → game}/reset.mcfunction
  28. +20 −0 data/fueoni/functions/game/spawn_item.mcfunction
  29. +11 −0 data/fueoni/functions/game/start.mcfunction
  30. +3 −6 data/fueoni/functions/init.mcfunction
  31. +9 −3 data/fueoni/functions/load.mcfunction
  32. +0 −11 data/fueoni/functions/lobby/tpentity.mcfunction
  33. +89 −291 data/fueoni/functions/main.mcfunction
  34. +12 −12 data/fueoni/functions/player/admin.mcfunction
  35. +9 −0 data/fueoni/functions/player/check/arrow_projectile/run_check.mcfunction
  36. +5 −0 data/fueoni/functions/player/check/arrow_projectile/start.mcfunction
  37. +10 −0 data/fueoni/functions/player/check/dropped_item/run_check.mcfunction
  38. +5 −0 data/fueoni/functions/player/check/dropped_item/start.mcfunction
  39. +45 −0 data/fueoni/functions/player/game_settings.mcfunction
  40. +8 −0 data/fueoni/functions/player/give_see_through.mcfunction
  41. +1 −1 data/fueoni/functions/player/join.mcfunction
  42. +1 −1 data/fueoni/functions/player/quit.mcfunction
  43. +2 −1 data/fueoni/functions/player/remove_tags.mcfunction
  44. +5 −3 data/fueoni/functions/player/tplobby.mcfunction
  45. +5 −3 data/fueoni/functions/player/tplobby_all.mcfunction
  46. +10 −0 data/fueoni/functions/random/init.mcfunction
  47. +16 −0 data/fueoni/functions/random/uniform.mcfunction
  48. +7 −4 data/fueoni/functions/score/add_objectives.mcfunction
  49. +2 −0 data/fueoni/functions/score/remove_game_objectives.mcfunction
  50. +5 −2 data/fueoni/functions/score/remove_objectives.mcfunction
  51. +0 −7 data/fueoni/functions/start.mcfunction
  52. +16 −0 data/fueoni/functions/team/add_teams.mcfunction
  53. +6 −0 data/fueoni/functions/team/remove_teams.mcfunction
  54. +27 −0 data/fueoni/functions/world/get_world_height.mcfunction
  55. +6 −0 data/fueoni/functions/world/iterate_down.mcfunction
  56. +6 −0 data/fueoni/functions/world/iterate_up.mcfunction
  57. +0 −17 data/fueoni/loot_tables/fo_rng_itemtype.json
  58. +0 −17 data/fueoni/loot_tables/fo_rng_spawntimer.json
  59. +1 −1 data/fueoni/tags/blocks/fo_nonsolid.json
  60. +1 −1 data/fueoni/tags/blocks/fo_nonsolid_liquid.json
  61. +5 −0 data/minecraft/tags/worldgen/structure/eye_of_ender_located.json
  62. +1 −1 pack.mcmeta
  63. BIN pack.png
165 changes: 165 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.


This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.

"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".

The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:

a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license
document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:

a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.

c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.

1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
59 changes: 42 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,50 @@
# 増え鬼 in Minecraft
使用可能なMnecraftのバージョン: __1.14.4__
使用可能なMnecraftのバージョン: **1.14~1.19.4**
**(次項の注意事項を必ず読んでください)**

**増え鬼 in Minecraft**は、好きなMinecraftのワールドで「増え鬼」ゲームが遊べるデータパックです。
通常の「増え鬼」のルールの他、プレイヤーが集めることができるアイテムがあります。

## 導入時の注意
「増え鬼 in Minecraft」は、Minecraft: Java Edition専用です。このデータパックを導入する際、Minecraftのバージョンとデータバックのバージョンに注意してください。

データパックとMinecraftのバージョン対応表:
| Minecraft | 増え鬼データパック |
----|----
| 1.19.4 | [ver2.1.0](https://github.com/KabanFriends/fueoni_in_minecraft/releases/tag/2.1.0) |
| 1.19~1.19.3 | [ver2.0.0](https://github.com/KabanFriends/fueoni_in_minecraft/releases/tag/2.0.0) |
| 1.18~1.18.2 | [ver1.2.0](https://github.com/KabanFriends/fueoni_in_minecraft/releases/tag/1.2.0) |
| 1.17~1.17.1 | [ver1.1.0](https://github.com/KabanFriends/fueoni_in_minecraft/releases/tag/1.1.0) |
| 1.14~1.16.5 | [ver1.0.1](https://github.com/KabanFriends/fueoni_in_minecraft/releases/tag/1.0.1) |

## ゲームのルール
### 基本的なルール
ゲームが開始すると、1人のプレイヤーが「鬼」として選ばれ、その他のプレイヤーは「逃走者」となります。
(開始前に「鬼」になるプレイヤーの抽選時間が15秒間あり、「鬼」が選ばれた後には「逃走者」が逃げる時間が15秒間あります)
ゲームが開始すると、1人または複数人のプレイヤーが「鬼」として選ばれ、その他のプレイヤーは「逃走者」となります。
(開始前に鬼になるプレイヤーの抽選時間が15秒間あり、鬼が選ばれた後には逃走者が逃げる時間が数秒間あります)

- **「鬼」のプレイヤー**は、マップ内にいる「逃走者」を倒して捕まえる役職です**すべての「逃走者」が捕まった場合**「鬼」の勝利となります
- **「逃走者」のプレイヤー**は、ゲームの制限時間の間、「鬼」から逃げる役職です**1人以上のプレイヤーが制限時間内に「鬼」に捕まらなかった場合**「逃走者」の勝利となります
- **鬼のプレイヤー**は、マップ内にいる逃走者を倒して捕まえる役職です**すべての逃走者が捕まった場合**鬼の勝利となります
- **逃走者のプレイヤー**は、ゲームの制限時間の間、鬼から逃げる役職です**1人以上のプレイヤーが制限時間内に鬼に捕まらなかった場合**逃走者の勝利となります

また、「鬼」に捕まえられた「逃走者」は、役職が「鬼」に変わります
また、「鬼」に捕まえられた逃走者は、役職が鬼に変わります

### 特殊なルール
ゲームのマップ内の一部の箇所に、**アイテム**が出現します。アイテムは全4種類あり、「逃走者」のみがアイテムを使用できます
ゲームのマップ内の一部の箇所に、**アイテム**が出現します。アイテムは全4種類あり、逃走者のみがアイテムを使用できます

- **「透視の目」** → 使用してから10秒間、すべての「鬼」が発光し、位置を確認することができます。
- **「透視の目」** → 使用してから10秒間、すべての鬼が発光し、位置を確認することができます。
- **「スピードポーション」** → 使用してから30秒間、使用者の移動速度が上昇します。
- **「透明化ポーション」** → 使用してから20秒間、使用者が透明になり、「鬼」から姿が見えなくなります
- **「透明化ポーション」** → 使用してから20秒間、使用者が透明になり、鬼から姿が見えなくなります
(「逃走者」からは透明のプレイヤーの姿が見えます)
- **「鬼退治の弓矢」** → 矢が「鬼」に当たると、その「鬼」はゲームの開始地点まで戻されます。
- **「鬼退治の弓矢」** → 矢が鬼に当たると、その鬼は強制的に進行方向の逆を向き、その後数秒間、視界が悪くなり、移動速度が低下します。

### ゲーム設定
管理者は、ゲームの設定を変更することができます。

設定可能な項目:
- 各逃走者用アイテムがそれぞれ出現するかどうか
- ゲーム開始時に抽選される鬼の人数
- 鬼の抽選後、鬼が解放されるまでの秒数
- ゲームが自動的に終了するまでの時間
- ゲーム終了後、プレイヤーをロビーに移動させるかどうか

## ダウンロード
[releasesページ](https://github.com/KabanFriends/fueoni_in_minecraft/releases)からこのデータパックをダウンロードすることができます。
@@ -31,25 +54,27 @@
1. 上記のリンクからzipファイルをダウンロードする
1. 増え鬼で遊びたいワールドのフォルダを開き、その中のdatapacksフォルダを開く
1. zipファイルを展開せずに、2で開いたフォルダの中に入れる
1. ワールドに入り、/reloadコマンドを実行する (Bukkit/Spigotサーバーの場合は/minecraft:reload)
1. ワールドに入り、コマンド **/reload** を実行する (Bukkit/Spigotサーバーの場合は */minecraft:reload* )

### 管理者用アイテムの入手方法
ゲームを始めるには、管理者が「**管理者用アイテム**」を使用する必要があります。
また、管理者用アイテムを入手する手段は2種類あります
管理者用アイテムを入手する手段は以下の2つです

#### 手段1
1. コマンド **/function fueoni:player/admin** を実行する
1. コマンド **/function fueoni:admin** を実行する
1. データパックが正常に導入できていれば、自動で管理者用アイテムが渡されます

#### 手段2
1. コマンドブロックを1個用意する (/give @s command_block)
1. 金床で、コマンドブロックに「*fueoni*」(全て小文字)という名前をつける
1. 金床で、コマンドブロックに「**fueoni**」(全て小文字)という名前をつける
1. インベントリに名前を付けたコマンドブロックを入れる
1. データパックが正常に導入できていれば、自動で管理者用アイテムが渡されます

## 利用について
動画や配信等で使用する際は、極力このページへのリンクを掲載してください。
リンクを掲載していただいた場合には、このゲームの使用は自由となります。
## 使用について
- 「増え鬼 in Minecraft」を、動画の撮影や配信を伴わないで使用する場合は、このゲームを自由に使用・改変することができます。
- 動画や配信等で使用する際は、このページへのリンクを掲載してください。
リンクを掲載していただいた場合には、このゲームの使用・改変は自由に行うことができます。
- 「増え鬼 in Minecraft」を改変したデータパックを配布する場合、配布するウェブサイト等に、このページへのリンクを掲載し、改変を行ったことを明記してください。

## 制作情報
製作者: **KabanFriends** (Discord: *KabanFriends#7721*)
16 changes: 16 additions & 0 deletions data/fueoni/advancements/item/ender_eye.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"parent": "fueoni:root",
"criteria": {
"use_ender_eye": {
"trigger": "minecraft:using_item",
"conditions": {
"item": {
"items": [
"minecraft:ender_eye"
],
"nbt": "{display:{Name:'{\"translate\":\"fueoni.item.see_through.name\",\"fallback\":\"透視の目\",\"color\":\"#B3E159\",\"bold\":true,\"italic\":false}'}}"
}
}
}
}
}
7 changes: 7 additions & 0 deletions data/fueoni/advancements/root.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"criteria": {
"root": {
"trigger": "minecraft:impossible"
}
}
}
16 changes: 16 additions & 0 deletions data/fueoni/advancements/spawn_egg/game_settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"parent": "fueoni:root",
"criteria": {
"use_spawn_egg": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"item": {
"items": [
"minecraft:squid_spawn_egg"
],
"nbt": "{EntityTag:{id:\"minecraft:armor_stand\",Tags:[\"foGameSettings\"]}}"
}
}
}
}
}
16 changes: 16 additions & 0 deletions data/fueoni/advancements/spawn_egg/set_lobby.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"parent": "fueoni:root",
"criteria": {
"use_spawn_egg": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"item": {
"items": [
"minecraft:llama_spawn_egg"
],
"nbt": "{EntityTag:{id:\"minecraft:armor_stand\",Tags:[\"foSetLobby\"]}}"
}
}
}
}
}
30 changes: 30 additions & 0 deletions data/fueoni/advancements/spawn_egg/start_game.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"parent": "fueoni:root",
"criteria": {
"use_spawn_egg": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"item": {
"items": [
"minecraft:creeper_spawn_egg"
],
"nbt": "{EntityTag:{id:\"minecraft:armor_stand\",Tags:[\"foStart\"]}}"
}
}
},
"use_spawn_egg_all": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"item": {
"items": [
"minecraft:parrot_spawn_egg"
],
"nbt": "{EntityTag:{id:\"minecraft:armor_stand\",Tags:[\"foStartAllPlayers\"]}}"
}
}
}
},
"requirements": [
["use_spawn_egg", "use_spawn_egg_all"]
]
}
4 changes: 4 additions & 0 deletions data/fueoni/functions/admin.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Function file for "FUEONI in Minecraft"
#Made by KabanFriends

function fueoni:player/admin
2 changes: 1 addition & 1 deletion data/fueoni/functions/bossbar/add_bossbar.mcfunction
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Function file for "FUEONI in Minecraft"
#Made by KabanFriends

bossbar add fo_ingame [{"text":"残り時間: ","color":"red"},{"text":"00:00","color":"gold","bold":"true"}]
bossbar add fo_ingame [{"translate":"fueoni.bossbar.title","fallback":"残り時間: %1$s","color":"red","with":[{"text":"00:00","color":"gold","bold":true}]}]
bossbar set fo_ingame color red
bossbar set fo_ingame style notched_10
7 changes: 7 additions & 0 deletions data/fueoni/functions/entity/iterate_random_tp.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#Function file for "FUEONI in Minecraft"
#Made by KabanFriends

scoreboard players remove tp_y foGameData 1
execute store result entity @s Pos[1] double 1 run scoreboard players get tp_y foGameData
execute if score tp_y foGameData > min_y foGameData at @s if block ~ ~1 ~ #fueoni:fo_nonsolid if block ~ ~ ~ #fueoni:fo_nonsolid unless block ~ ~-1 ~ #fueoni:fo_nonsolid_liquid run summon marker ~ ~ ~ {Tags:["foTPTarget","foGameEntity"]}
execute if score tp_y foGameData > min_y foGameData at @s run function fueoni:entity/iterate_random_tp
Loading