Ballistic commando arrows no longer pierce

Zungrysoft · May 29, 2021 · 2f5cb55 · 2f5cb55
1 parent e6b090c
commit 2f5cb55
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/data/tid/functions/custom_mobs/ballistic_commando.mcfunction b/data/tid/functions/custom_mobs/ballistic_commando.mcfunction
@@ -1 +1 @@
-summon minecraft:skeleton ~ ~ ~ {CustomName:'[{"text":"Ballistic Commando"}]',HandItems:[{id:bow,Count:1},{id:tipped_arrow,tag:{CustomPotionColor:1328383,Enchantments:[{id:"minecraft:unbreaking",lvl:1}],CustomPotionEffects:[{Id:27,Duration:1,Amplifier:13}]},Count:1}],ArmorItems:[{id:leather_boots,tag:{display:{color:1328383}},Count:1},{id:leather_leggings,tag:{display:{color:1328383}},Count:1},{id:leather_chestplate,tag:{display:{color:1328383}},Count:1},{id:yellow_stained_glass,Count:1}],HandDropChances:[0F,0F],ArmorDropChances:[0F,0F,0F,0F],DeathLootTable:"tid:entities/ballistic_commando",Tags:["ballistic_commando"]}
+summon minecraft:skeleton ~ ~ ~ {CustomName:'[{"text":"Ballistic Commando"}]',HandItems:[{id:bow,Count:1},{id:tipped_arrow,tag:{CustomPotionColor:1328383,Enchantments:[{id:"minecraft:unbreaking",lvl:1}],CustomPotionEffects:[{Id:27,Duration:1,Amplifier:14}]},Count:1}],ArmorItems:[{id:leather_boots,tag:{display:{color:1328383}},Count:1},{id:leather_leggings,tag:{display:{color:1328383}},Count:1},{id:leather_chestplate,tag:{display:{color:1328383}},Count:1},{id:yellow_stained_glass,Count:1}],HandDropChances:[0F,0F],ArmorDropChances:[0F,0F,0F,0F],DeathLootTable:"tid:entities/ballistic_commando",Tags:["ballistic_commando"]}
diff --git a/data/tid/functions/gameplay/bounce_arrow.mcfunction b/data/tid/functions/gameplay/bounce_arrow.mcfunction
@@ -5,7 +5,7 @@
 # counter4 - Number of bounces
 
 #Give this arrow piercing
-execute unless score @s counter1 matches 1.. run data modify entity @s PierceLevel set value 10b
+execute unless score @s counter1 matches 1.. if entity @s[nbt={CustomPotionEffects:[{Id:27b,Amplifier:13b}]}] run data modify entity @s PierceLevel set value 10b
 
 #Track how long it has been alive
 scoreboard players add @s counter1 1

diff --git a/data/tid/functions/gameplay/bounce_arrow_bounce.mcfunction b/data/tid/functions/gameplay/bounce_arrow_bounce.mcfunction
@@ -21,7 +21,7 @@ execute if score @s counter3 matches 4.. run function tid:gameplay/arrow_fizzle
 data modify entity @s inGround set value 0b
 
 #Reset piece level
-data modify entity @s PierceLevel set value 10b
+execute if entity @s[nbt={CustomPotionEffects:[{Id:27b,Amplifier:13b}]}] run data modify entity @s PierceLevel set value 10b
 
 #Increase the damage stat
 #execute unless score @s counter2 matches ..1 store result entity @s damage double 2 run data get entity @s damage

