mirror of
https://github.com/a-bad-dev/simple-shooter-game.git
synced 2026-06-09 04:16:30 +00:00
Massive update (#6)
* Refactor some of the code, multiple bug fixes * Fix something stupid * More bug fixes * LOTS OF STUFF * Make the sniper alot stronger and other changes * Prevent Players from respawning in the middle of a match * Fix stupid mistake * Small update * More updates * Remove minimap access.. and downgrade the sniper class
This commit is contained in:
parent
6c26978752
commit
17eeae8937
499 changed files with 616 additions and 225 deletions
94
mods/misc/xcompat/src/materials/farlands_reloaded.lua
Normal file
94
mods/misc/xcompat/src/materials/farlands_reloaded.lua
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
local materials = {
|
||||
sand = "fl_stone:sand",
|
||||
sandstone = "fl_stone:sandstone",
|
||||
gravel = "fl_topsoil:gravel",
|
||||
flint = "fl_topsoil:flint",
|
||||
copper_ingot = "fl_ores:copper_ingot",
|
||||
steel_ingot = "fl_ores:iron_ingot",
|
||||
gold_ingot = "fl_ores:gold_ingot",
|
||||
tin_ingot = "fl_ores:tin_ingot",
|
||||
copper_block = "fl_ores:copper_block",
|
||||
steel_block = "fl_ores:iron_block",
|
||||
gold_block = "fl_ores:gold_block",
|
||||
tin_block = "fl_ores:tin_block",
|
||||
axe_steel = "fl_tools:steel_axe",
|
||||
axe_diamond = "fl_tools:diamond_axe",
|
||||
axe_bronze = "fl_tools:bronze_axe",
|
||||
axe_stone = "fl_tools:stone_axe",
|
||||
axe_wood = "fl_tools:wood_axe",
|
||||
pick_steel = "fl_tools:steel_pick",
|
||||
mese = "fl_ores:iron_ingot",
|
||||
mese_crystal = "fl_ores:iron_ingot",
|
||||
mese_crystal_fragment = "fl_ores:iron_ingot",
|
||||
torch = "fl_light_sources:torch",
|
||||
diamond = "fl_ores:diamond",
|
||||
clay_lump = "fl_bricks:clay_lump",
|
||||
water_bucket = "fl_bucket:bucket_water",
|
||||
empty_bucket = "fl_bucket:bucket",
|
||||
dye_dark_grey = "fl_dyes:dark_grey_dye",
|
||||
dye_black = "fl_dyes:black_dye",
|
||||
dye_white = "fl_dyes:white_dye",
|
||||
dye_green = "fl_dyes:green_dye",
|
||||
dye_red = "fl_dyes:red_dye",
|
||||
dye_yellow = "fl_dyes:yellow_dye",
|
||||
dye_brown = "fl_dyes:brown_dye",
|
||||
dye_blue = "fl_dyes:blue_dye",
|
||||
dye_violet = "fl_dyes:violet_dye",
|
||||
dye_grey = "fl_dyes:grey_dye",
|
||||
dye_dark_green = "fl_dyes:dark_green_dye",
|
||||
dye_orange = "fl_dyes:orange_dye",
|
||||
dye_pink = "fl_dyes:pink_dye",
|
||||
dye_cyan = "fl_dyes:cyan_dye",
|
||||
dye_magenta = "fl_dyes:magenta_dye",
|
||||
silver_ingot = "fl_ores:iron_ingot",
|
||||
silicon = "mesecons_materials:silicon",
|
||||
string = "fl_plantlife:oxeye_daisy",
|
||||
paper = "",
|
||||
book = "",
|
||||
iron_lump = "fl_ores:iron_ore",
|
||||
wool_grey = "",
|
||||
wool_green = "",
|
||||
wool_dark_green = "",
|
||||
wool_brown = "",
|
||||
wool_black = "",
|
||||
wool_white = "",
|
||||
slab_stone = "fl_stone:stone_slab",
|
||||
slab_wood = "fl_trees:apple_plank_slab",
|
||||
glass = "fl_glass:framed_glass",
|
||||
glass_block = "fl_glass:framed_glass",
|
||||
glass_bottle = "fl_bottles:bottle",
|
||||
coal_lump = "fl_ores:coal_ore",
|
||||
stone = "fl_stone:stone",
|
||||
desert_stone = "fl_stone:desert_stone",
|
||||
desert_sand = "fl_stone:desert_sand",
|
||||
chest = "fl_storage:wood_chest",
|
||||
cobble = "fl_stone:stone_rubble",
|
||||
brick = "",
|
||||
obsidian_glass = "",
|
||||
water_source = "fl_liquids:water_source",
|
||||
water_flowing = "fl_liquids:water_flowing",
|
||||
dirt = "fl_stone:dirt",
|
||||
dirt_with_grass = "fl_topsoil:dirt_with_grass",
|
||||
apple_leaves = "fl_trees:apple_leaves",
|
||||
apple_log = "fl_trees:apple_trunk",
|
||||
apple_planks = "fl_trees:apple_plank",
|
||||
birch_leaves = "fl_trees:aspen_leaves",
|
||||
birch_log = "fl_trees:aspen_trunk",
|
||||
birch_planks = "fl_trees:aspen_plank",
|
||||
jungle_leaves = "fl_trees:jungletree_leaves",
|
||||
bowl = "",
|
||||
stick = "fl_trees:stick",
|
||||
obsidian = "",
|
||||
}
|
||||
|
||||
if minetest.get_modpath("basic_materials") then
|
||||
materials.paper = "basic_materials:plastic_sheet"
|
||||
end
|
||||
|
||||
if minetest.registered_items["farming:bowl"] then
|
||||
materials.bowl = "farming:bowl"
|
||||
elseif minetest.get_modpath("x_farming") then
|
||||
materials.bowl = "x_farming:bowl"
|
||||
end
|
||||
|
||||
return materials
|
||||
108
mods/misc/xcompat/src/materials/hades_revisited.lua
Normal file
108
mods/misc/xcompat/src/materials/hades_revisited.lua
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
local materials = {
|
||||
sand = "hades_core:fertile_sand",
|
||||
sandstone = "hades_core:sandstone",
|
||||
gravel = "hades_core:gravel",
|
||||
flint = "",
|
||||
copper_ingot = "hades_core:copper_ingot",
|
||||
steel_ingot = "hades_core:steel_ingot",
|
||||
gold_ingot = "hades_core:gold_ingot",
|
||||
tin_ingot = "hades_core:tin_ingot",
|
||||
silver_ingot = "--unknown--",
|
||||
copper_block = "hades_core:copperblock",
|
||||
steel_block = "hades_core:steelblock",
|
||||
gold_block = "hades_core:goldblock",
|
||||
tin_block = "hades_core:tinblock",
|
||||
axe_steel = "hades_core:axe_steel",
|
||||
axe_diamond = "hades_core:axe_diamond",
|
||||
axe_bronze = "hades_core:axe_bronze",
|
||||
axe_stone = "hades_core:axe_stone",
|
||||
axe_wood = "hades_core:axe_wood",
|
||||
pick_steel = "hades_core:pick_steel",
|
||||
mese = "hades_core:mese",
|
||||
mese_crystal = "hades_core:mese_crystal",
|
||||
mese_crystal_fragment = "hades_core:mese_crystal_fragment",
|
||||
torch = "hades_torches:torch",
|
||||
diamond = "hades_core:diamond",
|
||||
clay_lump = "hades_core:clay_lump",
|
||||
clay_brick = "hades_core:clay_brick",
|
||||
|
||||
--[[
|
||||
Since hades doesnt have buckets or water for the user,
|
||||
using dirt from near water to pull the water out
|
||||
]]
|
||||
water_bucket = "hades_core:dirt",
|
||||
empty_bucket = "hades_core:fertile_sand",
|
||||
dye_dark_grey = "dye:dark_grey",
|
||||
dye_black = "dye:black",
|
||||
dye_white = "dye:white",
|
||||
dye_green = "dye:green",
|
||||
dye_red = "dye:red",
|
||||
dye_yellow = "dye:yellow",
|
||||
dye_brown = "dye:brown",
|
||||
dye_blue = "dye:blue",
|
||||
dye_violet = "dye:violet",
|
||||
dye_grey = "dye:grey",
|
||||
dye_dark_green = "dye:dark_green",
|
||||
dye_orange = "dye:orange",
|
||||
dye_pink = "dye:pink",
|
||||
dye_cyan = "dye:cyan",
|
||||
dye_magenta = "dye:magenta",
|
||||
silicon = "hades_materials:silicon",
|
||||
string = "hades_farming:string",
|
||||
paper = "hades_core:paper",
|
||||
book = "hades_core:book",
|
||||
iron_lump = "hades_core:iron_lump",
|
||||
wool_grey = "wool:grey",
|
||||
wool_green = "wool:green",
|
||||
wool_dark_green = "wool:dark_green",
|
||||
wool_brown = "wool:brown",
|
||||
wool_black = "wool:black",
|
||||
wool_white = "wool:white",
|
||||
slab_stone = "stairs:slab_stone",
|
||||
slab_wood = "stairs:slab_wood",
|
||||
glass = "hades_core:glass",
|
||||
glass_block = "hades_core:glass",
|
||||
glass_bottle = "vessels:glass_bottle",
|
||||
obsidian_glass = "hades_core:obsidian_glass",
|
||||
coal_lump = "hades_core:coal_lump",
|
||||
stone = "hades_core:stone",
|
||||
desert_stone = "hades_core:stone_baked",
|
||||
desert_sand = "hades_core:volcanic_sand",
|
||||
chest = "hades_chests:chest";
|
||||
cobble = "hades_core:cobble",
|
||||
brick = "hades_core:brick",
|
||||
water_source = "hades_core:water_source",
|
||||
water_flowing = "hades_core:water_flowing",
|
||||
dirt = "hades_core:dirt",
|
||||
dirt_with_grass = "hades_core:dirt_with_grass",
|
||||
apple_leaves = "hades_trees:leaves",
|
||||
apple_log = "hades_trees:tree",
|
||||
apple_planks = "hades_trees:wood",
|
||||
birch_leaves = "hades_core:birch_leaves",
|
||||
birch_log = "hades_trees:birch_tree",
|
||||
birch_planks = "hades_trees:cream_wood",
|
||||
jungle_leaves = "hades_trees:jungle_leaves",
|
||||
--hades has no bowl but you get plate on eat so makes most sense?
|
||||
bowl = "hades_food:plate",
|
||||
stick = "hades_core:stick",
|
||||
obsidian = "hades_core:obsidian",
|
||||
}
|
||||
|
||||
if minetest.get_modpath("hades_bucket") then
|
||||
materials["water_bucket"] = "hades_bucket:bucket_water"
|
||||
materials["empty_bucket"] = "hades_bucket:bucket_empty"
|
||||
end
|
||||
if minetest.get_modpath("hades_extraores") then
|
||||
materials["silver_ingot"] = "hades_extraores:silver_ingot"
|
||||
materials["aluminum_ingot"] = "hades_extraores:aluminum_ingot"
|
||||
end
|
||||
if minetest.get_modpath("hades_default") then
|
||||
materials.desert_sand = "hades_default:desert_sand"
|
||||
end
|
||||
if minetest.get_modpath("hades_technic") then
|
||||
materials.lead_ingot = "hades_technic:lead_ingot"
|
||||
materials.carbon_steel_ingot = "hades_technic:carbon_steel_ingot"
|
||||
materials.stainless_steel_ingot = "hades_technic:stainless_steel_ingot"
|
||||
end
|
||||
|
||||
return materials
|
||||
118
mods/misc/xcompat/src/materials/mineclonia.lua
Normal file
118
mods/misc/xcompat/src/materials/mineclonia.lua
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
--note this file handles mineclonia, mineclone2, and its rename voxelibre
|
||||
|
||||
local mcl_dyes = minetest.get_modpath("mcl_dyes")
|
||||
local mcl_dyes_name = mcl_dyes and "mcl_dyes" or "mcl_dye"
|
||||
|
||||
local materials = {
|
||||
sand = "mcl_core:sand",
|
||||
sandstone = "mcl_core:sandstone",
|
||||
gravel = "mcl_core:gravel",
|
||||
flint = "mcl_core:flint",
|
||||
copper_ingot = "mcl_copper:copper_ingot",
|
||||
steel_ingot = "mcl_core:iron_ingot",
|
||||
gold_ingot = "mcl_core:gold_ingot",
|
||||
tin_ingot = "mcl_core:iron_ingot",
|
||||
copper_block = "mcl_copper:block",
|
||||
steel_block = "mcl_core:ironblock",
|
||||
gold_block = "mcl_core:goldblock",
|
||||
tin_block = "mcl_core:ironblock",
|
||||
axe_steel = "mcl_core:axe_steel",
|
||||
axe_diamond = "mcl_core:axe_diamond",
|
||||
axe_bronze = "mcl_core:axe_bronze",
|
||||
axe_stone = "mcl_core:axe_stone",
|
||||
axe_wood = "mcl_core:axe_wood",
|
||||
pick_steel = "mcl_core:pick_steel",
|
||||
torch = "mcl_torches:torch",
|
||||
diamond = "mcl_core:diamond",
|
||||
clay_lump = "mcl_core:clay_lump",
|
||||
water_bucket = "mcl_buckets:bucket_water",
|
||||
empty_bucket = "mcl_buckets:bucket_empty",
|
||||
dye_dark_grey = mcl_dyes_name .. ":dark_grey",
|
||||
dye_black = mcl_dyes_name .. ":black",
|
||||
dye_white = mcl_dyes_name .. ":white",
|
||||
dye_green = mcl_dyes_name .. ":green",
|
||||
dye_red = mcl_dyes_name .. ":red",
|
||||
dye_yellow = mcl_dyes_name .. ":yellow",
|
||||
dye_brown = mcl_dyes_name .. ":brown",
|
||||
dye_blue = mcl_dyes_name .. ":blue",
|
||||
dye_violet = mcl_dyes_name .. ":violet",
|
||||
dye_grey = mcl_dyes_name .. ":grey",
|
||||
dye_dark_green = mcl_dyes_name .. ":dark_green",
|
||||
dye_orange = mcl_dyes_name .. ":orange",
|
||||
dye_pink = mcl_dyes_name .. ":pink",
|
||||
dye_cyan = mcl_dyes_name .. ":cyan",
|
||||
dye_magenta = mcl_dyes_name .. ":magenta",
|
||||
silicon = "mcl_core:iron_ingot",
|
||||
string = "mcl_mobitems:string",
|
||||
paper = "mcl_core:paper",
|
||||
book = "mcl_books:book",
|
||||
iron_lump = "mcl_raw_ores:raw_iron",
|
||||
wool_grey = "mcl_wool:grey",
|
||||
wool_green = "mcl_wool:green",
|
||||
wool_dark_green = "mcl_wool:dark_green",
|
||||
wool_brown = "mcl_wool:brown",
|
||||
wool_black = "mcl_wool:black",
|
||||
wool_white = "mcl_wool:white",
|
||||
slab_stone = "mcl_stairs:slab_stone",
|
||||
slab_wood = "mcl_stairs:slab_wood",
|
||||
glass = "mcl_core:glass",
|
||||
glass_block = "mcl_core:glass",
|
||||
glass_bottle = "mcl_potions:glass_bottle",
|
||||
coal_lump = "mcl_core:coal_lump",
|
||||
stone = "mcl_core:stone",
|
||||
desert_stone = "mcl_core:redsandstone",
|
||||
desert_sand = "mcl_core:sand",
|
||||
chest = "mcl_chests:chest",
|
||||
cobble = "mcl_core:cobble",
|
||||
brick = "mcl_core:brick",
|
||||
obsidian_glass = "",
|
||||
water_source = "mcl_core:water_source",
|
||||
water_flowing = "mcl_core:water_flowing",
|
||||
dirt = "mcl_core:dirt",
|
||||
dirt_with_grass = "mcl_core:dirt_with_grass",
|
||||
bowl = "mcl_core:bowl",
|
||||
stick = "mcl_core:stick",
|
||||
obsidian = "mcl_core:obsidian",
|
||||
}
|
||||
|
||||
if minetest.get_modpath("mcl_redstone") then
|
||||
materials.mese = "mcl_redstone_torch:redstoneblock"
|
||||
materials.mese_crystal = "mcl_redstone:redstone"
|
||||
materials.mese_crystal_fragment = "mcl_core:iron_ingot"
|
||||
else
|
||||
materials.mese = "mesecons_torch:redstoneblock"
|
||||
materials.mese_crystal = "mesecons:redstone"
|
||||
materials.mese_crystal_fragment = "mcl_core:iron_ingot"
|
||||
end
|
||||
|
||||
if minetest.get_modpath("mcl_trees") then
|
||||
materials.apple_leaves = "mcl_trees:leaves_oak"
|
||||
materials.apple_log = "mcl_trees:tree_oak"
|
||||
materials.apple_planks = "mcl_trees:wood_oak"
|
||||
materials.birch_leaves = "mcl_trees:leaves_birch"
|
||||
materials.birch_log = "mcl_trees:tree_birch"
|
||||
materials.birch_planks = "mcl_trees:wood_birch"
|
||||
materials.jungle_leaves = "mcl_trees:leaves_jungle"
|
||||
else
|
||||
materials.apple_leaves = "mcl_core:leaves"
|
||||
materials.apple_log = "mcl_core:tree"
|
||||
materials.apple_planks = "mcl_core:wood"
|
||||
materials.birch_leaves = "mcl_core:birchleaves"
|
||||
materials.birch_log = "mcl_core:birchtree"
|
||||
materials.birch_planks = "mcl_core:birchwood"
|
||||
materials.jungle_leaves = "mcl_core:jungleleaves"
|
||||
end
|
||||
|
||||
if minetest.get_modpath("moreores") then
|
||||
materials.tin_ingot = "moreores:tin_ingot"
|
||||
materials.tin_block = "moreores:tin_block"
|
||||
materials.silver_ingot = "moreores:silver_ingot"
|
||||
end
|
||||
|
||||
if minetest.get_modpath("technic") then
|
||||
materials.lead_ingot = "technic:lead_ingot"
|
||||
materials.carbon_steel_ingot = "technic:carbon_steel_ingot"
|
||||
materials.stainless_steel_ingot = "technic:stainless_steel_ingot"
|
||||
end
|
||||
|
||||
return materials
|
||||
107
mods/misc/xcompat/src/materials/minetest.lua
Normal file
107
mods/misc/xcompat/src/materials/minetest.lua
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
local materials = {
|
||||
sand = "default:sand",
|
||||
sandstone = "default:sandstone",
|
||||
gravel = "default:gravel",
|
||||
flint = "default:flint",
|
||||
copper_ingot = "default:copper_ingot",
|
||||
steel_ingot = "default:steel_ingot",
|
||||
gold_ingot = "default:gold_ingot",
|
||||
tin_ingot = "default:tin_ingot",
|
||||
copper_block = "default:copperblock",
|
||||
steel_block = "default:steelblock",
|
||||
gold_block = "default:goldblock",
|
||||
tin_block = "default:tinblock",
|
||||
axe_steel = "default:axe_steel",
|
||||
axe_diamond = "default:axe_diamond",
|
||||
axe_bronze = "default:axe_bronze",
|
||||
axe_stone = "default:axe_stone",
|
||||
axe_wood = "default:axe_wood",
|
||||
pick_steel = "default:pick_steel",
|
||||
mese = "default:mese",
|
||||
mese_crystal = "default:mese_crystal",
|
||||
mese_crystal_fragment = "default:mese_crystal_fragment",
|
||||
torch = "default:torch",
|
||||
diamond = "default:diamond",
|
||||
clay_lump = "default:clay_lump",
|
||||
water_bucket = "bucket:bucket_water",
|
||||
empty_bucket = "bucket:bucket_empty",
|
||||
dye_dark_grey = "dye:dark_grey",
|
||||
dye_black = "dye:black",
|
||||
dye_white = "dye:white",
|
||||
dye_green = "dye:green",
|
||||
dye_red = "dye:red",
|
||||
dye_yellow = "dye:yellow",
|
||||
dye_brown = "dye:brown",
|
||||
dye_blue = "dye:blue",
|
||||
dye_violet = "dye:violet",
|
||||
dye_grey = "dye:grey",
|
||||
dye_dark_green = "dye:dark_green",
|
||||
dye_orange = "dye:orange",
|
||||
dye_pink = "dye:pink",
|
||||
dye_cyan = "dye:cyan",
|
||||
dye_magenta = "dye:magenta",
|
||||
silicon = "mesecons_materials:silicon",
|
||||
string = "farming:string",
|
||||
paper = "default:paper",
|
||||
book = "default:book",
|
||||
iron_lump = "default:iron_lump",
|
||||
wool_grey = "wool:grey",
|
||||
wool_green = "wool:green",
|
||||
wool_dark_green = "wool:dark_green",
|
||||
wool_brown = "wool:brown",
|
||||
wool_black = "wool:black",
|
||||
wool_white = "wool:white",
|
||||
slab_stone = "stairs:slab_stone",
|
||||
slab_wood = "stairs:slab_wood",
|
||||
glass = "default:glass",
|
||||
glass_block = "default:glass",
|
||||
glass_bottle = "vessels:glass_bottle",
|
||||
coal_lump = "default:coal_lump",
|
||||
stone = "default:stone",
|
||||
desert_stone = "default:desert_stone",
|
||||
desert_sand = "default:desert_sand",
|
||||
chest = "default:chest",
|
||||
cobble = "default:cobble",
|
||||
brick = "default:brick",
|
||||
obsidian_glass = "default:obsidian_glass",
|
||||
water_source = "default:water_source",
|
||||
water_flowing = "default:water_flowing",
|
||||
dirt = "default:dirt",
|
||||
dirt_with_grass = "default:dirt_with_grass",
|
||||
apple_leaves = "default:leaves",
|
||||
apple_log = "default:tree",
|
||||
apple_planks = "default:wood",
|
||||
birch_leaves = "default:aspen_leaves",
|
||||
birch_log = "default:aspen_tree",
|
||||
birch_planks = "default:aspen_wood",
|
||||
jungle_leaves = "default:jungleleaves",
|
||||
bowl = "",
|
||||
stick = "default:stick",
|
||||
obsidian = "default:obsidian",
|
||||
}
|
||||
|
||||
if minetest.registered_items["farming:bowl"] then
|
||||
materials.bowl = "farming:bowl"
|
||||
elseif minetest.get_modpath("x_farming") then
|
||||
materials.bowl = "x_farming:bowl"
|
||||
end
|
||||
|
||||
if minetest.get_modpath("moreores") then
|
||||
materials.silver_ingot = "moreores:silver_ingot"
|
||||
end
|
||||
|
||||
if minetest.get_modpath("technic") then
|
||||
materials.lead_ingot = "technic:lead_ingot"
|
||||
materials.carbon_steel_ingot = "technic:carbon_steel_ingot"
|
||||
materials.stainless_steel_ingot = "technic:stainless_steel_ingot"
|
||||
end
|
||||
|
||||
if minetest.get_modpath("aloz") then
|
||||
materials.aluminum_ingot = "aloz:aluminum_ingot"
|
||||
end
|
||||
|
||||
if minetest.get_modpath("techage") then
|
||||
materials.aluminum_ingot = "techage:aluminum"
|
||||
end
|
||||
|
||||
return materials
|
||||
Loading…
Add table
Add a link
Reference in a new issue