Compare commits

..

No commits in common. "master" and "nyan_cat" have entirely different histories.

99 changed files with 12 additions and 45 deletions

View File

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

View File

@ -166,7 +166,3 @@ minetest.register_on_dieplayer(function(player)
-- TODO: Add separate death sound
minetest.sound_play({name="player_damage", gain = 1.0}, {pos=player:get_pos(), max_hear_distance=16}, true)
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.

View File

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

View File

@ -63,15 +63,8 @@ mobs:register_mob("mobs_mc:polar_bear", {
walk_start = 0, walk_end = 40,
run_start = 0, run_end = 40,
},
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,13 +31,6 @@ local skeleton = {
group_attack = true,
visual = "sprite",
sounds = {
random = "mobs_mc_skeleton_random",
death = "mobs_mc_skeleton_death",
damage = "mobs_mc_skeleton_hurt",
distance = 16,
},
--head code
has_head = false,
head_bone = "head",

View File

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

View File

@ -17,7 +17,6 @@ mcl_doors:register_door("mcl_doors:wooden_door", {
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"},
sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
})
minetest.register_craft({
@ -41,7 +40,6 @@ mcl_doors:register_door("mcl_doors:acacia_door", {
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"},
sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
})
minetest.register_craft({
@ -65,7 +63,6 @@ mcl_doors:register_door("mcl_doors:birch_door", {
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"},
sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
})
minetest.register_craft({
@ -89,7 +86,6 @@ 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_top = {"mcl_doors_door_dark_oak_upper.png", "mcl_doors_door_dark_oak_side_upper.png"},
sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
})
minetest.register_craft({
@ -113,7 +109,6 @@ mcl_doors:register_door("mcl_doors:jungle_door", {
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"},
sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
})
minetest.register_craft({
@ -137,7 +132,6 @@ mcl_doors:register_door("mcl_doors:spruce_door", {
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"},
sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
})
minetest.register_craft({
@ -192,7 +186,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_top = {"mcl_doors_door_iron_upper.png^[transformFX", "mcl_doors_door_iron_side_upper.png"},
sounds = mcl_sounds.node_sound_metal_defaults(),
sound_open = "fbi",
sound_open = "doors_steel_door_open",
sound_close = "doors_steel_door_close",
only_redstone_can_open = true,
@ -232,7 +226,6 @@ for w=1, #woods do
_mcl_hardness = 3,
_mcl_blast_resistance = 3,
sounds = mcl_sounds.node_sound_wood_defaults(),
sound_open = "fbi",
})
minetest.register_craft({
@ -260,7 +253,7 @@ mcl_doors:register_trapdoor("mcl_doors:iron_trapdoor", {
_mcl_hardness = 5,
_mcl_blast_resistance = 5,
sounds = mcl_sounds.node_sound_metal_defaults(),
sound_open = "fbi",
sound_open = "doors_steel_door_open",
sound_close = "doors_steel_door_close",
only_redstone_can_open = true,
@ -272,4 +265,4 @@ minetest.register_craft({
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"},
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"},
}
})
})

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -190,7 +190,6 @@ minetest.register_on_rightclickplayer(function(player, clicker)
local inv = clicker:get_inventory()
inv:remove_item("main", "mcl_buckets:bucket_empty")
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})
-- if room add bucket of cum to inventory, otherwise drop as item
if inv:room_for_item("main", {name="mcl_mobitems:cum_bucket"}) then

View File

@ -29,7 +29,6 @@ mcl_sprint = {}
mcl_sprint.SPEED = 1.3
local players = {}
local current = false --Well, while memeclone should be pretty shitty and stuff, we do not want to make players deaf
-- Returns true if the player with the given name is sprinting, false if not.
-- Returns nil if player does not exist.
@ -85,10 +84,6 @@ local function setSprinting(playerName, sprinting) --Sets the state of a player
end
if sprinting == true then
playerphysics.add_physics_factor(player, "speed", "mcl_sprint:sprint", mcl_sprint.SPEED)
if current == false then
minetest.sound_play("running") --this should play "why are you running" to the whole server when ANYONE starts sprinting, if noone else does it at the same time :D
current = true
end
end
elseif sprinting == false
and player:get_wielded_item():get_name() ~= "mcl_bows:bow_0"
@ -97,7 +92,6 @@ local function setSprinting(playerName, sprinting) --Sets the state of a player
fov_new = math.max(players[playerName].fov - 0.05, 1.0)
if sprinting == false then
playerphysics.remove_physics_factor(player, "speed", "mcl_sprint:sprint")
current = false
end
end
if fov_new ~= fov_old then
@ -231,4 +225,4 @@ minetest.register_globalstep(function(dtime)
end
end
end)
end)

Binary file not shown.

Binary file not shown.