mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-08-19 05:24:11 +02:00
Rename and move texture: tnt_smoke
This commit is contained in:
parent
f00dc21252
commit
731f42ac88
@ -124,7 +124,7 @@ local function add_particles(pos, radius)
|
|||||||
maxexptime = 1.0,
|
maxexptime = 1.0,
|
||||||
minsize = radius * 0.5,
|
minsize = radius * 0.5,
|
||||||
maxsize = radius * 1.0,
|
maxsize = radius * 1.0,
|
||||||
texture = "tnt_smoke.png",
|
texture = "mcl_particles_smoke.png",
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
name = mcl_explosions
|
name = mcl_explosions
|
||||||
description = A common API to create explosions.
|
description = A common API to create explosions.
|
||||||
|
depends = mcl_particles
|
||||||
optional_depends = mcl_fire
|
optional_depends = mcl_fire
|
||||||
|
0
mods/ITEMS/mcl_tnt/textures/tnt_smoke.png → mods/CORE/mcl_particles/textures/mcl_particles_smoke.png
0
mods/ITEMS/mcl_tnt/textures/tnt_smoke.png → mods/CORE/mcl_particles/textures/mcl_particles_smoke.png
Before Width: | Height: | Size: 945 B After Width: | Height: | Size: 945 B |
@ -516,7 +516,7 @@ mobs.death_effect = function(pos, collisionbox)
|
|||||||
maxexptime = 1.5,
|
maxexptime = 1.5,
|
||||||
minsize = 0.5,
|
minsize = 0.5,
|
||||||
maxsize = 1.5,
|
maxsize = 1.5,
|
||||||
texture = "tnt_smoke.png",
|
texture = "mcl_particles_smoke.png",
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -841,7 +841,7 @@ local do_env_damage = function(self)
|
|||||||
if not (mod_weather and (mcl_weather.rain.raining or mcl_weather.state == "snow") and mcl_weather.is_outdoor(pos)) then
|
if not (mod_weather and (mcl_weather.rain.raining or mcl_weather.state == "snow") and mcl_weather.is_outdoor(pos)) then
|
||||||
self.health = self.health - damage
|
self.health = self.health - damage
|
||||||
|
|
||||||
effect(pos, 5, "tnt_smoke.png")
|
effect(pos, 5, "mcl_particles_smoke.png")
|
||||||
|
|
||||||
if check_for_death(self, "light", {type = "light"}) then
|
if check_for_death(self, "light", {type = "light"}) then
|
||||||
return true
|
return true
|
||||||
@ -907,7 +907,7 @@ local do_env_damage = function(self)
|
|||||||
|
|
||||||
self.health = self.health - self.water_damage
|
self.health = self.health - self.water_damage
|
||||||
|
|
||||||
effect(pos, 5, "tnt_smoke.png", nil, nil, 1, nil)
|
effect(pos, 5, "mcl_particles_smoke.png", nil, nil, 1, nil)
|
||||||
|
|
||||||
if check_for_death(self, "water", {type = "environment",
|
if check_for_death(self, "water", {type = "environment",
|
||||||
pos = pos, node = self.standing_in}) then
|
pos = pos, node = self.standing_in}) then
|
||||||
@ -952,7 +952,7 @@ local do_env_damage = function(self)
|
|||||||
|
|
||||||
self.health = self.health - nodef.damage_per_second
|
self.health = self.health - nodef.damage_per_second
|
||||||
|
|
||||||
effect(pos, 5, "tnt_smoke.png")
|
effect(pos, 5, "mcl_particles_smoke.png")
|
||||||
|
|
||||||
if check_for_death(self, "dps", {type = "environment",
|
if check_for_death(self, "dps", {type = "environment",
|
||||||
pos = pos, node = self.standing_in}) then
|
pos = pos, node = self.standing_in}) then
|
||||||
@ -2327,7 +2327,7 @@ local do_states = function(self, dtime)
|
|||||||
}, true)
|
}, true)
|
||||||
|
|
||||||
entity_physics(pos, entity_damage_radius)
|
entity_physics(pos, entity_damage_radius)
|
||||||
effect(pos, 32, "tnt_smoke.png", nil, nil, node_break_radius, 1, 0)
|
effect(pos, 32, "mcl_particles_smoke.png", nil, nil, node_break_radius, 1, 0)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
@ -2643,7 +2643,7 @@ local falling = function(self, pos)
|
|||||||
if damage > 0 then
|
if damage > 0 then
|
||||||
self.health = self.health - damage
|
self.health = self.health - damage
|
||||||
|
|
||||||
effect(pos, 5, "tnt_smoke.png", 1, 2, 2, nil)
|
effect(pos, 5, "mcl_particles_smoke.png", 1, 2, 2, nil)
|
||||||
|
|
||||||
if check_for_death(self, "fall", {type = "fall"}) then
|
if check_for_death(self, "fall", {type = "fall"}) then
|
||||||
return true
|
return true
|
||||||
@ -3960,7 +3960,7 @@ function mobs:safe_boom(self, pos, strength)
|
|||||||
}, true)
|
}, true)
|
||||||
local radius = strength
|
local radius = strength
|
||||||
entity_physics(pos, radius)
|
entity_physics(pos, radius)
|
||||||
effect(pos, 32, "tnt_smoke.png", radius * 3, radius * 5, radius, 1, 0)
|
effect(pos, 32, "mcl_particles_smoke.png", radius * 3, radius * 5, radius, 1, 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@ -4181,7 +4181,7 @@ function mobs:spawn_child(pos, mob_type)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local ent = child:get_luaentity()
|
local ent = child:get_luaentity()
|
||||||
effect(pos, 15, "tnt_smoke.png", 1, 2, 2, 15, 5)
|
effect(pos, 15, "mcl_particles_smoke.png", 1, 2, 2, 15, 5)
|
||||||
|
|
||||||
ent.child = true
|
ent.child = true
|
||||||
|
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
name = mcl_mobs
|
name = mcl_mobs
|
||||||
|
depends = mcl_particles
|
||||||
optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor
|
optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
mcl_init
|
mcl_init
|
||||||
|
mcl_particles
|
||||||
default?
|
default?
|
||||||
mcl_mobs
|
mcl_mobs
|
||||||
mcl_tnt?
|
mcl_tnt?
|
||||||
|
@ -144,7 +144,7 @@ local summon_particles = function(obj)
|
|||||||
maxexptime = 2.0,
|
maxexptime = 2.0,
|
||||||
minsize = 2.0,
|
minsize = 2.0,
|
||||||
maxsize = 3.0,
|
maxsize = 3.0,
|
||||||
texture = "tnt_smoke.png",
|
texture = "mcl_particles_smoke.png",
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ local torch_overheated = function(pos)
|
|||||||
velocity = {x = 0, y = 0.6, z = 0},
|
velocity = {x = 0, y = 0.6, z = 0},
|
||||||
expirationtime = 1.2,
|
expirationtime = 1.2,
|
||||||
size = 1.5,
|
size = 1.5,
|
||||||
texture = "tnt_smoke.png",
|
texture = "mcl_particles_smoke.png",
|
||||||
})
|
})
|
||||||
local timer = minetest.get_node_timer(pos)
|
local timer = minetest.get_node_timer(pos)
|
||||||
timer:start(TORCH_COOLOFF)
|
timer:start(TORCH_COOLOFF)
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
mcl_explosions
|
mcl_explosions
|
||||||
|
mcl_particles
|
||||||
mcl_sounds?
|
mcl_sounds?
|
||||||
mcl_mobitems?
|
mcl_mobitems?
|
||||||
mcl_death_messages?
|
mcl_death_messages?
|
||||||
|
@ -28,7 +28,7 @@ tnt.smoke_step = function(pos)
|
|||||||
expirationtime = 0.15 + math.random() * 0.25,
|
expirationtime = 0.15 + math.random() * 0.25,
|
||||||
size = 1.0 + math.random(),
|
size = 1.0 + math.random(),
|
||||||
collisiondetection = false,
|
collisiondetection = false,
|
||||||
texture = "tnt_smoke.png"
|
texture = "mcl_particles_smoke.png"
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -130,12 +130,12 @@ local function add_effects(pos, radius, drops)
|
|||||||
maxexptime = 2.5,
|
maxexptime = 2.5,
|
||||||
minsize = radius * 1,
|
minsize = radius * 1,
|
||||||
maxsize = radius * 3,
|
maxsize = radius * 3,
|
||||||
texture = "tnt_smoke.png",
|
texture = "mcl_particles_smoke.png",
|
||||||
})
|
})
|
||||||
|
|
||||||
-- we just dropped some items. Look at the items entities and pick
|
-- we just dropped some items. Look at the items entities and pick
|
||||||
-- one of them to use as texture
|
-- one of them to use as texture
|
||||||
local texture = "tnt_smoke.png" --fallback texture
|
local texture = "mcl_particles_smoke.png" --fallback texture
|
||||||
local most = 0
|
local most = 0
|
||||||
for name, stack in pairs(drops) do
|
for name, stack in pairs(drops) do
|
||||||
local count = stack:get_count()
|
local count = stack:get_count()
|
||||||
|
@ -776,7 +776,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
|
|||||||
/assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,hbhunger_icon_health_poison.png,88,0,9,9,0,0,y
|
/assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,hbhunger_icon_health_poison.png,88,0,9,9,0,0,y
|
||||||
/assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,hbhunger_icon.png,52,27,9,9,0,0,y
|
/assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,hbhunger_icon.png,52,27,9,9,0,0,y
|
||||||
/assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,mcl_hunger_icon_foodpoison.png,88,27,9,9,0,0,y
|
/assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,mcl_hunger_icon_foodpoison.png,88,27,9,9,0,0,y
|
||||||
/assets/minecraft/textures/particle,particles.png,/mods/ITEMS/mcl_tnt/textures,tnt_smoke.png,56,0,8,8,0,0,y
|
/assets/minecraft/textures/particle,particles.png,/mods/CORE/mcl_particles/textures,mcl_particles_smoke.png,56,0,8,8,0,0,y
|
||||||
/assets/minecraft/textures/blocks,shulker_top_black.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_black_shulker_box_top.png,,,,,,,y
|
/assets/minecraft/textures/blocks,shulker_top_black.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_black_shulker_box_top.png,,,,,,,y
|
||||||
/assets/minecraft/textures/blocks,shulker_top_blue.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_blue_shulker_box_top.png,,,,,,,y
|
/assets/minecraft/textures/blocks,shulker_top_blue.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_blue_shulker_box_top.png,,,,,,,y
|
||||||
/assets/minecraft/textures/blocks,shulker_top_brown.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_brown_shulker_box_top.png,,,,,,,y
|
/assets/minecraft/textures/blocks,shulker_top_brown.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_brown_shulker_box_top.png,,,,,,,y
|
||||||
|
|
Loading…
Reference in New Issue
Block a user