From 4f695d1baa1b2600b432e9bf53dac14b964d8f1f Mon Sep 17 00:00:00 2001 From: Ponpon Date: Fri, 7 Nov 2025 12:48:38 +0900 Subject: [PATCH] =?UTF-8?q?NO-ISSUE=20Delete=20entity=E7=A9=BA=E9=96=93?= =?UTF-8?q?=E3=81=AE=E6=97=A7=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/entity/advancements/item_frames.json | 72 ------------------- .../functions/arrow_reflection.mcfunction | 11 --- data/entity/functions/check_freeze.mcfunction | 10 --- data/entity/functions/cooldown.mcfunction | 18 ----- data/entity/functions/count/.mcfunction | 14 ---- data/entity/functions/count/loop.mcfunction | 10 --- .../functions/garbage_collection.mcfunction | 10 --- data/entity/functions/in_ground.mcfunction | 33 --------- .../functions/initialize_entity.mcfunction | 55 -------------- .../initialize_projectile.mcfunction | 17 ----- .../item_frame_destroy/detach.mcfunction | 3 - .../item_frame_destroy/item_frames.mcfunction | 9 --- .../item_frame_destroy/search.mcfunction | 13 ---- data/entity/functions/kill_child.mcfunction | 3 - data/entity/functions/loot/.mcfunction | 9 --- data/entity/functions/loot/loop.mcfunction | 14 ---- data/entity/functions/loot/loot/.mcfunction | 21 ------ .../functions/loot/loot/loot_table.mcfunction | 7 -- .../entity/functions/mob_death/act.mcfunction | 13 ---- .../functions/mob_death/check.mcfunction | 12 ---- .../functions/projectile_hit/.mcfunction | 24 ------- .../functions/projectile_hit/enemy.mcfunction | 10 --- .../projectile_hit/friendly.mcfunction | 18 ----- data/entity/functions/suffocation.mcfunction | 7 -- .../unique_floor/custom_floor.mcfunction | 6 -- .../unique_floor/damage_floor.mcfunction | 10 --- .../unique_floor/death_floor/death.mcfunction | 7 -- .../unique_floor/death_floor/tick.mcfunction | 12 ---- .../unique_floor/drop_floor.mcfunction | 11 --- .../functions/unique_floor/fork.mcfunction | 18 ----- .../unique_floor/moving_walkway.mcfunction | 9 --- data/entity/tags/blocks/unique_floors.json | 10 --- 32 files changed, 496 deletions(-) delete mode 100644 data/entity/advancements/item_frames.json delete mode 100644 data/entity/functions/arrow_reflection.mcfunction delete mode 100644 data/entity/functions/check_freeze.mcfunction delete mode 100644 data/entity/functions/cooldown.mcfunction delete mode 100644 data/entity/functions/count/.mcfunction delete mode 100644 data/entity/functions/count/loop.mcfunction delete mode 100644 data/entity/functions/garbage_collection.mcfunction delete mode 100644 data/entity/functions/in_ground.mcfunction delete mode 100644 data/entity/functions/initialize_entity.mcfunction delete mode 100644 data/entity/functions/initialize_projectile.mcfunction delete mode 100644 data/entity/functions/item_frame_destroy/detach.mcfunction delete mode 100644 data/entity/functions/item_frame_destroy/item_frames.mcfunction delete mode 100644 data/entity/functions/item_frame_destroy/search.mcfunction delete mode 100644 data/entity/functions/kill_child.mcfunction delete mode 100644 data/entity/functions/loot/.mcfunction delete mode 100644 data/entity/functions/loot/loop.mcfunction delete mode 100644 data/entity/functions/loot/loot/.mcfunction delete mode 100644 data/entity/functions/loot/loot/loot_table.mcfunction delete mode 100644 data/entity/functions/mob_death/act.mcfunction delete mode 100644 data/entity/functions/mob_death/check.mcfunction delete mode 100644 data/entity/functions/projectile_hit/.mcfunction delete mode 100644 data/entity/functions/projectile_hit/enemy.mcfunction delete mode 100644 data/entity/functions/projectile_hit/friendly.mcfunction delete mode 100644 data/entity/functions/suffocation.mcfunction delete mode 100644 data/entity/functions/unique_floor/custom_floor.mcfunction delete mode 100644 data/entity/functions/unique_floor/damage_floor.mcfunction delete mode 100644 data/entity/functions/unique_floor/death_floor/death.mcfunction delete mode 100644 data/entity/functions/unique_floor/death_floor/tick.mcfunction delete mode 100644 data/entity/functions/unique_floor/drop_floor.mcfunction delete mode 100644 data/entity/functions/unique_floor/fork.mcfunction delete mode 100644 data/entity/functions/unique_floor/moving_walkway.mcfunction delete mode 100644 data/entity/tags/blocks/unique_floors.json diff --git a/data/entity/advancements/item_frames.json b/data/entity/advancements/item_frames.json deleted file mode 100644 index 4c863ca0ca..0000000000 --- a/data/entity/advancements/item_frames.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "criteria": { - "item_frame": { - "trigger": "minecraft:player_interacted_with_entity", - "conditions": { - "entity": { - "type": "item_frame" - }, - "player": [ - { - "condition": "entity_properties", - "entity": "this", - "predicate": { - "flags": { - "is_sneaking": true - } - } - }, - { - "condition": "inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type_specific": { - "type": "player", - "gamemode": "adventure" - } - } - } - } - ] - } - }, - "glow_item_frame": { - "trigger": "minecraft:player_interacted_with_entity", - "conditions": { - "entity": { - "type": "glow_item_frame" - }, - "player": [ - { - "condition": "entity_properties", - "entity": "this", - "predicate": { - "flags": { - "is_sneaking": true - } - } - }, - { - "condition": "inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type_specific": { - "type": "player", - "gamemode": "adventure" - } - } - } - } - ] - } - } - }, - "requirements":[["item_frame","glow_item_frame"]], - "rewards": { - "function": "entity:item_frame_destroy/item_frames" - } -} \ No newline at end of file diff --git a/data/entity/functions/arrow_reflection.mcfunction b/data/entity/functions/arrow_reflection.mcfunction deleted file mode 100644 index 261f15cffb..0000000000 --- a/data/entity/functions/arrow_reflection.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -############################## -### 矢の反射削除処理 -############################## - -#1tick前のRotationと一致しなければ削除 -execute unless score @s ArrowRotation matches -2147483648.. store result score @s ArrowRotation run data get entity @s Rotation[0] -scoreboard players operation _ ArrowRotation = @s ArrowRotation -execute store result score @s ArrowRotation run data get entity @s Rotation[0] - -execute unless score _ ArrowRotation = @s ArrowRotation run tag @s add Garbage -execute unless score _ ArrowRotation = @s[tag=HasSkillDisplay] ArrowRotation on passengers run kill @s[tag=SkillDisplay] diff --git a/data/entity/functions/check_freeze.mcfunction b/data/entity/functions/check_freeze.mcfunction deleted file mode 100644 index 6521dc962a..0000000000 --- a/data/entity/functions/check_freeze.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -############################## -### 投射物等が凍結しているかチェック -############################## - -###PortalCooldownの値が1秒前と変化していなければ、凍結していると判断して消す -execute store result score _ Calc run data get entity @s PortalCooldown -execute if score @s ProjectileLife = _ Calc unless score _ Calc matches 0 run tag @s add Garbage -execute if score @s ProjectileLife = _ Calc if score _ Calc matches 0 if entity @s[tag=HasSkillDisplay] on passengers run kill @s[tag=SkillDisplay] -execute if score @s ProjectileLife = _ Calc if score _ Calc matches 0 run function entity:cooldown -execute store result score @s ProjectileLife run data get entity @s PortalCooldown \ No newline at end of file diff --git a/data/entity/functions/cooldown.mcfunction b/data/entity/functions/cooldown.mcfunction deleted file mode 100644 index 3c1ced2682..0000000000 --- a/data/entity/functions/cooldown.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -############################## -### PortalCooldown0トリガー -############################## - -###死亡処理 -tag @s add Garbage - -###CallOnTimeOut -execute if entity @s[tag=CallOnTimeOut] run function enemy:ai/call/trigger/time - -###ダークスワンプ処理 -execute if entity @s[tag=DarkSwamp] run function skill:act/black_mage/dark_swamp/tick - -###ブラストスパーク炸裂 -execute if entity @s[tag=BlastSpark] run function skill:act/hunter/blast_spark/explode - -###ワイルドフレア拡散処理 -execute if entity @s[tag=WildFlareSeed] run function skill:act/hunter/wild_flare/explode diff --git a/data/entity/functions/count/.mcfunction b/data/entity/functions/count/.mcfunction deleted file mode 100644 index c06d0ffc91..0000000000 --- a/data/entity/functions/count/.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> entity:count/ -# -# エンティティ数をカウントし、一定数以上であればGarbage付与をする -# -# @within function main:tick - -# エンティティ数カウント - execute store result score _ _ if entity @e[tag=Mob,tag=!Garbage] - -# エンティティが一定数以上であればGarbageループ処理 -# 201体以上に設定 - scoreboard players remove _ _ 200 - execute if score _ _ matches 0.. run function entity:count/loop - diff --git a/data/entity/functions/count/loop.mcfunction b/data/entity/functions/count/loop.mcfunction deleted file mode 100644 index e40fc36631..0000000000 --- a/data/entity/functions/count/loop.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> entity:count/loop -# -# Garbage付与 ループ処理 -# -# @within function entity:count/ - -# 生まれた順にGarbage付与 - tag @e[tag=Mob,tag=!Boss,tag=!Garbage,limit=1] add Garbage - scoreboard players remove _ _ 1 - execute if score _ _ matches 0.. run function entity:count/loop \ No newline at end of file diff --git a/data/entity/functions/garbage_collection.mcfunction b/data/entity/functions/garbage_collection.mcfunction deleted file mode 100644 index 731cd7c945..0000000000 --- a/data/entity/functions/garbage_collection.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -############################## -### エンティティ削除 -############################## - -execute if entity @s[tag=CallOnDeath] at @s run function enemy:ai/call/trigger/death -execute if entity @s[tag=Parent] run function entity:kill_child -execute if entity @s[tag=Garbage,tag=LifeScouter] on passengers if entity @s[tag=LifeScouterText] run kill @s -data merge entity @s[tag=Garbage] {Health:0f,Size:0,DeathTime:19s,HandItems:[{},{}],ArmorItems:[{},{},{},{}],Owner:[I;0,0,0,0]} -data remove entity @s[tag=Garbage] CustomName -kill @s[tag=Garbage] diff --git a/data/entity/functions/in_ground.mcfunction b/data/entity/functions/in_ground.mcfunction deleted file mode 100644 index d09a9ef9e0..0000000000 --- a/data/entity/functions/in_ground.mcfunction +++ /dev/null @@ -1,33 +0,0 @@ -############################## -### inGroundトリガー -############################## - -tag @s remove FlyingRequired -tag @s remove TickingRequired -scoreboard players remove @s[tag=NativeTask,tag=!BlastSpark] NativeFlag 1 -tag @s remove NativeTask - -###水流設置処理 -#execute if entity @s[tag=FlowingWater] run function entity:block_placer/flowing_water -###溶岩流設置処理 -#execute if entity @s[tag=FlowingLava] run function entity:block_placer/flowing_lava -###蜘蛛の巣設置処理 -#execute if entity @s[tag=Cobweb] run function entity:block_placer/cobweb -###炎設置処理 -#execute if entity @s[tag=Fire] run function entity:block_placer/fire -###松明設置処理 -#execute if entity @s[tag=Torch] run function entity:block_placer/torch -###羊毛設置処理 -#execute if entity @s[tag=Wool] run function entity:block_placer/wool -###氷設置処理 -#execute if entity @s[tag=Ice] run function entity:block_placer/ice - -###ワイルドフレア処理 -execute if entity @s[tag=WildFlareSeed] run kill @s -###ぽむぽむ花火処理 -execute if entity @s[tag=PomPom] run function skill:act/summoner/pompom/block - -tag @s[tag=KillInGround] add Garbage -execute if entity @s[tag=HasSkillDisplay] on passengers run kill @s[tag=SkillDisplay] - -kill @s[type=minecraft:trident,tag=!BlastSpark] diff --git a/data/entity/functions/initialize_entity.mcfunction b/data/entity/functions/initialize_entity.mcfunction deleted file mode 100644 index 9e71d897c7..0000000000 --- a/data/entity/functions/initialize_entity.mcfunction +++ /dev/null @@ -1,55 +0,0 @@ -################################################### -# エンティティが生成されたら呼び出され -# エンティティの初期化処理を行う -################################################### - -### 自然湧き処理 -execute if entity @s[type=#entity:natural_spawn,tag=] run function enemy:natural_spawn_type - -### モブ召喚 -execute if entity @s[tag=Spawn] run function enemy:spawn/ - -### モブステータス適用 -execute unless entity @s[tag=DelayedData] run data remove entity @s TicksFrozen -execute if entity @s[tag=DelayedData] run function enemy:spawn/apply_status/ - -### プレイヤー初期化 -execute if entity @s[type=player] run function player:initialized - -### 飛翔物属性付与 -execute unless entity @s[type=!#entity:projectiles,tag=!DamageProjectile] run function entity:initialize_projectile - -### Item to Spawn -execute if data entity @s[type=item] Item.tag.SpawnEntities run function enemy:spawn/item_to_spawn - -### NeverRemain削除 -kill @s[type=minecraft:item,nbt={Item:{tag:{NeverRemain:true}}}] - -#TNTを即時起爆 -data modify entity @s[type=tnt] fuse set value 0s - -#クリーパー爆発のAEC削除 -kill @s[type=area_effect_cloud,nbt={Radius:2.5f,RadiusOnUse:-0.5f,RadiusPerTick:-0.008333334f}] - -#ゾンビ増援制御 -attribute @s[type=zombie] zombie.spawn_reinforcements base set 0.0 -data remove entity @s[type=zombie] Attributes[{Name:"minecraft:zombie.spawn_reinforcements"}].Modifiers - -#自然湧きシュルカー・エンダーマイト・シルバーフィッシュ削除 -tag @s[type=#entity:enemy,tag=] add Garbage - -#額縁を無敵に -data modify entity @s[type=item_frame] Invulnerable set value 1b -data modify entity @s[type=glow_item_frame] Invulnerable set value 1b - -#SmartMotion E (反発係数) -execute unless score @s[tag=SmartMotion] sm.E matches -2147483648..2147483647 run scoreboard players set @s sm.E 100 - -#NativeFlag スコア付与 それぞれのタグで付与を独立させる -scoreboard players add @s[tag=DamageProjectile] NativeFlag 1 -scoreboard players add @s[tag=SmartMotion] NativeFlag 1 -scoreboard players add @s[tag=NativeTask] NativeFlag 1 -scoreboard players add @s[tag=Mutated] NativeFlag 1 - -### 初期化済みタグ付与 -tag @s add Initialized diff --git a/data/entity/functions/initialize_projectile.mcfunction b/data/entity/functions/initialize_projectile.mcfunction deleted file mode 100644 index f73d7ac999..0000000000 --- a/data/entity/functions/initialize_projectile.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -### 飛翔物属性付与 -tag @s[tag=!Cargo] add TickingRequired -tag @s add FlyingRequired -data modify entity @s[nbt={PortalCooldown:0}] PortalCooldown set value 200 - -### 矢のダメージ設定 -execute if entity @s[type=#minecraft:arrows,nbt={pickup:0b}] unless score @s Attack matches 1.. store result entity @s damage double 1 run scoreboard players get @e[tag=Mob,limit=1,sort=nearest,distance=..3] Attack -data modify entity @s[type=#minecraft:arrows,nbt={pickup:0b,damage:0d}] damage set value 2d - -### 雪玉系のダメージ設定 -#微小なダメージを与えて描画を直す -execute if entity @s[type=#entity:non_damage_projectiles,tag=DelayedData] run damage @s 0.001 - -### CallOnAttack設定 -tag @s[tag=CallOnAttack] add CallOnAttackProjectile -execute if entity @e[tag=Mob,tag=CallOnAttack,distance=..3,limit=1,sort=nearest] run tag @s add CallOnAttackProjectile -data modify entity @s[tag=CallOnAttackProjectile] Owner set from entity @e[tag=Mob,tag=CallOnAttack,limit=1,sort=nearest,distance=..3] UUID diff --git a/data/entity/functions/item_frame_destroy/detach.mcfunction b/data/entity/functions/item_frame_destroy/detach.mcfunction deleted file mode 100644 index ead2ac4525..0000000000 --- a/data/entity/functions/item_frame_destroy/detach.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -summon item ~ ~ ~ {Item:{id:"stick",Count:1b,tag:{CustomModelData:1}},Motion:[0d,0.2d,0d]} -data modify entity @e[type=item,distance=0,limit=1] Item set from entity @s Item -item replace entity @s container.0 with air \ No newline at end of file diff --git a/data/entity/functions/item_frame_destroy/item_frames.mcfunction b/data/entity/functions/item_frame_destroy/item_frames.mcfunction deleted file mode 100644 index 83d8af48f1..0000000000 --- a/data/entity/functions/item_frame_destroy/item_frames.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> entity:item_frame_destroy/item_frames - -# 探索距離7ブロック - scoreboard players set _ _ 70 - -# 視線先のスポナーを探索 - execute anchored eyes positioned ^ ^ ^ run function entity:item_frame_destroy/search - -advancement revoke @s only entity:item_frames \ No newline at end of file diff --git a/data/entity/functions/item_frame_destroy/search.mcfunction b/data/entity/functions/item_frame_destroy/search.mcfunction deleted file mode 100644 index 0f62c021e4..0000000000 --- a/data/entity/functions/item_frame_destroy/search.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> entity:item_frame_destroy/search - -#視線先のスポナーを探索 -scoreboard players remove _ _ 1 -execute if score _ _ matches 1.. unless entity @e[type=#entity:item_frames,distance=..0.25,sort=nearest,limit=1] positioned ^ ^ ^0.1 run function entity:item_frame_destroy/search - -# アイテムが飾られていなければ額縁を撤去 -execute if entity @s[advancements={entity:item_frames={item_frame=true}}] as @e[type=#entity:item_frames,distance=..0.25,sort=nearest,limit=1] unless data entity @s Item run summon item ~ ~ ~ {Item:{id:"item_frame",Count:1b},Motion:[0d,0.2d,0d]} -execute if entity @s[advancements={entity:item_frames={glow_item_frame=true}}] as @e[type=#entity:item_frames,distance=..0.25,sort=nearest,limit=1] unless data entity @s Item run summon item ~ ~ ~ {Item:{id:"glow_item_frame",Count:1b},Motion:[0d,0.2d,0d]} -execute as @e[type=#entity:item_frames,distance=..0.25,sort=nearest,limit=1] unless data entity @s Item run kill @s - -# アイテムが飾られていれば飾られているアイテムを排出 -execute as @e[type=#entity:item_frames,distance=..0.25,sort=nearest,limit=1] if data entity @s Item at @s positioned ^ ^ ^0.1 run function entity:item_frame_destroy/detach \ No newline at end of file diff --git a/data/entity/functions/kill_child.mcfunction b/data/entity/functions/kill_child.mcfunction deleted file mode 100644 index 1882d33a06..0000000000 --- a/data/entity/functions/kill_child.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -scoreboard players operation * ParentID -= @s OhMyDatID -tag @e[scores={ParentID=0}] add Garbage -scoreboard players operation * ParentID += @s OhMyDatID diff --git a/data/entity/functions/loot/.mcfunction b/data/entity/functions/loot/.mcfunction deleted file mode 100644 index 3c8382cf91..0000000000 --- a/data/entity/functions/loot/.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -############################## -### エンティティ ルートドロップ -############################## - -#初期化 -scoreboard players set @s Calc 10000 -function #oh_my_dat:please -data modify storage item: LootTableList set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4]."ステータス".LootTable -function entity:loot/loop diff --git a/data/entity/functions/loot/loop.mcfunction b/data/entity/functions/loot/loop.mcfunction deleted file mode 100644 index db4f759b74..0000000000 --- a/data/entity/functions/loot/loop.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -############################## -### エンティティ ルートドロップ -############################## - -#リストから1つ取得 -data modify storage item: LootTable set from storage item: LootTableList[-1] -#確率を判定 -execute store result score _ Calc run function calc:random -scoreboard players operation _ Calc %= @s Calc -execute store result score @s _ run data get storage item: LootTable.Chance 10000 -execute if score _ Calc < @s _ run function entity:loot/loot/ -#ループ -data remove storage item: LootTableList[-1] -execute if data storage item: LootTableList[-1] run function entity:loot/loop diff --git a/data/entity/functions/loot/loot/.mcfunction b/data/entity/functions/loot/loot/.mcfunction deleted file mode 100644 index f8c53b775f..0000000000 --- a/data/entity/functions/loot/loot/.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -############################## -### エンティティ ルートドロップ -############################## - -#個数を設定 上限99個 ルートテーブルの個数は上書きされる -execute store result score _ _ run data get storage item: LootTable.CountRange -scoreboard players add _ _ 1 -scoreboard players operation _ Calc %= _ _ -execute store result score @s _ run data get storage item: LootTable.Count -scoreboard players operation _ Calc += @s _ -#loot_table ループ -execute if data storage item: LootTable.Loot if score _ Calc matches 1.. run data modify entity 0-0-0-0-3 DeathLootTable set from storage item: LootTable.Loot -execute if data storage item: LootTable.Loot if score _ Calc matches 1.. run function entity:loot/loot/loot_table -#item -execute if data storage item: LootTable.Item if score _ Calc matches 1.. run loot spawn ~ ~ ~ loot minecraft:blocks/acacia_button -execute if data storage item: LootTable.Item if score _ Calc matches 1.. run data modify entity @e[type=item,tag=,distance=0,limit=1] Item merge from storage item: LootTable.Item -execute if data storage item: LootTable.Item as @e[type=item,tag=,distance=0] store result entity @s Item.Count byte 1 run scoreboard players get _ Calc - -#初期化回避 -execute as @e[type=item,tag=,distance=0] if data entity @s Item.tag.SpawnEntities run function enemy:spawn/item_to_spawn -tag @e[type=item,tag=,distance=0] add Initialized diff --git a/data/entity/functions/loot/loot/loot_table.mcfunction b/data/entity/functions/loot/loot/loot_table.mcfunction deleted file mode 100644 index a4837eff52..0000000000 --- a/data/entity/functions/loot/loot/loot_table.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -############################## -### エンティティ ルートドロップ -############################## - -loot spawn ~ ~ ~ kill 0-0-0-0-3 -scoreboard players remove _ Calc 1 -execute if score _ Calc matches 1.. run function entity:loot/loot/loot_table diff --git a/data/entity/functions/mob_death/act.mcfunction b/data/entity/functions/mob_death/act.mcfunction deleted file mode 100644 index ec0b8bcfa3..0000000000 --- a/data/entity/functions/mob_death/act.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -############################## -### エンティティ死亡時処理 -############################## - - -# 忍者スキル - 介錯 -execute if entity @s[scores={Kaishaku=1..},tag=!KaishakuExplosion] run function skill:act/ninja/kaishaku/explode -# ワイルドクッキング -execute if entity @s[scores={WildCooking=1..}] run function skill:act/hunter/wild_cooking/cook -# ルートテーブルドロップ -execute if entity @s[tag=HasLootTable] run function entity:loot/ -# バースト増加 -execute if entity @s[tag=Enemy,tag=!NonBurst] unless score $World Burst matches -1 run function skill:burst/add diff --git a/data/entity/functions/mob_death/check.mcfunction b/data/entity/functions/mob_death/check.mcfunction deleted file mode 100644 index 2fba8d7561..0000000000 --- a/data/entity/functions/mob_death/check.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -############################## -### エンティティ死亡チェック -############################## - -tag @s add Garbage - -#ダメージ表示 -execute if entity @s[scores={StoredDamage=-2147483648..}] run function enemy:show_damage/ - -execute if entity @s[tag=HasRaise] run function skill:enemy/reraise/death_cancel - -execute if entity @s[tag=Garbage] run function entity:mob_death/act \ No newline at end of file diff --git a/data/entity/functions/projectile_hit/.mcfunction b/data/entity/functions/projectile_hit/.mcfunction deleted file mode 100644 index 641e771484..0000000000 --- a/data/entity/functions/projectile_hit/.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -############################## -### 雪玉ヒット検知 -############################## - -#1tick後のPosを計算 -function calc:geometry/tp_00000 -execute store result score _ Calc run data get entity @s Pos[0] 100 -execute store result score _ _ run data get entity @s Motion[0] 100 -execute store result entity 0-0-0-0-0 Pos[0] double 0.01 run scoreboard players operation _ Calc += _ _ -execute store result score _ Calc run data get entity @s Pos[1] 100 -execute store result score _ _ run data get entity @s Motion[1] 100 -execute store result entity 0-0-0-0-0 Pos[1] double 0.01 run scoreboard players operation _ Calc += _ _ -execute store result score _ Calc run data get entity @s Pos[2] 100 -execute store result score _ _ run data get entity @s Motion[2] 100 -execute store result entity 0-0-0-0-0 Pos[2] double 0.01 run scoreboard players operation _ Calc += _ _ - -tag @s add NonTarget -#tag=FriendlyProjectile: Enemyにダメージ -execute if entity @s[tag=FriendlyProjectile] at 0-0-0-0-0 positioned ~-0.5 ~-0.5 ~-0.5 as @e[tag=Enemy,tag=!NonTarget,scores={ProjectileTime=0..},dx=0,dy=0,dz=0,limit=1,sort=nearest] run function entity:projectile_hit/enemy -#tag=EnemyProjectile: Playerにダメージ -execute if entity @s[tag=EnemyProjectile] at 0-0-0-0-0 positioned ~-0.5 ~-0.5 ~-0.5 as @e[predicate=entity:friendly,tag=!NonTarget,scores={ProjectileTime=0..},dx=0,dy=0,dz=0,limit=1,sort=nearest] run function entity:projectile_hit/friendly -tag @s remove NonTarget - -execute as 0-0-0-0-0 run function calc:geometry/return_marker diff --git a/data/entity/functions/projectile_hit/enemy.mcfunction b/data/entity/functions/projectile_hit/enemy.mcfunction deleted file mode 100644 index a03aee9e2c..0000000000 --- a/data/entity/functions/projectile_hit/enemy.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#ダメージ -execute as @e[tag=FriendlyProjectile,distance=..3,limit=1,sort=nearest] run function #oh_my_dat:please -data remove storage skill: damage -data modify storage skill: damage set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].AI.ProjectileDamage -execute if data storage skill: damage run function skill:damage/add/skill/normal -execute if data storage skill: damage run function skill:damage/apply/ -#CallOnAttack -execute if entity @e[tag=FriendlyProjectile,tag=CallOnAttackProjectile,distance=..3,limit=1,sort=nearest] at @s run function enemy:ai/call/trigger/attack/projectile -#無敵時間を設定 -scoreboard players set @s ProjectileTime -10 diff --git a/data/entity/functions/projectile_hit/friendly.mcfunction b/data/entity/functions/projectile_hit/friendly.mcfunction deleted file mode 100644 index 1e1dfde0ff..0000000000 --- a/data/entity/functions/projectile_hit/friendly.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#ダメージ -execute as @e[tag=EnemyProjectile,distance=..3,limit=1,sort=nearest] run function #oh_my_dat:please -data modify storage mob_data: MobName set from entity @e[tag=EnemyProjectile,distance=..3,limit=1,sort=nearest] CustomName -data modify storage score_damage: Argument set value {DamageType:[Global,Projectile]} -data modify storage score_damage: Argument.DeathCause set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4]."ステータス".DeathCause -execute store result score _ Damage store result storage score_damage: Argument.Damage double 1 run scoreboard players get @e[tag=EnemyProjectile,distance=..3,limit=1,sort=nearest] Attack -execute if entity @s[type=player] unless data storage score_damage: Argument{Damage:0} run function score_damage:api/attack -execute if entity @s[type=!player] unless data storage score_damage: Argument{Damage:0} run data modify storage skill: damage.hit set value 1b -execute if entity @s[type=!player] unless data storage score_damage: Argument{Damage:0} run function skill:damage/apply/physical -tag @s[type=!player] add HitDamageTaken -#CallOnAttack -execute if entity @e[tag=EnemyProjectile,tag=CallOnAttackProjectile,distance=..3,limit=1,sort=nearest] at @s run function enemy:ai/call/trigger/attack/projectile -#演出 -execute if entity @s[nbt=!{Health:0.0f}] run function makeup:enemy/projectile_hit -#無敵時間を設定 -scoreboard players set @s ProjectileTime -10 -#被ダメージトリガー -execute if entity @s[type=!player] run function player:trigger/damage_taken diff --git a/data/entity/functions/suffocation.mcfunction b/data/entity/functions/suffocation.mcfunction deleted file mode 100644 index 079ba21944..0000000000 --- a/data/entity/functions/suffocation.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ - -### めり込み死亡処理 - -gamerule showDeathMessages false -kill @s -tellraw @a [{"translate":"%1$sは いきを とめて ぶろっくの なかを のぞきこんだ。\n… からだが！！ うごかない！！\nそして、 いき たえてしまった…。","with":[{"selector":"@s"}]}] -gamerule showDeathMessages true diff --git a/data/entity/functions/unique_floor/custom_floor.mcfunction b/data/entity/functions/unique_floor/custom_floor.mcfunction deleted file mode 100644 index f6480efd55..0000000000 --- a/data/entity/functions/unique_floor/custom_floor.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ - -### カスタム床処理 -# execute if data block ~ ~ ~ {TrackOutput:true} を条件に付けることで、単発実行になる -execute store result storage tusb_player: _ long 1 run time query gametime -execute store result block ~ ~-2 ~ TrackOutput byte 1 run data modify storage tusb_player: _ set from block ~ ~-2 ~ LastExecution -clone ~ ~-2 ~ ~ ~-2 ~ ~ ~-2 ~ filtered command_block force diff --git a/data/entity/functions/unique_floor/damage_floor.mcfunction b/data/entity/functions/unique_floor/damage_floor.mcfunction deleted file mode 100644 index 6cdc430a2d..0000000000 --- a/data/entity/functions/unique_floor/damage_floor.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ - -### ダメージ床処理 - -execute if score @s Age matches 1.. run effect give @s minecraft:instant_damage 1 2 - -### 死亡時メッセージ -# function player:trigger/death に移行 - -function makeup:entity/unique_floor/damage_floor - diff --git a/data/entity/functions/unique_floor/death_floor/death.mcfunction b/data/entity/functions/unique_floor/death_floor/death.mcfunction deleted file mode 100644 index 3f1a24768c..0000000000 --- a/data/entity/functions/unique_floor/death_floor/death.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ - -### 即死床 死亡処理 - -gamerule showDeathMessages false -kill @s -tellraw @a [{"translate":"あ・・・ああっ！ みるみるうちに のろいが %1$sのからだを しんしょくしていく。\nああっ %1$sは・・・。こうきしんの だいしょうを いのちで はらうことに なってしまった・・・。","with":[{"selector":"@s"}]}] -gamerule showDeathMessages true diff --git a/data/entity/functions/unique_floor/death_floor/tick.mcfunction b/data/entity/functions/unique_floor/death_floor/tick.mcfunction deleted file mode 100644 index 952941d77f..0000000000 --- a/data/entity/functions/unique_floor/death_floor/tick.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ - -### 即死床処理 - -execute store result score _ _ run time query gametime - -scoreboard players operation _ _ -= @s GameTime -#死亡処理 マジックシールドで無効化 -execute if score _ _ matches 40..59 unless score @s MagicShield matches 1.. run function entity:unique_floor/death_floor/death -execute if score _ _ matches 40..59 if score @s MagicShield matches 1000.. run function skill:act/black_mage/magic_shield/activate -execute if score _ _ matches 60.. run scoreboard players operation @s GameTime += _ _ - -function makeup:entity/unique_floor/death_floor/tick diff --git a/data/entity/functions/unique_floor/drop_floor.mcfunction b/data/entity/functions/unique_floor/drop_floor.mcfunction deleted file mode 100644 index ea1db102f4..0000000000 --- a/data/entity/functions/unique_floor/drop_floor.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -### 落とし床処理 - -scoreboard players set _ _ 0 -execute if block ~ ~-4 ~ #block:no_collision if block ~ ~-5 ~ #block:no_collision run scoreboard players add _ _ 1 -execute if block ~ ~-3 ~ minecraft:warped_wart_block run scoreboard players add _ _ 1 -execute if block ~ ~-1 ~ #block:unbreakable run scoreboard players set _ _ 0 -execute if block ~ ~-3 ~ #block:unbreakable run scoreboard players set _ _ 0 - -execute if score _ _ matches 1.. unless block ~ ~-3 ~ minecraft:warped_wart_block align xz positioned ~0.5 ~ ~0.5 run tp @s ~ ~-5 ~ -execute if score _ _ matches 1.. unless block ~ ~-3 ~ minecraft:warped_wart_block at @s run function makeup:entity/unique_floor/drop_floor -execute if score _ _ matches 1.. if block ~ ~-3 ~ minecraft:warped_wart_block positioned ~ ~-1 ~ run function entity:unique_floor/drop_floor \ No newline at end of file diff --git a/data/entity/functions/unique_floor/fork.mcfunction b/data/entity/functions/unique_floor/fork.mcfunction deleted file mode 100644 index ea4930f7c1..0000000000 --- a/data/entity/functions/unique_floor/fork.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ - -### 特殊床 分岐 - - -### 即死床 -execute if block ~ ~-2 ~ minecraft:smooth_red_sandstone if score @s Age matches 1.. run function entity:unique_floor/death_floor/tick - -### ダメージ床 -execute if block ~ ~-2 ~ minecraft:nether_wart_block if entity @s[nbt={OnGround:true}] run function entity:unique_floor/damage_floor - -### 移動床 -execute if block ~ ~-2 ~ minecraft:magenta_glazed_terracotta run function entity:unique_floor/moving_walkway - -### 落とし床 -execute if block ~ ~-2 ~ minecraft:warped_wart_block if entity @s[nbt={OnGround:true}] run function entity:unique_floor/drop_floor - -### カスタム床 -execute if block ~ ~-2 ~ minecraft:command_block{CustomName:'"Trap"'} run function entity:unique_floor/custom_floor diff --git a/data/entity/functions/unique_floor/moving_walkway.mcfunction b/data/entity/functions/unique_floor/moving_walkway.mcfunction deleted file mode 100644 index 3c508abbd2..0000000000 --- a/data/entity/functions/unique_floor/moving_walkway.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ - -### 移動床処理 - -execute if block ~ ~-2 ~ minecraft:magenta_glazed_terracotta[facing=north] run tp @s ~ ~ ~0.4 -execute if block ~ ~-2 ~ minecraft:magenta_glazed_terracotta[facing=east] run tp @s ~-0.4 ~ ~ -execute if block ~ ~-2 ~ minecraft:magenta_glazed_terracotta[facing=west] run tp @s ~0.4 ~ ~ -execute if block ~ ~-2 ~ minecraft:magenta_glazed_terracotta[facing=south] run tp @s ~ ~ ~-0.4 - -function makeup:entity/unique_floor/moving_walkway diff --git a/data/entity/tags/blocks/unique_floors.json b/data/entity/tags/blocks/unique_floors.json deleted file mode 100644 index 0f4afba750..0000000000 --- a/data/entity/tags/blocks/unique_floors.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:smooth_red_sandstone", - "minecraft:nether_wart_block", - "minecraft:magenta_glazed_terracotta", - "minecraft:warped_wart_block", - "minecraft:command_block" - ] -}