29 Revīzijas 96dbf67dcd ... 384c09a352

Autors SHA1 Ziņojums Datums
  Nakilashiva 384c09a352 Merge https://notabug.org/BlueBird51/musttest_game 4 gadi atpakaļ
  BluebirdGreycoat 256a8241d4 Update description 4 gadi atpakaļ
  BluebirdGreycoat 38fb2a8130 Fix a mistake 4 gadi atpakaļ
  BlueBird51 1acd2df501 Merge branch 'thorium' of nhryciw1/musttest_game into master 4 gadi atpakaļ
  nhryciw1 2fa0afac0c Update 'mods/thorium/License.txt' 4 gadi atpakaļ
  nhryciw1 d3f2aef1ec Update 'mods/binoculars/license.txt' 4 gadi atpakaļ
  nhryciw1 9db50d1d98 Update 'mods/binoculars/license.txt' 4 gadi atpakaļ
  nhryciw1 36353948e9 Update 'mods/thorium/readme.txt' 4 gadi atpakaļ
  nhryciw1 1ee407c8f1 Add 'mods/thorium/License.txt' 4 gadi atpakaļ
  nhryciw1 6dfe167dde Update 'mods/thorium/init.lua' 4 gadi atpakaļ
  nhryciw1 7404973922 Update 'mods/thorium/init.lua' 4 gadi atpakaļ
  nhryciw1 f1730dfc1d Add 'mods/thorium/readme.txt' 4 gadi atpakaļ
  nhryciw1 1f1d4156d8 Update 'mods/thorium/init.lua' 4 gadi atpakaļ
  nhryciw1 37e8159c2d Upload files to 'mods/thorium/textures' 4 gadi atpakaļ
  nhryciw1 ebdc7a81f6 Delete 'mods/textures/technic_thorium_mineral.png' 4 gadi atpakaļ
  nhryciw1 194a10cde8 Delete 'mods/textures/technic_thorium_lump.png' 4 gadi atpakaļ
  nhryciw1 d938c5166e Delete 'mods/textures/technic_thorium_ingot.png' 4 gadi atpakaļ
  nhryciw1 9c3e7a287e Delete 'mods/textures/technic_thorium_fuel.png' 4 gadi atpakaļ
  nhryciw1 af36b82b5d Delete 'mods/textures/technic_thorium_dust.png' 4 gadi atpakaļ
  nhryciw1 9dc752f073 Delete 'mods/textures/technic_thorium_block.png' 4 gadi atpakaļ
  nhryciw1 2503e70f35 Upload files to 'mods/textures' 4 gadi atpakaļ
  nhryciw1 7deeb79f3c Update 'mods/thorium/init.lua' 4 gadi atpakaļ
  nhryciw1 12725a7dd7 Update 'mods/itempickup/init.lua' 4 gadi atpakaļ
  nhryciw1 72101edb72 Add 'mods/thorium/depends.txt' 4 gadi atpakaļ
  nhryciw1 abcc3a85f5 Update 'mods/oregen/ore-list.txt' 4 gadi atpakaļ
  nhryciw1 c55e6f3195 Update 'mods/machines/leecher.lua' 4 gadi atpakaļ
  nhryciw1 f065b889d3 Update 'mods/thorium/init.lua' 4 gadi atpakaļ
  BlueBird51 6add90891a Merge branch 'master' of Nakilashiva/musttest_game into master 4 gadi atpakaļ
  nhryciw1 c4b98c72aa Add 'mods/thorium/init.lua' 4 gadi atpakaļ

+ 5 - 3
mods/itempickup/init.lua

