From 1ba22e2574b360d6c56743c82f2cafba1c7db6a1 Mon Sep 17 00:00:00 2001 From: VanessaE Date: Thu, 4 Jun 2020 15:54:31 -0400 Subject: [PATCH] make fire burn down into embers first then those will degrade into ashes after 60s add sticks to embers to refuel and automatically reignite after 2s also make sure it_val and em_val are properly-set in on_construct in all nodes --- init.lua | 193 +++++++- models/contained_campfire.obj | 669 ++++++++++++++++++++++++++ textures/new_campfire_anim_embers.png | Bin 0 -> 844 bytes textures/new_campfire_embers.png | Bin 0 -> 214 bytes 4 files changed, 846 insertions(+), 16 deletions(-) create mode 100644 textures/new_campfire_anim_embers.png create mode 100644 textures/new_campfire_embers.png diff --git a/init.lua b/init.lua index 590408b..df42acf 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,9 @@ -- VARIABLES -new_campfire_cooking = 1; -- nil - not cooked, 1 - cooked -new_campfire_limit = 1; -- nil - unlimited campfire, 1 - limited -new_campfire_ttl = 30; -- Time in sec +new_campfire_cooking = 1 -- nil - not cooked, 1 - cooked +new_campfire_limit = 1 -- nil - unlimited campfire, 1 - limited +new_campfire_ttl = 30 -- Time in seconds until a fire burns down into embers +new_campfire_flare_up = 2 -- seconds from adding a stick to embers before it flares into a fire again +new_campfire_embers_ttl = 60 -- seconds until embers burn out completely leaving ash and an empty fireplace. new_campfire_stick_time = new_campfire_ttl/2; -- How long does the stick increase. In sec. new_campfire = {} @@ -207,6 +209,16 @@ local function add_stick(pos, itemstack) end end +local function burn_out(pos, node) + if string.find(node.name, "embers") then + minetest.set_node(pos, {name = string.gsub(node.name, "_with_embers", "")}) + minetest.add_item(pos, "new_campfire:ash") + else + fire_particles_off(pos) + minetest.set_node(pos, {name = string.gsub(node.name, "campfire_active", "fireplace_with_embers")}) + end +end + -- NODES local sbox = { @@ -237,6 +249,7 @@ minetest.register_node('new_campfire:fireplace', { tiles = { "default_stone.png", "new_campfire_empty_tile.png", + "new_campfire_empty_tile.png", "new_campfire_empty_tile.png" }, walkable = false, @@ -262,6 +275,8 @@ minetest.register_node('new_campfire:fireplace', { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string('infotext', S("Fireplace")); + meta:set_int("it_val", 0) + meta:set_int("em_val", 0) end, }) @@ -272,6 +287,7 @@ minetest.register_node('new_campfire:campfire', { tiles = { "default_stone.png", "default_wood.png", + "new_campfire_empty_tile.png", "new_campfire_empty_tile.png" }, inventory_image = "new_campfire_campfire.png", @@ -285,6 +301,8 @@ minetest.register_node('new_campfire:campfire', { on_construct = function(pos) local meta = minetest.get_meta(pos) + meta:set_int("it_val", 0) + meta:set_int("em_val", 0) meta:set_string('infotext', S("Campfire")); end, @@ -319,6 +337,7 @@ minetest.register_node('new_campfire:campfire_active', { tiles = { "default_stone.png", "default_wood.png", + "new_campfire_empty_tile.png", "new_campfire_empty_tile.png" }, inventory_image = "new_campfire_campfire.png", @@ -345,7 +364,8 @@ minetest.register_node('new_campfire:campfire_active', { on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_int('it_val', new_campfire_ttl); + meta:set_int('it_val', new_campfire_ttl) + meta:set_int("em_val", 0) infotext_edit(meta) minetest.get_node_timer(pos):start(2) end, @@ -358,6 +378,115 @@ minetest.register_node('new_campfire:campfire_active', { end, }) +minetest.register_node('new_campfire:fireplace_with_embers', { + description = S("Fireplace with embers"), + drawtype = 'mesh', + mesh = 'contained_campfire.obj', + tiles = { + "default_stone.png", + "new_campfire_empty_tile.png", + "new_campfire_empty_tile.png", + { + name = "new_campfire_anim_embers.png", + animation = { + type="vertical_frames", + aspect_w=16, + aspect_h=16, + length=2 + } + } + }, + walkable = false, + buildable_to = false, + sunlight_propagates = false, + paramtype = 'light', + light_source = 5, + groups = {dig_immediate=3, flammable=0, not_in_creative_inventory=1}, + selection_box = sbox, + sounds = default.node_sound_stone_defaults(), + drop = {max_items = 3, items = {{items = {"stairs:slab_cobble 3"}}}}, + + on_rightclick = function(pos, node, player, itemstack, pointed_thing) + local name = itemstack:get_name() + local a=add_stick(pos, itemstack) + if a then + minetest.swap_node(pos, {name = "new_campfire:campfire"}) + minetest.after(new_campfire_flare_up, function() + if minetest.get_meta(pos):get_int("it_val") > 0 then + minetest.swap_node(pos, {name="new_campfire:campfire_active"}) + end + end) + elseif name == "new_campfire:grille" then + itemstack:take_item() + minetest.swap_node(pos, {name = "new_campfire:fireplace_with_embers_with_grille"}) + end + end, + + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_int("it_val", 0) + meta:set_int("em_val", new_campfire_embers_ttl) + meta:set_string('infotext', S("Fireplace with embers")); + end, +}) + +minetest.register_node('new_campfire:fireplace_with_embers_with_grille', { + description = S("Fireplace with embers and grille"), + drawtype = 'mesh', + mesh = 'contained_campfire.obj', + tiles = { + "default_stone.png", + "new_campfire_empty_tile.png", + "default_steel_block.png", + { + name = "new_campfire_anim_embers.png", + animation = { + type="vertical_frames", + aspect_w=16, + aspect_h=16, + length=2 + } + } + }, + walkable = false, + buildable_to = false, + sunlight_propagates = false, + paramtype = 'light', + light_source = 5, + groups = {dig_immediate=3, flammable=0, not_in_creative_inventory=1}, + selection_box = grille_sbox, + node_box = grille_cbox, + sounds = default.node_sound_stone_defaults(), + drop = { + max_items = 4, + items = { + { + items = {"stairs:slab_cobble 3"}, + items = {"new_campfire:grille 1"} + } + } + }, + on_rightclick = function(pos, node, player, itemstack, pointed_thing) + local name = itemstack:get_name() + local a=add_stick(pos, itemstack) + if a then + minetest.swap_node(pos, {name = "new_campfire:campfire_with_grille"}) + minetest.after(new_campfire_flare_up, function() + if minetest.get_meta(pos):get_int("it_val") > 0 then + minetest.swap_node(pos, {name="new_campfire:campfire_active_with_grille"}) + end + end) + end + end, + + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_int("it_val", 0) + meta:set_int("em_val", new_campfire_embers_ttl) + meta:set_string('infotext', S("Fireplace with embers")); + end, +}) + minetest.register_node('new_campfire:fireplace_with_grille', { description = S("Fireplace with grille"), drawtype = 'mesh', @@ -365,7 +494,8 @@ minetest.register_node('new_campfire:fireplace_with_grille', { tiles = { "default_stone.png", "new_campfire_empty_tile.png", - "default_steel_block.png" + "default_steel_block.png", + "new_campfire_empty_tile.png" }, buildable_to = false, sunlight_propagates = false, @@ -385,6 +515,8 @@ minetest.register_node('new_campfire:fireplace_with_grille', { }, on_construct = function(pos) local meta = minetest.get_meta(pos) + meta:set_int("it_val", 0) + meta:set_int("em_val", 0) meta:set_string('infotext', S("Fireplace")); end, on_rightclick = function(pos, node, player, itemstack, pointed_thing) @@ -403,7 +535,8 @@ minetest.register_node('new_campfire:campfire_with_grille', { tiles = { "default_stone.png", "default_wood.png", - "default_steel_block.png" + "default_steel_block.png", + "new_campfire_empty_tile.png" }, inventory_image = "new_campfire_campfire.png", buildable_to = false, @@ -416,6 +549,8 @@ minetest.register_node('new_campfire:campfire_with_grille', { on_construct = function(pos) local meta = minetest.get_meta(pos) + meta:set_int("it_val", 0) + meta:set_int("em_val", 0) meta:set_string('infotext', S("Campfire")); end, @@ -455,7 +590,8 @@ minetest.register_node('new_campfire:campfire_active_with_grille', { tiles = { "default_stone.png", "default_wood.png", - "default_steel_block.png" + "default_steel_block.png", + "new_campfire_empty_tile.png" }, inventory_image = "new_campfire_campfire.png", buildable_to = false, @@ -488,6 +624,7 @@ minetest.register_node('new_campfire:campfire_active_with_grille', { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_int('it_val', new_campfire_ttl); + meta:set_int("em_val", 0) infotext_edit(meta) minetest.get_node_timer(pos):start(2) end, @@ -507,12 +644,34 @@ minetest.register_node('new_campfire:campfire_active_with_grille', { end, }) --- ABM +-- ABMs + minetest.register_abm({ - nodenames = {"new_campfire:campfire_active", "new_campfire:campfire_active_with_grille"}, --- neighbors = {"group:puts_out_fire"}, - interval = 1.0, -- Run every 3 seconds - chance = 1, -- Select every 1 in 1 nodes + nodenames = { + "new_campfire:fireplace_with_embers", + "new_campfire:fireplace_with_embers_with_grille" + }, + interval = 1.0, -- Run every second + chance = 1, -- Select every node + catch_up = false, + action = function(pos, node, active_object_count, active_object_count_wider) + local meta = minetest.get_meta(pos) + local em_val = meta:get_int("em_val") + meta:set_int("em_val", em_val - 1) + if em_val <= 0 then + burn_out(pos, node) + end + end +}) + + +minetest.register_abm({ + nodenames = { + "new_campfire:campfire_active", + "new_campfire:campfire_active_with_grille" + }, + interval = 1.0, -- Run every second + chance = 1, -- Select every node catch_up = false, action = function(pos, node, active_object_count, active_object_count_wider) @@ -522,7 +681,11 @@ minetest.register_abm({ {"group:water"} ) if #fpos > 0 then - minetest.set_node(pos, {name = string.gsub(node.name, "_active", "")}) + if string.find(node.name, "embers") then + burn_out(pos, node) + else + minetest.set_node(pos, {name = string.gsub(node.name, "_active", "")}) + end minetest.sound_play("fire_extinguish_flame",{pos = pos, max_hear_distance = 16, gain = 0.15}) else local meta = minetest.get_meta(pos) @@ -530,9 +693,7 @@ minetest.register_abm({ if new_campfire_limit and new_campfire_ttl > 0 then if it_val <= 0 then - minetest.remove_node(pos) - minetest.set_node(pos, {name = string.gsub(node.name, "campfire_active", "fireplace")} ) - minetest.add_item(pos, "new_campfire:ash") + burn_out(pos, node) return end meta:set_int('it_val', it_val); diff --git a/models/contained_campfire.obj b/models/contained_campfire.obj index 030364b..b1a8c7c 100644 --- a/models/contained_campfire.obj +++ b/models/contained_campfire.obj @@ -213,6 +213,166 @@ v -0.062500 0.125000 0.437500 v -0.312500 0.062500 0.437500 v 0.062500 0.062500 0.437500 v 0.312500 0.062500 -0.437500 +v -0.000319 -0.496425 0.327689 +v 0.065140 -0.496425 0.328566 +v 0.119655 -0.496425 0.289126 +v 0.186208 -0.496425 0.278641 +v 0.251573 -0.496425 0.251375 +v 0.280995 -0.496425 0.186620 +v 0.287679 -0.496425 0.118776 +v 0.352808 -0.496425 0.069724 +v 0.375546 -0.496425 -0.000517 +v 0.340149 -0.496425 -0.068240 +v 0.276930 -0.496425 -0.115357 +v 0.271610 -0.496425 -0.182214 +v 0.193062 -0.496425 -0.193898 +v 0.185356 -0.496425 -0.278400 +v 0.104110 -0.496425 -0.252630 +v 0.061064 -0.496425 -0.309112 +v -0.000319 -0.496425 -0.345968 +v -0.059488 -0.496425 -0.297980 +v -0.094534 -0.496425 -0.227971 +v -0.165560 -0.496425 -0.247817 +v -0.243320 -0.496425 -0.244474 +v -0.241318 -0.496425 -0.161547 +v -0.265990 -0.496425 -0.110561 +v -0.348228 -0.496425 -0.070073 +v -0.347905 -0.496425 -0.000517 +v -0.321918 -0.496425 0.063453 +v -0.277026 -0.496425 0.114099 +v -0.200869 -0.496425 0.133487 +v -0.207940 -0.496425 0.207105 +v -0.173428 -0.496425 0.258560 +v -0.105805 -0.496425 0.254151 +v -0.066636 -0.496425 0.332881 +v -0.000261 -0.436157 0.173488 +v 0.000599 -0.459697 0.259576 +v 0.000376 -0.439310 0.201148 +v 0.000691 -0.447927 0.232658 +v 0.052653 -0.459498 0.259920 +v 0.031059 -0.436157 0.173908 +v 0.046978 -0.447828 0.233101 +v 0.039074 -0.439284 0.201619 +v 0.095924 -0.459374 0.228362 +v 0.064335 -0.436157 0.149834 +v 0.086450 -0.447765 0.204418 +v 0.074888 -0.439267 0.175675 +v 0.148709 -0.459281 0.219890 +v 0.114150 -0.436157 0.141986 +v 0.135849 -0.447719 0.196558 +v 0.123199 -0.439255 0.168043 +v 0.200598 -0.459273 0.198230 +v 0.147551 -0.436157 0.128053 +v 0.182309 -0.447715 0.177170 +v 0.162892 -0.439254 0.151483 +v 0.246470 -0.459426 0.162528 +v 0.159070 -0.436157 0.118995 +v 0.220890 -0.447792 0.147016 +v 0.188899 -0.439274 0.131082 +v 0.229966 -0.459736 0.093264 +v 0.144596 -0.436157 0.059753 +v 0.205458 -0.447947 0.082996 +v 0.174210 -0.439316 0.070730 +v 0.282032 -0.459841 0.054241 +v 0.200315 -0.436157 0.017790 +v 0.254938 -0.447999 0.045825 +v 0.225028 -0.439330 0.032483 +v 0.300471 -0.460001 -0.001735 +v 0.205582 -0.436157 0.001517 +v 0.270443 -0.448079 -0.001580 +v 0.235712 -0.439351 -0.000390 +v 0.272967 -0.460412 -0.055903 +v 0.195064 -0.436157 -0.018607 +v 0.246596 -0.448284 -0.047980 +v 0.218081 -0.439406 -0.034329 +v 0.223331 -0.461058 -0.093974 +v 0.144737 -0.436157 -0.056116 +v 0.199521 -0.448607 -0.083603 +v 0.170754 -0.439493 -0.069746 +v 0.219804 -0.461581 -0.148183 +v 0.142365 -0.436157 -0.085921 +v 0.196134 -0.448869 -0.131108 +v 0.167790 -0.439563 -0.108318 +v 0.157126 -0.462230 -0.158252 +v 0.090110 -0.436157 -0.093693 +v 0.138519 -0.449193 -0.140051 +v 0.113989 -0.439650 -0.116421 +v 0.151282 -0.462638 -0.227270 +v 0.086773 -0.436157 -0.130284 +v 0.133259 -0.449397 -0.200199 +v 0.109647 -0.439705 -0.164700 +v 0.085396 -0.462788 -0.206545 +v 0.054947 -0.436157 -0.120189 +v 0.076113 -0.449473 -0.182160 +v 0.064968 -0.439725 -0.150552 +v 0.050404 -0.462761 -0.252404 +v 0.012415 -0.436157 -0.175997 +v 0.042356 -0.449459 -0.226428 +v 0.028451 -0.439721 -0.198461 +v 0.000524 -0.462809 -0.282439 +v 0.004944 -0.436157 -0.180483 +v 0.001351 -0.449483 -0.251091 +v 0.002969 -0.439727 -0.213772 +v -0.047648 -0.463036 -0.243787 +v -0.003385 -0.436157 -0.173727 +v -0.038371 -0.449596 -0.219083 +v -0.022170 -0.439758 -0.193440 +v -0.076318 -0.463304 -0.187114 +v -0.038880 -0.436157 -0.102821 +v -0.066062 -0.449730 -0.164066 +v -0.052359 -0.439794 -0.133213 +v -0.134192 -0.463252 -0.203231 +v -0.119861 -0.436157 -0.125448 +v -0.123278 -0.449705 -0.180027 +v -0.118033 -0.439787 -0.151556 +v -0.217279 -0.462948 -0.219440 +v -0.118715 -0.436157 -0.125220 +v -0.189814 -0.449552 -0.193109 +v -0.153737 -0.439746 -0.158621 +v -0.194812 -0.462385 -0.132185 +v -0.113820 -0.436157 -0.105665 +v -0.171371 -0.449271 -0.120682 +v -0.141725 -0.439671 -0.110976 +v -0.214284 -0.462020 -0.090654 +v -0.145079 -0.436157 -0.041066 +v -0.191349 -0.449088 -0.078751 +v -0.166018 -0.439622 -0.060600 +v -0.294758 -0.461341 -0.060434 +v -0.191979 -0.436157 -0.023883 +v -0.262701 -0.448749 -0.052240 +v -0.225081 -0.439531 -0.038862 +v -0.278750 -0.461077 -0.001700 +v -0.190021 -0.436157 -0.016467 +v -0.249705 -0.448617 -0.003972 +v -0.217228 -0.439496 -0.009377 +v -0.257876 -0.461083 0.049707 +v -0.176497 -0.436157 0.016824 +v -0.231079 -0.448620 0.041890 +v -0.201292 -0.439496 0.029854 +v -0.222098 -0.461281 0.090535 +v -0.160378 -0.436157 0.035008 +v -0.200014 -0.448719 0.077169 +v -0.177423 -0.439523 0.056845 +v -0.161018 -0.461465 0.106273 +v -0.085854 -0.436157 0.053980 +v -0.140800 -0.448811 0.092337 +v -0.113289 -0.439547 0.073197 +v -0.166406 -0.461192 0.165273 +v -0.092699 -0.436157 0.125242 +v -0.146147 -0.448675 0.149451 +v -0.119168 -0.439511 0.134798 +v -0.138427 -0.460955 0.206318 +v -0.092454 -0.436157 0.125607 +v -0.123655 -0.448556 0.182649 +v -0.106828 -0.439479 0.153107 +v -0.083961 -0.460667 0.202376 +v -0.043186 -0.436157 0.122394 +v -0.073227 -0.448412 0.179166 +v -0.058302 -0.439441 0.149891 +v -0.052339 -0.460056 0.264362 +v -0.017110 -0.436157 0.174808 +v -0.044310 -0.448107 0.236502 +v -0.031415 -0.439359 0.203723 vt 0.140625 0.781250 vt 0.250000 0.781250 vt 0.250000 0.625000 @@ -837,6 +997,166 @@ vt 0.062500 1.000000 vt 0.937500 1.000000 vt 0.937500 -0.000000 vt 0.062500 -0.000000 +vt 0.649484 0.173818 +vt 0.796402 0.706275 +vt 0.886377 0.346773 +vt 0.519313 0.992351 +vt 0.591186 0.899066 +vt 0.610939 1.000000 +vt 0.601064 0.070689 +vt 0.518148 0.093583 +vt 0.519313 0.000000 +vt 0.261598 0.920099 +vt 0.241716 0.801648 +vt 0.313408 0.833554 +vt 0.665058 0.884024 +vt 0.634876 0.807755 +vt 0.584705 0.150521 +vt 0.130635 0.784545 +vt 0.171287 0.879934 +vt 0.704278 0.210263 +vt 0.624317 0.234005 +vt 0.121401 0.684605 +vt 0.178337 0.749055 +vt 0.353551 0.935545 +vt 0.446123 0.892522 +vt 0.428872 0.993644 +vt 0.747617 0.144584 +vt 0.819075 0.186385 +vt 0.129203 0.589540 +vt 0.201139 0.647023 +vt 0.852289 0.271666 +vt 0.855055 0.149509 +vt 0.031415 0.612348 +vt 0.103727 0.507082 +vt 0.788034 0.314920 +vt 0.048906 0.409115 +vt 0.000000 0.508877 +vt 0.926123 0.420614 +vt 0.814937 0.376097 +vt 0.136252 0.339708 +vt 0.141728 0.427289 +vt 0.999554 0.508878 +vt 1.000000 0.406415 +vt 0.215180 0.291353 +vt 0.210306 0.371208 +vt 0.963649 0.603111 +vt 0.904006 0.507134 +vt 0.252129 0.224012 +vt 0.143602 0.241222 +vt 0.901624 0.677716 +vt 0.875166 0.582861 +vt 0.309853 0.174851 +vt 0.301778 0.276520 +vt 0.825734 0.643004 +vt 0.375029 0.137494 +vt 0.262774 0.099533 +vt 0.748787 0.753099 +vt 0.741342 0.666187 +vt 0.449231 0.137826 +vt 0.400884 0.205382 +vt 0.475959 0.765820 +vt 0.429984 0.730357 +vt 0.361157 0.718795 +vt 0.315008 0.698271 +vt 0.299093 0.684927 +vt 0.319091 0.597660 +vt 0.242108 0.535844 +vt 0.234830 0.511873 +vt 0.249362 0.482230 +vt 0.318896 0.426976 +vt 0.322173 0.383070 +vt 0.394372 0.371621 +vt 0.398982 0.317720 +vt 0.442955 0.332590 +vt 0.501718 0.250381 +vt 0.512041 0.243773 +vt 0.523549 0.253724 +vt 0.572590 0.358175 +vt 0.684477 0.324844 +vt 0.682894 0.325180 +vt 0.676130 0.353985 +vt 0.719320 0.449145 +vt 0.784119 0.474457 +vt 0.781414 0.485381 +vt 0.762728 0.534422 +vt 0.740458 0.561208 +vt 0.637492 0.589155 +vt 0.646949 0.694130 +vt 0.646611 0.694668 +vt 0.578540 0.689935 +vt 0.542511 0.767144 +vt 0.519233 0.765201 +vt 0.806172 0.814721 +vt 0.710129 0.813562 +vt 0.434503 0.054292 +vt 0.386338 0.846034 +vt 0.758489 0.890519 +vt 0.518352 0.805946 +vt 0.464885 0.806640 +vt 0.517917 0.852363 +vt 0.453965 0.853016 +vt 0.518044 0.892016 +vt 0.415404 0.768423 +vt 0.399428 0.810763 +vt 0.348654 0.757179 +vt 0.331176 0.799184 +vt 0.293812 0.732786 +vt 0.266985 0.770625 +vt 0.257879 0.702733 +vt 0.213680 0.726205 +vt 0.278175 0.613830 +vt 0.235002 0.631898 +vt 0.207963 0.557489 +vt 0.166636 0.577143 +vt 0.193201 0.509064 +vt 0.145214 0.507311 +vt 0.217560 0.459070 +vt 0.178163 0.438960 +vt 0.282950 0.406897 +vt 0.243203 0.386484 +vt 0.287045 0.350077 +vt 0.247883 0.316506 +vt 0.361380 0.338141 +vt 0.327488 0.303332 +vt 0.367379 0.267022 +vt 0.334755 0.214729 +vt 0.429109 0.287863 +vt 0.413710 0.241302 +vt 0.479563 0.217290 +vt 0.460351 0.176092 +vt 0.514770 0.194735 +vt 0.517005 0.139761 +vt 0.549503 0.224686 +vt 0.571887 0.186911 +vt 0.591213 0.313405 +vt 0.610147 0.267955 +vt 0.681952 0.286384 +vt 0.689199 0.244444 +vt 0.731283 0.275976 +vt 0.781128 0.225174 +vt 0.714686 0.346162 +vt 0.755646 0.331863 +vt 0.748251 0.420370 +vt 0.783249 0.393633 +vt 0.829854 0.452392 +vt 0.881831 0.432684 +vt 0.819005 0.495825 +vt 0.863877 0.503787 +vt 0.796987 0.553616 +vt 0.838142 0.571346 +vt 0.764008 0.593375 +vt 0.795221 0.623314 +vt 0.675397 0.617463 +vt 0.713409 0.645659 +vt 0.683520 0.708207 +vt 0.720795 0.729792 +vt 0.666471 0.735178 +vt 0.689720 0.778696 +vt 0.599425 0.730440 +vt 0.620045 0.773565 +vt 0.562276 0.809739 +vt 0.580092 0.858026 vn -0.9881 0.0000 0.1541 vn -0.1541 0.0000 -0.9881 vn 0.9881 0.0000 -0.1541 @@ -915,6 +1235,163 @@ vn 0.0004 -0.9854 -0.1704 vn -0.9209 -0.0668 0.3841 vn -0.0004 0.9854 0.1704 vn -0.3899 0.1568 -0.9074 +vn 0.0372 0.8794 0.4746 +vn -0.3521 0.8292 -0.4341 +vn 0.1832 0.8795 0.4392 +vn -0.5757 0.7660 0.2861 +vn -0.6187 0.7220 -0.3097 +vn 0.4346 0.8787 0.1975 +vn 0.1865 0.7208 -0.6675 +vn 0.7064 0.7044 0.0696 +vn 0.2966 0.8625 0.4100 +vn 0.1293 0.7498 -0.6489 +vn 0.3335 0.8324 0.4427 +vn -0.7961 0.6049 0.0192 +vn 0.4305 0.8918 0.1393 +vn -0.4759 0.8488 -0.2303 +vn 0.4284 0.8754 -0.2239 +vn -0.2359 0.7274 -0.6444 +vn 0.3491 0.8116 -0.4684 +vn -0.5489 0.8359 0.0025 +vn 0.5382 0.8417 -0.0431 +vn -0.4452 0.8770 0.1808 +vn 0.0949 0.7642 -0.6380 +vn -0.3941 0.8501 0.3494 +vn 0.6562 0.7522 -0.0600 +vn -0.1714 0.7193 0.6732 +vn -0.1996 0.7511 -0.6293 +vn -0.6830 0.7274 -0.0657 +vn 0.4913 0.7864 -0.3744 +vn -0.4324 0.8538 0.2898 +vn 0.2719 0.8491 -0.4529 +vn 0.0782 0.8645 0.4966 +vn 0.0377 0.8148 0.5785 +vn -0.0018 0.9936 0.1130 +vn -0.0043 0.9647 0.2633 +vn -0.0060 0.9163 0.4003 +vn 0.0668 0.9935 0.0926 +vn 0.1592 0.9622 0.2208 +vn 0.2470 0.9066 0.3421 +vn 0.0176 0.9935 0.1122 +vn 0.0418 0.9627 0.2675 +vn 0.0650 0.9078 0.4143 +vn 0.0430 0.9937 0.1032 +vn 0.1008 0.9651 0.2417 +vn 0.1540 0.9165 0.3693 +vn 0.0686 0.9939 0.0867 +vn 0.1577 0.9671 0.1997 +vn 0.2373 0.9236 0.3011 +vn 0.1159 0.9928 -0.0286 +vn 0.2908 0.9541 -0.0719 +vn 0.4689 0.8757 -0.1154 +vn 0.0712 0.9930 0.0943 +vn 0.1742 0.9573 0.2308 +vn 0.2752 0.8894 0.3649 +vn 0.1073 0.9936 0.0344 +vn 0.2452 0.9663 0.0788 +vn 0.3668 0.9228 0.1183 +vn 0.1024 0.9933 -0.0543 +vn 0.2384 0.9629 -0.1262 +vn 0.3619 0.9126 -0.1904 +vn 0.0736 0.9923 -0.0997 +vn 0.1810 0.9522 -0.2460 +vn 0.2872 0.8756 -0.3885 +vn 0.1227 0.9924 -0.0106 +vn 0.2922 0.9560 -0.0252 +vn 0.4509 0.8918 -0.0375 +vn 0.0188 0.9912 -0.1310 +vn 0.0469 0.9430 -0.3295 +vn 0.0764 0.8467 -0.5265 +vn 0.1337 0.9909 -0.0127 +vn 0.3367 0.9411 -0.0321 +vn 0.5402 0.8400 -0.0504 +vn -0.0414 0.9907 -0.1298 +vn -0.1039 0.9396 -0.3260 +vn -0.1655 0.8378 -0.5202 +vn 0.1066 0.9910 -0.0812 +vn 0.2613 0.9445 -0.1990 +vn 0.4096 0.8572 -0.3121 +vn 0.0660 0.9917 -0.1103 +vn 0.1535 0.9544 -0.2561 +vn 0.2314 0.8931 -0.3857 +vn -0.0831 0.9913 -0.1016 +vn -0.1961 0.9507 -0.2404 +vn -0.2984 0.8811 -0.3669 +vn -0.1252 0.9902 -0.0624 +vn -0.3185 0.9346 -0.1586 +vn -0.5113 0.8206 -0.2551 +vn 0.0378 0.9901 -0.1351 +vn 0.0961 0.9343 -0.3434 +vn 0.1542 0.8199 -0.5514 +vn 0.0280 0.9903 -0.1358 +vn 0.0686 0.9383 -0.3390 +vn 0.1079 0.8358 -0.5382 +vn -0.1315 0.9908 0.0320 +vn -0.3322 0.9397 0.0815 +vn -0.5333 0.8355 0.1322 +vn -0.1136 0.9920 -0.0553 +vn -0.2656 0.9553 -0.1298 +vn -0.4029 0.8939 -0.1963 +vn -0.0453 0.9911 -0.1255 +vn -0.1166 0.9390 -0.3236 +vn -0.1915 0.8278 -0.5273 +vn -0.1144 0.9930 0.0295 +vn -0.2597 0.9633 0.0676 +vn -0.3858 0.9170 0.1012 +vn -0.1102 0.9929 0.0448 +vn -0.2531 0.9620 0.1028 +vn -0.3793 0.9123 0.1541 +vn -0.0913 0.9925 0.0814 +vn -0.2159 0.9573 0.1924 +vn -0.3313 0.8964 0.2945 +vn -0.0324 0.9912 0.1280 +vn -0.0841 0.9393 0.3326 +vn -0.1387 0.8253 0.5473 +vn -0.1309 0.9913 -0.0128 +vn -0.3387 0.9403 -0.0334 +vn -0.5558 0.8295 -0.0543 +vn -0.1016 0.9926 0.0668 +vn -0.2388 0.9580 0.1587 +vn -0.3647 0.8987 0.2436 +vn 0.0077 0.9923 0.1233 +vn 0.0187 0.9530 0.3025 +vn 0.0302 0.8778 0.4781 +vn -0.1126 0.9921 0.0554 +vn -0.2881 0.9471 0.1413 +vn -0.4692 0.8522 0.2315 +vn 0.0081 0.9935 0.1136 +vn 0.0192 0.9643 0.2642 +vn 0.0303 0.9156 0.4010 +vn -0.0065 0.8802 0.4745 +vn 0.0369 0.8794 0.4747 +vn -0.3521 0.8293 -0.4340 +vn -0.5757 0.7659 0.2864 +vn -0.6187 0.7221 -0.3096 +vn 0.4172 0.7362 0.5328 +vn 0.5747 0.8062 -0.1405 +vn 0.2966 0.8625 0.4101 +vn -0.0339 0.6153 -0.7876 +vn 0.3334 0.8324 0.4427 +vn -0.6474 0.7448 0.1619 +vn 0.4304 0.8918 0.1393 +vn -0.4759 0.8487 -0.2306 +vn 0.4282 0.8755 -0.2240 +vn -0.3251 0.6769 -0.6604 +vn 0.3487 0.8117 -0.4685 +vn -0.4503 0.8849 0.1188 +vn 0.5381 0.8418 -0.0428 +vn -0.4452 0.8770 0.1809 +vn 0.0946 0.7643 -0.6379 +vn -0.3940 0.8501 0.3494 +vn 0.6561 0.7523 -0.0598 +vn -0.1713 0.7193 0.6732 +vn -0.1997 0.7511 -0.6293 +vn -0.6831 0.7274 -0.0656 +vn 0.4913 0.7864 -0.3745 +vn -0.4324 0.8538 0.2900 +vn 0.0782 0.8644 0.4966 +vn 0.0376 0.8148 0.5786 +vn -0.0064 0.8802 0.4746 g Cube_Cube.001_stones s off f 59/1/1 60/2/1 61/3/1 62/4/1 @@ -1087,3 +1564,195 @@ f 56/613/6 211/614/6 50/615/6 51/616/6 f 48/617/6 49/618/6 55/619/6 54/620/6 f 54/620/6 55/619/6 211/614/6 56/613/6 57/517/6 58/516/6 23/475/6 4/621/6 11/622/6 12/470/6 210/438/6 53/437/6 f 212/515/6 52/518/6 51/616/6 50/615/6 49/618/6 48/617/6 47/440/6 46/439/6 14/469/6 10/623/6 2/624/6 8/476/6 +g Cube_Cube.001_embers +f 231/625/6 240/626/6 235/627/6 +f 213/628/79 369/629/79 244/630/79 +f 230/631/80 309/632/80 229/633/80 +f 216/634/81 261/635/81 257/636/81 +f 243/637/82 369/629/82 365/638/82 +f 231/625/83 313/639/83 230/631/83 +f 218/640/84 261/635/84 217/641/84 +f 231/625/85 321/642/85 317/643/85 +f 219/644/86 265/645/86 218/640/86 +f 215/646/87 249/647/87 214/648/87 +f 232/649/88 325/650/88 321/642/88 +f 219/644/89 273/651/89 269/652/89 +f 234/653/90 325/650/90 233/654/90 +f 220/655/91 277/656/91 273/651/91 +f 235/627/92 329/657/92 234/653/92 +f 222/658/93 277/656/93 221/659/93 +f 235/627/94 337/660/94 333/661/94 +f 223/662/95 281/663/95 222/658/95 +f 237/664/96 337/660/96 236/665/96 +f 223/662/97 289/666/97 285/667/97 +f 238/668/98 341/669/98 237/664/98 +f 225/670/99 289/666/99 224/671/99 +f 239/672/100 345/673/100 238/668/100 +f 225/670/101 297/674/101 293/675/101 +f 240/626/102 349/676/102 239/672/102 +f 227/677/103 297/674/103 226/678/103 +f 240/626/104 357/679/104 353/680/104 +f 227/677/105 305/681/105 301/682/105 +f 250/683/5 254/684/5 258/685/5 262/686/5 266/687/5 270/688/5 274/689/5 278/690/5 282/691/5 286/692/5 290/693/5 294/694/5 298/695/5 302/696/5 306/697/5 310/698/5 314/699/5 318/700/5 322/701/5 326/702/5 330/703/5 334/704/5 338/705/5 342/706/5 346/707/5 350/708/5 354/709/5 358/710/5 362/711/5 366/712/5 370/713/5 245/714/5 +f 241/715/106 361/716/106 357/679/106 +f 228/717/107 309/632/107 305/681/107 +f 215/646/108 257/636/108 253/718/108 +f 243/637/109 361/716/109 242/719/109 +f 250/683/110 245/714/110 247/720/110 252/721/110 +f 252/721/111 247/720/111 248/722/111 251/723/111 +f 251/723/112 248/722/112 246/724/112 249/647/112 +f 254/684/113 250/683/113 252/721/113 256/725/113 +f 256/725/114 252/721/114 251/723/114 255/726/114 +f 255/726/115 251/723/115 249/647/115 253/718/115 +f 258/685/116 254/684/116 256/725/116 260/727/116 +f 260/727/117 256/725/117 255/726/117 259/728/117 +f 259/728/118 255/726/118 253/718/118 257/636/118 +f 262/686/119 258/685/119 260/727/119 264/729/119 +f 264/729/120 260/727/120 259/728/120 263/730/120 +f 263/730/121 259/728/121 257/636/121 261/635/121 +f 266/687/122 262/686/122 264/729/122 268/731/122 +f 268/731/123 264/729/123 263/730/123 267/732/123 +f 267/732/124 263/730/124 261/635/124 265/645/124 +f 270/688/125 266/687/125 268/731/125 272/733/125 +f 272/733/126 268/731/126 267/732/126 271/734/126 +f 271/734/127 267/732/127 265/645/127 269/652/127 +f 274/689/128 270/688/128 272/733/128 276/735/128 +f 276/735/129 272/733/129 271/734/129 275/736/129 +f 275/736/130 271/734/130 269/652/130 273/651/130 +f 278/690/131 274/689/131 276/735/131 280/737/131 +f 280/737/132 276/735/132 275/736/132 279/738/132 +f 279/738/133 275/736/133 273/651/133 277/656/133 +f 282/691/134 278/690/134 280/737/134 284/739/134 +f 284/739/135 280/737/135 279/738/135 283/740/135 +f 283/740/136 279/738/136 277/656/136 281/663/136 +f 286/692/137 282/691/137 284/739/137 288/741/137 +f 288/741/138 284/739/138 283/740/138 287/742/138 +f 287/742/139 283/740/139 281/663/139 285/667/139 +f 290/693/140 286/692/140 288/741/140 292/743/140 +f 292/743/141 288/741/141 287/742/141 291/744/141 +f 291/744/142 287/742/142 285/667/142 289/666/142 +f 294/694/143 290/693/143 292/743/143 296/745/143 +f 296/745/144 292/743/144 291/744/144 295/746/144 +f 295/746/145 291/744/145 289/666/145 293/675/145 +f 298/695/146 294/694/146 296/745/146 300/747/146 +f 300/747/147 296/745/147 295/746/147 299/748/147 +f 299/748/148 295/746/148 293/675/148 297/674/148 +f 302/696/149 298/695/149 300/747/149 304/749/149 +f 304/749/150 300/747/150 299/748/150 303/750/150 +f 303/750/151 299/748/151 297/674/151 301/682/151 +f 306/697/152 302/696/152 304/749/152 308/751/152 +f 308/751/153 304/749/153 303/750/153 307/752/153 +f 307/752/154 303/750/154 301/682/154 305/681/154 +f 310/698/155 306/697/155 308/751/155 312/753/155 +f 312/753/156 308/751/156 307/752/156 311/754/156 +f 311/754/157 307/752/157 305/681/157 309/632/157 +f 314/699/158 310/698/158 312/753/158 316/755/158 +f 316/755/159 312/753/159 311/754/159 315/756/159 +f 315/756/160 311/754/160 309/632/160 313/639/160 +f 318/700/161 314/699/161 316/755/161 320/757/161 +f 320/757/162 316/755/162 315/756/162 319/758/162 +f 319/758/163 315/756/163 313/639/163 317/643/163 +f 322/701/164 318/700/164 320/757/164 324/759/164 +f 324/759/165 320/757/165 319/758/165 323/760/165 +f 323/760/166 319/758/166 317/643/166 321/642/166 +f 326/702/167 322/701/167 324/759/167 328/761/167 +f 328/761/168 324/759/168 323/760/168 327/762/168 +f 327/762/169 323/760/169 321/642/169 325/650/169 +f 330/703/170 326/702/170 328/761/170 332/763/170 +f 332/763/171 328/761/171 327/762/171 331/764/171 +f 331/764/172 327/762/172 325/650/172 329/657/172 +f 334/704/173 330/703/173 332/763/173 336/765/173 +f 336/765/174 332/763/174 331/764/174 335/766/174 +f 335/766/175 331/764/175 329/657/175 333/661/175 +f 338/705/176 334/704/176 336/765/176 340/767/176 +f 340/767/177 336/765/177 335/766/177 339/768/177 +f 339/768/178 335/766/178 333/661/178 337/660/178 +f 342/706/179 338/705/179 340/767/179 344/769/179 +f 344/769/180 340/767/180 339/768/180 343/770/180 +f 343/770/181 339/768/181 337/660/181 341/669/181 +f 346/707/182 342/706/182 344/769/182 348/771/182 +f 348/771/183 344/769/183 343/770/183 347/772/183 +f 347/772/184 343/770/184 341/669/184 345/673/184 +f 350/708/185 346/707/185 348/771/185 352/773/185 +f 352/773/186 348/771/186 347/772/186 351/774/186 +f 351/774/187 347/772/187 345/673/187 349/676/187 +f 354/709/188 350/708/188 352/773/188 356/775/188 +f 356/775/189 352/773/189 351/774/189 355/776/189 +f 355/776/190 351/774/190 349/676/190 353/680/190 +f 358/710/191 354/709/191 356/775/191 360/777/191 +f 360/777/192 356/775/192 355/776/192 359/778/192 +f 359/778/193 355/776/193 353/680/193 357/679/193 +f 362/711/194 358/710/194 360/777/194 364/779/194 +f 364/779/195 360/777/195 359/778/195 363/780/195 +f 363/780/196 359/778/196 357/679/196 361/716/196 +f 366/712/197 362/711/197 364/779/197 368/781/197 +f 368/781/198 364/779/198 363/780/198 367/782/198 +f 367/782/199 363/780/199 361/716/199 365/638/199 +f 370/713/200 366/712/200 368/781/200 372/783/200 +f 372/783/201 368/781/201 367/782/201 371/784/201 +f 371/784/202 367/782/202 365/638/202 369/629/202 +f 245/714/203 370/713/203 372/783/203 247/720/203 +f 247/720/204 372/783/204 371/784/204 248/722/204 +f 248/722/205 371/784/205 369/629/205 246/724/205 +f 213/628/206 249/647/206 246/724/206 +f 213/628/207 246/724/207 369/629/207 +f 230/631/208 313/639/208 309/632/208 +f 216/634/81 217/641/81 261/635/81 +f 243/637/209 244/630/209 369/629/209 +f 231/625/210 317/643/210 313/639/210 +f 218/640/211 265/645/211 261/635/211 +f 231/625/85 232/649/85 321/642/85 +f 219/644/212 269/652/212 265/645/212 +f 215/646/213 253/718/213 249/647/213 +f 232/649/214 233/654/214 325/650/214 +f 219/644/215 220/655/215 273/651/215 +f 234/653/216 329/657/216 325/650/216 +f 220/655/217 221/659/217 277/656/217 +f 235/627/218 333/661/218 329/657/218 +f 222/658/219 281/663/219 277/656/219 +f 235/627/220 236/665/220 337/660/220 +f 223/662/221 285/667/221 281/663/221 +f 237/664/222 341/669/222 337/660/222 +f 223/662/223 224/671/223 289/666/223 +f 238/668/224 345/673/224 341/669/224 +f 225/670/225 293/675/225 289/666/225 +f 239/672/226 349/676/226 345/673/226 +f 225/670/227 226/678/227 297/674/227 +f 240/626/228 353/680/228 349/676/228 +f 227/677/229 301/682/229 297/674/229 +f 240/626/230 241/715/230 357/679/230 +f 227/677/231 228/717/231 305/681/231 +f 241/715/232 242/719/232 361/716/232 +f 228/717/107 229/633/107 309/632/107 +f 215/646/233 216/634/233 257/636/233 +f 243/637/234 365/638/234 361/716/234 +f 213/628/235 214/648/235 249/647/235 +f 215/646/6 214/648/6 213/628/6 +f 213/628/6 244/630/6 243/637/6 +f 243/637/6 242/719/6 241/715/6 +f 240/626/6 239/672/6 238/668/6 +f 243/637/6 241/715/6 240/626/6 +f 215/646/6 213/628/6 243/637/6 +f 217/641/6 216/634/6 218/640/6 +f 216/634/6 215/646/6 219/644/6 +f 219/644/6 218/640/6 216/634/6 +f 221/659/6 220/655/6 222/658/6 +f 220/655/6 219/644/6 222/658/6 +f 223/662/6 222/658/6 219/644/6 +f 225/670/6 224/671/6 223/662/6 +f 227/677/6 226/678/6 225/670/6 +f 229/633/6 228/717/6 230/631/6 +f 228/717/6 227/677/6 230/631/6 +f 231/625/6 230/631/6 227/677/6 +f 233/654/6 232/649/6 234/653/6 +f 232/649/6 231/625/6 234/653/6 +f 227/677/6 225/670/6 231/625/6 +f 225/670/6 223/662/6 219/644/6 +f 231/625/6 225/670/6 240/626/6 +f 215/646/6 243/637/6 219/644/6 +f 243/637/6 240/626/6 219/644/6 +f 240/626/6 238/668/6 235/627/6 +f 238/668/6 237/664/6 235/627/6 +f 237/664/6 236/665/6 235/627/6 +f 235/627/6 234/653/6 231/625/6 +f 240/626/6 225/670/6 219/644/6 diff --git a/textures/new_campfire_anim_embers.png b/textures/new_campfire_anim_embers.png new file mode 100644 index 0000000000000000000000000000000000000000..3b78b72c51942b6f4aa4bb4e49ce7512721f3520 GIT binary patch literal 844 zcmV-S1GD^zP)2RNKnoNe7#J@K1ValBO%@ne9v7xt5Y2fF90md{9T80t z2UiyXQ#v0$85~M09xW3SAOr|51Q659lUV=&0=Y>NbEzfoZ`e)Aospz>Wp61Ct;G(=31qQxHr8j2-P$A;1n% z>x`&QfH`-wxn6)vwO3#olM9lN)mLN&fP(ZQAjl?jw-*UsfEU{#PJ-%0ydv2IVD5El zpD4)gP=NY9s_`})uC;i zJO)VH;qiX<*brMZ6Wb7ju?@EO$a-O5wlRS5#Uoj;M6x9v9t#%40;H=)dh|$#$AXrm z5MY6*HAPetKuU{QI`@%`^uIn5X*qi=5EDT)-8>QiX{kv|I(a0Jmc!%i?6Dx0XeO2< z5@|^+Z;|yv!fYV{>FM!Lk7B_J#k?FIjs@XBxq6gGk8*f8@}dyHA!;oV)dEn8o0apt z6r=oaUJAv}9uBb(R14xA$qE3)Ymt|eM*+#d@o+?rX2Odo6fgK&