From cec27da45b9a23b729f6b35122eeb24d559bdd5f Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 3 Feb 2012 00:41:42 +0000
Subject: [PATCH] Reduced damage from Void Shards Reduced healing modifier on
Vitality Reduced chance of removing debuffs on Unflinching Resolve
git-svn-id: http://svn.net-core.org/repos/t-engine4@4815 51575b47-30f0-44d4-a5cc-537603b46e54
---
build/te4core.lua | 2 ++
game/engines/default/engine/KeyCommand.lua | 13 +++++++++++++
game/engines/default/engine/Module.lua | 4 ++++
.../tome/data/talents/cursed/cursed-aura.lua | 6 +++---
game/modules/tome/data/talents/misc/horrors.lua | 2 +-
.../data/talents/techniques/conditioning.lua | 4 ++--
.../tome/data/zones/ritch-tunnels/npcs.lua | 2 +-
premake4.lua | 17 +++--------------
8 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/build/te4core.lua b/build/te4core.lua
index 6cb12f880d..348ca9b33a 100644
--- a/build/te4core.lua
+++ b/build/te4core.lua
@@ -143,6 +143,7 @@ elseif _OPTIONS.lua == "jit2" then
}
configuration "windows"
+ if not _OPTIONS["no-cleanup-jit2"] then
local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c"
prebuildcommands{
_OPTIONS.force32bits and "gcc -m32 -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c" or "gcc -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c",
@@ -154,6 +155,7 @@ elseif _OPTIONS.lua == "jit2" then
"../src/luajit2/src/buildvm -m vmdef -o ../src/luajit2/vmdef.lua "..list,
"../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c",
}
+ end
end
diff --git a/game/engines/default/engine/KeyCommand.lua b/game/engines/default/engine/KeyCommand.lua
index 26ec4c352d..bd7a82c305 100644
--- a/game/engines/default/engine/KeyCommand.lua
+++ b/game/engines/default/engine/KeyCommand.lua
@@ -49,6 +49,19 @@ function _M:setupProfiler()
end)
end
+--- Adds the game reboot keybind (ctrl, alt, shift, r/n)
+function _M:setupRebootKeys()
+ if not config.settings.cheat then return end
+ self:addCommand(self._r, {"ctrl","alt","shift"}, function()
+ if not config.settings.cheat then return end
+ util.showMainMenu(false, engine.version[4], engine.version[1].."."..engine.version[2].."."..engine.version[3], game.__mod_info.short_name, game.save_name, false)
+ end)
+ self:addCommand(self._n, {"ctrl","alt","shift"}, function()
+ if not config.settings.cheat then return end
+ util.showMainMenu(false, engine.version[4], engine.version[1].."."..engine.version[2].."."..engine.version[3], game.__mod_info.short_name, game.save_name, true)
+ end)
+end
+
function _M:receiveKey(sym, ctrl, shift, alt, meta, unicode, isup, key)
self:handleStatus(sym, ctrl, shift, alt, meta, unicode, isup)
diff --git a/game/engines/default/engine/Module.lua b/game/engines/default/engine/Module.lua
index eb96613a6e..48a8e025ff 100644
--- a/game/engines/default/engine/Module.lua
+++ b/game/engines/default/engine/Module.lua
@@ -1,3 +1,4 @@
+
-- TE4 - T-Engine 4
-- Copyright (C) 2009, 2010, 2011 Nicolas Casalini
--
@@ -569,6 +570,9 @@ function _M:instanciate(mod, name, new_game, no_reboot)
-- And now run it!
_G.game:run()
+ -- Try to bind some debug keys
+ if _G.game.key and _G.game.key.setupRebootKeys then _G.game.key:setupRebootKeys() end
+
-- Add user chat if needed
if mod.allow_userchat and _G.game.key then
profile.chat:setupOnGame()
diff --git a/game/modules/tome/data/talents/cursed/cursed-aura.lua b/game/modules/tome/data/talents/cursed/cursed-aura.lua
index 008ac81676..228130e51e 100644
--- a/game/modules/tome/data/talents/cursed/cursed-aura.lua
+++ b/game/modules/tome/data/talents/cursed/cursed-aura.lua
@@ -112,9 +112,6 @@ newTalent{
-- chooses whether the player accepts the cursed aura tree when a cursable item is found..only offered once for Afflicted classes
chooseCursedAuraTree = function(self, t)
- game.player:runStop()
- game.player:restStop()
-
local choose = false
local x, y, i = self.x, self.y, 1
local item = game.level.map:getObject(x, y, i)
@@ -128,6 +125,9 @@ newTalent{
end
if choose then
+ game.player:runStop()
+ game.player:restStop()
+
-- don't bother the player when there is an enemy near
local grids = core.fov.circle_grids(self.x, self.y, 10, true)
for x, yy in pairs(grids) do
diff --git a/game/modules/tome/data/talents/misc/horrors.lua b/game/modules/tome/data/talents/misc/horrors.lua
index d6c7ad7112..19455d6fd4 100644
--- a/game/modules/tome/data/talents/misc/horrors.lua
+++ b/game/modules/tome/data/talents/misc/horrors.lua
@@ -419,7 +419,7 @@ newTalent{
requires_target = true,
is_summon = true,
getDamage = function(self, t) return self:combatTalentMindDamage(t, 5, 50) end,
- getExplosion = function(self, t) return self:combatTalentMindDamage(t, 20, 300) end,
+ getExplosion = function(self, t) return self:combatTalentMindDamage(t, 20, 200) end,
getSummonTime = function(self, t) return 6 + math.ceil(self:getTalentLevel(t)) end,
action = function(self, t)
local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
diff --git a/game/modules/tome/data/talents/techniques/conditioning.lua b/game/modules/tome/data/talents/techniques/conditioning.lua
index be699c9594..c4bb9509cb 100644
--- a/game/modules/tome/data/talents/techniques/conditioning.lua
+++ b/game/modules/tome/data/talents/techniques/conditioning.lua
@@ -24,7 +24,7 @@ newTalent{
mode = "passive",
points = 5,
getWoundReduction = function(self, t) return self:getTalentLevel(t)/10 end,
- getHealMod = function(self, t) return self:combatTalentStatDamage(t, "con", 20, 80) end,
+ getHealMod = function(self, t) return self:combatTalentStatDamage(t, "con", 10, 50) end,
getLifeRegen = function(self, t) return self:combatTalentStatDamage(t, "con", 2, 20) end,
getDuration = function(self, t) return 2 + math.ceil(self:getTalentLevel(t)) end,
do_vitality_recovery = function(self, t)
@@ -94,7 +94,7 @@ newTalent{
require = techs_con_req3,
mode = "passive",
points = 5,
- getChance = function(self, t) return self:combatTalentStatDamage(t, "con", 50, 100) end,
+ getChance = function(self, t) return self:combatTalentStatDamage(t, "con", 20, 80) end,
do_unflinching_resolve = function(self, t)
local effs = {}
-- Go through all spell effects
diff --git a/game/modules/tome/data/zones/ritch-tunnels/npcs.lua b/game/modules/tome/data/zones/ritch-tunnels/npcs.lua
index ffb3d25c3d..78be453ab8 100644
--- a/game/modules/tome/data/zones/ritch-tunnels/npcs.lua
+++ b/game/modules/tome/data/zones/ritch-tunnels/npcs.lua
@@ -32,7 +32,7 @@ newEntity{
Vicious predators, they inject corrupting diseases into their foes, and their sharp claws cut through most armours.]],
killer_message = ", who incubated her eggs in the corpse,",
- combat = { dam=resolvers.rngavg(10,32), atk=9, apr=4, damtype=DamageType.BLIGHT, dammod={dex=1.2} },
+ combat = { dam=resolvers.rngavg(10,32), atk=0, apr=4, damtype=DamageType.BLIGHT, dammod={dex=1.2} },
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
diff --git a/premake4.lua b/premake4.lua
index f516dfe26c..5bbc2a7102 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -28,22 +28,11 @@ solution "TEngine"
configuration "windows"
libdirs {
- "/e/libs/SDL-1.2.14/lib",
- "/e/libs/SDL_ttf-2.0.9/lib",
- "/e/libs/SDL_image-1.2.10/lib",
- "/e/libs/SDL_mixer-1.2.11/lib",
- "/e/libs/libvorbis-1.3.2/lib/.libs",
- "/e/libs/libogg-1.2.2/src/.libs",
- "/e/apps/mingw/lib",
+ "/c/mingw2/lib",
}
includedirs {
- "/e/libs/SDL-1.2.14/include/SDL",
- "/e/libs/SDL_ttf-2.0.9/include/",
- "/e/libs/SDL_image-1.2.10/include/",
- "/e/libs/SDL_mixer-1.2.11/include/",
- "/e/libs/libvorbis-1.3.2/include",
- "/e/libs/libogg-1.2.2/include",
- "/e/apps/mingw/include/GL",
+ "/c/mingw2/include/SDL",
+ "/c/mingw2/include/GL",
}
configuration "macosx"
--
GitLab