From 29857f25278de8cc6932a665829ddd02827caf74 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Mon, 6 Jul 2015 18:14:02 +0200 Subject: [PATCH] Updated nether and applied scripts --- minetestforfun_game/mods/bucket/textures/bucket.png | Bin .../mods/bucket/textures/bucket_acid.png | Bin .../mods/bucket/textures/bucket_lava.png | Bin .../mods/bucket/textures/bucket_river_water.png | Bin .../mods/bucket/textures/bucket_sand.png | Bin .../mods/bucket/textures/bucket_water.png | Bin .../default/sounds/default_gravel_footstep.1.ogg | Bin .../default/sounds/default_gravel_footstep.2.ogg | Bin .../default/sounds/default_gravel_footstep.3.ogg | Bin .../default/sounds/default_gravel_footstep.4.ogg | Bin mods/arrow_signs/textures/arrow_sign.png | Bin .../arrow_signs/textures/arrow_sign_border_down.png | Bin .../arrow_signs/textures/arrow_sign_border_left.png | Bin .../textures/arrow_sign_border_right.png | Bin mods/arrow_signs/textures/arrow_sign_border_up.png | Bin mods/inventory_icon/README.txt | 0 mods/inventory_icon/depends.txt | 0 mods/inventory_icon/description.txt | 0 mods/inventory_icon/init.lua | 0 .../textures/inventory_icon_backpack_free.png | Bin .../textures/inventory_icon_backpack_full.png | Bin .../textures/inventory_icon_bags_large.png | Bin .../textures/inventory_icon_bags_medium.png | Bin .../textures/inventory_icon_bags_small.png | Bin mods/mobs/textures/mobs_bucket_milk.png | Bin mods/nether/nether/init.lua | 6 +++--- mods/runes/textures/runes_grim_reaper_amulet.png | Bin mods/runes/textures/runes_minotaur_eye_amulet.png | Bin mods/runes/textures/runes_silver_cross_amulet.png | Bin mods/throwing/textures/throwing_arbalest.png | Bin mods/throwing/textures/throwing_arbalest_loaded.png | Bin mods/throwing/textures/throwing_bow_steel.png | Bin .../throwing/textures/throwing_bow_steel_loaded.png | Bin mods/throwing/textures/throwing_longbow.png | Bin mods/throwing/textures/throwing_longbow_loaded.png | Bin mods/track_players/init.lua | 0 36 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 minetestforfun_game/mods/bucket/textures/bucket.png mode change 100644 => 100755 minetestforfun_game/mods/bucket/textures/bucket_acid.png mode change 100644 => 100755 minetestforfun_game/mods/bucket/textures/bucket_lava.png mode change 100644 => 100755 minetestforfun_game/mods/bucket/textures/bucket_river_water.png mode change 100644 => 100755 minetestforfun_game/mods/bucket/textures/bucket_sand.png mode change 100644 => 100755 minetestforfun_game/mods/bucket/textures/bucket_water.png mode change 100644 => 100755 minetestforfun_game/mods/default/sounds/default_gravel_footstep.1.ogg mode change 100644 => 100755 minetestforfun_game/mods/default/sounds/default_gravel_footstep.2.ogg mode change 100644 => 100755 minetestforfun_game/mods/default/sounds/default_gravel_footstep.3.ogg mode change 100644 => 100755 minetestforfun_game/mods/default/sounds/default_gravel_footstep.4.ogg mode change 100644 => 100755 mods/arrow_signs/textures/arrow_sign.png mode change 100644 => 100755 mods/arrow_signs/textures/arrow_sign_border_down.png mode change 100644 => 100755 mods/arrow_signs/textures/arrow_sign_border_left.png mode change 100644 => 100755 mods/arrow_signs/textures/arrow_sign_border_right.png mode change 100644 => 100755 mods/arrow_signs/textures/arrow_sign_border_up.png mode change 100644 => 100755 mods/inventory_icon/README.txt mode change 100644 => 100755 mods/inventory_icon/depends.txt mode change 100644 => 100755 mods/inventory_icon/description.txt mode change 100644 => 100755 mods/inventory_icon/init.lua mode change 100644 => 100755 mods/inventory_icon/textures/inventory_icon_backpack_free.png mode change 100644 => 100755 mods/inventory_icon/textures/inventory_icon_backpack_full.png mode change 100644 => 100755 mods/inventory_icon/textures/inventory_icon_bags_large.png mode change 100644 => 100755 mods/inventory_icon/textures/inventory_icon_bags_medium.png mode change 100644 => 100755 mods/inventory_icon/textures/inventory_icon_bags_small.png mode change 100644 => 100755 mods/mobs/textures/mobs_bucket_milk.png mode change 100644 => 100755 mods/runes/textures/runes_grim_reaper_amulet.png mode change 100644 => 100755 mods/runes/textures/runes_minotaur_eye_amulet.png mode change 100644 => 100755 mods/runes/textures/runes_silver_cross_amulet.png mode change 100644 => 100755 mods/throwing/textures/throwing_arbalest.png mode change 100644 => 100755 mods/throwing/textures/throwing_arbalest_loaded.png mode change 100644 => 100755 mods/throwing/textures/throwing_bow_steel.png mode change 100644 => 100755 mods/throwing/textures/throwing_bow_steel_loaded.png mode change 100644 => 100755 mods/throwing/textures/throwing_longbow.png mode change 100644 => 100755 mods/throwing/textures/throwing_longbow_loaded.png mode change 100644 => 100755 mods/track_players/init.lua diff --git a/minetestforfun_game/mods/bucket/textures/bucket.png b/minetestforfun_game/mods/bucket/textures/bucket.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_acid.png b/minetestforfun_game/mods/bucket/textures/bucket_acid.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_lava.png b/minetestforfun_game/mods/bucket/textures/bucket_lava.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_river_water.png b/minetestforfun_game/mods/bucket/textures/bucket_river_water.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_sand.png b/minetestforfun_game/mods/bucket/textures/bucket_sand.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/bucket/textures/bucket_water.png b/minetestforfun_game/mods/bucket/textures/bucket_water.png old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_gravel_footstep.1.ogg b/minetestforfun_game/mods/default/sounds/default_gravel_footstep.1.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_gravel_footstep.2.ogg b/minetestforfun_game/mods/default/sounds/default_gravel_footstep.2.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_gravel_footstep.3.ogg b/minetestforfun_game/mods/default/sounds/default_gravel_footstep.3.ogg old mode 100644 new mode 100755 diff --git a/minetestforfun_game/mods/default/sounds/default_gravel_footstep.4.ogg b/minetestforfun_game/mods/default/sounds/default_gravel_footstep.4.ogg old mode 100644 new mode 100755 diff --git a/mods/arrow_signs/textures/arrow_sign.png b/mods/arrow_signs/textures/arrow_sign.png old mode 100644 new mode 100755 diff --git a/mods/arrow_signs/textures/arrow_sign_border_down.png b/mods/arrow_signs/textures/arrow_sign_border_down.png old mode 100644 new mode 100755 diff --git a/mods/arrow_signs/textures/arrow_sign_border_left.png b/mods/arrow_signs/textures/arrow_sign_border_left.png old mode 100644 new mode 100755 diff --git a/mods/arrow_signs/textures/arrow_sign_border_right.png b/mods/arrow_signs/textures/arrow_sign_border_right.png old mode 100644 new mode 100755 diff --git a/mods/arrow_signs/textures/arrow_sign_border_up.png b/mods/arrow_signs/textures/arrow_sign_border_up.png old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/README.txt b/mods/inventory_icon/README.txt old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/depends.txt b/mods/inventory_icon/depends.txt old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/description.txt b/mods/inventory_icon/description.txt old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/init.lua b/mods/inventory_icon/init.lua old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/textures/inventory_icon_backpack_free.png b/mods/inventory_icon/textures/inventory_icon_backpack_free.png old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/textures/inventory_icon_backpack_full.png b/mods/inventory_icon/textures/inventory_icon_backpack_full.png old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/textures/inventory_icon_bags_large.png b/mods/inventory_icon/textures/inventory_icon_bags_large.png old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/textures/inventory_icon_bags_medium.png b/mods/inventory_icon/textures/inventory_icon_bags_medium.png old mode 100644 new mode 100755 diff --git a/mods/inventory_icon/textures/inventory_icon_bags_small.png b/mods/inventory_icon/textures/inventory_icon_bags_small.png old mode 100644 new mode 100755 diff --git a/mods/mobs/textures/mobs_bucket_milk.png b/mods/mobs/textures/mobs_bucket_milk.png old mode 100644 new mode 100755 diff --git a/mods/nether/nether/init.lua b/mods/nether/nether/init.lua index bead98da..39b9f2c1 100755 --- a/mods/nether/nether/init.lua +++ b/mods/nether/nether/init.lua @@ -113,7 +113,7 @@ end local path = minetest.get_modpath("nether") dofile(path.."/weird_mapgen_noise.lua") dofile(path.."/items.lua") -dofile(path.."/furnace.lua") +--dofile(path.."/furnace.lua") dofile(path.."/pearl.lua") local function table_contains(t, v) @@ -132,9 +132,9 @@ local function do_ws_func(depth, a, x) local n = x/(16*SIZE) local y = 0 for k=1,depth do - y = y + SIZE*(math.sin(math.pi * k^a * n)/(math.pi * k^a)) + y = y + math.sin(math.pi * k^a * n)/(k^a) end - return y + return SIZE*y/math.pi end local chunksize = minetest.setting_get("chunksize") or 5 diff --git a/mods/runes/textures/runes_grim_reaper_amulet.png b/mods/runes/textures/runes_grim_reaper_amulet.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_minotaur_eye_amulet.png b/mods/runes/textures/runes_minotaur_eye_amulet.png old mode 100644 new mode 100755 diff --git a/mods/runes/textures/runes_silver_cross_amulet.png b/mods/runes/textures/runes_silver_cross_amulet.png old mode 100644 new mode 100755 diff --git a/mods/throwing/textures/throwing_arbalest.png b/mods/throwing/textures/throwing_arbalest.png old mode 100644 new mode 100755 diff --git a/mods/throwing/textures/throwing_arbalest_loaded.png b/mods/throwing/textures/throwing_arbalest_loaded.png old mode 100644 new mode 100755 diff --git a/mods/throwing/textures/throwing_bow_steel.png b/mods/throwing/textures/throwing_bow_steel.png old mode 100644 new mode 100755 diff --git a/mods/throwing/textures/throwing_bow_steel_loaded.png b/mods/throwing/textures/throwing_bow_steel_loaded.png old mode 100644 new mode 100755 diff --git a/mods/throwing/textures/throwing_longbow.png b/mods/throwing/textures/throwing_longbow.png old mode 100644 new mode 100755 diff --git a/mods/throwing/textures/throwing_longbow_loaded.png b/mods/throwing/textures/throwing_longbow_loaded.png old mode 100644 new mode 100755 diff --git a/mods/track_players/init.lua b/mods/track_players/init.lua old mode 100644 new mode 100755