plop

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

game/modules/tome/data/general/encounters/maj-eyal.lua

@@ -264,7 +264,7 @@ newEntity{
 
 		local g = mod.class.Grid.new{
 			show_tooltip=true,
-			name="Ring of Blood",
+			name="Hidden compound",
 			display='>', color=colors.CRIMSON,
 			notice = true,
 			change_level=1, change_zone="ring-of-blood"

game/modules/tome/data/maps/zones/ring-of-blood.lua

@@ -27,7 +27,7 @@ endy = 23
 -- defineTile section
 defineTile("#", "HARDWALL")
 defineTile("~", "LAVA_WALL")
-defineTile("<", "UP_WILDERNESS")
+defineTile("<", "UP")
 defineTile("-", "SAND")
 defineTile("O", "CONTROL_ORB")
 defineTile(".", "FLOOR")

game/modules/tome/data/quests/ring-of-blood.lua

@@ -92,7 +92,7 @@ on_turn = function(self)
 
 	local oldlev = game.zone.base_level
 	game.zone.base_level = 10
-	local filter = {type=rng.table{"animal", "humanoid"}, max_ood=3}
+	local filter = {type=rng.table{"animal", "humanoid"}, max_ood=3, special_rarity="slaver_rarity"}
 	local foe = game.zone:makeEntity(game.level, "actor", filter, nil, true)
 	local spot = game.level:pickSpot{type="arena", subtype="npc"}
 	local x, y = util.findFreeGrid(spot.x, spot.y, 20, true, {[engine.Map.ACTOR]=true})

game/modules/tome/data/zones/ring-of-blood/npcs.lua

@@ -17,13 +17,7 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-load("/data/general/npcs/rodent.lua", rarity(5))
-load("/data/general/npcs/vermin.lua", rarity(5))
-load("/data/general/npcs/molds.lua", rarity(5))
-load("/data/general/npcs/elven-warrior.lua", rarity(0))
-load("/data/general/npcs/elven-caster.lua", rarity(0))
-
-load("/data/general/npcs/all.lua", rarity(4, 35))
+load("/data/general/npcs/all.lua", function(e) e.slaver_rarity, e.rarity = e.rarity, nil end)
 
 local Talents = require("engine.interface.ActorTalents")
 
@@ -116,7 +110,7 @@ newEntity{ define_as = "PLAYER_SLAVE",
 	resolvers.equip{ {type="armor", subtype="light", auto_req=true} },
 
 	resolvers.talents{
-		[Talents.T_STRIKING_STANCE] = 1,
+		[Talents.T_EMPTY_HAND] = 1,
 		[Talents.T_DOUBLE_STRIKE] = 4,
 		[Talents.T_BODY_SHOT] = 3,
 		[Talents.T_RUSHING_STRIKE] = 1,
@@ -135,3 +129,75 @@ newEntity{ define_as = "PLAYER_SLAVE",
 
 	faction = "slavers",
 }
+
+
+-------------------------------------- NPCs
+
+newEntity{
+	define_as = "BASE_NPC_SLAVER",
+	type = "humanoid", subtype = "human",
+	display = "p", color=colors.DARK_KHAKI,
+--	faction = "slavers",
+
+	combat = { dam=resolvers.rngavg(5,12), atk=2, apr=6, physspeed=2 },
+
+	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },
+	resolvers.drops{chance=20, nb=1, {} },
+	resolvers.drops{chance=10, nb=1, {type="money"} },
+	infravision = 20,
+	lite = 1,
+
+	life_rating = 15,
+	rank = 2,
+	size_category = 3,
+
+	open_door = true,
+
+	resolvers.racial(),
+	resolvers.talents{ [Talents.T_HEAVY_ARMOUR_TRAINING]=1, [Talents.T_WEAPON_COMBAT]={base=1, every=5, max=10}, [Talents.T_WEAPONS_MASTERY]={base=1, every=5, max=10} },
+
+	autolevel = "warrior",
+	ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=3, },
+	energy = { mod=1 },
+	stats = { str=20, dex=8, mag=6, con=16 },
+}
+
+newEntity{ base = "BASE_NPC_SLAVER",
+	name = "slaver", color=colors.TEAL,
+	desc = [[A slaver.]],
+	level_range = {10, nil}, exp_worth = 1,
+	rarity = 1,
+	max_life = resolvers.rngavg(80,90), life_rating = 11,
+	resolvers.equip{
+		{type="weapon", subtype="staff", autoreq=true},
+	},
+	combat_armor = 0, combat_def = 6,
+	resolvers.talents{
+		[Talents.T_MANATHRUST]={base=3, every=5, max=6},
+		[Talents.T_FLAME]={base=3, every=5, max=6},
+		[Talents.T_LIGHTNING]={base=3, every=5, max=6},
+		[Talents.T_FLAMESHOCK]={base=3, every=5, max=6},
+	},
+
+	make_escort = {
+		{type="humanoid", subtype="human", name="enthralled slave", number=2},
+	}
+}
+
+newEntity{ base = "BASE_NPC_SLAVER",
+	name = "enthralled slave", color=colors.KHAKI,
+	desc = [[A slave.]],
+	level_range = {10, nil}, exp_worth = 1,
+	rarity = 20,
+	max_life = resolvers.rngavg(80,90), life_rating = 13,
+	combat_armor = 0, combat_def = 6,
+
+	resolvers.talents{
+		[Talents.T_UPPERCUT] = {base=3, every=5, max=6},
+		[Talents.T_EMPTY_HAND] = 1,
+		[Talents.T_CLINCH] = {base=3, every=5, max=6},
+		[Talents.T_MAIM] = {base=3, every=5, max=6},
+		[Talents.T_UNARMED_MASTERY] = {base=3, every=3, max=8},
+		[Talents.T_WEAPON_COMBAT] = {base=3, every=3, max=8},
+	},
+}

game/modules/tome/data/zones/ring-of-blood/zone.lua

@@ -19,9 +19,14 @@
 
 return {
 	name = "Ring of Blood",
+	display_name = function(x, y)
+		if game.level.level < 3 then return "Slavers Compound ("..game.level.level..")" end
+		return "Ring of Blood"
+	end,
+	variable_zone_name = true,
 	level_range = {10, 25},
 	level_scheme = "player",
-	max_level = 1,
+	max_level = 3,
 	decay = {300, 800},
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	width = 50, height = 50,
@@ -32,20 +37,55 @@ return {
 	max_material_level = 2,
 	generator =  {
 		map = {
-			class = "engine.generator.map.Static",
-			map = "zones/ring-of-blood",
+			class = "engine.generator.map.Forest",
+			zoom = 5,
+			sqrt_percent = 30,
+			noise = "fbm_perlin",
+			floor = "FLOOR",
+			wall = "WALL",
+			up = "UP",
+			down = "DOWN",
 		},
 		actor = {
 			class = "engine.generator.actor.Random",
-			nb_npc = {0, 0},
+			nb_npc = {10, 15},
 		},
 		object = {
 			class = "engine.generator.object.Random",
-			nb_object = {0, 0},
+			nb_object = {3, 5},
 		},
 		trap = {
 			class = "engine.generator.trap.Random",
-			nb_trap = {0, 0},
+			nb_trap = {6, 9},
+		},
+	},
+	levels = {
+		[1] = {
+			generator =  {
+				map = {
+					up = "UP_WILDERNESS",
+				},
+			},
+		},
+		[3] = {
+			generator =  {
+				map = {
+					class = "engine.generator.map.Static",
+					map = "zones/ring-of-blood",
+				},
+				actor = {
+					class = "engine.generator.actor.Random",
+					nb_npc = {0, 0},
+				},
+				object = {
+					class = "engine.generator.object.Random",
+					nb_object = {0, 0},
+				},
+				trap = {
+					class = "engine.generator.trap.Random",
+					nb_trap = {0, 0},
+				},
+			},
 		},
 	},
 	post_process = function(level)