[airtanks] Update to Git patch 71ea616:

https://github.com/AntumMT/mod-airtanks/tree/71ea616
This commit is contained in:
AntumDeluge 2017-06-28 16:20:53 -07:00
parent c6ba0b6e1c
commit 89664db335
7 changed files with 178 additions and 34 deletions

View File

@ -38,7 +38,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
* [currency][] ([WTFPL][lic.currency]) -- version: [3ee673d Git][ver.currency] *2017-05-18* ([patched][patch.currency])
* [enchanting][] ([GPL / WTFPL / CC BY-SA-NA][lic.enchanting]) -- version: [13ea31c Git][ver.enchanting] *2016-12-16* ([patched][patch.enchanting])
* equipment/
* [airtanks][] ([MIT][lic.airtanks]) -- version: [5787956 Git][ver.airtanks] *2017-05-13*
* [airtanks][] ([MIT][lic.airtanks]) -- version: [5787956 Git][ver.airtanks] *2017-05-13* ([patche][patch.airtanks])
* [slingshot][] ([MIT][lic.slingshot] / [CC0][lic.cc0]) -- version: [ef698e8 Git][ver.slingshot] *2017-06-26*
* [throwing][] ([WTFPL][lic.wtfpl]) -- version: [90bcf43 Git][ver.throwing] *2013-09-27* ([patched][patch.throwing])
* [xtraarmor][] ([CC BY-SA][lic.ccbysa3.0]) -- version: 0.3
@ -518,6 +518,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.3d_armor]: https://github.com/AntumMT/mtmp-3d_armor/tree/09fa26f
[patch.adv_spawning]: https://github.com/AntumMT/mtmod-adv_spawning/tree/757197a
[patch.airtanks]: https://github.com/AntumMT/mod-airtanks/tree/71ea616
[patch.animalmaterials]: https://github.com/AntumMT/mtmp-animalmaterials/tree/c97f681
[patch.animals]: https://github.com/AntumMT/mtmp-animals_modpack/tree/3e25eb0
[patch.awards]: https://github.com/AntumMT/mtmod-awards/tree/638c137

View File

@ -1675,32 +1675,41 @@ coloredwood_enable_stairsplus = true
# *** airtanks ***
## Number of uses for a steel air tank.
# type: int
# min: 2
# max: 1000
## Air tanks will begin to wear out when used.
#
# Only works if 'enable_tool_wear' is enabled.
# type: bool
# default: true
#airtanks_enable_wear = true
## Air tanks will wear out even in creative mode.
#
# Only works if 'airtanks_enable_wear' is enabled.
# type: bool
# default: true
#airtanks_wear_in_creative = true
## Number of uses for steel air tanks.
# type: int
# min: 2
# max: 1000
# default: 30
#airtanks_steel_uses = 30
## Number of uses for a copper air tank.
# type: int
# min: 2
# max: 1000
## Number of uses for copper air tanks.
# type: int
# min: 2
# max: 1000
# default: 10
#airtanks_copper_uses = 10
## Number of uses for a bronze air tank.
# type: int
# min: 2
# max: 1000
## Number of uses for bronze air tanks.
# type: int
# min: 2
# max: 1000
# default: 20
#airtanks_bronze_uses = 20
## Air tanks wear out in creative mode.
# type: bool
# default: true
#airtanks_wear_in_creative = true
#########

View File

@ -6,6 +6,22 @@ local print_settingtypes = false
local CONFIG_FILE_PREFIX = "airtanks_"
local config = {}
-- Setting for air tanks to wear out & break
local enable_wear = minetest.settings:get_bool("enable_tool_wear")
if enable_wear == nil then
-- Default is enabled
enable_wear = true
end
-- Check local setting if wear/break is enabled
if enable_wear then
enable_wear = minetest.settings:get_bool("airtanks_enable_wear")
if enable_wear == nil then
-- Default is enabled
enable_wear = true
end
end
local function setting(stype, name, default, description)
local value
if stype == "bool" then
@ -87,15 +103,17 @@ local function use_airtank(itemstack, user, pointed_thing, full_item)
minetest.sound_play("airtanks_hiss", {pos = user:getpos(), gain = 0.5})
if (not minetest.settings:get_bool("creative_mode")) or config.wear_in_creative then
local wdef = itemstack:get_definition()
itemstack:add_wear(65535/(wdef._airtank_uses-1))
if itemstack:get_count() == 0 then
if wdef.sound and wdef.sound.breaks then
minetest.sound_play(wdef.sound.breaks,
{pos = user:getpos(), gain = 0.5})
if enable_wear then
local wdef = itemstack:get_definition()
itemstack:add_wear(65535/(wdef._airtank_uses-1))
if itemstack:get_count() == 0 then
if wdef.sound and wdef.sound.breaks then
minetest.sound_play(wdef.sound.breaks,
{pos = user:getpos(), gain = 0.5})
end
local inv = user:get_inventory()
itemstack = inv:add_item("main", wdef._airtank_empty)
end
local inv = user:get_inventory()
itemstack = inv:add_item("main", wdef._airtank_empty)
end
end
return itemstack

