added witch, set icons for origins

src/main/resources/assets/faithful/lang/en_us.json

@@ -5,7 +5,7 @@
     "power.faithful.elf-powers/elven_craftsmanship.name": "Elven Magic",
     "power.faithful.elf-powers/elven_craftsmanship.description": "Elven craftsmanship is often described as containing enchantments. Elves themselves use these words to simplify how elvish weapons seem to have a quality no other races could achieve.",
     "power.faithful.elf-powers/elven_health.name": "Elven Health",
-    "power.faithful.elf-powers/elven_health.description": "Elves are immune to some poisons.",
+    "power.faithful.elf-powers/elven_health.description": "Elves are immune to most ailments.",
     "power.faithful.elf-powers/light_foot.name": "Light of Foot",
     "power.faithful.elf-powers/light_foot.description": "Elves can walk lightly across snow where the boots of humans would sink.",
     "power.faithful.elf-powers/nature_connection.name": "Nature's Connection",
@@ -77,7 +77,7 @@
     "power.faithful.merfolk-powers/gills.name": "Gills",
     "power.faithful.merfolk-powers/gills.description": "Merfolk can breathe underwater, but are slowed on land.",
 
-    //-----harpy-----//
+    //-----druid-----//
     "origin.faithful.druid.name": "Druid",
     "origin.faithful.druid.description": "Magicians who use nature to heal others.",
     "power.faithful.druid-powers/healing.name": "Healing Aura",
@@ -85,5 +85,15 @@
     "power.faithful.druid-powers/nature_aura.name": "Nature's Aura",
     "power.faithful.druid-powers/nature_aura.description": "Crops around you seem to grow faster.",
     "power.faithful.druid-powers/resistance.name": "Nature's Resistance",
-    "power.faithful.druid-powers/resistance.description": "When on certain blocks like grass, Druids gain slight damage resistance."
+    "power.faithful.druid-powers/resistance.description": "When on certain blocks like grass, Druids gain slight damage resistance.",
+
+    //-----witch-----//
+    "origin.faithful.witch.name": "Witch",
+    "origin.faithful.witch.description": "Practitioners of dark magic.",
+    "power.faithful.witch-powers/blinding.name": "Blinding Aura",
+    "power.faithful.witch-powers/blinding.description": "Witches can cause creatures around them to be blinded temporarily.",
+    "power.faithful.witch-powers/immunity.name": "Poison Immunity",
+    "power.faithful.witch-powers/immunity.description": "Witches are resistant to some poisons due to them constantly working with such potions.",
+    "power.faithful.witch-powers/pact.name": "Infernal Pact",
+    "power.faithful.witch-powers/pact.description": "Undead and infernal creatures do not attack Witches."
 }

src/main/resources/data/faithful/origins/druid.json

@@ -4,7 +4,7 @@
         "faithful:druid-powers/resistance",
         "faithful:druid-powers/nature_aura"
     ],
-    "icon": "minecraft:dirt",
+    "icon": "minecraft:oak_leaves",
     "order": 1009,
     "impact": 1
 }

src/main/resources/data/faithful/origins/dwarf.json

@@ -4,7 +4,7 @@
         "faithful:dwarf-powers/dwarven_mining",
 		"faithful:dwarf-powers/dwarven_resistance"
 	],
-	"icon": "minecraft:dirt",
+	"icon": "minecraft:stone",
 	"order": 1001,
 	"impact": 1
 }

src/main/resources/data/faithful/origins/elf.json

@@ -5,7 +5,7 @@
 		"faithful:elf-powers/elven_health",
 		"faithful:elf-powers/light_foot"
 	],
-	"icon": "minecraft:dirt",
+	"icon": "minecraft:feather",
 	"order": 1000,
 	"impact": 1
 }

src/main/resources/data/faithful/origins/goblin.json

@@ -4,7 +4,7 @@
         "faithful:goblin-powers/quick",
 		"faithful:goblin-powers/short"
 	],
-	"icon": "minecraft:dirt",
+	"icon": "minecraft:gold_nugget",
 	"order": 1006,
 	"impact": 1
 }

src/main/resources/data/faithful/origins/harpy.json

@@ -4,7 +4,7 @@
         "faithful:harpy-powers/claws",
 		"faithful:harpy-powers/birdlike"
 	],
-	"icon": "minecraft:dirt",
+	"icon": "icarus:white_feathered_wings",
 	"order": 1007,
 	"impact": 1
 }

src/main/resources/data/faithful/origins/kitsune.json

@@ -4,7 +4,7 @@
         "faithful:kitsune-powers/small",
 		"faithful:kitsune-powers/light"
 	],
