diff --git a/game/engines/default/engine/generator/map/Forest.lua b/game/engines/default/engine/generator/map/Forest.lua
index 85f48fb930c43daf5fea033fbe1750a31d3e0352..cbea5efdbe0b9b7011985772119f5781a907be75 100644
--- a/game/engines/default/engine/generator/map/Forest.lua
+++ b/game/engines/default/engine/generator/map/Forest.lua
@@ -107,12 +107,9 @@ function _M:addPond(x, y, spots)
local g7 = pmap[i-1] and pmap[i-1][j-1]
local g8 = pmap[i] and pmap[i][j-1]
local g9 = pmap[i+1] and pmap[i+1][j-1]
+ local nb = (g1 and 1 or 0) + (g2 and 1 or 0) + (g3 and 1 or 0) + (g4 and 1 or 0) + (g6 and 1 or 0) + (g7 and 1 or 0) + (g8 and 1 or 0) + (g9 and 1 or 0)
- if not g8 and not g4 and not g6 and g2 then pmap[i][j] = nil
- elseif not g2 and not g4 and not g6 and g8 then pmap[i][j] = nil
- elseif not g6 and not g2 and not g8 and g4 then pmap[i][j] = nil
- elseif not g4 and not g2 and not g8 and g6 then pmap[i][j] = nil
- end
+ if nb < 4 then pmap[i][j] = nil end
end end
-- Draw the pond
diff --git a/game/engines/default/engine/generator/map/RoomsLoader.lua b/game/engines/default/engine/generator/map/RoomsLoader.lua
index bbcacd4af7e8767f076fc885f472f3213ee347ef..8c7d9f501c4706294f865f9e893a93f152065d1e 100644
--- a/game/engines/default/engine/generator/map/RoomsLoader.lua
+++ b/game/engines/default/engine/generator/map/RoomsLoader.lua
@@ -118,14 +118,14 @@ function _M:makePod(x, y, radius, room_id, data)
end
for i = -radius + x, radius + x do for j = -radius + y, radius + y do
- local g1 = self.map.room_map[i-1] and self.map.room_map[i-1][j+1].room == room_id
- local g2 = self.map.room_map[i] and self.map.room_map[i][j+1].room == room_id
- local g3 = self.map.room_map[i+1] and self.map.room_map[i+1][j+1].room == room_id
- local g4 = self.map.room_map[i-1] and self.map.room_map[i-1][j].room == room_id
- local g6 = self.map.room_map[i+1] and self.map.room_map[i+1][j].room == room_id
- local g7 = self.map.room_map[i-1] and self.map.room_map[i-1][j-1].room == room_id
- local g8 = self.map.room_map[i] and self.map.room_map[i][j-1].room == room_id
- local g9 = self.map.room_map[i+1] and self.map.room_map[i+1][j-1].room == room_id
+ local g1 = self.map.room_map[i-1] and self.map.room_map[i-1][j+1] and self.map.room_map[i-1][j+1].room == room_id
+ local g2 = self.map.room_map[i] and self.map.room_map[i][j+1] and self.map.room_map[i][j+1].room == room_id
+ local g3 = self.map.room_map[i+1] and self.map.room_map[i+1][j+1] and self.map.room_map[i+1][j+1].room == room_id
+ local g4 = self.map.room_map[i-1] and self.map.room_map[i-1][j] and self.map.room_map[i-1][j].room == room_id
+ local g6 = self.map.room_map[i+1] and self.map.room_map[i+1][j] and self.map.room_map[i+1][j].room == room_id
+ local g7 = self.map.room_map[i-1] and self.map.room_map[i-1][j-1] and self.map.room_map[i-1][j-1].room == room_id
+ local g8 = self.map.room_map[i] and self.map.room_map[i][j-1] and self.map.room_map[i][j-1].room == room_id
+ local g9 = self.map.room_map[i+1] and self.map.room_map[i+1][j-1] and self.map.room_map[i+1][j-1].room == room_id
if not g8 and not g4 and not g6 and g2 then self.map(i, j, Map.TERRAIN, self:resolve('#')) self.map.room_map[i][j].room = nil
elseif not g2 and not g4 and not g6 and g8 then self.map(i, j, Map.TERRAIN, self:resolve('#')) self.map.room_map[i][j].room = nil
diff --git a/game/modules/tome/data/gfx/line_particle.png b/game/modules/tome/data/gfx/line_particle.png
new file mode 100644
index 0000000000000000000000000000000000000000..83583bc62d9a8899bafa107abffab175361965fe
Binary files /dev/null and b/game/modules/tome/data/gfx/line_particle.png differ
diff --git a/game/modules/tome/data/gfx/particles/image.lua b/game/modules/tome/data/gfx/particles/image.lua
new file mode 100644
index 0000000000000000000000000000000000000000..50cc75d15050056287536afca1461f8dedd62fbb
--- /dev/null
+++ b/game/modules/tome/data/gfx/particles/image.lua
@@ -0,0 +1,47 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 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
+
+base_size = 64
+
+local r = 1
+local g = 1
+local b = 1
+local a = 1
+
+return { generator = function()
+ return {
+ life = 10,
+ size = size, sizev = 0, sizea = 0,
+
+ x = x, xv = 0, xa = 0,
+ y = y, yv = 0, ya = 0,
+ dir = 0, dirv = dirv, dira = 0,
+ vel = 0, velv = 0, vela = 0,
+
+ r = r, rv = 0, ra = 0,
+ g = g, gv = 0, ga = 0,
+ b = b, bv = 0, ba = 0,
+ a = a, av = 0, aa = 0,
+ }
+end, },
+function(self)
+ self.ps:emit(1)
+end,
+1,
+image
diff --git a/game/modules/tome/data/gfx/particles/starfield.lua b/game/modules/tome/data/gfx/particles/starfield.lua
index e87b3db71aa7ba168c458fb2837fec94c3266bb3..97edf95438ab68ac4694c81d69cce86ab4eeedc2 100644
--- a/game/modules/tome/data/gfx/particles/starfield.lua
+++ b/game/modules/tome/data/gfx/particles/starfield.lua
@@ -67,4 +67,4 @@ function(self)
end
first = false
end,
-1000
+1000
\ No newline at end of file
diff --git a/game/modules/tome/data/gfx/particles/starfield_static.lua b/game/modules/tome/data/gfx/particles/starfield_static.lua
new file mode 100644
index 0000000000000000000000000000000000000000..e7786b48983b7d2eea8a102c8f5dd2a42f8f4a40
--- /dev/null
+++ b/game/modules/tome/data/gfx/particles/starfield_static.lua
@@ -0,0 +1,55 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 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
+
+local side = rng.table{4,6,2,8}
+local first = true
+local life
+
+local first = true
+
+local stars = {}
+for i = 1, nb do stars[#stars+1] = {x = rng.range(0, width), y = rng.range(0, height)} end
+
+local idx = 1
+
+return { generator = function()
+ local x = stars[idx].x
+ local y = stars[idx].y
+ idx = idx + 1
+ if idx > #stars then idx = 1 end
+
+ return {
+ life = 1000000,
+ size = rng.float(size_min, size_max), sizev = 0, sizea = 0,
+
+ x = x, xv = 0, xa = 0,
+ y = y, yv = 0, ya = 0,
+ dir = 0, dirv = 0, dira = 0,
+ vel = 0, velv = 0, vela = 0,
+
+ r = 1, rv = 0, ra = 0,
+ g = 1, gv = 0, ga = 0,
+ b = 1, bv = 0, ba = 0,
+ a = rng.float(a_min, a_max), av = 0, aa = 0,
+ }
+end, },
+function(self)
+ if first then self.ps:emit(nb) first = false end
+end,
+nb
\ No newline at end of file
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_blood_mage.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_blood_mage.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0024bb08efea4ff0b7c0289440f3158fe29ad66
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_blood_mage.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_corruptor.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_corruptor.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c97905a49eab3d8ce23a266dd297a2865335833
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_corruptor.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_cryomancer.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_cryomancer.png
new file mode 100644
index 0000000000000000000000000000000000000000..11ae1d827abbc168961222e66d6f36155103f090
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_cryomancer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_elite_berserker.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_elite_berserker.png
new file mode 100644
index 0000000000000000000000000000000000000000..40537508e682735d4c298415cde2f259ce6eb4cb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_elite_berserker.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_elite_fighter.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_elite_fighter.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6b9088f9095ec553aea41fad1262799aa7187f1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_elite_fighter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_high_cryomancer.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_high_cryomancer.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed8e4f1ccd3d7a7435f493cba50b252444762221
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_high_cryomancer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_high_pyromancer.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_high_pyromancer.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1646ee7da8a7cfe8a33847f3177860e449a4cb6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_high_pyromancer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_mage_hunter.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_mage_hunter.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cd673423e34d468c15d67110f89331ee4ac0199
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_mage_hunter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_necromancer.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_necromancer.png
new file mode 100644
index 0000000000000000000000000000000000000000..846b671439a4b2e7e3ce8b9d6eb3910347b37018
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_necromancer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_pyromancer.png b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_pyromancer.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d26aebcd3062ddacc694cfb0261e3c6eccb645e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/humanoid_orc_orc_pyromancer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/star.png b/game/modules/tome/data/gfx/shockbolt/terrain/star.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ec22b9ac18d34f9cd28d02680c7e05d22479ac0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/star.png differ
diff --git a/game/modules/tome/data/zones/abashed-expanse/zone.lua b/game/modules/tome/data/zones/abashed-expanse/zone.lua
index e8ce5dd232ea42ea6ed49001141406cfdb0a964a..d3d39fc487750db48e06802609a3ea49dface714 100644
--- a/game/modules/tome/data/zones/abashed-expanse/zone.lua
+++ b/game/modules/tome/data/zones/abashed-expanse/zone.lua
@@ -218,11 +218,16 @@ return {
post_process = function(level)
local Map = require "engine.Map"
- level.background_particle = require("engine.Particles").new("starfield", 1, {width=Map.viewport.width, height=Map.viewport.height, vel_min=0, vel_max=0.5})
+ level.background_particle1 = require("engine.Particles").new("starfield_static", 1, {width=Map.viewport.width, height=Map.viewport.height, nb=300, a_min=0.5, a_max = 0.8, size_min = 1, size_max = 3})
+ level.background_particle2 = require("engine.Particles").new("starfield_static", 1, {width=Map.viewport.width, height=Map.viewport.height, nb=300, a_min=0.5, a_max = 0.9, size_min = 4, size_max = 8})
+ level.world_particle = require("engine.Particles").new("image", 1, {size=512, image="shockbolt/terrain/eyal-world", x=400, y=400})
end,
background = function(level, x, y, nb_keyframes)
local Map = require "engine.Map"
- level.background_particle.ps:toScreen(x, y, true, 1)
+ level.background_particle1.ps:toScreen(x, y, true, 1)
+ local parx, pary = level.map.mx / (level.map.w - Map.viewport.mwidth), level.map.my / (level.map.h - Map.viewport.mheight)
+ level.background_particle2.ps:toScreen(x - parx * 40, y - pary * 40, true, 1)
+ level.world_particle.ps:toScreen(x - parx * 60, y - pary * 60, true, 1)
end,
}