From c451144e0371616a6d7ada1fdf6c13b44ab1d9bf Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 12 Aug 2012 02:18:03 +0000
Subject: [PATCH] moar
git-svn-id: http://svn.net-core.org/repos/t-engine4@5443 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/uiset/Minimalist.lua | 2 +-
.../data/general/events/noxious-caldera.lua | 41 ++++++++++++++++++
.../data/gfx/shockbolt/terrain/caldera.png | Bin 0 -> 7634 bytes
.../tome/data/maps/wilderness/eyal.lua | 1 +
game/modules/tome/data/zones/dreams/zone.lua | 4 +-
.../tome/data/zones/noxious-caldera/zone.lua | 3 ++
.../tome/data/zones/wilderness/events.lua | 22 ++++++++++
.../tome/data/zones/wilderness/zone.lua | 4 ++
tiled-maps/eyal2.tmx | 6 +++
9 files changed, 80 insertions(+), 3 deletions(-)
create mode 100644 game/modules/tome/data/general/events/noxious-caldera.lua
create mode 100644 game/modules/tome/data/gfx/shockbolt/terrain/caldera.png
create mode 100644 game/modules/tome/data/zones/wilderness/events.lua
diff --git a/game/modules/tome/class/uiset/Minimalist.lua b/game/modules/tome/class/uiset/Minimalist.lua
index 55b3f01daa..e5139b1733 100644
--- a/game/modules/tome/class/uiset/Minimalist.lua
+++ b/game/modules/tome/class/uiset/Minimalist.lua
@@ -1062,7 +1062,7 @@ function _M:displayResources(scale, bx, by, a)
dt[1]:toScreenFull(x+(front[6]-dt[6])/2, y+90, dt[6], dt[7], dt[2], dt[3], 1, 1, 1, a)
front[1]:toScreenFull(x, y, front[6], front[7], front[2], front[3], 1, 1, 1, a)
- self:showResourceTooltip(bx+x*scale, by+y*scale, front[6], front[7], "res:hourglass", game.level.turn_counter_desc)
+ self:showResourceTooltip(bx+x*scale, by+y*scale, front[6], front[7], "res:hourglass", game.level.turn_counter_desc or "")
x, y = self:resourceOrientStep(orient, bx, by, scale, x, y, fshat[6], front[7])
elseif game.mouse:getZone("res:hourglass") then game.mouse:unregisterZone("res:hourglass") end
diff --git a/game/modules/tome/data/general/events/noxious-caldera.lua b/game/modules/tome/data/general/events/noxious-caldera.lua
new file mode 100644
index 0000000000..83a300b15d
--- /dev/null
+++ b/game/modules/tome/data/general/events/noxious-caldera.lua
@@ -0,0 +1,41 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012 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
+
+level.data.on_enter_list.noxious_caldera = function()
+ if game.level.data.noxious_caldera_added then return end
+ if game:getPlayer(true).level < 20 then return end
+
+ local spot = game.level:pickSpot{type="world-encounter", subtype="noxious-caldera"}
+ if not spot then return end
+
+ game.level.data.noxious_caldera_added = true
+ local g = game.level.map(spot.x, spot.y, engine.Map.TERRAIN):cloneFull()
+ g.__nice_tile_base = nil
+ g.name = "Way into a volcanic caldera"
+ g.display='>' g.color_r=255 g.color_g=0 g.color_b=0 g.notice = true
+ g.change_level=1 g.change_zone="noxious-caldera" g.glow=true
+ g.add_displays = g.add_displays or {}
+ g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/caldera.png", z=5}
+ g.nice_tiler = nil
+ g:initGlow()
+ game.zone:addEntity(game.level, g, "terrain", spot.x, spot.y)
+ print("[WORLDMAP] noxious caldera at", spot.x, spot.y)
+end
+
+return true
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/caldera.png b/game/modules/tome/data/gfx/shockbolt/terrain/caldera.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b38061d7ff0036e995192d109eb4ae2fa17f56
GIT binary patch
literal 7634
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
AtN;K2
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/maps/wilderness/eyal.lua b/game/modules/tome/data/maps/wilderness/eyal.lua
index d8aba539b6..dd7720019f 100644
--- a/game/modules/tome/data/maps/wilderness/eyal.lua
+++ b/game/modules/tome/data/maps/wilderness/eyal.lua
@@ -448,6 +448,7 @@ addSpot({34, 25}, "world-encounter", "lost-merchant")
addSpot({35, 25}, "world-encounter", "lost-merchant")
addSpot({36, 25}, "world-encounter", "lost-merchant")
addSpot({37, 25}, "world-encounter", "lost-merchant")
+addSpot({35, 35}, "world-encounter", "noxious-caldera")
-- addZone section
addZone({5, 1, 82, 43}, "zonename", "Maj'Eyal")
diff --git a/game/modules/tome/data/zones/dreams/zone.lua b/game/modules/tome/data/zones/dreams/zone.lua
index c68f17db55..6d2196a62d 100644
--- a/game/modules/tome/data/zones/dreams/zone.lua
+++ b/game/modules/tome/data/zones/dreams/zone.lua
@@ -53,7 +53,7 @@ return {
},
actor = {
class = "mod.class.generator.actor.Random",
- nb_npc = {40, 40},
+ nb_npc = {30, 30},
filter = {type="feline"},
randelite = 0,
},
@@ -73,7 +73,7 @@ return {
-- Dream of vulnerability
if lev == 1 then
local f = require("mod.class.Player").new{
- name = "frail mice", image = "npc/vermin_rodent_giant_white_mouse.png",
+ name = "frail mouse", image = "npc/vermin_rodent_giant_white_mouse.png",
type = "vermin", subtype = "rodent",
display = "r", color=colors.WHITE,
body = { INVEN = 10 },
diff --git a/game/modules/tome/data/zones/noxious-caldera/zone.lua b/game/modules/tome/data/zones/noxious-caldera/zone.lua
index 618ccf2596..ddffec8810 100644
--- a/game/modules/tome/data/zones/noxious-caldera/zone.lua
+++ b/game/modules/tome/data/zones/noxious-caldera/zone.lua
@@ -87,6 +87,9 @@ return {
game.level.turn_counter = game.level.turn_counter - 1
game.player.changed = true
if game.level.turn_counter < 0 then
+ game.level.turn_counter = nil
+ game.level.max_turn_counter = nil
+
local dream = rng.range(1, 1)
game:changeLevel(dream, "dreams")
end
diff --git a/game/modules/tome/data/zones/wilderness/events.lua b/game/modules/tome/data/zones/wilderness/events.lua
new file mode 100644
index 0000000000..e594bd3cdc
--- /dev/null
+++ b/game/modules/tome/data/zones/wilderness/events.lua
@@ -0,0 +1,22 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012 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
+
+return { one_per_level=true,
+ {name="noxious-caldera", percent=100},
+}
diff --git a/game/modules/tome/data/zones/wilderness/zone.lua b/game/modules/tome/data/zones/wilderness/zone.lua
index 7725ccdc8a..c4cf10ecac 100644
--- a/game/modules/tome/data/zones/wilderness/zone.lua
+++ b/game/modules/tome/data/zones/wilderness/zone.lua
@@ -84,11 +84,15 @@ return {
-- Only run once
level.data.post_nicer_tiles = nil
end,
+ on_enter_list = {},
on_enter = function(_, _, newzone)
if game.player.level >= 12 and game.player.level <= 20 and not game.player:hasQuest("lightning-overload") then
game.player:grantQuest("lightning-overload")
elseif game.player:hasQuest("lightning-overload") then
game.player:hasQuest("lightning-overload"):on_wilderness()
end
+ for name, f in pairs(game.level.data.on_enter_list) do
+ f()
+ end
end
}
diff --git a/tiled-maps/eyal2.tmx b/tiled-maps/eyal2.tmx
index d00c5231cc..8b08beb791 100644
--- a/tiled-maps/eyal2.tmx
+++ b/tiled-maps/eyal2.tmx
@@ -17946,5 +17946,11 @@
<property name="type" value=""world-encounter""/>
</properties>
</object>
+ <object name="Noxious Caldera" x="1125" y="1125" width="21" height="20">
+ <properties>
+ <property name="subtype" value=""noxious-caldera""/>
+ <property name="type" value=""world-encounter""/>
+ </properties>
+ </object>
</objectgroup>
</map>
--
GitLab