From c6ebf0a000a55698747e4af832b7f35db88fcbff Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 16 Jan 2011 01:33:18 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@2391 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../tome/data/birth/classes/divine.lua | 4 ++--
.../tome/data/general/encounters/maj-eyal.lua | 24 +++++++++++++++++++
game/modules/tome/data/general/grids/void.lua | 3 +--
.../chronomancy/timeline-threading.lua | 6 ++---
.../data/texts/unlock-divine_anorithil.lua | 2 +-
.../data/texts/unlock-divine_sun_paladin.lua | 2 +-
.../tome/data/zones/lake-nur/grids.lua | 2 +-
.../tome/data/zones/old-forest/grids.lua | 2 +-
8 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/game/modules/tome/data/birth/classes/divine.lua b/game/modules/tome/data/birth/classes/divine.lua
index 289ce43ebc..d686c2ff7e 100644
--- a/game/modules/tome/data/birth/classes/divine.lua
+++ b/game/modules/tome/data/birth/classes/divine.lua
@@ -44,7 +44,7 @@ newBirthDescriptor{
name = "Sun Paladin",
desc = {
"Sun Paladins hail from the Gates of Morning, the last bastion of the free people in the Far East.",
- "Their way of life is well represented by their motto 'We walk in the dark places no others will enter. We stand on the bridge, and no one may pass.'",
+ "Their way of life is well represented by their motto 'The Sun is our giver, our purity, our essence. We carry the light into dark places, and against our strength none shall pass.'",
"They can channel the power of the Sun to smite all who seek to destroy the Sunwall.",
"Competent in both weapon and shield combat and magic, they usually burn their foes from afar before engaging in melee.",
"Their most important stats are: Strength and Magic",
@@ -89,7 +89,7 @@ newBirthDescriptor{
name = "Anorithil",
desc = {
"Anorithils hail from the Gates of Morning, the last bastion of the free people in the Far East.",
- "Their way of life is well represented by their motto 'We are Grey. We stand between the darkness and the light.'",
+ "Their way of life is well represented by their motto 'We stand betwixt the Sun and Moon, where light and darkness meet. In the grey twilight we seek our destiny.'",
"They can channel the power of the Sun and the Moon to burn and tear apart all who seek to destroy the Sunwall.",
"Masters of Sun and Moon magic, they usually burn their foes with Sun rays before calling the fury of the stars.",
"Their most important stats are: Magic and Cunning",
diff --git a/game/modules/tome/data/general/encounters/maj-eyal.lua b/game/modules/tome/data/general/encounters/maj-eyal.lua
index 53dc860068..e8c5bef9ea 100644
--- a/game/modules/tome/data/general/encounters/maj-eyal.lua
+++ b/game/modules/tome/data/general/encounters/maj-eyal.lua
@@ -221,3 +221,27 @@ newEntity{
return true
end,
}
+
+newEntity{
+ name = "Temporal Rift",
+ type = "harmless", subtype = "special", unique = true,
+ level_range = {16, 26},
+ rarity = 8,
+ on_world_encounter = "mark-spellblaze",
+ on_encounter = function(self, who)
+ local x, y = self:findSpot(who)
+ if not x then return end
+
+ local g = mod.class.Grid.new{
+ show_tooltip=true,
+ name="Temporal Rift",
+ display='>', color=colors.VIOLET, image = "terrain/grass.png", add_displays = {mod.class.Grid.new{image = "object/temporal_instability.png"}},
+ notice = true,
+ change_level=1, change_zone="temporal-rift",
+ }
+ g:resolve() g:resolve(nil, true)
+ game.zone:addEntity(game.level, g, "terrain", x, y)
+ game.logPlayer(who, "#LIGHT_BLUE#You notice a strange disturbance. It seems to be a rift in reality itself.")
+ return true
+ end,
+}
diff --git a/game/modules/tome/data/general/grids/void.lua b/game/modules/tome/data/general/grids/void.lua
index cd979b3ef5..314a6206fa 100644
--- a/game/modules/tome/data/general/grids/void.lua
+++ b/game/modules/tome/data/general/grids/void.lua
@@ -31,8 +31,7 @@ newEntity{
newEntity{
define_as = "SPACE_TURBULENCE",
name = "space turbulence",
- display = '#', color=colors.WHITE,
- shader = "space_turbulence", textures = { function() return _3DNoise, true end },
+ display = '#', color=colors.WHITE, image="terrain/temporal_instability_yellow.png",
always_remember = true,
does_block_move = true,
_noalpha = false,
diff --git a/game/modules/tome/data/talents/chronomancy/timeline-threading.lua b/game/modules/tome/data/talents/chronomancy/timeline-threading.lua
index b0d2f9ddf6..e391f9d0de 100644
--- a/game/modules/tome/data/talents/chronomancy/timeline-threading.lua
+++ b/game/modules/tome/data/talents/chronomancy/timeline-threading.lua
@@ -237,9 +237,7 @@ newTalent{
return true
end,
info = function(self, t)
- local percent = t.getPercent(self, t)
- return ([[Casting this spell sends you back to the moment you entered the current dungeon level.
- Traveling through time carries with it inherent penalties and doing so will permanently reduce your hit points by %d%%.]])
- :format(percent)
+ return ([[]])
+ :format()
end,
}
diff --git a/game/modules/tome/data/texts/unlock-divine_anorithil.lua b/game/modules/tome/data/texts/unlock-divine_anorithil.lua
index 9c5be077dc..6417938383 100644
--- a/game/modules/tome/data/texts/unlock-divine_anorithil.lua
+++ b/game/modules/tome/data/texts/unlock-divine_anorithil.lua
@@ -23,7 +23,7 @@ In the uttermost east, on the continent known only as the Far East, dwell the la
Anorithil are mages who are trained in special magic to focus the powers of the Sun and Moon.
They have learned to harness the energy of both shadows and light in their battle against the Pride.
-Their motto is: "I am Grey. I stand between the candle and the star. We are Grey. We stand between the darkness and the light."
+Their motto is: "We stand betwixt the Sun and Moon, where light and darkness meet. In the grey twilight we seek our destiny."
You have helped one of them and can now create new characters with the #LIGHT_GREEN#Anorithil class#WHITE#.
diff --git a/game/modules/tome/data/texts/unlock-divine_sun_paladin.lua b/game/modules/tome/data/texts/unlock-divine_sun_paladin.lua
index 6ccdd47e7e..a0d86ec7f4 100644
--- a/game/modules/tome/data/texts/unlock-divine_sun_paladin.lua
+++ b/game/modules/tome/data/texts/unlock-divine_sun_paladin.lua
@@ -23,7 +23,7 @@ In the uttermost east, on the continent known only as the Far East, dwell the la
Sun Paladins are warriors who are trained in special magic to focus the powers of the Sun.
Paragons of all that is good, they are nonetheless terrible in their battle against the Pride.
-Their motto is: "We walk in the dark places no others will enter. We stand on the bridge, and no one may pass."
+Their motto is: "The Sun is our giver, our purity, our essence. We carry the light into dark places, and against our strength none shall pass."
You have discovered the Gates of Morning and can now create new characters with the #LIGHT_GREEN#Sun Paladin class#WHITE#.
diff --git a/game/modules/tome/data/zones/lake-nur/grids.lua b/game/modules/tome/data/zones/lake-nur/grids.lua
index 6c1151f9af..ab8edf3755 100644
--- a/game/modules/tome/data/zones/lake-nur/grids.lua
+++ b/game/modules/tome/data/zones/lake-nur/grids.lua
@@ -24,7 +24,7 @@ load("/data/general/grids/sand.lua")
newEntity{
define_as = "OLD_FOREST",
- name = "way to the old forest", image = "terrain/way_next_8.png",
+ name = "way to the old forest", image = "terrain/grass.png", add_displays = {class.new{image = "terrain/way_next_8.png"}},
display = '<', color_r=255, color_g=255, color_b=0,
notice = true,
always_remember = true,
diff --git a/game/modules/tome/data/zones/old-forest/grids.lua b/game/modules/tome/data/zones/old-forest/grids.lua
index 18dfb4cba6..2c4657a0f3 100644
--- a/game/modules/tome/data/zones/old-forest/grids.lua
+++ b/game/modules/tome/data/zones/old-forest/grids.lua
@@ -24,7 +24,7 @@ load("/data/general/grids/water.lua")
newEntity{
define_as = "LAKE_NUR",
name = "way to the lake of Nur",
- display = '>', color_r=255, color_g=255, color_b=0, image = "terrain/way_next_2.png",
+ display = '>', color_r=255, color_g=255, color_b=0, image = "terrain/grass.png", add_displays = {class.new{image = "terrain/way_next_2.png"}},
notice = true,
always_remember = true,
change_level = 1, change_zone = "lake-nur",
--
GitLab