diff --git a/game/engines/default/engine/Entity.lua b/game/engines/default/engine/Entity.lua index 6663c9f80f2909ac28c9975c86b55facaa4ae2b7..5477e79534a729ce7923448e8a8e1d0a4a440842 100644 --- a/game/engines/default/engine/Entity.lua +++ b/game/engines/default/engine/Entity.lua @@ -391,13 +391,13 @@ end --- Get a string that will display in text the texture of this entity function _M:getDisplayString(tstr) if tstr then - if core.display.FBOActive() then + if core.display.FBOActive() or true then return tstring{{"uid", self.uid}} else return tstring{} end else - if core.display.FBOActive() then + if core.display.FBOActive() or true then return "#UID:"..self.uid..":0#" else return "" diff --git a/game/engines/default/engine/generator/map/Forest.lua b/game/engines/default/engine/generator/map/Forest.lua index a15d79dbd547b3e44d83e783b8217147ce743c3d..5a07db5cb47a2b727499f5edbc0444b6559ab292 100644 --- a/game/engines/default/engine/generator/map/Forest.lua +++ b/game/engines/default/engine/generator/map/Forest.lua @@ -75,7 +75,7 @@ function _M:addPond(x, y, spots) local lx, ly = l() while lx do -- print(lx, ly, nmap[lx][ly]) - if nmap[lx][ly] > highest.v then highest.v = nmap[lx][ly]; highest.x = lx; highest.y = ly end + if nmap[lx] and nmap[lx][ly] and nmap[lx][ly] > highest.v then highest.v = nmap[lx][ly]; highest.x = lx; highest.y = ly end lx, ly = l() end -- print("Highest pond point", highest.x, highest.y," ::", highest.v) @@ -86,7 +86,7 @@ function _M:addPond(x, y, spots) while lx do local stop = true for _ = 1, #self.do_ponds.pond do - if nmap[lx][ly] < split * self.do_ponds.pond[_][1] then + if nmap[lx] and nmap[lx][ly] and nmap[lx][ly] < split * self.do_ponds.pond[_][1] then pmap[lx][ly] = self.do_ponds.pond[_][2] stop = false break diff --git a/game/modules/tome/data/talents/gifts/gifts.lua b/game/modules/tome/data/talents/gifts/gifts.lua index 75722b03134a05ddb76ceb347952c58cd96b2da5..bfe076d4f9dbebfec36d4ebf6b6405e563c6ad78 100644 --- a/game/modules/tome/data/talents/gifts/gifts.lua +++ b/game/modules/tome/data/talents/gifts/gifts.lua @@ -25,7 +25,7 @@ newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-melee", newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-distance", name = "summoning (distance)", description = "The art of calling creatures to your aid." } newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-utility", name = "summoning (utility)", description = "The art of calling creatures to your aid." } newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-augmentation", name = "summoning (augmentation)", description = "The art of calling creatures to your aid." } -newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-advanced", name = "summoning (advanced)", description = "The art of calling creatures to your aid." } +newTalentType{ allow_random=true, is_nature=true, type="wild-gift/summon-advanced", name = "summoning (advanced)", min_lev = 10, description = "The art of calling creatures to your aid." } newTalentType{ allow_random=true, is_nature=true, type="wild-gift/slime", name = "slime aspect", generic = true, description = "Through dedicated consumption of slime mold juice, you have gained an affinity with slime molds." } newTalentType{ allow_random=true, is_nature=true, type="wild-gift/sand-drake", name = "sand drake aspect", description = "Take on the defining aspects of a Sand Drake." } newTalentType{ allow_random=true, is_nature=true, type="wild-gift/fire-drake", name = "fire drake aspect", description = "Take on the defining aspects of a Fire Drake." } diff --git a/src/core_lua.c b/src/core_lua.c index 3237abfa70090733dff3a3df260bca1a7270243d..080a56467a830d5951a197dd6f7885f98e9aef99 100644 --- a/src/core_lua.c +++ b/src/core_lua.c @@ -675,6 +675,7 @@ static int sdl_font_draw(lua_State *L) { // Push it & reset the surface font_make_texture_line(L, s, nb_lines, is_separator, id_real_line, line_data, line_data_size, direct_uid_draw); + id_dduid = 1; is_separator = FALSE; SDL_FillRect(s, NULL, SDL_MapRGBA(s->format, 0, 0, 0, 0)); // printf("Ending previous line at size %d\n", size); @@ -853,6 +854,7 @@ static int sdl_font_draw(lua_State *L) } font_make_texture_line(L, s, nb_lines, is_separator, id_real_line, line_data, line_data_size, direct_uid_draw); + id_dduid = 1; if (size > max_size) max_size = size; if (txt) SDL_FreeSurface(txt);