OUPS ! give all summons and bosses infravision/lite/...

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

game/modules/tome/data/talents/gifts/summon-distance.lua

@@ -154,6 +154,7 @@ newTalent{
 
 			max_life = resolvers.rngavg(5,10),
 			life_rating = 8,
+			infravision = 20,
 
 			combat_armor = 0, combat_def = 0,
 			combat = { dam=1, atk=1, },
@@ -220,6 +221,7 @@ newTalent{
 
 			max_life = resolvers.rngavg(5,10),
 			life_rating = 10,
+			infravision = 20,
 
 			combat_armor = 7, combat_def = 0,
 			combat = { dam=12, atk=5, },
@@ -289,6 +291,7 @@ newTalent{
 
 			max_life = resolvers.rngavg(5,10),
 			life_rating = 8,
+			infravision = 20,
 
 			combat_armor = 0, combat_def = 0,
 			combat = { dam=1, atk=1, },
@@ -357,6 +360,7 @@ newTalent{
 
 			max_life = resolvers.rngavg(100, 150),
 			life_rating = 12,
+			infravision = 20,
 
 			combat_armor = 0, combat_def = 0,
 			combat = { dam=15, atk=10, apr=15 },

game/modules/tome/data/talents/gifts/summon-melee.lua

@@ -54,7 +54,8 @@ newTalent{
 			level_range = {self.level, self.level}, exp_worth = 0,
 
 			max_life = resolvers.rngavg(25,50),
-			life_rating = 4,
+			life_rating = 6,
+			infravision = 20,
 
 			combat_armor = 2, combat_def = 4,
 			combat = { dam=resolvers.rngavg(12,25), atk=10, apr=10, dammod={str=0.8} },
@@ -117,6 +118,7 @@ newTalent{
 
 			max_life = resolvers.rngavg(25,50),
 			life_rating = 15,
+			infravision = 20,
 
 			combat_armor = 1, combat_def = 1,
 			never_move = 1,
@@ -178,6 +180,7 @@ newTalent{
 			max_stamina = 100,
 			life_rating = 13,
 			max_life = resolvers.rngavg(50,80),
+			infravision = 20,
 
 			autolevel = "none",
 			ai = "summoned", ai_real = "dumb_talented_simple", ai_state = { talent_in=2, },
@@ -247,6 +250,7 @@ newTalent{
 			max_stamina = 100,
 			life_rating = 13,
 			max_life = resolvers.rngavg(50,80),
+			infravision = 20,
 
 			autolevel = "none",
 			ai = "summoned", ai_real = "dumb_talented_simple", ai_state = { talent_in=2, },

game/modules/tome/data/talents/gifts/summon-utility.lua

@@ -177,6 +177,7 @@ newTalent{
 
 			max_life = 100,
 			life_rating = 14,
+			infravision = 20,
 
 			combat_armor = 10, combat_def = 0,
 			combat = { dam=1, atk=1, },
@@ -243,6 +244,7 @@ newTalent{
 
 			max_life = 50,
 			life_rating = 10,
+			infravision = 20,
 
 			combat_armor = 0, combat_def = 0,
 			combat = { dam=resolvers.rngavg(20,25), atk=16, apr=9, damtype=DamageType.NATURE, dammod={dex=1.2} },
@@ -309,6 +311,7 @@ newTalent{
 
 			max_life = resolvers.rngavg(5,10),
 			life_rating = 8,
+			infravision = 20,
 
 			combat_armor = 0, combat_def = 0,
 			combat = { dam=1, atk=1, },

game/modules/tome/data/talents/spells/nature.lua

@@ -128,6 +128,7 @@ newTalent{
 
 			resolvers.talents{ [Talents.T_STUN]=2 },
 			max_stamina = 100,
+			infravision = 20,
 
 			resists = { [DamageType.COLD] = 20, [DamageType.NATURE] = 20 },
 			level_range = {self.level, self.level}, exp_worth = 0,

game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua

@@ -39,6 +39,7 @@ newEntity{ define_as = "GREATER_MUMMY_LORD",
 	rank = 4,
 	size_category = 2,
 	open_door = true,
+	infravision = 20,
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, },
 	equipment = resolvers.equip{
@@ -80,6 +81,7 @@ newEntity{ base = "BASE_NPC_MUMMY",
 	max_life = resolvers.rngavg(120,140),
 	ai_state = { talent_in=4, },
 	stats = { mag=25, wil=20, },
+	infravision = 20,
 
 	resolvers.equip{
 		{type="weapon", subtype="greatsword", autoreq=true},
@@ -101,6 +103,7 @@ newEntity{ base = "BASE_NPC_MUMMY",
 	max_life = resolvers.rngavg(20,40), life_rating=4,
 	ai_state = { talent_in=2, },
 	never_move = 1,
+	infravision = 20,
 
 	resolvers.equip{
 		{type="armor", subtype="mummy", ego_chance=100, autoreq=true},
@@ -121,6 +124,7 @@ newEntity{ base = "BASE_NPC_MUMMY",
 	rarity = 3,
 	max_life = resolvers.rngavg(60,80), life_rating=7,
 	ai_state = { talent_in=4, },
+	infravision = 20,
 
 	resolvers.equip{
 		{type="armor", subtype="mummy", autoreq=true},

game/modules/tome/data/zones/ardhungol/npcs.lua

@@ -29,6 +29,7 @@ newEntity{ define_as = "UNGOLE", base = "BASE_NPC_SPIDER",
 	stats = { str=25, dex=10, cun=47, mag=10, con=20 },
 	rank = 4,
 	size_category = 4,
+	infravision = 20,
 
 	combat_armor = 17, combat_def = 17,
 	resists = { [DamageType.FIRE] = 20, [DamageType.ACID] = 20, [DamageType.COLD] = 20, [DamageType.LIGHTNING] = 20, },

game/modules/tome/data/zones/carn-dum/npcs.lua

@@ -38,6 +38,7 @@ newEntity{ define_as = "RANTHA_THE_WORM",
 	rank = 4,
 	size_category = 5,
 	combat_armor = 17, combat_def = 14,
+	infravision = 20,
 
 	resists = { [DamageType.FIRE] = -20, [DamageType.COLD] = 100 },
 

game/modules/tome/data/zones/flooded-cave/npcs.lua

@@ -36,6 +36,7 @@ newEntity{ define_as = "UKLLMSWWIK",
 	rank = 4,
 	size_category = 4,
 	can_breath={water=1},
+	infravision = 20,
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
 	drops = resolvers.drops{chance=100, nb=3, {ego_chance=100} },

game/modules/tome/data/zones/maze/npcs.lua

@@ -41,6 +41,7 @@ newEntity{ define_as = "MINOTAUR_MAZE",
 	stats = { str=25, dex=10, cun=8, mag=20, wil=20, con=20 },
 	rank = 4,
 	size_category = 4,
+	infravision = 20,
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, },
 	equipment = resolvers.equip{

game/modules/tome/data/zones/moria/npcs.lua

@@ -34,6 +34,7 @@ newEntity{ define_as = "GOLBUG",
 	max_stamina = 245,
 	rank = 5,
 	size_category = 3,
+	infravision = 20,
 	stats = { str=22, dex=19, cun=34, mag=10, con=16 },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, NECK=1, HEAD=1, },

game/modules/tome/data/zones/old-forest/npcs.lua

@@ -44,6 +44,7 @@ newEntity{ define_as = "OLD_MAN_WILLOW",
 	stats = { str=25, dex=10, cun=8, mag=20, wil=20, con=20 },
 	rank = 4,
 	size_category = 5,
+	infravision = 20,
 
 	resists = { [DamageType.FIRE] = -50 },
 

game/modules/tome/data/zones/sandworm-lair/npcs.lua

@@ -55,6 +55,7 @@ newEntity{ define_as = "SANDWORM_QUEEN",
 	max_life = 150, life_rating = 17, fixed_rating = true,
 	max_stamina = 85,
 	max_mana = 85,
+	infravision = 20,
 	stats = { str=25, dex=10, cun=8, mag=20, wil=20, con=20 },
 
 	stun_immune = 1,

game/modules/tome/data/zones/tol-falas-ambush/npcs.lua

@@ -31,6 +31,7 @@ newEntity{ base="BASE_NPC_ORC", define_as = "UKRUK",
 	max_life = 1500, life_rating = 15, fixed_rating = true,
 	rank = 4,
 	size_category = 3,
+	infravision = 20,
 
 	stun_immune = 1,
 	blind_immune = 1,

game/modules/tome/data/zones/tol-falas/npcs.lua

@@ -37,6 +37,7 @@ newEntity{ define_as = "THE_MASTER",
 	max_stamina = 145,
 	rank = 5,
 	size_category = 3,
+	infravision = 20,
 	stats = { str=19, dex=19, cun=34, mag=25, con=16 },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, NECK=1, },

game/modules/tome/data/zones/tower-amon-sul/npcs.lua

@@ -37,6 +37,7 @@ newEntity{ define_as = "SHADE_OF_ANGMAR",
 	max_stamina = 85,
 	rank = 4,
 	size_category = 3,
+	infravision = 20,
 	stats = { str=16, dex=12, cun=14, mag=25, con=16 },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },

game/modules/tome/data/zones/town-gates-of-morning/npcs.lua

@@ -33,6 +33,7 @@ newEntity{ define_as = "HIGH_SUN_PALADIN_AERYN",
 	size_category = 3,
 	female = true,
 	max_life = 250, life_rating = 14, fixed_rating = true,
+	infravision = 20,
 	stats = { str=15, dex=10, cun=12, mag=16, con=14 },
 
 	open_door = true,

game/modules/tome/data/zones/town-sunwall-outpost/npcs.lua

@@ -33,6 +33,7 @@ newEntity{ define_as = "SUN_PALADIN_TORNUK",
 	size_category = 3,
 	female = true,
 	max_life = 150, life_rating = 14, fixed_rating = true,
+	infravision = 20,
 	stats = { str=15, dex=10, cun=12, mag=16, con=14 },
 
 	open_door = true,

game/modules/tome/data/zones/trollshaws/npcs.lua

@@ -42,6 +42,7 @@ newEntity{ define_as = "TROLL_BILL",
 	stats = { str=25, dex=10, cun=8, mag=10, con=20 },
 	rank = 4,
 	size_category = 4,
+	infravision = 20,
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
 	equipment = resolvers.equip{ {type="weapon", subtype="greatmaul", defined="GREATMAUL_BILL_TRUNK", autoreq=true}, },

game/modules/tome/data/zones/unremarkable-cave/npcs.lua

@@ -36,6 +36,7 @@ newEntity{ define_as = "FILLAREL",
 	negative_regen = 10,
 	rank = 4,
 	size_category = 3,
+	infravision = 20,
 	stats = { str=10, dex=22, cun=25, mag=20, con=12 },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },

src/map.c

@@ -29,6 +29,7 @@
 #include "script.h"
 //#include "shaders.h"
 
+extern bool shaders_active;
 extern void useShader(GLuint p, int x, int y, float a);
 
 static int map_object_new(lua_State *L)
@@ -406,9 +407,9 @@ inline void display_map_quad(map_type *map, int dx, int dy, map_object *m, int i
 	}
 	int z;
 	if (m->shader) useShader(m->shader, i, j, a);
-	for (z = m->nb_textures - 1; z >= 0; z--)
+	for (z = (!shaders_active) ? 0 : (m->nb_textures - 1); z >= 0; z--)
 	{
-		glActiveTexture(GL_TEXTURE0+z);
+		if (shaders_active) glActiveTexture(GL_TEXTURE0+z);
 		glBindTexture(m->textures_is3d[z] ? GL_TEXTURE_3D : GL_TEXTURE_2D, m->textures[z]);
 	}
 	glBegin(GL_QUADS);