既存の1.19.4のモブデータ(NBT)を1.20.4用に更新

TUSB · May 3, 2024 · 4660822 · 4660822
1 parent bd4b588
commit 4660822
Show file tree

Hide file tree

Showing 465 changed files with 742 additions and 1,391 deletions.
diff --git a/data/settings/functions/enemy/.mcfunction b/data/settings/functions/enemy/.mcfunction
@@ -9,5 +9,3 @@ execute if entity @s[tag=GulliversLand] run function settings:enemy/gullivers_la
 execute if entity @s[tag=Nether] run function settings:enemy/nether/
 execute if entity @s[tag=End] run function settings:enemy/end/
 execute if entity @s[tag=DebugRoom] run function settings:enemy/debug_room/
-execute if entity @s[tag=Void] run function settings:enemy/void/
-execute if entity @s[tag=TableMountain] run function settings:enemy/table_mountain/
diff --git a/data/settings/functions/enemy/cloudia/.mcfunction b/data/settings/functions/enemy/cloudia/.mcfunction
@@ -1,2 +1 @@
 execute if entity @s[tag=Friendly] run function settings:enemy/cloudia/friendly/
-execute if entity @s[tag=Sky] run function settings:enemy/cloudia/sky/
diff --git a/data/settings/functions/enemy/cloudia/friendly/blow/employee/.mcfunction b/data/settings/functions/enemy/cloudia/friendly/blow/employee/.mcfunction
@@ -1,3 +1,2 @@
-execute if entity @s[tag=HelloWork] run function settings:enemy/cloudia/friendly/blow/employee/hello_work
 execute if entity @s[tag=HelloWorkRightLines] run function settings:enemy/cloudia/friendly/blow/employee/hello_work_right_lines
 execute if entity @s[tag=HelloWorkLeftLines] run function settings:enemy/cloudia/friendly/blow/employee/hello_work_left_lines
diff --git a/data/settings/functions/enemy/cloudia/sky/shoot/phanbomb/throw_bomb.mcfunction b/data/settings/functions/enemy/cloudia/sky/shoot/phanbomb/throw_bomb.mcfunction
@@ -6,4 +6,4 @@ data modify storage tusb_mob: "即時ステータス"."基本移動力" set valu
 data modify storage tusb_mob: "即時ステータス"."ノックバック耐性" set value 0d
 data modify storage tusb_mob: "即時ステータス"."ノックバック力" set value 0d
 # AI
-data modify storage tusb_mob: "遅延ステータス".AI set value {Initial:[{Condition:[{Name:"Function",Tags:[Global,Event,Function,CommonExe,IsDaytime]}],Name:"Kill"}],Death:[{Element:[Fire],Name:"Damage",Player:{Damage:40d,DamageType:[Blast],DeathCause:'[{"translate":"「道ずれはヤメグワー！」%1$sは%2$sの爆風に巻き込まれ断末魔を上げ破裂した。","with":[{"selector":"@s"},{"storage":"mob_data:","nbt":"MobName","interpret":true}]}]'},Mob:{Physical:20,Fire:400,Hit:true},Distance:{Min:0.0d,Max:7d},Explosion:-1,AEC:{Particle:"flame",Duration:10,Radius:1f,Effects:[{Id:14,Amplifier:3b,Duration:400,ShowParticles:false}]}},{Name:"Spawn",SpawnEntities:[[{Tags:[Global,Event,Function,IceExplosion,AecHuge],Level:1}]]},{Name:"Function",Tags:[Global,Event,Function,AttackSound,Explosion]}],TurnCount:1,Turn:[{Index:1,Skill:[{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:135}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:136}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:137}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:138}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:138}}],DisabledSlots:4144959}},{Condition:[{Name:"HasTarget",Target:{Look:"Friendly",Radius:48d}},{Name:"RandomChance",Chance:0.25d}],Name:"Spawn",SpawnEntities:[[{Tags:[Global,Event,Bullet,IceBomb,Main],Level:2}]]}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:137}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:136}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Condition:[{Name:"CheckNBT",Logic:"OR",NBT:{OnGround:true}},{Name:"CheckBlock",Block:[Lava]}],Name:"Kill"},{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:135}}],DisabledSlots:4144959}}]}]}]}
+data modify storage tusb_mob: "遅延ステータス".AI set value {Initial:[{Condition:[{Name:"Function",Tags:[Global,Event,Function,CommonExe,IsDaytime]}],Name:"Kill"}],Death:[{Element:[Fire],Name:"Damage",Player:{Damage:40d,DamageType:[Blast],DeathCause:'[{"translate":"「道ずれはヤメグワー！」%1$sは%2$sの爆風に巻き込まれ断末魔を上げ破裂した。","with":[{"selector":"@s"},{"storage":"mob_data:","nbt":"MobName","interpret":true}]}]'},Mob:{Physical:20,Fire:400,Hit:true},Distance:{Min:0.0d,Max:7d},Explosion:-1,AEC:{Particle:"flame",Duration:10,Radius:1f,effects:[{id:"minecraft:invisibility",amplifier:3b,duration:400,show_particles:false}]}},{Name:"Spawn",SpawnEntities:[[{Tags:[Global,Event,Function,IceExplosion,AecHuge],Level:1}]]},{Name:"Function",Tags:[Global,Event,Function,AttackSound,Explosion]}],TurnCount:1,Turn:[{Index:1,Skill:[{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:135}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:136}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:137}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:138}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:138}}],DisabledSlots:4144959}},{Condition:[{Name:"HasTarget",Target:{Look:"Friendly",Radius:48d}},{Name:"RandomChance",Chance:0.25d}],Name:"Spawn",SpawnEntities:[[{Tags:[Global,Event,Bullet,IceBomb,Main],Level:2}]]}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:137}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:136}}],DisabledSlots:4144959}}]},{Interval:{Min:3,Max:3,Current:3},Loop:{Max:1,Current:1},Call:[{Condition:[{Name:"CheckNBT",Logic:"OR",NBT:{OnGround:true}},{Name:"CheckBlock",Block:[Lava]}],Name:"Kill"},{Name:"MergeNBT",NBT:{ArmorItems:[{},{},{},{id:"minecraft:firework_star",Count:1b,tag:{Explosion:{Type:0b,Colors:[I;4441343]},CustomModelData:135}}],DisabledSlots:4144959}}]}]}]}
diff --git a/data/settings/functions/enemy/debug_room/.mcfunction b/data/settings/functions/enemy/debug_room/.mcfunction
@@ -1,3 +1,2 @@
-execute if entity @s[tag=Ground] run function settings:enemy/debug_room/ground/
-execute if entity @s[tag=Friendly] run function settings:enemy/debug_room/friendly/
 execute if entity @s[tag=Event] run function settings:enemy/debug_room/event/
+execute if entity @s[tag=Friendly] run function settings:enemy/debug_room/friendly/
diff --git a/data/settings/functions/enemy/debug_room/event/.mcfunction b/data/settings/functions/enemy/debug_room/event/.mcfunction
@@ -1,3 +1 @@
-execute if entity @s[tag=Bullet] run function settings:enemy/debug_room/event/bullet/
-execute if entity @s[tag=Shoot] run function settings:enemy/debug_room/event/shoot/
 execute if entity @s[tag=Function] run function settings:enemy/debug_room/event/function/
diff --git a/data/settings/functions/enemy/debug_room/event/bullet/egg.mcfunction b/data/settings/functions/enemy/debug_room/event/bullet/egg.mcfunction
@@ -6,4 +6,4 @@ data modify storage tusb_mob: "遅延ステータス"."ステータス"."物理
 data modify storage tusb_mob: "遅延ステータス"."ステータス"."魔法攻撃力" set value 100
 data modify storage tusb_mob: "遅延ステータス"."ステータス".DeathCause set value '[{"translate":"%1$sは%2$sを喉に詰まらせて、倒れてしまった。","with":[{"selector":"@s"},{"storage":"mob_data:","nbt":"MobName","interpret":true}]}]'
 # AI
-data modify storage tusb_mob: "遅延ステータス".AI set value {Initial:[{Settings:[{Name:"Facing",Target:{Look:"Player",Radius:64d,IgnoreBlocks:true},Anchor:"Eyes"}],Name:"Step",Speed:1.2d,SpeedRange:0.4d}],Attack:[{Name:"Damage",Player:{Damage:0d,DamageType:[Global]},Distance:{Max:0.1d},AEC:{Particle:"block air",Duration:10,Radius:0.5f,Effects:[{Id:17b,Amplifier:1b,Duration:200}]}}]}
+data modify storage tusb_mob: "遅延ステータス".AI set value {Initial:[{Settings:[{Name:"Facing",Target:{Look:"Player",Radius:64d,IgnoreBlocks:true},Anchor:"Eyes"}],Name:"Step",Speed:1.2d,SpeedRange:0.4d}],Attack:[{Name:"Damage",Player:{Damage:0d,DamageType:[Global]},Distance:{Max:0.1d},AEC:{Particle:"block air",Duration:10,Radius:0.5f,effects:[{id:"minecraft:hunger",amplifier:1b,duration:200}]}}]}
diff --git a/data/settings/functions/enemy/debug_room/event/function/for_reference_explosion/.mcfunction b/data/settings/functions/enemy/debug_room/event/function/for_reference_explosion/.mcfunction
@@ -1,2 +1 @@
-execute if entity @s[tag=Aec] run function settings:enemy/debug_room/event/function/for_reference_explosion/aec
 execute if entity @s[tag=ParticleTest] run function settings:enemy/debug_room/event/function/for_reference_explosion/particle_test
diff --git a/data/settings/functions/enemy/debug_room/friendly/blow/.mcfunction b/data/settings/functions/enemy/debug_room/friendly/blow/.mcfunction
@@ -1,2 +1 @@
-execute if entity @s[tag=DebugMan] run function settings:enemy/debug_room/friendly/blow/debug_man
 execute if entity @s[tag=StockExchange] run function settings:enemy/debug_room/friendly/blow/stock_exchange/
diff --git a/data/settings/functions/enemy/debug_room/friendly/blow/stock_exchange/.mcfunction b/data/settings/functions/enemy/debug_room/friendly/blow/stock_exchange/.mcfunction
@@ -1,2 +1 @@
-execute if entity @s[tag=Main] run function settings:enemy/debug_room/friendly/blow/stock_exchange/main
 execute if entity @s[tag=Update] run function settings:enemy/debug_room/friendly/blow/stock_exchange/update