diff --git a/coca.lua b/coca.lua index 6c040ce..0d52af3 100644 --- a/coca.lua +++ b/coca.lua @@ -59,6 +59,32 @@ minetest.register_craftitem("drug_wars:cocaine", { end }) +minetest.register_craftitem("drug_wars:crack", { + description = "Crack", + inventory_image = "drugwars_crack.png", + on_smoke_glasspipe = function(player) + local playername = player:get_player_name() + local newhunger = hbhunger.hunger[playername] + drug_wars.CRACK_HUNGER_BUFF + + if(newhunger <= 30) then + hbhunger.hunger[playername] = newhunger + else + hbhunger.hunger[playername] = 30 + end + + drug_wars.speed_buff(player, drug_wars.CRACK_SPEED_BUFF) + drug_wars.increase_addiction(playername, drug_wars.CRACK_ADDICTION) + + table.insert(drug_wars.aftereffects, { + countdown = drug_wars.CRACK_DURATION * (1.0 - drug_wars.addictions[playername]), + on_timeout = function() + drug_wars.speed_debuff(player, drug_wars.CRACK_SPEED_BUFF, drug_wars.CRACK_SPEED_BUFF) + drug_wars.drug_damage(player, drug_wars.CRACK_DAMAGE * (1 + drug_wars.addictions[playername] * 2.0)) + end + }) + end +}) + -- craft usages minetest.register_craft({ @@ -69,6 +95,11 @@ minetest.register_craft({ } }) +minetest.register_craft({ + type = "cooking", + output = "drug_wars:crack 2", + recipe = "drug_wars:cocaine", +}) -- plant nodes definition local crop_def = { diff --git a/config.lua b/config.lua index 7005fc5..004a212 100644 --- a/config.lua +++ b/config.lua @@ -1,10 +1,11 @@ +--general options drug_wars.ADDICTION_TICK = 30 drug_wars.ADDICTION_REDUCTION = 0.1 drug_wars.ADDICTION_REDUCTION_THRESHOLD = 0.05 drug_wars.ADDICTION_DAMAGE = 3 drug_wars.ADDICTION_DAMAGE_THRESHOLD = 0.35 --- weed effects +-- weed stats drug_wars.WEED_SPEED_DEBUFF = 0.2 drug_wars.WEED_SPEED_DEBUFF_THRESHOLD = 0.4 drug_wars.WEED_HUNGER_DEBUFF = 4 @@ -13,7 +14,7 @@ drug_wars.WEED_ADDICTION = 0.02 drug_wars.WEED_ADDICTION_THRESHOLD = 0.5 drug_wars.WEED_DURATION = 30 --- hashish effects +-- hashish stats drug_wars.HASHISH_SPEED_DEBUFF = 0.25 drug_wars.HASHISH_SPEED_DEBUFF_THRESHOLD = 0.4 drug_wars.HASHISH_HUNGER_DEBUFF = 6 @@ -22,9 +23,16 @@ drug_wars.HASHISH_ADDICTION = 0.05 drug_wars.HASHISH_ADDICTION_THRESHOLD = 0.5 drug_wars.HASHISH_DURATION = 30 --- cocaine effects +-- cocaine stats drug_wars.COCAINE_SPEED_BUFF = 0.6 drug_wars.COCAINE_HUNGER_BUFF = 8 drug_wars.COCAINE_ADDICTION = 0.1 drug_wars.COCAINE_DAMAGE = 4 -drug_wars.COCAINE_DURATION = 5 \ No newline at end of file +drug_wars.COCAINE_DURATION = 180 + +-- crack stats +drug_wars.CRACK_SPEED_BUFF = 0.8 +drug_wars.CRACK_HUNGER_BUFF = 8 +drug_wars.CRACK_ADDICTION = 0.125 +drug_wars.CRACK_DAMAGE = 3 +drug_wars.CRACK_DURATION = 80 \ No newline at end of file diff --git a/pipes.lua b/pipes.lua index b3770cb..cd2d17b 100644 --- a/pipes.lua +++ b/pipes.lua @@ -53,7 +53,7 @@ minetest.register_tool("drug_wars:glass_pipe", { minetest.register_craft({ output = "drug_wars:glass_pipe", recipe = { - {"group:glass", "default:flint" , ""}, - {"default:steel_ingot", "group:glass", "group:glass"} + {"default:glass", "default:flint" , ""}, + {"default:steel_ingot", "default:glass", "default:glass"} } }) \ No newline at end of file diff --git a/textures/drugwars_crack.png b/textures/drugwars_crack.png new file mode 100644 index 0000000..f8e353b Binary files /dev/null and b/textures/drugwars_crack.png differ diff --git a/textures/drugwars_glass_pipe.png b/textures/drugwars_glass_pipe.png index 9fb6eeb..441e30e 100644 Binary files a/textures/drugwars_glass_pipe.png and b/textures/drugwars_glass_pipe.png differ