@@ -156,7 +156,8 @@ local drop_xp_list = {
 	["glowstone:glowing_dust"] = 1.0,
 	["quartz:quartz_crystal"] = 0.5,
 	["talinite:lump"] = 1.0,
-	["titanium:titanium"] = 1.0,
+	["thorium:lump"] = 1.0,
+    ["titanium:titanium"] = 1.0,
 	["uranium:lump"] = 1.0,
 	["zinc:lump"] = 1.0,
 	["sulfur:lump"] = 0.1,
@@ -195,7 +196,8 @@ local drop_extra_item_list = {
 	["glowstone:glowing_dust"] = true,
 	["quartz:quartz_crystal"] = true,
 	["talinite:lump"] = true,
-	["titanium:titanium"] = true,
+	["thorium:lump"] = true,
+    ["titanium:titanium"] = true,
 	["uranium:lump"] = true,
 	["zinc:lump"] = true,
 	["sulfur:lump"] = true,
@@ -225,7 +227,7 @@ local drop_node_list = {
 	["alatro:ore"] = true,
 	["arol:ore"] = true,
 	["talinite:ore"] = true,
-
+	["thorium:ore"] = true,
 	["titanium:ore"] = true,
 	["uranium:ore"] = true,
 	["sulfur:ore"] = true,

+ 2 - 1
mods/machines/leecher.lua

@@ -42,7 +42,8 @@ local ore_conversion_data = {
 	["rackstone:redrack_with_copper"] = "dusts:copper",
 	["rackstone:redrack_with_tin"] = "dusts:tin",
 	["talinite:ore"] = "talinite:dust",
-	["uranium:ore"] = "uranium:dust",
+	["thorium:ore"] = "thorium:dust",
+    ["uranium:ore"] = "uranium:dust",
 	["zinc:ore"] = "zinc:dust",
 	["sulfur:ore"] = "sulfur:dust",
 }

+ 1 - 0
mods/oregen/ore-list.txt

@@ -39,6 +39,7 @@
  * quartz:quartz_ore
 +* talinite:ore
  * titanium:ore
++* thorium:ore
 +* uranium:ore
 +* zinc:ore
  * morerocks:marble

+ 59 - 0
mods/thorium/License.txt

@@ -0,0 +1,59 @@
+License of source code
+----------------------
+
+The MIT License (MIT)
+Copyright (C) 2017 nhryciw1
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+For more details:
+https://opensource.org/licenses/MIT
+
+
+Licenses of media (textures)
+----------------------------
+
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+Copyright (C) 2017 nhryciw1
+
+You are free to:
+Share — copy and redistribute the material in any medium or format.
+Adapt — remix, transform, and build upon the material for any purpose, even commercially.
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+Under the following terms:
+
+Attribution — You must give appropriate credit, provide a link to the license, and
+indicate if changes were made. You may do so in any reasonable manner, but not in any way
+that suggests the licensor endorses you or your use.
+
+ShareAlike — If you remix, transform, or build upon the material, you must distribute
+your contributions under the same license as the original.
+
+No additional restrictions — You may not apply legal terms or technological measures that
+legally restrict others from doing anything the license permits.
+
+Notices:
+
+You do not have to comply with the license for elements of the material in the public
+domain or where your use is permitted by an applicable exception or limitation.
+No warranties are given. The license may not give you all of the permissions necessary
+for your intended use. For example, other rights such as publicity, privacy, or moral
+rights may limit how you use the material.
+
+For more details:
+http://creativecommons.org/licenses/by-sa/3.0/

+ 6 - 0
mods/thorium/depends.txt

@@ -0,0 +1,6 @@
+default
+grinder
+oregen
+mapgen
+coresounds
+stairs

+ 125 - 0
mods/thorium/init.lua

@@ -0,0 +1,125 @@
+minetest.register_node("thorium:ore", {
+  description = "Thorium Ore",
+  tiles = {"default_stone.png^technic_thorium_mineral.png"},
+  groups = utility.dig_groups("mineral", {melts = 1, ore = 1}),
+  drop = "thorium:lump",
+  sounds = default.node_sound_stone_defaults(),
+	silverpick_drop = true,
+	
+	-- thorium ore reacts like uranium ore with respect to lava, only less violently.
+	on_melt = function(pos, other)
+		minetest.after(0, function()
+      tnt.boom(pos, {
+        radius = 2,
+        ignore_protection = false,
+        ignore_on_blast = false,
+        damage_radius = 3,
+        disable_drops = true,
+      })
+		end)
+	end,
+})
+
+minetest.register_node("thorium:block", {
+  description = "Thorium Block (Not Radioactive)",
+  tiles = {"technic_thorium_block.png"},
+  groups = utility.dig_groups("block"),
+  sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_craftitem("thorium:lump", {
+  description = "Thorium Ore Lump",
+  inventory_image = "technic_thorium_lump.png",
+})
+
+minetest.register_craftitem("thorium:ingot", {
+	description = "Thorium Ingot",
+	inventory_image = "technic_thorium_ingot.png",
+	groups = {ingot = 1},
+})
+
+minetest.register_craftitem("thorium:dust", {
+	description = "Thorium Dust",
+	inventory_image = "technic_thorium_dust.png",
+})
+
+
+
+minetest.register_craft({
+  type = "cooking",
+  output = "thorium:ingot",
+  recipe = "thorium:lump",
+})
+
+minetest.register_craft({
+  type = "cooking",
+  output = "thorium:ingot",
+  recipe = "thorium:dust",
+})
+
+minetest.register_craft({
+  type = "grinding",
+  output = 'thorium:dust 2',
+  recipe = 'thorium:lump',
+  time = 6,
+})
+
+minetest.register_craft({
+  type = "grinding",
+  output = 'thorium:dust',
+  recipe = 'thorium:ingot',
+  time = 20,
+})
+
+
+minetest.register_craft({
+	output = "thorium:block",
+	recipe = {
+		{"thorium:ingot", "thorium:ingot", "thorium:ingot"},
+		{"thorium:ingot", "thorium:ingot", "thorium:ingot"},
+		{"thorium:ingot", "thorium:ingot", "thorium:ingot"},
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "thorium:ingot 9",
+	recipe = {"thorium:block"},
+})
+
+oregen.register_ore({
+  ore_type         = "scatter",
+  ore              = "thorium:ore",
+  wherein          = "default:stone",
+  clust_scarcity   = 8*8*8,
+  clust_num_ores   = 2,
+  clust_size       = 3,
+  y_min       = -700,
+  y_max       = -400,
+})
+
+oregen.register_ore({
+  ore_type         = "scatter",
+  ore              = "thorium:ore",
+  wherein          = "default:stone",
+  clust_scarcity   = 6*6*6,
+  clust_num_ores   = 2,
+  clust_size       = 3,
+  y_min       = -800,
+  y_max       = -600,
+})
+
+
+minetest.register_craftitem("thorium:rod", {
+  description = "Fission Reactor Thorium Fuel Rod",
+  inventory_image = "technic_thorium_fuel.png",
+	stack_max = 1,
+})
+
+minetest.register_craft({
+  type = "compressing",
+  output = "thorium:rod",
+  recipe = "thorium:ingot 12",
+  time = 60,
+})
+

+ 17 - 0
mods/thorium/readme.txt

@@ -0,0 +1,17 @@
+Minetest Game mod: thorium
+=============================
+See license.txt for license information.
+
+Authors of source code
+----------------------
+nhryciw1 (MIT)
+
+Authors of media (textures)
+---------------------------
+nhryciw1 (CC BY-SA 3.0):
+all textures
+
+thoriu mod written by nhryciw1
+as of version 1.0, thorium fuel rods don't actually work in nuclear reactors, and this is intentional. I am still 
+working on how exactly would be the best way to implement it as fuel. 
+for right now, thorium is just a random new metal.

BIN
mods/thorium/textures/technic_thorium_block.png


BIN
mods/thorium/textures/technic_thorium_dust.png


+ 0 - 0
mods/thorium/textures/technic_thorium_fuel.png


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels