added command to get bubble_cannon

also now gives arrows
moltenwolfcub · Sep 26, 2021 · 2dce619 · 2dce619
1 parent 1ae1989
commit 2dce619
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/data/aquallotle/functions/bubble_cannon/main.mcfunction b/data/aquallotle/functions/bubble_cannon/main.mcfunction
@@ -1,3 +1,9 @@
+give @a[tag=aquallotle,scores={aquallotle_canon=1..}] bow{CustomModelData:1b,Unbreakable:1,display:{Name:'{"text":"Aquallotle Bubble Bazooka"}'}}
+scoreboard players set @a[scores={aquallotle_canon=1..}] aquallotle_canon 0
+
+scoreboard players enable @a[tag=aquallotle] aquallotle_canon
+item replace entity @a[tag=aquallotle,nbt={SelectedItem:{id: "minecraft:bow",tag: {CustomModelData:1b}}},nbt=!{Inventory:[{"id":"minecraft:arrow"}]}] inventory.0 with minecraft:arrow 64
+
 execute at @e[type=arrow] if entity @a[distance=..2,tag=aquallotle,nbt={SelectedItem: {id: "minecraft:bow", tag: {CustomModelData:1b}}}] run summon minecraft:snowball ~ ~ ~ {Tags:["bubbleball"],Item:{id:"minecraft:snowball",Count:1b,tag:{CustomModelData:2}}}
 execute as @e[type=minecraft:snowball] at @s run data modify entity @s Motion set from entity @e[type=minecraft:arrow,distance=0,limit=1] Motion
 execute as @e[type=minecraft:snowball] at @s run kill @e[type=minecraft:arrow,distance=0,limit=1]

diff --git a/data/aquallotle/functions/on_load.mcfunction b/data/aquallotle/functions/on_load.mcfunction
@@ -9,6 +9,7 @@ scoreboard objectives add aquallotle_item trigger
 scoreboard objectives add aquallotle_baner trigger
 scoreboard objectives add aquallotle_head trigger
 scoreboard objectives add aquallotle_shiel trigger
+scoreboard objectives add aquallotle_canon trigger
 
 scoreboard objectives add aquallotle_drops trigger
 scoreboard objectives add aquallotle_block trigger

diff --git a/data/aquallotle/functions/trigger_remove.mcfunction b/data/aquallotle/functions/trigger_remove.mcfunction
@@ -10,6 +10,7 @@ execute as @a[tag=!aquallotle] run trigger aquallotle_boots set 0
 execute as @a[tag=!aquallotle] run trigger aquallotle_head set 0
 execute as @a[tag=!aquallotle] run trigger aquallotle_baner set 0
 execute as @a[tag=!aquallotle] run trigger aquallotle_shiel set 0
+execute as @a[tag=!aquallotle] run trigger aquallotle_canon set 0
 
 attribute @a[limit=1,tag=!aquallotle] minecraft:generic.attack_damage modifier remove f81d4fae-7dec-11d1-a865-03f0c95e6bf7
 attribute @a[limit=1,tag=!aquallotle] minecraft:generic.attack_speed modifier remove f81d4fae-7dec-11d1-a865-03f0c95e6bf7

diff --git a/data/default/functions/uninstall.mcfunction b/data/default/functions/uninstall.mcfunction
@@ -25,6 +25,7 @@ scoreboard objectives remove aquallotle_shiel
 scoreboard objectives remove aquallotle_shift
 scoreboard objectives remove aquallotle_stand
 scoreboard objectives remove aquallotle_petgo
+scoreboard objectives remove aquallotle_canon
 
 #endregion
 #region drcc