From fe9b79c295eb4eae10a374b65b8164ca976fd451 Mon Sep 17 00:00:00 2001
From: Tai Kedzierski <dch.tai@gmail.com>
Date: Fri, 28 Dec 2018 00:39:40 +0000
Subject: [PATCH] no disrespect to Nathan Petrelli, but I dont think we should
 name monsterducks after him...!

---
 mobs/flying_duck.lua                              |   4 ++--
 mobs/spawn.lua                                    |   8 ++------
 models/{nathan_petrelli.x => flying_duck.x}       |   0
 textures/{nathan_petrelli.png => flying_duck.png} | Bin
 todo.txt                                          |   1 +
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename models/{nathan_petrelli.x => flying_duck.x} (100%)
 rename textures/{nathan_petrelli.png => flying_duck.png} (100%)

diff --git a/mobs/flying_duck.lua b/mobs/flying_duck.lua
index bb22418..1d3d22f 100644
--- a/mobs/flying_duck.lua
+++ b/mobs/flying_duck.lua
@@ -4,8 +4,8 @@ mobs:register_mob("nssm:flying_duck", {
     hp_min = 10,
     collisionbox = {-0.3, -0.2, -0.3, 0.3, 0.2, 0.3},
     visual = "mesh",
-    mesh = "nathan_petrelli.x",
-    textures = {{"nathan_petrelli.png"}},
+    mesh = "flying_duck.x",
+    textures = {{"flying_duck.png"}},
     visual_size = {x=1, y=1},
     view_range = 30,
     walk_velocity = 2,
diff --git a/mobs/spawn.lua b/mobs/spawn.lua
index 03ce41b..2717eb6 100644
--- a/mobs/spawn.lua
+++ b/mobs/spawn.lua
@@ -86,6 +86,7 @@ if mm ~= 0 then
 
         -- FOREST
 
+        -- Mantis larvae
         mobs:spawn_specific("nssm:larva", {"default:dirt_with_grass"}, {"default:tree","default:aspen_tree"},
 			0, 20, 40, 200000/mm, 1, -31000, 140)
 
@@ -186,18 +187,13 @@ if mm ~= 0 then
 
         -- FOREST
 
+        -- Mantis larvae
         mobs:spawn_specific("nssm:larva", {"default:dirt_with_grass"}, {"default:tree","default:aspen_tree"},
 			0, 20, 40, 800000/mm, 1, -31000, 140)
 
         mobs:spawn_specific("nssm:masticone", {"default:dirt_with_grass"}, {"default:tree","default:aspen_tree"},
 			0, 20, 180, 6000000/mm, 2, -31000, 140)
 
-        mobs:spawn_specific("nssm:mantis", {"default:dirt_with_grass"}, {"default:tree","default:aspen_tree"},
-			0, 20, 40, 1000000/mm, 1, -31000, 140)
-
-        mobs:spawn_specific("nssm:mantis_beast", {"default:dirt_with_grass"}, {"default:tree","default:aspen_tree"},
-			0, 20, 40, 100000/mm, 1, -31000, 140)
-
         -- PINE FOREST
 
         mobs:spawn_specific("nssm:pumpboom_small", {"default:dirt_with_grass", "default:dirt_with_snow","default:snowblock"}, {"default:pine_tree"},
diff --git a/models/nathan_petrelli.x b/models/flying_duck.x
similarity index 100%
rename from models/nathan_petrelli.x
rename to models/flying_duck.x
diff --git a/textures/nathan_petrelli.png b/textures/flying_duck.png
similarity index 100%
rename from textures/nathan_petrelli.png
rename to textures/flying_duck.png
diff --git a/todo.txt b/todo.txt
index f2c34fe..b143745 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,6 +1,7 @@
 Mobs bugs + changes
 
 * Ensure phoenix cannot burn through unswappable
+* Check darts.lua - this is where phoenix "arrow" is defined, these routines do not have protection checks
 
 Server-oriented changes