-	"icon": "minecraft:dirt",
+	"icon": "minecraft:sweet_berries",
 	"order": 1003,
 	"impact": 1
 }

src/main/resources/data/faithful/origins/merfolk.json

@@ -7,7 +7,7 @@
 		"origins:swim_speed",
 		"origins:aquatic"
 	],
-	"icon": "minecraft:dirt",
+	"icon": "minecraft:prismarine_crystals",
 	"order": 1008,
 	"impact": 3
 }

src/main/resources/data/faithful/origins/orc.json

@@ -4,7 +4,7 @@
         "faithful:orc-powers/strength",
 		"faithful:orc-powers/orc_skin"
 	],
-	"icon": "minecraft:dirt",
+	"icon": "minecraft:golden_axe",
 	"order": 1004,
 	"impact": 1
 }

src/main/resources/data/faithful/origins/pixie.json

@@ -5,7 +5,7 @@
 		"faithful:pixie-powers/luck",
         "faithful:pixie-powers/light"
 	],
-	"icon": "minecraft:dirt",
+	"icon": "minecraft:glowstone_dust",
 	"order": 1002,
 	"impact": 2
 }

src/main/resources/data/faithful/origins/witch.json

@@ -0,0 +1,10 @@
+{
+    "powers": [
+        "faithful:witch-powers/blinding",
+        "faithful:witch-powers/pact",
+        "faithful:witch-powers/immunity"
+    ],
+    "icon": "minecraft:dragon_breath",
+    "order": 1010,
+    "impact": 1
+}

src/main/resources/data/faithful/powers/witch-powers/blinding.json

@@ -0,0 +1,24 @@
+{
+    "type": "origins:active_self",
+    "key": "primary",
+    "entity_action": {
+        "type": "origins:area_of_effect",
+        "radius": 12,
+        "bientity_action": {
+            "type": "origins:target_action",
+            "action": {
+                "type": "origins:apply_effect",
+                "effect": {
+                    "effect": "minecraft:blindness",
+                    "duration": 600,
+                    "amplifier": 1
+                }
+            }
+        }
+    },
+    "cooldown": 2400,
+    "hud_render": {
+        "sprite_location": "origins:textures/gui/community/spiderkolo/resource_bar_03.png",
+        "bar_index": "21"
+    }
+}

src/main/resources/data/faithful/powers/witch-powers/immunity.json

@@ -0,0 +1,7 @@
+{
+  "type": "origins:effect_immunity",
+  "effects": [
+    "minecraft:wither",
+    "minecraft:poison"
+  ]
+}

src/main/resources/data/faithful/powers/witch-powers/pact.json

@@ -0,0 +1,21 @@
+{
+    "type":"origins:action_over_time",
+    "entity_action":{
+       "type":"origins:and",
+       "actions":[
+          {
+             "type":"origins:execute_command",
+             "command":"team add witchpassive"
+          },
+          {
+             "type":"origins:execute_command",
+             "command":"team join witchpassive @s"
+          },
+          {
+             "type":"origins:execute_command",
+             "command":"team join witchpassive @e[type=#faithful:hostiles]"
+          }
+       ]
+    },
+    "interval":20
+ }

src/main/resources/data/faithful/tags/entity_types/hostiles.json

@@ -1,30 +1,15 @@
 {
     "replace": false,
     "values": [
-        "minecraft:blaze",
-        "minecraft:cave_spider",
-        "minecraft:spider",
         "minecraft:piglin",
+        "minecraft:blaze",
         "minecraft:drowned",
-        "minecraft:enderman",
         "minecraft:zombified_piglin",
-        "minecraft:creeper",
-        "minecraft:elder_guardian",
-        "minecraft:endermite",
-        "minecraft:ghast",
-        "minecraft:guardian",
-        "minecraft:hoglin",
         "minecraft:husk",
         "minecraft:magma_cube",
         "minecraft:phantom",
-        "minecraft:piglin_brute",
-        "minecraft:pillager",
-        "minecraft:ravager",
         "minecraft:skeleton",
-        "minecraft:slime",
         "minecraft:stray",
-        "minecraft:vindicator",
-        "minecraft:witch",
         "minecraft:wither_skeleton",
         "minecraft:zoglin",
         "minecraft:zombie",

src/main/resources/data/origins/origin_layers/origin.json

@@ -10,6 +10,7 @@
 		"faithful:harpy",
 		"faithful:merfolk",
 		"faithful:druid",
+		"faithful:witch",
 		{
 			"condition": {
 				"type": "origins:equipped_item",