oups

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

game/modules/tome/class/GameState.lua

@@ -1030,7 +1030,7 @@ local random_zone_themes = {
 	} end },
 }
 
-function _M:debugRandomZone()
+function _M:createRandomZone()
 	------------------------------------------------------------
 	-- Select theme
 	------------------------------------------------------------
@@ -1073,6 +1073,14 @@ function _M:debugRandomZone()
 	local layout = rng.table(random_zone_layouts)
 	print("[RANDOM ZONE] Using layout", layout.name)
 
+	------------------------------------------------------------
+	-- Select Music
+	------------------------------------------------------------
+	local musics = {}
+	for i, file in ipairs(fs.list("/data/music/")) do
+		if file:find("%.ogg$") then musics[#musics+1] = file end
+	end
+
 	local zone = engine.Zone.new("random_zone", {
 		name = "Random Zone!!",
 		level_range = {data.min_lev, data.max_lev},
@@ -1082,7 +1090,7 @@ function _M:debugRandomZone()
 		width = data.w, height = data.h,
 		color_shown = data.tint_s,
 		color_obscure = data.tint_o,
-		ambient_music = "a_lomos_del_dragon_blanco.ogg",
+		ambient_music = music,
 		generator =  {
 			map = layout.gen(data),
 			actor = { class = "engine.generator.actor.Random",nb_npc = {5, 7}, },
@@ -1093,5 +1101,9 @@ function _M:debugRandomZone()
 		object_list = mod.class.Object:loadList("/data/general/objects/objects.lua"),
 		trap_list = mod.class.Trap:loadList("/data/general/traps/alarm.lua"),
 	})
-	game:changeLevel(1, zone)
+	return zone
+end
+
+function _M:debugRandomZone()
+	game:changeLevel(1, self:createRandomZone())
 end

game/modules/tome/data/zones/high-peak/npcs.lua

@@ -76,6 +76,7 @@ newEntity{
 	combat_armor = 20,
 	combat_def = 20,
 
+	no_auto_resists = true,
 	resists = { all = 45, },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, FEET=1 },
@@ -88,28 +89,28 @@ newEntity{
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 
 	resolvers.talents{
-		[Talents.T_STONE_SKIN]=7,
-		[Talents.T_QUICKEN_SPELLS]=7,
-		[Talents.T_SPELL_SHAPING]=7,
-		[Talents.T_ARCANE_POWER]=7,
-		[Talents.T_ESSENCE_OF_SPEED]=7,
-		[Talents.T_HYMN_OF_SHADOWS]=7,
-
-		[Talents.T_FLAME]=7,
-		[Talents.T_FREEZE]=7,
-		[Talents.T_LIGHTNING]=7,
-		[Talents.T_MANATHRUST]=7,
-		[Talents.T_FLAMESHOCK]=7,
-		[Talents.T_STRIKE]=7,
-		[Talents.T_HEAL]=7,
-		[Talents.T_REGENERATION]=7,
-		[Talents.T_ILLUMINATE]=7,
-		[Talents.T_METAFLOW]=7,
-		[Talents.T_PHASE_DOOR]=7,
-
-		[Talents.T_MOONLIGHT_RAY]=7,
-		[Talents.T_STARFALL]=7,
-		[Talents.T_TWILIGHT_SURGE]=7,
+		[Talents.T_STONE_SKIN]={base=7, every=6},
+		[Talents.T_QUICKEN_SPELLS]={base=7, every=6},
+		[Talents.T_SPELL_SHAPING]={base=7, every=6},
+		[Talents.T_ARCANE_POWER]={base=7, every=6},
+		[Talents.T_ESSENCE_OF_SPEED]={base=7, every=6},
+		[Talents.T_HYMN_OF_SHADOWS]={base=7, every=6},
+
+		[Talents.T_FLAME]={base=7, every=6},
+		[Talents.T_FREEZE]={base=7, every=6},
+		[Talents.T_LIGHTNING]={base=7, every=6},
+		[Talents.T_MANATHRUST]={base=7, every=6},
+		[Talents.T_FLAMESHOCK]={base=7, every=6},
+		[Talents.T_STRIKE]={base=7, every=6},
+		[Talents.T_HEAL]={base=7, every=6},
+		[Talents.T_REGENERATION]={base=7, every=6},
+		[Talents.T_ILLUMINATE]={base=7, every=6},
+		[Talents.T_METAFLOW]={base=7, every=6},
+		[Talents.T_PHASE_DOOR]={base=7, every=6},
+
+		[Talents.T_MOONLIGHT_RAY]={base=7, every=6},
+		[Talents.T_STARFALL]={base=7, every=6},
+		[Talents.T_TWILIGHT_SURGE]={base=7, every=6},
 	},
 	resolvers.sustains_at_birth(),
 
@@ -149,6 +150,7 @@ newEntity{
 	combat_armor = 20,
 	combat_def = 20,
 
+	no_auto_resists = true,
 	resists = { all = 65, },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, FEET=1, HEAD=1, HANDS=1 },
@@ -165,29 +167,29 @@ newEntity{
 
 	resolvers.talents{
 		[Talents.T_RUSH]=6,
-		[Talents.T_BONE_GRAB]=7,
-		[Talents.T_BONE_SPEAR]=7,
-		[Talents.T_BONE_SHIELD]=7,
-		[Talents.T_BURNING_HEX]=7,
-		[Talents.T_EMPATHIC_HEX]=7,
-		[Talents.T_CURSE_OF_VULNERABILITY]=7,
-		[Talents.T_CURSE_OF_DEFENSELESSNESS]=7,
-		[Talents.T_CURSE_OF_DEATH]=7,
-		[Talents.T_VIRULENT_DISEASE]=7,
-		[Talents.T_CYST_BURST]=7,
-		[Talents.T_CATALEPSY]=7,
-		[Talents.T_EPIDEMIC]=7,
-		[Talents.T_REND]=7,
-		[Talents.T_RUIN]=7,
-		[Talents.T_DARK_SURPRISE]=7,
-		[Talents.T_CORRUPTED_STRENGTH]=7,
-		[Talents.T_BLOODLUST]=7,
-		[Talents.T_ACID_BLOOD]=7,
-		[Talents.T_DRAIN]=7,
+		[Talents.T_BONE_GRAB]={base=7, every=6},
+		[Talents.T_BONE_SPEAR]={base=7, every=6},
+		[Talents.T_BONE_SHIELD]={base=7, every=6},
+		[Talents.T_BURNING_HEX]={base=7, every=6},
+		[Talents.T_EMPATHIC_HEX]={base=7, every=6},
+		[Talents.T_CURSE_OF_VULNERABILITY]={base=7, every=6},
+		[Talents.T_CURSE_OF_DEFENSELESSNESS]={base=7, every=6},
+		[Talents.T_CURSE_OF_DEATH]={base=7, every=6},
+		[Talents.T_VIRULENT_DISEASE]={base=7, every=6},
+		[Talents.T_CYST_BURST]={base=7, every=6},
+		[Talents.T_CATALEPSY]={base=7, every=6},
+		[Talents.T_EPIDEMIC]={base=7, every=6},
+		[Talents.T_REND]={base=7, every=6},
+		[Talents.T_RUIN]={base=7, every=6},
+		[Talents.T_DARK_SURPRISE]={base=7, every=6},
+		[Talents.T_CORRUPTED_STRENGTH]={base=7, every=6},
+		[Talents.T_BLOODLUST]={base=7, every=6},
+		[Talents.T_ACID_BLOOD]={base=7, every=6},
+		[Talents.T_DRAIN]={base=7, every=6},
 
 		[Talents.T_WEAPON_COMBAT]=10,
-		[Talents.T_WEAPONS_MASTERY]=7,
-		[Talents.T_MASSIVE_ARMOUR_TRAINING]=7,
+		[Talents.T_WEAPONS_MASTERY]={base=7, every=6},
+		[Talents.T_MASSIVE_ARMOUR_TRAINING]={base=7, every=6},
 	},
 	resolvers.sustains_at_birth(),