mt-mods/missions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport mission cleanup

Browse Source
This commit is contained in:
Thomas Rudin 2018-05-16 14:21:01 +02:00
parent df37d66c58
commit e7843d126b
3 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functions.lua
View File

@ -97,8 +97,8 @@ local check_player_mission = function(player, mission, remaining)
minetest.chat_send_player(player:get_player_name(), "Mission timed out!: " .. mission.title)
minetest.log("action", "[missions] " .. player:get_player_name() .. " -- mission timed out: " .. mission.title)
if has_xp_redo_mod and mission.penaltyxp then
xp_redo.add_xp(player:get_player_name(), -mission.penaltyxp)
if has_xp_redo_mod and mission.xp and mission.xp.penalty then
xp_redo.add_xp(player:get_player_name(), -mission.penalty)
end
end
@ -173,8 +173,8 @@ local check_player_mission = function(player, mission, remaining)
player:hud_remove(four)
end)
if has_xp_redo_mod and mission.rewardxp then
xp_redo.add_xp(player:get_player_name(), mission.rewardxp)
if has_xp_redo_mod and mission.xp and mission.xp.reward then
xp_redo.add_xp(player:get_player_name(), mission.xp.reward)
end

9
hud.lua
View File

@ -139,15 +139,6 @@ missions.hud_update = function(player, playermissions)
if mission.hud == nil then
-- add waypoint markers if new mission
mission.hud = {}
if mission.source ~= nil then
mission.hud.source = player:hud_add({
hud_elem_type = "waypoint",
name = mission.source.title .. "(Source)",
text = "m",
number = 0x0000FF,
world_pos = {x=mission.source.x, y=mission.source.y, z=mission.source.z}
})
end
mission.hud.target = player:hud_add({
hud_elem_type = "waypoint",
name = mission.target.title .. "(Destination)",

23
transport.lua
View File

@ -28,9 +28,6 @@ local update_formspec = function(meta)
"button_exit[6,1;2,1;start;Start]" ..
-- col 2
-- TODO: implement source-inv, uncomment from-spec afterwards
-- "label[0,2;From]" ..
-- "list[context;from;1,2;1,1;]" ..
"label[2,2;To]" ..
"list[context;to;3,2;1,1;]" ..
"field[6,2.5;2,1;time;Time (min);" .. meta:get_int("time") .. "]" ..
@ -38,13 +35,11 @@ local update_formspec = function(meta)
-- col 3
"label[0,3;Reward]" ..
"list[context;reward;2,3;3,1;]" ..
-- "field[6,3.5;2,1;rewardmultiplier;Multiplier;" .. meta:get_int("reward-multi") .. "]" ..
xp_str("field[6,3.5;2,1;rewardxp;XP-Reward;" .. meta:get_int("rewardxp") .. "]") ..
-- col 4
"label[0,4;Transport]" ..
"list[context;transport;2,4;3,1;]" ..
-- "field[6,4.5;2,1;transportmultiplier;Multiplier;" .. meta:get_int("transport-multi") .. "]" ..
xp_str("field[6,4.5;2,1;penaltyxp;XP-Penalty;" .. meta:get_int("penaltyxp") .. "]") ..
-- col 5,6,7,8
@ -79,6 +74,7 @@ minetest.register_node("missions:transport", {
inv:set_size("to", 1)
inv:set_size("reward", 3)
inv:set_size("transport", 3)
meta:set_int("time", 300)
-- xp stuff
if has_xp_redo_mod then
@ -87,9 +83,6 @@ minetest.register_node("missions:transport", {
meta:set_int("entryxp", 0)
end
meta:set_int("reward-multi", 1)
meta:set_int("transport-multi", 1)
meta:set_int("time", 300)
update_formspec(meta)
end,
@ -160,12 +153,6 @@ minetest.register_node("missions:transport", {
local time = tonumber(fields.time)
if time ~= nil then meta:set_int("time", time) end
local rewardMulti = tonumber(fields.rewardmultiplier)
if rewardMulti~= nil then meta:set_int("reward-multi", rewardMulti) end
local transportMulti = tonumber(fields.transportmultiplier)
if transportMulti~= nil then meta:set_int("transport-multi", transportMulti) end
local rewardxp = tonumber(fields.rewardxp)
if rewardxp~= nil then meta:set_int("rewardxp", rewardxp) end
@ -188,12 +175,13 @@ minetest.register_node("missions:transport", {
mission.start = os.time(os.date("!*t"))
if has_xp_redo_mod then
mission.rewardxp = meta:get_int("rewardxp")
mission.penaltyxp = meta:get_int("penaltyxp")
mission.xp = {
reward = meta:get_int("rewardxp"),
penalty = meta:get_int("penaltyxp")
}
end
local reward = {}
reward.multiplier = meta:get_int("reward-multi")
reward.list = {}
local i=1
while i<=inv:get_size("reward") do
@ -206,7 +194,6 @@ minetest.register_node("missions:transport", {
mission.reward = reward;
local transport = {}
transport.multiplier = meta:get_int("transport-multi")
transport.list = {}
i = 1
while i<=inv:get_size("transport") do