From 2ea2e3cd475c6e9a14c9b2966c21b111211bfa9e Mon Sep 17 00:00:00 2001
From: Eric Wykoff <ericwykoff@yahoo.com>
Date: Fri, 23 Jan 2015 10:46:30 -0600
Subject: [PATCH] fixed dimensional anchor not cooking my computer
prepped anomalies for later stuff
---
.../tome/data/chats/chronomancy-bias-weave.lua | 4 ++--
.../tome/data/talents/chronomancy/anomalies.lua | 16 ++++++++--------
.../talents/chronomancy/spacetime-folding.lua | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/game/modules/tome/data/chats/chronomancy-bias-weave.lua b/game/modules/tome/data/chats/chronomancy-bias-weave.lua
index 524f478a26..eab7632f67 100644
--- a/game/modules/tome/data/chats/chronomancy-bias-weave.lua
+++ b/game/modules/tome/data/chats/chronomancy-bias-weave.lua
@@ -35,10 +35,10 @@ newChat{ id="welcome",
return set_bias({type = "physical", chance=chance})
end,
},
- {"Teleport",
+ {"Warp",
action = function()
game.level.map:particleEmitter(game.player.x, game.player.y, 1, "temporal_teleport")
- return set_bias({type = "teleport", chance=chance})
+ return set_bias({type = "Warp", chance=chance})
end,
},
{"Temporal",
diff --git a/game/modules/tome/data/talents/chronomancy/anomalies.lua b/game/modules/tome/data/talents/chronomancy/anomalies.lua
index f7257bc685..19cf621524 100644
--- a/game/modules/tome/data/talents/chronomancy/anomalies.lua
+++ b/game/modules/tome/data/talents/chronomancy/anomalies.lua
@@ -111,7 +111,7 @@ end
newTalent{
name = "Anomaly Rearrange",
type = {"chronomancy/anomalies", 1},
- anomaly_type = "teleport",
+ anomaly_type = "warp",
type_no_req = true,
no_unlearn_last = true,
points = 1,
@@ -157,7 +157,7 @@ newTalent{
newTalent{
name = "Anomaly Teleport",
type = {"chronomancy/anomalies", 1},
- anomaly_type = "teleport",
+ anomaly_type = "warp",
type_no_req = true,
no_unlearn_last = true,
points = 1,
@@ -203,7 +203,7 @@ newTalent{
newTalent{
name = "Anomaly Swap",
type = {"chronomancy/anomalies", 1},
- anomaly_type = "teleport",
+ anomaly_type = "warp",
type_no_req = true,
no_unlearn_last = true,
points = 1,
@@ -259,7 +259,7 @@ newTalent{
newTalent{
name = "Anomaly Displacement Shield",
type = {"chronomancy/anomalies", 1},
- anomaly_type = "teleport",
+ anomaly_type = "warp",
type_no_req = true,
no_unlearn_last = true,
points = 1,
@@ -305,7 +305,7 @@ newTalent{
newTalent{
name = "Anomaly Wormhole",
type = {"chronomancy/anomalies", 1},
- anomaly_type = "teleport",
+ anomaly_type = "warp",
type_no_req = true,
no_unlearn_last = true,
points = 1,
@@ -398,7 +398,7 @@ newTalent{
newTalent{
name = "Anomaly Probability Travel",
type = {"chronomancy/anomalies", 1},
- anomaly_type = "teleport",
+ anomaly_type = "warp",
type_no_req = true,
no_unlearn_last = true,
points = 1,
@@ -442,7 +442,7 @@ newTalent{
newTalent{
name = "Anomaly Blink",
type = {"chronomancy/anomalies", 1},
- anomaly_type = "teleport",
+ anomaly_type = "warp",
type_no_req = true,
no_unlearn_last = true,
points = 1,
@@ -486,7 +486,7 @@ newTalent{
newTalent{
name = "Anomaly Summon Townsfolk",
type = {"chronomancy/anomalies", 1},
- anomaly_type = "teleport",
+ anomaly_type = "warp",
type_no_req = true,
no_unlearn_last = true,
points = 1,
diff --git a/game/modules/tome/data/talents/chronomancy/spacetime-folding.lua b/game/modules/tome/data/talents/chronomancy/spacetime-folding.lua
index 926a02d2e8..4dce3c377e 100644
--- a/game/modules/tome/data/talents/chronomancy/spacetime-folding.lua
+++ b/game/modules/tome/data/talents/chronomancy/spacetime-folding.lua
@@ -365,8 +365,8 @@ newTalent{
local _ _, _, _, x, y = self:canProject(tg, x, y)
local particle
- if core.shader.active(4) then
- particle = {type="volumetric", args={radius=self:getTalentRadius(t)+2, kind="fast_sphere", img="moony_01", density=60, shininess=50, scrollingSpeed=-0.004}, only_one=true}
+ if core.shader.allow("volumetric") then
+ particle = {type="volumetric", args={radius=self:getTalentRadius(t)*2, kind="fast_sphere", img="moony_01", density=60, shininess=50, scrollingSpeed=-0.004}, only_one=true}
else
particle = {type="temporal_cloud"}
end
--
GitLab