From 0b4456cf7e41b208736bc6f98addeca42ab2895b Mon Sep 17 00:00:00 2001
From: Kacper Kostka <kacper.kostka08@gmail.com>
Date: Sat, 4 Feb 2023 16:17:05 +0100
Subject: [PATCH] cool craftings

---
 mods/amogus_blocks/init.lua               |  18 +++++++++++-
 mods/amogus_blocks/textures/iron_ore.png  | Bin 0 -> 338 bytes
 mods/amogus_craftings/init.lua            |  33 ++++++++++++++++++++++
 mods/amogus_general/init.lua              |  10 +++----
 mods/amogus_generator/init.lua            |  10 +++++++
 mods/amogus_items/init.lua                |   6 +++-
 mods/amogus_items/textures/iron_ingot.png | Bin 0 -> 259 bytes
 mods/player_api/init.lua                  |   2 +-
 8 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 mods/amogus_blocks/textures/iron_ore.png
 create mode 100644 mods/amogus_items/textures/iron_ingot.png

diff --git a/mods/amogus_blocks/init.lua b/mods/amogus_blocks/init.lua
index dce84cb..f39d73e 100644
--- a/mods/amogus_blocks/init.lua
+++ b/mods/amogus_blocks/init.lua
@@ -25,7 +25,15 @@ minetest.register_node("amogus_blocks:tv", {
 		"crt.png"
 	},
 	paramtype2 = "facedir",
-	drop = 'amogus_blocks:amogus_blocks', groups = {stone=3},
+	drop = { -- amogus_items:capacitor amogus_items:pcb
+ -- drop two items
+		max_items = 2,
+		items = {
+			{items = {'amogus_items:capacitor'}, rarity = 1},
+			{items = {'amogus_items:pcb'}, rarity = 1},
+		
+	},
+	}, groups = {stone=3},
 })
 
 minetest.register_node("amogus_blocks:bricks", {
@@ -376,6 +384,14 @@ minetest.register_node("amogus_blocks:sussium_ore", {
 	--sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("amogus_blocks:iron_ore", {
+	description = "Iron Ore",
+	tiles = {"iron_ore.png"},
+	groups = {stone = 3},
+	drop = 'amogus_items:iron_ingot',
+	--sounds = default.node_sound_stone_defaults(),
+})
+
 local loot = {
     "amogus_items:amogus",
     "amogus_items:sprite",
diff --git a/mods/amogus_blocks/textures/iron_ore.png b/mods/amogus_blocks/textures/iron_ore.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ad7a3eb8fb31de00757b2c9102a7741b9e8765c
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB;B!wG#}EturNNebOolu$0{0g<F?Dvie_*sy
zk$S*vvL)bx(_!uvD}Hi`3VDRsu$XL~IW>8biFMGmIBPlob?1u8|AgsYIGk=I^?`kd
z{rxS|4^I<|c<aAqWyBH(;bosqbuY;GHHSa`T*b2f++STrm8E@hF;09dl_qMrGqIk(
z9vzY*%5Z|Y%x|&6)w7d-^19hYHTfRc&hjaj=LOsC1AYvh9)(w|@{TeH-B6MhPLg7H
zk}qcbOKc*O&$j1zqE8M~FIe~Q(t;bSyc@X!Iv!fDlHe`!>YA-FWtuC~TLZnW+6Yb4
feU7J}$AsE{`de1>!PQ|4(8~;-u6{1-oD!M<!^wO;

literal 0
HcmV?d00001

diff --git a/mods/amogus_craftings/init.lua b/mods/amogus_craftings/init.lua
index 7955f5c..ced7437 100644
--- a/mods/amogus_craftings/init.lua
+++ b/mods/amogus_craftings/init.lua
@@ -252,4 +252,37 @@ minetest.register_craft({
         {"", "", ""},
     }
 })
+minetest.register_craft({
+    output = "amogus_items:dynamite",
+    recipe = {
+        {"amogus_items:capacitor", "amogus_items:capacitor", "amogus_items:capacitor"},
+        {"amogus_items:capacitor", "amogus_items:pcb", "amogus_items:capacitor"},
+        {"amogus_blocks:obsusian", "amogus_blocks:obsusian", "amogus_blocks:obsusian"},
+    }
+})
+minetest.register_craft({
+    output = "carts:cart",
+    recipe = {
+        {"amogus_items:iron_ingot", "", "amogus_items:iron_ingot"},
+        {"amogus_items:iron_ingot", "amogus_items:iron_ingot", "amogus_items:iron_ingot"},
+        {"", "amogus_items:iron_ingot", ""},
+    }
+})
 
+minetest.register_craft({
+    output = "carts:powerrail 16",
+    recipe = {
+        {"amogus_items:iron_ingot", "amogus_items:pcb", "amogus_items:iron_ingot"},
+        {"amogus_items:iron_ingot", "amogus_items:wooden_plank", "amogus_items:iron_ingot"},
+        {"amogus_items:iron_ingot", "amogus_items:wooden_plank", "amogus_items:iron_ingot"},
+    }
+})
+
+minetest.register_craft({
+    output = "carts:rail 16",
+    recipe = {
+        {"amogus_items:iron_ingot", "amogus_items:wooden_plank", "amogus_items:iron_ingot"},
+        {"amogus_items:iron_ingot", "amogus_items:wooden_plank", "amogus_items:iron_ingot"},
+        {"amogus_items:iron_ingot", "amogus_items:wooden_plank", "amogus_items:iron_ingot"},
+    }
+})
\ No newline at end of file
diff --git a/mods/amogus_general/init.lua b/mods/amogus_general/init.lua
index 3ecdda5..a700304 100644
--- a/mods/amogus_general/init.lua
+++ b/mods/amogus_general/init.lua
@@ -3,11 +3,11 @@ minetest.register_on_joinplayer(function(player)
     --player:set_sky({r=0, g=0, b=0}, "plain", {})
     
     -- play music in loop without position
-    minetest.sound_play("amogus_incomming", {
-        to_player = player:get_player_name(),
-        loop = true,
-        gain = 1
-    })
+   -- minetest.sound_play("amogus_incomming", {
+     --   to_player = player:get_player_name(),
+       -- loop = true,
+        --gain = 1
+    --})
 end)
 
 amogus_general = { }
diff --git a/mods/amogus_generator/init.lua b/mods/amogus_generator/init.lua
index b2540ae..40fe4d9 100644
--- a/mods/amogus_generator/init.lua
+++ b/mods/amogus_generator/init.lua
@@ -87,8 +87,18 @@ minetest.register_ore({
     clust_size     = 1,
     y_max          = 31000,
     y_min          = -31000,
+})minetest.register_ore({
+    ore_type       = "scatter",
+    ore            = "amogus_blocks:iron_ore",
+    wherein        = "amogus_blocks:stone",
+    clust_scarcity = 8 * 8 * 8,
+    clust_num_ores = 1,
+    clust_size     = 1,
+    y_max          = 31000,
+    y_min          = -31000,
 })
 
+
 minetest.register_decoration({
     deco_type = "simple",
     place_on = {"amogus_blocks:grass"},
diff --git a/mods/amogus_items/init.lua b/mods/amogus_items/init.lua
index d383c56..11b62ec 100644
--- a/mods/amogus_items/init.lua
+++ b/mods/amogus_items/init.lua
@@ -79,6 +79,8 @@ minetest.register_craftitem("amogus_items:amogus", {
                 5, -- max_hear_distance
                 2.0 -- pitch
             )
+            
+            itemstack:take_item()
         end
         return itemstack
     end
@@ -391,6 +393,8 @@ minetest.register_tool("amogus_items:dynamite", {
         if pointed_thing.type == "node" then
             local pos = pointed_thing.above
             minetest.add_entity(pos, "amogus_items:dynamite_entity")
+            -- remove one item from the itemstack
+            itemstack:take_item()
         end
         return itemstack
     end
@@ -418,7 +422,7 @@ minetest.register_entity("amogus_items:dynamite_entity", {
             maxexptime = 3,
             minsize = 1,
             maxsize = 2,
-            texture = "plasma_effect.png",
+            texture = "capacitor.png",
         })
         self.object:remove()
     end
diff --git a/mods/amogus_items/textures/iron_ingot.png b/mods/amogus_items/textures/iron_ingot.png
new file mode 100644
index 0000000000000000000000000000000000000000..e405bfba1b72c9540bd31fefcc9ed6fdadaad51a
GIT binary patch
literal 259
zcmV+e0sQ`nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#y-7qtR5(xFlOYa-Fc3vQ8dFyRuBqVwCD?k7gR89L8k_)<-T?#`;072f@ZA)#
z$p*rft=pQK`7iTk+60j&iOl0)0pmEjvMhu2PDOp+J4z{j26SELwrztD;=Q0d*kuPk
zxvnereMePQnCBVB7!1R3s=xH~8q+j^F$O}&(MeGhu-2Z`ZU?25avqSTDWsIgo#**S
z<||-X7I4myWf|(aeg^O=ZQG)08h9nGb=VA^{Ewi=atDkCyZ}+tJ`wfewRHdh002ov
JPDHLkV1hihYL5T_

literal 0
HcmV?d00001

diff --git a/mods/player_api/init.lua b/mods/player_api/init.lua
index 99e3135..a32ca1f 100644
--- a/mods/player_api/init.lua
+++ b/mods/player_api/init.lua
@@ -22,7 +22,7 @@ player_api.register_model("amogus_entity.obj", {
 	collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3},
 	
     visual = "mesh",
-    visual_size = {x=10, y=10, z=10},
+    visual_size = {x=15, y=15, z=15},
 
 })