Add flamecatcher spell, and addItemExtras hook for SpellConjuration

2020-10-21 22:23:54 +01:00
parent d85441867e
commit 2bb242e6fb
44 changed files with 622 additions and 6 deletions
@@ -260,6 +260,7 @@ item.ebwizardry\:spectral_leggings.name=Spectral Leggings
 item.ebwizardry\:spectral_boots.name=Spectral Boots

 item.ebwizardry\:lightning_hammer.name=Lightning Hammer
+item.ebwizardry\:flamecatcher.name=Flamecatcher

 item.ebwizardry\:generic.disabled=This item has been disabled in the config

@@ -621,6 +622,7 @@ entity.ebwizardry\:ice_lance.name=Magic
 entity.ebwizardry\:smoke_bomb.name=Magic
 entity.ebwizardry\:ice_spike.name=Magic
 entity.ebwizardry\:combustion_rune.name=Magic
+entity.ebwizardry\:flamecatcher_arrow.name=Magic

 entity.ebwizardry\:black_hole.name=Black Hole
 entity.ebwizardry\:shield.name=Shield
@@ -825,6 +827,7 @@ spell.ebwizardry\:fire_sigil=Fire Sigil
 spell.ebwizardry\:fireskin=Fireskin
 spell.ebwizardry\:firestorm=Firestorm
 spell.ebwizardry\:fire_breath=Fire Breath
+spell.ebwizardry\:flamecatcher=Flamecatcher
 spell.ebwizardry\:flame_ray=Flame Ray
 spell.ebwizardry\:flaming_axe=Flaming Axe
 spell.ebwizardry\:flaming_weapon=Flaming Weapon
@@ -1013,6 +1016,7 @@ spell.ebwizardry\:fire_sigil.desc=Places a magical fire trap on the ground which
 spell.ebwizardry\:fireskin.desc=Cloaks the caster in flames for 30 seconds, causing anything that attacks them to catch fire.
 spell.ebwizardry\:firestorm.desc="Purge the land and purge the soil!\nTrees shall burn and lakes shall boil!\nTorch the wood and scorch the stone!\nAll bow before the infernal throne!"
 spell.ebwizardry\:fire_breath.desc="I am the dragon."
+spell.ebwizardry\:flamecatcher.desc=It is said that in times of need, Flamecatcher offers her power to worthy pyromancers, only to vanish back into the night once her deed is done.
 spell.ebwizardry\:flame_ray.desc=Creates a stream of flames in the direction you are pointing which sets on fire and continually damages targets.
 spell.ebwizardry\:flaming_axe.desc=Creates a flaming axe which sets enemies on fire when hit. Lasts for 30 seconds.
 spell.ebwizardry\:flaming_weapon.desc=Temporarily imbues the first weapon on the caster's hotbar with the power of flame, causing it to set fire to its victims. The magic wears off after 45 seconds.
@@ -260,6 +260,7 @@ item.ebwizardry\:spectral_leggings.name=Spectral Leggings
 item.ebwizardry\:spectral_boots.name=Spectral Boots

 item.ebwizardry\:lightning_hammer.name=Lightning Hammer
+item.ebwizardry\:flamecatcher.name=Flamecatcher

 item.ebwizardry\:generic.disabled=This item has been disabled in the config

@@ -621,6 +622,7 @@ entity.ebwizardry\:ice_lance.name=Magic
 entity.ebwizardry\:smoke_bomb.name=Magic
 entity.ebwizardry\:ice_spike.name=Magic
 entity.ebwizardry\:combustion_rune.name=Magic
+entity.ebwizardry\:flamecatcher_arrow.name=Magic

 entity.ebwizardry\:black_hole.name=Black Hole
 entity.ebwizardry\:shield.name=Shield
@@ -825,6 +827,7 @@ spell.ebwizardry\:fire_sigil=Fire Sigil
 spell.ebwizardry\:fireskin=Fireskin
 spell.ebwizardry\:firestorm=Firestorm
 spell.ebwizardry\:fire_breath=Fire Breath
+spell.ebwizardry\:flamecatcher=Flamecatcher
 spell.ebwizardry\:flame_ray=Flame Ray
 spell.ebwizardry\:flaming_axe=Flaming Axe
 spell.ebwizardry\:flaming_weapon=Flaming Weapon
