1
0
Fork 0

Compare commits

...

9 Commits

Author SHA1 Message Date
ataberkw a34c3948e8 README.md Güncelle 2023-12-13 21:35:46 +00:00
Wbjitscool ebd733be82 update's the campfire's fire burning animation to make it look better (#4077)
improve the look of the campfire's flame/burning animation

Reviewed-on: MineClone2/MineClone2#4077
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Wbjitscool <dwsda121@gmail.com>
Co-committed-by: Wbjitscool <dwsda121@gmail.com>
2023-12-13 05:22:41 +00:00
the-real-herowl 610bcab0d6 Merge pull request 'Update's the stonecutter animation speed to match to the MC's one' (#4074) from stonecutter_fixes into master
Reviewed-on: MineClone2/MineClone2#4074
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-13 03:14:27 +00:00
Wbjitscool 07eb70e9be Update mods/ITEMS/mcl_stonecutter/init.lua 2023-12-13 02:39:25 +00:00
the-real-herowl b3da7a473d Merge pull request 'Move deepslate ore registration within generation check' (#4070) from Zasco/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#4070
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
2023-12-13 02:06:25 +00:00
Zasco 351e31a889 Move deepslate ore registration within generation check 2023-12-12 23:16:51 +00:00
the-real-herowl aff4216ccf Merge pull request 'on_attack callback fix' (#4065) from on_attack_callback into master
Reviewed-on: MineClone2/MineClone2#4065
2023-12-10 23:55:47 +00:00
the-real-herowl 8b00fff4cb Remove dangling else 2023-12-11 00:54:30 +01:00
the-real-herowl cf70de0ecc Add an on_attack callback for mobs (#4064)
Added an on_attack callback that allows to execute additional custom logic after each attack.

Reviewed-on: MineClone2/MineClone2#4064
Co-authored-by: the-real-herowl <wiktor_t-i@proton.me>
Co-committed-by: the-real-herowl <wiktor_t-i@proton.me>
2023-12-10 16:10:33 +00:00
6 changed files with 31 additions and 27 deletions

View File

@ -1,4 +1,4 @@
# MineClone2 # Finecraft Game (MineClone2)
An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils. An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
Developed by many people. Not developed or endorsed by Mojang AB. Developed by many people. Not developed or endorsed by Mojang AB.

View File

@ -1250,7 +1250,10 @@ function mob_class:do_states_attack (dtime)
elseif self.attack_type == "custom" and self.attack_state then elseif self.attack_type == "custom" and self.attack_state then
self.attack_state(self, dtime) self.attack_state(self, dtime)
else
end end
if self.on_attack then
self.on_attack(self, dtime)
end
end end

View File

@ -314,7 +314,8 @@ function mcl_mobs.register_mob(name, def)
return self:mob_activate(staticdata, def, dtime) return self:mob_activate(staticdata, def, dtime)
end, end,
attack_state = def.attack_state, attack_state = def.attack_state, -- custom attack state
on_attack = def.on_attack, -- called after attack, useful with otherwise predefined attack states (not custom)
harmed_by_heal = def.harmed_by_heal, harmed_by_heal = def.harmed_by_heal,
is_boss = def.is_boss, is_boss = def.is_boss,
dealt_effect = def.dealt_effect, dealt_effect = def.dealt_effect,

View File

@ -282,7 +282,7 @@ function mcl_campfires.register_campfire(name, def)
type="vertical_frames", type="vertical_frames",
aspect_w=32, aspect_w=32,
aspect_h=16, aspect_h=16,
length=2.0 length=0.8
}} }}
}, },
overlay_tiles = { overlay_tiles = {

View File

@ -392,7 +392,7 @@ minetest.register_node("mcl_stonecutter:stonecutter", {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 16, aspect_w = 16,
aspect_h = 16, aspect_h = 16,
length = 1 length = 0.15
} }
} }
}, },

View File

@ -128,27 +128,6 @@ minetest.register_ore({
}) })
minetest.register_ore({
ore_type = "blob",
ore = "mcl_deepslate:deepslate",
wherein = { "mcl_core:stone" },
clust_scarcity = 200,
clust_num_ores = 100,
clust_size = 10,
y_min = deepslate_min,
y_max = deepslate_max,
noise_params = {
offset = 0,
scale = 1,
spread = { x = 250, y = 250, z = 250 },
seed = 12345,
octaves = 3,
persist = 0.6,
lacunarity = 2,
flags = "defaults",
}
})
minetest.register_ore({ minetest.register_ore({
ore_type = "blob", ore_type = "blob",
ore = "mcl_deepslate:tuff", ore = "mcl_deepslate:tuff",
@ -173,6 +152,27 @@ minetest.register_ore({
-- DEEPSLATE -- DEEPSLATE
if minetest.settings:get_bool("mcl_generate_deepslate", true) then if minetest.settings:get_bool("mcl_generate_deepslate", true) then
minetest.register_ore({
ore_type = "blob",
ore = "mcl_deepslate:deepslate",
wherein = { "mcl_core:stone" },
clust_scarcity = 200,
clust_num_ores = 100,
clust_size = 10,
y_min = deepslate_min,
y_max = deepslate_max,
noise_params = {
offset = 0,
scale = 1,
spread = { x = 250, y = 250, z = 250 },
seed = 12345,
octaves = 3,
persist = 0.6,
lacunarity = 2,
flags = "defaults",
}
})
minetest.register_ore({ minetest.register_ore({
ore_type = "scatter", ore_type = "scatter",
ore = "mcl_deepslate:infested_deepslate", ore = "mcl_deepslate:infested_deepslate",