Compare commits

...

17 Commits

Author SHA1 Message Date
chmodsayshello bb5ba111af remove the sound with a reference to the IS since terror is nothing to meme about in my opinion
In the removed sound, you could hear "Ich danke den unzähligen freiwilligen Helfern der Terrororganisation IS", or something like "thanks to the countless helpers of the terror organization is!"
2022-02-01 20:16:41 +00:00
chmodsayshello 942e2b45d0 Merge pull request 'Merge my own changes into my master branch #4' (#5) from running into master
Reviewed-on: chmodsayshello/Memeclone_Fork#5
2022-02-01 20:08:58 +00:00
chmodsayshello 3dde8ce8ce Merge pull request 'Merge my own changes into my master branch #3' (#4) from nyan_cat into master
Reviewed-on: chmodsayshello/Memeclone_Fork#4
2022-02-01 20:08:30 +00:00
chmodsayshello 80332c69c2 Merge pull request 'Merge my own changes into my master branch #2' (#3) from doors into master
Reviewed-on: chmodsayshello/Memeclone_Fork#3
2022-02-01 20:07:52 +00:00
chmodsayshello 22dadd6eba Merge pull request 'Merge my own changes into my master branch #1' (#2) from awards into master
Reviewed-on: chmodsayshello/Memeclone_Fork#2
2022-02-01 20:06:46 +00:00
chmodsayshello 000a066c8c Merge pull request 'update fork' (#1) from EliasFleckenstein03/Memeclone:master into master
Reviewed-on: chmodsayshello/Memeclone_Fork#1
2022-02-01 20:06:04 +00:00
chmodsayshello 14ffabb5bf nyan cat/ocelot 2022-01-28 20:41:55 +00:00
chmodsayshello bbf438844b nyan cat texture 2022-01-28 20:41:18 +00:00
Lizzy Fleckenstein 8f9a582b05
Windows join sound 2022-01-28 19:21:51 +01:00
chmodsayshello dcc6eda6a6 change code to use the new door sound 2022-01-28 11:37:35 +00:00
chmodsayshello 2a7a66487f upload a better door sound 2022-01-28 11:36:53 +00:00
chmodsayshello 99890b5400 delete old door sounds 2022-01-28 11:36:23 +00:00
chmodsayshello b5aa9aecd1 delete old door sounds 2022-01-28 11:35:53 +00:00
chmodsayshello cc9052ca86 some "nice" new achievement names 2022-01-28 10:43:29 +00:00
Lizzy Fleckenstein 49b4619d27
Snowball explosion & super load moans 2022-01-27 22:18:36 +01:00
Lizzy Fleckenstein 9bb03727b2
The Cum Monster 2022-01-27 21:41:57 +01:00
Lizzy Fleckenstein 768c718fe4
Sound update 2022-01-27 21:36:57 +01:00
98 changed files with 41 additions and 15 deletions

View File

@ -1,5 +1,6 @@
mcl_moans = {} mcl_moans = {}
function mcl_moans.moan(spec) function mcl_moans.moan(spec)
spec.gain = (spec.gain or 1.0) * 10.0
minetest.sound_play("mcl_moan", spec) minetest.sound_play("mcl_moan", spec)
end end

View File

@ -166,3 +166,7 @@ minetest.register_on_dieplayer(function(player)
-- TODO: Add separate death sound -- TODO: Add separate death sound
minetest.sound_play({name="player_damage", gain = 1.0}, {pos=player:get_pos(), max_hear_distance=16}, true) minetest.sound_play({name="player_damage", gain = 1.0}, {pos=player:get_pos(), max_hear_distance=16}, true)
end) end)
minetest.register_on_joinplayer(function(player)
minetest.sound_play("shutdown", {to_player = player:get_player_name()})
end)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -66,7 +66,7 @@ local cow_def = {
local inv = clicker:get_inventory() local inv = clicker:get_inventory()
inv:remove_item("main", mobs_mc.items.bucket) inv:remove_item("main", mobs_mc.items.bucket)
mcl_moans.moan({object = self.object}) mcl_moans.moan({object = self.object})
minetest.sound_play("mobs_mc_cow_milk", {object = player, gain = 0.6}) minetest.sound_play("mobs_mc_cow_milk", {object = self.object, gain = 0.6})
-- if room add bucket of milk to inventory, otherwise drop as item -- if room add bucket of milk to inventory, otherwise drop as item
if inv:room_for_item("main", {name=mobs_mc.items.milk}) then if inv:room_for_item("main", {name=mobs_mc.items.milk}) then
clicker:get_inventory():add_item("main", mobs_mc.items.milk) clicker:get_inventory():add_item("main", mobs_mc.items.milk)

View File

@ -38,9 +38,8 @@ local ocelot = {
xp_min = 1, xp_min = 1,
xp_max = 3, xp_max = 3,
collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3}, collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3},
visual = "mesh", visual = "sprite",
mesh = "mobs_mc_cat.b3d", textures = {"mobs_mc_nyan.png"},
textures = {"mobs_mc_cat_ocelot.png"},
visual_size = {x=2.0, y=2.0}, visual_size = {x=2.0, y=2.0},
makes_footstep_sound = true, makes_footstep_sound = true,
walk_chance = default_walk_chance, walk_chance = default_walk_chance,
@ -232,4 +231,4 @@ mobs:spawn({
-- spawn eggs -- spawn eggs
-- FIXME: The spawn icon shows a cat texture, not an ocelot texture -- FIXME: The spawn icon shows a cat texture, not an ocelot texture
mobs:register_egg("mobs_mc:ocelot", S("Ocelot"), "mobs_mc_spawn_icon_cat.png", 0) mobs:register_egg("mobs_mc:ocelot", S("Ocelot"), "mobs_mc_spawn_icon_cat.png", 0)

View File

@ -63,8 +63,15 @@ mobs:register_mob("mobs_mc:polar_bear", {
walk_start = 0, walk_end = 40, walk_start = 0, walk_end = 40,
run_start = 0, run_end = 40, run_start = 0, run_end = 40,
}, },
view_range = 16, view_range = 16,
do_custom = function(self)
if not self._cum_nametag_set then
self.nametag = "The Cum Monster"
self._cum_nametag_set = true
mobs.update_tag(self)
end
end,
}) })

View File

@ -31,6 +31,13 @@ local skeleton = {
group_attack = true, group_attack = true,
visual = "sprite", visual = "sprite",
sounds = {
random = "mobs_mc_skeleton_random",
death = "mobs_mc_skeleton_death",
damage = "mobs_mc_skeleton_hurt",
distance = 16,
},
--head code --head code
has_head = false, has_head = false,
head_bone = "head", head_bone = "head",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

@ -69,7 +69,7 @@ awards.register_achievement("mcl:bakeCake", {
} }
}) })
awards.register_achievement("mcl:buildBetterPickaxe", { awards.register_achievement("mcl:buildBetterPickaxe", {
title = S("Getting an Upgrade"), title = S("Now we have the good stuff"),
-- TODO: This achievement should support all non-wood pickaxes -- TODO: This achievement should support all non-wood pickaxes
description = S("Craft a stone pickaxe using sticks and cobblestone."), description = S("Craft a stone pickaxe using sticks and cobblestone."),
icon = "default_tool_stonepick.png", icon = "default_tool_stonepick.png",
@ -80,7 +80,7 @@ awards.register_achievement("mcl:buildBetterPickaxe", {
} }
}) })
awards.register_achievement("mcl:buildSword", { awards.register_achievement("mcl:buildSword", {
title = S("Time to Strike!"), title = S("Kinda sUs!"),
description = S("Craft a wooden sword using wooden planks and sticks on a crafting table."), description = S("Craft a wooden sword using wooden planks and sticks on a crafting table."),
icon = "default_tool_woodsword.png", icon = "default_tool_woodsword.png",
trigger = { trigger = {
@ -104,7 +104,7 @@ awards.register_achievement("mcl:bookcase", {
-- Item pickup achievements: These are awarded when picking up a certain item. -- Item pickup achievements: These are awarded when picking up a certain item.
-- The achivements are manually given in the mod mcl_item_entity. -- The achivements are manually given in the mod mcl_item_entity.
awards.register_achievement("mcl:diamonds", { awards.register_achievement("mcl:diamonds", {
title = S("DIAMONDS!"), title = S("Look how rich I am!!!!"),
description = S("Pick up a diamond from the floor."), description = S("Pick up a diamond from the floor."),
icon = "mcl_core_diamond_ore.png", icon = "mcl_core_diamond_ore.png",
}) })
@ -115,7 +115,7 @@ awards.register_achievement("mcl:blazeRod", {
}) })
awards.register_achievement("mcl:killCow", { awards.register_achievement("mcl:killCow", {
title = S("Cow Tipper"), title = S("IMPOSTER"),
description = S("Pick up leather from the floor.\nHint: Cows and some other animals have a chance to drop leather, when killed."), description = S("Pick up leather from the floor.\nHint: Cows and some other animals have a chance to drop leather, when killed."),
icon = "mcl_mobitems_leather.png", icon = "mcl_mobitems_leather.png",
}) })
@ -241,12 +241,12 @@ end)
awards.register_achievement("mcl:stoneAge", { awards.register_achievement("mcl:stoneAge", {
title = S("Stone Age"), title = S("UGAUGA"),
description = S("Mine a stone with new pickaxe."), description = S("Mine a stone with new pickaxe."),
icon = "default_cobble.png", icon = "default_cobble.png",
}) })
awards.register_achievement("mcl:hotStuff", { awards.register_achievement("mcl:hotStuff", {
title = S("Hot Stuff"), title = S("HOTHOTHOTHOTHOTHOT"),
description = S("Put lava in a bucket."), description = S("Put lava in a bucket."),
icon = "bucket_lava.png", icon = "bucket_lava.png",
}) })

View File

@ -17,6 +17,7 @@ mcl_doors:register_door("mcl_doors:wooden_door", {
tiles_bottom = {"mcl_doors_door_wood_lower.png", "mcl_doors_door_wood_side_lower.png"}, tiles_bottom = {"mcl_doors_door_wood_lower.png", "mcl_doors_door_wood_side_lower.png"},
tiles_top = {"mcl_doors_door_wood_upper.png", "mcl_doors_door_wood_side_upper.png"}, tiles_top = {"mcl_doors_door_wood_upper.png", "mcl_doors_door_wood_side_upper.png"},
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
}) })
minetest.register_craft({ minetest.register_craft({
@ -40,6 +41,7 @@ mcl_doors:register_door("mcl_doors:acacia_door", {
tiles_bottom = {"mcl_doors_door_acacia_lower.png", "mcl_doors_door_acacia_side_lower.png"}, tiles_bottom = {"mcl_doors_door_acacia_lower.png", "mcl_doors_door_acacia_side_lower.png"},
tiles_top = {"mcl_doors_door_acacia_upper.png", "mcl_doors_door_acacia_side_upper.png"}, tiles_top = {"mcl_doors_door_acacia_upper.png", "mcl_doors_door_acacia_side_upper.png"},
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
}) })
minetest.register_craft({ minetest.register_craft({
@ -63,6 +65,7 @@ mcl_doors:register_door("mcl_doors:birch_door", {
tiles_bottom = {"mcl_doors_door_birch_lower.png", "mcl_doors_door_birch_side_lower.png"}, tiles_bottom = {"mcl_doors_door_birch_lower.png", "mcl_doors_door_birch_side_lower.png"},
tiles_top = {"mcl_doors_door_birch_upper.png", "mcl_doors_door_birch_side_upper.png"}, tiles_top = {"mcl_doors_door_birch_upper.png", "mcl_doors_door_birch_side_upper.png"},
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
}) })
minetest.register_craft({ minetest.register_craft({
@ -86,6 +89,7 @@ mcl_doors:register_door("mcl_doors:dark_oak_door", {
tiles_bottom = {"mcl_doors_door_dark_oak_lower.png", "mcl_doors_door_dark_oak_side_lower.png"}, tiles_bottom = {"mcl_doors_door_dark_oak_lower.png", "mcl_doors_door_dark_oak_side_lower.png"},
tiles_top = {"mcl_doors_door_dark_oak_upper.png", "mcl_doors_door_dark_oak_side_upper.png"}, tiles_top = {"mcl_doors_door_dark_oak_upper.png", "mcl_doors_door_dark_oak_side_upper.png"},
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
}) })
minetest.register_craft({ minetest.register_craft({
@ -109,6 +113,7 @@ mcl_doors:register_door("mcl_doors:jungle_door", {
tiles_bottom = {"mcl_doors_door_jungle_lower.png", "mcl_doors_door_jungle_side_lower.png"}, tiles_bottom = {"mcl_doors_door_jungle_lower.png", "mcl_doors_door_jungle_side_lower.png"},
tiles_top = {"mcl_doors_door_jungle_upper.png", "mcl_doors_door_jungle_side_upper.png"}, tiles_top = {"mcl_doors_door_jungle_upper.png", "mcl_doors_door_jungle_side_upper.png"},
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
}) })
minetest.register_craft({ minetest.register_craft({
@ -132,6 +137,7 @@ mcl_doors:register_door("mcl_doors:spruce_door", {
tiles_bottom = {"mcl_doors_door_spruce_lower.png", "mcl_doors_door_spruce_side_lower.png"}, tiles_bottom = {"mcl_doors_door_spruce_lower.png", "mcl_doors_door_spruce_side_lower.png"},
tiles_top = {"mcl_doors_door_spruce_upper.png", "mcl_doors_door_spruce_side_upper.png"}, tiles_top = {"mcl_doors_door_spruce_upper.png", "mcl_doors_door_spruce_side_upper.png"},
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
}) })
minetest.register_craft({ minetest.register_craft({
@ -186,7 +192,7 @@ mcl_doors:register_door("mcl_doors:iron_door", {
tiles_bottom = {"mcl_doors_door_iron_lower.png^[transformFX", "mcl_doors_door_iron_side_lower.png"}, tiles_bottom = {"mcl_doors_door_iron_lower.png^[transformFX", "mcl_doors_door_iron_side_lower.png"},
tiles_top = {"mcl_doors_door_iron_upper.png^[transformFX", "mcl_doors_door_iron_side_upper.png"}, tiles_top = {"mcl_doors_door_iron_upper.png^[transformFX", "mcl_doors_door_iron_side_upper.png"},
sounds = mcl_sounds.node_sound_metal_defaults(), sounds = mcl_sounds.node_sound_metal_defaults(),
sound_open = "doors_steel_door_open", sound_open = "fbi",
sound_close = "doors_steel_door_close", sound_close = "doors_steel_door_close",
only_redstone_can_open = true, only_redstone_can_open = true,
@ -226,6 +232,7 @@ for w=1, #woods do
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
}) })
minetest.register_craft({ minetest.register_craft({
@ -253,7 +260,7 @@ mcl_doors:register_trapdoor("mcl_doors:iron_trapdoor", {
_mcl_hardness = 5, _mcl_hardness = 5,
_mcl_blast_resistance = 5, _mcl_blast_resistance = 5,
sounds = mcl_sounds.node_sound_metal_defaults(), sounds = mcl_sounds.node_sound_metal_defaults(),
sound_open = "doors_steel_door_open", sound_open = "fbi",
sound_close = "doors_steel_door_close", sound_close = "doors_steel_door_close",
only_redstone_can_open = true, only_redstone_can_open = true,
@ -265,4 +272,4 @@ minetest.register_craft({
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"}, {"mcl_core:iron_ingot", "mcl_core:iron_ingot"},
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"}, {"mcl_core:iron_ingot", "mcl_core:iron_ingot"},
} }
}) })

Binary file not shown.

View File

@ -190,6 +190,7 @@ minetest.register_on_rightclickplayer(function(player, clicker)
local inv = clicker:get_inventory() local inv = clicker:get_inventory()
inv:remove_item("main", "mcl_buckets:bucket_empty") inv:remove_item("main", "mcl_buckets:bucket_empty")
mcl_moans.moan({object = player}) mcl_moans.moan({object = player})
minetest.sound_play("mcl_sounds_penis", {object = player, gain = 0.6})
minetest.sound_play("mobs_mc_cow_milk", {object = player, gain = 0.6}) minetest.sound_play("mobs_mc_cow_milk", {object = player, gain = 0.6})
-- if room add bucket of cum to inventory, otherwise drop as item -- if room add bucket of cum to inventory, otherwise drop as item
if inv:room_for_item("main", {name="mcl_mobitems:cum_bucket"}) then if inv:room_for_item("main", {name="mcl_mobitems:cum_bucket"}) then

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.