diff --git a/game/engines/default/engine/generator/actor/Random.lua b/game/engines/default/engine/generator/actor/Random.lua index 12524197a4a3d451e07f34e6798969abd6614eec..2848b6d6ec9368f0a3ac9f7be58616b4a75933f2 100644 --- a/game/engines/default/engine/generator/actor/Random.lua +++ b/game/engines/default/engine/generator/actor/Random.lua @@ -78,6 +78,7 @@ end function _M:generateOne() local f = nil if self.filters then f = self.filters[rng.range(1, #self.filters)] end + print("===========================================", f and f.max_ood) local m = self.zone:makeEntity(self.level, "actor", f, nil, true) if m then local x, y = rng.range(self.area.x1, self.area.x2), rng.range(self.area.y1, self.area.y2) diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua index 1d047ff618fcc1214e0407df1271546a9ce289db..328116ba78d73a3c565bee1ef7f0b599eb476f8c 100644 --- a/game/modules/tome/class/Actor.lua +++ b/game/modules/tome/class/Actor.lua @@ -843,7 +843,7 @@ function _M:tooltip(x, y, seen_by) local ts = tstring{} ts:add({"uid",self.uid}) ts:merge(rank_color:toTString()) ts:add(self.name, {"color", "WHITE"}) - if self.type == "humanoid" or self.type == "giant" then ts:add({"font","italic"}, "(", self.female and "female" or "male", ")", {"font","normal"}, true) end + if self.type == "humanoid" or self.type == "giant" then ts:add({"font","italic"}, "(", self.female and "female" or "male", ")", {"font","normal"}, true) else ts:add(true) end ts:add(self.type:capitalize(), " / ", self.subtype:capitalize(), true) ts:add("Rank: ") ts:merge(rank_color:toTString()) ts:add(rank, {"color", "WHITE"}, true) ts:add({"color", 0, 255, 255}, ("Level: %d"):format(self.level), {"color", "WHITE"}, true) diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua index 88358fd17b865c10577d9756c2f1dff86f5b428d..000dd43302800a55629de960908f3b1d692fc729 100644 --- a/game/modules/tome/class/Game.lua +++ b/game/modules/tome/class/Game.lua @@ -1008,37 +1008,12 @@ function _M:setupCommands() for i, a in ipairs(e.add_mos or {}) do print(" => ", a.image) end end end end end, - [{"_f","ctrl"}] = function() if config.settings.cheat then - self.nicer_tiles:updateAround(self.level, game.player.x, game.player.y) --- self.nicer_tiles:replaceAll(self.level) ---[[ - local i,j = game.player.x, game.player.y - local level=self.level - local s = level.map:checkEntity(i, j, Map.TERRAIN, "type") or "wall" - local g1 = level.map:checkEntity(i-1, j+1, Map.TERRAIN, "type") == s and 1 or 0 - local g2 = level.map:checkEntity(i, j+1, Map.TERRAIN, "type") == s and 1 or 0 - local g3 = level.map:checkEntity(i+1, j+1, Map.TERRAIN, "type") == s and 1 or 0 - local g4 = level.map:checkEntity(i-1, j, Map.TERRAIN, "type") == s and 1 or 0 - local g6 = level.map:checkEntity(i+1, j, Map.TERRAIN, "type") == s and 1 or 0 - local g7 = level.map:checkEntity(i-1, j-1, Map.TERRAIN, "type") == s and 1 or 0 - local g8 = level.map:checkEntity(i, j-1, Map.TERRAIN, "type") == s and 1 or 0 - local g9 = level.map:checkEntity(i+1, j-1, Map.TERRAIN, "type") == s and 1 or 0 - print((" [ [=[\n%d%d%d\n%d %d\n%d%d%d]=] ] = '',"):format(g7,g8,g9,g4,g6,g1,g2,g3)) ---]] - end end, [{"_g","ctrl"}] = function() if config.settings.cheat then --- game.player:setEffect(game.player.EFF_BONE_SHIELD, 30, {nb=3}) --- self.state:debugRandomZone() --- local m = game.zone:makeEntity(game.level, "actor", {random_boss=true}, nil, true) --- if m then game.zone:addEntity(game.level, m, "actor", game.player.x, game.player.y + 1) end --- self:changeLevel(1, "test") - local list = mod.class.Object:loadList("/data/general/objects/brotherhood-artifacts.lua") - for _, e in ipairs(list) do if e.image and e.unique then - local o = e:clone() - o:resolve() o:resolve(nil,true) - local x, y = util.findFreeGrid(self.player.x, self.player.y, 15, true, {[engine.Map.OBJECT]=true}) - game.zone:addEntity(game.level, o, "object", x, y) - end end + for uid, e in pairs(self.level.entities) do + if e.level and e.level >= 10 then + print("========WARNING", e.x, e.y, e.name, e.level) + end + end end end, } diff --git a/game/modules/tome/data/zones/ritch-tunnels/npcs.lua b/game/modules/tome/data/zones/ritch-tunnels/npcs.lua index 922e0d629e5cdf0bbec77ce29bc1662dfc9a3f31..ffb3d25c3d84e5daeb6678f9b8adb79919e017ba 100644 --- a/game/modules/tome/data/zones/ritch-tunnels/npcs.lua +++ b/game/modules/tome/data/zones/ritch-tunnels/npcs.lua @@ -94,7 +94,7 @@ newEntity{ base = "BASE_NPC_RITCH_REL", newEntity{ base = "BASE_NPC_RITCH_REL", define_as = "HIVE_MOTHER", unique = true, - name = "Ritch Hive Mother", + name = "Ritch Great Hive Mother", image = "npc/insect_ritch_ritch_hive_mother.png", display = "I", color=colors.VIOLET, desc = [[This huge ritch seems to be the mother of all those here. Her sharp, fiery, claws dart toward you!]], level_range = {7, nil}, exp_worth = 2,