View File

@ -0,0 +1,89 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-27 14:50-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: init.lua:32
msgid "A tank containing compressed air."
msgstr ""
#: init.lua:33
#, lua-format
msgid ""
"If you're underwater and you're running out of breath, wield this item and "
"use it to replenish 5 bubbles on your breath bar. When fully charged this "
"tank has %i uses before it becomes empty."
msgstr ""
#: init.lua:35
msgid "A compressed air tank, currently empty."
msgstr ""
#: init.lua:36
#, lua-format
msgid ""
"This tank can be recharged with compressed air by using it on a compressor "
"block. When fully charged this tank has %i uses before it becomes empty."
msgstr ""
#: init.lua:38
msgid "A machine for filling air tanks with compressed air."
msgstr ""
#: init.lua:39
msgid ""
"Place this machine somewhere that it has access to air (one of its adjacent "
"nodes needs to have air in it). When you click on it with an empty or partly-"
"empty compressed air tank the tank will be refilled."
msgstr ""
#: init.lua:41
msgid "A breathing tube to allow automatic hands-free use of air tanks."
msgstr ""
#: init.lua:42
msgid ""
"If this item is present in your quick-use inventory then whenever your "
"breath bar goes below 5 it will automatically make use of any air tanks that "
"are present in your quick-use inventory to replenish your breath supply. "
"Note that it will not use air tanks that are present elsewhere in your "
"inventory, only ones in your quick-use bar."
msgstr ""
#: init.lua:105
msgid "Empty @1"
msgstr ""
#: init.lua:152
msgid "Steel Air Tank"
msgstr ""
#: init.lua:153
msgid "Copper Air Tank"
msgstr ""
#: init.lua:154
msgid "Bronze Air Tank"
msgstr ""
#: init.lua:167
msgid "Air Compressor"
msgstr ""
#: init.lua:203
msgid "Breathing Tube"
msgstr ""

View File

@ -0,0 +1,6 @@
@echo off
setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
cd ..
set LIST=
for /r %%X in (*.lua) do set LIST=!LIST! %%X
..\intllib\tools\xgettext.bat %LIST%

View File

@ -1,4 +1,15 @@
airtanks_steel_uses (Number of uses for a steel air tank) int 30 2 1000
airtanks_copper_uses (Number of uses for a copper air tank) int 10 2 1000
airtanks_bronze_uses (Number of uses for a bronze air tank) int 20 2 1000
airtanks_wear_in_creative (Air tanks wear out in creative mode) bool true
# If 'enable_tool_wear' is enabled, air tanks will begin to wear out when used.
airtanks_enable_wear (Wear out when used) bool true
# If 'airtanks_enable_wear' is enabled, air tanks will wear out even in creative mode.
airtanks_wear_in_creative (Wear out in creative mode) bool true
# Number of uses for steel air tanks.
airtanks_steel_uses (Steel air tank uses) int 30 2 1000
# Number of uses for copper air tanks.
airtanks_copper_uses (Copper air tank uses) int 10 2 1000
# Number of uses for bronze air tanks.
airtanks_bronze_uses (Bronze air tank uses) int 20 2 1000

View File

@ -59,10 +59,20 @@ chatlog.monthfirst (Timestamp shows month before day) bool true
[**airtanks]
airtanks_steel_uses (Number of uses for a steel air tank) int 30 2 1000
airtanks_copper_uses (Number of uses for a copper air tank) int 10 2 1000
airtanks_bronze_uses (Number of uses for a bronze air tank) int 20 2 1000
airtanks_wear_in_creative (Air tanks wear out in creative mode) bool true
# If 'enable_tool_wear' is enabled, air tanks will begin to wear out when used.
airtanks_enable_wear (Wear out when used) bool true
# If 'airtanks_enable_wear' is enabled, air tanks will wear out even in creative mode.
airtanks_wear_in_creative (Wear out in creative mode) bool true
# Number of uses for steel air tanks.
airtanks_steel_uses (Steel air tank uses) int 30 2 1000
# Number of uses for copper air tanks.
airtanks_copper_uses (Copper air tank uses) int 10 2 1000
# Number of uses for bronze air tanks.
airtanks_bronze_uses (Bronze air tank uses) int 20 2 1000
[**slingshot]