diff --git a/data/tid/functions/gameplay/custom_potions.mcfunction b/data/tid/functions/gameplay/custom_potions.mcfunction
@@ -21,6 +21,7 @@ execute as @e[type=#tid:monster,nbt={ActiveEffects:[{Amplifier:11b,Id:27b}]}] at
 #12: Transform
 execute as @e[type=#tid:monster,nbt={ActiveEffects:[{Amplifier:12b,Id:27b}]}] at @s run function tid:gameplay/transform_arrow
 #13 is used for Bouncing Arrow
+#14 is used for Bouncing Arrow from Monsters
 
 #Clear the bad luck effect
 effect clear @a unluck
diff --git a/data/tid/functions/main.mcfunction b/data/tid/functions/main.mcfunction
@@ -84,6 +84,7 @@ execute as @e[type=area_effect_cloud,name="snow_placer"] at @s run function tid:
 #Custom Arrows
 execute as @e[type=arrow,nbt={CustomPotionEffects:[{}]}] run data modify entity @s pickup set value 0
 execute as @e[type=arrow,nbt={CustomPotionEffects:[{Id:27b,Amplifier:13b}]}] at @s run function tid:gameplay/bounce_arrow
+execute as @e[type=arrow,nbt={CustomPotionEffects:[{Id:27b,Amplifier:14b}]}] at @s run function tid:gameplay/bounce_arrow
 execute as @e[type=arrow,nbt={CustomPotionEffects:[{}],inGround:1b}] at @s run function tid:gameplay/arrow_fizzle
 execute as @e[type=arrow,nbt={CustomPotionEffects:[{Id:27b,Amplifier:1b}]}] at @s run function tid:gameplay/shredder_arrow
 execute as @e[type=arrow,nbt={CustomPotionEffects:[{Id:27b,Amplifier:2b}]}] at @s run function tid:gameplay/sniper_arrow

diff --git a/data/tid/functions/misc/neon_port_random_spawner.mcfunction b/data/tid/functions/misc/neon_port_random_spawner.mcfunction
@@ -6,4 +6,4 @@ fill ~ ~-1 ~ ~ ~1 ~ air replace redstone_block
 #Regular mob
 execute if predicate tid:random_60 run function tid:misc/neon_random_spawner
 #Ballistic Commando
-setblock ~ ~ ~ spawner{MaxNearbyEntities: 3s, RequiredPlayerRange: 16s, SpawnCount: 4s, MinSpawnDelay: 200s, MaxSpawnDelay: 800s, Delay: 10s, SpawnRange: 4s, SpawnPotentials: [{Entity: {id: "minecraft:skeleton",CustomName:'[{"text":"Ballistic Commando"}]',HandItems:[{id:bow,Count:1},{id:tipped_arrow,tag:{CustomPotionColor:1328383,Enchantments:[{id:"minecraft:unbreaking",lvl:1}],CustomPotionEffects:[{Id:27,Duration:1,Amplifier:13}]},Count:1}],ArmorItems:[{id:leather_boots,tag:{display:{color:1328383}},Count:1},{id:leather_leggings,tag:{display:{color:1328383}},Count:1},{id:leather_chestplate,tag:{display:{color:1328383}},Count:1},{id:yellow_stained_glass,Count:1}],HandDropChances:[0F,0F],ArmorDropChances:[0F,0F,0F,0F],DeathLootTable:"tid:entities/ballistic_commando",Tags:["ballistic_commando"]}, Weight: 1}]}
+setblock ~ ~ ~ spawner{MaxNearbyEntities: 3s, RequiredPlayerRange: 16s, SpawnCount: 4s, MinSpawnDelay: 200s, MaxSpawnDelay: 800s, Delay: 10s, SpawnRange: 4s, SpawnPotentials: [{Entity: {id: "minecraft:skeleton",CustomName:'[{"text":"Ballistic Commando"}]',HandItems:[{id:bow,Count:1},{id:tipped_arrow,tag:{CustomPotionColor:1328383,Enchantments:[{id:"minecraft:unbreaking",lvl:1}],CustomPotionEffects:[{Id:27,Duration:1,Amplifier:14}]},Count:1}],ArmorItems:[{id:leather_boots,tag:{display:{color:1328383}},Count:1},{id:leather_leggings,tag:{display:{color:1328383}},Count:1},{id:leather_chestplate,tag:{display:{color:1328383}},Count:1},{id:yellow_stained_glass,Count:1}],HandDropChances:[0F,0F],ArmorDropChances:[0F,0F,0F,0F],DeathLootTable:"tid:entities/ballistic_commando",Tags:["ballistic_commando"]}, Weight: 1}]}