mirror of
https://github.com/a-bad-dev/simple-shooter-game.git
synced 2026-06-09 20:36:15 +00:00
Merge branch 'main' of https://github.com/IonicCheese/simple-shooter-game
This commit is contained in:
commit
ba9efa195a
2 changed files with 4 additions and 21 deletions
1
TODO.txt
1
TODO.txt
|
|
@ -1,6 +1,7 @@
|
||||||
Lines starting with "!" are high priority
|
Lines starting with "!" are high priority
|
||||||
TODO:
|
TODO:
|
||||||
|
|
||||||
|
!- Fix players turning into GreenBlob for some reason
|
||||||
-- GUIs to do everything
|
-- GUIs to do everything
|
||||||
-- Improve the maps by adding structures
|
-- Improve the maps by adding structures
|
||||||
-- Random loot spawning in chests in predefined places (inside houses)
|
-- Random loot spawning in chests in predefined places (inside houses)
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,13 @@
|
||||||
local player_data = {}
|
|
||||||
local alive_players = {}
|
local alive_players = {}
|
||||||
|
|
||||||
local function save_player_data(player)
|
local function save_player_data(player)
|
||||||
local name = player:get_player_name()
|
player:get_meta():set_string("skin", core.serialize(player:get_properties().textures))
|
||||||
player_data[name] = {
|
|
||||||
size = player:get_properties().visual_size,
|
|
||||||
skin = player:get_properties().textures,
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function load_player_data(player)
|
local function load_player_data(player)
|
||||||
local name = player:get_player_name()
|
|
||||||
player:set_properties({
|
player:set_properties({
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
textures = player_data[name].skin,
|
textures = core.deserialize(player:get_meta():get_string("skin"))
|
||||||
visual_size = player_data[name].size,
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -55,7 +48,6 @@ function set_player_mode(player, mode)
|
||||||
pointable = false,
|
pointable = false,
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
textures = {"blank.png"},
|
textures = {"blank.png"},
|
||||||
visual_size = {x=0, y=0},
|
|
||||||
})
|
})
|
||||||
|
|
||||||
player:set_nametag_attributes({color = {a = 0}})
|
player:set_nametag_attributes({color = {a = 0}})
|
||||||
|
|
@ -135,14 +127,6 @@ core.register_on_joinplayer(function(player)
|
||||||
list[current_player;main;0,1.25;8,3;8]
|
list[current_player;main;0,1.25;8,3;8]
|
||||||
listring[current_player;main]
|
listring[current_player;main]
|
||||||
]])
|
]])
|
||||||
|
|
||||||
local player_name = player:get_player_name()
|
|
||||||
|
|
||||||
player_data[player_name] = {
|
|
||||||
size = player:get_properties().visual_size,
|
|
||||||
skin = player:get_properties().textures,
|
|
||||||
}
|
|
||||||
|
|
||||||
player:set_properties({pointable = false})
|
player:set_properties({pointable = false})
|
||||||
|
|
||||||
set_player_mode(player, "normal")
|
set_player_mode(player, "normal")
|
||||||
|
|
@ -230,11 +214,9 @@ core.register_chatcommand("reset", {
|
||||||
player:get_inventory():set_list("main", {})
|
player:get_inventory():set_list("main", {})
|
||||||
player:set_properties({
|
player:set_properties({
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
textures = player_data[player_name].skin,
|
textures = core.deserialize(player:get_meta():get_string("skin")),
|
||||||
visual_size = player_data[player_name].size,
|
|
||||||
pointable=false,
|
pointable=false,
|
||||||
})
|
})
|
||||||
player_data[player_name] = {}
|
|
||||||
end
|
end
|
||||||
core.chat_send_all(core.colorize("red", "Match terminated."))
|
core.chat_send_all(core.colorize("red", "Match terminated."))
|
||||||
return ""
|
return ""
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue