From b2c4f1c67688995048a6128da3aee8d18d33da7e Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 17 Sep 2010 18:35:04 +0000
Subject: [PATCH] moar vaults Dialogs titels are in bold
git-svn-id: http://svn.net-core.org/repos/t-engine4@1242 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/Dialog.lua | 2 +
.../data/maps/vaults/mage-hideout-dark.lua | 43 ++++++++++++++
.../tome/data/maps/vaults/mage-hideout.lua | 43 ++++++++++++++
.../data/maps/vaults/troll-hideout-dark.lua | 56 +++++++++++++++++++
.../tome/data/maps/vaults/troll-hideout.lua | 56 +++++++++++++++++++
.../tome/data/zones/old-forest/grids.lua | 1 +
.../tome/data/zones/old-forest/zone.lua | 2 +-
.../tome/data/zones/trollshaws/zone.lua | 2 +-
8 files changed, 203 insertions(+), 2 deletions(-)
create mode 100644 game/modules/tome/data/maps/vaults/mage-hideout-dark.lua
create mode 100644 game/modules/tome/data/maps/vaults/mage-hideout.lua
create mode 100644 game/modules/tome/data/maps/vaults/troll-hideout-dark.lua
create mode 100644 game/modules/tome/data/maps/vaults/troll-hideout.lua
diff --git a/game/engines/default/engine/Dialog.lua b/game/engines/default/engine/Dialog.lua
index 936e71d9a2..14e232f607 100644
--- a/game/engines/default/engine/Dialog.lua
+++ b/game/engines/default/engine/Dialog.lua
@@ -196,8 +196,10 @@ function _M:display()
s:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_4.png"), self.w - 3, i)
end
+ self.font:setStyle("bold")
local tw, th = self.font:size(self.title)
s:drawColorStringBlended(self.font, self.title, (self.w - tw) / 2, 4, 255,255,255)
+ self.font:setStyle("normal")
self.internal_surface:erase()
self:drawDialog(self.internal_surface)
diff --git a/game/modules/tome/data/maps/vaults/mage-hideout-dark.lua b/game/modules/tome/data/maps/vaults/mage-hideout-dark.lua
new file mode 100644
index 0000000000..2f1cd55b5e
--- /dev/null
+++ b/game/modules/tome/data/maps/vaults/mage-hideout-dark.lua
@@ -0,0 +1,43 @@
+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+setStatusAll{no_teleport=true}
+
+rotates = {"default", "90", "180", "270", "flipx", "flipy"}
+
+defineTile(',', "GRASS_DARK1")
+defineTile('#', "WALL")
+defineTile('X', "TREE_DARK1")
+defineTile('+', "DOOR")
+defineTile('s', "GRASS_DARK1", nil, {random_filter={name="skeleton mage", add_levels=6}})
+defineTile('$', "FLOOR", {random_filter={type="scroll"}}, nil)
+
+startx = 1
+starty = 7
+
+return {
+[[XXXXXXXXXXX]],
+[[X,,X,,,X,X,]],
+[[X,X,,,,,,XX]],
+[[X,X,,s####X]],
+[[X,X,,,#$$#X]],
+[[X,XX,,+$$#X]],
+[[X,,XX,####X]],
+[[X,,,XXXXXXX]],
+}
diff --git a/game/modules/tome/data/maps/vaults/mage-hideout.lua b/game/modules/tome/data/maps/vaults/mage-hideout.lua
new file mode 100644
index 0000000000..94df7dfae3
--- /dev/null
+++ b/game/modules/tome/data/maps/vaults/mage-hideout.lua
@@ -0,0 +1,43 @@
+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+setStatusAll{no_teleport=true}
+
+rotates = {"default", "90", "180", "270", "flipx", "flipy"}
+
+defineTile(',', "GRASS")
+defineTile('#', "WALL")
+defineTile('X', "TREE")
+defineTile('+', "DOOR")
+defineTile('s', "GRASS", nil, {random_filter={name="skeleton mage", add_levels=6}})
+defineTile('$', "FLOOR", {random_filter={type="scroll"}}, nil)
+
+startx = 1
+starty = 7
+
+return {
+[[XXXXXXXXXXX]],
+[[X,,X,,,X,X,]],
+[[X,X,,,,,,XX]],
+[[X,X,,s####X]],
+[[X,X,,,#$$#X]],
+[[X,XX,,+$$#X]],
+[[X,,XX,####X]],
+[[X,,,XXXXXXX]],
+}
diff --git a/game/modules/tome/data/maps/vaults/troll-hideout-dark.lua b/game/modules/tome/data/maps/vaults/troll-hideout-dark.lua
new file mode 100644
index 0000000000..3e6797e6c0
--- /dev/null
+++ b/game/modules/tome/data/maps/vaults/troll-hideout-dark.lua
@@ -0,0 +1,56 @@
+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+setStatusAll{no_teleport=true}
+
+rotates = {"default", "90", "180", "270", "flipx", "flipy"}
+
+defineTile('.', "FLOOR")
+defineTile(',', "GRASS_DARK1")
+defineTile('~', "SHALLOW_WATER")
+defineTile('#', "HARDWALL")
+defineTile('X', "TREE_DARK1")
+defineTile('+', "DOOR")
+
+defineTile('T', "FLOOR", {random_filter={type="potion"}}, {random_filter={name="forest troll",add_levels=10}})
+defineTile('t', "FLOOR", nil, {random_filter={name="forest troll"}})
+defineTile('$', "FLOOR", {random_filter={type="potion"}}, nil)
+
+return {
+[[,,,,,,,,,,,,,,,,,,,,,,]],
+[[,,,XX,,X,,,,,,,,,,X,,,]],
+[[,,X~~~~~~~,,~~~~~XXX,,]],
+[[,XX~#####~,,~#####~,,,]],
+[[,XX~#...#~~~~#...#~,X,]],
+[[,XX~#.t.######.t.#~,,,]],
+[[,,X~#...#.t..#...#~,X,]],
+[[,XX~####+..t.+####~,,,]],
+[[,XX~~~#....#####~~~,,,]],
+[[,,,..t+....#$$$#~,,,X,]],
+[[,,,..t+....+$$T#~,,,x,]],
+[[,XX~~~#....#####~~~,X,]],
+[[,,X~####+....+####~,X,]],
+[[,,X~#...#....#...#~,X,]],
+[[,,X~#.t.######.t.#~,,,]],
+[[,XX~#...#~~~~#...#~,,,]],
+[[,,X~#####~,,~#####~,,,]],
+[[,,X~~~~~~~,,~~~~~~~,,,]],
+[[,,XXX,X,,XXX,X,,XXX,,,]],
+[[,,,,,,,,,,,,,,,,,,,,,,]],
+}
diff --git a/game/modules/tome/data/maps/vaults/troll-hideout.lua b/game/modules/tome/data/maps/vaults/troll-hideout.lua
new file mode 100644
index 0000000000..4ff0591726
--- /dev/null
+++ b/game/modules/tome/data/maps/vaults/troll-hideout.lua
@@ -0,0 +1,56 @@
+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+setStatusAll{no_teleport=true}
+
+rotates = {"default", "90", "180", "270", "flipx", "flipy"}
+
+defineTile('.', "FLOOR")
+defineTile(',', "GRASS")
+defineTile('~', "SHALLOW_WATER")
+defineTile('#', "HARDWALL")
+defineTile('X', "TREE")
+defineTile('+', "DOOR")
+
+defineTile('T', "FLOOR", {random_filter={type="potion"}}, {random_filter={name="forest troll"}})
+defineTile('t', "FLOOR", nil, {random_filter={name="forest troll"}})
+defineTile('$', "FLOOR", {random_filter={type="potion"}}, nil)
+
+return {
+[[,,,,,,,,,,,,,,,,,,,,,,]],
+[[,,,XX,,X,,,,,,,,,,X,,,]],
+[[,,X~~~~~~~,,~~~~~XXX,,]],
+[[,XX~#####~,,~#####~,,,]],
+[[,XX~#...#~~~~#...#~,X,]],
+[[,XX~#.t.######.t.#~,,,]],
+[[,,X~#...#.t..#...#~,X,]],
+[[,XX~####+..t.+####~,,,]],
+[[,XX~~~#....#####~~~,,,]],
+[[,,,..t+....#$$$#~,,,X,]],
+[[,,,..t+....+$$T#~,,,x,]],
+[[,XX~~~#....#####~~~,X,]],
+[[,,X~####+....+####~,X,]],
+[[,,X~#...#....#...#~,X,]],
+[[,,X~#.t.######.t.#~,,,]],
+[[,XX~#...#~~~~#...#~,,,]],
+[[,,X~#####~,,~#####~,,,]],
+[[,,X~~~~~~~,,~~~~~~~,,,]],
+[[,,XXX,X,,XXX,X,,XXX,,,]],
+[[,,,,,,,,,,,,,,,,,,,,,,]],
+}
diff --git a/game/modules/tome/data/zones/old-forest/grids.lua b/game/modules/tome/data/zones/old-forest/grids.lua
index 649dff9ed6..17d13d0604 100644
--- a/game/modules/tome/data/zones/old-forest/grids.lua
+++ b/game/modules/tome/data/zones/old-forest/grids.lua
@@ -19,3 +19,4 @@
load("/data/general/grids/basic.lua")
load("/data/general/grids/forest.lua")
+load("/data/general/grids/water.lua")
diff --git a/game/modules/tome/data/zones/old-forest/zone.lua b/game/modules/tome/data/zones/old-forest/zone.lua
index e5d4fabe68..2140dff1b3 100644
--- a/game/modules/tome/data/zones/old-forest/zone.lua
+++ b/game/modules/tome/data/zones/old-forest/zone.lua
@@ -36,7 +36,7 @@ return {
edge_entrances = {6,4},
rooms = {"forest_clearing", {"lesser_vault",8}},
rooms_config = {forest_clearing={pit_chance=5, filters={{type="insect", subtype="ant"}, {type="insect"}, {type="animal", subtype="snake"}, {type="animal", subtype="canine"}}}},
- lesser_vaults_list = {"honey_glade_dark"},
+ lesser_vaults_list = {"honey_glade_dark", "troll-hideout-dark", "mage-hideout-dark"},
['.'] = "GRASS_DARK1",
['#'] = {"TREE_DARK1","TREE_DARK2","TREE_DARK3","TREE_DARK4","TREE_DARK5","TREE_DARK6","TREE_DARK7","TREE_DARK8","TREE_DARK9","TREE_DARK10","TREE_DARK11","TREE_DARK12","TREE_DARK13","TREE_DARK14","TREE_DARK15","TREE_DARK16","TREE_DARK17","TREE_DARK18","TREE_DARK19","TREE_DARK20",},
up = "UP",
diff --git a/game/modules/tome/data/zones/trollshaws/zone.lua b/game/modules/tome/data/zones/trollshaws/zone.lua
index 47ba9c9f29..c0e8b8495a 100644
--- a/game/modules/tome/data/zones/trollshaws/zone.lua
+++ b/game/modules/tome/data/zones/trollshaws/zone.lua
@@ -48,7 +48,7 @@ return {
nb_rooms = {0,0,0,1},
rooms = {"lesser_vault"},
- lesser_vaults_list = {"honey_glade", "forest-ruined-building1", "forest-ruined-building2", "forest-ruined-building3", "forest-snake-pit"},
+ lesser_vaults_list = {"honey_glade", "forest-ruined-building1", "forest-ruined-building2", "forest-ruined-building3", "forest-snake-pit", "mage-hideout-dark"},
lite_room_chance = 100,
},
actor = {
--
GitLab