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

update

git-svn-id: http://svn.net-core.org/repos/t-engine4@2434 51575b47-30f0-44d4-a5cc-537603b46e54
parent a53a56a8
No related branches found
No related tags found
No related merge requests found
......@@ -198,7 +198,7 @@ function _M:archeryShoot(targets, talent, tg, params)
tg.talent = tg.talent or talent
if not tg.range then tg.range=weapon.range or 6 end
tg.display = tg.display or {display='/'}
tg.display = tg.display or {display='/', trail="generictrail"}
tg.speed = (tg.speed or 20) * (ammo.travel_speed or 100) / 100
tg.archery = params or {}
tg.archery.weapon = weapon
......
......@@ -174,8 +174,8 @@ newChat{ id="welcome",
text = "#LIGHT_GREEN#You take a look at the ranking boards before entering.\n"..text,
answers = {
--{"Enter the arena for 3 rounds[DEBUG]", action=arena_3, jump="perks"},
{"Enter the arena for 30 rounds", action=arena_30, jump="perks"},
{"Enter the arena for 60 rounds", action=arena_60, jump="perks"},
{"Enter the arena (60 waves)", action=arena_60, jump="perks"},
{"Enter the arena (shorter mode, 30 rounds)", action=arena_30, jump="perks"},
--{"Enter the arena for as much as you can last", action=arena_inf, jump="perks"},
{"#LIGHT_RED#[Reset all arena save data]", action=save_clear, jump="welcome2"},
}
......@@ -185,8 +185,8 @@ newChat{ id="welcome2",
text = "What will you do now?",
answers = {
--{"Enter the arena for 3 rounds[DEBUG]", action=arena_3, jump="perks"},
{"Enter the arena for 30 rounds", action=arena_30, jump="perks"},
{"Enter the arena for 60 rounds", action=arena_60, jump="perks"},
{"Enter the arena for 30 rounds", action=arena_30, jump="perks"},
--{"Enter the arena for as much as you can last", action=arena_inf, jump="perks"},
}
}
......
......@@ -58,7 +58,7 @@ newTalent{
end,
on_pre_use = function(self, t, silent)
if self:isTalentActive(t.id) then return true end
local armor = self:getInven("BODY")[1]
local armor = self:getInven("BODY") and self:getInven("BODY")[1]
if armor and (armor.subtype == "heavy" or armor.subtype == "massive") then
if not silent then game.logPlayer(self, "You cannot Stealth with such heavy armour!") end
return nil
......
......@@ -403,7 +403,7 @@ return {
if not plvl == game.player.level then --If bonuses made the player level up, give minimal time.
if rest_time > 30 then rest_time = 30 end
else
if rest_time < 10 then rest_time = 10
if rest_time < 25 then rest_time = 25
elseif rest_time > 80 then rest_time = 80
end
end
......
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