adjusts

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

game/engine/Zone.lua

@@ -58,9 +58,9 @@ function _M:computeRarities(type, list, level, ood, filter)
 --				print("OOD Entity !", e.name, ":=:", level.level, "to", lev)
 --			end
 
-			local max = 1000
-			if lev < e.level_range[1] then max = 1000 / (3 * (e.level_range[1] - lev))
-			elseif lev > e.level_range[2] then max = 1000 / (lev - e.level_range[2])
+			local max = 10000
+			if lev < e.level_range[1] then max = 10000 / (3 * (e.level_range[1] - lev))
+			elseif lev > e.level_range[2] then max = 10000 / (lev - e.level_range[2])
 			end
 			local genprob = math.ceil(max / e.rarity)
 			print(("Entity(%30s) got %3d (=%3d / %3d) chance to generate. Level range(%2d-%2d), current %2d"):format(e.name, math.floor(genprob), math.floor(max), e.rarity, e.level_range[1], e.level_range[2], lev))

game/modules/tome/class/Object.lua

@@ -35,7 +35,7 @@ function _M:getDesc()
 		for stat, i in pairs(self.combat.dammod or {}) do
 			dm[#dm+1] = ("+%d%% %s"):format(i * 100, Stats.stats_def[stat].name)
 		end
-		desc[#desc+1] = ("%d Damage (%s), %d Attack, %d Armor Peneration, Crit %d%%"):format(self.combat.dam or 0, table.concat(dm, ','), self.combat.atk or 0, self.combat.apr or 0, self.combat_physcrit or 0)
+		desc[#desc+1] = ("%d Damage (%s), %d Attack, %d Armor Peneration, Crit %d%%"):format(self.combat.dam or 0, table.concat(dm, ','), self.combat.atk or 0, self.combat.apr or 0, self.combat.physcrit or 0)
 		desc[#desc+1] = ""
 	end
 

game/modules/tome/class/PlayerDisplay.lua

@@ -40,6 +40,7 @@ function _M:display()
 	self.surface:drawColorString(self.font, ("CUN: #00ff00#%3d"):format(game.player:getCun()), 0, h, 255, 255, 255) h = h + self.font_h
 	self.surface:drawColorString(self.font, ("CON: #00ff00#%3d"):format(game.player:getCon()), 0, h, 255, 255, 255) h = h + self.font_h
 	h = h + self.font_h
+	self.surface:drawString(self.font, ("Fatigue %3d%%"):format(game.player.fatigue), 0, h, 255, 255, 255) h = h + self.font_h
 	self.surface:drawString(self.font, ("Armor %3d"):format(game.player:combatArmor()), 0, h, 255, 255, 255) h = h + self.font_h
 	self.surface:drawString(self.font, ("Defence %3d"):format(game.player:combatDefense()), 0, h, 255, 255, 255) h = h + self.font_h
 

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

@@ -2,7 +2,7 @@ local Talents = require("engine.interface.ActorTalents")
 
 newEntity{
 	define_as = "BASE_NPC_MOLD",
-	group = "molds",
+	type = "immovable", subtype = "molds",
 	display = "m", color=colors.WHITE,
 	desc = "A strange growth on the dungeon floor.",
 	body = { INVEN = 10 },

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

@@ -2,14 +2,14 @@ local Talents = require("engine.interface.ActorTalents")
 
 newEntity{
 	define_as = "BASE_NPC_SKELETON",
-	group = "skeletons",
+	type = "undead", subtype = "skeletons",
 	display = "s", color=colors.WHITE,
 
 	combat = { dam=1, atk=1, apr=1 },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
 	equipment = resolvers.equip{ {type="weapon", subtype="longsword"} },
-	drops = resolvers.drops{chance=100, nb=5, {ego_chance=50} },
+	drops = resolvers.drops{chance=20, nb=1, {} },
 
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { talent_in=3, },
@@ -43,6 +43,8 @@ newEntity{ base = "BASE_NPC_SKELETON",
 	stats = { str=10, dex=12, cun=14, mag=14, con=10 },
 	talents = resolvers.talents{ Talents.T_MANA_POOL, Talents.T_FLAME, Talents.T_MANATHRUST },
 
+	equipment = resolvers.equip{ {type="weapon", subtype="staff"} },
+
 	autolevel = "caster",
 	ai = "dumb_talented_simple", ai_state = { talent_in=6, },
 }

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

@@ -2,7 +2,7 @@ local Talents = require("engine.interface.ActorTalents")
 
 newEntity{
 	define_as = "BASE_NPC_VERMIN",
-	group = "vermins",
+	type = "nuisance", subtype = "vermins",
 	display = "w", color=colors.WHITE,
 	can_multiply = 2,
 	body = { INVEN = 10 },

game/modules/tome/data/general/objects/world-artifacts.lua

@@ -7,7 +7,7 @@ newEntity{
 	level_range = {20, 25},
 	display = "\\", color=colors.VIOLET,
 	encumber = 6,
-	rarity = 20,
+	rarity = 100,
 	desc = [[This unique looking staff is carved with runes of destruction.]],
 
 	require = { stat = { mag=24 }, },
@@ -30,7 +30,7 @@ newEntity{
 	level_range = {1, 10},
 	display = "~", color=colors.YELLOW,
 	encumber = 1,
-	rarity = 10,
+	rarity = 100,
 	desc = [[A small crystal phial, with the light of Earendil's Star contained inside. Its light is imperishable, and near it darkness cannot endure.]],
 
 	wielder = {
@@ -46,7 +46,7 @@ newEntity{
 	level_range = {20, 30},
 	display = "~", color=colors.YELLOW,
 	encumber = 1,
-	rarity = 25,
+	rarity = 250,
 
 	desc = [[A great globe seemingly filled with moonlight, the famed Heart of the Mountain, which splinters the light that falls upon it into a thousand glowing shards.]],
 
@@ -63,7 +63,7 @@ newEntity{
 	level_range = {1, 10},
 	display = '"', color=colors.VIOLET,
 	encumber = 1,
-	rarity = 10,
+	rarity = 100,
 	desc = [[A crystal clear stone hangs on the chain. It displays images of your surroundings, but somehow they seem closer.]],
 
 	use = function(self, o)

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

@@ -5,9 +5,10 @@ load("/data/general/npcs/skeleton.lua")
 local Talents = require("engine.interface.ActorTalents")
 
 -- The boss of Amon Sul, no "rarity" field means it will not be randomly generated
-newEntity{ base = "BASE_NPC_SKELETON", define_as = "SHADE_OF_ANGMAR",
-	unique = true,
-	name = "The Shade of Angmar", color=colors.VIOLET,
+newEntity{ define_as = "SHADE_OF_ANGMAR",
+	type = "undead", subtype = "skeleton", unique = true,
+	name = "The Shade of Angmar",
+	display = "s", color=colors.VIOLET,
 	desc = [[This skeleton looks nasty. There is red flames in its empty eye sockets. It wield a nasty sword and towers toward you, throwing spells.]],
 	level_range = {6, 10}, exp_worth = 1,
 	max_life = 150, fixed_rating = true,
@@ -15,8 +16,12 @@ newEntity{ base = "BASE_NPC_SKELETON", define_as = "SHADE_OF_ANGMAR",
 	combat_armor = 3, combat_def = 1,
 	stats = { str=10, dex=12, cun=14, mag=14, con=10 },
 
+	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
+	equipment = resolvers.equip{ {type="weapon", subtype="longsword"} },
+	drops = resolvers.drops{chance=100, nb=5, {ego_chance=50} },
+
 	talents = resolvers.talents{ Talents.T_MANA_POOL, Talents.T_FREEZE, Talents.T_TIDAL_WAVE },
 
 	autolevel = "warriormage",
-	ai = "dumb_talented_simple", ai_state = { talent_in=1, },
+	ai = "dumb_talented_simple", ai_state = { talent_in=4, },
 }

src/main.c

@@ -199,7 +199,7 @@ void on_tick()
 	Frames++;
 	{
 		int t = SDL_GetTicks();
-		if (t - T0 >= 1000) {
+		if (t - T0 >= 10000) {
 			float seconds = (t - T0) / 1000.0;
 			float fps = Frames / seconds;
 			printf("%d ticks  in %g seconds = %g TPS\n", Frames, seconds, fps);
@@ -233,7 +233,7 @@ void on_redraw()
 	Frames++;
 	{
 		int t = SDL_GetTicks();
-		if (t - T0 >= 1000) {
+		if (t - T0 >= 10000) {
 			float seconds = (t - T0) / 1000.0;
 			float fps = Frames / seconds;
 			printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps);