From c51228bd7f4f372a63259708f3c4352dc14d5a37 Mon Sep 17 00:00:00 2001 From: Der1248 Date: Sat, 25 May 2019 16:36:41 +0200 Subject: [PATCH] Regnum 3.3.4 upload --- game.conf | 3 +++ menu/Thumbs.db | Bin 35328 -> 35328 bytes mods/3d_armor/3d_armor/init.lua | 1 - mods/tutorial/basic/other.lua | 15 +++++++++--- mods/tutorial/init.lua | 39 +++++++++++++++++++++++++++++++- 5 files changed, 53 insertions(+), 5 deletions(-) diff --git a/game.conf b/game.conf index 6f98c06..29bd8ff 100644 --- a/game.conf +++ b/game.conf @@ -1 +1,4 @@ name = Regnum +release = 1338 +author = 1248 +description = Fight monsters, collect XP, craft battleaxes, armor, guns and lots more. diff --git a/menu/Thumbs.db b/menu/Thumbs.db index b9e949fd39d5919024d5f0ebf6904e8fe9495f0d..b1b4a514953282b019d091349d2da39cda6d2eb6 100644 GIT binary patch delta 112 zcmZpe!qhN@X@d_7BhzF>7J2p$=F9G|316LD%n~r!nbmNz0Sn9IA1vOyjEoEn4F92E z@zk-78J;(`zBTsJ=ykY@yH<(zy#KmZ{sA@rgg E07FbH)c^nh delta 108 zcmZpe!qhN@X@d_7BjaR67I}7qsF+EA-d~wq%o4!M_#X(E7#J8p^yEfXjmbY)yeA)K zG2C3jI){lvW6|FA{`>y6Z= math.random(100) then hp_change = 0 end diff --git a/mods/tutorial/basic/other.lua b/mods/tutorial/basic/other.lua index 8e40ebc..569a396 100644 --- a/mods/tutorial/basic/other.lua +++ b/mods/tutorial/basic/other.lua @@ -2409,15 +2409,19 @@ ach3.get_formspec = function(player, pos) return end local player_inv = player:get_inventory() - player_inv:set_size("year", 2) + player_inv:set_size("year", 3) local year = player_inv:get_stack("year", 1):get_count() local year2 = player_inv:get_stack("year", 2):get_count() + local year3 = player_inv:get_stack("year", 3):get_count() local d = 0 if year == 1 then d = d+1 end if year2 == 1 then d = d+1 + end + if year3 == 1 then + d = d+1 end formspec= "size[10.5,11.3]" .."background[10.5,11.3;1,1;gui_formbg.png;true]" @@ -2427,9 +2431,11 @@ ach3.get_formspec = function(player, pos) .."button[2,0;2,0.5;main;Main]" .."label[0.8,1.1;one year Trophy]" .."label[0.8,1.9;two years Trophy]" - .."label[5.5,0;"..d.."/2]" + .."label[0.8,2.7;three years Trophy]" + .."label[5.5,0;"..d.."/3]" .."image[0,1;0.8,0.8;tutorial_"..year..".png]" .."image[0,1.8;0.8,0.8;tutorial_"..year2..".png]" + .."image[0,2.6;0.8,0.8;tutorial_"..year3..".png]" return formspec end for j = 1, 8, 1 do @@ -3218,12 +3224,15 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end if fields.achc then local player_inv = player:get_inventory() - player_inv:set_size("year", 2) + player_inv:set_size("year", 3) if player:get_inventory():contains_item("main", "tutorial:trophy_year1") then player_inv:set_stack("year", 1,"tutorial:dirt") end if player:get_inventory():contains_item("main", "tutorial:trophy_year2") then player_inv:set_stack("year", 2,"tutorial:dirt") + end + if player:get_inventory():contains_item("main", "tutorial:trophy_year3") then + player_inv:set_stack("year", 3,"tutorial:dirt") end inventory_plus.set_inventory_formspec(player, ach3.get_formspec(player)) end diff --git a/mods/tutorial/init.lua b/mods/tutorial/init.lua index 94ead0d..ffefd70 100644 --- a/mods/tutorial/init.lua +++ b/mods/tutorial/init.lua @@ -14,7 +14,7 @@ minetest.register_on_joinplayer(function(player) offset = {x=0, y=30}, alignment = {x=1, y=0}, number = 0xFFFFFF , - text = "Game Version : 3.3.3", + text = "Game Version : 3.3.4", }) end) @@ -137,6 +137,38 @@ minetest.register_node("tutorial:trophy_year2", { fixed = { -0.21, -0.5, -0.125, 0.2725, 0.125, 0.1875 } } }) +minetest.register_node("tutorial:trophy_year3", { + description = "Three years Regnum!!", + tiles = { + "moreores_mithril_block.png" + }, + groups = { snappy=3 }, + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.125, -0.5, -0.125, 0.1875, -0.4375, 0.1875}, -- NodeBox1 + {-0.0625, -0.4375, -0.0625, 0.125, -0.375, 0.125}, -- NodeBox2 + {-0.02, -0.375, -0.02, 0.0825, -0.1875, 0.0825}, -- NodeBox3 + {-0.0625, -0.1875, -0.0625, 0.125, -0.125, 0.125}, -- NodeBox4 + {-0.125, -0.1875, -0.0625, -0.0625, 0.125, 0.125}, -- NodeBox5 + {0.125, -0.1875, -0.0625, 0.1875, 0.125, 0.125}, -- NodeBox6 + {-0.125, -0.1875, 0.125, 0.1875, 0.125, 0.1875}, -- NodeBox7 + {-0.125, -0.1875, -0.125, 0.1875, 0.125, -0.0625}, -- NodeBox8 + {-0.0625, -0.25, -0.0625, 0.125, -0.1875, 0.125}, -- NodeBox9 + {0.1875, 0.05, 0, 0.23, 0.0925, 0.0625}, -- NodeBox10 + {0.1875, -0.15, 0, 0.23, -0.11, 0.0625}, -- NodeBox11 + {0.23, -0.15, 0, 0.2725, 0.0925, 0.0625}, -- NodeBox12 + {-0.1675, -0.15, 0, -0.125, -0.11, 0.0625}, -- NodeBox13 + {-0.1675, 0.05, 0, -0.125, 0.0925, 0.0625}, -- NodeBox14 + {-0.21, -0.15, 0, -0.1675, 0.0925, 0.0625}, -- NodeBox15 + } + }, + selection_box = { + type = "fixed", + fixed = { -0.21, -0.5, -0.125, 0.2725, 0.125, 0.1875 } + } +}) minetest.register_craft({ output = 'tutorial:legendstick9', recipe = { @@ -954,6 +986,11 @@ minetest.register_on_joinplayer(function(player) player:set_physics_override(override_table) local player_inv = player:get_inventory() player_inv:set_stack("crtime", 1, nil) + player_inv:set_size("year", 3) + if player_inv:room_for_item("main", "tutorial:trophy_year3") and player_inv:get_stack("year", 3):get_count() == 0 then + player_inv:add_item("main", "tutorial:trophy_year3") + player_inv:set_stack("year", 3, "default:dirt") + end end) minetest.register_craftitem("tutorial:cooking_schluessel1", { description = "Cookingkey lv.1",