item modifiers

data/nauthack/functions/nautray/conditions/nauthack_collision.mcfunction

@@ -1,2 +1,2 @@
 execute if data storage nauthack:nauthack nautray.args.nauthack_collision unless block ~ ~ ~ #nauthack:non_solid run scoreboard players set nautray_move nautmath_var 0
-execute if data storage nauthack:nauthack nautray.args.nauthack_collision if entity @e[type = !#nauthack:nocoll, distance = ..1.5, team = !nauthack_nocoll] run scoreboard players set nautray_move nautmath_var 0
+execute if data storage nauthack:nauthack nautray.args.nauthack_collision if entity @e[type = !#nauthack:nocoll, distance = ..1.5, team = !nautcore_nocoll] run scoreboard players set nautray_move nautmath_var 0

data/nauthack/functions/nautray/raycycle.mcfunction

@@ -5,6 +5,6 @@ function nauthack:nautray/condition
 function #nauthack:nautray/effects
 
 scoreboard players remove nautray_power nautmath_var 1
-tp ^ ^ ^0.25
+execute at @s anchored feet run tp ^ ^ ^0.25
 
 execute if score nautray_move nautmath_var matches 1 at @s anchored feet run function nauthack:nautray/raycycle

data/nauthack/functions/nauttime/tick.mcfunction

@@ -1,3 +1,11 @@
 scoreboard players add nauttime_tick nautmath_var 1
 
-execute if score nauttime_tick nautmath_var matches 5 run function nauthack:nauttime/5tick
+execute if score nauttime_tick nautmath_var matches 5 run function nauthack:nauttime/5tick
+
+execute unless score nauttime_odd nautmath_var matches 1 run scoreboard players set nauttime_odd nautmath_var 2
+execute if score nauttime_odd nautmath_var matches 1 run scoreboard players set nauttime_odd nautmath_var 0
+execute if score nauttime_odd nautmath_var matches 2 run scoreboard players set nauttime_odd nautmath_var 1
+
+execute if score nauttime_odd nautmath_var matches 1 unless score nauttime_odd_odd nautmath_var matches 1 run scoreboard players set nauttime_odd_odd nautmath_var 2
+execute if score nauttime_odd nautmath_var matches 1 if score nauttime_odd_odd nautmath_var matches 1 run scoreboard players set nauttime_odd_odd nautmath_var 0
+execute if score nauttime_odd nautmath_var matches 1 if score nauttime_odd_odd nautmath_var matches 2 run scoreboard players set nauttime_odd_odd nautmath_var 1

data/nauthack/item_modifiers/attribute/chestplate/speed.json

@@ -12,7 +12,7 @@
 						"name": "item_attribute_speed"
 					},
 					"score": "nautmath_var",
-					"scale": 0.1
+					"scale": 0.01
 				},
 				"operation": "addition",
 				"slot": "chest"

data/nauthack/item_modifiers/attribute/clear.json

@@ -0,0 +1,6 @@
+[
+	{
+		"function": "minecraft:set_nbt",
+		"tag": "{AttributeModifiers: []}"
+	}
+]  

data/nauthack/item_modifiers/attribute/feet/speed.json

@@ -12,7 +12,7 @@
 						"name": "item_attribute_speed"
 					},
 					"score": "nautmath_var",
-					"scale": 0.1
+					"scale": 0.01
 				},
 				"operation": "addition",
 				"slot": "feet"

data/nauthack/item_modifiers/attribute/helmet/speed.json

@@ -12,7 +12,7 @@
 						"name": "item_attribute_speed"
 					},
 					"score": "nautmath_var",
-					"scale": 0.1
+					"scale": 0.01
 				},
 				"operation": "addition",
 				"slot": "head"

data/nauthack/item_modifiers/attribute/leggings/speed.json

@@ -12,7 +12,7 @@
 						"name": "item_attribute_speed"
 					},
 					"score": "nautmath_var",
-					"scale": 0.1
+					"scale": 0.01
 				},
 				"operation": "addition",
 				"slot": "legs"

data/nauthack/item_modifiers/damage.json

@@ -7,7 +7,8 @@
 				"type": "minecraft:fixed",
 				"name": "item_damage"
 			},
-			"score": "nautmath_var"
+			"score": "nautmath_var",
+			"scale": 0.001
 		},
 		"add": true
 	}

data/nauthack/tags/entity_types/nocoll.json

@@ -7,7 +7,6 @@
 		"minecraft:armor_stand",
 		"minecraft:eye_of_ender",
 		"minecraft:fishing_bobber",
-		"minecraft:marker",
-		"minecraft:player"
+		"minecraft:marker"
 	]
 }