Skip to content
Snippets Groups Projects
Commit dd272590 authored by dg's avatar dg
Browse files

Fixed tactical AI infos on some AOE talents

git-svn-id: http://svn.net-core.org/repos/t-engine4@4229 51575b47-30f0-44d4-a5cc-537603b46e54
parent e430933c
No related branches found
No related tags found
No related merge requests found
......@@ -367,10 +367,10 @@ end
function _M:setResolution(res, force)
local r = available_resolutions[res]
if force and not r then
local _, _, w, h = res:find("([0-9][0-9][0-9]+)x([0-9][0-9][0-9]+)")
local _, _, w, h, f = res:find("([0-9][0-9][0-9]+)x([0-9][0-9][0-9]+)(.*)")
w = tonumber(w)
h = tonumber(h)
if w and h then r = {w, h, false} end
if w and h then r = {w, h, f==" Fullscreen" and true or false} end
end
if not r then return false, "unknown resolution" end
......
......@@ -63,6 +63,7 @@ newTalent{
random_ego = "attack",
cooldown = 15,
hate = 0.2,
requires_target = true,
action = function(self, t)
if not self:hasAxeWeapon() and not self:hasCursedWeapon() then
game.logPlayer(self, "You cannot use %s without an axe or a cursed weapon!", t.name)
......
......@@ -103,6 +103,7 @@ newTalent{
tactical = { ESCAPE = 2, ATTACKAREA = 1, DISABLE = 1 },
direct_hit = true,
range = 0,
requires_target = true,
radius = function(self, t)
return 1 + 0.5 * t.getDuration(self, t)
end,
......@@ -149,6 +150,7 @@ newTalent{
tactical = { ATTACKAREA = 2 },
range = 0,
radius = 3,
requires_target = true,
target = function(self, t)
return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false}
end,
......
......@@ -29,6 +29,7 @@ newTalent{
tactical = { ATTACKAREA = 3 },
range = 0,
radius = 1,
requires_target = true,
target = function(self, t)
return {type="ball", range=self:getTalentRange(t), selffire=false, radius=self:getTalentRadius(t)}
end,
......
......@@ -1649,6 +1649,7 @@ static int sdl_set_window_size(lua_State *L)
int h = luaL_checknumber(L, 2);
bool fullscreen = lua_toboolean(L, 3);
printf("Setting resolution to %dx%d (%s)\n", w, h, fullscreen ? "fullscreen" : "windowed");
do_resize(w, h, fullscreen);
lua_pushboolean(L, TRUE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment