Compare commits
3 Commits
19b8ea4028
...
armor-dama
Author | SHA1 | Date | |
---|---|---|---|
fed2087238 | |||
dfa19cce98 | |||
1d8509e75b |
6
.github/workflows/reference.yml
vendored
@ -11,15 +11,15 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: Setup Lua
|
||||
uses: leafo/gh-actions-lua@v8
|
||||
uses: leafo/gh-actions-lua@v10.0.0
|
||||
with:
|
||||
luaVersion: 5.4
|
||||
- name: Setup Lua Rocks
|
||||
uses: leafo/gh-actions-luarocks@v4
|
||||
- name: Setup LDoc dependencies
|
||||
run: luarocks install --only-deps https://raw.githubusercontent.com/lunarmodules/LDoc/master/ldoc-scm-3.rockspec
|
||||
run: luarocks install --only-deps https://raw.githubusercontent.com/lunarmodules/ldoc/master/rockspecs/ldoc-1.5.0-1.rockspec
|
||||
- name: Setup LDoc
|
||||
run: git clone --single-branch --branch=custom https://github.com/AntumDeluge/ldoc.git .ldoc/ldoc && chmod +x .ldoc/ldoc/ldoc.lua
|
||||
- name: Generate docs
|
||||
|
1
.gitignore
vendored
@ -4,6 +4,7 @@
|
||||
*bak*
|
||||
tags
|
||||
*.vim
|
||||
armor.conf
|
||||
|
||||
## Eclipse project files & directories
|
||||
.project
|
||||
|
@ -631,6 +631,9 @@ end
|
||||
armor.damage = function(self, player, index, stack, use)
|
||||
local old_stack = ItemStack(stack)
|
||||
local worn_armor = armor:get_weared_armor_elements(player)
|
||||
if not worn_armor then
|
||||
return
|
||||
end
|
||||
local armor_worn_cnt = 0
|
||||
for k,v in pairs(worn_armor) do
|
||||
armor_worn_cnt = armor_worn_cnt + 1
|
||||
@ -681,6 +684,10 @@ armor.equip = function(self, player, itemstack)
|
||||
for i=1, armor_inv:get_size("armor") do
|
||||
local stack = armor_inv:get_stack("armor", i)
|
||||
if self:get_element(stack:get_name()) == armor_element then
|
||||
--prevents equiping an armor that would unequip a cursed armor.
|
||||
if minetest.get_item_group(stack:get_name(), "cursed") ~= 0 then
|
||||
return itemstack
|
||||
end
|
||||
index = i
|
||||
self:unequip(player, armor_element)
|
||||
break
|
||||
|
@ -1,37 +0,0 @@
|
||||
-- Armor Configuration (defaults)
|
||||
|
||||
-- Increase this if you get initialization glitches when a player first joins.
|
||||
ARMOR_INIT_DELAY = 3
|
||||
|
||||
-- Number of initialization attempts.
|
||||
-- Use in conjunction with ARMOR_INIT_DELAY if initialization problems persist.
|
||||
ARMOR_INIT_TIMES = 3
|
||||
|
||||
-- Increase this if armor is not getting into bones due to server lag.
|
||||
ARMOR_BONES_DELAY = 3
|
||||
|
||||
-- How often player armor/wield items are updated.
|
||||
ARMOR_UPDATE_TIME = 1
|
||||
|
||||
-- Drop armor when a player dies.
|
||||
-- Uses bones mod if present, otherwise items are dropped around the player.
|
||||
ARMOR_DROP = true
|
||||
|
||||
-- Pulverise armor when a player dies, overrides ARMOR_DROP.
|
||||
ARMOR_DESTROY = false
|
||||
|
||||
-- You can use this to increase or decrease overall armor effectiveness,
|
||||
-- eg: ARMOR_LEVEL_MULTIPLIER = 0.5 will reduce armor level by half.
|
||||
ARMOR_LEVEL_MULTIPLIER = 1
|
||||
|
||||
-- You can use this to increase or decrease overall armor healing,
|
||||
-- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether.
|
||||
ARMOR_HEAL_MULTIPLIER = 1
|
||||
|
||||
-- You can also use this file to execute arbitary lua code
|
||||
-- eg: Dumb the armor down if using Simple Mobs
|
||||
--if minetest.get_modpath("mobs") then
|
||||
-- ARMOR_LEVEL_MULTIPLIER = 1
|
||||
-- ARMOR_HEAL_MULTIPLIER = 0
|
||||
--end
|
||||
|
@ -224,6 +224,11 @@ local function init_player_armor(initplayer)
|
||||
if player:get_player_name() ~= name then
|
||||
return 0
|
||||
end
|
||||
--cursed items cannot be unequiped by the player
|
||||
local is_cursed = minetest.get_item_group(stack:get_name(), "cursed") ~= 0
|
||||
if not minetest.is_creative_enabled(player) and is_cursed then
|
||||
return 0
|
||||
end
|
||||
return stack:get_count()
|
||||
end,
|
||||
allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
|
||||
@ -355,9 +360,12 @@ if armor.config.drop == true or armor.config.destroy == true then
|
||||
for i=1, armor_inv:get_size("armor") do
|
||||
local stack = armor_inv:get_stack("armor", i)
|
||||
if stack:get_count() > 0 then
|
||||
table.insert(drop, stack)
|
||||
armor:run_callbacks("on_unequip", player, i, stack)
|
||||
armor_inv:set_stack("armor", i, nil)
|
||||
--soulbound armors remain equipped after death
|
||||
if minetest.get_item_group(stack:get_name(), "soulbound") == 0 then
|
||||
table.insert(drop, stack)
|
||||
armor:run_callbacks("on_unequip", player, i, stack)
|
||||
armor_inv:set_stack("armor", i, nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
armor:save_armor_inventory(player)
|
||||
@ -393,8 +401,8 @@ if armor.config.drop == true or armor.config.destroy == true then
|
||||
end)
|
||||
end
|
||||
end)
|
||||
else -- reset un-dropped armor and it's effects
|
||||
minetest.register_on_respawnplayer(function(player)
|
||||
-- reset un-dropped armor and it's effects
|
||||
armor:set_player_armor(player)
|
||||
end)
|
||||
end
|
||||
@ -511,5 +519,3 @@ if armor.config.fire_protect == true then
|
||||
return hp_change
|
||||
end, true)
|
||||
end
|
||||
|
||||
minetest.log("action", "[3d_armor] loaded.")
|
||||
|
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 274 B |
Before Width: | Height: | Size: 339 B After Width: | Height: | Size: 349 B |
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 571 B |
@ -353,5 +353,3 @@ minetest.register_craft({
|
||||
{"3d_armor_stand:armor_stand", "default:steel_ingot"},
|
||||
}
|
||||
})
|
||||
|
||||
minetest.log("action", "[3d_armor_stand] loaded.")
|
||||
|
@ -46,9 +46,6 @@ unified_inventory.register_page("armor", {
|
||||
"image[3.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]"..
|
||||
"label[6.0,"..(fy + 0.0)..";"..F(S("Level"))..": "..armor.def[name].level.."]"..
|
||||
"label[6.0,"..(fy + 0.5)..";"..F(S("Heal"))..": "..armor.def[name].heal.."]"..
|
||||
"label[6.0,"..(fy + 2.0)..";"..F(S("Speed"))..": "..armor.def[name].speed.."]"..
|
||||
"label[6.0,"..(fy + 2.5)..";"..F(S("Jump"))..": "..armor.def[name].jump.."]"..
|
||||
"label[6.0,"..(fy + 3.0)..";"..F(S("Gravity"))..": "..armor.def[name].gravity.."]"..
|
||||
"listring[current_player;main]"..
|
||||
"listring[detached:"..name.."_armor;armor]"
|
||||
if armor.config.fire_protect then
|
||||
@ -62,5 +59,3 @@ unified_inventory.register_page("armor", {
|
||||
return {formspec=formspec}
|
||||
end,
|
||||
})
|
||||
|
||||
minetest.log("action", "[3d_armor_ui] loaded.")
|
||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 258 B |
Before Width: | Height: | Size: 548 B After Width: | Height: | Size: 261 B |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 409 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 285 B |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 869 B After Width: | Height: | Size: 261 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 216 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 256 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 188 B |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 214 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 288 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 298 B |
Before Width: | Height: | Size: 937 B After Width: | Height: | Size: 253 B |
Before Width: | Height: | Size: 602 B After Width: | Height: | Size: 241 B |
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 337 B |
Before Width: | Height: | Size: 796 B After Width: | Height: | Size: 271 B |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 207 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 261 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 180 B |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 245 B |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 278 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 273 B |
Before Width: | Height: | Size: 903 B After Width: | Height: | Size: 252 B |
Before Width: | Height: | Size: 821 B After Width: | Height: | Size: 239 B |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 393 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 286 B |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 325 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 203 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 194 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 246 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 183 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 217 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 251 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 261 B |
Before Width: | Height: | Size: 236 B After Width: | Height: | Size: 261 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 258 B |
Before Width: | Height: | Size: 613 B After Width: | Height: | Size: 404 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 289 B |
Before Width: | Height: | Size: 494 B After Width: | Height: | Size: 350 B |
Before Width: | Height: | Size: 834 B After Width: | Height: | Size: 257 B |
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 217 B |
Before Width: | Height: | Size: 142 B After Width: | Height: | Size: 258 B |
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 186 B |
Before Width: | Height: | Size: 154 B After Width: | Height: | Size: 212 B |
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 290 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 268 B |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 265 B |
Before Width: | Height: | Size: 872 B After Width: | Height: | Size: 270 B |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 429 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 290 B |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 353 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 269 B |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 220 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 189 B |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 213 B |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 294 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 308 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 245 B |
Before Width: | Height: | Size: 779 B After Width: | Height: | Size: 226 B |
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 281 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 353 B |
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 251 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 202 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 256 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 178 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 238 B |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 272 B |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 257 B |
Before Width: | Height: | Size: 854 B After Width: | Height: | Size: 261 B |
Before Width: | Height: | Size: 530 B After Width: | Height: | Size: 272 B |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 416 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 286 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 338 B |
Before Width: | Height: | Size: 732 B After Width: | Height: | Size: 253 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 224 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 246 B |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 180 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 250 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 286 B |
Before Width: | Height: | Size: 881 B After Width: | Height: | Size: 315 B |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 233 B |
Before Width: | Height: | Size: 783 B After Width: | Height: | Size: 232 B |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 385 B |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 274 B |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 354 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 267 B |