All demons are now part of the Fearscape faction

All creatures in the Crypt of Kryl-Feijan are now part of the Fearscape faction


git-svn-id: http://svn.net-core.org/repos/t-engine4@3940 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/data/factions.lua

@@ -19,31 +19,32 @@
 
 -- CSV export
 local src = [[
-,Enemies,Undead,Allied Kingdoms,Shalore,Thalore,Iron Throne,The Way,Angolwen,Dreadfell,,Temple of Creation|H,Water lair|H,Assassin lair|H,Rhalore,Zigur,,Sunwall|H,Orc Pride,,Sandworm Burrowers,Victim,Slavers,,Sorcerers
-Enemies,,,,,,,,,,,,,,,,,,,,,,,,
-Undead,-1,,,,,,,,,,,,,,,,,,,,,,,
-Allied Kingdoms,-1,-1,,,,,,,,,,,,,,,,,,,,,,
-Shalore,-1,-1,0.5,,,,,,,,,,,,,,,,,,,,,
-Thalore,-1,-1,0.7,0.2,,,,,,,,,,,,,,,,,,,,
-Iron Throne,-1,-1,0.2,0.2,0.2,,,,,,,,,,,,,,,,,,,
-The Way,-1,-1,0,0,0,0,,,,,,,,,,,,,,,,,,
-Angolwen,-1,-1,,,,,,,,,,,,,,,,,,,,,,
-Dreadfell,,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,
-Temple of Creation|H,,,,,,,,,,,,,,,,,,,,,,,,
-Water lair|H,-1,,,,,,,,,,-1,,,,,,,,,,,,,
-Assassin lair|H,,,,,,,,,,,,,,,,,,,,,,,,
-Rhalore,-1,-1,-1,-1,-1,-1,-1,-1,-1,,-1,-1,-1,,,,,,,,,,,
-Zigur,-1,-1,1,1,1,1,0.2,-1,-1,,,,,-1,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,
-Sunwall|H,-1,-1,,,,,,,-1,,,,-1,-1,,,,,,,,,,
-Orc Pride,,-1,-1,-1,-1,-1,-1,-1,-1,,,,,-1,-1,,-1,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,
-Sandworm Burrowers,,,,,,,,,,,,,,,,,,,,,,,,
-Victim,,,,,,,,,,,,,,,,,,,,,,,,
-Slavers,-1,,,,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,
-Sorcerers,,-1,-1,-1,-1,-1,-1,-1,-1,,,,,-1,-1,,-1,1,,,,,,
+,Enemies,Undead,Allied Kingdoms,Shalore,Thalore,Iron Throne,The Way,Angolwen,Dreadfell,,Temple of Creation|H,Water lair|H,Assassin lair|H,Rhalore,Zigur,,Sunwall|H,Orc Pride,,Sandworm Burrowers,Victim,Slavers,,Sorcerers,Fearscape
+Enemies,,,,,,,,,,,,,,,,,,,,,,,,,
+Undead,-1,,,,,,,,,,,,,,,,,,,,,,,,
+Allied Kingdoms,-1,-1,,,,,,,,,,,,,,,,,,,,,,,
+Shalore,-1,-1,0.5,,,,,,,,,,,,,,,,,,,,,,
+Thalore,-1,-1,0.7,0.2,,,,,,,,,,,,,,,,,,,,,
+Iron Throne,-1,-1,0.2,0.2,0.2,,,,,,,,,,,,,,,,,,,,
+The Way,-1,-1,0,0,0,0,,,,,,,,,,,,,,,,,,,
+Angolwen,-1,-1,,,,,,,,,,,,,,,,,,,,,,,
+Dreadfell,,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,
+Temple of Creation|H,,,,,,,,,,,,,,,,,,,,,,,,,
+Water lair|H,-1,,,,,,,,,,-1,,,,,,,,,,,,,,
+Assassin lair|H,,,,,,,,,,,,,,,,,,,,,,,,,
+Rhalore,-1,-1,-1,-1,-1,-1,-1,-1,-1,,-1,-1,-1,,,,,,,,,,,,
+Zigur,-1,-1,1,1,1,1,0.2,-1,-1,,,,,-1,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,
+Sunwall|H,-1,-1,,,,,,,-1,,,,-1,-1,,,,,,,,,,,
+Orc Pride,,-1,-1,-1,-1,-1,-1,-1,-1,,,,,-1,-1,,-1,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,
+Sandworm Burrowers,,,,,,,,,,,,,,,,,,,,,,,,,
+Victim,,,,,,,,,,,,,,,,,,,,,,,,,
+Slavers,-1,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,
+Sorcerers,,-1,-1,-1,-1,-1,-1,-1,-1,,,,,-1,-1,,-1,1,,,,,,,
+Fearscape,,,-1,-1,-1,-1,-1,-1,,,-1,-1,-1,-1,-1,,-1,,,,,,,,
 ]]
 
 local facts = {}

