ThePython10110
/
ExchangeClone
mirror of https://github.com/ThePython10110/ExchangeClone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into dev

This commit is contained in:
ThePython 2023-11-09 19:00:54 -08:00
parent 81b374223b 074c964573
commit cb0f322668
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -73,6 +73,9 @@ Dependencies: Minetest Game or MineClone.
* Ice and obsidian can now be transmuted into water and lava, respectively. * Ice and obsidian can now be transmuted into water and lava, respectively.
* It is now impossible to transmute between bedrock and barriers (MCL). I don't know why I did it in the first place :D * It is now impossible to transmute between bedrock and barriers (MCL). I don't know why I did it in the first place :D
### 5.3
* Fixed shearing beehives in MCL (thanks @Ranko-Saotome!)
### 5.2 ### 5.2
* Bugfixes * Bugfixes
* Removed unnecessary logging every time players take damage (I was testing stuff out with the armor) * Removed unnecessary logging every time players take damage (I was testing stuff out with the armor)
@ -87,7 +90,7 @@ Dependencies: Minetest Game or MineClone.
* Red Matter Armor no longer increases player health (the wiki lied to me). * Red Matter Armor no longer increases player health (the wiki lied to me).
* A couple of changes to DM/RM armor in MineClone, which may or may not be noticeable. I really don't know. * A couple of changes to DM/RM armor in MineClone, which may or may not be noticeable. I really don't know.
* Bugfixes: * Bugfixes:
* Fixed Mineclonia energy values (I foolishly assumed that all items would have the same itemstrings and groups). * Fixed Mineclonia energy values (I foolishly assumed that all items would have the same itemstrings and groups, thanks @Ranko-Saotome for reporting this).
### 5.0 (the most insteresting release so far) ### 5.0 (the most insteresting release so far)
**You MUST break and replace any existing Constructors, Deconstructors, and Energy Collectors when updating from any previous version. Nothing will be lost (hopefully). In Minetest Game, this is a bit of a problem (try blowing it up maybe? I don't know, sorry).** **You MUST break and replace any existing Constructors, Deconstructors, and Energy Collectors when updating from any previous version. Nothing will be lost (hopefully). In Minetest Game, this is a bit of a problem (try blowing it up maybe? I don't know, sorry).**

1
exchangeclone/armor.lua
View File

@ -111,6 +111,7 @@ if exchangeclone.mcl then
end end
mcl_damage.register_modifier(function(obj, damage, reason) mcl_damage.register_modifier(function(obj, damage, reason)
minetest.log(dump({damage, reason}))
local blocked = blocked_damage_types[reason.type] local blocked = blocked_damage_types[reason.type]
local inv = mcl_util.get_inventory(obj) local inv = mcl_util.get_inventory(obj)
if inv then if inv then

4
exchangeclone/shears.lua
View File

@ -241,7 +241,7 @@ for _, itemstring in ipairs({"mcl_beehives:bee_nest_5", "mcl_beehives:beehive_5"
minetest.registered_items[itemstring].on_rightclick = function(pos, node, player, itemstack, pointed_thing) minetest.registered_items[itemstring].on_rightclick = function(pos, node, player, itemstack, pointed_thing)
local held_name = player:get_wielded_item():get_name() local held_name = player:get_wielded_item():get_name()
local shears = special_shears[held_name] local shears = special_shears[held_name]
local beehive = "mcl_beehives:beehive" local beehive
local campfire_area = vector.offset(pos, 0, -5, 0) local campfire_area = vector.offset(pos, 0, -5, 0)
local campfire = minetest.find_nodes_in_area(pos, campfire_area, "group:lit_campfire") local campfire = minetest.find_nodes_in_area(pos, campfire_area, "group:lit_campfire")
@ -256,7 +256,7 @@ for _, itemstring in ipairs({"mcl_beehives:bee_nest_5", "mcl_beehives:beehive_5"
minetest.set_node(pos, node) minetest.set_node(pos, node)
if not campfire[1] then mcl_util.deal_damage(player, 3) end --significantly less damage if not campfire[1] then mcl_util.deal_damage(player, 3) end --significantly less damage
else else
old_honey_harvest() old_honey_harvest(pos, node, player, itemstack, pointed_thing)
end end
end end
end end