mtcontrib/witchcraft
1
0
Fork 1
mirror of https://github.com/D00Med/witchcraft.git synced 2025-06-28 22:26:36 +02:00
Code Issues Releases Wiki Activity

Compare commits

merge into: mtcontrib:master
Branches Tags
mtcontrib:master crabman77:fix_crash crabman77:master crabman77:nalc-old
mtcontrib:v0.2
...
pull from: crabman77:master
Branches Tags
crabman77:fix_crash crabman77:master crabman77:nalc-old mtcontrib:master
mtcontrib:v0.2

11 Commits
master ... master

Author SHA1 Message Date
sys4
06a3ca6265 Fix crash when right clic with no wielded item on pot 2021-08-16 21:35:00 +02:00
sys4
0cbc98900a Fix a merge error 2021-03-15 21:02:18 +01:00
sys4
0a06acc1d8 Merge remote-tracking branch 'upstream/master' 2021-03-14 23:24:34 +01:00
sys4
b500873215 Fix taking wielded items with some ingredients + add mod.conf 2020-07-15 01:37:23 +02:00
sys4
0e277c51fb Tidy code and remove stack_max limit of Glass Bottle 2020-07-13 00:44:28 +02:00
sys4
36d76ca7fb Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-06-14 23:10:12 +02:00
sys4-fr
32e3f8928b Ajoute message de chargement du mod dans le journal "action" 2019-01-19 20:25:08 +01:00
sys4-fr
c515b58ca1 La dent s'obtient aléatoirement en ramassant du sable 2018-11-03 14:52:41 +01:00
sys4-fr
8bf04f444e Correction du lancé de sorts pour les parchemins 
Changement d'un ingrédient de potion : lilypad remplace waterlily
 2018-11-02 21:36:54 +01:00
sys4-fr
dd3a7d13c7 Corrige un crash avec la splash potion orange 
Corrige la collision avec la gauge bar
 2018-11-02 20:40:25 +01:00
sys4-fr
fef074b9ed Change le craft de la dent avec le sable du desert. 2018-10-13 17:03:32 +02:00
1 changed files with 5 additions and 2 deletions
Expand all files Collapse all files

7
init.lua
View File

@ -565,7 +565,7 @@ witchcraft.pot = {
{"blue", "brown", "default:dirt", "blue2", "moreplants:bullrush", "red", "purple"},
{"blue2", "yellow", "default:steelblock", "yellow", "default:copperblock", "green2", "aqua"},
{"darkpurple", "cyan", "flowers:mushroom_red", "green", "moreplants:weed", "yellow", "redbrown"},
{"purple", "blue2", "flowers:waterlily", "gpurple", "default:mese_crystal", "magenta", "darkpurple"},
{"purple", "blue2", "nalc_flowers:lily_pad", "gpurple", "default:mese_crystal", "magenta", "darkpurple"},
{"magenta", "purple", "witchcraft:bottle_eyes", "darkpurple", "moreplants:mushroom", "purple", "darkpurple"},
{"red", "grey", "default:gravel", "yllwgrn", "default:flint", "blue", "purple"},
{"redbrown", "magenta", "flowers:mushroom_brown", "magenta", "default:stone", "grey", "brown"},
@ -587,7 +587,7 @@ witchcraft.pot = {
--new recipes
witchcraft.pot_new = {
{"blue", "blue2", "flowers:waterlily", "brown", "default:dirt", "red", "purple"},
{"blue", "blue2", "nalc_flowers:lily_pad", "brown", "default:dirt", "red", "purple"},
{"blue2", "green", "default:papyrus", "", "", "gred", "magenta"},
{"green", "green2", "default:sapling", "", "", "yellow", "yllwgrn"},
{"green2", "yellow", "default:mese_crystal_fragment", "", "", "blue", "cyan"},
@ -655,6 +655,7 @@ for _, row in ipairs(witchcraft.pot_new) do --change 'pot_new' to 'pot' for the
},
on_rightclick = function(pos, node, clicker, itemstack, _)
local wield_item = itemstack:get_name()
if wield_item == "" then return nil end
if wield_item == "vessels:glass_bottle" then
local wield_items_count = itemstack:get_count()
@ -3627,3 +3628,5 @@ minetest.register_node("witchcraft:candle", {
dofile(minetest.get_modpath("witchcraft").."/scrolls.lua")
dofile(minetest.get_modpath("witchcraft").."/brewing_stand.lua")
minetest.log("action", "[witchcraft] loaded.")