sorcery  Diff

Differences From Artifact [9df8830b92]:

• File enchanter.lua — part of check-in [ea6e475e44] at 2020-10-19 09:52:11 on branch trunk — continue dev on celestial mechanics, add melding+division spells (resonance), refine itemclasses, add keypunch and punchcards, add paper pulp, add a shitload of visuals, add convenience scripts for working with the wiki, make the flamebolt spell actually useful instead of just a pretty lightshow, add essences, inferno crystal, and other goodies; iterate on wands, lots of shit i can't remember, various bugfixes (user: lexi, size: 16047) [annotate] [blame] [check-ins using]

To Artifact [bac74a37c3]:

• File enchanter.lua — part of check-in [96c5289a2a] at 2020-10-21 03:35:35 on branch trunk — add rune forges, runes, amulet frames, write sacrifice spell, touch up amulet graphics, enable enchantment of amulets (though spells cannot yet be cast), defuckulate syncresis core icon, unfuckitize sneaky leycalc bug that's probably been the cause of some long-standing wackiness, add item classes, add some more textures, disbungle various other asstastrophes, remove sneaky old debug code, improve library code, add utility for uploading merge requests (user: lexi, size: 16060) [annotate] [blame] [check-ins using]

   100    100   		background[-0.25,-0.25;8.5,9;sorcery_enchanter_bg.png;true]
   101    101   		image[2.13,0;4.35,4;sorcery_enchanter_glyphs.png]
   102    102   		list[context;foci;3.5,0;1,1;0]
   103    103   		list[context;item;3.5,1.2;1,1;]
   104    104   		list[context;foci;2.5,2;1,1;1]
   105    105   		list[context;foci;4.5,2;1,1;2]
   106    106   		list[current_player;main;0,4.7;8,4;]
          107  +		listring[context;foci]
   107    108   		listring[current_player;main]
   108    109   		listring[context;item]
          110  +		listring[current_player;main]
   109    111   	]] .. slots)
   110    112   end
   111    113   
   112    114   sorcery.enchant = {} do
   113    115   	sorcery.enchant.update_enchanter = enchanter_update
   114    116   	local m = sorcery.lib.marshal
   115    117   	local ench_t = m.g.struct {
................................................................................
   376    378   		-- so i'm just compromising and setting delta to a
   377    379   		-- constant :/
   378    380   		minetest.after(delta, function()
   379    381   			if not sorcery.ctx.stat(user) then return end
   380    382   			local u = sorcery.ctx.get(user)
   381    383   			local h = u.hud_ench
   382    384   			if not h then return end
   383         -			print('timeleft,delta',h.timeleft,delta)
   384    385   			if h.timeleft - delta <= 0 then
   385    386   				user:hud_remove(h.id)
   386    387   				u.hud_ench = nil
   387    388   			else
   388    389   				h.timeleft = h.timeleft - delta
   389    390   				h.fn = false
   390    391   				enchpwrhud(user, false, h.fac)