Adjusted energy values/recipes after orb change

changelog.txt

@@ -20,4 +20,7 @@
         New recipe is a Philosopher's Stone in the middle, diamonds in the corners, and iron/steel ingots on the sides.
     Changed the energy values of tin, copper, and bronze in Minetest Game.
     Renamed images to reflect mod name change ("exchangeclone" instead of "ee" for Element Exchange)
-    Deleted unnecessary "config.lua"
+    Deleted unnecessary "config.lua"
+2.1
+    Fixed Exchange Orb energy value (forgot to change it after changing the recipe)
+    Changed constructor, deconstructor, and collector recipes and energy values to make them cheaper

constructor.lua

@@ -210,7 +210,7 @@ minetest.register_craft({
     output = "exchangeclone:element_constructor",
     recipe = {
         {"", "exchangeclone:exchange_orb",""},
-        {"exchangeclone:exchange_orb", recipe_ingredient, "exchangeclone:exchange_orb"},
+        {"", recipe_ingredient, ""},
         {"", "exchangeclone:exchange_orb",  ""}
     }
 })

deconstructor.lua

@@ -192,7 +192,7 @@ minetest.register_craft({
     output = "exchangeclone:element_deconstructor",
     recipe = {
         {"", "exchangeclone:exchange_orb",""},
-        {"exchangeclone:exchange_orb", recipe_ingredient, "exchangeclone:exchange_orb"},
+        {"", recipe_ingredient, ""},
         {"", "exchangeclone:exchange_orb",  ""}
     }
 })

energy.lua

@@ -1,10 +1,11 @@
 -- WARNING: Do not use aliases; they will be ignored.
 exchangeclone.mtg_energy_values = {
     ["exchangeclone"] = {
-        orb = 8452,
-        element_deconstructor = 33816,
-        element_constructor = 58392,
+        orb = 33792,
+        element_deconstructor = 67592,
+        element_constructor = 92168,
         energy_collector = 23901,
+        philosophers_stone = 9984,
     },
     ["beds"] = {
         bed_bottom = 168,
@@ -304,10 +305,11 @@ I had to change some since they weren't as "equivalent" as they were supposed to
 I also didn't type out the ones with a value of 1, since that's the default.]]
 exchangeclone.mcl_energy_values = {
     ["exchangeclone"] = {
-        element_deconstructor = 33816,
-        element_constructor = 58392,
+        element_deconstructor = 67592,
+        element_constructor = 92168,
         energy_collector = 23883,
-        orb = 8452,
+        orb = 33792,
+        philosophers_stone = 9984,
     },
     ["mcl_core"] = {
         stonebrickmossy = 9,

energy_collector.lua

@@ -49,7 +49,7 @@ local function on_timer(pos, elapsed)
     if minetest.get_natural_light(pos) == 15 then
         local dest_orb = inv:get_stack("main", 1)
         local stored = dest_orb:get_meta():get_float("stored_charge") or 0
-        stored = stored + 1
+        stored = stored + exchangeclone.collector_speed
         dest_orb:get_meta():set_float("stored_charge", stored)
         dest_orb:get_meta():set_string("description", "Exchange Orb\nCurrent Charge: "..tostring(stored))
         inv:set_stack("main", 1, dest_orb)
@@ -63,7 +63,7 @@ local function on_construct(pos)
     inv:set_size("main", 1)
     meta:set_string("formspec", get_energy_collector_formspec())
     meta:set_string("infotext", "Energy Collector")
-    on_timer(pos, 0)
+    on_timer(pos, 1)
 end
 
 local function allow_metadata_inventory_put(pos, listname, index, stack, player)
@@ -141,13 +141,13 @@ minetest.register_node("exchangeclone:energy_collector", {
     on_construct = on_construct,
     on_dig_node = on_dig_node,
     on_metadata_inventory_move = function(pos)
-        minetest.get_node_timer(pos):start(exchangeclone.collector_interval)
+        minetest.get_node_timer(pos):start(1)
     end,
     on_metadata_inventory_put = function(pos)
-        minetest.get_node_timer(pos):start(exchangeclone.collector_interval)
+        minetest.get_node_timer(pos):start(1)
     end,
     on_metadata_inventory_take = function(pos)
-        minetest.get_node_timer(pos):start(exchangeclone.collector_interval)
+        minetest.get_node_timer(pos):start(1)
     end,
     on_blast = on_blast,
     allow_metadata_inventory_put = allow_metadata_inventory_put,

init.lua

@@ -20,14 +20,14 @@ end
 local default_path = minetest.get_modpath("exchangeclone")
 
 function exchangeclone.get_item_energy(name)
-    return minetest.registered_items[name].energy_value or 1
+    return minetest.registered_items[name].energy_value
 end
 
-exchangeclone.collector_interval = minetest.settings:get("exchangeclone.collector_interval") or 5
+exchangeclone.collector_speed = minetest.settings:get("exchangeclone.energy_collector_speed") or 10
 
 dofile(default_path.."/constructor.lua")
 dofile(default_path.."/deconstructor.lua")
 dofile(default_path.."/energy_collector.lua")
-dofile(default_path.."/energy.lua")
 dofile(default_path.."/orb.lua")
-dofile(default_path.."/philosophers_stone.lua")
+dofile(default_path.."/philosophers_stone.lua")
+dofile(default_path.."/energy.lua")

orb.lua

@@ -7,7 +7,7 @@ end
 minetest.register_tool("exchangeclone:exchange_orb", {
     description = "Exchange Orb\nCurrent Charge: 0",
     inventory_image = "exchangeclone_exchange_orb.png",
-    energy_value = 8452,
+    energy_value = 33792,
     on_use = exchangeclone.read_orb_charge,
 })
 

settingtypes.txt

@@ -1,2 +1 @@
-# How fast the energy collector gathers energy from the light
-exchangeclone.collector_interval (Collector Gather Interval) int 5
+exchangeclone.energy_collector_speed (Energy Collector energy/second) int 10