@@ -1013,6 +1016,7 @@ spell.ebwizardry\:fire_sigil.desc=Places a magical fire trap on the ground which
 spell.ebwizardry\:fireskin.desc=Cloaks the caster in flames for 30 seconds, causing anything that attacks them to catch fire.
 spell.ebwizardry\:firestorm.desc="Purge the land and purge the soil!\nTrees shall burn and lakes shall boil!\nTorch the wood and scorch the stone!\nAll bow before the infernal throne!"
 spell.ebwizardry\:fire_breath.desc="I am the dragon."
+spell.ebwizardry\:flamecatcher.desc=It is said that in times of need, Flamecatcher offers her power to worthy pyromancers, only to vanish back into the night once her deed is done.
 spell.ebwizardry\:flame_ray.desc=Creates a stream of flames in the direction you are pointing which sets on fire and continually damages targets.
 spell.ebwizardry\:flaming_axe.desc=Creates a flaming axe which sets enemies on fire when hit. Lasts for 30 seconds.
 spell.ebwizardry\:flaming_weapon.desc=Temporarily imbues the first weapon on the caster's hotbar with the power of flame, causing it to set fire to its victims. The magic wears off after 45 seconds.
@@ -0,0 +1,105 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_standby"
+    },
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [ -80, 260, -40 ],
+            "translation": [ -1, -2, 2.5 ],
+            "scale": [ 0.9, 0.9, 0.9 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ -80, -280, 40 ],
+            "translation": [ -1, -2, 2.5 ],
+            "scale": [ 0.9, 0.9, 0.9 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, -90, 25 ],
+            "translation": [ 1.13, 3.2, 1.13],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 0, 90, -25 ],
+            "translation": [ 1.13, 3.2, 1.13],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "pulling": 1
+            },
+            "model": "ebwizardry:item/flamecatcher_pulling_0"
+        },
+        {
+            "predicate": {
+                "pulling": 1,
+                "pull": 0.65
+            },
+            "model": "ebwizardry:item/flamecatcher_pulling_1"
+        },
+        {
+            "predicate": {
+                "pulling": 1,
+                "pull": 0.9
+            },
+            "model": "ebwizardry:item/flamecatcher_pulling_2"
+        },
+        {
+            "predicate": {
+                "conjuring": 1
+            },
+            "model": "ebwizardry:item/flamecatcher_conjuring_0"
+        },
+        {
+            "predicate": {
+                "conjuring": 1,
+                "conjure": 0.125
+            },
+            "model": "ebwizardry:item/flamecatcher_conjuring_1"
+        },
+        {
+            "predicate": {
+                "conjuring": 1,
+                "conjure": 0.25
+            },
+            "model": "ebwizardry:item/flamecatcher_conjuring_2"
+        },
+        {
+            "predicate": {
+                "conjuring": 1,
+                "conjure": 0.375
+            },
+            "model": "ebwizardry:item/flamecatcher_conjuring_3"
+        },
+        {
+            "predicate": {
+                "conjuring": 1,
+                "conjure": 0.5
+            },
+            "model": "ebwizardry:item/flamecatcher_conjuring_4"
+        },
+        {
+            "predicate": {
+                "conjuring": 1,
+                "conjure": 0.625
+            },
+            "model": "ebwizardry:item/flamecatcher_conjuring_5"
+        },
+        {
+            "predicate": {
+                "conjuring": 1,
+                "conjure": 0.75
+            },
+            "model": "ebwizardry:item/flamecatcher_conjuring_6"
+        },
+        {
+            "predicate": {
+                "conjuring": 1,
+                "conjure": 0.875
+            },
+            "model": "ebwizardry:item/flamecatcher_conjuring_7"
+        }
+    ]
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_conjuring_0"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_conjuring_1"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_conjuring_2"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_conjuring_3"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_conjuring_4"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_conjuring_5"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_conjuring_6"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_conjuring_7"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_pulling_0"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_pulling_1"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "parent": "item/bow",
+    "textures": {
+        "layer0": "ebwizardry:items/flamecatcher_pulling_2"
+    }
+}
@@ -14,6 +14,8 @@
 	"item.purifying_elixir.drink": 		{"category": "player", "sounds": ["ebwizardry:buff_large"]},
 	"item.mana_flask.use": 				{"category": "player", "sounds": ["item/bottle/fill1", "item/bottle/fill2", "item/bottle/fill3", "item/bottle/fill4"]},
 	"item.mana_flask.recharge": 		{"category": "player", "sounds": ["ebwizardry:conjure"]},
