From 52cdfcd25e19bb78f3f0916de43447101f660887 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 18 Aug 2011 08:35:38 +0000
Subject: [PATCH] Roads, water and molten lava show up on the minimap
git-svn-id: http://svn.net-core.org/repos/t-engine4@4178 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Grid.lua | 1 +
game/modules/tome/data/general/grids/lava.lua | 1 +
game/modules/tome/data/general/grids/water.lua | 1 +
game/modules/tome/data/zones/last-hope-graveyard/grids.lua | 3 ++-
game/modules/tome/data/zones/town-angolwen/grids.lua | 3 ++-
game/modules/tome/data/zones/town-derth/grids.lua | 3 ++-
game/modules/tome/data/zones/town-gates-of-morning/grids.lua | 3 ++-
game/modules/tome/data/zones/town-last-hope/grids.lua | 3 ++-
game/modules/tome/data/zones/town-shatur/grids.lua | 3 ++-
game/modules/tome/data/zones/town-zigur/grids.lua | 3 ++-
game/modules/tome/data/zones/trollmire/grids.lua | 3 ++-
game/modules/tome/dialogs/Birther.lua | 4 ++--
12 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/game/modules/tome/class/Grid.lua b/game/modules/tome/class/Grid.lua
index a84f6d0d3e..61a2daf980 100644
--- a/game/modules/tome/class/Grid.lua
+++ b/game/modules/tome/class/Grid.lua
@@ -102,6 +102,7 @@ end
-- You may overload this method to customize your minimap
function _M:setupMinimapInfo(mo, map)
if self.change_level then mo:minimap(240, 0, 240) return end
+ if self.special_minimap then mo:minimap(self.special_minimap.r, self.special_minimap.g, self.special_minimap.b) return end
return engine.Grid.setupMinimapInfo(self, mo, map)
end
diff --git a/game/modules/tome/data/general/grids/lava.lua b/game/modules/tome/data/general/grids/lava.lua
index d62d3367e0..ba29310599 100644
--- a/game/modules/tome/data/general/grids/lava.lua
+++ b/game/modules/tome/data/general/grids/lava.lua
@@ -58,6 +58,7 @@ newEntity{
type = "floor", subtype = "molten_lava",
name = "molten lava", image = "terrain/lava/molten_lava_5_01.png",
display = '%', color=colors.LIGHT_RED, back_color=colors.RED,
+ special_minimap = colors.RED,
does_block_move = true,
pass_projectile = true,
shader = "lava",
diff --git a/game/modules/tome/data/general/grids/water.lua b/game/modules/tome/data/general/grids/water.lua
index 621aa9de8c..2c3eb770d5 100644
--- a/game/modules/tome/data/general/grids/water.lua
+++ b/game/modules/tome/data/general/grids/water.lua
@@ -123,6 +123,7 @@ newEntity{
name = "deep water", image = "terrain/water_floor.png",
display = '~', color=colors.AQUAMARINE, back_color=colors.DARK_BLUE,
always_remember = true,
+ special_minimap = colors.BLUE,
}
-----------------------------------------
diff --git a/game/modules/tome/data/zones/last-hope-graveyard/grids.lua b/game/modules/tome/data/zones/last-hope-graveyard/grids.lua
index ca542791fc..65874bd17d 100644
--- a/game/modules/tome/data/zones/last-hope-graveyard/grids.lua
+++ b/game/modules/tome/data/zones/last-hope-graveyard/grids.lua
@@ -42,7 +42,8 @@ for i = 1, 20 do newEntity{ base="SWAMPTREE", define_as = "SWAMPTREE"..i, image
newEntity{ base = "FLOOR", define_as = "ROAD",
type = "floor", subtype = "road",
name="cobblestone road",
- display='.', image="terrain/stone_road1.png"
+ display='.', image="terrain/stone_road1.png",
+ special_minimap = colors.DARK_GREY,
}
newEntity{ base = "FLOOR", define_as = "GRAVE",
diff --git a/game/modules/tome/data/zones/town-angolwen/grids.lua b/game/modules/tome/data/zones/town-angolwen/grids.lua
index 07dedb1a92..c213e1f71b 100644
--- a/game/modules/tome/data/zones/town-angolwen/grids.lua
+++ b/game/modules/tome/data/zones/town-angolwen/grids.lua
@@ -31,7 +31,8 @@ for i = 1, 4 do newEntity{ base = "FIELDS", define_as = "FIELDS"..i, image="terr
newEntity{ base = "FLOOR", define_as = "COBBLESTONE",
name="cobblestone road",
- display='.', image="terrain/stone_road1.png"
+ display='.', image="terrain/stone_road1.png",
+ special_minimap = colors.DARK_GREY,
}
newEntity{ base = "FLOOR", define_as = "ROCK",
diff --git a/game/modules/tome/data/zones/town-derth/grids.lua b/game/modules/tome/data/zones/town-derth/grids.lua
index 1c8fdbbc32..a8f7070fdc 100644
--- a/game/modules/tome/data/zones/town-derth/grids.lua
+++ b/game/modules/tome/data/zones/town-derth/grids.lua
@@ -28,5 +28,6 @@ newEntity{ base = "GRASS", define_as = "FIELDS",
newEntity{ base = "FLOOR", define_as = "COBBLESTONE",
name="cobblestone road",
- display='.', image="terrain/stone_road1.png"
+ display='.', image="terrain/stone_road1.png",
+ special_minimap = colors.DARK_GREY,
}
diff --git a/game/modules/tome/data/zones/town-gates-of-morning/grids.lua b/game/modules/tome/data/zones/town-gates-of-morning/grids.lua
index 7d5d236cd2..ccd3c8936e 100644
--- a/game/modules/tome/data/zones/town-gates-of-morning/grids.lua
+++ b/game/modules/tome/data/zones/town-gates-of-morning/grids.lua
@@ -25,7 +25,8 @@ load("/data/general/grids/sand.lua")
newEntity{ base = "FLOOR", define_as = "ROAD",
name="cobblestone road",
- display='.', image="terrain/stone_road1.png"
+ display='.', image="terrain/stone_road1.png",
+ special_minimap = colors.DARK_GREY,
}
newEntity{
diff --git a/game/modules/tome/data/zones/town-last-hope/grids.lua b/game/modules/tome/data/zones/town-last-hope/grids.lua
index a4412a7fe9..f603c164fa 100644
--- a/game/modules/tome/data/zones/town-last-hope/grids.lua
+++ b/game/modules/tome/data/zones/town-last-hope/grids.lua
@@ -23,7 +23,8 @@ load("/data/general/grids/mountain.lua")
newEntity{ base = "FLOOR", define_as = "ROAD",
name="cobblestone road",
- display='.', image="terrain/stone_road1.png"
+ display='.', image="terrain/stone_road1.png",
+ special_minimap = colors.DARK_GREY,
}
newEntity{
diff --git a/game/modules/tome/data/zones/town-shatur/grids.lua b/game/modules/tome/data/zones/town-shatur/grids.lua
index c05976ed0c..9983f3ab07 100644
--- a/game/modules/tome/data/zones/town-shatur/grids.lua
+++ b/game/modules/tome/data/zones/town-shatur/grids.lua
@@ -24,5 +24,6 @@ load("/data/general/grids/mountain.lua", function(e) if e.image == "terrain/rock
newEntity{ base = "FLOOR", define_as = "COBBLESTONE",
name="cobblestone road",
- display='.', image="terrain/stone_road1.png"
+ display='.', image="terrain/stone_road1.png",
+ special_minimap = colors.DARK_GREY,
}
diff --git a/game/modules/tome/data/zones/town-zigur/grids.lua b/game/modules/tome/data/zones/town-zigur/grids.lua
index 3fcaa088e0..b894be51ff 100644
--- a/game/modules/tome/data/zones/town-zigur/grids.lua
+++ b/game/modules/tome/data/zones/town-zigur/grids.lua
@@ -51,7 +51,8 @@ for i = 1, 4 do newEntity{ base = "FIELDS", define_as = "FIELDS"..i, image="terr
newEntity{ base = "FLOOR", define_as = "COBBLESTONE",
name="cobblestone road",
- display='.', image="terrain/stone_road1.png"
+ display='.', image="terrain/stone_road1.png",
+ special_minimap = colors.DARK_GREY,
}
newEntity{ base = "HARDWALL", define_as = "ROCK",
diff --git a/game/modules/tome/data/zones/trollmire/grids.lua b/game/modules/tome/data/zones/trollmire/grids.lua
index a91d9ff539..49c06757a1 100644
--- a/game/modules/tome/data/zones/trollmire/grids.lua
+++ b/game/modules/tome/data/zones/trollmire/grids.lua
@@ -25,7 +25,8 @@ local grass_editer = { method="borders_def", def="grass"}
newEntity{ base = "FLOOR", define_as = "DIRT",
name="dirt road",
- display='.', image="terrain/stone_road1.png"
+ display='.', image="terrain/stone_road1.png",
+ special_minimap = colors.DARK_GREY,
}
newEntity{
diff --git a/game/modules/tome/dialogs/Birther.lua b/game/modules/tome/dialogs/Birther.lua
index 8ed412a8a0..1a0217b7e5 100644
--- a/game/modules/tome/dialogs/Birther.lua
+++ b/game/modules/tome/dialogs/Birther.lua
@@ -234,8 +234,8 @@ function _M:makeDefault()
self:setDescriptor("permadeath", "Adventure")
self:setDescriptor("race", "Human")
self:setDescriptor("subrace", "Higher")
- self:setDescriptor("class", "Celestial")
- self:setDescriptor("subclass", "Sun Paladin")
+ self:setDescriptor("class", "Warrior")
+ self:setDescriptor("subclass", "Fighter")
__module_extra_info.no_birth_popup = true
self:atEnd("created")
end
--
GitLab