Updated to version 5.3.3

1-20-2-overlay/data/incendium/functions/item/necrotic_shield/on_block.mcfunction

@@ -6,8 +6,7 @@ summon area_effect_cloud ~ ~0.25 ~ {id:"minecraft:area_effect_cloud",Particle:"l
 execute at @e[type=#incendium:mobs,tag=!in.immune,distance=1..7,limit=8,sort=nearest,predicate=incendium:random/30] run summon evoker_fangs ~ ~ ~ {Warmup:1,Glowing:1b,Tags:["in.necrotic_fangs"]}
 execute as @e[type=evoker_fangs,distance=..10] at @s run tp @s ~ ~ ~ facing entity @p[tag=in.self] eyes
 
-scoreboard players set @s in.cd_prism 60
-scoreboard players set @s in.cd_shield 60
+scoreboard players set @s in.cd_shield 120
 
 # We exclude in.checked here since these entities will automatically get this tag in the next tick
 #  This means repeated shield blocking won't constantly tick the same entities again!

1-20-2-overlay/data/incendium/functions/item/radiation_shield/on_block.mcfunction

@@ -3,7 +3,6 @@
 
 summon area_effect_cloud ~ ~0.5 ~ {id:"minecraft:area_effect_cloud",Particle:"dust 0 1 0 2",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:8,effects:[{id:"minecraft:poison",amplifier:1b,duration:90},{id:"minecraft:poison",amplifier:0b,duration:120}],Tags:["in.radiation"]}
 
-scoreboard players set @s in.cd_prism 120
 scoreboard players set @s in.cd_shield 120
 
 data modify entity @e[type=area_effect_cloud,distance=..4,limit=1,tag=in.radiation,tag=!in.checked] Owner set from entity @p[tag=in.valid_player] UUID

data/incendium/functions/entity/spirit/init.mcfunction

@@ -1,8 +1,9 @@
 # from: entity/mob/init
 # @s: magma cube
 
-summon vex ~ ~ ~ {Tags:["in.spirit"]}
+summon vex ~ ~ ~ {Tags:["in.spirit"],LifeTicks:3200}
 summon marker ~ ~ ~ {Tags:["in.spirit_death", "in.ticking_entity"]}
 
 execute as @e[type=vex,tag=in.spirit,tag=!in.checked,distance=..1,limit=1,sort=nearest] run function incendium:entity/spirit/vex_init
 tp @s ~ -10 ~
+kill @s

data/incendium/functions/entity/spirit/main.mcfunction

@@ -12,4 +12,5 @@ particle minecraft:dust 0.5 0.5 0.5 1 ^0 ^0.5 ^-0.25 0.25 0.25 0.25 0.025 4 norm
 particle minecraft:dust 0 0.969 1 1 ^-0.2 ^0.8 ^0.1 0 0 0 0 1 force
 particle minecraft:dust 0 1 0.8 1 ^0.2 ^0.8 ^0.1 0 0 0 0 1 force
 
-execute if score @s in.lifetime matches ..0 run tp @s ~ ~-10 ~
+execute if score @s in.lifetime matches ..0 run tp @s ~ -20 ~
+execute if score @s in.lifetime matches ..0 run kill @s

data/incendium/functions/entity/toxic_slime/init.mcfunction

@@ -1,6 +1,6 @@
 # from: entity/mobs/init
 # @s: toxic slime
 
-summon slime ~ ~ ~ {Tags:["in.toxic_slime"]}
+summon slime ~ ~ ~ {Tags:["in.toxic_slime"],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],ArmorItems:[{Count:1b,id:"minecraft:golden_boots",tag:{Enchantments:[{id:"minecraft:feather_falling",lvl:255},{id:"minecraft:unbreaking",lvl:255}]}},{},{},{}]}
 execute as @e[type=slime,tag=in.toxic_slime,tag=!in.checked,distance=..1,limit=1,sort=nearest] run function incendium:entity/toxic_slime/slime_init
 tp @s ~ -10 ~

data/incendium/functions/entity/toxic_slime/main.mcfunction

@@ -4,4 +4,5 @@
 execute if entity @a[distance=..1.5,predicate=incendium:biome/toxic_heap,predicate=!incendium:wearing/hazmat] run effect give @a[distance=..1.5,tag=in.valid_player] minecraft:poison 5 4
 particle minecraft:falling_dust slime_block ~ ~0.45 ~ 0.1 0.2 0.1 0 0 normal
 
-execute if score @s in.lifetime matches ..0 run tp @s ~ ~-10 ~
+execute if score @s in.lifetime matches ..0 run tp @s ~ -20 ~
+execute if score @s in.lifetime matches ..0 run kill @s

data/incendium/functions/item/greatsword_of_sacrifice/on_hit.mcfunction

@@ -1,7 +1,7 @@
 # from: player/event/on_hit_or_kill
 # @s: player hitting
 
-effect give @s instant_damage 1 1
+damage @s 3.0 thorns by @s from @s
 
 particle soul ~ ~1 ~ 0 0 0 0.1 100 force
 playsound minecraft:entity.husk.converted_to_zombie player @a[distance=..16] ~ ~ ~ 2 1.5 0

data/incendium/functions/item/necrotic_shield/on_block.mcfunction

@@ -1,13 +1,12 @@
 # from: player/on_block
 # @s: player being hit
 
-summon area_effect_cloud ~ ~0.25 ~ {id:"minecraft:area_effect_cloud",Particle:"large_smoke",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:10,Color:0,Effects:[{Id:20b,Amplifier:2b,Duration:100,ShowParticles:1b}],Tags:["in.necrotic_wither"]}
+summon area_effect_cloud ~ ~0.25 ~ {id:"minecraft:area_effect_cloud",Particle:"large_smoke",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:10,Color:0,Effects:[{Id:20,Amplifier:2b,Duration:100,ShowParticles:1b}],Tags:["in.necrotic_wither"]}
 
 execute at @e[type=#incendium:mobs,tag=!in.immune,distance=1..7,limit=8,sort=nearest,predicate=incendium:random/30] run summon evoker_fangs ~ ~ ~ {Warmup:1,Glowing:1b,Tags:["in.necrotic_fangs"]}
 execute as @e[type=evoker_fangs,distance=..10] at @s run tp @s ~ ~ ~ facing entity @p[tag=in.self] eyes
 
-scoreboard players set @s in.cd_prism 60
-scoreboard players set @s in.cd_shield 60
+scoreboard players set @s in.cd_shield 120
 
 # We exclude in.checked here since these entities will automatically get this tag in the next tick
 #  This means repeated shield blocking won't constantly tick the same entities again!

data/incendium/functions/item/prismatic_shield/on_block.mcfunction

@@ -3,5 +3,5 @@
 
 tag @s add in.self
 execute positioned ~ ~1.25 ~ run function incendium:item/prismatic_shield/ray/start
-scoreboard players set @s in.cd_shield 15
+scoreboard players set @s in.cd_shield 120
 tag @s remove in.self

data/incendium/functions/item/prismatic_shield/ray/start.mcfunction

@@ -1,5 +1,5 @@
 tag @s add laser
-scoreboard players set @s in.cd_prism 60
+scoreboard players set @s in.cd_shield 120
 scoreboard players set #hit in.fire_laser 0
 scoreboard players set #distance3 in.fire_laser 0
 playsound minecraft:block.beacon.power_select player @a[distance=..16] ~ ~ ~ 1 2 0.5

data/incendium/functions/item/radiation_shield/on_block.mcfunction

@@ -1,9 +1,8 @@
 # from: player/on_block
 # @s: player being hit
 
-summon area_effect_cloud ~ ~0.5 ~ {id:"minecraft:area_effect_cloud",Particle:"dust 0 1 0 2",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:8,Effects:[{Id:19b,Amplifier:1b,Duration:90},{Id:24b,Amplifier:0b,Duration:120}],Tags:["in.radiation"]}
+summon area_effect_cloud ~ ~0.5 ~ {id:"minecraft:area_effect_cloud",Particle:"dust 0 1 0 2",ReapplicationDelay:200,Radius:0.5f,RadiusPerTick:0.8f,Duration:8,Effects:[{Id:19,Amplifier:1b,Duration:90},{Id:24,Amplifier:0b,Duration:120}],Tags:["in.radiation"]}
 
-scoreboard players set @s in.cd_prism 120
 scoreboard players set @s in.cd_shield 120
 
 data modify entity @e[type=area_effect_cloud,distance=..4,limit=1,tag=in.radiation,tag=!in.checked] Owner set from entity @p[tag=in.valid_player] UUID

data/incendium/functions/load.mcfunction

@@ -44,7 +44,6 @@ scoreboard objectives add in.castle_id dummy
 scoreboard objectives add in.retreating dummy
 
 scoreboard objectives add in.cd_shield dummy
-scoreboard objectives add in.cd_prism dummy
 scoreboard objectives add in.cd_charm dummy
 scoreboard objectives add in.cd_corrupt dummy
 scoreboard objectives add in.cur_spell dummy

data/incendium/functions/player/init.mcfunction

@@ -3,7 +3,6 @@
 function incendium:technical/entity_id/init
 scoreboard players add @s in.wet 0
 scoreboard players add @s in.shielding 0
-scoreboard players add @s in.cd_shield 0
-scoreboard players add @s in.cd_prism 0
+scoreboard players add @s in.cd_shield 120
 scoreboard players add @s in.cd_charm 0
 scoreboard players add @s in.cd_corrupt 0

data/incendium/functions/player/main.mcfunction

@@ -18,7 +18,6 @@ execute unless score @s in.eid matches 0..32767 run function incendium:technical
 
 # are scores set?
 execute unless entity @s[scores={in.cd_shield=-1..}] run scoreboard players add @s in.cd_shield 0
-execute unless entity @s[scores={in.cd_prism=-1..}] run scoreboard players add @s in.cd_prism 0
 execute unless entity @s[scores={in.cd_charm=-1..}] run scoreboard players add @s in.cd_charm 0
 execute unless entity @s[scores={in.cd_corrupt=-1..}] run scoreboard players add @s in.cd_corrupt 0
 
@@ -91,14 +90,9 @@ tag @s[tag=in.mainhand_scroll] add in.scroll
 
 tag @s[tag=!in.offhand_scroll,tag=!in.mainhand_scroll] remove in.scroll
 
-# effect clearing
-effect clear @s[scores={in.cd_prism=1..}] wither
-effect clear @s[scores={in.cd_prism=1..}] poison
-
 # decr scoreboards
 scoreboard players remove @s[scores={in.cd_shield=1..}] in.cd_shield 1
 scoreboard players remove @s[scores={in.cd_corrupt=1..}] in.cd_corrupt 1
-scoreboard players remove @s[scores={in.cd_prism=1..}] in.cd_prism 1
 scoreboard players remove @s[scores={in.cd_charm=1..}] in.cd_charm 1
 scoreboard players remove @s[scores={in.cd_weapon=1..}] in.cd_weapon 1
 scoreboard players remove @s[scores={in.cd_wrath=1..}] in.cd_wrath 1

data/incendium/predicates/structure/fortress.json

@@ -1,9 +1,23 @@
 {
-  "condition": "minecraft:entity_properties",
-  "entity": "this",
-  "predicate": {
-    "location": {
-      "structure": "minecraft:fortress"
-    }
-  }
-}
+    "condition": "minecraft:any_of",
+    "terms": [
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "location": {
+                    "structure": "minecraft:fortress"
+                }
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "location": {
+                    "structure": "betterfortresses:fortress"
+                }
+            }
+        }
+    ]
+}

