move undead to templates

Zireael07 · Sep 19, 2013 · e73bf0a · e73bf0a
1 parent 756ccdd
commit e73bf0a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 76 deletions.
diff --git a/data/general/npcs/animals.lua b/data/general/npcs/animals.lua
@@ -271,10 +271,14 @@ newEntity{
 	movement_speed_bonus = 0.66,
 }
 
-newEntity{ base = "BASE_NPC_ANIMAL",
+newEntity{
 	define_as = "BASE_NPC_TORTOISE",
 	display = 'B', color=colors.DARK_GREEN,
+	body = { INVEN = 10 },
 	desc = [[A large tortoise.]],
+
+
+	ai = "dumb_talented_simple", ai_state = { talent_in=3, },
 	stats = { str=17, dex=10, con=21, int=2, wis=15, cha=7, luc=2 },
 	combat = { dam= {1,10} },
 	skill_spot = 2,

diff --git a/data/general/npcs/templates/humanoid.lua b/data/general/npcs/templates/humanoid.lua
@@ -74,4 +74,22 @@ newEntity {
 	[DamageType.COLD] = 10,
 	[DamageType.ELECTRIC] = 10,
 	 }
+}
+
+--Undead templates
+newEntity {
+	name = " skeleton", suffix = true, instant_resolve = true,
+	keywords = {undead=true},
+	level_range = {5, nil},
+	rarity = 5,
+	infravision = 3,
+	combat = { dam= {1,6} },
+}
+
+newEntity {
+	name = " zombie", suffix = true, instant_resolve = true,
+	keywords = {undead=true},
+	level_range = {5, nil},
+	rarity = 5,
+	combat = { dam= {1,6} },
 }
diff --git a/data/general/npcs/undead.lua b/data/general/npcs/undead.lua
diff --git a/data/zones/cavern/npcs.lua b/data/zones/cavern/npcs.lua
@@ -16,8 +16,6 @@
 
 load("/data/general/npcs/humanoid.lua")
 
-load("/data/general/npcs/undead.lua")
-
 load("/data/general/npcs/animals.lua")
 
 load("/data/general/npcs/aberration.lua")

diff --git a/data/zones/dungeon/npcs.lua b/data/zones/dungeon/npcs.lua
@@ -16,8 +16,6 @@
 
 load("/data/general/npcs/humanoid.lua")
 
-load("/data/general/npcs/undead.lua")
-
 load("/data/general/npcs/animals.lua")
 
 load("/data/general/npcs/aberration.lua")