+	"item.flamecatcher.shoot": 			{"category": "player", "sounds": ["fireworks/launch1"]},
+	"item.flamecatcher.flame": 			{"category": "player", "sounds": ["ebwizardry:combust"]},

 	"entity.black_hole.ambient": 		{"category": "spells", "sounds": ["portal/portal"]},
 	"entity.black_hole.vanish": 		{"category": "spells", "sounds": ["portal/trigger"]},
@@ -95,6 +97,7 @@
 	"entity.firebomb.throw": 			{"category": "spells", "sounds": ["random/bow"]},
 	"entity.firebomb.smash": 			{"category": "spells", "sounds": ["random/glass1", "random/glass2", "random/glass3"]},
 	"entity.firebomb.fire": 			{"category": "spells", "sounds": ["ebwizardry:combust"]},
+	"entity.flamecatcher_arrow.hit": 	{"category": "spells", "sounds": ["damage/hit1", "damage/hit2", "damage/hit3"]},
 	"entity.force_arrow.hit": 			{"category": "spells", "sounds": ["fireworks/blast1"]},
 	"entity.force_orb.hit": 			{"category": "spells", "sounds": ["damage/hit1", "damage/hit2", "damage/hit3"]},
 	"entity.force_orb.hit_block": 		{"category": "spells", "sounds": ["fireworks/blast1"]},
@@ -184,6 +187,7 @@
 	"spell.fire_breath.start": 			{"category": "spells", "sounds": ["ebwizardry:flames_start"]},
 	"spell.fire_breath.loop": 			{"category": "spells", "sounds": ["ebwizardry:flames_loop"]},
 	"spell.fire_breath.end": 			{"category": "spells", "sounds": ["ebwizardry:flames_end"]},
+	"spell.flamecatcher": 				{"category": "spells", "sounds": ["ebwizardry:buff"]},
 	"spell.flame_ray.start": 			{"category": "spells", "sounds": ["ebwizardry:flames_start"]},
 	"spell.flame_ray.loop": 			{"category": "spells", "sounds": ["ebwizardry:flames_loop"]},
 	"spell.flame_ray.end": 				{"category": "spells", "sounds": ["ebwizardry:flames_end"]},
@@ -0,0 +1,26 @@
+{
+  "enabled": {
+    "book": true,
+    "scroll": true,
+    "wands": true,
+    "npcs": true,
+    "dispensers": true,
+    "commands": true,
+    "treasure": true,
+	"trades": true,
+    "looting": true
+  },
+  "tier": "master",
+  "element": "fire",
+  "type": "utility",
+  "cost": 100,
+  "chargeup": 20,
+  "cooldown": 150,
+  "base_properties": {
+    "item_lifetime": 600,
+    "range": 40,
+    "shot_count": 5,
+    "damage": 16,
+    "burn_duration": 15
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "animation": {
+ 
+	"frametime": 2,
+
+	"frames": [
+0,
+ 1, 2, 3, 4, 5, 6, 7]
+
+	}
+
+}
@@ -0,0 +1,12 @@
+{
+  "animation": {
+ 
+	"frametime": 2,
+
+	"frames": [
+0,
+ 1, 2, 3, 4, 5, 6, 7]
+
+	}
+
+}
@@ -0,0 +1,12 @@
+{
+  "animation": {
+ 
+	"frametime": 2,
+
+	"frames": [
+0,
+ 1, 2, 3, 4, 5, 6, 7]
+
+	}
+
+}
@@ -0,0 +1,12 @@
+{
+  "animation": {
+ 
+	"frametime": 2,
+
+	"frames": [
+0,
+ 1, 2, 3, 4, 5, 6, 7]
+
+	}
+
+}