tiles!

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

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

@@ -647,6 +647,7 @@ newEntity{ base = "BASE_NPC_HORROR",
 	name = "dreaming horror", color=colors.ORCHID,
 	desc =[[A vaguely tentacled yet constantly changing form rests here apparently oblivious to your existence.
 With each slow breath it takes reality distorts around it.  Blue twirls into red, green twists into yellow, and the air sings softly before bursting into a myriad of pastel shapes and colors.]],
+	resolvers.nice_tile{tall=1},
 	shader = "shadow_simulacrum",
 	shader_args = { color = {0.5, 0.5, 1.0}, base = 0.8, time_factor= 2000 },
 	level_range = {20, nil}, exp_worth = 1,
@@ -811,8 +812,8 @@ newEntity{ base = "BASE_NPC_HORROR", define_as = "DREAM_SEED",
 
 newEntity{ base="BASE_NPC_HORROR",
 	name = "Grgglck the Devouring Darkness", unique = true,
-	color = colors.DARK_GREY,
-	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/horror_eldritch_grgglck.png", display_h=2, display_y=-1}}},
+	color = colors.DARK_GREY, image = "npc/horror_eldritch_grgglck.png",
+	resolvers.nice_tile{tall=1},
 	rarity = 50,
 	desc = [[A horror from the deepest pits of the earth. It looks like a huge pile of tentacles all trying to reach for you.
 You can discern a huge round mouth covered in razor-sharp teeth.]],
@@ -907,6 +908,7 @@ newEntity{ base="BASE_NPC_HORROR", define_as = "GRGGLCK_TENTACLE",
 newEntity{ base = "BASE_NPC_HORROR",
 	name = "Ak'Gishil", color=colors.GREY, unique = true,
 	desc = "This blade horror has grown in power dramatically, and become a nexus of temporal energy. Rifts in space open around it constantly, summoning and banishing blades before vanishing as quickly as they appear.",
+	resolvers.nice_tile{tall=1},
 	level_range = {30, nil}, exp_worth = 1,
 	rarity = 55,
 	rank = 3.5,
@@ -961,7 +963,7 @@ newEntity{ base = "BASE_NPC_HORROR",
 }
 
 newEntity{ base="BASE_NPC_HORROR", define_as = "ANIMATED_BLADE",
-	type = "construct", subtype = "weapon", image="object/artifact/spectral_blade.png",
+	type = "construct", subtype = "weapon", image="object/artifact/magical_animated_sword.png",
 	name = "Animated Sword",
 	color = colors.GREY,
 	desc = [[Time seems to warp and bend around this floating weapon.]],

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

@@ -94,7 +94,6 @@ newEntity{ base = "BASE_NPC_TROLL",
 newEntity{ base = "BASE_NPC_TROLL",
 	name = "mountain troll thunderer", color=colors.AQUAMARINE, image="npc/troll_mt.png",
 	desc = [[A large and athletic troll with an extremely tough and warty hide.]],
-	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/giant_troll_mountain_troll_thunderer.png", display_h=2, display_y=-1}}},
 	level_range = {20, nil}, exp_worth = 1,
 	rarity = 5,
 	rank = 3,
@@ -113,9 +112,9 @@ newEntity{ base = "BASE_NPC_TROLL",
 }
 
 newEntity{ base = "BASE_NPC_TROLL",
-	name = "patchwork troll", color=colors.PURPLE, image="npc/troll_patchwork.png",
+	name = "patchwork troll", color=colors.PURPLE,
 	desc = [[A disgusting and mismatched construct of necromantically-enhanced troll bits and shattered weapons. Confused and furious, it rends and shatters its surroundings with impossible strength, moving with speed found nowhere in nature.]],
-	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/giant_troll_patchwork_troll.png", display_h=2, display_y=-1}}},
+	resolvers.nice_tile{tall=1},
 	level_range = {38, nil}, exp_worth = 1,
 	rarity = 6,
 	rank = 3,
@@ -144,7 +143,8 @@ newEntity{ base = "BASE_NPC_TROLL",
 }
 
 newEntity{ base = "BASE_NPC_TROLL", unique=true,
-	name = "Forest Troll Hedge-Wizard", color=colors.YELLOW_GREEN, image="npc/troll_f.png",
+	name = "Forest Troll Hedge-Wizard", color=colors.YELLOW_GREEN, 
+	resolvers.nice_tile{tall=1},
 	desc = [[This old looking troll glares at you with malice. His muscles appear atrophied, but a certain power surrounds him nonetheless.]],
 	level_range = {3, nil}, exp_worth = 2,
 	rank=3.5,
@@ -171,6 +171,6 @@ newEntity{ base = "BASE_NPC_TROLL", unique=true,
 	resolvers.sustains_at_birth(),
 	
 	resolvers.inscription("RUNE:_REFLECTION_SHIELD", {cooldown=14,}),
-	resolvers.drops{chance=100, nb=1, {defined="RUNE_REFLECT"} },
+	resolvers.drops{chance=100, nb=1, {defined="RUNE_REFLECT", random_art_replace={chance=50}} },
 	resolvers.drops{chance=100, nb=1, {tome_drops="boss"} },
 }

game/modules/tome/data/general/npcs/venom-drake.lua

@@ -84,7 +84,7 @@ newEntity{ base = "BASE_NPC_VENOM_DRAKE",
 newEntity{ base = "BASE_NPC_VENOM_DRAKE",
 	name = "venom wyrm", color=colors.LIGHT_GREEN, display="D",
 	desc = [[An old and powerful corrosive venom drake, armed with a deadly breath weapon and nasty claws.]],
-	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/dragon_venom_venom_wyrm.png", display_h=2, display_y=-1}}},
+	resolvers.nice_tile{tall=1},
 	level_range = {25, nil}, exp_worth = 1,
 	rarity = 5,
 	rank = 3,

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

@@ -123,40 +123,3 @@ newEntity{ base = "BASE_NPC_WIGHT",
 		[Talents.T_MIND_DISRUPTION]={base=4, every=5, max=8},
 	},
 }
-
--- The Void Spectre, the Aether Wight. Minor talents in all elements, but arcane through and through.
-newEntity{ base = "BASE_NPC_WIGHT",
-	name = "Void Spectre", color=colors.RED, image="npc/emperor_wight.png", unique=true,
-	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/emperor_wight.png", display_h=2, display_y=-1}}},
-	desc=[[Intense Arcane energy whirls in the air around this ethereal form. ]],
-	level_range = {45, nil}, exp_worth = 2,
-	life_rating=16,
-	rarity = 50,
-	rank = 3.5,
-	max_life = resolvers.rngavg(200,300),
-	max_mana = resolvers.rngavg(800,1200),
-	mana_regen = 5,
-	combat_armor = 12, combat_def = 30, combat_atk=30,
-	
-		combat = { dam=resolvers.mbonus(40, 20), atk=20, apr=15, damtype=DamageType.ARCANE },
-	
-		resists = { [DamageType.COLD] = 30, [DamageType.FIRE] = 30, [DamageType.LIGHTNING] = 30, [DamageType.PHYSICAL] = 0, [DamageType.LIGHT] = 0, [DamageType.ARCANE] = 100},
-
-	ai = "tactical",
-	resolvers.talents{ [Talents.T_FLAMESHOCK]={base=3, every=5, max=7}, [Talents.T_LIGHTNING]={base=4, every=5, max=8}, [Talents.T_GLACIAL_VAPOUR]={base=3, every=5, max=7}, [Talents.T_STRIKE]={base=3, every=5, max=7},
-		[Talents.T_ARCANE_POWER]={base=6, every=2, max=12},
-		[Talents.T_MANATHRUST]={base=6, every=4, max=10},
-		[Talents.T_ARCANE_VORTEX]={base=4, every=4, max=7},
-		[Talents.T_SPELLCRAFT]=5,
-		[Talents.T_AETHER_BEAM]={base=6, every=7, max=9},
-		[Talents.T_AETHER_BREACH]={base=3, every=6, max=6},
-		[Talents.T_HEAL]={base=2, every=6, max=6},
-		[Talents.T_SHIELDING]={base=3, every=6, max=6},
-		[Talents.T_ARCANE_SHIELD]={base=2, every=5, max=5},
-		[Talents.T_PURE_AETHER]={base=3, every=7, max=5},
-		[Talents.T_PHASE_DOOR]=10,
-	},
-	resolvers.sustains_at_birth(),
-	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
-	resolvers.drops{chance=100, nb=1, {defined="AETHER_RING"} },
-}
\ No newline at end of file

game/modules/tome/data/zones/dreams/zone.lua

@@ -277,7 +277,7 @@ You feel like running away!]], 600)
 				body = { INVEN = 10 },
 				infravision = 10,
 				stats = { str=12, dex=12, mag=3, con=10, cun=10, },
-				combat = {sound = {"actions/melee", pitch=0.6, vol=1.2}, sound_miss = {"actions/melee", pitch=0.6, vol=1.2}, dam=35, atk=15, apr=3 },
+				combat = {sound = {"actions/melee", pitch=0.6, vol=1.2}, sound_miss = {"actions/melee", pitch=0.6, vol=1.2}, dam=90, atk=15, apr=3 },
 				combat_armor = 5, combat_def = 5,
 				level_range = {1, 1}, exp_worth = 1,
 				max_life = 100, life_regen = 0,

game/modules/tome/data/zones/rak-shor-pride/npcs.lua

@@ -127,7 +127,7 @@ newEntity{ base = "BASE_NPC_GHOUL", define_as = "ROTTING_TITAN",
 	stats = { str=40, dex=20, mag=24, con=25 },
 	resists = {all = 25, [DamageType.PHYSICAL]=15, [DamageType.ARCANE]=-50, [DamageType.FIRE]=-20},
 
-	resolvers.equip{ {type="weapon", subtype="greatmaul", defined="ROTTING_MAUL", random_art_replace={chance=30}, autoreq=true, force_drop=true}, },
+	resolvers.equip{ {type="weapon", subtype="greatmaul", defined="ROTTING_MAUL", random_art_replace={chance=50}, autoreq=true, force_drop=true}, },
 
 	combat = { dam=resolvers.levelup(80, 1, 2), atk=resolvers.levelup(70, 1, 1), apr=20, dammod={str=1.3}, damtype=engine.DamageType.PHYSICAL, },
 
@@ -228,7 +228,7 @@ newEntity{ base = "BASE_NPC_GHOST", define_as = "GLACIAL_LEGION",
 		[Talents.T_FROST_HANDS]={base=3, every=7, max=8},
 	},
 	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
-	resolvers.drops{chance=100, nb=1, {defined="GLACIAL_CLOAK"} },
+	resolvers.drops{chance=100, nb=1, {defined="GLACIAL_CLOAK", random_art_replace={chance=50}} },
 }
 
 --Heavy Sentinel, flaming bone giant.
@@ -275,7 +275,7 @@ newEntity{ base = "BASE_NPC_BONE_GIANT", define_as = "HEAVY_SENTINEL",
 	},
 	resolvers.sustains_at_birth(),
 	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
-	resolvers.drops{chance=100, nb=1, {defined="ARMOR_MOLTEN"} },
+	resolvers.drops{chance=100, nb=1, {defined="ARMOR_MOLTEN", random_art_replace={chance=50}} },
 }
 
 -- Arch Zephyr, Vampiric Storm Lord. Wields a bow and lightning magic with equal effectiveness, and moves quickly.
@@ -298,7 +298,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE", unique=true, define_as="ARCH_ZEPHYR",
 	combat_spellpower = 40,
 
 	ai = "tactical", ai_state = { talent_in=4, },
-	resolvers.equip{ {type="weapon", subtype="longbow", defined="STORM_FURY", random_art_replace={chance=20}, autoreq=true, force_drop=true}, {type="ammo", subtype="arrow", autoreq=true} },
+	resolvers.equip{ {type="weapon", subtype="longbow", defined="STORM_FURY", random_art_replace={chance=50}, autoreq=true, force_drop=true}, {type="ammo", subtype="arrow", autoreq=true} },
 
 	resists = { [DamageType.LIGHTNING] = 100, [DamageType.PHYSICAL] = -20, [DamageType.LIGHT] = 30,  },
 	resolvers.talents{
@@ -322,4 +322,41 @@ newEntity{ base = "BASE_NPC_VAMPIRE", unique=true, define_as="ARCH_ZEPHYR",
 		[Talents.T_STEADY_SHOT]={base=4, every=5, max=10},
 	},
 	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
-}
\ No newline at end of file
+}
+
+-- The Void Spectre, the Aether Wight. Minor talents in all elements, but arcane through and through.
+newEntity{ base = "BASE_NPC_WIGHT",
+	name = "Void Spectre", color=colors.RED, unique=true,
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_wight_void_spectre.png", display_h=2, display_y=-1}}},
+	desc=[[Intense Arcane energy whirls in the air around this ethereal form. ]],
+	level_range = {45, nil}, exp_worth = 2,
+	life_rating=16,
+	rarity = 50,
+	rank = 3.5,
+	max_life = resolvers.rngavg(200,300),
+	max_mana = resolvers.rngavg(800,1200),
+	mana_regen = 5,
+	combat_armor = 12, combat_def = 30, combat_atk=30,
+	
+		combat = { dam=resolvers.mbonus(40, 20), atk=20, apr=15, damtype=DamageType.ARCANE },
+	
+		resists = { [DamageType.COLD] = 30, [DamageType.FIRE] = 30, [DamageType.LIGHTNING] = 30, [DamageType.PHYSICAL] = 0, [DamageType.LIGHT] = 0, [DamageType.ARCANE] = 100},
+
+	ai = "tactical",
+	resolvers.talents{ [Talents.T_FLAMESHOCK]={base=3, every=5, max=7}, [Talents.T_LIGHTNING]={base=4, every=5, max=8}, [Talents.T_GLACIAL_VAPOUR]={base=3, every=5, max=7}, [Talents.T_STRIKE]={base=3, every=5, max=7},
+		[Talents.T_ARCANE_POWER]={base=6, every=2, max=12},
+		[Talents.T_MANATHRUST]={base=6, every=4, max=10},
+		[Talents.T_ARCANE_VORTEX]={base=4, every=4, max=7},
+		[Talents.T_SPELLCRAFT]=5,
+		[Talents.T_AETHER_BEAM]={base=6, every=7, max=9},
+		[Talents.T_AETHER_BREACH]={base=3, every=6, max=6},
+		[Talents.T_HEAL]={base=2, every=6, max=6},
+		[Talents.T_SHIELDING]={base=3, every=6, max=6},
+		[Talents.T_ARCANE_SHIELD]={base=2, every=5, max=5},
+		[Talents.T_PURE_AETHER]={base=3, every=7, max=5},
+		[Talents.T_PHASE_DOOR]=10,
+	},
+	resolvers.sustains_at_birth(),
+	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
+	resolvers.drops{chance=100, nb=1, {defined="AETHER_RING", random_art_replace={chance=50}} },
+}

game/modules/tome/resolvers.lua

@@ -629,6 +629,8 @@ function resolvers.nice_tile(def)
 end
 function resolvers.calc.nice_tile(t, e)
 	if engine.Map.tiles.nicer_tiles then
+		if t[1].tall then t[1] = {image="invis.png", add_mos = {{image="=BASE=TILE=", display_h=2, display_y=-1}}} end
+		if t[1].add_mos and t[1].add_mos[1] and t[1].add_mos[1].image == "=BASE=TILE=" then t[1].add_mos[1].image = e.image end
 		table.merge(e, t[1])
 	end
 	return nil