From b057a20b2a4183b0253b023120660ca3be204490 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Tue, 14 Feb 2017 23:09:59 +0100
Subject: [PATCH] Diffrent fireballs for ghast and blaze

---
 mods/mobs_mc/blaze.lua | 33 ++++++++++++++++++++++++++++++++-
 mods/mobs_mc/ghast.lua | 13 ++++++-------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/mods/mobs_mc/blaze.lua b/mods/mobs_mc/blaze.lua
index 186e8f478..800975a06 100644
--- a/mods/mobs_mc/blaze.lua
+++ b/mods/mobs_mc/blaze.lua
@@ -55,7 +55,7 @@ mobs:register_mob("mobs_mc:blaze", {
 	light_damage = 0,
 	view_range = 16,
 	attack_type = "shoot",
-    arrow = "mobs_monster:fireball",
+    arrow = "mobs_mc:blaze_fireball",
     shoot_interval = 3.5,
     passive = false,
     jump = true,
@@ -68,6 +68,37 @@ mobs:register_mob("mobs_mc:blaze", {
 
 mobs:register_spawn("mobs_mc:blaze", {"mcl_core:lava_flowing", "mcl_nether:netherrack","air"}, 30, -1, 5000, 1, -2000)
 
+-- Blaze fireball
+mobs:register_arrow("mobs_mc:blaze_fireball", {
+	visual = "sprite",
+	visual_size = {x = 0.3, y = 0.3},
+	textures = {"mcl_fire_fire_charge.png"},
+	velocity = 12,
+
+	-- Direct hit, no fire... just plenty of pain
+	hit_player = function(self, player)
+		player:punch(self.object, 1.0, {
+			full_punch_interval = 1.0,
+			damage_groups = {fleshy = 5},
+		}, nil)
+	end,
+
+	hit_mob = function(self, player)
+		player:punch(self.object, 1.0, {
+			full_punch_interval = 1.0,
+			damage_groups = {fleshy = 5},
+		}, nil)
+	end,
+
+	-- Node hit, make fire
+	hit_node = function(self, pos, node)
+		local pos_above = {x=pos.x, y=pos.y+1, z=pos.z}
+		if minetest.registered_nodes[minetest.get_node(pos_above).name].buildable_to then
+			minetest.set_node(pos_above, {name="mcl_fire:basic_flame"})
+		end
+	end
+})
+
 -- spawn eggs
 mobs:register_egg("mobs_mc:blaze", "Spawn Blaze", "spawn_egg_blaze.png")
 
diff --git a/mods/mobs_mc/ghast.lua b/mods/mobs_mc/ghast.lua
index c74b91ef4..4233503a5 100644
--- a/mods/mobs_mc/ghast.lua
+++ b/mods/mobs_mc/ghast.lua
@@ -64,7 +64,7 @@ mobs:register_mob("mobs_mc:ghast", {
 	view_range = 16,
 	--attack_type = "dogshoot",
 	attack_type = "dogshoot",
-	arrow = "mobs_monster:fireball",
+	arrow = "mobs_mc:ghast_fireball",
 	shoot_interval = 3.5,
 	shoot_offset = 1,
 		--'dogshoot_switch' allows switching between shoot and dogfight modes inside dogshoot using timer (1 = shoot, 2 = dogfight)
@@ -83,25 +83,25 @@ mobs:register_mob("mobs_mc:ghast", {
 
 mobs:register_spawn("mobs_mc:ghast", {"mcl_core:flowing_lava", "nether:rack","air"}, 17, -1, 5000, 1, -2000)
 
--- fireball (weapon)
-mobs:register_arrow(":mobs_monster:fireball", {
+-- Ghast fireball
+mobs:register_arrow("mobs_mc:ghast_fireball", {
 	visual = "sprite",
 	visual_size = {x = 0.5, y = 0.5},
-	textures = {"mobs_fireball.png"},
+	textures = {"mcl_fire_fire_charge.png"},
 	velocity = 6,
 
 	-- direct hit, no fire... just plenty of pain
 	hit_player = function(self, player)
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
-			damage_groups = {fleshy = 8},
+			damage_groups = {fleshy = 6},
 		}, nil)
 	end,
 
 	hit_mob = function(self, player)
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
-			damage_groups = {fleshy = 8},
+			damage_groups = {fleshy = 6},
 		}, nil)
 	end,
 
@@ -113,7 +113,6 @@ mobs:register_arrow(":mobs_monster:fireball", {
 
 
 
-
 -- spawn eggs
 mobs:register_egg("mobs_mc:ghast", "Spawn Ghast", "spawn_egg_ghast.png")