beawre of flooded lake of nur

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

game/modules/tome/data/general/npcs/horror_aquatic.lua

@@ -74,6 +74,7 @@ newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 	name = "swarming horror", color=colors.GREY,
 	desc ="This tiny fish-like creature moves erratically, but is constantly surrounded by others of its kind.",
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_aquatic_swarming_horror.png", display_h=2, display_y=-1}}},
 	level_range = {10, nil}, exp_worth = 1,
 	rarity = 2,
 	hive_swarm_rarity = 1,
@@ -96,6 +97,7 @@ newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 	name = "ravenous horror", color=colors.GREY,
 	desc ="A vile looking liquid flows from the teeth of this agile monster. It glides through the water towards you, spined fins jutting outwards.",
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_aquatic_ravenous_horror.png", display_h=2, display_y=-1}}},
 	level_range = {10, nil}, exp_worth = 1,
 	rarity = 2,
 	autolevel = "warriormage",
@@ -114,6 +116,7 @@ newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 	name = "boiling horror", color=colors.BLUE,
 	desc ="This frothing ball of water rages with an intense heat.",
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_aquatic_boiling_horror.png", display_h=2, display_y=-1}}},
 	level_range = {14, nil}, exp_worth = 1,
 	rarity = 2,
 	autolevel = "caster",
@@ -142,6 +145,7 @@ newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 	name = "swarm hive", color=colors.BLACK,
 	desc ="This titanic mass of flesh pulsates and churns as tiny monsters burst from its orifaces.",
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_aquatic_swarm_hive.png", display_h=2, display_y=-1}}},
 	level_range = {15, nil}, exp_worth = 1,
 	rarity = 6,
 	rank = 3,
@@ -171,7 +175,7 @@ newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 	name = "abyssal horror", color=colors.BLACK,
 	desc = "This deep black form is shrouded in darkness. All you can make out are a pair of deep red eyes, hidden behind a mass of tentacles.",
-	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_eldritch_umbral_horror.png", display_h=2, display_y=-1}}},
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_eldritch_abyssal_horror.png", display_h=2, display_y=-1}}},
 	level_range = {16, nil}, exp_worth = 1,
 	rarity = 12, --Scary but rare
 	rank = 3,
@@ -203,5 +207,5 @@ newEntity{ base = "BASE_NPC_HORROR_AQUATIC",
 			
 			[Talents.T_TENTACLE_GRAB]={base=1, every=5, max=6},
 	},
-		resolvers.sustains_at_birth(),
+	resolvers.sustains_at_birth(),
 }
\ No newline at end of file

game/modules/tome/data/zones/lake-nur/npcs.lua

@@ -19,7 +19,7 @@
 
 load("/data/general/npcs/aquatic_critter.lua", function(e) if e.rarity then e.water_rarity, e.rarity = e.rarity, nil end end)
 load("/data/general/npcs/aquatic_demon.lua", function(e) if e.rarity then e.water_rarity, e.rarity = e.rarity, nil end end)
---load("/data/general/npcs/horror_aquatic.lua", function(e) if e.rarity then e.horror_water_rarity, e.rarity = e.rarity, nil end end)
+load("/data/general/npcs/horror_aquatic.lua", function(e) if e.rarity then e.horror_water_rarity, e.rarity = e.rarity, nil end end)
 load("/data/general/npcs/horror.lua", rarity(0))
 load("/data/general/npcs/snake.lua", rarity(3))
 load("/data/general/npcs/plant.lua", rarity(3))

game/modules/tome/data/zones/lake-nur/zone.lua

@@ -94,10 +94,11 @@ return {
 			generator = is_flooded and {
 				map = {
 					down = "SHERTUL_FORTRESS",
+					['.'] = {"WATER_FLOOR","WATER_FLOOR","WATER_FLOOR","WATER_FLOOR","WATER_FLOOR","WATER_FLOOR","WATER_FLOOR","WATER_FLOOR_BUBBLE"},
 					force_last_stair = true,
 				},
 				actor = {
-					filters = {{special_rarity="water_rarity"}},
+					filters = {{special_rarity="water_rarity"},{special_rarity="horror_water_rarity"}},
 					nb_npc = {30, 35},
 				},
 			} or {