Skip to content
Snippets Groups Projects
Commit ee759f2c authored by DarkGod's avatar DarkGod
Browse files

New super nice looking fountain in Angolwen

new effect for sun ray
parent c8082231
No related branches found
No related tags found
No related merge requests found
game/modules/tome/data/gfx/particles_images/volumetric/sunray.png

26.6 KiB

game/modules/tome/data/gfx/shockbolt/terrain/statues/angolwen_fountain.png

139 KiB

...@@ -24,6 +24,7 @@ defineTile(".", "GRASS") ...@@ -24,6 +24,7 @@ defineTile(".", "GRASS")
defineTile("t", "TREE") defineTile("t", "TREE")
defineTile('*', "ROCK") defineTile('*', "ROCK")
defineTile('~', "FOUNTAIN") defineTile('~', "FOUNTAIN")
defineTile('F', "FOUNTAIN_MAIN")
defineTile('-', "FIELDS") defineTile('-', "FIELDS")
defineTile('_', "GRASS_ROAD_STONE") defineTile('_', "GRASS_ROAD_STONE")
...@@ -38,6 +39,7 @@ defineTile('T', "GRASS", nil, "TARELION") ...@@ -38,6 +39,7 @@ defineTile('T', "GRASS", nil, "TARELION")
startx = 24 startx = 24
starty = 46 starty = 46
-- ASCII map section
return [[ return [[
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...@@ -66,7 +68,7 @@ return [[ ...@@ -66,7 +68,7 @@ return [[
^^^^...^^^_^^^_^^^^^...___...^^^^^^^^^^^^^^^^^^^^^ ^^^^...^^^_^^^_^^^^^...___...^^^^^^^^^^^^^^^^^^^^^
^^^.....^^_^^^_^^^^^..__~__..^^^^^^^^^^^^^^^^^^^^^ ^^^.....^^_^^^_^^^^^..__~__..^^^^^^^^^^^^^^^^^^^^^
^^.*....____________.__~~~__.___________^^^^^^^^^^ ^^.*....____________.__~~~__.___________^^^^^^^^^^
^^.@_____^^^^^^^^^^___~~~~~___^^^^^^^^^_^^^^^^^^^^ ^^.@_____^^^^^^^^^^___~~F~~___^^^^^^^^^_^^^^^^^^^^
^^.*....____________.__~~~__.___________^^^^^^^^^^ ^^.*....____________.__~~~__.___________^^^^^^^^^^
^^^.....^^_^^^_^^^^^..__~__..^^^^^^^^^^_^^^^^^^^^^ ^^^.....^^_^^^_^^^^^..__~__..^^^^^^^^^^_^^^^^^^^^^
^^^^...^^^_^^^_^^^^^...___...^^^^^^^^^^_^^^^^^^^^^ ^^^^...^^^_^^^_^^^^^...___...^^^^^^^^^^_^^^^^^^^^^
......
...@@ -42,7 +42,12 @@ newTalent{ ...@@ -42,7 +42,12 @@ newTalent{
local tg = {type="hit", range=self:getTalentRange(t), talent=t} local tg = {type="hit", range=self:getTalentRange(t), talent=t}
local x, y = self:getTarget(tg) local x, y = self:getTarget(tg)
if not x or not y then return nil end if not x or not y then return nil end
self:project(tg, x, y, DamageType.LIGHT, self:spellCrit(t.getDamage(self, t)), {type="light"})
local particule = {type="light"}
if core.shader.allow("adv") then
particule = {type="volumetric", args={kind="conic_cylinder", life=14, base_rotation=rng.range(160, 200), radius=4, y=1.8, density=40, shininess=20, growSpeed=0.006, img="sunray"}}
end
self:project(tg, x, y, DamageType.LIGHT, self:spellCrit(t.getDamage(self, t)), particule)
if self:getTalentLevel(t) >= 3 then if self:getTalentLevel(t) >= 3 then
local _ _, x, y = self:canProject(tg, x, y) local _ _, x, y = self:canProject(tg, x, y)
......
...@@ -43,5 +43,16 @@ newEntity{ base = "FLOOR", define_as = "ROCK", ...@@ -43,5 +43,16 @@ newEntity{ base = "FLOOR", define_as = "ROCK",
newEntity{ base = "DEEP_WATER", define_as = "FOUNTAIN", newEntity{ base = "DEEP_WATER", define_as = "FOUNTAIN",
name="fountain", name="fountain",
does_block_move = true does_block_move = true,
}
newEntity{ base = "DEEP_WATER", define_as = "FOUNTAIN_MAIN",
name="fountain",
does_block_move = true,
add_displays = {class.new{
z = 17,
image = "terrain/statues/angolwen_fountain.png",
display_w = 6, display_h = 5,
display_x = -2.5, display_y = -2,
}},
} }
...@@ -7,6 +7,11 @@ ...@@ -7,6 +7,11 @@
<property name="display" value="."/> <property name="display" value="."/>
</properties> </properties>
</tile> </tile>
<tile id="26">
<properties>
<property name="display" value="F"/>
</properties>
</tile>
<tile id="30"> <tile id="30">
<properties> <properties>
<property name="display" value="_"/> <property name="display" value="_"/>
...@@ -86,7 +91,7 @@ ...@@ -86,7 +91,7 @@
</tileset> </tileset>
<layer name="Terrain" width="50" height="50"> <layer name="Terrain" width="50" height="50">
<data encoding="base64" compression="zlib"> <data encoding="base64" compression="zlib">
eJztmMsRhCAMhj3bhGVYgw1Rz14tYN+V2M3ugcxkMpGBICQwHP7RBRfy+RtebpomNzRkVLNA2jFz8S8CWeLBHHC/krKFlNPntRmA4/jr4a8zKnv565up+6AybYYzP2hZqM4iR8v5gVlofnB58yXPascey8R9U9oxpvKsngP80Y4phwX80I5lcAwOa8J5rh0LvFc8ZsaOodb8GBy2OJyPJ/S7Zw5red6qH1y/KRyhdWJNBq7PWA7KQPcaNVhCZxqpHBD/xrCUZtgZDskeDzOAuPoYSTiemW3h/2yMUtuUcvTgh8X8kHJQllCbNcarHA530pfG/JHLEdNmifmc+66vPmupxXELSIsjdZ1YmqPW/qNXjr0Tjqv9yOHvgcNantf0o/T8UYPDqgaHLVk895F6gdft2jFJfACOO+Jo0Zce/MAsmuN+i/oB1IHf/Q== eJztmMsNwyAMhnPOCj1kjMzQhZin1wzQZybpNu0BS5blIDABG8ThV1JIwV/+mJebpskNDRnVLJB2zFz8i0CWeDAH3K+kbCHl9HltBuD4/vXw1xmVvfz1zdR9UJk2w5EftCxUZ5Gj5fzALDQ/uLzZybPasccycd+UdoypPKvnAH+0Y8phAT+0Yxkcg8OacJ5rxwLvFY+ZsWOoNT8Ghy0O5+MJ/e6Zw1qet+oH128KR2idWJOB6zOWgzLQvUYNltCZRioHxH9lWEozbAyHZI+HGUBcfYwkHM/MtvB/IP4LwxLbppSjBz8s5oeUg7KE2qwxXuVwuIO+NOaPXI6YNkvM59x3ffZZSy2OW0BaHKnrxNIctfYfvXJsnXCc7UcOfw8c1vK8ph+l548aHFY1OGzJ4rmP1Au8bteOSeIDcNwRR4u+9OAHZtEc91vUD6sE388=
</data> </data>
</layer> </layer>
</map> </map>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment