From cfac0a37c8a64e6a351055309d0424d1ff6f029b Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Sun, 10 Dec 2017 15:49:54 +0100 Subject: [PATCH] Change item_drop mod Change player speed parameters (come back to normal values) --- .gitmodules | 3 + minetest.conf | 32 ++-- mods/item_drop | 1 + mods/item_drop/README.txt | 42 ----- mods/item_drop/init.lua | 184 ------------------- mods/item_drop/sounds/item_drop_pickup.1.ogg | Bin 5530 -> 0 bytes mods/item_drop/sounds/item_drop_pickup.2.ogg | Bin 5714 -> 0 bytes mods/item_drop/sounds/item_drop_pickup.3.ogg | Bin 5250 -> 0 bytes mods/item_drop/sounds/item_drop_pickup.4.ogg | Bin 5302 -> 0 bytes 9 files changed, 24 insertions(+), 238 deletions(-) create mode 160000 mods/item_drop delete mode 100755 mods/item_drop/README.txt delete mode 100755 mods/item_drop/init.lua delete mode 100755 mods/item_drop/sounds/item_drop_pickup.1.ogg delete mode 100755 mods/item_drop/sounds/item_drop_pickup.2.ogg delete mode 100755 mods/item_drop/sounds/item_drop_pickup.3.ogg delete mode 100755 mods/item_drop/sounds/item_drop_pickup.4.ogg diff --git a/.gitmodules b/.gitmodules index 1918e5bd..4b06972d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -147,3 +147,6 @@ [submodule "mods/playereffects"] path = mods/playereffects url = https://github.com/sys4-fr/playereffects.git +[submodule "mods/item_drop"] + path = mods/item_drop + url = https://github.com/tacotexmex/item_drop.git diff --git a/minetest.conf b/minetest.conf index f00f8b61..17e0a9ec 100755 --- a/minetest.conf +++ b/minetest.conf @@ -60,29 +60,29 @@ curl_timeout = 15000 ### MOVEMENT MODIFICATIONS ### ############################## # Slightly decreased compared to minetest_next. -movement_acceleration_default = 2.4 +#movement_acceleration_default = 2.4 # Same acceleration in air and on the ground, to fix some movement glitches. Also is easier to play. -movement_acceleration_air = 1.2 +#movement_acceleration_air = 1.2 # Almost instant acceleration in fast mode for more control. -movement_acceleration_fast = 24 +#movement_acceleration_fast = 24 # Walking is 20 % faster than in minetest_game. Makes playing without the "fast" privilege less boring. -movement_speed_walk = 4.8 +#movement_speed_walk = 4.8 # Half the speed of walking, just like the animation. -movement_speed_crouch = 2.4 +#movement_speed_crouch = 2.4 # 5 times faster than walking. -movement_speed_fast = 24 +#movement_speed_fast = 24 # Makes climbing speed faster than rising in the water. Also makes ladders more useful. -movement_speed_climb = 4.8 +#movement_speed_climb = 4.8 # Faster movement in liquids. Jumping at the water surface also speeds up swimming. -movement_liquid_fluidity = 1.6 (default = 1) +#movement_liquid_fluidity = 1.6 (default = 1) # Ralentissement à la surface de l'eau -movement_liquid_fluidity_smooth = 0.5 +#movement_liquid_fluidity_smooth = 0.5 # Vitesse à laquelle le joueur coule -movement_liquid_sink = 15 +#movement_liquid_sink = 15 # Slightly less gravity. -movement_gravity = 9.5 +#movement_gravity = 9.5 # Jump height slightly reduced. -movement_speed_jump = 6.5 +#movement_speed_jump = 6.5 # Emplacement du static spawn point static_spawnpoint = 144, 25, 261 # Emplacment du static spawn pour le nether @@ -195,3 +195,11 @@ secure.trusted_mods = irc, snow, stacktraceplus ## Player Anim ## player_model_version = default_character_v1 + +# item_drop +enable_item_drop = false +enable_item_pickup_key = false +enable_item_pickup = true +item_pickup_radius = 0.75 +item_pickup_keytype = Sneak + diff --git a/mods/item_drop b/mods/item_drop new file mode 160000 index 00000000..962d0a38 --- /dev/null +++ b/mods/item_drop @@ -0,0 +1 @@ +Subproject commit 962d0a3889db609c349e3e99a58104bbb22f4c93 diff --git a/mods/item_drop/README.txt b/mods/item_drop/README.txt deleted file mode 100755 index fe43054d..00000000 --- a/mods/item_drop/README.txt +++ /dev/null @@ -1,42 +0,0 @@ -===ITEM_DROP MOD for MINETEST-C55=== -by PilzAdam - -Introduction: -This mod adds Minecraft like drop/pick up of items to Minetest. - -How to install: -Unzip the archive an place it in minetest-base-directory/mods/minetest/ -if you have a windows client or a linux run-in-place client. If you have -a linux system-wide instalation place it in ~/.minetest/mods/minetest/. -If you want to install this mod only in one world create the folder -worldmods/ in your worlddirectory. -For further information or help see: -http://wiki.minetest.com/wiki/Installing_Mods - -How to use the mod: -Just install it an everything works. - -For developers: -You dont have to use get_drops() anymore because of changes in the -builtin files of minetest. - -License: -Sourcecode: WTFPL (see below) -Sound: WTFPL (see below) - -See also: -http://minetest.net/ - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2004 Sam Hocevar - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/mods/item_drop/init.lua b/mods/item_drop/init.lua deleted file mode 100755 index 9e54705a..00000000 --- a/mods/item_drop/init.lua +++ /dev/null @@ -1,184 +0,0 @@ -item_drop = {} -local enable_damage = minetest.setting_getbool("enable_damage") -local creative_mode = minetest.setting_getbool("creative_mode") -local TICK_UPDATE = 0.1 - - --- Following edits by gravgun - -item_drop.drop_callbacks = {} -item_drop.pickup_callbacks = {} - --- on_drop(dropper, drop_entity, itemstack) -function item_drop.add_drop_callback(on_drop) - table.insert(item_drop.drop_callbacks, on_drop) -end - --- on_pickup(picker, itemstack) -function item_drop.add_pickup_callback(on_pickup) - table.insert(item_drop.pickup_callbacks, on_pickup) -end - --- Idea is to have a radius pickup range around the player, whatever the height --- We need to have a radius that will at least contain 1 node distance at the player's feet --- Using simple trigonometry, we get that we need a radius of --- sqrt(pickup_range² + player_half_height²) -local pickup_range = 1.3 -local pickup_range_squared = pickup_range*pickup_range -local player_half_height = 0.9 -local scan_range = math.sqrt(player_half_height*player_half_height + pickup_range_squared) --- Node drops are insta-pickup, everything else (player drops) are not -local delay_before_playerdrop_pickup = 1 --- Time in which the node comes to the player -local pickup_duration = 0.1 --- Little treshold so the items aren't already on the player's middle -local pickup_inv_duration = 1/pickup_duration*0.7 - -local function tick() - local tstamp = minetest.get_us_time() - for _,player in ipairs(minetest.get_connected_players()) do - if player:get_hp() > 0 or not enable_damage then - local pos = player:getpos() - pos.y = pos.y + player_half_height - local inv = player:get_inventory() - - if inv then - for _,object in ipairs(minetest.get_objects_inside_radius(pos, scan_range)) do - local luaEnt = object:get_luaentity() - if luaEnt and luaEnt.name == "__builtin:item" then - local ticky = luaEnt.item_drop_min_tstamp - if ticky then - if tstamp >= ticky then - luaEnt.item_drop_min_tstamp = nil - end - elseif not luaEnt.item_drop_nopickup then - -- Point-line distance computation, heavily simplified since the wanted line, - -- being the player, is completely upright (no variation on X or Z) - local pos2 = object:getpos() - -- No sqrt, avoid useless computation - -- (just take the radius, compare it to the square of what you want) - -- Pos order doesn't really matter, we're squaring the result - -- (but don't change it, we use the cached values afterwards) - local dX = pos.x-pos2.x - local dZ = pos.z-pos2.z - local playerDistance = dX*dX+dZ*dZ - if playerDistance <= pickup_range_squared then - local itemStack = ItemStack(luaEnt.itemstring) - if inv:room_for_item("main", itemStack) then - local vec = {x=dX, y=pos.y-pos2.y, z=dZ} - vec.x = vec.x*pickup_inv_duration - vec.y = vec.y*pickup_inv_duration - vec.z = vec.z*pickup_inv_duration - object:setvelocity(vec) - luaEnt.physical_state = false - luaEnt.object:set_properties({ - physical = false - }) - -- Mark the object as already picking up - luaEnt.item_drop_nopickup = true - - minetest.after(pickup_duration, function() - local lua = luaEnt - if object == nil or lua == nil or lua.itemstring == nil then - return - end - if inv:room_for_item("main", itemStack) then - inv:add_item("main", itemStack) - if luaEnt.itemstring ~= "" then - minetest.sound_play("item_drop_pickup", {pos = pos, gain = 0.3, max_hear_distance = 8}) - end - luaEnt.itemstring = "" - object:remove() - for i, cb in ipairs(item_drop.pickup_callbacks) do - cb(player, itemstack) - end - else - object:setvelocity({x = 0,y = 0,z = 0}) - luaEnt.physical_state = true - luaEnt.object:set_properties({ - physical = true - }) - luaEnt.item_drop_nopickup = nil - end - end) - end - end - end - end - end - end - end - end - minetest.after(TICK_UPDATE, tick) -end - -local mt_handle_node_drops = minetest.handle_node_drops -function minetest.handle_node_drops(pos, drops, digger) - if digger and digger.is_fake_player then -- Pipeworks' wielders - mt_handle_node_drops(pos, drops, digger) - return - end - local inv - if creative_mode and digger and digger:is_player() then - inv = digger:get_inventory() - end - for _,item in ipairs(drops) do - local count, name - if type(item) == "string" then - count = 1 - name = item - else - count = item:get_count() - name = item:get_name() - end - if not inv or not inv:contains_item("main", ItemStack(name)) then - for i=1,count do - local obj - local x = math.random(1, 5) - if math.random(1,2) == 1 then x = -x end - - local z = math.random(1, 5) - if math.random(1,2) == 1 then z = -z end - - obj = minetest.spawn_item(pos, name) - if obj ~= nil then - obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z}) - end - end - end - end -end - -local mt_item_drop = minetest.item_drop -function minetest.item_drop(itemstack, dropper, pos) - if dropper and dropper.is_player then - local v = dropper:get_look_dir() - local p = {x=pos.x, y=pos.y+1.2, z=pos.z} - local cs = itemstack:get_count() - if dropper:get_player_control().sneak then - cs = 1 - end - local item = itemstack:take_item(cs) - local obj = core.add_item(p, item) - if obj then - v.x = v.x*2 - v.y = v.y*2 + 2 - v.z = v.z*2 - obj:setvelocity(v) - obj:get_luaentity().item_drop_min_tstamp = minetest.get_us_time() + delay_before_playerdrop_pickup * 1000000 - for i, cb in ipairs(item_drop.drop_callbacks) do - cb(dropper, obj, itemstack) - end - end - else - core.add_item(pos, itemstack) - end - return itemstack -end - -if minetest.setting_getbool("log_mods") then - minetest.log("action", "[item_drop] item_drop overriden: " .. tostring(mt_item_drop) .. " " .. tostring(minetest.item_drop)) - minetest.log("action", "[item_drop] loaded.") -end - -tick() diff --git a/mods/item_drop/sounds/item_drop_pickup.1.ogg b/mods/item_drop/sounds/item_drop_pickup.1.ogg deleted file mode 100755 index 6b335ead394ae0dce64b3f9dd413e32cac542f86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5530 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 diff --git a/mods/item_drop/sounds/item_drop_pickup.2.ogg b/mods/item_drop/sounds/item_drop_pickup.2.ogg deleted file mode 100755 index 7b7e16985f556d2dbc2e1cc414510e6c0d05430d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5714 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 Yno>>8py-wrFGBU!Lo(KoVi2_AZ^tAjf&c&j diff --git a/mods/item_drop/sounds/item_drop_pickup.3.ogg b/mods/item_drop/sounds/item_drop_pickup.3.ogg deleted file mode 100755 index 1245ff58f0360046142a3f648e1c365fd838b962..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5250 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 Ug*XqsPMhr%LVJF^ognBx0hBU7b^rhX diff --git a/mods/item_drop/sounds/item_drop_pickup.4.ogg b/mods/item_drop/sounds/item_drop_pickup.4.ogg deleted file mode 100755 index 1ffa2c16029af8f7d754cd66261bd2493a569e31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5302 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 SE|dhKPX;_=9nw)xpuYkA=21NW