data/minecraft/tags/worldgen/biome/has_structure/bastion_remnant.json

@@ -1,7 +1,10 @@
 {
-  "replace": false,
-  "values": [
-    "incendium:inverted_forest",
-    "incendium:weeping_valley"
-  ]
-}
+    "replace": false,
+    "values": [
+        "incendium:inverted_forest",
+        "incendium:weeping_valley",
+        "incendium:ash_barrens",
+        "incendium:volcanic_deltas",
+        "incendium:withered_forest"
+    ]
+}

data/minecraft/tags/worldgen/biome/has_structure/nether_fortress.json

@@ -1,9 +1,10 @@
 {
-  "replace": false,
-  "values": [
-    "incendium:inverted_forest",
-    "incendium:weeping_valley",
-    "incendium:infernal_dunes",
-    "incendium:toxic_heap"
-  ]
-}
+    "replace": false,
+    "values": [
+        "incendium:inverted_forest",
+        "incendium:weeping_valley",
+        "incendium:infernal_dunes",
+        "incendium:volcanic_deltas",
+        "incendium:toxic_heap"
+    ]
+}

data/minecraft/worldgen/structure_set/nether_complexes.json

@@ -14,9 +14,9 @@
     "salt": 30084232,
     "exclusion_zone": {
       "other_set": "incendium:greater_structures",
-      "chunk_count": 16
+      "chunk_count": 8
     },
-    "spacing": 20,
+    "spacing": 16,
     "separation": 8
   }
 }