Merge pull request 'Nyan cat/ocelot' (#3) from chmodsayshello/Memeclone_Fork:nyan_cat into master

Reviewed-on: EliasFleckenstein03/Memeclone#3

mods/CORE/mcl_moans/init.lua

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

mods/CORE/mcl_sounds/init.lua

@@ -166,3 +166,7 @@ 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)

mods/ENTITIES/mobs_mc/cow+mooshroom.lua

@@ -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 = 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 inv:room_for_item("main", {name=mobs_mc.items.milk}) then
 				clicker:get_inventory():add_item("main", mobs_mc.items.milk)

mods/ENTITIES/mobs_mc/ocelot.lua

@@ -38,9 +38,8 @@ local ocelot = {
 	xp_min = 1,
 	xp_max = 3,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3},
-	visual = "mesh",
-	mesh = "mobs_mc_cat.b3d",
-	textures = {"mobs_mc_cat_ocelot.png"},
+	visual = "sprite",
+	textures = {"mobs_mc_nyan.png"},
 	visual_size = {x=2.0, y=2.0},
 	makes_footstep_sound = true,
 	walk_chance = default_walk_chance,

mods/ENTITIES/mobs_mc/polar_bear.lua

@@ -65,6 +65,13 @@ mobs:register_mob("mobs_mc:polar_bear", {
 	},
 	
 	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,
 })
 
 

mods/ENTITIES/mobs_mc/skeleton+stray.lua

@@ -31,6 +31,13 @@ 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",

mods/HUD/mcl_achievements/init.lua

@@ -69,7 +69,7 @@ awards.register_achievement("mcl:bakeCake", {
 	}
 })
 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
 	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("Time to Strike!"),
+	title = S("Kinda sUs!"),
 	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("DIAMONDS!"),
+	title = S("Look how rich I am!!!!"),
 	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("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."),
 	icon = "mcl_mobitems_leather.png",
 })
@@ -241,12 +241,12 @@ end)
 
 
 awards.register_achievement("mcl:stoneAge", {
-	title		= S("Stone Age"),
+	title		= S("UGAUGA"),
 	description	= S("Mine a stone with new pickaxe."),
 	icon		= "default_cobble.png",
 })
 awards.register_achievement("mcl:hotStuff", {
-	title		= S("Hot Stuff"),
+	title		= S("HOTHOTHOTHOTHOTHOT"),
 	description	= S("Put lava in a bucket."),
 	icon		= "bucket_lava.png",
 })

mods/ITEMS/mcl_doors/register.lua

@@ -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_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({
@@ -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_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({
@@ -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_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({
@@ -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_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({
@@ -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_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({
@@ -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_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({
@@ -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_top = {"mcl_doors_door_iron_upper.png^[transformFX", "mcl_doors_door_iron_side_upper.png"},
 	sounds = mcl_sounds.node_sound_metal_defaults(),
-	sound_open = "doors_steel_door_open",
+	sound_open = "fbi",
 	sound_close = "doors_steel_door_close",
 
 	only_redstone_can_open = true,
@@ -226,6 +232,7 @@ 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({
@@ -253,7 +260,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 = "doors_steel_door_open",
+	sound_open = "fbi",
 	sound_close = "doors_steel_door_close",
 
 	only_redstone_can_open = true,

mods/ITEMS/mcl_mobitems/init.lua

@@ -190,6 +190,7 @@ 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