From 51dd90e278bc7169a5e2ce525ffdc1e5ad4e8885 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Jul 2015 16:10:56 -0400 Subject: [PATCH 01/21] added more nodes, craft items, and crafting recipes, needs textures --- equivalent_exchange/LICENSE.txt | 202 ++++++++++++++++++++++++++++++++ equivalent_exchange/README.md | 6 + 2 files changed, 208 insertions(+) create mode 100644 equivalent_exchange/LICENSE.txt create mode 100644 equivalent_exchange/README.md diff --git a/equivalent_exchange/LICENSE.txt b/equivalent_exchange/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/equivalent_exchange/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/equivalent_exchange/README.md b/equivalent_exchange/README.md new file mode 100644 index 0000000..1bcdf1d --- /dev/null +++ b/equivalent_exchange/README.md @@ -0,0 +1,6 @@ +Equivalent Exchange for Minetest + +A semi-port of the minecraft mod Equivalent Exchange + +Usage: +Cheat yourself a energy condenser (equivalent_exchange:condenser) \ No newline at end of file From 86594d0e1884a791aa80180e660550723181cb4d Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Wed, 29 Jul 2015 16:13:21 -0400 Subject: [PATCH 02/21] Update README.md --- equivalent_exchange/README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/equivalent_exchange/README.md b/equivalent_exchange/README.md index 1bcdf1d..b57fc4e 100644 --- a/equivalent_exchange/README.md +++ b/equivalent_exchange/README.md @@ -1,6 +1,3 @@ Equivalent Exchange for Minetest -A semi-port of the minecraft mod Equivalent Exchange - -Usage: -Cheat yourself a energy condenser (equivalent_exchange:condenser) \ No newline at end of file +An eventual port of the minecraft mod Equivalent Exchange From 7d9f6fa05e730d665d0c7f677571073558f6d466 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Aug 2015 08:23:25 -0400 Subject: [PATCH 03/21] transformed into modpack --- .../equivalent_exchange/alchemical_chest.lua | 74 ++++ .../equivalent_exchange/condenser.lua | 116 +++++++ .../equivalent_exchange/depends.txt | 1 + .../equivalent_exchange/emcs.lua | 97 ++++++ .../equivalent_exchange/init.lua | 7 + .../equivalent_exchange/normal_items.lua | 63 ++++ .../philosophers_stone.lua | 21 ++ .../alchemy_bag.lua | 46 +++ .../depends.txt | 2 + .../equivalent_exchange_alchemy_bags/init.lua | 3 + .../depends.txt | 2 + .../energy_collector.lua | 326 ++++++++++++++++++ .../init.lua | 4 + .../normal_items.lua | 152 ++++++++ .../equivalent_exchange_extras/depends.txt | 3 + .../equivalent_exchange_extras/init.lua | 1 + equivalent_exchange/modpack.txt | 0 17 files changed, 918 insertions(+) create mode 100644 equivalent_exchange/equivalent_exchange/alchemical_chest.lua create mode 100644 equivalent_exchange/equivalent_exchange/condenser.lua create mode 100644 equivalent_exchange/equivalent_exchange/depends.txt create mode 100644 equivalent_exchange/equivalent_exchange/emcs.lua create mode 100644 equivalent_exchange/equivalent_exchange/init.lua create mode 100644 equivalent_exchange/equivalent_exchange/normal_items.lua create mode 100644 equivalent_exchange/equivalent_exchange/philosophers_stone.lua create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/alchemy_bag.lua create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/depends.txt create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/init.lua create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/depends.txt create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/init.lua create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua create mode 100644 equivalent_exchange/equivalent_exchange_extras/depends.txt create mode 100644 equivalent_exchange/equivalent_exchange_extras/init.lua create mode 100644 equivalent_exchange/modpack.txt diff --git a/equivalent_exchange/equivalent_exchange/alchemical_chest.lua b/equivalent_exchange/equivalent_exchange/alchemical_chest.lua new file mode 100644 index 0000000..c62bae4 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange/alchemical_chest.lua @@ -0,0 +1,74 @@ +-- chest = { +-- talisman_check = function(pos) +-- local meta = minetest.get_meta(pos) +-- local inventory = meta:get_inventory() +-- local size = inventory:get_size("container") +-- for i = 1, size do +-- local stack = inventory:get_stack("from", i) + +-- end +-- } + +-- Registering Nodes -- + +minetest.register_node("equivalent_exchange:alchemical_chest", { + description = "Alchemical Chest", + tiles = { + "equivalent_exchange_alchemical_chest_top.png", + "equivalent_exchange_alchemical_chest_bottom.png", + "equivalent_exchange_alchemical_chest_side.png", + "equivalent_exchange_alchemical_chest_side.png", + "equivalent_exchange_alchemical_chest_side.png", + "equivalent_exchange_alchemical_chest_front.png", + }, + paramtype2 = "facedir", + groups = {cracky = 2}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[13,13]".. + "label[0,0;Alchemical Chest]".. + "list[current_name;container;0,0.5;13,8;]".. + "list[current_player;main;2.5,9;8,4;]") + meta:set_string("infotext", "Alchemical Chest") + local inv = meta:get_inventory() + inv:set_size("container", 13*8) + end, + can_dig = function(pos,player) + local meta = minetest.env:get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + -- on_metadata_inventory_put = function(pos, listname, index, stack, player) + -- chest.talisman_check(pos) + -- end, + -- on_metadata_inventory_take = function(pos, listname, index, stack, player) + -- chest.talisman_check(pos) + -- end, + -- on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + -- chest.talisman_check(pos) + -- end, + emc = 8987 +}) + +-- Registering Craft Items -- + +minetest.register_craftitem("equivalent_exchange:talisman_of_repair", { + description = "Talisman of Repair", + inventory_image = "equivalent_exchange_talisman_of_repair.png", + stack_max = 1, + emc = 10000, +}) + +-- Registering Crafts -- + +minetest.register_craft({ + output = "equivalent_exchange:alchemical_chest", + recipe = { + {"equivalent_exchange:low_covalence", "equivalent_exchange:medium_covalence", "equivalent_exchange:high_covalence"}, + {"default:stone", "default:diamond", "default:stone"}, + {"default:steel_ingot", "default:chest", "default:steel_ingot"} + } +}) \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/condenser.lua b/equivalent_exchange/equivalent_exchange/condenser.lua new file mode 100644 index 0000000..7b07725 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange/condenser.lua @@ -0,0 +1,116 @@ +condenser = { + convert = function(pos) + local meta = minetest.get_meta(pos) + local inventory = meta:get_inventory() + local target = inventory:get_stack("to", 1) + local emc = meta:get_int("emc") + if target:is_empty() then + meta:set_string("formspec", condenser.get_formspec(emc, 0)) + return + end + if not inventory:room_for_item("from", target:get_name()) then return end + target = target:to_table() + local target_emc = condenser.get_emc(target.name) + if not target_emc then return end + local emc = meta:get_int("emc") + local size = inventory:get_size("from") + for i=1, size do + local stack = inventory:get_stack("from", i) + if not stack:is_empty() then + stack = stack:to_table() + local local_emc = condenser.get_emc(stack.name) + if local_emc ~= nil then + emc = emc + local_emc * stack.count + inventory:set_stack("from", i, {}) + end + --print(dump(stack)) + end + end + local timesOver = math.floor(emc / target_emc) + emc = emc - timesOver * target_emc + meta:set_int("emc", emc) + inventory:add_item("from", {name=target.name, count = timesOver}) + meta:set_string("formspec", condenser.get_formspec(emc, target_emc)) + end, + + get_emc = function(name) + return minetest.registered_items[name].emc + end, + + get_formspec = function(emc, target) + return "size[13,13]".. + "label[0,0;Energy Condenser]".. + "list[current_name;to;0,0.5;1,1;]".. + "list[current_name;from;0,1.5;13,7;]".. + "list[current_player;main;2.5,9;8,4;]".. + "image[5,0;1,1;default_furnace_fire_bg.png^[lowpart:".. + (emc/target*100)..":default_furnace_fire_fg.png]".. + "label[10.5,0.5;Current EMC: ".. emc .."\nNeeded EMC: ".. (target - emc).."]" + end, +} +-- Registering ABMs -- + +minetest.register_abm({ + nodenames = {"equivalent_exchange:condenser"}, + interval = 1.5, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + condenser.convert(pos) + end, +}) +-- Registering Nodes -- + +minetest.register_node("equivalent_exchange:condenser", { + description = "Energy Condenser", + tiles = { + "equivalent_exchange_condenser_top.png", + "equivalent_exchange_condenser_bottom.png", + "equivalent_exchange_condenser_side.png", + "equivalent_exchange_condenser_side.png", + "equivalent_exchange_condenser_side.png", + "equivalent_exchange_condenser_side.png" + }, + paramtype2 = "facedir", + groups = {cracky = 2}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", condenser.get_formspec(0, 0)) + meta:set_string("infotext", "Energy Condenser") + meta:set_string("emc_storable", "true") + local inv = meta:get_inventory() + inv:set_size("to", 1) + inv:set_size("from", 13*7) + end, + can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + if not inv:is_empty("to") then + return false + elseif not inv:is_empty("from") then + return false + end + return true + end, + on_metadata_inventory_put = function(pos, listname, index, stack, player) + condenser.convert(pos) + return stack:get_count() + end, + on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + condenser.convert(pos) + return count + end, + emc = 42,011 +}) + +--Registering Crafts-- + +minetest.register_craft({ + output = "equivalent_exchange:condenser", + recipe = { + {"default:obsidian", "default:mese", "default:obsidian"}, + {"default:mese", "equivalent_exchange:alchemical_chest", "default:mese"}, + {"default:obsidian", "default:mese", "default:obsidian"} + } +}) \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/depends.txt b/equivalent_exchange/equivalent_exchange/depends.txt new file mode 100644 index 0000000..331d858 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange/depends.txt @@ -0,0 +1 @@ +default \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua new file mode 100644 index 0000000..4a0d685 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -0,0 +1,97 @@ +local emcs = { + node = { + ["default:"] = { + stone = 2, + cobble = 1, + desert_stone = 1, + stonebrick = 1, + desert_stonebrick = 1, + dirt_with_grass = 50, + dirt_with_snow = 50, + dirt = 1, + sand=1, + desert_sand = 1, + gravel = 4, + sandstone = 4, + sandstonebrick = 4, + clay = 16, + brick = 16, + tree = 32, + jungletree = 32, + junglewood = 8, + cactus = 8, + papyrus = 32, + bookshelf = 336, + glass = 1, + fence_wood = 12, + rail = 96, + ladder = 14, + wood = 8, + torch = 9, + sign_wall = 52, + chest = 64, + chest_locked = 320, + furnace = 8, + mossycobble = 1, + mese=75978, + obsidian = 64, + } + }, + craftitem = { + ["default:"] = { + stick = 2, + paper = 96, + book = 288, + + -- Old Value: 128 + -- Precise Value: 57 + coal_lump = 55, + + -- Old Value: 8442 + -- Precise Value: 420 (including blocks) + mese_crystal = 425, + + -- Old Value: 8192 + -- Precise Value: 848 + diamond = 850, + clay_lump = 16, + + -- Old Value: 256 + -- Precise Value (of lump): 61 + steel_ingot = 90, + + -- Old Value: 85 + -- Precise Value (of lump): 146 + copper_ingot = 225, + + --Old Value: 255 + bronze_ingot = 90 + 225, + + -- Old Value: 2048 + -- Precise Value (of lump): 442 + gold_ingot = 675, + + -- Old Value: 938 + -- Precise Value: 47 + mese_crystal_fragment = 25, + clay_brick = 16, + } + } +-- block = { +-- ["default:"] = { +-- } +-- } +} + +for type, emcset in pairs(emcs) do + for prefix, subs in pairs(emcset) do + for name, emc in pairs(subs) do + local ornode = minetest.registered_items[prefix..name] + local node = {emc=emc} + for tagname, tagvalue in pairs(ornode) do + node[tagname] = tagvalue + end + minetest["register_"..type](":"..prefix..name, node) + end + end +end \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/init.lua b/equivalent_exchange/equivalent_exchange/init.lua new file mode 100644 index 0000000..1a8a2a2 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange/init.lua @@ -0,0 +1,7 @@ +dofile(minetest.get_modpath("equivalent_exchange").."/emcs.lua") +dofile(minetest.get_modpath("equivalent_exchange").."/alchemical_chest.lua") +dofile(minetest.get_modpath("equivalent_exchange").."/condenser.lua") +dofile(minetest.get_modpath("equivalent_exchange").."/philosophers_stone.lua") +dofile(minetest.get_modpath("equivalent_exchange").."/normal_items.lua") + +print("[equivalent_exchange] Mod loaded!") \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/normal_items.lua b/equivalent_exchange/equivalent_exchange/normal_items.lua new file mode 100644 index 0000000..7bfbacf --- /dev/null +++ b/equivalent_exchange/equivalent_exchange/normal_items.lua @@ -0,0 +1,63 @@ +-- Registering Craft Items -- + +minetest.register_craftitem("equivalent_exchange:low_covalence", { + description = "Low Covalence Dust", + inventory_image = "equivalent_exchange_low_covalence.png", + emc = 1, +}) + +minetest.register_craftitem("equivalent_exchange:medium_covalence", { + description = "Medium Covalence Dust", + inventory_image = "equivalent_exchange_medium_covalence.png", + emc = 8, +}) + +minetest.register_craftitem("equivalent_exchange:high_covalence", { + description = "High Covalence Dust", + inventory_image = "equivalent_exchange_high_covalence.png", + emc = 208, +}) + +-- Registering Crafts -- + +minetest.register_craft({ + type = "shapeless", + output = "equivalent_exchange:low_covalence 40", + recipe = {"default:cobble", "default:cobble", "default:cobble", + "default:cobble", "default:cobble", "default:cobble", + "default:cobble", "default:cobble", "default:coal_lump"} +}) + +minetest.register_craft({ + type = "shapeless", + output = "equivalent_exchange:medium_covalence 40", + recipe = {"default:steel_ingot", "default:bronze_ingot"} +}) + +minetest.register_craft({ + type = "shapeless", + output = "equivalent_exchange:high_covalence 40", + recipe = {"default:diamond", "default:mese_crystal"} +}) + +local materials = {"wood","stone","steel","bronze","mese","diamond"} +local covalence = {"low_covalence","low_covalence","medium_covalence","medium_covalence","high_covalence","high_covalence"} +local tools = {"pick_","shovel_","axe_","sword_","hoe_"} +local type = {"default:","default:","default:","default:","farming:"} + + +for i = 1,6 do + for j = 1,5 do + minetest["register_craft"]({ + type = "shapeless", + output = type[j]..tools[j]..materials[i], + recipe = {"equivalent_exchange:"..covalence[i], "equivalent_exchange:"..covalence[i], "equivalent_exchange:"..covalence[i], type[j]..tools[j]..materials[i]} + }) + end +end + +minetest.register_craft({ + type = "shapeless", + output = "screwdriver:screwdriver", + recipe = {"equivalent_exchange:medium_covalence", "equivalent_exchange:medium_covalence", "equivalent_exchange:medium_covalence", "screwdriver:screwdriver"} +}) \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/philosophers_stone.lua b/equivalent_exchange/equivalent_exchange/philosophers_stone.lua new file mode 100644 index 0000000..9bbfa17 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange/philosophers_stone.lua @@ -0,0 +1,21 @@ +-- Registering Craft Items -- + +minetest.register_craftitem("equivalent_exchange:philosophers_stone", { + description = "Philosopher's Stone", + inventory_image = "equivalent_exchange_philosophers_stone.png", + emc = 8892, +}) + +-- Registering Crafts -- + +minetest.register_craft({ + output = "equivalent_exchange:philosophers_stone", + recipe = { + {"default:mese", "default:desert_stone", "default:mese"}, + {"default:desert_stone", "default:diamond", "default:mese"}, + {"default:mese", "default:desert_stone", "default:mese"} + } +}) + +--Transmutation Crafts here after default EMCs are sorted out -- + diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/alchemy_bag.lua b/equivalent_exchange/equivalent_exchange_alchemy_bags/alchemy_bag.lua new file mode 100644 index 0000000..f000673 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_alchemy_bags/alchemy_bag.lua @@ -0,0 +1,46 @@ +local colors = {'grey','dark_grey','black','blue','cyan','green','dark_green','yellow','orange','brown','red','pink','magenta','violet'} + +minetest.register_craftitem("equivalent_exchange_alchemy_bags:white", { + description = "White Alchemy Bag", + inventory_image = "equivalent_exchange_alchemy_bag_white.png", + emc = 9631, +}) + +minetest.register_craft({ + output = "equivalent_exchange:alchemy_bag_white", + recipe = { + {"equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence"}, + {"wool:white", "equivalent_exchange:alchemical_chest", "wool:white"}, + {"wool:white", "wool:white", "wool:white"} + } +}) + +for i = 1,14 do + + -- Registering Craft Items -- + + minetest["register_craftitem"](":".."equivalent_exchange_alchemy_bags:"..colors[i], { + description = colors[i]:gsub("^%l", string.upper).." Alchemy Bag", + groups = {not_in_creative_inventory = 1}, + inventory_image = "equivalent_exchange_alchemy_bag_"..colors[i]..".png", + emc = 9631, + }) + + -- Registering Crafts -- + + minetest["register_craft"]({ + output = "equivalent_exchange_alchemy_bags:"..colors[i], + recipe = { + {"equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence"}, + {"wool:"..colors[i], "equivalent_exchange:alchemical_chest", "wool:"..colors[i]}, + {"wool:"..colors[i], "wool:"..colors[i], "wool:"..colors[i]} + } + }) + + minetest["register_craft"]({ + type = "shapeless", + output = "equivalent_exchange_alchemy_bags:"..colors[i], + recipe = {"equivalent_exchange_alchemy_bags:white", "dye:"..colors[i]} + }) + +end \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/depends.txt b/equivalent_exchange/equivalent_exchange_alchemy_bags/depends.txt new file mode 100644 index 0000000..e472448 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_alchemy_bags/depends.txt @@ -0,0 +1,2 @@ +default +equivalent_exchange \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/init.lua b/equivalent_exchange/equivalent_exchange_alchemy_bags/init.lua new file mode 100644 index 0000000..fad79c8 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_alchemy_bags/init.lua @@ -0,0 +1,3 @@ +dofile(minetest.get_modpath("equivalent_exchange_alchemy_bags").."/alchemy_bag.lua") + +print("[equivalent_exchange_alchemy_bags] Mod loaded!") \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/depends.txt b/equivalent_exchange/equivalent_exchange_energy_collectors/depends.txt new file mode 100644 index 0000000..e472448 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/depends.txt @@ -0,0 +1,2 @@ +default +equivalent_exchange \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua new file mode 100644 index 0000000..a12c8a1 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua @@ -0,0 +1,326 @@ +collector = { + emc_gather = function(orig_emc, mark,multiplier) + return orig_emc + (10^(mark - 1)) * multiplier + end, + emc_transfer = function(mark,pos,multiplier) + local meta = minetest.get_meta(pos) + local emc = meta:get_int("emc") + local surrounding_nodes = { + minetest.get_meta({x = pos.x + 1, y = pos.y, z = pos.z}), + minetest.get_meta({x = pos.x - 1, y = pos.y, z = pos.z}), + minetest.get_meta({x = pos.x, y = pos.y + 1, z = pos.z}), + minetest.get_meta({x = pos.x, y = pos.y - 1, z = pos.z}), + minetest.get_meta({x = pos.x, y = pos.y, z = pos.z + 1}), + minetest.get_meta({x = pos.x, y = pos.y, z = pos.z - 1}) + } + local emc_transferable_nodes = {} + local emc_transferable_nodes_length = 0 + for i = 1,6 do + if surrounding_nodes[i]:get_string("emc_storable") == "true" then + table.insert(emc_transferable_nodes,surrounding_nodes[i]) + emc_transferable_nodes_length = emc_transferable_nodes_length + 1 + end + end + local newemc = (collector.emc_gather(emc, mark, multiplier)) + local distribution = math.floor(newemc / emc_transferable_nodes_length) + for j = 1,emc_transferable_nodes_length do + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Energy Collector Mark"..mark.."]".. + "label[4,0;EMC Stored: "..(newemc - distribution).."]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_int("emc",(newemc - distribution)) + emc_transferable_nodes[j]:set_int("emc", (emc_transferable_nodes[j]:get_int("emc") + distribution)) + end + end, + check_multiplier = function(pos) + local multiplier = 1 + if minetest.get_meta({x = pos.x, y = pos.y + 1, z = pos.z}):get_int("multiplier") == 2 then + multiplier = 2 + end + return multiplier + end, +} + +-- Registering ABMs -- + +minetest.register_abm({ + nodenames = {"equivalent_exchange_energy_collectors:mk1"}, + interval = 1.0, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local meta = minetest.get_meta(pos) + local emc = meta:get_int("emc") + local multiplier = collector.check_multiplier(pos) + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Energy Collector Mark 1]".. + "label[4,0;EMC Stored: "..collector.emc_gather(emc,1,multiplier).."]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_int("emc",collector.emc_gather(emc,1,multiplier)) + collector.emc_transfer(1,pos,multiplier) + end, +}) + +minetest.register_abm({ + nodenames = {"equivalent_exchange_energy_collectors:mk2"}, + interval = 1.0, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local meta = minetest.get_meta(pos) + local emc = meta:get_int("emc") + local multiplier = collector.check_multiplier(pos) + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Energy Collector Mark 2]".. + "label[4,0;EMC Stored: "..collector.emc_gather(emc,2,multiplier).."]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_int("emc",collector.emc_gather(emc,2,multiplier)) + collector.emc_transfer(2,pos,multiplier) + end, +}) + +minetest.register_abm({ + nodenames = {"equivalent_exchange_energy_collectors:mk3"}, + interval = 1.0, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local meta = minetest.get_meta(pos) + local emc = meta:get_int("emc") + local multiplier = collector.check_multiplier(pos) + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Energy Collector Mark 3]".. + "label[4,0;EMC Stored: "..collector.emc_gather(emc,3,multiplier).."]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_int("emc",collector.emc_gather(emc,3,multiplier)) + collector.emc_transfer(3,pos,multiplier) + end, +}) + +minetest.register_abm({ + nodenames = {"equivalent_exchange+energy_collectors:antimatter_collector"}, + interval = 1.0, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local meta = minetest.get_meta(pos) + local emc = meta:get_int("emc") + local multiplier = collector.check_multiplier(pos) + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Antimatter Collector]".. + "label[4,0;EMC Stored: "..collector.emc_gather(emc,4,multiplier).."]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_int("emc",collector.emc_gather(emc,4,multiplier)) + collector.emc_transfer(4,pos,multiplier) + end, +}) + +-- Registering Nodes -- + +minetest.register_node("equivalent_exchange_energy_collectors:mk1", { + description = "Energy Collector Mark 1", + tiles = { + "equivalent_exchange_energy_collector_mk1_top.png", + "equivalent_exchange_energy_collector_mk1_bottom.png", + "equivalent_exchange_energy_collector_mk1_side.png", + "equivalent_exchange_energy_collector_mk1_side.png", + "equivalent_exchange_energy_collector_mk1_side.png", + "equivalent_exchange_energy_collector_mk1_side.png", + }, + paramtype2 = "facedir", + groups = {cracky = 2}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Energy Collector Mark 1]".. + "label[4,0;EMC Stored: 0]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_string("infotext", "Energy Collector Mark 1") + meta:set_int("emc", 0) + local inv = meta:get_inventory() + inv:set_size("container", 6) + end, + can_dig = function(pos,player) + local meta = minetest.env:get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + emc = 529605 +}) + +minetest.register_node("equivalent_exchange_energy_collectors:mk2", { + description = "Energy Collector Mark 2", + tiles = { + "equivalent_exchange_energy_collector_mk2_top.png", + "equivalent_exchange_energy_collector_mk2_bottom.png", + "equivalent_exchange_energy_collector_mk2_side.png", + "equivalent_exchange_energy_collector_mk2_side.png", + "equivalent_exchange_energy_collector_mk2_side.png", + "equivalent_exchange_energy_collector_mk2_side.png", + }, + paramtype2 = "facedir", + groups = {cracky = 2}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Energy Collector Mark 2]".. + "label[4,0;EMC Stored: 0]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_string("infotext", "Energy Collector Mark 2") + meta:set_int("emc", 0) + local inv = meta:get_inventory() + inv:set_size("container", 6) + end, + can_dig = function(pos,player) + local meta = minetest.env:get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + emc = 529605 +}) + +minetest.register_node("equivalent_exchange_energy_collectors:mk3", { + description = "Energy Collector Mark 3", + tiles = { + "equivalent_exchange_energy_collector_mk3_top.png", + "equivalent_exchange_energy_collector_mk3_bottom.png", + "equivalent_exchange_energy_collector_mk3_side.png", + "equivalent_exchange_energy_collector_mk3_side.png", + "equivalent_exchange_energy_collector_mk3_side.png", + "equivalent_exchange_energy_collector_mk3_side.png", + }, + paramtype2 = "facedir", + groups = {cracky = 2}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Energy Collector Mark 3]".. + "label[4,0;EMC Stored: 0]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_string("infotext", "Energy Collector Mark 3") + meta:set_int("emc", 0) + local inv = meta:get_inventory() + inv:set_size("container", 6) + end, + can_dig = function(pos,player) + local meta = minetest.env:get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + emc = 529605 +}) + +minetest.register_node("equivalent_exchange_energy_collectors:antimatter_collector", { + description = "Antimatter Collector", + tiles = { + "equivalent_exchange_antimatter_collector_top.png", + "equivalent_exchange_antimatter_collector_bottom.png", + "equivalent_exchange_antimatter_collector_side.png", + "equivalent_exchange_antimatter_collector_side.png", + "equivalent_exchange_antimatter_collector_side.png", + "equivalent_exchange_antimatter_collector_side.png", + }, + paramtype2 = "facedir", + groups = {cracky = 2}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[6,1.5]".. + "label[0,0;Antimatter Collector]".. + "label[4,0;EMC Stored: 0]".. + "list[current_name;container;0,0.5;6,1;]") + meta:set_string("infotext", "Antimatter Collector") + meta:set_int("emc", 0) + local inv = meta:get_inventory() + inv:set_size("container", 6) + end, + can_dig = function(pos,player) + local meta = minetest.env:get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + emc = 269554885 +}) + +minetest.register_node("equivalent_exchange_energy_collectors:interdiction_stone", { + description = "Interdiction Stone", + tiles = { + "equivalent_exchange_interdiction_stone.png", + "equivalent_exchange_interdiction_stone.png", + "equivalent_exchange_interdiction_stone.png", + "equivalent_exchange_interdiction_stone.png", + "equivalent_exchange_interdiction_stone.png", + "equivalent_exchange_interdiction_stone.png" + }, + paramtype2 = "facedir", + groups = {cracky = 1}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + light_source = 10, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_int("multiplier", 2) + end, +}) + +-- Registering Crafts -- + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:mk1", + recipe = { + {"default:mese", "default:glass", "default:mese"}, + {"default:mese", "default:diamondblock", "default:mese"}, + {"default:mese", "default:furnace", "default:mese"} + } +}) + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:mk2", + recipe = { + {"default:mese", "equivalent_exchange_energy_collectors:red_matter", "default:mese"}, + {"default:mese", "equivalent_exchange_energy_collectors:mk1", "default:mese"}, + {"default:mese", "default:mese", "default:mese"} + } +}) + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:mk3", + recipe = { + {"default:mese", "equivalent_exchange_energy_collectors:antimatter", "default:mese"}, + {"default:mese", "equivalent_exchange_energy_collectors:mk2", "default:mese"}, + {"default:mese", "default:mese", "default:mese"} + } +}) + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:interdiction_stone", + recipe = { + {"default:torch", "equivalent_exchange_energy_collectors:aeternalis_fuel", "default:torch"}, + {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange:philosophers_stone", "equivalent_exchange_energy_collectors:aeternalis_fuel"}, + {"equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence"} + }, + replacements = { + {"equivalent_exchange:philosophers_stone", "equivalent_exchange:philosophers_stone"} + } +}) + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:antimatter_collector", + recipe = { + {"equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors:condensed_antimatter"}, + {"equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors_energy_collectors:mk3", "equivalent_exchange_energy_collectors:condensed_antimatter"}, + {"equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors:condensed_antimatter"} + } +}) diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/init.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/init.lua new file mode 100644 index 0000000..8b0ac87 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/init.lua @@ -0,0 +1,4 @@ +dofile(minetest.get_modpath("equivalent_exchange_energy_collectors").."/energy_collector.lua") +dofile(minetest.get_modpath("equivalent_exchange_energy_collectors").."/normal_items.lua") + +print("[equivalent_exchange_energy_collectors] Mod loaded!") \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua new file mode 100644 index 0000000..fc76aeb --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua @@ -0,0 +1,152 @@ +-- Registering Nodes -- + +minetest.register_node("equivalent_exchange_energy_collectors:red_matter_block", { + description = "Red Matter Block", + tiles = { + "equivalent_exchange_red_matter_block.png", + "equivalent_exchange_red_matter_block.png", + "equivalent_exchange_red_matter_block.png", + "equivalent_exchange_red_matter_block.png", + "equivalent_exchange_red_matter_block.png", + "equivalent_exchange_red_matter_block.png" + }, + paramtype2 = "facedir", + groups = {cracky = 3}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + emc = 1253376 +}) + +minetest.register_node("equivalent_exchange_energy_collectors:antimatter_block", { + description = "Antimatter Block", + tiles = { + "equivalent_exchange_antimatter_block.png", + "equivalent_exchange_antimatter_block.png", + "equivalent_exchange_antimatter_block.png", + "equivalent_exchange_antimatter_block.png", + "equivalent_exchange_antimatter_block.png", + "equivalent_exchange_antimatter_block.png" + }, + paramtype2 = "facedir", + groups = {cracky = 3}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + emc = 4202496 +}) + +minetest.register_node("equivalent_exchange_energy_collectors:condensed_antimatter", { + description = "Condensed Antimatter", + tiles = { + "equivalent_exchange_condensed_antimatter.png", + "equivalent_exchange_condensed_antimatter.png", + "equivalent_exchange_condensed_antimatter.png", + "equivalent_exchange_condensed_antimatter.png", + "equivalent_exchange_condensed_antimatter.png", + "equivalent_exchange_condensed_antimatter.png" + }, + paramtype2 = "facedir", + groups = {cracky = 5}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + emc = 33628160 +}) + +-- Registering Craft Items -- + +minetest.register_craftitem("equivalent_exchange_energy_collectors:alchemical_crystal", { + description = "Alchemical Crystal", + inventory_image = "equivalent_exchange_alchemical_crystal.png", + emc = 512, +}) + +minetest.register_craftitem("equivalent_exchange_energy_collectors:mobius_fuel", { + description = "Mobius Fuel", + inventory_image = "equivalent_exchange_mobius_fuel.png", + emc = 2048, +}) + +minetest.register_craftitem("equivalent_exchange_energy_collectors:aeternalis_fuel", { + description = "Aeternalis Fuel", + inventory_image = "equivalent_exchange_aeternalis_fuel.png", + emc = 8192, +}) + +minetest.register_craftitem("equivalent_exchange_energy_collectors:red_matter", { + description = "Red Matter", + inventory_image = "equivalent_exchange_red_matter.png", + emc = 139264 +}) + +minetest.register_craftitem("equivalent_exchange_energy_collectors:antimatter", { + description = "Antimatter", + inventory_image = "equivalent_exchange_antimatter.png", + emc = 466944 +}) + +-- Registering Crafts -- + +local fuels = {"default:diamond","equivalent_exchange_energy_collectors:alchemical_crystal","equivalent_exchange_energy_collectors:mobius_fuel","equivalent_exchange_energy_collectors:aeternalis_fuel"} + +for i = 2,4 do + minetest["register_craft"]({ + type = "shapeless", + output = fuels[i], + recipe = {"equivalent_exchange:philosophers_stone", fuels[i-1], fuels[i-1], fuels[i-1],fuels[i-1]}, + replacements = { + {"equivalent_exchange:philosophers_stone", "equivalent_exchange:philosophers_stone"} + } + }) + minetest["register_craft"]({ + type = "shapeless", + output = fuels[i-1].." 4", + recipe = {"equivalent_exchange:philosophers_stone", fuels[i]}, + replacements = { + {"equivalent_exchange:philosophers_stone", "equivalent_exchange:philosophers_stone"} + } + }) +end + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:red_matter", + recipe = { + {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel"}, + {"equivalent_exchange_energy_collectors:aeternalis_fuel", "default:mese", "equivalent_exchange_energy_collectors:aeternalis_fuel"}, + {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel"} + } +}) + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:antimatter", + recipe = { + {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel"}, + {"equivalent_exchange_energy_collectors:red_matter","equivalent_exchange_energy_collectors:red_matter","equivalent_exchange_energy_collectors:red_matter"}, + {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel"} + } +}) + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:red_matter_block", + recipe = { + {"equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter"}, + {"equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter"}, + {"equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter"} + } +}) + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:antimatter_block", + recipe = { + {"equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter"}, + {"equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter"}, + {"equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter"} + } +}) + +minetest.register_craft({ + output = "equivalent_exchange_energy_collectors:condensed_antimatter", + recipe = { + {"equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:antimatter_block"}, + {"equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:antimatter_block"}, + {"equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:antimatter_block"} + } +}) \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_extras/depends.txt b/equivalent_exchange/equivalent_exchange_extras/depends.txt new file mode 100644 index 0000000..8cd1ff4 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_extras/depends.txt @@ -0,0 +1,3 @@ +default +equivalent_exchange +equivalent_exchange_energy_collectors \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_extras/init.lua b/equivalent_exchange/equivalent_exchange_extras/init.lua new file mode 100644 index 0000000..127e429 --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_extras/init.lua @@ -0,0 +1 @@ +print ("[equivalent_exchange_extras] Mod loaded!") \ No newline at end of file diff --git a/equivalent_exchange/modpack.txt b/equivalent_exchange/modpack.txt new file mode 100644 index 0000000..e69de29 From 0aa0fa78fbf40549887b727987acee41ae762024 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Aug 2015 08:42:22 -0400 Subject: [PATCH 04/21] organized --- .../equivalent_exchange/alchemical_chest.lua | 17 ++---- .../equivalent_exchange/condenser.lua | 10 ++-- .../equivalent_exchange/normal_items.lua | 18 +++--- .../philosophers_stone.lua | 6 +- .../alchemy_bag.lua | 7 ++- .../energy_collector.lua | 46 +++++++------- .../normal_items.lua | 60 ++++++++++--------- .../alchemical_items.lua | 20 +++++++ .../equivalent_exchange_extras/init.lua | 2 + 9 files changed, 106 insertions(+), 80 deletions(-) create mode 100644 equivalent_exchange/equivalent_exchange_extras/alchemical_items.lua diff --git a/equivalent_exchange/equivalent_exchange/alchemical_chest.lua b/equivalent_exchange/equivalent_exchange/alchemical_chest.lua index c62bae4..d7e683d 100644 --- a/equivalent_exchange/equivalent_exchange/alchemical_chest.lua +++ b/equivalent_exchange/equivalent_exchange/alchemical_chest.lua @@ -1,3 +1,5 @@ +local modname = "equivalent_exchange:" + -- chest = { -- talisman_check = function(pos) -- local meta = minetest.get_meta(pos) @@ -11,7 +13,7 @@ -- Registering Nodes -- -minetest.register_node("equivalent_exchange:alchemical_chest", { +minetest.register_node(modname.."alchemical_chest", { description = "Alchemical Chest", tiles = { "equivalent_exchange_alchemical_chest_top.png", @@ -53,21 +55,12 @@ minetest.register_node("equivalent_exchange:alchemical_chest", { emc = 8987 }) --- Registering Craft Items -- - -minetest.register_craftitem("equivalent_exchange:talisman_of_repair", { - description = "Talisman of Repair", - inventory_image = "equivalent_exchange_talisman_of_repair.png", - stack_max = 1, - emc = 10000, -}) - -- Registering Crafts -- minetest.register_craft({ - output = "equivalent_exchange:alchemical_chest", + output = modname.."alchemical_chest", recipe = { - {"equivalent_exchange:low_covalence", "equivalent_exchange:medium_covalence", "equivalent_exchange:high_covalence"}, + {modname.."low_covalence", modname.."medium_covalence", modname.."high_covalence"}, {"default:stone", "default:diamond", "default:stone"}, {"default:steel_ingot", "default:chest", "default:steel_ingot"} } diff --git a/equivalent_exchange/equivalent_exchange/condenser.lua b/equivalent_exchange/equivalent_exchange/condenser.lua index 7b07725..e6ad620 100644 --- a/equivalent_exchange/equivalent_exchange/condenser.lua +++ b/equivalent_exchange/equivalent_exchange/condenser.lua @@ -1,3 +1,5 @@ +local modname = "equivalent_exchange:" + condenser = { convert = function(pos) local meta = minetest.get_meta(pos) @@ -51,7 +53,7 @@ condenser = { -- Registering ABMs -- minetest.register_abm({ - nodenames = {"equivalent_exchange:condenser"}, + nodenames = {modname.."condenser"}, interval = 1.5, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) @@ -60,7 +62,7 @@ minetest.register_abm({ }) -- Registering Nodes -- -minetest.register_node("equivalent_exchange:condenser", { +minetest.register_node(modname.."condenser", { description = "Energy Condenser", tiles = { "equivalent_exchange_condenser_top.png", @@ -107,10 +109,10 @@ minetest.register_node("equivalent_exchange:condenser", { --Registering Crafts-- minetest.register_craft({ - output = "equivalent_exchange:condenser", + output = modname.."condenser", recipe = { {"default:obsidian", "default:mese", "default:obsidian"}, - {"default:mese", "equivalent_exchange:alchemical_chest", "default:mese"}, + {"default:mese", modname.."alchemical_chest", "default:mese"}, {"default:obsidian", "default:mese", "default:obsidian"} } }) \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/normal_items.lua b/equivalent_exchange/equivalent_exchange/normal_items.lua index 7bfbacf..b90ab67 100644 --- a/equivalent_exchange/equivalent_exchange/normal_items.lua +++ b/equivalent_exchange/equivalent_exchange/normal_items.lua @@ -1,18 +1,20 @@ +local modname = "equivalent_exchange:" + -- Registering Craft Items -- -minetest.register_craftitem("equivalent_exchange:low_covalence", { +minetest.register_craftitem(modname.."low_covalence", { description = "Low Covalence Dust", inventory_image = "equivalent_exchange_low_covalence.png", emc = 1, }) -minetest.register_craftitem("equivalent_exchange:medium_covalence", { +minetest.register_craftitem(modname.."medium_covalence", { description = "Medium Covalence Dust", inventory_image = "equivalent_exchange_medium_covalence.png", emc = 8, }) -minetest.register_craftitem("equivalent_exchange:high_covalence", { +minetest.register_craftitem(modname.."high_covalence", { description = "High Covalence Dust", inventory_image = "equivalent_exchange_high_covalence.png", emc = 208, @@ -22,7 +24,7 @@ minetest.register_craftitem("equivalent_exchange:high_covalence", { minetest.register_craft({ type = "shapeless", - output = "equivalent_exchange:low_covalence 40", + output = modname.."low_covalence 40", recipe = {"default:cobble", "default:cobble", "default:cobble", "default:cobble", "default:cobble", "default:cobble", "default:cobble", "default:cobble", "default:coal_lump"} @@ -30,13 +32,13 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", - output = "equivalent_exchange:medium_covalence 40", + output = modname.."medium_covalence 40", recipe = {"default:steel_ingot", "default:bronze_ingot"} }) minetest.register_craft({ type = "shapeless", - output = "equivalent_exchange:high_covalence 40", + output = modname.."high_covalence 40", recipe = {"default:diamond", "default:mese_crystal"} }) @@ -51,7 +53,7 @@ for i = 1,6 do minetest["register_craft"]({ type = "shapeless", output = type[j]..tools[j]..materials[i], - recipe = {"equivalent_exchange:"..covalence[i], "equivalent_exchange:"..covalence[i], "equivalent_exchange:"..covalence[i], type[j]..tools[j]..materials[i]} + recipe = {modname..covalence[i], modname..covalence[i], modname..covalence[i], type[j]..tools[j]..materials[i]} }) end end @@ -59,5 +61,5 @@ end minetest.register_craft({ type = "shapeless", output = "screwdriver:screwdriver", - recipe = {"equivalent_exchange:medium_covalence", "equivalent_exchange:medium_covalence", "equivalent_exchange:medium_covalence", "screwdriver:screwdriver"} + recipe = {modname.."medium_covalence", modname.."medium_covalence", modname.."medium_covalence", "screwdriver:screwdriver"} }) \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/philosophers_stone.lua b/equivalent_exchange/equivalent_exchange/philosophers_stone.lua index 9bbfa17..fba70a7 100644 --- a/equivalent_exchange/equivalent_exchange/philosophers_stone.lua +++ b/equivalent_exchange/equivalent_exchange/philosophers_stone.lua @@ -1,6 +1,8 @@ +local modname = "equivalent_exchange:" + -- Registering Craft Items -- -minetest.register_craftitem("equivalent_exchange:philosophers_stone", { +minetest.register_craftitem(modname.."philosophers_stone", { description = "Philosopher's Stone", inventory_image = "equivalent_exchange_philosophers_stone.png", emc = 8892, @@ -9,7 +11,7 @@ minetest.register_craftitem("equivalent_exchange:philosophers_stone", { -- Registering Crafts -- minetest.register_craft({ - output = "equivalent_exchange:philosophers_stone", + output = modname.."philosophers_stone", recipe = { {"default:mese", "default:desert_stone", "default:mese"}, {"default:desert_stone", "default:diamond", "default:mese"}, diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/alchemy_bag.lua b/equivalent_exchange/equivalent_exchange_alchemy_bags/alchemy_bag.lua index f000673..98fa55f 100644 --- a/equivalent_exchange/equivalent_exchange_alchemy_bags/alchemy_bag.lua +++ b/equivalent_exchange/equivalent_exchange_alchemy_bags/alchemy_bag.lua @@ -1,3 +1,4 @@ +local modname = "equivalent_exchange_alchemy_bags:" local colors = {'grey','dark_grey','black','blue','cyan','green','dark_green','yellow','orange','brown','red','pink','magenta','violet'} minetest.register_craftitem("equivalent_exchange_alchemy_bags:white", { @@ -19,7 +20,7 @@ for i = 1,14 do -- Registering Craft Items -- - minetest["register_craftitem"](":".."equivalent_exchange_alchemy_bags:"..colors[i], { + minetest["register_craftitem"](":"..modname..colors[i], { description = colors[i]:gsub("^%l", string.upper).." Alchemy Bag", groups = {not_in_creative_inventory = 1}, inventory_image = "equivalent_exchange_alchemy_bag_"..colors[i]..".png", @@ -29,7 +30,7 @@ for i = 1,14 do -- Registering Crafts -- minetest["register_craft"]({ - output = "equivalent_exchange_alchemy_bags:"..colors[i], + output = modname..colors[i], recipe = { {"equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence"}, {"wool:"..colors[i], "equivalent_exchange:alchemical_chest", "wool:"..colors[i]}, @@ -39,7 +40,7 @@ for i = 1,14 do minetest["register_craft"]({ type = "shapeless", - output = "equivalent_exchange_alchemy_bags:"..colors[i], + output = modname..colors[i], recipe = {"equivalent_exchange_alchemy_bags:white", "dye:"..colors[i]} }) diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua index a12c8a1..3720960 100644 --- a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua @@ -1,3 +1,5 @@ +local modname = "equivalent_exchange_energy_collectors:" + collector = { emc_gather = function(orig_emc, mark,multiplier) return orig_emc + (10^(mark - 1)) * multiplier @@ -45,7 +47,7 @@ collector = { -- Registering ABMs -- minetest.register_abm({ - nodenames = {"equivalent_exchange_energy_collectors:mk1"}, + nodenames = {modname.."mk1"}, interval = 1.0, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) @@ -63,7 +65,7 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"equivalent_exchange_energy_collectors:mk2"}, + nodenames = {modname.."mk2"}, interval = 1.0, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) @@ -81,7 +83,7 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"equivalent_exchange_energy_collectors:mk3"}, + nodenames = {modname.."mk3"}, interval = 1.0, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) @@ -118,7 +120,7 @@ minetest.register_abm({ -- Registering Nodes -- -minetest.register_node("equivalent_exchange_energy_collectors:mk1", { +minetest.register_node(modname.."mk1", { description = "Energy Collector Mark 1", tiles = { "equivalent_exchange_energy_collector_mk1_top.png", @@ -152,7 +154,7 @@ minetest.register_node("equivalent_exchange_energy_collectors:mk1", { emc = 529605 }) -minetest.register_node("equivalent_exchange_energy_collectors:mk2", { +minetest.register_node(modname.."mk2", { description = "Energy Collector Mark 2", tiles = { "equivalent_exchange_energy_collector_mk2_top.png", @@ -186,7 +188,7 @@ minetest.register_node("equivalent_exchange_energy_collectors:mk2", { emc = 529605 }) -minetest.register_node("equivalent_exchange_energy_collectors:mk3", { +minetest.register_node(modname.."mk3", { description = "Energy Collector Mark 3", tiles = { "equivalent_exchange_energy_collector_mk3_top.png", @@ -220,7 +222,7 @@ minetest.register_node("equivalent_exchange_energy_collectors:mk3", { emc = 529605 }) -minetest.register_node("equivalent_exchange_energy_collectors:antimatter_collector", { +minetest.register_node(modname.."antimatter_collector", { description = "Antimatter Collector", tiles = { "equivalent_exchange_antimatter_collector_top.png", @@ -254,7 +256,7 @@ minetest.register_node("equivalent_exchange_energy_collectors:antimatter_collect emc = 269554885 }) -minetest.register_node("equivalent_exchange_energy_collectors:interdiction_stone", { +minetest.register_node(modname.."interdiction_stone", { description = "Interdiction Stone", tiles = { "equivalent_exchange_interdiction_stone.png", @@ -278,7 +280,7 @@ minetest.register_node("equivalent_exchange_energy_collectors:interdiction_stone -- Registering Crafts -- minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:mk1", + output = modname.."mk1", recipe = { {"default:mese", "default:glass", "default:mese"}, {"default:mese", "default:diamondblock", "default:mese"}, @@ -287,28 +289,28 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:mk2", + output = modname.."mk2", recipe = { - {"default:mese", "equivalent_exchange_energy_collectors:red_matter", "default:mese"}, - {"default:mese", "equivalent_exchange_energy_collectors:mk1", "default:mese"}, + {"default:mese", modname.."red_matter", "default:mese"}, + {"default:mese", modname.."mk1", "default:mese"}, {"default:mese", "default:mese", "default:mese"} } }) minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:mk3", + output = modname.."mk3", recipe = { - {"default:mese", "equivalent_exchange_energy_collectors:antimatter", "default:mese"}, - {"default:mese", "equivalent_exchange_energy_collectors:mk2", "default:mese"}, + {"default:mese", modname.."antimatter", "default:mese"}, + {"default:mese", modname.."mk2", "default:mese"}, {"default:mese", "default:mese", "default:mese"} } }) minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:interdiction_stone", + output = modname.."interdiction_stone", recipe = { - {"default:torch", "equivalent_exchange_energy_collectors:aeternalis_fuel", "default:torch"}, - {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange:philosophers_stone", "equivalent_exchange_energy_collectors:aeternalis_fuel"}, + {"default:torch", modname.."aeternalis_fuel", "default:torch"}, + {modname.."aeternalis_fuel", "equivalent_exchange:philosophers_stone", modname.."aeternalis_fuel"}, {"equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence", "equivalent_exchange:high_covalence"} }, replacements = { @@ -317,10 +319,10 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:antimatter_collector", + output = modname.."antimatter_collector", recipe = { - {"equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors:condensed_antimatter"}, - {"equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors_energy_collectors:mk3", "equivalent_exchange_energy_collectors:condensed_antimatter"}, - {"equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors:condensed_antimatter", "equivalent_exchange_energy_collectors:condensed_antimatter"} + {modname.."condensed_antimatter", modname.."condensed_antimatter", modname.."condensed_antimatter"}, + {modname.."condensed_antimatter", "equivalent_exchange_energy_collectors_energy_collectors:mk3", modname.."condensed_antimatter"}, + {modname.."condensed_antimatter", modname.."condensed_antimatter", modname.."condensed_antimatter"} } }) diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua index fc76aeb..82be283 100644 --- a/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua @@ -1,6 +1,8 @@ +local modname = "equivalent_exchange_energy_collectors:" + -- Registering Nodes -- -minetest.register_node("equivalent_exchange_energy_collectors:red_matter_block", { +minetest.register_node(modname.."red_matter_block", { description = "Red Matter Block", tiles = { "equivalent_exchange_red_matter_block.png", @@ -17,7 +19,7 @@ minetest.register_node("equivalent_exchange_energy_collectors:red_matter_block", emc = 1253376 }) -minetest.register_node("equivalent_exchange_energy_collectors:antimatter_block", { +minetest.register_node(modname.."antimatter_block", { description = "Antimatter Block", tiles = { "equivalent_exchange_antimatter_block.png", @@ -34,7 +36,7 @@ minetest.register_node("equivalent_exchange_energy_collectors:antimatter_block", emc = 4202496 }) -minetest.register_node("equivalent_exchange_energy_collectors:condensed_antimatter", { +minetest.register_node(modname.."condensed_antimatter", { description = "Condensed Antimatter", tiles = { "equivalent_exchange_condensed_antimatter.png", @@ -53,31 +55,31 @@ minetest.register_node("equivalent_exchange_energy_collectors:condensed_antimatt -- Registering Craft Items -- -minetest.register_craftitem("equivalent_exchange_energy_collectors:alchemical_crystal", { +minetest.register_craftitem(modname.."alchemical_crystal", { description = "Alchemical Crystal", inventory_image = "equivalent_exchange_alchemical_crystal.png", emc = 512, }) -minetest.register_craftitem("equivalent_exchange_energy_collectors:mobius_fuel", { +minetest.register_craftitem(modname.."mobius_fuel", { description = "Mobius Fuel", inventory_image = "equivalent_exchange_mobius_fuel.png", emc = 2048, }) -minetest.register_craftitem("equivalent_exchange_energy_collectors:aeternalis_fuel", { +minetest.register_craftitem(modname.."aeternalis_fuel", { description = "Aeternalis Fuel", inventory_image = "equivalent_exchange_aeternalis_fuel.png", emc = 8192, }) -minetest.register_craftitem("equivalent_exchange_energy_collectors:red_matter", { +minetest.register_craftitem(modname.."red_matter", { description = "Red Matter", inventory_image = "equivalent_exchange_red_matter.png", emc = 139264 }) -minetest.register_craftitem("equivalent_exchange_energy_collectors:antimatter", { +minetest.register_craftitem(modname.."antimatter", { description = "Antimatter", inventory_image = "equivalent_exchange_antimatter.png", emc = 466944 @@ -85,7 +87,7 @@ minetest.register_craftitem("equivalent_exchange_energy_collectors:antimatter", -- Registering Crafts -- -local fuels = {"default:diamond","equivalent_exchange_energy_collectors:alchemical_crystal","equivalent_exchange_energy_collectors:mobius_fuel","equivalent_exchange_energy_collectors:aeternalis_fuel"} +local fuels = {"default:diamond",modname.."alchemical_crystal",modname.."mobius_fuel",modname.."aeternalis_fuel"} for i = 2,4 do minetest["register_craft"]({ @@ -107,46 +109,46 @@ for i = 2,4 do end minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:red_matter", + output = modname.."red_matter", recipe = { - {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel"}, - {"equivalent_exchange_energy_collectors:aeternalis_fuel", "default:mese", "equivalent_exchange_energy_collectors:aeternalis_fuel"}, - {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel"} + {modname.."aeternalis_fuel", modname.."aeternalis_fuel", modname.."aeternalis_fuel"}, + {modname.."aeternalis_fuel", "default:mese", modname.."aeternalis_fuel"}, + {modname.."aeternalis_fuel", modname.."aeternalis_fuel", modname.."aeternalis_fuel"} } }) minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:antimatter", + output = modname.."antimatter", recipe = { - {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel"}, - {"equivalent_exchange_energy_collectors:red_matter","equivalent_exchange_energy_collectors:red_matter","equivalent_exchange_energy_collectors:red_matter"}, - {"equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:aeternalis_fuel"} + {modname.."aeternalis_fuel", modname.."aeternalis_fuel", modname.."aeternalis_fuel"}, + {modname.."red_matter",modname.."red_matter",modname.."red_matter"}, + {modname.."aeternalis_fuel", modname.."aeternalis_fuel", modname.."aeternalis_fuel"} } }) minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:red_matter_block", + output = modname.."red_matter_block", recipe = { - {"equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter"}, - {"equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter"}, - {"equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter", "equivalent_exchange_energy_collectors:red_matter"} + {modname.."red_matter", modname.."red_matter", modname.."red_matter"}, + {modname.."red_matter", modname.."red_matter", modname.."red_matter"}, + {modname.."red_matter", modname.."red_matter", modname.."red_matter"} } }) minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:antimatter_block", + output = modname.."antimatter_block", recipe = { - {"equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter"}, - {"equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter"}, - {"equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter", "equivalent_exchange_energy_collectors:antimatter"} + {modname.."antimatter", modname.."antimatter", modname.."antimatter"}, + {modname.."antimatter", modname.."antimatter", modname.."antimatter"}, + {modname.."antimatter", modname.."antimatter", modname.."antimatter"} } }) minetest.register_craft({ - output = "equivalent_exchange_energy_collectors:condensed_antimatter", + output = modname.."condensed_antimatter", recipe = { - {"equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:antimatter_block"}, - {"equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:aeternalis_fuel", "equivalent_exchange_energy_collectors:antimatter_block"}, - {"equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:antimatter_block", "equivalent_exchange_energy_collectors:antimatter_block"} + {modname.."antimatter_block", modname.."antimatter_block", modname.."antimatter_block"}, + {modname.."antimatter_block", modname.."aeternalis_fuel", modname.."antimatter_block"}, + {modname.."antimatter_block", modname.."antimatter_block", modname.."antimatter_block"} } }) \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_extras/alchemical_items.lua b/equivalent_exchange/equivalent_exchange_extras/alchemical_items.lua new file mode 100644 index 0000000..56d8a0a --- /dev/null +++ b/equivalent_exchange/equivalent_exchange_extras/alchemical_items.lua @@ -0,0 +1,20 @@ +local modname = "equivalent_exchange_extras:" +-- Registering Craft Items -- + +minetest.register_craftitem(modname.."talisman_of_repair", { + description = "Talisman of Repair", + inventory_image = "equivalent_exchange_talisman_of_repair.png", + stack_max = 1, + emc = 10000, +}) + +-- Registering Crafts -- + +minetest.register_craft({ + output = modname.."talisman_of_repair", + recipe = { + {"equivalent_exchange:low_covalence", "equivalent_exchange:medium_covalence", "equivalent_exchange:high_covalence"}, + {"farming:string", "wool:white", "farming:string"}, + {"equivalent_exchange:high_covalence", "equivalent_exchange:medium_covalence", "equivalent_exchange:low_covalence"} + } +}) \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange_extras/init.lua b/equivalent_exchange/equivalent_exchange_extras/init.lua index 127e429..120aba3 100644 --- a/equivalent_exchange/equivalent_exchange_extras/init.lua +++ b/equivalent_exchange/equivalent_exchange_extras/init.lua @@ -1 +1,3 @@ +dofile(minetest.get_modpath("equivalent_exchange_extras").."/alchemical_items.lua") + print ("[equivalent_exchange_extras] Mod loaded!") \ No newline at end of file From 3707c6c73790f1a97e48c846700c099a2b8ea124 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Aug 2015 09:04:31 -0400 Subject: [PATCH 05/21] changed naming --- .../equivalent_exchange/alchemical_chest.lua | 12 ++-- .../equivalent_exchange/condenser.lua | 12 ++-- .../equivalent_exchange/normal_items.lua | 6 +- .../philosophers_stone.lua | 2 +- .../textures/ee_alchemical_chest_bottom.png | Bin 0 -> 274 bytes .../textures/ee_alchemical_chest_front.png | Bin 0 -> 331 bytes .../textures/ee_alchemical_chest_side.png | Bin 0 -> 278 bytes .../textures/ee_alchemical_chest_top.png | Bin 0 -> 614 bytes .../textures/ee_condenser_bottom.png | Bin 0 -> 184 bytes .../textures/ee_condenser_side.png | Bin 0 -> 387 bytes .../textures/ee_condenser_top.png | Bin 0 -> 510 bytes .../textures/ee_high_covalence.png | Bin 0 -> 305 bytes .../textures/ee_low_covalence.png | Bin 0 -> 306 bytes .../textures/ee_medium_covalence.png | Bin 0 -> 300 bytes .../textures/ee_philosophers_stone.png | Bin 0 -> 258 bytes .../alchemy_bag.lua | 4 +- .../textures/ee_alchemy_bags_black.png | Bin 0 -> 312 bytes .../textures/ee_alchemy_bags_blue.png | Bin 0 -> 335 bytes .../textures/ee_alchemy_bags_brown.png | Bin 0 -> 320 bytes .../textures/ee_alchemy_bags_cyan.png | Bin 0 -> 320 bytes .../textures/ee_alchemy_bags_dark_green.png | Bin 0 -> 317 bytes .../textures/ee_alchemy_bags_dark_grey.png | Bin 0 -> 304 bytes .../textures/ee_alchemy_bags_green.png | Bin 0 -> 317 bytes .../textures/ee_alchemy_bags_grey.png | Bin 0 -> 308 bytes .../textures/ee_alchemy_bags_magenta.png | Bin 0 -> 331 bytes .../textures/ee_alchemy_bags_orange.png | Bin 0 -> 329 bytes .../textures/ee_alchemy_bags_pink.png | Bin 0 -> 325 bytes .../textures/ee_alchemy_bags_red.png | Bin 0 -> 326 bytes .../textures/ee_alchemy_bags_violet.png | Bin 0 -> 321 bytes .../textures/ee_alchemy_bags_white.png | Bin 0 -> 314 bytes .../textures/ee_alchemy_bags_yellow.png | Bin 0 -> 320 bytes .../energy_collector.lua | 64 +++++++++--------- .../normal_items.lua | 46 ++++++------- .../ee_energy_collectors_aeternalis_fuel.png | Bin 0 -> 428 bytes ...e_energy_collectors_alchemical_crystal.png | Bin 0 -> 449 bytes .../ee_energy_collectors_antimatter.png | Bin 0 -> 240 bytes .../ee_energy_collectors_antimatter_block.png | Bin 0 -> 503 bytes ...collectors_antimatter_collector_bottom.png | Bin 0 -> 296 bytes ...y_collectors_antimatter_collector_side.png | Bin 0 -> 485 bytes ...gy_collectors_antimatter_collector_top.png | Bin 0 -> 577 bytes ...energy_collectors_condensed_antimatter.png | Bin 0 -> 654 bytes ...e_energy_collectors_interdiction_stone.png | Bin 0 -> 719 bytes .../ee_energy_collectors_mobius_fuel.png | Bin 0 -> 453 bytes .../ee_energy_collectors_red_matter.png | Bin 0 -> 227 bytes .../ee_energy_collectors_red_matter_block.png | Bin 0 -> 407 bytes .../alchemical_items.lua | 2 +- 46 files changed, 74 insertions(+), 74 deletions(-) create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_alchemical_chest_bottom.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_alchemical_chest_front.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_alchemical_chest_side.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_alchemical_chest_top.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_condenser_bottom.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_condenser_side.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_condenser_top.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_high_covalence.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_low_covalence.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_medium_covalence.png create mode 100644 equivalent_exchange/equivalent_exchange/textures/ee_philosophers_stone.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_black.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_blue.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_brown.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_cyan.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_dark_green.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_dark_grey.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_green.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_grey.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_magenta.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_orange.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_pink.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_red.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_violet.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_white.png create mode 100644 equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_yellow.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_aeternalis_fuel.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_alchemical_crystal.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_block.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_bottom.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_side.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_top.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_condensed_antimatter.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_interdiction_stone.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mobius_fuel.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_red_matter.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_red_matter_block.png diff --git a/equivalent_exchange/equivalent_exchange/alchemical_chest.lua b/equivalent_exchange/equivalent_exchange/alchemical_chest.lua index d7e683d..935bf13 100644 --- a/equivalent_exchange/equivalent_exchange/alchemical_chest.lua +++ b/equivalent_exchange/equivalent_exchange/alchemical_chest.lua @@ -16,12 +16,12 @@ local modname = "equivalent_exchange:" minetest.register_node(modname.."alchemical_chest", { description = "Alchemical Chest", tiles = { - "equivalent_exchange_alchemical_chest_top.png", - "equivalent_exchange_alchemical_chest_bottom.png", - "equivalent_exchange_alchemical_chest_side.png", - "equivalent_exchange_alchemical_chest_side.png", - "equivalent_exchange_alchemical_chest_side.png", - "equivalent_exchange_alchemical_chest_front.png", + "ee_alchemical_chest_top.png", + "ee_alchemical_chest_bottom.png", + "ee_alchemical_chest_side.png", + "ee_alchemical_chest_side.png", + "ee_alchemical_chest_side.png", + "ee_alchemical_chest_front.png", }, paramtype2 = "facedir", groups = {cracky = 2}, diff --git a/equivalent_exchange/equivalent_exchange/condenser.lua b/equivalent_exchange/equivalent_exchange/condenser.lua index e6ad620..56c4403 100644 --- a/equivalent_exchange/equivalent_exchange/condenser.lua +++ b/equivalent_exchange/equivalent_exchange/condenser.lua @@ -65,12 +65,12 @@ minetest.register_abm({ minetest.register_node(modname.."condenser", { description = "Energy Condenser", tiles = { - "equivalent_exchange_condenser_top.png", - "equivalent_exchange_condenser_bottom.png", - "equivalent_exchange_condenser_side.png", - "equivalent_exchange_condenser_side.png", - "equivalent_exchange_condenser_side.png", - "equivalent_exchange_condenser_side.png" + "ee_condenser_top.png", + "ee_condenser_bottom.png", + "ee_condenser_side.png", + "ee_condenser_side.png", + "ee_condenser_side.png", + "ee_condenser_side.png" }, paramtype2 = "facedir", groups = {cracky = 2}, diff --git a/equivalent_exchange/equivalent_exchange/normal_items.lua b/equivalent_exchange/equivalent_exchange/normal_items.lua index b90ab67..9dc12ea 100644 --- a/equivalent_exchange/equivalent_exchange/normal_items.lua +++ b/equivalent_exchange/equivalent_exchange/normal_items.lua @@ -4,19 +4,19 @@ local modname = "equivalent_exchange:" minetest.register_craftitem(modname.."low_covalence", { description = "Low Covalence Dust", - inventory_image = "equivalent_exchange_low_covalence.png", + inventory_image = "ee_low_covalence.png", emc = 1, }) minetest.register_craftitem(modname.."medium_covalence", { description = "Medium Covalence Dust", - inventory_image = "equivalent_exchange_medium_covalence.png", + inventory_image = "ee_medium_covalence.png", emc = 8, }) minetest.register_craftitem(modname.."high_covalence", { description = "High Covalence Dust", - inventory_image = "equivalent_exchange_high_covalence.png", + inventory_image = "ee_high_covalence.png", emc = 208, }) diff --git a/equivalent_exchange/equivalent_exchange/philosophers_stone.lua b/equivalent_exchange/equivalent_exchange/philosophers_stone.lua index fba70a7..8789835 100644 --- a/equivalent_exchange/equivalent_exchange/philosophers_stone.lua +++ b/equivalent_exchange/equivalent_exchange/philosophers_stone.lua @@ -4,7 +4,7 @@ local modname = "equivalent_exchange:" minetest.register_craftitem(modname.."philosophers_stone", { description = "Philosopher's Stone", - inventory_image = "equivalent_exchange_philosophers_stone.png", + inventory_image = "ee_philosophers_stone.png", emc = 8892, }) diff --git a/equivalent_exchange/equivalent_exchange/textures/ee_alchemical_chest_bottom.png b/equivalent_exchange/equivalent_exchange/textures/ee_alchemical_chest_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b76eb2cc552a1e94b46376723ab20c7a49c26b28 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*dwcd$Bo+&^f+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9Vp)6>Eak-ae8U6Bi{i9j>Ah{F8}lYq#hM7BNPq~y8sa$#UAiMGAd%u@k zJon*LiLdGT$P>WisT{dVi!c6!Oh*5s4vxUh{XE z)7O>#KD!(TvxGE9(rKWOY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$ z4irD=>Eak-ae8ggMqXw`o;}kignP6G889ze@R3E*O!&gS8A^*zahZ4uHde5=KXN|) zvnGA+Ucrmp>hl;IBpx%a*}96?<;rWz=lut6IJhV*n!hgju7|_ygeN_v#@RC_KArM* z|6f&?_kS66mL~XfZhtPyP_W-dU`FCv+YeP8t1nCwKEbnQE614|!AuM+X%^2*8gGi6 zvt)Uur{VlZXvSKP;{XE z)7O>#KD!(TgNWtiT4kV+Y-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$ z4ixY4ba4!^IK4LLG~WRQj>9cq`fYyxSO4E}x-23sf;sEao{t)9r!YO3)Vy3tY3)}3 zOJ{-@8Uo+%wP&_rXkeJJ>DR6zrQiqEHL=PLSI%hN-|=VDk*L?7)=#{&@yOLnY3p9} zbP0l+XkK#I|Rg literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange/textures/ee_alchemical_chest_top.png b/equivalent_exchange/equivalent_exchange/textures/ee_alchemical_chest_top.png new file mode 100644 index 0000000000000000000000000000000000000000..18400d050f0d2576afe33f432159ff61cc55e0aa GIT binary patch literal 614 zcmV-s0-61ZP)5{>u&`i#m(xpQu;W&FDIJ?xzIg^3JfXO11REk^%=M*f3BJ@gzM$+1MhU;+L!>c7r ze(?AWzxVt8zVG+_zL*fg=MkZ4n)c2x3_4eBzJB^fE|(*d$&k%vBd6Q_!u9n9`Fx(v zRh!Qrrp#tDVnPW2?E5kACvAS1zYs!@Oddt1EEZJ&Omj%Hxy@5c=XK!?m1nO40K+f< zD3t~PTwcD20K{T-5{Z_&6V@HaK?jgh(rA3dvdRDmApqF$e8j3;-b+&QOOhnQCfs!;~3A*H0Rr%AbU#*;hM+}G1ePAMg(IgIY$ z_I6+SAds#@%AKppzHciTS0z_Ih`z0b=hZoX638YH5u=68$_Js9e>Rqw<`By&KWOPS zD;JAJ>Ss0VN^6bc|5T_Qzs0V!a2zK9c+7YH3vsjAc>#zu3jhEB07*qoM6N<$f@H=C Ap8x;= literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange/textures/ee_condenser_bottom.png b/equivalent_exchange/equivalent_exchange/textures/ee_condenser_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9d26df983401c7ef990bf8183681bd02f783cc93 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*dj*6~&q6|<-HZvrm#5q4VH#M&W$Yo$~E=o--Nlj5G&n(GMaQE~LNYP7W z2a4-?x;TbdoK8+jPX2w~fiWR5At7PHq)AHNpEswUmzW`;!LpdGN6H|JfyE$b)?CKL W^{mckmmCGTjlt8^&t;ucLK6T;axcFC literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange/textures/ee_condenser_side.png b/equivalent_exchange/equivalent_exchange/textures/ee_condenser_side.png new file mode 100644 index 0000000000000000000000000000000000000000..bb0973363a930e1effebdf6f3304846c5e41be21 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*d4v)m7lh1%cvY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=} zJ5cv{HxhA zLz1j-A68yeR#+$bB#M>q1xOmJJe(dLfpTBeT+e$22E cKX&5>BU5vufAiEY5W{ubY@O_{0`vBkfSFXuqZuce^peBUS=JA0K_V)K*~`QLg>k4 zZpA^+1E96YnR#0PxOu_I@hl(=A4$_DS(bfYVp*(IWW@)KO%58H%)BjHi+uGI3{|O! zPQ7czcf%L%hA$RkerYM-zv2A;5Wij0q02OZlcQY#rpYI6UJ$=s5(GUv)|DNM91k}y zm?ocAJaW9sB>Mf=Dj-dp)(55&H!o~urJ{=1T)eZa1NAfa_}AP`fwEuzSh-AJW$Ch& z5khDwrM~|dYbm9cQtF2XZTHKT$rVEA+PcsA3u*(wU4;7sFaQ7m07*qoM6N<$g1IQw AHUIzs literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange/textures/ee_high_covalence.png b/equivalent_exchange/equivalent_exchange/textures/ee_high_covalence.png new file mode 100644 index 0000000000000000000000000000000000000000..b37cf621b0d7fbb5ff5e15fb6211918fbb993850 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yBr(4_*2*EAwVJ7%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dC_dHG#WBR<^xIxvt|kW=_xn5hS<({s7F6*2UngBU(YM1~3 literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange/textures/ee_low_covalence.png b/equivalent_exchange/equivalent_exchange/textures/ee_low_covalence.png new file mode 100644 index 0000000000000000000000000000000000000000..9e30339b1b59ba029c4436ecea6cd425dc69f622 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yBr&<@#_LXcA$`KW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL&I%IL*_=F~s8Z+cSn-hXMp#FIv}sIx29-`@pe7VLHJPJ3YFu zWWIGNP*v)1oBT(TTifv<>yv5k4>oSxXvpxhH0N9K_H!395Ac?qUi^nO#P?<7I);e% zBAe&j-m2>Iv#W;Z_TfYCr?WFyadvPy&puI@ngyJfl7vaXDgZAUvQ>{BH-{ByODPgVO+n!G|u(ZTD1%o>?*H4Vil k(zur`;A-Gy{#YW=z^`-Am^HcMVIRoRp00i_>zopr050WchyVZp literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange/textures/ee_philosophers_stone.png b/equivalent_exchange/equivalent_exchange/textures/ee_philosophers_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..69c0f1c189af63e40ff2b60308b102705bbd48de GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~ySyNe+P7VEOo2lEo-U3d7N?UF76=$D;z zg6*&V^6*T`{4QB2#c=u0(VbkY>*npvm1r{%S}i$U(dUMVvDaDGi(ig6i0gejy0feC zpx`R@G=^Qz{-2*@nDb9JtRa!(5Q9pCud$t_Skj`dr-#z#6!}b9#{5dUL5{iQ$&3We yp7eZan*|#*UHW7rq84~LEs6_LGdB+8Vfelw;Kjsh_H{s~F?hQAxvX{XE z)7O>#KD!*RutiS(q@6$^+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9Voue)5S5w;`GwVhI}lF9IpE(=dO5}ySMp!fBAx~%jXqsJ0#KCIeV+~!{2rqAD(;N zOFQ>7@_W_$mmUhw{|H>1R&js3wvf;nr9eZ5nB{S{(bA2om0~?9Z{0s_(EX@uHu3al z9~T8B1LGN$N0f}t^?nnsOiNqws>79K>6FcC^TgzR9bE#ldC$i(hO!#>&({6dxnQeU z((d;O^Nzf#e0$R7*jvS~_uMxox*vU*UgaG3|A@GSV%p)n#M*x#FL}E9xvX{XE z)7O>#KD!*R6w9PTq2)j!+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9VmX()5S5w;`GwV8@UcE2(;BN4tON8i?gB3ZlG4F27cI7iW!JRRS1T+~ zIma~d$=?7OGu3xTRW23Go0_@MhdWnxOQ|N`WdG+b*(&F6S?PS9@yMWZ#^asqI=3DT z4d$49{9%dU`N+mpxrJ-J&4d34AN*b^yzyrFhPf{9EZ?6j>pAKib+13f=SI-RA2YvA c_-wzC$^2SImvOTC9gt5wUHx3vIVCg!0N?wD5C8xG literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_brown.png b/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..1c53791004f093505deff194c2dc40d08f8badab GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*R0_%aC-7|nfvY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=} zJ5YR^r;B5V#p$KNhGK^lczgp~#P8mz>YcaL{fo}tw%O6LYglt-e?7Q3;mVH`?-T$3 z%x7t^=Px?BY@OPy-CM##1Wig!Z}w_(9j;FCbYZpZWMN}4h+02qt&^k9BOMpjE%GN$ z_O)ggsvO*U%+mUKn}Kl2-uBCh+ZAql&6{h=>2WZA_6pY3%PxGCJ9m6<#d#r~M3!{l zD$8T`nmg{!UzAhE|H(7p{1)}262+6+>s1Y8mA7A85gYk3ypAD+HTTfrpL#VQuX(!q KxvX{XE z)7O>#KD!*RIP*@9eKUbVvY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=} zJ5YR^r;B5V#p$KN8wC$5@YK}oJpA&~imzOHduFmH8jHs@UNU)^Gs{9$MsSj|UWw4J z=kY=Z<{$Ssd2#3D=hrIDd|4J3r(gdb`tY@di%_Ve=b}c&1=(M6$S>Y{XE z)7O>#KD!*REXNho{@Fkw+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9Voup)5S5w;`GvBL%u@>JbSKiaGY5a`2XtnkNQ`(2D4{)i=Ju_TG|)ebRz9|`OeL< z56&kqNx8eD^?Ba)Ya)VIdZRPqQ(OQ26!HvV)$C+rYglz=%MvG&-+rThsW7#cRtF4!Xzreb~8II_!u@87K>K?N5@j^!P?IrmES!~^_tDVqCa z9?ciIbGuzD`c89+&>iFVo@U3Uq`Z61@ho}DwOdoxt@);XpHnG!!+!qka*)3~UHx3v IIVCg!06U3zQUCw| literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_dark_grey.png b/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_dark_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..b98e36172f8b1aa36898e2f0c4594b4531c02266 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*R1n*6a{y?CRY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$ z4isPJ>Eak-ae8U6p%AkoM~rcp$hGfsa__3wXs(#EGsKGRVUk*z!tQrWO!f1gsLuSk zZD&-rl~Tep>*sq!zuk+S6mZZ>sFCqO>8q=ow`xkb&TCzG{XE z)7O>#KD!*RjDCg+_eP+QY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$ z4iw+)>Eak-ae8U6A>Sbb9-C;6&{vZ-3j04Ov{};sm~*Z`u=tWyt76!m2+8bbnRs^M z`=au)27CU>>9P0MeS23{86fI-eY>`K>S7-|&lL*lod*~WY>l&xZe_~-q_aY3Hhbl! zt%d8ugl=*7T|T|AhlybZ`@xS#{XE z)7O>#KD!*RxC!G{>1jYA+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9Voua)5S5w;`GvBLm_5Gju_*a8<&6KwY#AH!{NSz`rfOtOOr+P(vsLWz1CCs@Vqd} zXlcpXopUx@D|u+f-uu0F!`5Y!W^knmaq}>&4_-fOt*@j0C7lx0Z2LKCyT$E}&OKsl z+SkFrpv1(Gkk%q#=W%aZx{}lZ(LY-|mp@pnX<(ex^K7q|f|A0bk463UK>=QdsjI6E w{FA=!`IaL6*e57k_CaaSt*G6Xr*5r#%G)HGSKpxXSQF$OPgg&ebxsLQ0Ac)TbpQYW literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_magenta.png b/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..5387da1a0356ce6b1caddf900f646bd340b5626a GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*Rl33Z38ApIZvY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=} zJ5cwumPJ#8Ee9Z#(q9zCOW}WjXf*-h)eL zHUdFs#QvnuVr|?BT^lMHp9y{WkZ|N#&J3rTni+~cKbZPv&+P`OdieT$J`V`=@3T#v z@OYA&VGHZ@`8#j!d?0nvRG7yl$y8XB8zgr@B;=@O|J8=|_WKPBHWwevZTsk1bnxr< z?S)p-*;WpHoF(>)+d17#l%zlXdLF$a?MudyX=@}qeK+kWQf0Vno;Tx&*3rixUwXRw KxvX{XE z)7O>#KD!*Ryq*bP#uK2BY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$ z4iw+->Eak-ae8U6A>Sbbo;@ZD8V(&hcIe!#`5$`swda3PU-Kq*g2XO`RYIXleL9o_`7!og4*QSK8hVl8PhE{S7_VVff{-Mq~{k8Lyv+o>jIA6{DrXrc_Q?z?G!?NTj*P@=TTk}Qx{?GWl Uk literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_pink.png b/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_pink.png new file mode 100644 index 0000000000000000000000000000000000000000..212f6706126f0c21eadff387469d00f20efdccfb GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*RvQWmP+&MrY+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9Vour)5S5w;`GvBL%u@>JbO$+7yIaR^qPM#_-5C%m;bf&jezM&3s(esTdQ*Q#WtNt zJ6^tXv+RTOi+7~lFVj97n-?DHa$)=3DAUrgAK#3Jul(kx%Dv4j z-Ln_0?bL7oq0aj5pFry7>Ir^LRm*Ho9-A@g%=vJZ%Z5eSYrVq5eod7QV$A#8@mcN# O$bX)$elF{r5}E+AXmx7< literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_red.png b/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_red.png new file mode 100644 index 0000000000000000000000000000000000000000..169f94b8279dd520cf033c560b72707880799d44 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*Rh>6w=k5HhHY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$ z4iw+x>Eak-aeC=wL%zcbJg)XDHtg=YBK$*{R8zyHTeU-k;Y2E)L;;ZIm=B;P( Qbp?6Q)78&qol`;+0Myrbj{pDw literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_violet.png b/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_violet.png new file mode 100644 index 0000000000000000000000000000000000000000..796c11be5529f621f357775821105613275fbdc9 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*RqE^we?F~R7+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9Vout)5S5w;`GvBL%u@>JT~H1E}BBZ-1)DBe_72tFgs#~*3=aqqNc%%9^6pv$SJFt zZhf2apUo20-+2i$ciZWOxLzn{-hM@_m0Mq{bESg%#sdr&u2fyk5#>snn5L*T@vnk! zna-UqWzJmFa}(Ja&d4w@T()|2LB`(W+q86dJ4V$X*}~ZeLxX2r6I_1x=ALlQG`@l- zmroo1^E~*s)Hro@^#p&Xs%f^G$7W2nu~gY0vv}LJklmZEt*>EjQ_4MiOReE5$Zwvm KelF{r5}E)KRB%`T literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_white.png b/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a10aefcd5a71449d37de2ed0737fff29a8416ee0 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*Rq~H~!NAW-*+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9VouR)5S5w;`GwVhI}lF9IpE(=dO8se3Es={|a_*eg|L6=)|5wN6y|__@P!_K;QS{(~_wDA2T(VaTy zm6!w>jhkn>`?x%g$+VxBp62G2dBmmV+O0@o|L*=}4lXOU?s~q=!He^ZP2RO1>PUvuVtaeZ{qGuKIqPry^~pc+dj1cl-)eOUb2ch&0(r{Q)z4*}Q$iB} Dw;^*$ literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_yellow.png b/equivalent_exchange/equivalent_exchange_alchemy_bags/textures/ee_alchemy_bags_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..ed6d6318a6e13a67e4201ee4ca4ad4ef91bb8d1f GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD!*RJQLeB7IvVJY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN6g zQn=02#WBRre)gTe~DWM4f Dr+9S* literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua index 3720960..4bf2196 100644 --- a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua @@ -101,7 +101,7 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"equivalent_exchange+energy_collectors:antimatter_collector"}, + nodenames = {modname.."antimatter_collector"}, interval = 1.0, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) @@ -123,12 +123,12 @@ minetest.register_abm({ minetest.register_node(modname.."mk1", { description = "Energy Collector Mark 1", tiles = { - "equivalent_exchange_energy_collector_mk1_top.png", - "equivalent_exchange_energy_collector_mk1_bottom.png", - "equivalent_exchange_energy_collector_mk1_side.png", - "equivalent_exchange_energy_collector_mk1_side.png", - "equivalent_exchange_energy_collector_mk1_side.png", - "equivalent_exchange_energy_collector_mk1_side.png", + "ee_energy_collectors_energy_collector_mk1_top.png", + "ee_energy_collectors_energy_collector_mk1_bottom.png", + "ee_energy_collectors_energy_collector_mk1_side.png", + "ee_energy_collectors_energy_collector_mk1_side.png", + "ee_energy_collectors_energy_collector_mk1_side.png", + "ee_energy_collectors_energy_collector_mk1_side.png", }, paramtype2 = "facedir", groups = {cracky = 2}, @@ -157,12 +157,12 @@ minetest.register_node(modname.."mk1", { minetest.register_node(modname.."mk2", { description = "Energy Collector Mark 2", tiles = { - "equivalent_exchange_energy_collector_mk2_top.png", - "equivalent_exchange_energy_collector_mk2_bottom.png", - "equivalent_exchange_energy_collector_mk2_side.png", - "equivalent_exchange_energy_collector_mk2_side.png", - "equivalent_exchange_energy_collector_mk2_side.png", - "equivalent_exchange_energy_collector_mk2_side.png", + "ee_energy_collectors_energy_collector_mk2_top.png", + "ee_energy_collectors_energy_collector_mk2_bottom.png", + "ee_energy_collectors_energy_collector_mk2_side.png", + "ee_energy_collectors_energy_collector_mk2_side.png", + "ee_energy_collectors_energy_collector_mk2_side.png", + "ee_energy_collectors_energy_collector_mk2_side.png", }, paramtype2 = "facedir", groups = {cracky = 2}, @@ -191,12 +191,12 @@ minetest.register_node(modname.."mk2", { minetest.register_node(modname.."mk3", { description = "Energy Collector Mark 3", tiles = { - "equivalent_exchange_energy_collector_mk3_top.png", - "equivalent_exchange_energy_collector_mk3_bottom.png", - "equivalent_exchange_energy_collector_mk3_side.png", - "equivalent_exchange_energy_collector_mk3_side.png", - "equivalent_exchange_energy_collector_mk3_side.png", - "equivalent_exchange_energy_collector_mk3_side.png", + "ee_energy_collectors_energy_collector_mk3_top.png", + "ee_energy_collectors_energy_collector_mk3_bottom.png", + "ee_energy_collectors_energy_collector_mk3_side.png", + "ee_energy_collectors_energy_collector_mk3_side.png", + "ee_energy_collectors_energy_collector_mk3_side.png", + "ee_energy_collectors_energy_collector_mk3_side.png", }, paramtype2 = "facedir", groups = {cracky = 2}, @@ -225,12 +225,12 @@ minetest.register_node(modname.."mk3", { minetest.register_node(modname.."antimatter_collector", { description = "Antimatter Collector", tiles = { - "equivalent_exchange_antimatter_collector_top.png", - "equivalent_exchange_antimatter_collector_bottom.png", - "equivalent_exchange_antimatter_collector_side.png", - "equivalent_exchange_antimatter_collector_side.png", - "equivalent_exchange_antimatter_collector_side.png", - "equivalent_exchange_antimatter_collector_side.png", + "ee_energy_collectors_antimatter_collector_top.png", + "ee_energy_collectors_antimatter_collector_bottom.png", + "ee_energy_collectors_antimatter_collector_side.png", + "ee_energy_collectors_antimatter_collector_side.png", + "ee_energy_collectors_antimatter_collector_side.png", + "ee_energy_collectors_antimatter_collector_side.png", }, paramtype2 = "facedir", groups = {cracky = 2}, @@ -259,12 +259,12 @@ minetest.register_node(modname.."antimatter_collector", { minetest.register_node(modname.."interdiction_stone", { description = "Interdiction Stone", tiles = { - "equivalent_exchange_interdiction_stone.png", - "equivalent_exchange_interdiction_stone.png", - "equivalent_exchange_interdiction_stone.png", - "equivalent_exchange_interdiction_stone.png", - "equivalent_exchange_interdiction_stone.png", - "equivalent_exchange_interdiction_stone.png" + "ee_energy_collectors_interdiction_stone.png", + "ee_energy_collectors_interdiction_stone.png", + "ee_energy_collectors_interdiction_stone.png", + "ee_energy_collectors_interdiction_stone.png", + "ee_energy_collectors_interdiction_stone.png", + "ee_energy_collectors_interdiction_stone.png" }, paramtype2 = "facedir", groups = {cracky = 1}, @@ -322,7 +322,7 @@ minetest.register_craft({ output = modname.."antimatter_collector", recipe = { {modname.."condensed_antimatter", modname.."condensed_antimatter", modname.."condensed_antimatter"}, - {modname.."condensed_antimatter", "equivalent_exchange_energy_collectors_energy_collectors:mk3", modname.."condensed_antimatter"}, + {modname.."condensed_antimatter", modname.."mk3", modname.."condensed_antimatter"}, {modname.."condensed_antimatter", modname.."condensed_antimatter", modname.."condensed_antimatter"} } }) diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua index 82be283..9383398 100644 --- a/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/normal_items.lua @@ -5,12 +5,12 @@ local modname = "equivalent_exchange_energy_collectors:" minetest.register_node(modname.."red_matter_block", { description = "Red Matter Block", tiles = { - "equivalent_exchange_red_matter_block.png", - "equivalent_exchange_red_matter_block.png", - "equivalent_exchange_red_matter_block.png", - "equivalent_exchange_red_matter_block.png", - "equivalent_exchange_red_matter_block.png", - "equivalent_exchange_red_matter_block.png" + "ee_energy_collectors_red_matter_block.png", + "ee_energy_collectors_red_matter_block.png", + "ee_energy_collectors_red_matter_block.png", + "ee_energy_collectors_red_matter_block.png", + "ee_energy_collectors_red_matter_block.png", + "ee_energy_collectors_red_matter_block.png" }, paramtype2 = "facedir", groups = {cracky = 3}, @@ -22,12 +22,12 @@ minetest.register_node(modname.."red_matter_block", { minetest.register_node(modname.."antimatter_block", { description = "Antimatter Block", tiles = { - "equivalent_exchange_antimatter_block.png", - "equivalent_exchange_antimatter_block.png", - "equivalent_exchange_antimatter_block.png", - "equivalent_exchange_antimatter_block.png", - "equivalent_exchange_antimatter_block.png", - "equivalent_exchange_antimatter_block.png" + "ee_energy_collectors_antimatter_block.png", + "ee_energy_collectors_antimatter_block.png", + "ee_energy_collectors_antimatter_block.png", + "ee_energy_collectors_antimatter_block.png", + "ee_energy_collectors_antimatter_block.png", + "ee_energy_collectors_antimatter_block.png" }, paramtype2 = "facedir", groups = {cracky = 3}, @@ -39,12 +39,12 @@ minetest.register_node(modname.."antimatter_block", { minetest.register_node(modname.."condensed_antimatter", { description = "Condensed Antimatter", tiles = { - "equivalent_exchange_condensed_antimatter.png", - "equivalent_exchange_condensed_antimatter.png", - "equivalent_exchange_condensed_antimatter.png", - "equivalent_exchange_condensed_antimatter.png", - "equivalent_exchange_condensed_antimatter.png", - "equivalent_exchange_condensed_antimatter.png" + "ee_energy_collectors_condensed_antimatter.png", + "ee_energy_collectors_condensed_antimatter.png", + "ee_energy_collectors_condensed_antimatter.png", + "ee_energy_collectors_condensed_antimatter.png", + "ee_energy_collectors_condensed_antimatter.png", + "ee_energy_collectors_condensed_antimatter.png" }, paramtype2 = "facedir", groups = {cracky = 5}, @@ -57,31 +57,31 @@ minetest.register_node(modname.."condensed_antimatter", { minetest.register_craftitem(modname.."alchemical_crystal", { description = "Alchemical Crystal", - inventory_image = "equivalent_exchange_alchemical_crystal.png", + inventory_image = "ee_energy_collectors_alchemical_crystal.png", emc = 512, }) minetest.register_craftitem(modname.."mobius_fuel", { description = "Mobius Fuel", - inventory_image = "equivalent_exchange_mobius_fuel.png", + inventory_image = "ee_energy_collectors_mobius_fuel.png", emc = 2048, }) minetest.register_craftitem(modname.."aeternalis_fuel", { description = "Aeternalis Fuel", - inventory_image = "equivalent_exchange_aeternalis_fuel.png", + inventory_image = "ee_energy_collectors_aeternalis_fuel.png", emc = 8192, }) minetest.register_craftitem(modname.."red_matter", { description = "Red Matter", - inventory_image = "equivalent_exchange_red_matter.png", + inventory_image = "ee_energy_collectors_red_matter.png", emc = 139264 }) minetest.register_craftitem(modname.."antimatter", { description = "Antimatter", - inventory_image = "equivalent_exchange_antimatter.png", + inventory_image = "ee_energy_collectors_antimatter.png", emc = 466944 }) diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_aeternalis_fuel.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_aeternalis_fuel.png new file mode 100644 index 0000000000000000000000000000000000000000..8bcba70ac2ac42dfa4d0b7eac835dd4555b9955b GIT binary patch literal 428 zcmV;d0aN~oP);Mu&_u%3Kg`n4n9CCJ3$fD%7}{3 zV5OK!w-JPW2k#1r%et@@K}pU#Yn|?AcZT`@8Tj|eWj!bvy1_ZDsMNoH7V*tpV~jy- z&Gh9VO5)Ol{3Lnocn*Mg!(y#PYYl)@Z9LCI$(9=w@si|jwMnv% z`z+nwWT&8H=pxf02m&S#)_AC&0I<;6;(cTufYK2NXLLu;K%PVK>$h?2PYc@-f9GZU@MBK-;_Lzisi-@_+3 WaEQ_^Jh=D(000009@I)=!A($q>_6cYLl?M1>}J2&E{MJ;-So}jk~anq`WL|btc zp{SHFHp!p^gD~UQzpds6E$i+s_nyPyoO|Klm$YqA)^)Mm-y6opU1b~ax>#g78Zj|V zKAKJZk|f?;m#Sq+TM5d#E^bOC+-{foc+A{!m<$F0B!fXtRTV%ilPJsJ%XplxY84q! z(`i^NU^YXNBtAV4fb(c{g=9rRB$L524E9qg=8nT#qk#+@hr=X1kN#w`+k;>-i7ynw zsn_v^!<=NZ0L*NgzG-r}x5sQ(3T0gvSA_z;PzbwLLy1HXLh#&f6Od&99xZFd$hBzh z5(#mU&*S!bn5`D>V!>1h4A0|fI9y9X{z-7#=|~Ti3jSD(14ZG*ws{?oH-dK_Qclyv rQ6RvXs;%coR@9lnc=jqk;b1Rbmc5ZK90%6k zJhNiTC5J;@md7fVFsdjmS@nFy!kOt4?l`aGx)**UtgGnUVe4{sd*&H87cX32sDG(^ f^`CFXJGU~o2HTXKDSRylbO?i|tDnm{r-UW|wt7>r literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_block.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_block.png new file mode 100644 index 0000000000000000000000000000000000000000..9f0a6f94bb412bb693c331a89ca5448cdae36060 GIT binary patch literal 503 zcmVumPa4<%<2FCDl4|m$yl{20!TqxCnsIP88#&Lak(G`6#p?M zfX!xuB%ZcgUe9L^yB(5{07Oxcu>AVTX`cDKUa2Z>w;Kk06F(pJxH~>M?i23L!w%uUThL_VP=>cW`+crg%lKqs!$bF ztzD1?1jA&Qb%>iI6Cx-I%c3L_VLXHg0trz-p>a1Gu8>e^NEq#XZ~#ChiDO@Pt|Bt~ zRwY$6@I}@7`lenm7AvU~U8i29zMqw3CY5yuerw~)@raw@?ma|vY`nyzsCyTZh~RCx ztQnld% txC5%{56G9eyNDLF7Q8)(|H|NB$8U046Z4lE|HA+P002ovPDHLkV1iFp&MW`` literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_bottom.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..66cc532c011b7be3d13d5b32169809e1e5438892 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)0PTx(t<1YaI1~BAf*t zk;M!Q+`=Ht$S`Y;1W=H@#M9T6{XVLb9155hc#~xw)x%B|t6%gL6@8 zVo7R>LV0FMhJw4NZ$OG(DmzfT$J50z#NzbQ$)^PmC~&ZvOG-b;;Qkihog3g(bi(2z z^DC7*E)jAI*b6=$W^(X)8C-PkC*zdn4im;zTn0ZFlX})S*&W>UFOMPOsw+#V?361T z3|7beUXv2;xN_fK)^3~G$AcPKKZvwO?k~N6S~udV?uy;4{?E9|z8x%G@Lg!T$eRW! jhyM#tO$aOd^Y@%NTUd1JqQonpaA5Fs^>bP0l+XkK669t5 literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_side.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_side.png new file mode 100644 index 0000000000000000000000000000000000000000..4b26e902fba2b54de0fc5390f87ba13332b284d5 GIT binary patch literal 485 zcmVWFU8GbZ8()Nlj2>E@cM*00Bu!L_t(I%cYaCY63wJ zhCg!>Y_6ClxKAK#ol2V{;0u`ITAPsSNGGXMSYDSh*o0sc2zdb^1VTD%eSj+zn{6z_ zW>Tojo#sf;g=KfxnScKO-`xtJoG_{Y*4m?rCzHtrU>Ar8w^xtM=W_s_zk2|P$U(6& z#_!cyt6M3B*=h8()99;+9GvB9Hi3u~Cg9h$>G@bh^#1zA19%C}IZvq>CJ@4TZ2<;G zvy^6-FlC5y&P((r=5=1yZWzr{A`|nqcmp6ZG3#ZynVwFk(N{nt6KfCznq`@0S*Ae{ zXk_9-&aUQcpTTdA|COWGTJ5${?{G6rJd1qyotb$C)v|7%vsWS$1F&9R&vd0U%8<6{FvSnM}MZu bso(hrNinZ-=S!GN00000NkvXXu0mjfQB}hv literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_top.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_antimatter_collector_top.png new file mode 100644 index 0000000000000000000000000000000000000000..6d6d426a2d9a98b7a19d49b5a28a369f76babb87 GIT binary patch literal 577 zcmV-H0>1r;P)WFU8GbZ8()Nlj2>E@cM*00E^*L_t(I%cYaQYui8+ z$3F@oJ!k@z0!D(YiHX3_Kn9U4UNRQy$r-Z*x@0x@FDTX8rQjt?=eBh8lBGWe4~2kT zIg18E4nur}CZGoD*Flw>L+z5h<&JmX_x*nF-8}~o9uUg_VHn=4csLy91OOX9p7D5n ziTc(yT5AAKKXm|zqNps&E_`Z_>P((|TsQ!j{z~|E{vOU33av&LfV1Qc#uz*Q8=F9F zYTUV7f*i-;Y?2oq1ReUsxNd%4-`XY_eXt1tOJ#5Egq77P1kk^XElhF63W4jo?5bn> zmoY1=Q%=9ULMg@J4%}YX`0l*@XEP-XLjk1K=n5dspe<>dN}8skwHB?lG=sK01`z})j<)n*^JM;hM#b_ zljm-)YXA(gUPZkm@O|Gp+*QX6vL415JkP7VQV~nVCK-<~#+0Bz)}y)cf>xu8h&?XZ zg$V;L&y0K-Zr*YlD3YZ P00000NkvXXu0mjf8^G|_ literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_condensed_antimatter.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_condensed_antimatter.png new file mode 100644 index 0000000000000000000000000000000000000000..9134ddad0d379c9c9b7a28645b637483a2ad57df GIT binary patch literal 654 zcmV;90&)F`P)vR!KpNTu2a2i$I8s2&t_Rw5?69q7PR} zh0r2HTL?i&kwLVwqIFFe`8u_8C>?n3Y4OgKZCccMR?p_#bIv{20P!Cv08ETN0bsMa z!R@E#F*ouDSUy6C5JUuuVEot&Q^saqs0NR@c&8ftllOxea$p--ZF`=&l2>(mhWp9j4y9fPgejarfUA z+SAO8-5V$QT%Mz^v7e>-EC7R4X##GBTB^+LHvw*dv9EZR_l5iPHwIX$&r++^0H{V{@Xm|8_;QDW7icz043?@?DwW(qsY<

p@e9i2o7BO?$pCnT1COo73n?H7Pt<;<(gWFbPaB?BNLLvj*07*qoM6N<$f`8>0-2eap literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_interdiction_stone.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_interdiction_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..cc2b6d070a9542f96865a35e0fe82dbbc98fa941 GIT binary patch literal 719 zcmV;=0xfxhOD06B5i35ezM@ zT$B;CC~(Hnu!Xx8{w>a^bLW1Y79-vEzVPmz_u-u1dyb@f+LdD*6QFx>fSv7KdO9xP zU}1}eNrHq3sGvmnMEC?W)#v-KZ7$}{@MCDHCD_^C1t23fj@UR@SR_b@0dgeJ5Dy=V z1OUIc{{UbB^mLr3ud|EKTUFY`p-mjJlBQJsN~yX=R!)#L(qtsf>QXE{)pnl{+e1M0X8mZzD@58)lLfrPQZ*MKHIO*}>`@0rXGa<^Qfu7}jL z!R_^FrV2wm+gQX^4;K$F3gT~U;$v!p<;|ZwymXCyb$OY;$%FDd0OR>v)V0CWu0GyW zzi^}TGA>>#k5o^)W_wQoaJ@56N^EQ_EHOzOWgVh~gf!L1#pC1VIsmn`-Bt_da;E{< zSC{>$)q5>Eq^9xRiw>!4gL>owkjtHoD>%+N{{?g5`}6Oi$SnW>002ovPDHLkV1iWs BI*tGU literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mobius_fuel.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mobius_fuel.png new file mode 100644 index 0000000000000000000000000000000000000000..e7f9adbee54fe50f1bb6ab00ef8d72396c8dce8c GIT binary patch literal 453 zcmV;$0XqJPP)0a8gs zK~y-))snwU0&y6JAI(JX4vhFx)VZBX1hus`IYa~^;uaO?l1oHw{R8en|A1Ri;7~L) zHj1=1WrHSmoS~WCiGJI{@~pK!+xz45^71|}{CjyO6>_>RN8__<)wS0*$#|5>&~G+z z>UDxA_e^hvWu@1nXqujh19G}953dve289lTb{nVBAP7Vhg=I|xkfTGq-_2$=gq01U zu9aXoWMLm3b`_p&o2PD<`0OkRA*AaD{nK>;~S^ zK#4?9Vlm#zWt@8bGw&CIn&YtO_p@;>CsWAjx;#jynNn4PD|fsUG^CWw?R0owssV5u zZ+~HD=iv)$r(i}Iw00000NkvXXu0mjf^|ipt literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_red_matter.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_red_matter.png new file mode 100644 index 0000000000000000000000000000000000000000..b3ce6f2ddce2cb4b1b32c773b47b2a10d77448f2 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~ySyL^f6c|dK%h{8r;B5V#p&dP1p)?(xNYVy{W1Tb zVEe1TJUo*!ze^TMFIQVRc7M` ziP;+^n+zJ54mkBJ;_sJxFlF%#*5;!Pe=qz{6*_Qm;L{Gdq(Q82o(fD}Bmr RB7k-?c)I$ztaD0e0sz?+O4R@W literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_red_matter_block.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_red_matter_block.png new file mode 100644 index 0000000000000000000000000000000000000000..df5e38a151620265da97fef1a4fd3668a2f9b960 GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEF#%vYl*E*R^xpYuOkY90_+Em`>8PV7cg~Q zS;H%|**Y{pQ2CyV8GB;21Fzg7tGg9*<8Np3CA>6jZ&sXiymh%%gi3UX?_aqu&2nP5 z1zs=U3S=$(8@?U5BeVxnD@H1$u+j>*IF4xAJ+r6WI zUt6CxLw_oR+IO|0_Yb79#e9S<`dj6V-|ag%`M2|xf{4cVnL97dZk`e0`m7=BfK$b> xpR?rdJ6pHLJ$a_%)WSSx_Gf;!3#-rnPfdb;|#taD0e0stwfpiKY( literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_extras/alchemical_items.lua b/equivalent_exchange/equivalent_exchange_extras/alchemical_items.lua index 56d8a0a..ecb29ab 100644 --- a/equivalent_exchange/equivalent_exchange_extras/alchemical_items.lua +++ b/equivalent_exchange/equivalent_exchange_extras/alchemical_items.lua @@ -3,7 +3,7 @@ local modname = "equivalent_exchange_extras:" minetest.register_craftitem(modname.."talisman_of_repair", { description = "Talisman of Repair", - inventory_image = "equivalent_exchange_talisman_of_repair.png", + inventory_image = "ee_extras_talisman_of_repair.png", stack_max = 1, emc = 10000, }) From 44e60dccaf96a0413d5c1190be1eb5839044f823 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Aug 2015 10:58:55 -0400 Subject: [PATCH 06/21] added klein star --- .../energy_collector.lua | 99 ++++++++++++------ .../ee_energy_collectors_klein_star.png | Bin 0 -> 357 bytes 2 files changed, 69 insertions(+), 30 deletions(-) create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_klein_star.png diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua index 4bf2196..dc149ae 100644 --- a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua @@ -1,7 +1,7 @@ local modname = "equivalent_exchange_energy_collectors:" collector = { - emc_gather = function(orig_emc, mark,multiplier) + emc_gather = function(orig_emc, mark, multiplier) return orig_emc + (10^(mark - 1)) * multiplier end, emc_transfer = function(mark,pos,multiplier) @@ -23,14 +23,45 @@ collector = { emc_transferable_nodes_length = emc_transferable_nodes_length + 1 end end + if emc_transferable_nodes_length == 0 then + local generate_amount = math.floor(emc / 10) + local inventory = meta:get_inventory() + local size = inventory:get_size("container") + if emc >= 10 then + meta:set_int("emc", emc - 10*generate_amount) + if mark == 4 then + meta:set_string("formspec", + "size[8,7.5]".. + "label[0,0;Antimatter Collector]".. + "label[4,0;EMC Stored: "..emc - 10*generate_amount.."]".. + "list[current_name;container;0,0.5;8,7;]") + else + meta:set_string("formspec", + "size[8,7.5]".. + "label[0,0;Energy Collector Mark "..mark.."]".. + "label[4,0;EMC Stored: "..emc - 10*generate_amount.."]".. + "list[current_name;container;0,0.5;8,7;]") + end + inventory:add_item("container",modname.."klein_star "..generate_amount) + end + end local newemc = (collector.emc_gather(emc, mark, multiplier)) local distribution = math.floor(newemc / emc_transferable_nodes_length) for j = 1,emc_transferable_nodes_length do - meta:set_string("formspec", - "size[6,1.5]".. - "label[0,0;Energy Collector Mark"..mark.."]".. - "label[4,0;EMC Stored: "..(newemc - distribution).."]".. - "list[current_name;container;0,0.5;6,1;]") + print(mark) + if mark == 4 then + meta:set_string("formspec", + "size[8,7.5]".. + "label[0,0;Antimatter Collector]".. + "label[4,0;EMC Stored: "..(newemc - distribution).."]".. + "list[current_name;container;0,0.5;8,7;]") + else + meta:set_string("formspec", + "size[8,7.5]".. + "label[0,0;Energy Collector Mark "..mark.."]".. + "label[4,0;EMC Stored: "..(newemc - distribution).."]".. + "list[current_name;container;0,0.5;8,7;]") + end meta:set_int("emc",(newemc - distribution)) emc_transferable_nodes[j]:set_int("emc", (emc_transferable_nodes[j]:get_int("emc") + distribution)) end @@ -55,10 +86,10 @@ minetest.register_abm({ local emc = meta:get_int("emc") local multiplier = collector.check_multiplier(pos) meta:set_string("formspec", - "size[6,1.5]".. + "size[8,7.5]".. "label[0,0;Energy Collector Mark 1]".. "label[4,0;EMC Stored: "..collector.emc_gather(emc,1,multiplier).."]".. - "list[current_name;container;0,0.5;6,1;]") + "list[current_name;container;0,0.5;8,7;]") meta:set_int("emc",collector.emc_gather(emc,1,multiplier)) collector.emc_transfer(1,pos,multiplier) end, @@ -73,10 +104,10 @@ minetest.register_abm({ local emc = meta:get_int("emc") local multiplier = collector.check_multiplier(pos) meta:set_string("formspec", - "size[6,1.5]".. + "size[8,7.5]".. "label[0,0;Energy Collector Mark 2]".. "label[4,0;EMC Stored: "..collector.emc_gather(emc,2,multiplier).."]".. - "list[current_name;container;0,0.5;6,1;]") + "list[current_name;container;0,0.5;8,7;]") meta:set_int("emc",collector.emc_gather(emc,2,multiplier)) collector.emc_transfer(2,pos,multiplier) end, @@ -91,10 +122,10 @@ minetest.register_abm({ local emc = meta:get_int("emc") local multiplier = collector.check_multiplier(pos) meta:set_string("formspec", - "size[6,1.5]".. + "size[8,7.5]".. "label[0,0;Energy Collector Mark 3]".. "label[4,0;EMC Stored: "..collector.emc_gather(emc,3,multiplier).."]".. - "list[current_name;container;0,0.5;6,1;]") + "list[current_name;container;0,0.5;8,7;]") meta:set_int("emc",collector.emc_gather(emc,3,multiplier)) collector.emc_transfer(3,pos,multiplier) end, @@ -109,10 +140,10 @@ minetest.register_abm({ local emc = meta:get_int("emc") local multiplier = collector.check_multiplier(pos) meta:set_string("formspec", - "size[6,1.5]".. + "size[8,7.5]".. "label[0,0;Antimatter Collector]".. "label[4,0;EMC Stored: "..collector.emc_gather(emc,4,multiplier).."]".. - "list[current_name;container;0,0.5;6,1;]") + "list[current_name;container;0,0.5;8,7;]") meta:set_int("emc",collector.emc_gather(emc,4,multiplier)) collector.emc_transfer(4,pos,multiplier) end, @@ -137,19 +168,19 @@ minetest.register_node(modname.."mk1", { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", - "size[6,1.5]".. + "size[8,7.5]".. "label[0,0;Energy Collector Mark 1]".. "label[4,0;EMC Stored: 0]".. - "list[current_name;container;0,0.5;6,1;]") + "list[current_name;container;0,0.5;8,7;]") meta:set_string("infotext", "Energy Collector Mark 1") meta:set_int("emc", 0) local inv = meta:get_inventory() - inv:set_size("container", 6) + inv:set_size("container", 8*7) end, can_dig = function(pos,player) local meta = minetest.env:get_meta(pos); local inv = meta:get_inventory() - return inv:is_empty("main") + return inv:is_empty("container") end, emc = 529605 }) @@ -171,19 +202,19 @@ minetest.register_node(modname.."mk2", { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", - "size[6,1.5]".. + "size[8,7.5]".. "label[0,0;Energy Collector Mark 2]".. "label[4,0;EMC Stored: 0]".. - "list[current_name;container;0,0.5;6,1;]") + "list[current_name;container;0,0.5;8,7;]") meta:set_string("infotext", "Energy Collector Mark 2") meta:set_int("emc", 0) local inv = meta:get_inventory() - inv:set_size("container", 6) + inv:set_size("container", 8*7) end, can_dig = function(pos,player) local meta = minetest.env:get_meta(pos); local inv = meta:get_inventory() - return inv:is_empty("main") + return inv:is_empty("container") end, emc = 529605 }) @@ -205,19 +236,19 @@ minetest.register_node(modname.."mk3", { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", - "size[6,1.5]".. + "size[8,7.5]".. "label[0,0;Energy Collector Mark 3]".. "label[4,0;EMC Stored: 0]".. - "list[current_name;container;0,0.5;6,1;]") + "list[current_name;container;0,0.5;8,7;]") meta:set_string("infotext", "Energy Collector Mark 3") meta:set_int("emc", 0) local inv = meta:get_inventory() - inv:set_size("container", 6) + inv:set_size("container", 8*7) end, can_dig = function(pos,player) local meta = minetest.env:get_meta(pos); local inv = meta:get_inventory() - return inv:is_empty("main") + return inv:is_empty("container") end, emc = 529605 }) @@ -239,19 +270,19 @@ minetest.register_node(modname.."antimatter_collector", { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", - "size[6,1.5]".. + "size[8,7.5]".. "label[0,0;Antimatter Collector]".. "label[4,0;EMC Stored: 0]".. - "list[current_name;container;0,0.5;6,1;]") + "list[current_name;container;0,0.5;8,7;]") meta:set_string("infotext", "Antimatter Collector") meta:set_int("emc", 0) local inv = meta:get_inventory() - inv:set_size("container", 6) + inv:set_size("container", 8*7) end, can_dig = function(pos,player) local meta = minetest.env:get_meta(pos); local inv = meta:get_inventory() - return inv:is_empty("main") + return inv:is_empty("container") end, emc = 269554885 }) @@ -277,6 +308,14 @@ minetest.register_node(modname.."interdiction_stone", { end, }) +-- Registering Craft Items -- + +minetest.register_craftitem(modname.."klein_star", { + description = "Klein Star", + inventory_image = "ee_energy_collectors_klein_star.png", + emc = 100, +}) + -- Registering Crafts -- minetest.register_craft({ diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_klein_star.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_klein_star.png new file mode 100644 index 0000000000000000000000000000000000000000..b53f0297de3507c3c39edd818b7e20de6fadca11 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~2P2;)zwy9vy$`C1eNT=ySw;r8}RbWB_%{!k$9;OYVn zf2Z_^yl-?gw-nsWDw(!mcjVlzCx-IR>KU4%a$gn(h4ZY|{hQ^Tzxvd1v!Y{_P6ZjC z``J>(QojC}+AW~9nSr6r?0&xM9EsUo~!*}fY~%C^+S%9fpOZb^Ei>G4+J^jwLh3(gev t6r{Wrc;+{;=-UnNJ%7bN+{pj4{T}1B>khv@sz`!->*?y}vd$@?2>@u_h$a94 literal 0 HcmV?d00001 From 3f5394f1a852175cdfcca216b14938d53f9798b9 Mon Sep 17 00:00:00 2001 From: yamanq Date: Sat, 1 Aug 2015 23:19:33 -0400 Subject: [PATCH 07/21] Fixed License --- equivalent_exchange/LICENSE.txt | 189 ++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/equivalent_exchange/LICENSE.txt b/equivalent_exchange/LICENSE.txt index d645695..38c61d0 100644 --- a/equivalent_exchange/LICENSE.txt +++ b/equivalent_exchange/LICENSE.txt @@ -1,4 +1,193 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS + +0. Definitions. +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + +a) The work must carry prominent notices stating that you modified it, and giving a relevant date. +b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. +c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. +d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + +a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. +b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. +c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. +d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. +e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + +a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or +b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or +c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or +d) Limiting the use for publicity purposes of names of licensors or authors of the material; or +e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or +f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. + +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + + + +Original code is license under the Apache License Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ From 1529646e63e9a40bfa8620273bec87cabd135300 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 2 Aug 2015 09:34:59 -0400 Subject: [PATCH 08/21] added stack overflow handling --- equivalent_exchange/equivalent_exchange/condenser.lua | 7 ++++++- .../energy_collector.lua | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/condenser.lua b/equivalent_exchange/equivalent_exchange/condenser.lua index 56c4403..9e42e77 100644 --- a/equivalent_exchange/equivalent_exchange/condenser.lua +++ b/equivalent_exchange/equivalent_exchange/condenser.lua @@ -31,7 +31,12 @@ condenser = { local timesOver = math.floor(emc / target_emc) emc = emc - timesOver * target_emc meta:set_int("emc", emc) - inventory:add_item("from", {name=target.name, count = timesOver}) + for i = 1, timesOver do + inventory:add_item("from", {name = target.name, count = 99}) + end + if timesOver % 99 > 0 then + inventory:add_item("from", {name = target.name, count = timesOver % 99}) + end meta:set_string("formspec", condenser.get_formspec(emc, target_emc)) end, diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua index dc149ae..5ac8ead 100644 --- a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua @@ -25,6 +25,7 @@ collector = { end if emc_transferable_nodes_length == 0 then local generate_amount = math.floor(emc / 10) + local timesOver = math.floor(generate_amount / 99) local inventory = meta:get_inventory() local size = inventory:get_size("container") if emc >= 10 then @@ -42,7 +43,12 @@ collector = { "label[4,0;EMC Stored: "..emc - 10*generate_amount.."]".. "list[current_name;container;0,0.5;8,7;]") end - inventory:add_item("container",modname.."klein_star "..generate_amount) + for i = 1, timesOver do + inventory:add_item("container", {name = modname.."klein_star", count = 99}) + end + if timesOver % 99 > 0 then + inventory:add_item("container", {name = modname.."klein_star", count = timesOver % 99}) + end end end local newemc = (collector.emc_gather(emc, mark, multiplier)) From 6861d41e668c80323a56990dd2a681f4199b13ea Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 2 Aug 2015 10:51:08 -0400 Subject: [PATCH 09/21] Revert "Fixed License" This reverts commit d107f220ac8582d00572de844b8c5a85ca625615. --- equivalent_exchange/LICENSE.txt | 189 -------------------------------- 1 file changed, 189 deletions(-) diff --git a/equivalent_exchange/LICENSE.txt b/equivalent_exchange/LICENSE.txt index 38c61d0..d645695 100644 --- a/equivalent_exchange/LICENSE.txt +++ b/equivalent_exchange/LICENSE.txt @@ -1,193 +1,4 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -“This License” refers to version 3 of the GNU General Public License. - -“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. - -To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. - -A “covered work” means either the unmodified Program or a work based on the Program. - -To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. - -A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: - -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: - -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. - -An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. - -A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. - -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - - - -Original code is license under the Apache License Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ From 4bf97c9ce182dbb4e06ff43f4b87a8a26ede0443 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 2 Aug 2015 10:57:34 -0400 Subject: [PATCH 10/21] cleaned up energy collector, fixed last commit --- .../equivalent_exchange/condenser.lua | 12 +- .../energy_collector.lua | 275 ++++-------------- .../ee_energy_collectors_mk1_bottom.png | Bin 0 -> 306 bytes .../ee_energy_collectors_mk1_side.png | Bin 0 -> 481 bytes .../textures/ee_energy_collectors_mk1_top.png | Bin 0 -> 492 bytes .../ee_energy_collectors_mk2_bottom.png | Bin 0 -> 327 bytes .../ee_energy_collectors_mk2_side.png | Bin 0 -> 481 bytes .../textures/ee_energy_collectors_mk2_top.png | Bin 0 -> 498 bytes .../ee_energy_collectors_mk3_bottom.png | Bin 0 -> 324 bytes .../ee_energy_collectors_mk3_side.png | Bin 0 -> 513 bytes .../textures/ee_energy_collectors_mk3_top.png | Bin 0 -> 524 bytes 11 files changed, 69 insertions(+), 218 deletions(-) create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_bottom.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_side.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_top.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk2_bottom.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk2_side.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk2_top.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk3_bottom.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk3_side.png create mode 100644 equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk3_top.png diff --git a/equivalent_exchange/equivalent_exchange/condenser.lua b/equivalent_exchange/equivalent_exchange/condenser.lua index 9e42e77..02e9924 100644 --- a/equivalent_exchange/equivalent_exchange/condenser.lua +++ b/equivalent_exchange/equivalent_exchange/condenser.lua @@ -25,17 +25,17 @@ condenser = { emc = emc + local_emc * stack.count inventory:set_stack("from", i, {}) end - --print(dump(stack)) end end - local timesOver = math.floor(emc / target_emc) - emc = emc - timesOver * target_emc + local generate_amount = math.floor(emc / target_emc) + local times_over = math.floor(generate_amount / 99) + emc = emc - generate_amount * target_emc meta:set_int("emc", emc) - for i = 1, timesOver do + for i = 1, times_over do inventory:add_item("from", {name = target.name, count = 99}) end - if timesOver % 99 > 0 then - inventory:add_item("from", {name = target.name, count = timesOver % 99}) + if generate_amount % 99 > 0 then + inventory:add_item("from", {name = target.name, count = generate_amount % 99}) end meta:set_string("formspec", condenser.get_formspec(emc, target_emc)) end, diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua index 5ac8ead..30dace6 100644 --- a/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua +++ b/equivalent_exchange/equivalent_exchange_energy_collectors/energy_collector.lua @@ -25,36 +25,35 @@ collector = { end if emc_transferable_nodes_length == 0 then local generate_amount = math.floor(emc / 10) - local timesOver = math.floor(generate_amount / 99) + local times_over = math.floor(generate_amount / 99) local inventory = meta:get_inventory() local size = inventory:get_size("container") if emc >= 10 then meta:set_int("emc", emc - 10*generate_amount) if mark == 4 then meta:set_string("formspec", - "size[8,7.5]".. + "size[8,7.4]".. "label[0,0;Antimatter Collector]".. "label[4,0;EMC Stored: "..emc - 10*generate_amount.."]".. "list[current_name;container;0,0.5;8,7;]") else meta:set_string("formspec", - "size[8,7.5]".. + "size[8,7.4]".. "label[0,0;Energy Collector Mark "..mark.."]".. "label[4,0;EMC Stored: "..emc - 10*generate_amount.."]".. "list[current_name;container;0,0.5;8,7;]") end - for i = 1, timesOver do + for i = 1, times_over do inventory:add_item("container", {name = modname.."klein_star", count = 99}) end - if timesOver % 99 > 0 then - inventory:add_item("container", {name = modname.."klein_star", count = timesOver % 99}) + if generate_amount % 99 > 0 then + inventory:add_item("container", {name = modname.."klein_star", count = generate_amount % 99}) end end end local newemc = (collector.emc_gather(emc, mark, multiplier)) local distribution = math.floor(newemc / emc_transferable_nodes_length) for j = 1,emc_transferable_nodes_length do - print(mark) if mark == 4 then meta:set_string("formspec", "size[8,7.5]".. @@ -81,217 +80,69 @@ collector = { end, } +local register_name = {"mk1","mk2","mk3","antimatter_collector"} +local item_name = {"Energy Collector Mark 1","Energy Collector Mark 2","Energy Collector Mark 3", "Antimatter Collector"} + +for i = 1,4 do + -- Registering ABMs -- -minetest.register_abm({ - nodenames = {modname.."mk1"}, - interval = 1.0, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local meta = minetest.get_meta(pos) - local emc = meta:get_int("emc") - local multiplier = collector.check_multiplier(pos) - meta:set_string("formspec", - "size[8,7.5]".. - "label[0,0;Energy Collector Mark 1]".. - "label[4,0;EMC Stored: "..collector.emc_gather(emc,1,multiplier).."]".. - "list[current_name;container;0,0.5;8,7;]") - meta:set_int("emc",collector.emc_gather(emc,1,multiplier)) - collector.emc_transfer(1,pos,multiplier) - end, -}) - -minetest.register_abm({ - nodenames = {modname.."mk2"}, - interval = 1.0, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local meta = minetest.get_meta(pos) - local emc = meta:get_int("emc") - local multiplier = collector.check_multiplier(pos) - meta:set_string("formspec", - "size[8,7.5]".. - "label[0,0;Energy Collector Mark 2]".. - "label[4,0;EMC Stored: "..collector.emc_gather(emc,2,multiplier).."]".. - "list[current_name;container;0,0.5;8,7;]") - meta:set_int("emc",collector.emc_gather(emc,2,multiplier)) - collector.emc_transfer(2,pos,multiplier) - end, -}) - -minetest.register_abm({ - nodenames = {modname.."mk3"}, - interval = 1.0, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local meta = minetest.get_meta(pos) - local emc = meta:get_int("emc") - local multiplier = collector.check_multiplier(pos) - meta:set_string("formspec", - "size[8,7.5]".. - "label[0,0;Energy Collector Mark 3]".. - "label[4,0;EMC Stored: "..collector.emc_gather(emc,3,multiplier).."]".. - "list[current_name;container;0,0.5;8,7;]") - meta:set_int("emc",collector.emc_gather(emc,3,multiplier)) - collector.emc_transfer(3,pos,multiplier) - end, -}) - -minetest.register_abm({ - nodenames = {modname.."antimatter_collector"}, - interval = 1.0, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local meta = minetest.get_meta(pos) - local emc = meta:get_int("emc") - local multiplier = collector.check_multiplier(pos) - meta:set_string("formspec", - "size[8,7.5]".. - "label[0,0;Antimatter Collector]".. - "label[4,0;EMC Stored: "..collector.emc_gather(emc,4,multiplier).."]".. - "list[current_name;container;0,0.5;8,7;]") - meta:set_int("emc",collector.emc_gather(emc,4,multiplier)) - collector.emc_transfer(4,pos,multiplier) - end, -}) + minetest["register_abm"]({ + nodenames = {modname..register_name[i]}, + interval = 1.0, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + local meta = minetest.get_meta(pos) + local emc = meta:get_int("emc") + local multiplier = collector.check_multiplier(pos) + local emc_per = collector.emc_gather(emc,i,multiplier) + meta:set_string("formspec", + "size[8,7.4]".. + "label[0,0;"..item_name[i].."]".. + "label[4,0;EMC Stored: "..emc_per.."]".. + "list[current_name;container;0,0.5;8,7;]") + meta:set_int("emc", emc_per) + collector.emc_transfer(i,pos,multiplier) + end, + }) -- Registering Nodes -- -minetest.register_node(modname.."mk1", { - description = "Energy Collector Mark 1", - tiles = { - "ee_energy_collectors_energy_collector_mk1_top.png", - "ee_energy_collectors_energy_collector_mk1_bottom.png", - "ee_energy_collectors_energy_collector_mk1_side.png", - "ee_energy_collectors_energy_collector_mk1_side.png", - "ee_energy_collectors_energy_collector_mk1_side.png", - "ee_energy_collectors_energy_collector_mk1_side.png", - }, - paramtype2 = "facedir", - groups = {cracky = 2}, - is_ground_content = false, - sounds = default.node_sound_stone_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7.5]".. - "label[0,0;Energy Collector Mark 1]".. - "label[4,0;EMC Stored: 0]".. - "list[current_name;container;0,0.5;8,7;]") - meta:set_string("infotext", "Energy Collector Mark 1") - meta:set_int("emc", 0) - local inv = meta:get_inventory() - inv:set_size("container", 8*7) - end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("container") - end, - emc = 529605 -}) + minetest["register_node"](":"..modname..register_name[i], { + description = item_name[i], + tiles = { + "ee_energy_collectors_"..register_name[i].."_top.png", + "ee_energy_collectors_"..register_name[i].."_bottom.png", + "ee_energy_collectors_"..register_name[i].."_side.png", + "ee_energy_collectors_"..register_name[i].."_side.png", + "ee_energy_collectors_"..register_name[i].."_side.png", + "ee_energy_collectors_"..register_name[i].."_side.png", + }, + paramtype2 = "facedir", + groups = {cracky = 2}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", + "size[8,7.4]".. + "label[0,0;"..item_name[i].."]".. + "label[4,0;EMC Stored: 0]".. + "list[current_name;container;0,0.5;8,7;]") + meta:set_string("infotext", item_name[i]) + meta:set_int("emc", 0) + local inventory = meta:get_inventory() + inventory:set_size("container", 8*7) + end, + can_dig = function(pos,player) + local meta = minetest.env:get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("container") + end, + --emc = emc[i] + }) -minetest.register_node(modname.."mk2", { - description = "Energy Collector Mark 2", - tiles = { - "ee_energy_collectors_energy_collector_mk2_top.png", - "ee_energy_collectors_energy_collector_mk2_bottom.png", - "ee_energy_collectors_energy_collector_mk2_side.png", - "ee_energy_collectors_energy_collector_mk2_side.png", - "ee_energy_collectors_energy_collector_mk2_side.png", - "ee_energy_collectors_energy_collector_mk2_side.png", - }, - paramtype2 = "facedir", - groups = {cracky = 2}, - is_ground_content = false, - sounds = default.node_sound_stone_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7.5]".. - "label[0,0;Energy Collector Mark 2]".. - "label[4,0;EMC Stored: 0]".. - "list[current_name;container;0,0.5;8,7;]") - meta:set_string("infotext", "Energy Collector Mark 2") - meta:set_int("emc", 0) - local inv = meta:get_inventory() - inv:set_size("container", 8*7) - end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("container") - end, - emc = 529605 -}) - -minetest.register_node(modname.."mk3", { - description = "Energy Collector Mark 3", - tiles = { - "ee_energy_collectors_energy_collector_mk3_top.png", - "ee_energy_collectors_energy_collector_mk3_bottom.png", - "ee_energy_collectors_energy_collector_mk3_side.png", - "ee_energy_collectors_energy_collector_mk3_side.png", - "ee_energy_collectors_energy_collector_mk3_side.png", - "ee_energy_collectors_energy_collector_mk3_side.png", - }, - paramtype2 = "facedir", - groups = {cracky = 2}, - is_ground_content = false, - sounds = default.node_sound_stone_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7.5]".. - "label[0,0;Energy Collector Mark 3]".. - "label[4,0;EMC Stored: 0]".. - "list[current_name;container;0,0.5;8,7;]") - meta:set_string("infotext", "Energy Collector Mark 3") - meta:set_int("emc", 0) - local inv = meta:get_inventory() - inv:set_size("container", 8*7) - end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("container") - end, - emc = 529605 -}) - -minetest.register_node(modname.."antimatter_collector", { - description = "Antimatter Collector", - tiles = { - "ee_energy_collectors_antimatter_collector_top.png", - "ee_energy_collectors_antimatter_collector_bottom.png", - "ee_energy_collectors_antimatter_collector_side.png", - "ee_energy_collectors_antimatter_collector_side.png", - "ee_energy_collectors_antimatter_collector_side.png", - "ee_energy_collectors_antimatter_collector_side.png", - }, - paramtype2 = "facedir", - groups = {cracky = 2}, - is_ground_content = false, - sounds = default.node_sound_stone_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", - "size[8,7.5]".. - "label[0,0;Antimatter Collector]".. - "label[4,0;EMC Stored: 0]".. - "list[current_name;container;0,0.5;8,7;]") - meta:set_string("infotext", "Antimatter Collector") - meta:set_int("emc", 0) - local inv = meta:get_inventory() - inv:set_size("container", 8*7) - end, - can_dig = function(pos,player) - local meta = minetest.env:get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("container") - end, - emc = 269554885 -}) +end minetest.register_node(modname.."interdiction_stone", { description = "Interdiction Stone", diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_bottom.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..d608e06e5bdf288f7ccbb4d8d8b75f875ef6d815 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#KD#`R73)cRA3>myY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$ z4isPE>Eak-aeC=wTfQa-fmZu7Z5MX4Kajb1tWWu7rSv)nZ_kCcifTbKE+$H-X$5b} zzbC)@=!K{1)@qDPqCa2%q#Pf|!f^buWJBf~Mvc`~jMLs1mF2IOXRkW7s;>EKki@~@ z4>2t)OxIrB>OH!a!>081ag%S_PUeTE%@WtF+-Xwqdi@ERFO$+uH_5wQ=!!3WaC4j9 vAwHeWaeY-Dfrr19waK2i`>(WX@A*o$kDKH5!xS~RL7wq+^>bP0l+XkKy=ZQT literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_side.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_side.png new file mode 100644 index 0000000000000000000000000000000000000000..bf380373ca3fd8b932e61fa11d59cf0103ef894a GIT binary patch literal 481 zcmV<70UrK|P)TP!vFqA|X&G&EO>Yh2qw=Q(MR2 z-a&A26DPkw90V7^Kah;pEp%{hS0^DlWr!{{V1jZxlow;8l+m00=(bC^v1QoeO}bnR)~PvyOOkLt=os5C)E{pDGdt zj>usVgH=pH6d>cx4axZpiVv@;CT*%U01A_Fst;eE@9d4?u?MQw)xaX!xooO6ic^Q; z)QLgfsD-ARCk@V?)AQTFpL38*D%E>LJD0rOW&QjJK;G^W?OaOrUJ7th!fIdvu(jG~ zx=CR&rZ5?!=_XsN4G@=@(wJ1G4E#%@Qj|QCDpm4DjcSxHt#hNiH-^N3YadhQ*5~{U XI}c0el%YsI00000NkvXXu0mjfcsIs? literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_top.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk1_top.png new file mode 100644 index 0000000000000000000000000000000000000000..a9c637ec1b15359836cb99edead919e10b78f120 GIT binary patch literal 492 zcmVWFU8GbZ8()Nlj2>E@cM*00B@*L_t(I%cWDjYQj(y z{*s0eX(q|w6!Hq#be18A{bis3&dUU86u=G{zWitGy%PYyT&S>P zR^=q)iAC9JL{x5QJMB`DFKO5B(PvpmzU%j>$d|O8c8SUjWvdbK#3Jn+O#FO^*H?rc z;x*vA=&*^zhjvNQ-aFyp2J3t8g!TowDjHe^pc@W!!-2WDjaipd&qqk3045uw<-1pf zE#HO7#z>=}o&()*s$J-?3E;bujP3aKe;I{D=WmfOiOP*6-=&NSPb|{1LAA=atZtQ$ i)(jQEy~m_9J?CHZ8sp{!1Wla)000013Ogy5HtEG95T{;J^We$4}g*JyZW(=E#!( z1QTXmH~|zr@Zt4wW;PHo<6{*$YEU@i&gQ177VZg*((Oz!hMUy(#2rXuHVc1X%CJo0 zW?9Ph1*;DmFwB1Y;^9Z2MjqykRgBYfZ|phJbT+!A6HYIn%Cfc)d>>gTe~ HDWM4fI*D}L literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk2_side.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk2_side.png new file mode 100644 index 0000000000000000000000000000000000000000..98be110e3f40c9ce75c344d9f0c7b97f68c44344 GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~ySyN~;M&g*J_3bgGeaUuobz*YQ}arITm}Z`qSVBa z)D(sC%#sWRcTeAd6une-1_nk~PZ!4!i_=Rd@6S3EAabm}tA)ppYm%eWg5-OLnw$%H z_BkGNXn$}kc9Z2Z-Y0#J0ygaCzYxd~I}hc~m7o7!`~1!| zGnqL%l&lyIU;GjOVEXdo=h+$V<>Mk~V3C&~>Mgh6Ot95%frf1=e~)a4cd^KG zn7N#5lJZU?|Bu4S-V>7a&)v{h(iNC6Un2JcOEk}t&En}YYQe8o9q{Lgn-dt$+I})b zy2fy$Ci8;rQA`Che7@d`)}5MqxxXyfDOU82_{6d|>&?Ghm#$rLCRoON15aMO)cKz* zb$6T9JT%JA&e^^@nqgPkx-aJsPf}o$T`bury`t{c{?hLo`p9as8<2S(|HN!RwwJ`}F;zOIp$O3paCD?ydi^`18WE4`#jp!|3F* VS@cpc|pTdp$y^IT9=AE>>&YY8`d}S(o!zAsw4ijAL zX1&`qv$t!(pC`M{=ClZR6mjm{Y|G)PB(E;80M0R_(%Z3wkEv44(>-8Ti5 zx8H8~2XB%2!*?lcZjg85AD9*u}Owq~>Da#fXy{fcTC&YK^t;PvG(RP6jy1(elIJ1C|&(_U}u#X0s@ zw@tjU`H9tw(|5}>@5|?Vf6v=J<$Zn3 zVGc33oS$AZJ+>-H{^8HRs+LdZ$p10qd~oM`=xJ|FeWr%YJk=Ui?*+hdmQBTwYZMyt6NOgx`0KoAkTQZ L`njxgN@xNAqzrkZ literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk3_side.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk3_side.png new file mode 100644 index 0000000000000000000000000000000000000000..897b13cc33901c24459301279ac3a248d6328749 GIT binary patch literal 513 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~ySyN$O6pEak-aeC=w!z`vifi`6uB{Vn4`i#jb8va` zEQ#22a9UY+I!BV?4VG_go0d*oa$_+^*26r(wIU%CJO%Gv4s}-G+mrU=f2Hw%`^kY` zoZ&}!9d?HN60ejyZqLflv|L|n?S#8&Obw~lnj6kBt2Fk1uj6(IQ`cTQA@cswO|p{? zn5+CP(c`SqT5Dk2#3sI1Z}YxvhFKw*t%Q{NmT=LV{Y&FkcLsSGd1-1+_o}JeGq-a~jtS!le)e=LoBex?`X4v5Rb7j` zpSpeKh8z>k9wn~DCq%rMIIu}JEKmACPsK*&+)%?eQX94z+RMaj`M9Qe(REeMn#-H+ z`T1UREtQb|s`X!NdKl32?M&gamu>p~*PgpCxBOz}_Gar-pqTJ<^>bP0l+XkK9TmkT literal 0 HcmV?d00001 diff --git a/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk3_top.png b/equivalent_exchange/equivalent_exchange_energy_collectors/textures/ee_energy_collectors_mk3_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7fae94332ab0ba4981590d461eff95f229a48211 GIT binary patch literal 524 zcmV+n0`vWeP)WFU8GbZ8()Nlj2>E@cM*00D4GL_t(I%cYaCY63wJ zhQD|s7FIEZrZ_APY_<+G9(ar{dFFu4E1?`U?L834I_#R)bzz;e)~ z{eA;L#(;iDGw+Aw@)eeYu1zv-u;rkO-_dRhCb-n@G4F@?9nJT{Bdg{ffWk)x|4rLF z$COgisMkf(seHcN$#y-Gq*W8Z@uXFg?Rq4iFLxs8R2ucVD5WHONM>Fx4#xllL4fCZ zL{UU>I3@|7DCwRvkIZ2UyUom&9Rz_5s#dE2teSgr`HC~(>@kTv&jTP$)00x#3Ji1M z;}?pe$OcU&6FbbK1iQ_Qc|W9}pGjIZOJb6fR*iywX5J5-8DtMDFuPFFJ(BRrk@5QN z^|XveqQi5$9*Lw=N4~!@UMZ#Iwp_NWe9Zn^6fi#R^}JO2Oy0pLI`M7eDM O0000 Date: Sun, 2 Aug 2015 13:46:49 -0400 Subject: [PATCH 11/21] greatly optimized emcs.lua --- .../equivalent_exchange/emcs.lua | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index 4a0d685..b0577eb 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -83,15 +83,25 @@ local emcs = { -- } } -for type, emcset in pairs(emcs) do - for prefix, subs in pairs(emcset) do - for name, emc in pairs(subs) do - local ornode = minetest.registered_items[prefix..name] - local node = {emc=emc} - for tagname, tagvalue in pairs(ornode) do - node[tagname] = tagvalue - end - minetest["register_"..type](":"..prefix..name, node) +-- for type, emcset in pairs(emcs) do +-- for prefix, subs in pairs(emcset) do +-- for name, emc in pairs(subs) do +-- local ornode = minetest.registered_items[prefix..name] +-- local node = {emc=emc} +-- for tagname, tagvalue in pairs(ornode) do +-- node[tagname] = tagvalue +-- end +-- minetest["register_"..type](":"..prefix..name, node) +-- end +-- end +-- end + +for type, emctable in pairs(emcs) do + for modname, itemlist in pairs(emctable) do + for itemname, emcvalue in pairs(itemlist) do + minetest.override_item(modname..itemname, { + emc = emcvalue, + }) end end end \ No newline at end of file From a543b93bf4c144134db9e41ad8dc146a64a21fbf Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 2 Aug 2015 13:59:41 -0400 Subject: [PATCH 12/21] finished last commit --- .../equivalent_exchange/emcs.lua | 168 ++++++++---------- 1 file changed, 72 insertions(+), 96 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index b0577eb..e164056 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -1,107 +1,83 @@ -local emcs = { - node = { - ["default:"] = { - stone = 2, - cobble = 1, - desert_stone = 1, - stonebrick = 1, - desert_stonebrick = 1, - dirt_with_grass = 50, - dirt_with_snow = 50, - dirt = 1, - sand=1, - desert_sand = 1, - gravel = 4, - sandstone = 4, - sandstonebrick = 4, - clay = 16, - brick = 16, - tree = 32, - jungletree = 32, - junglewood = 8, - cactus = 8, - papyrus = 32, - bookshelf = 336, - glass = 1, - fence_wood = 12, - rail = 96, - ladder = 14, - wood = 8, - torch = 9, - sign_wall = 52, - chest = 64, - chest_locked = 320, - furnace = 8, - mossycobble = 1, - mese=75978, - obsidian = 64, - } - }, - craftitem = { - ["default:"] = { - stick = 2, - paper = 96, - book = 288, +["default:"] = { + -- Nodes -- + stone = 2, + cobble = 1, + desert_stone = 1, + stonebrick = 1, + desert_stonebrick = 1, + dirt_with_grass = 50, + dirt_with_snow = 50, + dirt = 1, + sand=1, + desert_sand = 1, + gravel = 4, + sandstone = 4, + sandstonebrick = 4, + clay = 16, + brick = 16, + tree = 32, + jungletree = 32, + junglewood = 8, + cactus = 8, + papyrus = 32, + bookshelf = 336, + glass = 1, + fence_wood = 12, + rail = 96, + ladder = 14, + wood = 8, + torch = 9, + sign_wall = 52, + chest = 64, + chest_locked = 320, + furnace = 8, + mossycobble = 1, + mese=75978, + obsidian = 64, + -- Craft Items -- + stick = 2, + paper = 96, + book = 288, - -- Old Value: 128 - -- Precise Value: 57 - coal_lump = 55, + -- Old Value: 128 + -- Precise Value: 57 + coal_lump = 55, - -- Old Value: 8442 - -- Precise Value: 420 (including blocks) - mese_crystal = 425, + -- Old Value: 8442 + -- Precise Value: 420 (including blocks) + mese_crystal = 425, - -- Old Value: 8192 - -- Precise Value: 848 - diamond = 850, - clay_lump = 16, + -- Old Value: 8192 + -- Precise Value: 848 + diamond = 850, + clay_lump = 16, - -- Old Value: 256 - -- Precise Value (of lump): 61 - steel_ingot = 90, + -- Old Value: 256 + -- Precise Value (of lump): 61 + steel_ingot = 90, - -- Old Value: 85 - -- Precise Value (of lump): 146 - copper_ingot = 225, + -- Old Value: 85 + -- Precise Value (of lump): 146 + copper_ingot = 225, - --Old Value: 255 - bronze_ingot = 90 + 225, + --Old Value: 255 + bronze_ingot = 90 + 225, - -- Old Value: 2048 - -- Precise Value (of lump): 442 - gold_ingot = 675, + -- Old Value: 2048 + -- Precise Value (of lump): 442 + gold_ingot = 675, - -- Old Value: 938 - -- Precise Value: 47 - mese_crystal_fragment = 25, - clay_brick = 16, - } - } --- block = { --- ["default:"] = { --- } --- } + -- Old Value: 938 + -- Precise Value: 47 + mese_crystal_fragment = 25, + clay_brick = 16, } --- for type, emcset in pairs(emcs) do --- for prefix, subs in pairs(emcset) do --- for name, emc in pairs(subs) do --- local ornode = minetest.registered_items[prefix..name] --- local node = {emc=emc} --- for tagname, tagvalue in pairs(ornode) do --- node[tagname] = tagvalue --- end --- minetest["register_"..type](":"..prefix..name, node) --- end --- end --- end - -for type, emctable in pairs(emcs) do - for modname, itemlist in pairs(emctable) do - for itemname, emcvalue in pairs(itemlist) do - minetest.override_item(modname..itemname, { - emc = emcvalue, - }) - end +for modname, itemlist in pairs(emctable) do + for itemname, emcvalue in pairs(itemlist) do + minetest.override_item(modname..itemname, { + description = minetest.registered_items[modname..itemname].description.."\nEMC: "..emcvalue, + emc = emcvalue, + }) end -end \ No newline at end of file +end From 8ad8b10ee42005ede1ce9d199bf8104cbadfc00c Mon Sep 17 00:00:00 2001 From: Yaman Date: Sun, 2 Aug 2015 20:38:27 -0400 Subject: [PATCH 13/21] Actually completed previous commit (created working code) --- .../equivalent_exchange/emcs.lua | 149 ++++++++++-------- 1 file changed, 80 insertions(+), 69 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index e164056..ecdb21e 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -1,83 +1,94 @@ -["default:"] = { - -- Nodes -- - stone = 2, - cobble = 1, - desert_stone = 1, - stonebrick = 1, - desert_stonebrick = 1, - dirt_with_grass = 50, - dirt_with_snow = 50, - dirt = 1, - sand=1, - desert_sand = 1, - gravel = 4, - sandstone = 4, - sandstonebrick = 4, - clay = 16, - brick = 16, - tree = 32, - jungletree = 32, - junglewood = 8, - cactus = 8, - papyrus = 32, - bookshelf = 336, - glass = 1, - fence_wood = 12, - rail = 96, - ladder = 14, - wood = 8, - torch = 9, - sign_wall = 52, - chest = 64, - chest_locked = 320, - furnace = 8, - mossycobble = 1, - mese=75978, - obsidian = 64, - -- Craft Items -- - stick = 2, - paper = 96, - book = 288, +local emcs = { + ["default"] = { + stone = 2, + cobble = 1, + desert_stone = 1, + stonebrick = 1, + desert_stonebrick = 1, + dirt_with_grass = 50, + dirt_with_snow = 50, + dirt = 1, + sand=1, + desert_sand = 1, + gravel = 4, + sandstone = 4, + sandstonebrick = 4, + clay = 16, + brick = 16, + tree = 32, + jungletree = 32, + junglewood = 8, + cactus = 8, + papyrus = 32, + bookshelf = 336, + glass = 1, + fence_wood = 12, + rail = 96, + ladder = 14, + wood = 8, + torch = 9, + sign_wall = 52, + chest = 64, + chest_locked = 320, + furnace = 8, + mossycobble = 1, + mese=75978, + obsidian = 64, + stick = 2, + paper = 96, + book = 288, - -- Old Value: 128 - -- Precise Value: 57 - coal_lump = 55, + -- Old Value: 128 + -- Precise Value: 57 + coal_lump = 55, - -- Old Value: 8442 - -- Precise Value: 420 (including blocks) - mese_crystal = 425, + -- Old Value: 8442 + -- Precise Value: 420 (including blocks) + mese_crystal = 425, - -- Old Value: 8192 - -- Precise Value: 848 - diamond = 850, - clay_lump = 16, + -- Old Value: 8192 + -- Precise Value: 848 + diamond = 850, + clay_lump = 16, - -- Old Value: 256 - -- Precise Value (of lump): 61 - steel_ingot = 90, + -- Old Value: 256 + -- Precise Value (of lump): 61 + steel_ingot = 90, - -- Old Value: 85 - -- Precise Value (of lump): 146 - copper_ingot = 225, + -- Old Value: 85 + -- Precise Value (of lump): 146 + copper_ingot = 225, - --Old Value: 255 - bronze_ingot = 90 + 225, + --Old Value: 255 + bronze_ingot = 90 + 225, - -- Old Value: 2048 - -- Precise Value (of lump): 442 - gold_ingot = 675, + -- Old Value: 2048 + -- Precise Value (of lump): 442 + gold_ingot = 675, - -- Old Value: 938 - -- Precise Value: 47 - mese_crystal_fragment = 25, - clay_brick = 16, + -- Old Value: 938 + -- Precise Value: 47 + mese_crystal_fragment = 25, + clay_brick = 16, + } } +-- block = { +-- ["default:"] = { +-- } +-- } -for modname, itemlist in pairs(emctable) do + + +for modname, itemlist in emcs do for itemname, emcvalue in pairs(itemlist) do - minetest.override_item(modname..itemname, { - description = minetest.registered_items[modname..itemname].description.."\nEMC: "..emcvalue, + minetest.override_item(modname..":"..itemname, { + -- Weird bug or whatever + -- From IRC + -- are you running that at load time or runtime? + -- if the latter, you can't redefine items at runtime. + -- if the former, that may be a bug in the engine + -- description = minetest.registered_items[itemname].description.."\nEMC = "..tostring(emcvalue), emc = emcvalue, }) end -end +end \ No newline at end of file From 183b1acaafe9ea0e2746892fdbe1de55cbcee62e Mon Sep 17 00:00:00 2001 From: Yaman Date: Sun, 2 Aug 2015 21:15:12 -0400 Subject: [PATCH 14/21] Made description work --- equivalent_exchange/equivalent_exchange/emcs.lua | 14 ++++++-------- equivalent_exchange/equivalent_exchange/init.lua | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index ecdb21e..430e72e 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -1,6 +1,6 @@ local emcs = { ["default"] = { - stone = 2, + stone = 4, cobble = 1, desert_stone = 1, stonebrick = 1, @@ -72,14 +72,11 @@ local emcs = { clay_brick = 16, } } --- block = { --- ["default:"] = { --- } --- } +minetest.override_item("wool:green", { + description = "dlkasjfdslkfjlskadj" + }) - - -for modname, itemlist in emcs do +for modname, itemlist in pairs(emcs) do for itemname, emcvalue in pairs(itemlist) do minetest.override_item(modname..":"..itemname, { -- Weird bug or whatever @@ -88,6 +85,7 @@ for modname, itemlist in emcs do -- if the latter, you can't redefine items at runtime. -- if the former, that may be a bug in the engine -- description = minetest.registered_items[itemname].description.."\nEMC = "..tostring(emcvalue), + description = "ljlkj", emc = emcvalue, }) end diff --git a/equivalent_exchange/equivalent_exchange/init.lua b/equivalent_exchange/equivalent_exchange/init.lua index 1a8a2a2..61205bd 100644 --- a/equivalent_exchange/equivalent_exchange/init.lua +++ b/equivalent_exchange/equivalent_exchange/init.lua @@ -4,4 +4,5 @@ dofile(minetest.get_modpath("equivalent_exchange").."/condenser.lua") dofile(minetest.get_modpath("equivalent_exchange").."/philosophers_stone.lua") dofile(minetest.get_modpath("equivalent_exchange").."/normal_items.lua") -print("[equivalent_exchange] Mod loaded!") \ No newline at end of file +print("[equivalent_exchange] Mod loaded!") +minetest.log("action","hello world") \ No newline at end of file From 000fe4b3c36cfb20c41d6deb93a05eb6a4e9d3d7 Mon Sep 17 00:00:00 2001 From: Yaman Date: Mon, 3 Aug 2015 00:02:05 -0400 Subject: [PATCH 15/21] fixed emcs.lua --- .../equivalent_exchange/emcs.lua | 162 ++++++++---------- 1 file changed, 69 insertions(+), 93 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index b0577eb..bde6abe 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -1,107 +1,83 @@ local emcs = { - node = { - ["default:"] = { - stone = 2, - cobble = 1, - desert_stone = 1, - stonebrick = 1, - desert_stonebrick = 1, - dirt_with_grass = 50, - dirt_with_snow = 50, - dirt = 1, - sand=1, - desert_sand = 1, - gravel = 4, - sandstone = 4, - sandstonebrick = 4, - clay = 16, - brick = 16, - tree = 32, - jungletree = 32, - junglewood = 8, - cactus = 8, - papyrus = 32, - bookshelf = 336, - glass = 1, - fence_wood = 12, - rail = 96, - ladder = 14, - wood = 8, - torch = 9, - sign_wall = 52, - chest = 64, - chest_locked = 320, - furnace = 8, - mossycobble = 1, - mese=75978, - obsidian = 64, - } - }, - craftitem = { - ["default:"] = { - stick = 2, - paper = 96, - book = 288, + ["default"] = { + stone = 4, + cobble = 1, + desert_stone = 1, + stonebrick = 1, + desert_stonebrick = 1, + dirt_with_grass = 50, + dirt_with_snow = 50, + dirt = 1, + sand=1, + desert_sand = 1, + gravel = 4, + sandstone = 4, + sandstonebrick = 4, + clay = 16, + brick = 16, + tree = 32, + jungletree = 32, + junglewood = 8, + cactus = 8, + papyrus = 32, + bookshelf = 336, + glass = 1, + fence_wood = 12, + rail = 96, + ladder = 14, + wood = 8, + torch = 9, + sign_wall = 52, + chest = 64, + chest_locked = 320, + furnace = 8, + mossycobble = 1, + mese=75978, + obsidian = 64, + stick = 2, + paper = 96, + book = 288, - -- Old Value: 128 - -- Precise Value: 57 - coal_lump = 55, + -- Old Value: 128 + -- Precise Value: 57 + coal_lump = 55, - -- Old Value: 8442 - -- Precise Value: 420 (including blocks) - mese_crystal = 425, + -- Old Value: 8442 + -- Precise Value: 420 (including blocks) + mese_crystal = 425, - -- Old Value: 8192 - -- Precise Value: 848 - diamond = 850, - clay_lump = 16, + -- Old Value: 8192 + -- Precise Value: 848 + diamond = 850, + clay_lump = 16, - -- Old Value: 256 - -- Precise Value (of lump): 61 - steel_ingot = 90, + -- Old Value: 256 + -- Precise Value (of lump): 61 + steel_ingot = 90, - -- Old Value: 85 - -- Precise Value (of lump): 146 - copper_ingot = 225, + -- Old Value: 85 + -- Precise Value (of lump): 146 + copper_ingot = 225, - --Old Value: 255 - bronze_ingot = 90 + 225, + --Old Value: 255 + bronze_ingot = 90 + 225, - -- Old Value: 2048 - -- Precise Value (of lump): 442 - gold_ingot = 675, + -- Old Value: 2048 + -- Precise Value (of lump): 442 + gold_ingot = 675, - -- Old Value: 938 - -- Precise Value: 47 - mese_crystal_fragment = 25, - clay_brick = 16, - } + -- Old Value: 938 + -- Precise Value: 47 + mese_crystal_fragment = 25, + clay_brick = 16, } --- block = { --- ["default:"] = { --- } --- } } --- for type, emcset in pairs(emcs) do --- for prefix, subs in pairs(emcset) do --- for name, emc in pairs(subs) do --- local ornode = minetest.registered_items[prefix..name] --- local node = {emc=emc} --- for tagname, tagvalue in pairs(ornode) do --- node[tagname] = tagvalue --- end --- minetest["register_"..type](":"..prefix..name, node) --- end --- end --- end - -for type, emctable in pairs(emcs) do - for modname, itemlist in pairs(emctable) do - for itemname, emcvalue in pairs(itemlist) do - minetest.override_item(modname..itemname, { - emc = emcvalue, - }) - end +for modname, itemlist in pairs(emcs) do + for itemname, emcvalue in pairs(itemlist) do + minetest.override_item(modname..":"..itemname, { + description = minetest.registered_items[modname..":"..itemname].description.."\nEMC = "..tostring(emcvalue), + emc = emcvalue, + }) end end \ No newline at end of file From 0cc52f218553791678ccd13bb480a97a5ab37174 Mon Sep 17 00:00:00 2001 From: Yaman Date: Mon, 3 Aug 2015 00:11:12 -0400 Subject: [PATCH 16/21] Revert "Revert "Fixed License"" This reverts commit 0756bde38c7293f27f92eb064e7856ec8e34f36e. --- equivalent_exchange/LICENSE.txt | 189 ++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/equivalent_exchange/LICENSE.txt b/equivalent_exchange/LICENSE.txt index d645695..38c61d0 100644 --- a/equivalent_exchange/LICENSE.txt +++ b/equivalent_exchange/LICENSE.txt @@ -1,4 +1,193 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS + +0. Definitions. +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + +a) The work must carry prominent notices stating that you modified it, and giving a relevant date. +b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. +c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. +d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + +a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. +b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. +c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. +d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. +e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + +a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or +b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or +c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or +d) Limiting the use for publicity purposes of names of licensors or authors of the material; or +e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or +f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. + +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + + + +Original code is license under the Apache License Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ From 4706c64b506ab49f48996085b425ece28dcb7816 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Aug 2015 06:53:44 -0400 Subject: [PATCH 17/21] added philosopher stone crafts, emcs.lua runs last(partially) --- .../equivalent_exchange/depends.txt | 13 +- .../equivalent_exchange/emcs.lua | 134 +++++++++--------- .../equivalent_exchange/init.lua | 2 +- .../philosophers_stone.lua | 37 ++++- 4 files changed, 116 insertions(+), 70 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/depends.txt b/equivalent_exchange/equivalent_exchange/depends.txt index 331d858..66a7630 100644 --- a/equivalent_exchange/equivalent_exchange/depends.txt +++ b/equivalent_exchange/equivalent_exchange/depends.txt @@ -1 +1,12 @@ -default \ No newline at end of file +default +bucket? +doors? +dye? +farming? +flowers? +screwdriver? +stairs? +tnt? +vessels? +wool? +xpanes? \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index bde6abe..96450ac 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -1,82 +1,82 @@ local emcs = { ["default"] = { - stone = 4, - cobble = 1, - desert_stone = 1, - stonebrick = 1, - desert_stonebrick = 1, - dirt_with_grass = 50, - dirt_with_snow = 50, + -- Plains -- dirt = 1, - sand=1, + grass_1 = 5, + sand = 1, + -- papyrus + -- clay + -- clay_lump + -- tree + -- leaves + -- apple + -- sapling + -- Tundra -- + snow = 1, + -- ice + -- pinetree + -- pinewood + -- pine_sapling + -- Desert -- + desert_cobble = 1, desert_sand = 1, - gravel = 4, - sandstone = 4, - sandstonebrick = 4, - clay = 16, - brick = 16, - tree = 32, - jungletree = 32, - junglewood = 8, - cactus = 8, - papyrus = 32, - bookshelf = 336, - glass = 1, - fence_wood = 12, - rail = 96, - ladder = 14, - wood = 8, - torch = 9, - sign_wall = 52, - chest = 64, - chest_locked = 320, - furnace = 8, - mossycobble = 1, - mese=75978, - obsidian = 64, - stick = 2, - paper = 96, - book = 288, - - -- Old Value: 128 - -- Precise Value: 57 + -- cactus + dry_shrub = 5, + -- Jungle -- + -- jungletree + -- jungleleaves + junglegrass = 5, + -- junglesapling + -- Underground-- + cobble = 1, + -- mossycobble + -- gravel coal_lump = 55, - - -- Old Value: 8442 - -- Precise Value: 420 (including blocks) - mese_crystal = 425, - - -- Old Value: 8192 - -- Precise Value: 848 - diamond = 850, - clay_lump = 16, - - -- Old Value: 256 + -- Precise Value: 57 + iron_lump = 61, -- Precise Value (of lump): 61 - steel_ingot = 90, - - -- Old Value: 85 - -- Precise Value (of lump): 146 - copper_ingot = 225, - - --Old Value: 255 - bronze_ingot = 90 + 225, - - -- Old Value: 2048 + copper_lump = 146, -- Precise Value (of lump): 442 - gold_ingot = 675, - - -- Old Value: 938 - -- Precise Value: 47 - mese_crystal_fragment = 25, - clay_brick = 16, - } + gold_lump = 488, + -- Precise Value: 420 + mese_crystal = 425, + -- Precise Value: 848 + diamond = 976, + -- obsidian + -- nyancat + -- nyancat_rainbow + -- Exceptions -- + -- wood + -- junglewood + -- stick + }, + -- ["bucket"] = { + -- -- bucket_water + -- -- bucket_lava + -- }, + ["farming"] = { + seed_wheat = 20, + seed_cotton = 35, + wheat = 50, + flour = 200, + bread = 300, + string = 86, + }, + ["flowers"] = { + dandelion_white = 5, + dandelion_yellow = 5, + geranium = 5, + rose = 5, + tulip = 5, + viola = 5, + }, } for modname, itemlist in pairs(emcs) do for itemname, emcvalue in pairs(itemlist) do + print(minetest.registered_items[modname..":"..itemname].description) minetest.override_item(modname..":"..itemname, { - description = minetest.registered_items[modname..":"..itemname].description.."\nEMC = "..tostring(emcvalue), + description = minetest.registered_items[modname..":"..itemname].description.."\nEMC Value: "..emcvalue, emc = emcvalue, }) end diff --git a/equivalent_exchange/equivalent_exchange/init.lua b/equivalent_exchange/equivalent_exchange/init.lua index 1a8a2a2..347ef2e 100644 --- a/equivalent_exchange/equivalent_exchange/init.lua +++ b/equivalent_exchange/equivalent_exchange/init.lua @@ -1,7 +1,7 @@ -dofile(minetest.get_modpath("equivalent_exchange").."/emcs.lua") dofile(minetest.get_modpath("equivalent_exchange").."/alchemical_chest.lua") dofile(minetest.get_modpath("equivalent_exchange").."/condenser.lua") dofile(minetest.get_modpath("equivalent_exchange").."/philosophers_stone.lua") dofile(minetest.get_modpath("equivalent_exchange").."/normal_items.lua") +dofile(minetest.get_modpath("equivalent_exchange").."/emcs.lua") print("[equivalent_exchange] Mod loaded!") \ No newline at end of file diff --git a/equivalent_exchange/equivalent_exchange/philosophers_stone.lua b/equivalent_exchange/equivalent_exchange/philosophers_stone.lua index 8789835..c926679 100644 --- a/equivalent_exchange/equivalent_exchange/philosophers_stone.lua +++ b/equivalent_exchange/equivalent_exchange/philosophers_stone.lua @@ -19,5 +19,40 @@ minetest.register_craft({ } }) ---Transmutation Crafts here after default EMCs are sorted out -- +--Transmutation Crafts -- +minetest.register_craft({ + type = "shapeless", + output = "default:steel_ingot 4", + recipe = {modname.."philosophers_stone", "default:gold_ingot"}, + replacements = { + {modname.."philosophers_stone", modname.."philosophers_stone"} + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "default:gold_ingot", + recipe = {modname.."philosophers_stone", "default:steel_ingot", "default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + replacements = { + {modname.."philosophers_stone", modname.."philosophers_stone"} + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "default:gold_ingot 2", + recipe = {modname.."philosophers_stone", "default:diamond"}, + replacements = { + {modname.."philosophers_stone", modname.."philosophers_stone"} + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "default:diamond", + recipe = {modname.."philosophers_stone", "default:gold_ingot", "default:gold_ingot"}, + replacements = { + {modname.."philosophers_stone", modname.."philosophers_stone"} + } +}) From e4c3ab9bcb775b7db5864d013c1c6b3c01ed44f2 Mon Sep 17 00:00:00 2001 From: yamanq Date: Mon, 3 Aug 2015 07:20:06 -0400 Subject: [PATCH 18/21] mroe changes --- equivalent_exchange/equivalent_exchange/emcs.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index 63ec985..7e06b25 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -71,9 +71,6 @@ local emcs = { viola = 5, }, } -minetest.override_item("wool:green", { - description = "dlkasjfdslkfjlskadj" - }) for modname, itemlist in pairs(emcs) do for itemname, emcvalue in pairs(itemlist) do From bd58f097ded6fcdf4c1e8979c3df251f9bfe0280 Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Fri, 7 Aug 2015 18:12:52 -0400 Subject: [PATCH 19/21] added all base emc values --- .../equivalent_exchange/emcs.lua | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index 7e06b25..2ba4206 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -4,33 +4,32 @@ local emcs = { dirt = 1, grass_1 = 5, sand = 1, - -- papyrus - -- clay - -- clay_lump - -- tree - -- leaves - -- apple - -- sapling + papyrus = 50, + clay = 160, + clay_lump = 40, + tree = 16, + leaves = 5, + apple = 128, + sapling = 16, -- Tundra -- snow = 1, - -- ice - -- pinetree - -- pinewood - -- pine_sapling + ice = 10, + pinetree = 16, + pine_sapling = 16, -- Desert -- desert_cobble = 1, desert_sand = 1, - -- cactus + cactus = 30, dry_shrub = 5, -- Jungle -- - -- jungletree - -- jungleleaves + jungletree = 16, + jungleleaves = 5, junglegrass = 5, - -- junglesapling + junglesapling = 16, -- Underground-- cobble = 1, - -- mossycobble - -- gravel + mossycobble = 110, + gravel = 55, coal_lump = 55, -- Precise Value: 57 iron_lump = 61, @@ -42,18 +41,19 @@ local emcs = { mese_crystal = 425, -- Precise Value: 848 diamond = 976, - -- obsidian - -- nyancat - -- nyancat_rainbow + obsidian = + nyancat = 3786750, + nyancat_rainbow = 3786750, -- Exceptions -- - -- wood - -- junglewood - -- stick + wood = 4, + junglewood = 4, + pinewood = 4, + stick = 1, + }, + ["bucket"] = { + bucket_water = 275, + bucket_lava = }, - -- ["bucket"] = { - -- -- bucket_water - -- -- bucket_lava - -- }, ["farming"] = { seed_wheat = 20, seed_cotton = 35, From bd7294766e7bf1625fb3f4f934fc9b4b6a40d13a Mon Sep 17 00:00:00 2001 From: yamanq Date: Sat, 8 Aug 2015 12:51:21 -0400 Subject: [PATCH 20/21] craft emc work except for groups --- .../equivalent_exchange/emcs.lua | 93 +++++++++++++++++-- 1 file changed, 84 insertions(+), 9 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index 2ba4206..7813a0e 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -41,7 +41,10 @@ local emcs = { mese_crystal = 425, -- Precise Value: 848 diamond = 976, - obsidian = + + -- REDO VALUE HERE + obsidian = 0, + nyancat = 3786750, nyancat_rainbow = 3786750, -- Exceptions -- @@ -51,8 +54,10 @@ local emcs = { stick = 1, }, ["bucket"] = { - bucket_water = 275, - bucket_lava = + bucket_water = 275, + + -- REDO VALUE HERE + bucket_lava = 0, }, ["farming"] = { seed_wheat = 20, @@ -71,12 +76,82 @@ local emcs = { viola = 5, }, } - + +-- Add all items to a table. +local registered_items = {} +local local_emcs = {} + +for itemname, value in pairs(minetest.registered_items) do + table.insert(registered_items, itemname) +end + +-- Add EMC values to raw materials. for modname, itemlist in pairs(emcs) do - for itemname, emcvalue in pairs(itemlist) do - minetest.override_item(modname..":"..itemname, { - description = minetest.registered_items[modname..":"..itemname].description.."\nEMC Value: "..emcvalue, - emc = emcvalue, + for itemname, emcvalue in pairs(itemlist) do + minetest.override_item(modname..":"..itemname, { + description = minetest.registered_items[modname..":"..itemname].description.."\nEMC Value: "..emcvalue, + emc = emcvalue, + }) + end +end + +for i=1,10 do + for _, itemname in pairs(registered_items) do + if itemname ~= "" + and itemname ~= ":" + and minetest.get_all_craft_recipes(itemname) ~= nil + and minetest.registered_items[itemname] + and minetest.registered_items[itemname].emc == nil then + + for _, recipe in pairs(minetest.get_all_craft_recipes(itemname)) do + local emcvalue = 0 + + if recipe.type == "cooking" and minetest.registered_items[recipe.items[1].emc] ~= nil then + emcvalue = minetest.registered_items[recipe.items[1]].emc * 1.5 + -- table.insert(exceptions, itemname) + + else + for _,item in pairs(recipe.items) do + if string.sub(item,1,string.len("group:"))=="group:" then + local current_emc = 0 + for _,definition in pairs(minetest.registered_nodes) do + if definition.groups[item] and definition.emc ~= nil then + if definition.emc < current_emc then + current_emc = definition.emc + + elseif current_emc == 0 then + current_emc = definition.emc + end + end + end + emcvalue = current_emc + elseif minetest.registered_items[item] and minetest.registered_items[item].emc then + emcvalue = emcvalue + minetest.registered_items[item].emc + else + emcvalue = nil + break + end + end + output_number = recipe.output:split(" ") + local craft_number + if output_number[2] then + craft_number = tonumber(output_number[2]) + else + craft_number = 1 + end + if emcvalue ~= nil then + emcvalue = emcvalue / craft_number + end + end + local_emcs[itemname] = emcvalue + end + end + end + for item, value in pairs(local_emcs) do + minetest.override_item(item, { + description = minetest.registered_items[item].description.."\nEMC Value: "..value, + emc = value, }) end -end \ No newline at end of file + local_emcs = {} +end From f03b703b7060aed89ac8f09f18e7f88360efe3cf Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Sun, 9 Aug 2015 17:31:49 -0400 Subject: [PATCH 21/21] fixed groups --- .../equivalent_exchange/emcs.lua | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/equivalent_exchange/equivalent_exchange/emcs.lua b/equivalent_exchange/equivalent_exchange/emcs.lua index 7813a0e..7a6b788 100644 --- a/equivalent_exchange/equivalent_exchange/emcs.lua +++ b/equivalent_exchange/equivalent_exchange/emcs.lua @@ -38,7 +38,7 @@ local emcs = { -- Precise Value (of lump): 442 gold_lump = 488, -- Precise Value: 420 - mese_crystal = 425, + mese_crystal = 423, -- Precise Value: 848 diamond = 976, @@ -87,15 +87,15 @@ end -- Add EMC values to raw materials. for modname, itemlist in pairs(emcs) do - for itemname, emcvalue in pairs(itemlist) do - minetest.override_item(modname..":"..itemname, { - description = minetest.registered_items[modname..":"..itemname].description.."\nEMC Value: "..emcvalue, - emc = emcvalue, - }) - end + for itemname, emcvalue in pairs(itemlist) do + minetest.override_item(modname..":"..itemname, { + description = minetest.registered_items[modname..":"..itemname].description.."\nEMC Value: "..emcvalue, + emc = emcvalue, + }) + end end -for i=1,10 do +for i = 1,10 do for _, itemname in pairs(registered_items) do if itemname ~= "" and itemname ~= ":" @@ -105,26 +105,18 @@ for i=1,10 do for _, recipe in pairs(minetest.get_all_craft_recipes(itemname)) do local emcvalue = 0 - - if recipe.type == "cooking" and minetest.registered_items[recipe.items[1].emc] ~= nil then - emcvalue = minetest.registered_items[recipe.items[1]].emc * 1.5 - -- table.insert(exceptions, itemname) - - else + if recipe.type == "cooking" and minetest.registered_items[recipe.items[1]] ~= nil and minetest.registered_items[recipe.items[1]].emc then + emcvalue = (minetest.registered_items[recipe.items[1]].emc * 1.5)-- Change to cooktime eventually. + print(itemname, emcvalue) + elseif minetest.registered_items[recipe.output:split(" ")[1]].emc == nil then for _,item in pairs(recipe.items) do - if string.sub(item,1,string.len("group:"))=="group:" then - local current_emc = 0 - for _,definition in pairs(minetest.registered_nodes) do - if definition.groups[item] and definition.emc ~= nil then - if definition.emc < current_emc then - current_emc = definition.emc - - elseif current_emc == 0 then - current_emc = definition.emc - end + if string.find(item, "group:") then + groupname = item:gsub("group:", "") + for _, groupitem in pairs(registered_items) do + if minetest.get_item_group(groupitem, groupname) == 1 and minetest.registered_items[groupitem].emc then + emcvalue = emcvalue + minetest.registered_items[groupitem].emc end end - emcvalue = current_emc elseif minetest.registered_items[item] and minetest.registered_items[item].emc then emcvalue = emcvalue + minetest.registered_items[item].emc else @@ -143,11 +135,14 @@ for i=1,10 do emcvalue = emcvalue / craft_number end end + print(itemname, emcvalue) local_emcs[itemname] = emcvalue end end end + print (local_emcs["default:gold_ingot"]) for item, value in pairs(local_emcs) do + --print (item,value) minetest.override_item(item, { description = minetest.registered_items[item].description.."\nEMC Value: "..value, emc = value, @@ -155,3 +150,6 @@ for i=1,10 do end local_emcs = {} end + + +