game/modules/tome/data/general/npcs/major-demon.lua

@@ -26,6 +26,7 @@ newEntity{
 	type = "demon", subtype = "major",
 	display = "U", color=colors.WHITE,
 	blood_color = colors.GREEN,
+	faction = "fearscape",
 	body = { INVEN = 10 },
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=1, },

game/modules/tome/data/general/npcs/minor-demon.lua

@@ -26,6 +26,7 @@ newEntity{
 	type = "demon", subtype = "minor",
 	display = "u", color=colors.WHITE,
 	blood_color = colors.GREEN,
+	faction = "fearscape",
 	body = { INVEN = 10 },
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=1, },

game/modules/tome/data/zones/crypt-kryl-feijan/npcs.lua

@@ -29,9 +29,10 @@ newEntity{ base="BASE_NPC_MAJOR_DEMON", define_as = "KRYL_FEIJAN",
 	desc = [[This huge demon is covered in darkness. The ripped flesh of its "mother" still hangs from its sharp claws.]],
 	killer_message = "and devoured as a demonic breakfast",
 	level_range = {29, nil}, exp_worth = 2,
-	rank = 3.5,
+	faction = "fearscape",
+	rank = 4,
 	size_category = 4,
-	max_life = 250, life_rating = 22, fixed_rating = true,
+	max_life = 250, life_rating = 27, fixed_rating = true,
 	infravision = 10,
 	stats = { str=15, dex=10, cun=42, mag=16, con=14 },
 	move_others=true,
@@ -82,7 +83,7 @@ newEntity{ define_as = "MELINDA",
 	autolevel = "tank",
 	ai = "summoned", ai_real = "move_dmap", ai_state = { ai_target="target_player", talent_in=4, },
 	stats = { str=8, dex=7, mag=8, con=12 },
-	faction = "victim",
+	faction = "victim", hard_faction = "victim",
 	never_anger = true,
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },

game/modules/tome/data/zones/crypt-kryl-feijan/zone.lua

@@ -58,6 +58,9 @@ return {
 			nb_trap = {6, 9},
 		},
 	},
+	post_process = function(level)
+		for uid, e in pairs(level.entities) do e.faction = e.hard_faction or "fearscape" end
+	end,
 	on_enter = function(lev)
 		if lev < 4 then
 			require("engine.ui.Dialog"):simplePopup("Crypt", "You hear an eerie chanting echoing from a distance.")

game/modules/tome/data/zones/demon-plane/npcs.lua

@@ -29,6 +29,7 @@ newEntity{ define_as = "DRAEBOR",
 	name = "Draebor, the Imp",
 	display = "u", color=colors.VIOLET,
 	desc = [[An intensely irritating git of a monster.]],
+	faction = "fearscape",
 	level_range = {35, nil}, exp_worth = 3,
 	max_life = 300, life_rating = 22, fixed_rating = true,
 	rank = 4,