sorcery  Check-in [032f54d1d5]

Overview
Comment:bugfixes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA3-256: 032f54d1d58eb85ec500ddbc7078218ca96cc1c6cbbc72e3582ff305fede64bf
User & Date: lexi on 2024-03-17 00:35:03
Other Links: manifest | tags
Context
2024-03-17
00:35
bugfixes Leaf check-in: 032f54d1d5 user: lexi tags: trunk
2022-03-18
01:50
updates check-in: 4b5ada2414 user: lexi tags: trunk
Changes

Modified potions.lua from [4d3cea5840] to [caa667dc69].

193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
				max_hear_distance = 12;
			}, true)
			local ret = ItemStack("vessels:glass_bottle")
			if stack:is_empty() then stack = ret else
				if user:get_inventory():room_for_item('main',ret) then
					user:get_inventory():add_item('main',ret)
				else
					minetest.add_item(user.get_pos(), ret)
				end
			end
			return stack
		end
	}
	local fullname = potion.name .. ' Draught'
	sorcery.register_potion(name, fullname,







|







193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
				max_hear_distance = 12;
			}, true)
			local ret = ItemStack("vessels:glass_bottle")
			if stack:is_empty() then stack = ret else
				if user:get_inventory():room_for_item('main',ret) then
					user:get_inventory():add_item('main',ret)
				else
					minetest.add_item(user:get_pos(), ret)
				end
			end
			return stack
		end
	}
	local fullname = potion.name .. ' Draught'
	sorcery.register_potion(name, fullname,

Modified writing.lua from [cf9865540e] to [0d6f78a1ee].

494
495
496
497
498
499
500

501
502
503
504
505
506
507
508
...
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
				end
			end

			-- handle editing request
			local rpp = sorcery.cookbook.constants.recipes_per_cookbook_page 
			if p.mode then for idx=1,rpp do
				if fields['recipe_' .. tostring(idx)] then

					local recnr = (bm:get_int('pagenr')-1)*rpp + idx
					local rec = book.pages[recnr]
					local bookchanged = false 
					if p.mode == 'delete' then
						p.operstack:take_item(1)
						table.remove(book.pages,recnr)
						bookchanged = true
					elseif p.mode == 'copy' and
................................................................................
							name = rm:get_string('recipe_name');
						})
						-- insertion can operate in one of two modes: copying
						-- the recipe into the book, or inserting the paper
						-- directly. if there is no ink available, we use the
						-- latter mode. in effect, this means deleting the
						-- recipe item is insufficient ink is available.
						if charge_ink(constants.op_cost_insert_rec) == false then
							p.operstack = ItemStack(nil)
						end
						bookchanged = true
					elseif p.mode == 'cut' then
						local spr = p.operstack:get_definition()._sorcery
						local sch = (spr and spr.material and spr.material.data.hardness) or 2
						local suses = sch * constants.cuts_per_scissor_hardness







>
|







 







|







494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
...
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
				end
			end

			-- handle editing request
			local rpp = sorcery.cookbook.constants.recipes_per_cookbook_page 
			if p.mode then for idx=1,rpp do
				if fields['recipe_' .. tostring(idx)] then
					local pg = math.max(1, bm:get_int 'pagenr') -- handle unset page
					local recnr = (pg-1)*rpp + idx
					local rec = book.pages[recnr]
					local bookchanged = false 
					if p.mode == 'delete' then
						p.operstack:take_item(1)
						table.remove(book.pages,recnr)
						bookchanged = true
					elseif p.mode == 'copy' and
................................................................................
							name = rm:get_string('recipe_name');
						})
						-- insertion can operate in one of two modes: copying
						-- the recipe into the book, or inserting the paper
						-- directly. if there is no ink available, we use the
						-- latter mode. in effect, this means deleting the
						-- recipe item is insufficient ink is available.
						if (not p.has_pen) or charge_ink(constants.op_cost_insert_rec) == false then
							p.operstack = ItemStack(nil)
						end
						bookchanged = true
					elseif p.mode == 'cut' then
						local spr = p.operstack:get_definition()._sorcery
						local sch = (spr and spr.material and spr.material.data.hardness) or 2
						local suses = sch * constants.cuts_per_scissor_hardness