crabman77/witchcraft
1
0
Fork 0
forked from nalc/witchcraft
Code Issues Pull Requests Projects Releases Wiki Activity

27.6.17 update

Browse Source 
>mod now supports player_monoids
>potion textures match the new glass bottle texture
This commit is contained in:
D00Med 2017-06-27 08:23:58 +10:00
parent 0baf0cb53b
commit 27cd07358a
26 changed files with 110 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
depends.txt
View File

@ -3,6 +3,7 @@ vessels
tnt
fire
playereffects
player_monoids?
farming?
lightning?
pmobs?

127
init.lua
View File

@ -1437,7 +1437,97 @@ minetest.register_entity("witchcraft:smoke_splash", {
--player effects
playereffects.register_effect_type("potion_speed_lv1", "High speed", nil, {"speed"},
if minetest.get_modpath("player_monoids") then
local speed = player_monoids.speed
local jump = player_monoids.jump
local gravity = player_monoids.gravity
playereffects.register_effect_type("witchcraft:potion_speed_lv1", "High Speed", nil, {"witchcraft:potion_speed_lv1"},
function(player)
speed:add_change(player, 2, "witchcraft:potion_speed_lv1")
end,
function(effect, player)
speed:del_change(player, "witchcraft:potion_speed_lv1")
end,
false
)
playereffects.register_effect_type("witchcraft:potion_speed_lv2", "High Speed", nil, {"witchcraft:potion_speed_lv2"},
function(player)
speed:add_change(player, 2.5, "witchcraft:potion_speed_lv2")
end,
function(effect, player)
speed:del_change(player, "witchcraft:potion_speed_lv2")
end,
false
)
playereffects.register_effect_type("witchcraft:potion_jump_lvx", "High Jump", nil, {"witchcraft:potion_jump_lvx"},
function(player)
jump:add_change(player, 1.5, "witchcraft:potion_jump_lvx")
gravity:add_change(player, 0.8, "witchcraft:potion_jump_lvx")
end,
function(effect, player)
jump:del_change(player, "witchcraft:potion_jump_lvx")
gravity:del_change(player, "witchcraft:potion_jump_lvx")
end,
false
)
playereffects.register_effect_type("witchcraft:potion_antigrav_lvx", "Light weight", nil, {"witchcraft:potion_antigrav_lvx"},
function(player)
gravity:add_change(player, 0.1, "witchcraft:potion_antigrav_lvx")
end,
function(effect, player)
gravity:del_change(player, "witchcraft:potion_antigrav_lvx")
end,
false
)
playereffects.register_effect_type("witchcraft:potion_slow_lv1", "Low Speed", nil, {"witchcraft:potion_slow_lv1"},
function(player)
speed:add_change(player, 0.5, "witchcraft:potion_slow_lv1")
end,
function(effect, player)
speed:del_change(player, "witchcraft:potion_slow_lv1")
end,
false
)
playereffects.register_effect_type("witchcraft:potion_slow_lv2", "Low Speed", nil, {"witchcraft:potion_slow_lv2"},
function(player)
speed:add_change(player, 0.4, "witchcraft:potion_slow_lv2")
end,
function(effect, player)
speed:del_change(player, "witchcraft:potion_slow_lv2")
end,
false
)
playereffects.register_effect_type("witchcraft:potion_swim_lv1", "Fast Swim", nil, {"witchcraft:potion_swim_lv1"},
function(player)
speed:add_change(player, 3, "witchcraft:potion_swim_lv1")
end,
function(effect, player)
speed:del_change(player, "witchcraft:potion_swim_lv1")
end,
false
)
playereffects.register_effect_type("witchcraft:potion_swim_lv2", "Dive", nil, {"witchcraft:potion_swim_lv2"},
function(player)
speed:add_change(player, 3, "witchcraft:potion_swim_lv2")
gravity:add_change(player, 4, "witchcraft:potion_swim_lv2")
end,
function(effect, player)
speed:del_change(player, "witchcraft:potion_swim_lv2")
gravity:del_change(player, "witchcraft:potion_swim_lv2")
end,
false
)
else
playereffects.register_effect_type("witchcraft:potion_speed_lv1", "High speed", nil, {"speed"},
function(player)
player:set_physics_override(2,nil,nil)
end,
@ -1448,7 +1538,7 @@ playereffects.register_effect_type("potion_speed_lv1", "High speed", nil, {"spee
false
)
playereffects.register_effect_type("potion_speed_lv2", "High speed", nil, {"speed"},
playereffects.register_effect_type("witchcraft:potion_speed_lv2", "High speed", nil, {"speed"},
function(player)
player:set_physics_override(2.5,nil,nil)
end,
@ -1459,7 +1549,7 @@ playereffects.register_effect_type("potion_speed_lv2", "High speed", nil, {"spee
false
)
playereffects.register_effect_type("potion_jump_lvx", "High Jump", nil, {"jump"},
playereffects.register_effect_type("witchcraft:potion_jump_lvx", "High Jump", nil, {"jump"},
function(player)
player:set_physics_override(nil,1.5,0.8)
end,
@ -1470,7 +1560,7 @@ playereffects.register_effect_type("potion_jump_lvx", "High Jump", nil, {"jump"}
false
)
playereffects.register_effect_type("potion_antigrav_lvx", "Light weight", nil, {"gravity"},
playereffects.register_effect_type("witchcraft:potion_antigrav_lvx", "Light weight", nil, {"gravity"},
function(player)
player:set_physics_override(nil,nil,0.1)
end,
@ -1481,7 +1571,7 @@ playereffects.register_effect_type("potion_antigrav_lvx", "Light weight", nil, {
false
)
playereffects.register_effect_type("potion_slow_lv1", "Low speed", nil, {"speed"},
playereffects.register_effect_type("witchcraft:potion_slow_lv1", "Low speed", nil, {"speed"},
function(player)
player:set_physics_override(0.5,nil,nil)
end,
@ -1492,7 +1582,7 @@ playereffects.register_effect_type("potion_slow_lv1", "Low speed", nil, {"speed"
false
)
playereffects.register_effect_type("potion_slow_lv2", "Low speed", nil, {"speed"},
playereffects.register_effect_type("witchcraft:potion_slow_lv2", "Low speed", nil, {"speed"},
function(player)
player:set_physics_override(0.4,nil,nil)
end,
@ -1503,7 +1593,7 @@ playereffects.register_effect_type("potion_slow_lv2", "Low speed", nil, {"speed"
false
)
playereffects.register_effect_type("potion_swim_lv1", "Fast Swim", nil, {"swim"},
playereffects.register_effect_type("witchcraft:potion_swim_lv1", "Fast Swim", nil, {"swim"},
function(player)
player:set_physics_override(3,nil,nil)
end,
@ -1514,7 +1604,7 @@ playereffects.register_effect_type("potion_swim_lv1", "Fast Swim", nil, {"swim"}
false
)
playereffects.register_effect_type("potion_swim_lv2", "Dive", nil, {"swim"},
playereffects.register_effect_type("witchcraft:potion_swim_lv2", "Dive", nil, {"swim"},
function(player)
player:set_physics_override(3,nil,4)
end,
@ -1524,6 +1614,7 @@ playereffects.register_effect_type("potion_swim_lv2", "Dive", nil, {"swim"},
end,
false
)
end
playereffects.register_effect_type("potion_silver", "Fire resist", nil, {"fire_resist"},
function(player)
@ -3015,7 +3106,7 @@ minetest.register_node("witchcraft:potion_magenta", {
on_use = function(item, user, pointed_thing)
local player = user:get_player_name()
local breath_change = user:set_breath(5)
playereffects.apply_effect_type("potion_speed_lv1", 10, user)
playereffects.apply_effect_type("witchcraft:potion_speed_lv1", 10, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
@ -3058,7 +3149,7 @@ minetest.register_node("witchcraft:potion_magenta_2", {
on_use = function(item, user, pointed_thing)
local player = user:get_player_name()
local breath_change = user:set_breath(5)
playereffects.apply_effect_type("potion_speed_lv2", 10, user)
playereffects.apply_effect_type("witchcraft:potion_speed_lv2", 10, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
@ -3101,7 +3192,7 @@ minetest.register_node("witchcraft:potion_cyan", {
on_use = function(item, user, pointed_thing)
local player = user:get_player_name()
local breath_change = user:set_breath(5)
playereffects.apply_effect_type("potion_antigrav_lvx", 10, user)
playereffects.apply_effect_type("witchcraft:potion_antigrav_lvx", 10, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
5, --amount
@ -3184,7 +3275,7 @@ minetest.register_node("witchcraft:potion_cyan_2", {
on_use = function(item, user, pointed_thing)
local player = user:get_player_name()
local breath_change = user:set_breath(5)
playereffects.apply_effect_type("potion_antigrav_lvx", 20, user)
playereffects.apply_effect_type("witchcraft:potion_antigrav_lvx", 20, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
5, --amount
@ -3226,7 +3317,7 @@ minetest.register_node("witchcraft:potion_green2", {
on_use = function(item, user, pointed_thing)
local player = user:get_player_name()
local breath_change = user:set_breath(5)
playereffects.apply_effect_type("potion_jump_lvx", 6, user)
playereffects.apply_effect_type("witchcraft:potion_jump_lvx", 6, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
5, --amount
@ -3315,7 +3406,7 @@ minetest.register_node("witchcraft:potion_green2_2", {
on_use = function(item, user, pointed_thing)
local player = user:get_player_name()
local breath_change = user:set_breath(5)
playereffects.apply_effect_type("potion_jump_lvx", 10, user)
playereffects.apply_effect_type("witchcraft:potion_jump_lvx", 10, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
5, --amount
@ -3357,7 +3448,7 @@ minetest.register_node("witchcraft:potion_redbrown", {
on_use = function(item, user, pointed_thing)
local player = user:get_player_name()
local breath_change = user:set_breath(5)
playereffects.apply_effect_type("potion_slow_lv1", 11, user)
playereffects.apply_effect_type("witchcraft:potion_slow_lv1", 11, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
5, --amount
@ -3399,7 +3490,7 @@ minetest.register_node("witchcraft:potion_redbrown_2", {
on_use = function(item, user, pointed_thing)
local player = user:get_player_name()
local breath_change = user:set_breath(5)
playereffects.apply_effect_type("potion_slow_lv2", 15, user)
playereffects.apply_effect_type("witchcraft:potion_slow_lv2", 15, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
5, --amount
@ -3442,7 +3533,7 @@ minetest.register_node("witchcraft:potion_blue2", {
local player = user:get_player_name()
local breath = user:get_breath()
if breath <= 10 then
playereffects.apply_effect_type("potion_swim_lv1", 15, user)
playereffects.apply_effect_type("witchcraft:potion_swim_lv1", 15, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
5, --amount
@ -3486,7 +3577,7 @@ minetest.register_node("witchcraft:potion_blue2_2", {
local player = user:get_player_name()
local breath = user:get_breath()
if breath <= 10 then
playereffects.apply_effect_type("potion_swim_lv2", 15, user)
playereffects.apply_effect_type("witchcraft:potion_swim_lv2", 15, user)
local playerpos = user:getpos();
minetest.add_particlespawner(
5, --amount

BIN
recipes.gfie
View File

Binary file not shown.

BIN
screenshot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
textures/witchcraft_potion_aqua.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 349 B

BIN
textures/witchcraft_potion_blue.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 356 B

BIN
textures/witchcraft_potion_blue2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 350 B

BIN
textures/witchcraft_potion_brown.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 382 B

After

Width:  |  Height:  |  Size: 354 B

BIN
textures/witchcraft_potion_cyan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 355 B

BIN
textures/witchcraft_potion_darkpurple.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 391 B

After

Width:  |  Height:  |  Size: 351 B

BIN
textures/witchcraft_potion_gcyan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 374 B

BIN
textures/witchcraft_potion_ggreen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 550 B

After

Width:  |  Height:  |  Size: 378 B

BIN
textures/witchcraft_potion_gold.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 365 B

BIN
textures/witchcraft_potion_gpurple.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 375 B

BIN
textures/witchcraft_potion_gred.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 377 B

BIN
textures/witchcraft_potion_green.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 349 B

BIN
textures/witchcraft_potion_green2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 391 B

After

Width:  |  Height:  |  Size: 351 B

BIN
textures/witchcraft_potion_grey.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 342 B

BIN
textures/witchcraft_potion_magenta.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 350 B

BIN
textures/witchcraft_potion_orange.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 349 B

BIN
textures/witchcraft_potion_purple.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 349 B

BIN
textures/witchcraft_potion_red.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 345 B

BIN
textures/witchcraft_potion_redbrown.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 354 B

BIN
textures/witchcraft_potion_silver.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 419 B

After

Width:  |  Height:  |  Size: 359 B

BIN
textures/witchcraft_potion_yellgrn.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 352 B

BIN
textures/witchcraft_potion_yellow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 347 B