diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml new file mode 100644 index 0000000..4bea2fa --- /dev/null +++ b/.github/workflows/integration-test.yml @@ -0,0 +1,14 @@ +name: integration-test + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - name: integration-test + run: ./integration-test.sh diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml new file mode 100644 index 0000000..d00f53a --- /dev/null +++ b/.github/workflows/luacheck.yml @@ -0,0 +1,17 @@ +name: luacheck + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: apt + run: sudo apt-get install -y luarocks + - name: luacheck install + run: luarocks install --local luacheck + - name: luacheck run + run: $HOME/.luarocks/bin/luacheck ./ diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..88349af --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,32 @@ + +unused_args = false + +globals = { + "wieldview", + "armor", + "inventory_plus" +} + +read_globals = { + -- Stdlib + string = {fields = {"split"}}, + table = {fields = {"copy", "getn"}}, + + -- Minetest + "vector", "ItemStack", + "dump", "VoxelArea", + + -- deps + "default", + "minetest", + "unified_inventory", + "wardrobe", + "player_monoids", + "armor_monoid", + "sfinv", + "ARMOR_MATERIALS", + "ARMOR_FIRE_NODES", + "pova", + "skins", + "u_skins" +} diff --git a/3d_armor/README.md b/3d_armor/README.md new file mode 100644 index 0000000..050eb61 --- /dev/null +++ b/3d_armor/README.md @@ -0,0 +1,524 @@ +# [mod] Visible Player Armor [3d_armor] + +| | | | | +|--|--|--|--| +|-[Overview](#overview) |||-[API](#api) +|-[Armor Configuration](#armor-configuration) |||- - [3d_Armor Item Storage](#3d_armor-item-storage) +|- - [disable_specific_materials](#to-disable-individual-armor-materials) |||- - [Armor Registration](#armor-registration) +|- - [armor_init_delay](#initialization-glitches-when-a-player-first-joins) |||- - [Registering Armor Groups](#registering-armor-groups) +|- - [armor_init_times](#number-of-initialization-attempts) |||- - [Groups used by 3d_Armor](#groups-used-by-3d_armor) +|- - [armor_bones_delay](#armor-not-in-bones-due-to-server-lag) |||- - - [Elements](#elements) +|- - [armor_update_time](#how-often-player-armor-items-are-updated) |||- - - [Attributes](#attributes) +|- - [armor_drop](#drop-armor-when-a-player-dies) |||- - - [Physics](#physics) +|- - [armor_destroy](#destroy-armor-when-a-player-dies) |||- - - [Durability](#durability) +|- - [armor_level_multiplier](#armor-level-multiplyer) |||- - - [Armor Material](#armor-material) +|- - [armor_heal_multiplier](#armor-healing-multiplyer) |||- - [Armour Functions](#armor-functions) +|- - [armor_set_elements](#allows-the-customisation-of-armor-set) |||- - - [armor:set_player_armor](#armor-set_player_armor) +|- - [armor_set_bonus](#armor-set-bonus-multiplier) |||- - - [armor:punch](#armor-punch) +|- - [armor_water_protect](#enable-water-protection) |||- - - [armor:damage](#armor-damage) +|- - [armor_fire_protect](#enable-fire-protection) |||- - - [armor:remove_all](#armor-remove_all) +|- - [armor_punch_damage](#enable-punch-damage-effects) |||- - - [armor:equip](#armor-equip) +|- - [armor_migrate_old_inventory](#migration-of-old-armor-inventories) |||- - - [armor:unequip](#armor-unequip) +|- - [wieldview_update_time](#how-often-player-wield-items-are-updated) |||- - - [armor:update_skin](#armor-update_skin) +|-[Credits](#credits) |||- - [Callbacks](#Callbacks) +| |||- - - [Item callbacks](#item-callbacks) +| |||- - - [Global callbacks](#global-callbacks) + +# Overview + +**Depends:** default + +**Recommends:** sfinv, unified_inventory or smart_inventory (use only one to avoid conflicts) + +**Supports:** player_monoids, armor_monoid and POVA + +Adds craftable armor that is visible to other players. Each armor item worn contributes to +a player's armor group level making them less vulnerable to weapons. + +Armor takes damage when a player is hurt but also offers a percentage chance of healing. +Overall level is boosted by 10% when wearing a full matching set. + +# Armor Configuration + +Change the following default settings by going to Main Menu>>Settings(Tab)>>All Settings(Button)>>Mods>>minetest-3d_Armor>>3d_Armor + +### To disable individual armor materials + **set the below to false** + + armor_material_wood = true + armor_material_cactus = true + armor_material_steel = true + armor_material_bronze = true + armor_material_diamond = true + armor_material_gold = true + armor_material_mithril = true + armor_material_crystal = true + +### Initialization glitches when a player first joins + **Increase to prevent glitches** + + armor_init_delay = 2 + +### Number of initialization attempts + **Increase to prevent glitches - Use in conjunction with armor_init_delay if initialization problems persist.** + + armor_init_times = 10 + +### Armor not in bones due to server lag + **Increase to help resolve** + + armor_bones_delay = 1 + +### How often player armor items are updated +**Number represents how often per second update is performed, higher value means less performance hit for servers but armor items maybe delayed in updating when switching.Fractional seconds also supported eg 0.1** + + armor_update_time = 1 + +### Drop armor when a player dies + **Uses bones mod if present, otherwise items are dropped around the player when false.** + + armor_drop = true + +### Destroy armor when a player dies + **overrides armor_drop.** + + armor_destroy = false + +### Armor level multiplyer + **Increase to make armor more effective and decrease to make armor less effective** + **eg: level_multiplier = 0.5 will reduce armor level by half.** + + armor_level_multiplier = 1 + +### Armor healing multiplyer + **Increase to make armor healing more effective and decrease to make healing less effective** + **eg: armor_heal_multiplier = 0 will disable healing altogether.** + + armor_heal_multiplier = 1 + +### Allows the customisation of armor set + **Shields already configured as need to be worn to complete an armor set** + **These names come from [Element names](#groups-used-by-3d_armor), the second half of the element name only is used eg armor_head is head** + + armor_set_elements = head torso legs feet shield + +### Armor set bonus multiplier + **Set to 1 to disable set bonus** + + armor_set_multiplier = 1.1 + +### Enable water protection + **periodically restores breath when activated** + + armor_water_protect = true + +### Enable fire protection +**defaults to true if using ethereal mod** + + armor_fire_protect = false + +### Fire protection enabled, disable torch fire damage +**when fire protection is enabled allows you to disable fire damage from torches** +**defaults to true if using ethereal mod** + + armor_fire_protect_torch = false + +### Enable punch damage effects + + armor_punch_damage = true + +### Migration of old armor inventories + + armor_migrate_old_inventory = true + +### How often player wield items are updated +**Number represents how often per second update is performed, higher value means less performance hit for servers but wield items maybe delayed in updating when switching. Fractional seconds also supported eg 0.1** +***Note this is MT engine functionality but included for completness*** + + wieldview_update_time = 1 + +# API + +## 3d_Armor item storage +3d_Armor stores each armor piece a player currently has equiped in a ***detached*** inventory. The easiest way to access this inventory if needed is using this line of code + + local _, armor_inv = armor:get_valid_player(player, "3d_armor") + +**Example** + + armor:register_on_equip(function(player, index, stack) + local _, armor_inv = armor:get_valid_player(player, "3d_armor") + for i = 1, 6 do + local stack = armor_inv:get_stack("armor", i) + if stack:get_name() == "3d_armor:chestplate_gold" then + minetest.chat_send_player(player:get_player_name(),"Got to love the Bling!!!") + end + end + end) + +## Armor Registration + + armor:register_armor(name, def) + +Wrapper function for `minetest.register_tool`, which enables the easy registration of new armor items. While registering armor as a tool item is still supported, this may be deprecated in future so all armor items should be registered using *armor:register_armor(name,def)*. + +### Additional fields supported by 3d_armor + + texture = + preview = + armor_groups = + damage_groups =
+ reciprocate_damage = + on_equip = + on_unequip = + on_destroy = + on_damage = + on_punched = + +***Reciprocal tool*** damage will apply damage back onto the attacking tool/weapon, however this will only be done by the first armor inventory item with `reciprocate_damage = true`, damage does not stack. + +**Example Simple:** + + armor:register_armor("mod_name:chestplate_leather", { + description = "Leather Chestplate", + inventory_image = "mod_name_inv_chestplate_leather.png", + texture = "mod_name_leather_chestplate.png", + preview = "mod_name_leather_chestplate_preview.png", + groups = {armor_torso=1, armor_heal=0, armor_use=2000, flammable=1}, + armor_groups = {fleshy=10}, + damage_groups = {cracky=3, snappy=2, choppy=3, crumbly=2, level=1} + }) +*See ***armor.lua*** under **3d_armor>>3d_armor** for further examples* + +**Extended functionality** +The values for ***texture*** and ***preview*** do not need to be included when registering armor if they follow the naming convention in the textures mod folder of: +***texture:*** *mod_name_leather_chestplate.png* +***preview:*** *mod_name_leather_chestplate_preview.png* + +## Registering Armor Groups +3d armor has a built in armor group which is ***fleshy*** all players base vulnerability to being fleshy is ***100***. + 3d armour allows for the easy registration/addition of new armor groups:: + + armor:register_armor_group(group, base) + +***group:*** Is the name of the new armor group +***base*** Is the starting vulnerability that all players have to that new group. This dosent need to be 100. + +**Example** + + armor:register_armor_group("radiation", 100) + +New armor group is registered called *radiation* and all players start off with a base vulnerability of *100* to radiation. + +**Example** *Showing armor reg, new group usage and custom function* + + armor:register_armor("mod_name:speed_boots", { + description = "Speed Boots", + inventory_image = "mod_name_speed_boots_inv.png", + texture = "mod_name_speed_boots.png", + preview = "mod_name_speed_boots_preview.png", + groups = {armor_feet=1, armor_use=500, physics_speed=1.2, flammable=1}, + armor_groups = {fleshy=10, radiation=10}, + damage_groups = {cracky=3, snappy=3, choppy=3, crumbly=3, level=1}, + reciprocate_damage = true, + on_destroy = function(player, index, stack) + local pos = player:get_pos() + if pos then + minetest.sound_play({ + name = "mod_name_break_sound", + pos = pos, + gain = 0.5, + }) + end + end, + }) + +### Tools/weapons and new armor groups +The above allows armor to block/prevent new damage types but you also need to assign the new damage group to a tool/weapon or even a node (see technic mod) to make wearing the armor item meaningful. Simply add the ***armor_groups*** name to the tool items ***damage_groups***. + +**Example** + + minetest.register_tool("mod_name:glowing_sword", { + description = "Glowing Sword", + inventory_image = "mod_name_tool_glowingsword.png", + tool_capabilities = {full_punch_interval = 1.2,max_drop_level=0, + groupcaps={ + cracky = {times={[3]=1.60}, uses=10, maxlevel=1},}, + damage_groups = {fleshy=10,radiation=20}, + }, + sound = {breaks = "default_tool_breaks"}, + groups = {pickaxe = 1, flammable = 2} + }) + +## Groups used by 3d_Armor +3d_armor has many default groups already registered, these are categorized under 4 main headings + - **Elements:** armor_head, armor_torso, armor_legs, armor_feet + - **Attributes:** armor_heal, armor_fire, armor_water + - **Physics:** physics_jump, physics_speed, physics_gravity + - **Durability:** armor_use, flammable + +***Note: for calculation purposes "Attributes" and "Physics" values stack*** + +### Elements +Additional armor elements can be added by dependant mods, for example shields adds the group armor_shield which has by default a limit that only 1 shield can be worn at a time. + +Adding Elements is more complex but the below code can be used to add new elements; + + if minetest.global_exists("armor") and armor.elements then + table.insert(armor.elements, "hands") + end +**1st line** not strictly needed but checks that the global table "armor" and subtable "elements" exists +**2nd line** adds a new value to the armor.elements table called "hands" + +See ***init.lua*** under **3d_armor>>shields** for a further example + +The new armor item can now be registered using the new element +**Example** + + armor:register_armor("mod_name:gloves_wood", { + description = "Wood Gauntlets", + inventory_image = "mod_name_inv_gloves_wood.png", + texture = "mod_name_gloves_wood.png", + preview = "mod_name_gloves_wood_preview.png", + groups = {armor_hands=1, armor_heal=0, armor_use=2000, flammable=1}, + armor_groups = {fleshy=5}, + damage_groups = {cracky=3, snappy=2, choppy=3, crumbly=2, level=1}, + }) + +### Attributes +Three attributes are avaliable in 3d_armor these are armor_heal, armor_fire and armor_water. Although possible to add additional attributes they would do nothing as code needs to be provide to specifiy the behaviour this could be done in a dependant mod + +#### Armor_heal +This isn't how much the armor will heal but relates to the chance the armor will completely block the damage. For each point of ***armor_heal*** there is a 1% chance that damage will be completely blocked, this value will stack between all armor pieces + +**Example** +The below Diamond chestplate has a 12% chance to completely block all damage (armor_heal=12), however so do boots, helmet and trousers so if the player was wearing all 4 pieces they would have a 48% chance of blocking all damage each attack. + + armor:register_armor("3d_armor:chestplate_diamond", { + description = S("Diamond Chestplate"), + inventory_image = "3d_armor_inv_chestplate_diamond.png", + groups = {armor_torso=1, armor_heal=12, armor_use=200}, + armor_groups = {fleshy=20}, + damage_groups = {cracky=2, snappy=1, choppy=1, level=3}, + }) + +#### Armor_fire +***"Armor_fire"*** provides 5 levels of fire protection + - level 1 protects against torches + - level 2 protects against crystal spike (Ethereal mod) + - level 3 protects against fire + - level 4 unused + - level 5 protects against lava + +**Example** + + armor:register_armor("mod_name:fire_proof_jacket", { + description = "Fire Proof Jacket", + inventory_image = "mod_name_inv_fire_proof_jacket.png", + groups = {armor_torso=1, armor_fire=3, armor_use=1000}, + armor_groups = {fleshy=10}, + damage_groups = {cracky=2, snappy=1, choppy=1, level=3}, + }) + +#### Armor_water +***"Armor_water"*** will periodically restore a players breath when underwater. This only has one level or state, which is armor_water=1 + +**Example** + + armor:register_armor("mod_name:helmet_underwater_breath", { + description = "Helmet of Underwater Breathing", + inventory_image = "mod_name_inv_helmet_underwater_breath.png", + groups = {armor_head=1, armor_water=1, armor_use=1000}, + armor_groups = {fleshy=5}, + damage_groups = {cracky=2, snappy=1, choppy=1, level=3}, + }) + +### Physics +The physics attributes supported by 3d_armor are ***physics_jump, physics_speed and physics_gravity***. Although 3d_armor supports the use of this with no other mods it is recommended that the mod [player_monoids](https://forum.minetest.net/viewtopic.php?t=14895) is used to help with intermod compatability. + +***physics_jump*** - Will increase/decrease the jump strength of the player so they can jump more/less. The base number is "1" and any value is added or subtracted, supports fractional so "physics_jump=1" will increase jump strength by 100%. "physics_jump= -0.5" will decrease jump by 50%. + +***physics_speed*** - Will increase/decrease the walk speed of the player so they walk faster/slower. The base number is "1" and any value is added or subtracted, supports fractional so "physics_speed=1.5" will increase speed by 150%, "physics_speed= -0.5" will decrease speed by 50%. + +***physics_gravity*** - Will increase/decrease gravity the player experiences so it's higher/lower. The base number is "1" and any value is added or subtracted, supports fractional so "physics_gravity=2" will increase gravity by 200%, "physics_gravity= -1" will decrease gravity by 100%. + +*Note: The player physics modifications won't be applied via `set_physics_override` if `player_physics_locked` is set to 1 in the respective player's meta.* + +### Durability +Durability is determined by the value assigned to the group ***armor_use***. The higher the ***armor_use*** value the faster/more quickly it is damaged/degrades. This is calculated using the formula: + + Total uses = approx(65535/armor_use) + + **Example** + All wood armor items have an ***armor_use=2000***; + + 65535/2000 = 32.76 (32) + After 32 uses(hits) the armor item will break. + + All diamond armor items have an ***armor_use=200***; + + 65535/2000 = 327.6 (327) + After 327 uses(hits) the armor item will break. + +### Armor Material +The material the armor is made from is defined by adding the material to the end of registered armor item name. It is very important the material is the last item in the registered item name and it is preceeded by an "_" eg "_materialname". +The material name is what 3d_armor uses to determine if a player is wearing a set of armor. To recieve the set bonus all items worn must be made of the same material. +So to get a set bonus under the default set settings the players armor items listed below must be made of the same material: +* head - Helmet +* torso - Chestplate +* legs - Leggings +* feet - Boots +* shield - Shields + +If all of the above were made of material "wood" the player would recieve an ***armor_set_bonus*** of armor_level * 1.1, essentially +10% + + **Example One** + + armor:register_armor("3d_armor:helmet_bronze", { + description = S("Bronze Helmet"), + inventory_image = "3d_armor_inv_helmet_bronze.png", + groups = {armor_head=1, armor_heal=6, armor_use=400, physics_speed=-0.01, physics_gravity=0.01}, + armor_groups = {fleshy=10}, + damage_groups = {cracky=3, snappy=2, choppy=2, crumbly=1, level=2}, + }) + + **Example Two** + + armor:register_armor("new_mod:helmet_spartan_bronze", { + description = S("Spartan Helmet"), + inventory_image = "new_mod_inv_helmet_spartan_bronze.png", + groups = {armor_head=1, armor_heal=6, armor_use=350, physics_speed=-0.01, physics_gravity=0.01}, + armor_groups = {fleshy=12}, + damage_groups = {cracky=3, snappy=2, choppy=2, crumbly=1, level=2}, + }) + +***Note: At the moment an armor item can only be made of one material*** + +## Armor Functions + +### armor set_player_armor + + armor:set_player_armor(player) + +Primarily an internal function but can be called externally to apply any +changes that might not otherwise get handled. + +### armor punch + + armor:punch(player, hitter, time_from_last_punch, tool_capabilities) + +Used to apply damage to all equipped armor based on the damage groups of +each individual item.`hitter`, `time_from_last_punch` and `tool_capabilities` +are optional but should be valid if included. + +### armor damage + + armor:damage(player, index, stack, use) + +Adds wear to a single armor itemstack, triggers `on_damage` callbacks and +updates the necessary inventories. Also handles item destruction callbacks +and so should NOT be called from `on_unequip` to avoid an infinite loop. + +### armor remove_all + + armor:remove_all(player) + +Removes all armors from the player's inventory without triggering any callback. + +### armor equip + + armor:equip(player, armor_name) + +Equip the armor, removing the itemstack from the main inventory if there's one. + +### armor unequip + + armor:unequip(player, armor_name) + +Unequip the armor, adding the itemstack to the main inventory. + +### armor update_skin + + armor:update_skin(player_name) + +Triggers a skin update with the same action as if a field with `skins_set` was submitted. + +## Callbacks + +### Item Callbacks + +In all of the below when armor is destroyed `stack` will contain a copy of the previous stack. + +*unsure what this note means may apply to all item callbacks or just on_punched* +Return `false` to override armor damage effects. + +#### on_equip + + on_equip = func(player, index, stack) + +#### on_unequip + + on_unequip = func(player, index, stack) + +#### on_destroy + + on_destroy = func(player, index, stack) + +#### on_damage + + on_damage = func(player, index, stack) + +#### on_punched + + on_punched = func(player, hitter, time_from_last_punch, tool_capabilities) + +`on_punched` is called every time a player is punched or takes damage, `hitter`, `time_from_last_punch` and `tool_capabilities` can be `nil` and will be in the case of fall damage. +When fire protection is enabled, hitter == "fire" in the event of fire damage. + + +### Global Callbacks + +#### armor register_on_update + + armor:register_on_update(function(player)) + +#### armor register_on_equip + + armor:register_on_equip(function(player, index, stack)) + +#### armor register_on_unequip + + armor:register_on_unequip(function(player, index, stack)) + +#### armor register_on_destroy +armor:register_on_destroy(function(player, index, stack)) + + **Example** + + armor:register_on_update(function(player) + print(player:get_player_name().." armor updated!") + end) + + +# Credits + +### The below have added too, tested or in other ways contributed to the development and ongoing support of 3d_Armor + +|Stu |Stujones11 |Stu |Github Ghosts | +|:---------------:|:---------------:|:---------------:|:---------------:| +|Pavel_S |BlockMen |Tenplus1 |donat-b | +|JPRuehmann |BrandonReese |Megaf |Zeg9 | +|poet.nohit |Echoes91 |Adimgar |Khonkhortisan | +|VanessaE |CraigyDavi |proller |Thomasrudin | +|Byakuren |kilbith (jp) |afflatus |G1ov4 | +|Thomas-S |Dragonop |Napiophelios |Emojigit | +|rubenwardy |daviddoesminetest|bell07 |OgelGames | +|tobyplowy |crazyginger72 |fireglow |bhree | +|Lone_Wolf(HT) |Wuzzy(2) |numberZero |Monte48 | +|AntumDeluge |Terumoc |runsy |Dacmot | +|codexp |davidthecreator |SmallJoker |orbea | +|BuckarooBanzay |daret |Exeterdad |Calinou | +|Pilcrow182 |indriApollo |HybridDog |CraigyDavi | +|Paly-2 |Diogogomes | | | + +*Note: Names gathered from 3d_armor forum thread and github, I may have missed some people, apologises if I have - S01* diff --git a/3d_armor/README.txt b/3d_armor/README.txt deleted file mode 100644 index 7dbe82d..0000000 --- a/3d_armor/README.txt +++ /dev/null @@ -1,191 +0,0 @@ -[mod] Visible Player Armor [3d_armor] -===================================== - -Depends: default - -Recommends: sfinv, unified_inventory or smart_inventory (use only one to avoid conflicts) - -Supports: player_monoids and armor_monoid - -Adds craftable armor that is visible to other players. Each armor item worn contributes to -a player's armor group level making them less vulnerable to weapons. - -Armor takes damage when a player is hurt but also offers a percentage chance of healing. -Overall level is boosted by 10% when wearing a full matching set. - -Fire protection added by TenPlus1 when using crystal armor if Ethereal mod active, level 1 -protects against torches, level 2 for crystal spike, level 3 for fire, level 5 for lava. - -Armor Configuration -------------------- - -Override the following default settings by adding them to your minetest.conf file. - --- Set false to disable individual armor materials. -armor_material_wood = true -armor_material_cactus = true -armor_material_steel = true -armor_material_bronze = true -armor_material_diamond = true -armor_material_gold = true -armor_material_mithril = true -armor_material_crystal = true - --- Increase this if you get initialization glitches when a player first joins. -armor_init_delay = 2 - --- Number of initialization attempts. --- Use in conjunction with armor_init_delay if initialization problems persist. -armor_init_times = 10 - --- Increase this if armor is not getting into bones due to server lag. -armor_bones_delay = 1 - --- How often player armor 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: 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 - --- Enable water protection (periodically restores breath when activated) -armor_water_protect = true - --- Enable fire protection (defaults true if using ethereal mod) -armor_fire_protect = false - --- Enable punch damage effects. -armor_punch_damage = true - --- Enable migration of old armor inventories -armor_migrate_old_inventory = true - -API ---- - -Armor Registration: - -armor:register_armor(name, def) - -Wrapper function for `minetest.register_tool`, while registering armor as -a tool item is still supported, this may be deprecated in future so new code -should use this method. - -Additional fields supported by 3d_armor: - - texture = - preview = - armor_groups =
- damage_groups =
- reciprocate_damage = - on_equip = - on_unequip = - on_destroy = - on_damage = - on_punched = - -armor:register_armor_group(group, base) - -Example: - -armor:register_armor_group("radiation", 100) - -armor:register_armor("mod_name:speed_boots", { - description = "Speed Boots", - inventory_image = "mod_name_speed_boots_inv.png", - texture = "mod_name_speed_boots.png", - preview = "mod_name_speed_boots_preview.png", - groups = {armor_feet=1, armor_use=500, physics_speed=1.2, flammable=1}, - armor_groups = {fleshy=10, radiation=10}, - damage_groups = {cracky=3, snappy=3, choppy=3, crumbly=3, level=1}, - reciprocate_damage = true, - on_destroy = function(player, index, stack) - local pos = player:get_pos() - if pos then - minetest.sound_play({ - name = "mod_name_break_sound", - pos = pos, - gain = 0.5, - }) - end - end, -}) - -See armor.lua, technic_armor and shields mods for more examples. - -Default groups: - -Elements: armor_head, armor_torso, armor_legs, armor_feet -Attributes: armor_heal, armor_fire, armor_water -Physics: physics_jump, physics_speed, physics_gravity -Durability: armor_use, flammable - -Notes: - -Elements may be modified by dependent mods, eg shields adds armor_shield. -Attributes and physics values are 'stackable', durability is determined -by the level of armor_use, total uses == approx (65535/armor_use), non-fleshy -damage groups need to be defined in the tool/weapon used against the player. - -Reciprocal tool damage will be done only by the first armor inventory item - with `reciprocate_damage = true` - -Armor Functions: - -armor:set_player_armor(player) - -Primarily an internal function but can be called externally to apply any -changes that might not otherwise get handled. - -armor:punch(player, hitter, time_from_last_punch, tool_capabilities) - -Used to apply damage to all equipped armor based on the damage groups of -each individual item.`hitter`, `time_from_last_punch` and `tool_capabilities` -are optional but should be valid if included. - -armor:damage(player, index, stack, use) - -Adds wear to a single armor itemstack, triggers `on_damage` callbacks and -updates the necessary inventories. Also handles item destruction callbacks -and so should NOT be called from `on_unequip` to avoid an infinite loop. - -Item Callbacks: - -on_equip = func(player, index, stack) -on_unequip = func(player, index, stack) -on_destroy = func(player, index, stack) -on_damage = func(player, index, stack) -on_punched = func(player, hitter, time_from_last_punch, tool_capabilities) - -Notes: - -`on_punched` is called every time a player is punched or takes damage, `hitter`, -`time_from_last_punch` and `tool_capabilities` can be `nil` and will be in the -case of fall damage, etc. When fire protection is enabled, hitter == "fire" -in the event of fire damage. Return `false` to override armor damage effects. -When armor is destroyed `stack` will contain a copy of the previous stack. - -Global Callbacks: - -armor:register_on_update(func(player)) -armor:register_on_equip(func(player, index, stack)) -armor:register_on_unequip(func(player, index, stack)) -armor:register_on_destroy(func(player, index, stack)) - -Global Callback Example: - -armor:register_on_update(function(player) - print(player:get_player_name().." armor updated!") -end) - diff --git a/3d_armor/api.lua b/3d_armor/api.lua index e460a24..996ec6d 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -1,5 +1,5 @@ -- support for i18n -local S = armor_i18n.gettext +local S = minetest.get_translator(minetest.get_current_modname()) local skin_previews = {} local use_player_monoids = minetest.global_exists("player_monoids") @@ -74,7 +74,8 @@ armor = { on_destroy = {}, }, migrate_old_inventory = true, - version = "0.4.13", + version = "0.4.13", + get_translator = S } armor.config = { @@ -94,14 +95,38 @@ armor.config = { material_gold = true, material_mithril = true, material_crystal = true, + set_elements = "head torso legs feet shield", + set_multiplier = 1.1, water_protect = true, fire_protect = minetest.get_modpath("ethereal") ~= nil, + fire_protect_torch = minetest.get_modpath("ethereal") ~= nil, punch_damage = true, } -- Armor Registration armor.register_armor = function(self, name, def) + def.on_secondary_use = function(itemstack, player) + return armor:equip(player, itemstack) + end + def.on_place = function(itemstack, player, pointed_thing) + if pointed_thing.type == "node" and player and not player:get_player_control().sneak then + local node = minetest.get_node(pointed_thing.under) + local ndef = minetest.registered_nodes[node.name] + if ndef and ndef.on_rightclick then + return ndef.on_rightclick(pointed_thing.under, node, player, itemstack, pointed_thing) + end + end + return armor:equip(player, itemstack) + end + -- The below is a very basic check to try and see if a material name exists as part + -- of the item name. However this check is very simple and just checks theres "_something" + -- at the end of the item name and logging an error to debug if not. + local check_mat_exists = string.match(name, "%:.+_(.+)$") + if check_mat_exists == nil then + minetest.log("warning:[3d_armor] Registered armor "..name.. + " does not have \"_material\" specified at the end of the item registration name") + end minetest.register_tool(name, def) end @@ -182,15 +207,16 @@ armor.set_player_armor = function(self, player) end local state = 0 local count = 0 - local material = {count=1} local preview = armor:get_preview(name) local texture = "3d_armor_trans.png" - local textures = {} local physics = {} local attributes = {} local levels = {} local groups = {} local change = {} + local set_worn = {} + local armor_multi = 0 + local worn_armor = armor:get_weared_armor_elements(player) for _, phys in pairs(self.physics) do physics[phys] = 1 end @@ -244,21 +270,38 @@ armor.set_player_armor = function(self, player) local value = def.groups["armor_"..attr] or 0 attributes[attr] = attributes[attr] + value end - local mat = string.match(item, "%:.+_(.+)$") - if material.name then - if material.name == mat then - material.count = material.count + 1 + end + end + -- The following code compares player worn armor items against requirements + -- of which armor pieces are needed to be worn to meet set bonus requirements + for loc,item in pairs(worn_armor) do + local item_mat = string.match(item, "%:.+_(.+)$") + local worn_key = item_mat or "unknown" + + -- Perform location checks to ensure the armor is worn correctly + for k,set_loc in pairs(armor.config.set_elements)do + if set_loc == loc then + if set_worn[worn_key] == nil then + set_worn[worn_key] = 0 + set_worn[worn_key] = set_worn[worn_key] + 1 + else + set_worn[worn_key] = set_worn[worn_key] + 1 end - else - material.name = mat end end end + + -- Apply the armor multiplier only if the player is wearing a full set of armor + for mat_name,arm_piece_num in pairs(set_worn) do + if arm_piece_num == #armor.config.set_elements then + armor_multi = armor.config.set_multiplier + end + end for group, level in pairs(levels) do if level > 0 then level = level * armor.config.level_multiplier - if material.name and material.count == #self.elements then - level = level * 1.1 + if armor_multi ~= 0 then + level = level * armor.config.set_multiplier end end local base = self.registered_groups[group] @@ -279,6 +322,11 @@ armor.set_player_armor = function(self, player) if use_armor_monoid then armor_monoid.monoid:add_change(player, change, "3d_armor:armor") else + -- Preserve immortal group (damage disabled for player) + local immortal = player:get_armor_groups().immortal + if immortal and immortal ~= 0 then + groups.immortal = 1 + end player:set_armor_groups(groups) end if use_player_monoids then @@ -297,7 +345,10 @@ armor.set_player_armor = function(self, player) }) pova.do_override(player) else - player:set_physics_override(physics) + local player_physics_locked = player:get_meta():get_int("player_physics_locked") + if player_physics_locked == nil or player_physics_locked == 0 then + player:set_physics_override(physics) + end end self.textures[name].armor = texture self.textures[name].preview = preview @@ -312,6 +363,8 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili if not name then return end + local set_state + local set_count local state = 0 local count = 0 local recip = true @@ -319,8 +372,8 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili local list = armor_inv:get_list("armor") for i, stack in pairs(list) do if stack:get_count() == 1 then - local name = stack:get_name() - local use = minetest.get_item_group(name, "armor_use") or 0 + local itemname = stack:get_name() + local use = minetest.get_item_group(itemname, "armor_use") or 0 local damage = use > 0 local def = stack:get_definition() or {} if type(def.on_punched) == "function" then @@ -333,6 +386,9 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili local groupcaps = tool_capabilities.groupcaps or {} local uses = 0 damage = false + if next(groupcaps) == nil then + damage = true + end for group, caps in pairs(groupcaps) do local maxlevel = caps.maxlevel or 0 local diff = maxlevel - level @@ -368,21 +424,33 @@ armor.punch = function(self, player, hitter, time_from_last_punch, tool_capabili end end if damage == true and hitter == "fire" then - damage = minetest.get_item_group(name, "flammable") > 0 + damage = minetest.get_item_group(itemname, "flammable") > 0 end if damage == true then self:damage(player, i, stack, use) + set_state = self.def[name].state + set_count = self.def[name].count end state = state + stack:get_wear() count = count + 1 end end + if set_count and set_count ~= count then + state = set_state or state + count = set_count or count + end self.def[name].state = state self.def[name].count = count end armor.damage = function(self, player, index, stack, use) local old_stack = ItemStack(stack) + local worn_armor = armor:get_weared_armor_elements(player) + local armor_worn_cnt = 0 + for k,v in pairs(worn_armor) do + armor_worn_cnt = armor_worn_cnt + 1 + end + use = math.ceil(use/armor_worn_cnt) stack:add_wear(use) self:run_callbacks("on_damage", player, index, stack) self:set_inventory_stack(player, index, stack) @@ -393,6 +461,66 @@ armor.damage = function(self, player, index, stack, use) end end +armor.get_weared_armor_elements = function(self, player) + local name, inv = self:get_valid_player(player, "[get_weared_armor]") + local weared_armor = {} + if not name then + return + end + for i=1, inv:get_size("armor") do + local item_name = inv:get_stack("armor", i):get_name() + local element = self:get_element(item_name) + if element ~= nil then + weared_armor[element] = item_name + end + end + return weared_armor +end + +armor.equip = function(self, player, itemstack) + local name, armor_inv = self:get_valid_player(player, "[equip]") + local weared_armor = self:get_weared_armor_elements(player) + local armor_element = self:get_element(itemstack:get_name()) + if name and armor_element then + if weared_armor[armor_element] ~= nil then + self:unequip(player, armor_element) + end + armor_inv:add_item("armor", itemstack:take_item()) + self:set_player_armor(player) + self:save_armor_inventory(player) + end + return itemstack +end + +armor.unequip = function(self, player, armor_element) + local name, armor_inv = self:get_valid_player(player, "[unequip]") + local weared_armor = self:get_weared_armor_elements(player) + if not name or not weared_armor[armor_element] then + return + end + local itemstack = armor_inv:remove_item("armor", ItemStack(weared_armor[armor_element])) + minetest.after(0, function() + local inv = player:get_inventory() + if inv:room_for_item("main", itemstack) then + inv:add_item("main", itemstack) + else + minetest.add_item(player:get_pos(), itemstack) + end + end) + self:set_player_armor(player) + self:save_armor_inventory(player) +end + +armor.remove_all = function(self, player) + local name, inv = self:get_valid_player(player, "[remove_all]") + if not name then + return + end + inv:set_list("armor", {}) + self:set_player_armor(player) + self:save_armor_inventory(player) +end + armor.get_player_skin = function(self, name) if (self.skin_mod == "skins" or self.skin_mod == "simple_skins") and skins.skins[name] then return skins.skins[name]..".png" @@ -404,6 +532,16 @@ armor.get_player_skin = function(self, name) return armor.default_skin..".png" end +armor.update_skin = function(self, name) + minetest.after(0, function() + local pplayer = minetest.get_player_by_name(name) + if pplayer then + self.textures[name].skin = self:get_player_skin(name) + self:set_player_armor(pplayer) + end + end) +end + armor.add_preview = function(self, preview) skin_previews[preview] = true end @@ -466,7 +604,8 @@ end armor.load_armor_inventory = function(self, player) local _, inv = self:get_valid_player(player, "[load_armor_inventory]") if inv then - local armor_list_string = player:get_attribute("3d_armor_inventory") + local meta = player:get_meta() + local armor_list_string = meta:get_string("3d_armor_inventory") if armor_list_string then inv:set_list("armor", self:deserialize_inventory_list(armor_list_string)) @@ -478,7 +617,8 @@ end armor.save_armor_inventory = function(self, player) local _, inv = self:get_valid_player(player, "[save_armor_inventory]") if inv then - player:set_attribute("3d_armor_inventory", + local meta = player:get_meta() + meta:set_string("3d_armor_inventory", self:serialize_inventory_list(inv:get_list("armor"))) end end @@ -519,7 +659,7 @@ armor.drop_armor = function(pos, stack) if node then local obj = minetest.add_item(pos, stack) if obj then - obj:setvelocity({x=math.random(-1, 1), y=5, z=math.random(-1, 1)}) + obj:set_velocity({x=math.random(-1, 1), y=5, z=math.random(-1, 1)}) end end end diff --git a/3d_armor/armor.lua b/3d_armor/armor.lua index 85d120a..f791239 100644 --- a/3d_armor/armor.lua +++ b/3d_armor/armor.lua @@ -1,5 +1,5 @@ -- support for i18n -local S = armor_i18n.gettext +local S = armor.get_translator armor:register_armor("3d_armor:helmet_admin", { description = S("Admin Helmet"), @@ -79,6 +79,19 @@ if armor.materials.wood then damage_groups = {cracky=3, snappy=2, choppy=3, crumbly=2, level=1}, groups = {armor_feet=1, armor_heal=0, armor_use=2000, flammable=1}, }) + local wood_armor_fuel = { + helmet = 6, + chestplate = 8, + leggings = 7, + boots = 5 + } + for armor, burn in pairs(wood_armor_fuel) do + minetest.register_craft({ + type = "fuel", + recipe = "3d_armor:" .. armor .. "_wood", + burntime = burn, + }) + end end if armor.materials.cactus then @@ -110,6 +123,19 @@ if armor.materials.cactus then armor_groups = {fleshy=5}, damage_groups = {cracky=3, snappy=3, choppy=2, crumbly=2, level=1}, }) + local cactus_armor_fuel = { + helmet = 14, + chestplate = 16, + leggings = 15, + boots = 13 + } + for armor, burn in pairs(cactus_armor_fuel) do + minetest.register_craft({ + type = "fuel", + recipe = "3d_armor:" .. armor .. "_cactus", + burntime = burn, + }) + end end if armor.materials.steel then diff --git a/3d_armor/depends.txt b/3d_armor/depends.txt index a33755d..f101e69 100644 --- a/3d_armor/depends.txt +++ b/3d_armor/depends.txt @@ -5,4 +5,4 @@ pova? fire? ethereal? bakedclay? -intllib? +moreores? diff --git a/3d_armor/init.lua b/3d_armor/init.lua index 9e26ca1..fde3fac 100644 --- a/3d_armor/init.lua +++ b/3d_armor/init.lua @@ -5,15 +5,17 @@ local last_punch_time = {} local pending_players = {} local timer = 0 --- support for i18n -armor_i18n = { } -armor_i18n.gettext, armor_i18n.ngettext = dofile(modpath.."/intllib.lua") +dofile(modpath.."/api.lua") -- local functions -local S = armor_i18n.gettext local F = minetest.formspec_escape +local S = armor.get_translator + +-- integration test +if minetest.settings:get_bool("enable_3d_armor_integration_test") then + dofile(modpath.."/integration_test.lua") +end -dofile(modpath.."/api.lua") -- Legacy Config Support @@ -21,13 +23,11 @@ local input = io.open(modpath.."/armor.conf", "r") if input then dofile(modpath.."/armor.conf") input:close() - input = nil end input = io.open(worldpath.."/armor.conf", "r") if input then dofile(worldpath.."/armor.conf") input:close() - input = nil end for name, _ in pairs(armor.config) do local global = "ARMOR_"..name:upper() @@ -48,6 +48,8 @@ for name, config in pairs(armor.config) do local setting = minetest.settings:get("armor_"..name) if type(config) == "number" then setting = tonumber(setting) + elseif type(config) == "string" then + setting = tostring(setting) elseif type(config) == "boolean" then setting = minetest.settings:get_bool("armor_"..name) end @@ -62,11 +64,26 @@ for material, _ in pairs(armor.materials) do end end +-- Convert set_elements to a Lua table splitting on blank spaces +local t_set_elements = armor.config.set_elements +armor.config.set_elements = string.split(t_set_elements, " ") + +-- Remove torch damage if fire_protect_torch == false +if armor.config.fire_protect_torch == false and armor.config.fire_protect == true then + for k,v in pairs(armor.fire_nodes) do + for k2,v2 in pairs(v) do + if string.find (v2,"torch") then + armor.fire_nodes[k] = nil + end + end + end +end + -- Mod Compatibility if minetest.get_modpath("technic") then armor.formspec = armor.formspec.. - "label[5,2.5;"..F(S("Radiation"))..": armor_group_radiation]" + "label[5,2.5;"..F(S("Radiation"))..": armor_group_radiation]" armor:register_armor_group("radiation") end local skin_mods = {"skins", "u_skins", "simple_skins", "wardrobe"} @@ -95,26 +112,37 @@ dofile(modpath.."/armor.lua") armor.formspec = armor.formspec.. "label[5,1;"..F(S("Level"))..": armor_level]".. - "label[5,1.5;"..F(S("Heal"))..": armor_attr_heal]" + "label[5,1.5;"..F(S("Heal"))..": armor_attr_heal]" if armor.config.fire_protect then - armor.formspec = armor.formspec.."label[5,2;"..F(S("Fire"))..": armor_attr_fire]" + armor.formspec = armor.formspec.."label[5,2;"..F(S("Fire"))..": armor_attr_fire]" end +armor:register_on_damage(function(player, index, stack) + local name = player:get_player_name() + local def = stack:get_definition() + if name and def and def.description and stack:get_wear() > 60100 then + minetest.chat_send_player(name, S("Your @1 is almost broken!", def.description)) + minetest.sound_play("default_tool_breaks", {to_player = name, gain = 2.0}) + end +end) armor:register_on_destroy(function(player, index, stack) local name = player:get_player_name() local def = stack:get_definition() if name and def and def.description then minetest.chat_send_player(name, S("Your @1 got destroyed!", def.description)) + minetest.sound_play("default_tool_breaks", {to_player = name, gain = 2.0}) end end) local function validate_armor_inventory(player) -- Workaround for detached inventory swap exploit local _, inv = armor:get_valid_player(player, "[validate_armor_inventory]") + local pos = player:get_pos() if not inv then return end local armor_prev = {} - local armor_list_string = player:get_attribute("3d_armor_inventory") + local attribute_meta = player:get_meta() -- I know, the function's name is weird but let it be like that. ;) + local armor_list_string = attribute_meta:get_string("3d_armor_inventory") if armor_list_string then local armor_list = armor:deserialize_inventory_list(armor_list_string) for i, stack in ipairs(armor_list) do @@ -140,6 +168,7 @@ local function validate_armor_inventory(player) elements[element] = true; else inv:remove_item("armor", stack) + minetest.item_drop(stack, player, pos) -- The following code returns invalid items to the player's main -- inventory but could open up the possibity for a hacked client -- to receive items back they never really had. I am not certain @@ -158,9 +187,9 @@ local function validate_armor_inventory(player) end end -local function init_player_armor(player) - local name = player:get_player_name() - local pos = player:get_pos() +local function init_player_armor(initplayer) + local name = initplayer:get_player_name() + local pos = initplayer:get_pos() if not name or not pos then return false end @@ -181,6 +210,9 @@ local function init_player_armor(player) armor:set_player_armor(player) end, allow_put = function(inv, listname, index, put_stack, player) + if player:get_player_name() ~= name then + return 0 + end local element = armor:get_element(put_stack:get_name()) if not element then return 0 @@ -196,27 +228,33 @@ local function init_player_armor(player) return 1 end, allow_take = function(inv, listname, index, stack, player) + if player:get_player_name() ~= name then + return 0 + end return stack:get_count() end, allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) + if player:get_player_name() ~= name then + return 0 + end return count end, }, name) armor_inv:set_size("armor", 6) - if not armor:load_armor_inventory(player) and armor.migrate_old_inventory then - local player_inv = player:get_inventory() + if not armor:load_armor_inventory(initplayer) and armor.migrate_old_inventory then + local player_inv = initplayer:get_inventory() player_inv:set_size("armor", 6) for i=1, 6 do local stack = player_inv:get_stack("armor", i) armor_inv:set_stack("armor", i, stack) end - armor:save_armor_inventory(player) + armor:save_armor_inventory(initplayer) player_inv:set_size("armor", 0) end for i=1, 6 do local stack = armor_inv:get_stack("armor", i) if stack:get_count() > 0 then - armor:run_callbacks("on_equip", player, i, stack) + armor:run_callbacks("on_equip", initplayer, i, stack) end end armor.def[name] = { @@ -252,7 +290,7 @@ local function init_player_armor(player) end end end - armor:set_player_armor(player) + armor:set_player_armor(initplayer) return true end @@ -280,24 +318,24 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if not name then return end + local player_name = player:get_player_name() for field, _ in pairs(fields) do if string.find(field, "skins_set") then - minetest.after(0, function(player) - local skin = armor:get_player_skin(name) - armor.textures[name].skin = skin - armor:set_player_armor(player) - end, player) + armor:update_skin(player_name) end end end) minetest.register_on_joinplayer(function(player) default.player_set_model(player, "3d_armor_character.b3d") - minetest.after(0, function(player) - if init_player_armor(player) == false then - pending_players[player] = 0 + local player_name = player:get_player_name() + + minetest.after(0, function() + local pplayer = minetest.get_player_by_name(player_name) + if pplayer and init_player_armor(pplayer) == false then + pending_players[pplayer] = 0 end - end, player) + end) end) minetest.register_on_leaveplayer(function(player) @@ -330,8 +368,8 @@ if armor.config.drop == true or armor.config.destroy == true then if pos and armor.config.destroy == false then minetest.after(armor.config.bones_delay, function() local meta = nil - local maxp = vector.add(pos, 8) - local minp = vector.subtract(pos, 8) + local maxp = vector.add(pos, 16) + local minp = vector.subtract(pos, 16) local bones = minetest.find_nodes_in_area(minp, maxp, {"bones:bones"}) for _, p in pairs(bones) do local m = minetest.get_meta(p) @@ -357,21 +395,29 @@ 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) + armor:set_player_armor(player) + end) end if armor.config.punch_damage == true then minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities) local name = player:get_player_name() - if name then + local hit_ip = hitter:is_player() + if name and hit_ip and minetest.is_protected(player:get_pos(), "") then + return + elseif name then armor:punch(player, hitter, time_from_last_punch, tool_capabilities) last_punch_time[name] = minetest.get_gametime() end end) end -minetest.register_on_player_hpchange(function(player, hp_change) - if player and hp_change < 0 then +minetest.register_on_player_hpchange(function(player, hp_change, reason) + if player and reason.type ~= "drown" and reason.hunger == nil + and hp_change < 0 then local name = player:get_player_name() if name then local heal = armor.def[name].heal @@ -390,82 +436,70 @@ end, true) minetest.register_globalstep(function(dtime) timer = timer + dtime - if timer > armor.config.init_delay then - for player, count in pairs(pending_players) do - local remove = init_player_armor(player) == true - pending_players[player] = count + 1 - if remove == false and count > armor.config.init_times then - minetest.log("warning", S("3d_armor: Failed to initialize player")) - remove = true - end - if remove == true then - pending_players[player] = nil + if timer <= armor.config.init_delay then + return + end + timer = 0 + + for player, count in pairs(pending_players) do + local remove = init_player_armor(player) == true + pending_players[player] = count + 1 + if remove == false and count > armor.config.init_times then + minetest.log("warning", S("3d_armor: Failed to initialize player")) + remove = true + end + if remove == true then + pending_players[player] = nil + end + end + + -- water breathing protection, added by TenPlus1 + if armor.config.water_protect == true then + for _,player in pairs(minetest.get_connected_players()) do + local name = player:get_player_name() + if armor.def[name].water > 0 and + player:get_breath() < 10 then + player:set_breath(10) end end - timer = 0 end end) --- Fire Protection and water breating, added by TenPlus1 - +-- Fire Protection, added by TenPlus1. if armor.config.fire_protect == true then - -- override hot nodes so they do not hurt player anywhere but mod + -- override any hot nodes that do not already deal damage for _, row in pairs(armor.fire_nodes) do if minetest.registered_nodes[row[1]] then - minetest.override_item(row[1], {damage_per_second = 0}) + local damage = minetest.registered_nodes[row[1]].damage_per_second + if not damage or damage == 0 then + minetest.override_item(row[1], {damage_per_second = row[3]}) + end end end else - print (S("[3d_armor] Fire Nodes disabled")) + print ("[3d_armor] Fire Nodes disabled") end -if armor.config.water_protect == true or armor.config.fire_protect == true then - minetest.register_globalstep(function(dtime) - armor.timer = armor.timer + dtime - if armor.timer < armor.config.update_time then - return - end - for _,player in pairs(minetest.get_connected_players()) do - local name = player:get_player_name() - local pos = player:get_pos() - local hp = player:get_hp() - if not name or not pos or not hp then - return - end - -- water breathing - if armor.config.water_protect == true then - if armor.def[name].water > 0 and - player:get_breath() < 10 then - player:set_breath(10) - end - end +if armor.config.fire_protect == true then + minetest.register_on_player_hpchange(function(player, hp_change, reason) + + if reason.type == "node_damage" and reason.node then -- fire protection - if armor.config.fire_protect == true then - local fire_damage = true - pos.y = pos.y + 1.4 -- head level - local node_head = minetest.get_node(pos).name - pos.y = pos.y - 1.2 -- feet level - local node_feet = minetest.get_node(pos).name - -- is player inside a hot node? - for _, row in pairs(armor.fire_nodes) do - -- check fire protection, if not enough then get hurt - if row[1] == node_head or row[1] == node_feet then - if fire_damage == true then + if armor.config.fire_protect == true and hp_change < 0 then + local name = player:get_player_name() + for _,igniter in pairs(armor.fire_nodes) do + if reason.node == igniter[1] then + if armor.def[name].fire < igniter[2] then armor:punch(player, "fire") - last_punch_time[name] = minetest.get_gametime() - fire_damage = false - end - if hp > 0 and armor.def[name].fire < row[2] then - hp = hp - row[3] * armor.config.update_time - player:set_hp(hp) - break + else + hp_change = 0 end end end end end - armor.timer = 0 - end) + return hp_change + end, true) end minetest.log("action", "[3d_armor] loaded.") diff --git a/3d_armor/integration_test.lua b/3d_armor/integration_test.lua new file mode 100644 index 0000000..65e9dfd --- /dev/null +++ b/3d_armor/integration_test.lua @@ -0,0 +1,25 @@ + +minetest.log("warning", "[TEST] integration-test enabled!") + +minetest.register_on_mods_loaded(function() + minetest.after(1, function() + + local data = minetest.write_json({ success = true }, true); + local file = io.open(minetest.get_worldpath().."/integration_test.json", "w" ); + if file then + file:write(data) + file:close() + end + + file = io.open(minetest.get_worldpath().."/registered_nodes.txt", "w" ); + if file then + for name in pairs(minetest.registered_nodes) do + file:write(name .. '\n') + end + file:close() + end + + minetest.log("warning", "[TEST] integration tests done!") + minetest.request_shutdown("success") + end) +end) diff --git a/3d_armor/intllib.lua b/3d_armor/intllib.lua deleted file mode 100644 index 6669d72..0000000 --- a/3d_armor/intllib.lua +++ /dev/null @@ -1,45 +0,0 @@ - --- Fallback functions for when `intllib` is not installed. --- Code released under Unlicense . - --- Get the latest version of this file at: --- https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua - -local function format(str, ...) - local args = { ... } - local function repl(escape, open, num, close) - if escape == "" then - local replacement = tostring(args[tonumber(num)]) - if open == "" then - replacement = replacement..close - end - return replacement - else - return "@"..open..num..close - end - end - return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl)) -end - -local gettext, ngettext -if minetest.get_modpath("intllib") then - if intllib.make_gettext_pair then - -- New method using gettext. - gettext, ngettext = intllib.make_gettext_pair() - else - -- Old method using text files. - gettext = intllib.Getter() - end -end - --- Fill in missing functions. - -gettext = gettext or function(msgid, ...) - return format(msgid, ...) -end - -ngettext = ngettext or function(msgid, msgid_plural, n, ...) - return format(n==1 and msgid or msgid_plural, ...) -end - -return gettext, ngettext diff --git a/3d_armor/locale/3d_armor.es.tr b/3d_armor/locale/3d_armor.es.tr new file mode 100644 index 0000000..86a44db --- /dev/null +++ b/3d_armor/locale/3d_armor.es.tr @@ -0,0 +1,58 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1=3d_armor: La armadura desconectada es nula @1 +3d_armor: Player name is nil @1=3d_armor: El nombre del jugador es nulo @1 +3d_armor: Player reference is nil @1=3d_armor: La referencia del jugador es nula @1 + +### armor.lua ### + +Admin Boots=Botas de admin +Admin Chestplate=Peto de admin +Admin Helmet=Casco de admin +Admin Leggings=Grebas de admin +Bronze Boots=Botas de bronce +Bronze Chestplate=Peto de bronce +Bronze Helmet=Casco de bronce +Bronze Leggings=Grebas de bronce +Cactus Boots=Botas de cactus +Cactus Chestplate=Peto de cactus +Cactus Helmet=Casco de cactus +Cactus Leggings=Grebas de cactus +Crystal Boots=Botas de cristal +Crystal Chestplate=Peto de cristal +Crystal Helmet=Casco de cristal +Crystal Leggings=Grebas de cristal +Diamond Boots=Botas de diamante +Diamond Chestplate=Peto de diamante +Diamond Helmet=Casco de diamante +Diamond Leggings=Grebas de diamante +Gold Boots=Botas de oro +Gold Chestplate=Peto de oro +Gold Helmet=Casco de oro +Gold Leggings=Grebas de oro +Mithril Boots=Botas de mitrilo +Mithril Chestplate=Peto de mitrilo +Mithril Helmet=Casco de mitrilo +Mithril Leggings=Grebas de mitrilo +Steel Boots=Botas de acero +Steel Chestplate=Peto de acero +Steel Helmet=Casco de acero +Steel Leggings=Grebas de acero +Wood Boots=Botas de madera +Wood Chestplate=Peto de madera +Wood Helmet=Casco de madera +Wood Leggings=Grebas de madera + +### init.lua ### + +3d_armor: Failed to initialize player=3d_armor: Fallo en la inicialización del jugador +Fire=Fuego +Heal=Salud +Level=Nivel +Radiation=Radiación +Your @1 got destroyed!=¡Tu @1 fue destruído! +Your @1 is almost broken!=¡Tu @1 esta a punto de romperse! +[3d_armor] Fire Nodes disabled=[3d_armor] Nodos de fuego desabilitados diff --git a/3d_armor/locale/3d_armor.fr.tr b/3d_armor/locale/3d_armor.fr.tr new file mode 100644 index 0000000..849a0f1 --- /dev/null +++ b/3d_armor/locale/3d_armor.fr.tr @@ -0,0 +1,58 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1=3d_armor : Inventaire détaché pour l'armure non trouvé @1 +3d_armor: Player name is nil @1=3d_armor : Nom du joueur non trouvé @1 +3d_armor: Player reference is nil @1=3d_armor : Référence au joueur non trouvée @1 + +### armor.lua ### + +Admin Boots=Bottes d'admin +Admin Chestplate=Cuirasse d'admin +Admin Helmet=Casque d'admin +Admin Leggings=Jambières d'admin +Bronze Boots=Bottes en bronze +Bronze Chestplate=Cuirasse en bronze +Bronze Helmet=Casque en bronze +Bronze Leggings=Jambières en bronze +Cactus Boots=Bottes en cactus +Cactus Chestplate=Cuirasse en cactus +Cactus Helmet=Casque en cactus +Cactus Leggings=Jambières en cactus +Crystal Boots=Bottes en cristal +Crystal Chestplate=Cuirasse en cristal +Crystal Helmet=Casque en cristal +Crystal Leggings=Jambières en cristal +Diamond Boots=Bottes en diamant +Diamond Chestplate=Cuirasse en diamant +Diamond Helmet=Casque en diamant +Diamond Leggings=Jambières en diamant +Gold Boots=Bottes en or +Gold Chestplate=Cuirasse en or +Gold Helmet=Casque en or +Gold Leggings=Jambières en or +Mithril Boots=Bottes en mithril +Mithril Chestplate=Cuirasse en mithril +Mithril Helmet=Casque en mithril +Mithril Leggings=Jambières en mithril +Steel Boots=Bottes en acier +Steel Chestplate=Cuirasse en acier +Steel Helmet=Casque en acier +Steel Leggings=Jambières en acier +Wood Boots=Bottes en bois +Wood Chestplate=Cuirasse en bois +Wood Helmet=Casque en bois +Wood Leggings=Jambières en bois + +### init.lua ### + +3d_armor: Failed to initialize player=3d_armor : Impossible d'initialiser le joueur +Fire=Fire +Heal=Soins +Level=Niveau +Radiation=Radiation +Your @1 got destroyed!=Une partie de votre armure a été détruite : @1 ! +Your @1 is almost broken!=Une partie de votre armure est presque détruite : @1 ! +[3d_armor] Fire Nodes disabled=[3d_armor] Nœuds de type feu désactivés diff --git a/3d_armor/locale/3d_armor.it.tr b/3d_armor/locale/3d_armor.it.tr new file mode 100644 index 0000000..d8be62e --- /dev/null +++ b/3d_armor/locale/3d_armor.it.tr @@ -0,0 +1,85 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1=3d_armor: L'inventario separato dell'armatura è nullo @1 +3d_armor: Player name is nil @1=3d_armor: Il nome dell'utente è nullo @1 +3d_armor: Player reference is nil @1=3d_armor: Il riferimento all'utente è nullo @1 + +### armor.lua ### + +Admin Boots=Stivali dell'amministratrice/tore +Admin Chestplate=Corazza dell'amministratrice/tore +Admin Helmet=Elmo dell'amministratrice/tore +Admin Leggings=Gambali dell'amministratrice/tore +Bronze Boots=Stivali di bronzo +Bronze Chestplate=Corazza di bronzo +Bronze Helmet=Elmo di bronzo +Bronze Leggings=Gambali di bronzo +Cactus Boots=Stivali di cactus +Cactus Chestplate=Corazza di cactus +Cactus Helmet=Elmo di cactus +Cactus Leggings=Gambali di cactus +Crystal Boots=Stivali di cristallo +Crystal Chestplate=Corazza di cristallo +Crystal Helmet=Elmo di cristallo +Crystal Leggings=Gambali di cristallo +Diamond Boots=Stivali di diamante +Diamond Chestplate=Corazza di diamante +Diamond Helmet=Elmo di diamante +Diamond Leggings=Gambali di diamante +Gold Boots=Stivali d'oro +Gold Chestplate=Corazza d'oro +Gold Helmet=Elmo d'oro +Gold Leggings=Gambali d'oro +Mithril Boots=Stivali di mithril +Mithril Chestplate=Corazza di mithril +Mithril Helmet=Elmo di mithril +Mithril Leggings=Gambali di mithril +Steel Boots=Stivali d'acciaio +Steel Chestplate=Corazza d'acciaio +Steel Helmet=Elmo d'acciaio +Steel Leggings=Gambali d'acciaio +Wood Boots=Stivali di legno +Wood Chestplate=Corazza di legno +Wood Helmet=Elmo di legno +Wood Leggings=Gambali di legno + +### init.lua ### + +3d_armor: Failed to initialize player=3d_armor: Inizializzazione dell'utente fallita +Fire=Fuoco +Heal=Guarigione +Level=Livello +Radiation=Radiazione +Your @1 got destroyed!=@1 in frantumi! +Your @1 is almost broken!=@1 quasi in frantumi! +[3d_armor] Fire Nodes disabled=[3d_armor] Nodi fuoco disabilitati + + +##### not used anymore ##### + +3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod caricata ma inutilizzata. +Back=Indietro +Armor=Armatura +3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod caricata ma inutilizzata. +Armor stand top=Parte superiore del supporto per armatura +Armor stand=Supporto per armatura +Armor Stand=Supporto per armatura +Locked Armor stand=Supporto per armatura chiuso a chiave +Armor Stand (owned by @1)=Supporto per armatura (di proprietà di @1) +3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod caricata ma inutilizzata. +3d Armor=Armatura 3D +Armor not initialized!=Armatura non inizializzata! +Admin Shield=Scudo dell'amministratrice/tore +Wooden Shield=Scudo di legno +Enhanced Wood Shield=Scudo di legno migliorato +Cactus Shield=Scudo di cactus +Enhanced Cactus Shield=Scudo di cactus migliorato +Steel Shield=Scudo d'acciaio +Bronze Shield=Scudo di bronzo +Diamond Shield=Scudo di diamante +Gold Shield=Scudo d'oro +Mithril Shield=Scudo di mithril +Crystal Shield=Scudo di cristallo diff --git a/3d_armor/locale/3d_armor.ms.tr b/3d_armor/locale/3d_armor.ms.tr new file mode 100644 index 0000000..b76dd61 --- /dev/null +++ b/3d_armor/locale/3d_armor.ms.tr @@ -0,0 +1,85 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1=3d_armor: Inventori perisai terpisah tiada nilai @1 +3d_armor: Player name is nil @1=3d_armor: Nama pemain tiada nilai @1 +3d_armor: Player reference is nil @1=3d_armor: Rujukan pemain tiada nilai @1 + +### armor.lua ### + +Admin Boots=But Pentadbir +Admin Chestplate=Perisai Dada Pentadbir +Admin Helmet=Helmet Pentadbir +Admin Leggings=Perisai Kaki Pentadbir +Bronze Boots=But Gangsa +Bronze Chestplate=Perisai Dada Gangsa +Bronze Helmet=Helmet Gangsa +Bronze Leggings=Perisai Kaki Gangsa +Cactus Boots=But Kaktus +Cactus Chestplate=Perisai Dada Kaktus +Cactus Helmet=Helmet Kaktus +Cactus Leggings=Perisai Kaki Kaktus +Crystal Boots=But Kristal +Crystal Chestplate=Perisai Dada Kristal +Crystal Helmet=Helmet Kristal +Crystal Leggings=Perisai Kaki Kristal +Diamond Boots=But Intan +Diamond Chestplate=Perisai Dada Intan +Diamond Helmet=Helmet Intan +Diamond Leggings=Perisai Kaki Intan +Gold Boots=But Emas +Gold Chestplate=Perisai Dada Emas +Gold Helmet=Helmet Emas +Gold Leggings=Perisai Kaki Emas +Mithril Boots=But Mithril +Mithril Chestplate=Perisai Dada Mithril +Mithril Helmet=Helmet Mithril +Mithril Leggings=Perisai Kaki Mithril +Steel Boots=But Keluli +Steel Chestplate=Perisai Dada Keluli +Steel Helmet=Helmet Keluli +Steel Leggings=Perisai Kaki Keluli +Wood Boots=But Kayu +Wood Chestplate=Perisai Dada Kayu +Wood Helmet=Helmet Kayu +Wood Leggings=Perisai Kaki Kayu + +### init.lua ### + +3d_armor: Failed to initialize player=3d_armor: Gagal mengasalkan pemain +Fire=Api +Heal=Pulih +Level=Tahap +Radiation=Radiasi +Your @1 got destroyed!=@1 anda telah musnah! +Your @1 is almost broken!= +[3d_armor] Fire Nodes disabled=[3d_armor] Nod-nod Api dilumpuhkan + + +##### not used anymore ##### + +3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mods dimuatkan tetapi tidak digunakan. +Back=Kembali +Armor=Perisai +3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mods dimuatkan tetapi tidak digunakan. +Armor stand top=Bhg atas dirian perisai +Armor stand=Dirian perisai +Armor Stand=Dirian Perisai +Locked Armor stand=Dirian perisai Berkunci +Armor Stand (owned by @1)=Dirian Perisai (milik @1) +3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mods dimuatkan tetapi tidak digunakan. +3d Armor=Perisai 3d +Armor not initialized!=Perisai tidak diasalkan! +Admin Shield=Perisai Pegang Pentadbir +Wooden Shield=Perisai Pegang Kayu +Enhanced Wood Shield=Perisai Pegang Kayu Kukuh +Cactus Shield=Perisai Pegang Kaktus +Enhanced Cactus Shield=Perisai Pegang Kaktus Kukuh +Steel Shield=Perisai Pegang Keluli +Bronze Shield=Perisai Pegang Gangsa +Diamond Shield=Perisai Pegang Intan +Gold Shield=Perisai Pegang Emas +Mithril Shield=Perisai Pegang Mithril +Crystal Shield=Perisai Pegang Kristal diff --git a/3d_armor/locale/3d_armor.pt.tr b/3d_armor/locale/3d_armor.pt.tr new file mode 100644 index 0000000..8fc689d --- /dev/null +++ b/3d_armor/locale/3d_armor.pt.tr @@ -0,0 +1,85 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1=3d_armor: Inventario avulso de armadura é nulo @1 +3d_armor: Player name is nil @1=3d_armor: Nome de jogador é nulo @1 +3d_armor: Player reference is nil @1=3d_armor: Referência Jogador é nula @1 + +### armor.lua ### + +Admin Boots=Botas de Administrador +Admin Chestplate=Peitoral de Administrador +Admin Helmet=Capacete de Administrador +Admin Leggings=Calças de Administrador +Bronze Boots=Botas de Bronze +Bronze Chestplate=Peitoral de Bronze +Bronze Helmet=Capacete de Bronze +Bronze Leggings=Calças de Bronze +Cactus Boots=Botas de Madeira +Cactus Chestplate=Peitoral de Cacto +Cactus Helmet=Capacete de Cacto +Cactus Leggings=Calças de Cacto +Crystal Boots=Botas de Cristal +Crystal Chestplate=Peitoral de Cristal +Crystal Helmet=Capacete de Cristal +Crystal Leggings=Calças de Cristal +Diamond Boots=Botas de Diamante +Diamond Chestplate=Peitoral de Diamante +Diamond Helmet=Capacete de Diamante +Diamond Leggings=Calças de Diamante +Gold Boots=Botas de Ouro +Gold Chestplate=Peitoral de Ouro +Gold Helmet=Capacete de Ouro +Gold Leggings=Calças de Ouro +Mithril Boots=Botas de Mithril +Mithril Chestplate=Peitoral de Mithril +Mithril Helmet=Capacete de Mithril +Mithril Leggings=Calças de Mithril +Steel Boots=Botas de Aço +Steel Chestplate=Peitoral de Aço +Steel Helmet=Capacete de Aço +Steel Leggings=Calças de Aço +Wood Boots=Botas de Madeira +Wood Chestplate=Peitoral de Madeira +Wood Helmet=Capacete de Madeira +Wood Leggings=Calças de Madeira + +### init.lua ### + +3d_armor: Failed to initialize player=3d_armor: Falha ao inicializar jogador +Fire=Fogo +Heal=Saúde +Level=Nível +Radiation=Radiação +Your @1 got destroyed!=@1 foi destruído(a)! +Your @1 is almost broken!= +[3d_armor] Fire Nodes disabled=[3d_armor] Nodes de gofo desabilitados + + +##### not used anymore ##### + +3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod carregado mas inoperante. +Back=Voltar +Armor=Armadura +3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod carregado mas inoperante. +Armor stand top=Topo de estande de armadura +Armor stand=Estande de armadura +Armor Stand=Estande de Armadura +Locked Armor stand=Estande de Armadura Trancada +Armor Stand (owned by @1)=Estande de Armadura (pertente a @1) +3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod carregado mas inoperante. +3d Armor=3d Armor +Armor not initialized!=Armadura não inicializada! +Admin Shield=Escudo de Administrador +Wooden Shield=Escudo de Madeira +Enhanced Wood Shield=Escudo de Madeira Melhorado +Cactus Shield=Escudo de Cacto +Enhanced Cactus Shield=Escudo de Cacto Melhorado +Steel Shield=Escudo de Aço +Bronze Shield=Escudo de Bronze +Diamond Shield=Escudo de Diamante +Gold Shield=Escudo de Ouro +Mithril Shield=Escudo de Mithril +Crystal Shield=Escudo de Cristal diff --git a/3d_armor/locale/3d_armor.pt_BR.tr b/3d_armor/locale/3d_armor.pt_BR.tr new file mode 100644 index 0000000..8fc689d --- /dev/null +++ b/3d_armor/locale/3d_armor.pt_BR.tr @@ -0,0 +1,85 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1=3d_armor: Inventario avulso de armadura é nulo @1 +3d_armor: Player name is nil @1=3d_armor: Nome de jogador é nulo @1 +3d_armor: Player reference is nil @1=3d_armor: Referência Jogador é nula @1 + +### armor.lua ### + +Admin Boots=Botas de Administrador +Admin Chestplate=Peitoral de Administrador +Admin Helmet=Capacete de Administrador +Admin Leggings=Calças de Administrador +Bronze Boots=Botas de Bronze +Bronze Chestplate=Peitoral de Bronze +Bronze Helmet=Capacete de Bronze +Bronze Leggings=Calças de Bronze +Cactus Boots=Botas de Madeira +Cactus Chestplate=Peitoral de Cacto +Cactus Helmet=Capacete de Cacto +Cactus Leggings=Calças de Cacto +Crystal Boots=Botas de Cristal +Crystal Chestplate=Peitoral de Cristal +Crystal Helmet=Capacete de Cristal +Crystal Leggings=Calças de Cristal +Diamond Boots=Botas de Diamante +Diamond Chestplate=Peitoral de Diamante +Diamond Helmet=Capacete de Diamante +Diamond Leggings=Calças de Diamante +Gold Boots=Botas de Ouro +Gold Chestplate=Peitoral de Ouro +Gold Helmet=Capacete de Ouro +Gold Leggings=Calças de Ouro +Mithril Boots=Botas de Mithril +Mithril Chestplate=Peitoral de Mithril +Mithril Helmet=Capacete de Mithril +Mithril Leggings=Calças de Mithril +Steel Boots=Botas de Aço +Steel Chestplate=Peitoral de Aço +Steel Helmet=Capacete de Aço +Steel Leggings=Calças de Aço +Wood Boots=Botas de Madeira +Wood Chestplate=Peitoral de Madeira +Wood Helmet=Capacete de Madeira +Wood Leggings=Calças de Madeira + +### init.lua ### + +3d_armor: Failed to initialize player=3d_armor: Falha ao inicializar jogador +Fire=Fogo +Heal=Saúde +Level=Nível +Radiation=Radiação +Your @1 got destroyed!=@1 foi destruído(a)! +Your @1 is almost broken!= +[3d_armor] Fire Nodes disabled=[3d_armor] Nodes de gofo desabilitados + + +##### not used anymore ##### + +3d_armor_ip: Mod loaded but unused.=3d_armor_ip: Mod carregado mas inoperante. +Back=Voltar +Armor=Armadura +3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: Mod carregado mas inoperante. +Armor stand top=Topo de estande de armadura +Armor stand=Estande de armadura +Armor Stand=Estande de Armadura +Locked Armor stand=Estande de Armadura Trancada +Armor Stand (owned by @1)=Estande de Armadura (pertente a @1) +3d_armor_ui: Mod loaded but unused.=3d_armor_ui: Mod carregado mas inoperante. +3d Armor=3d Armor +Armor not initialized!=Armadura não inicializada! +Admin Shield=Escudo de Administrador +Wooden Shield=Escudo de Madeira +Enhanced Wood Shield=Escudo de Madeira Melhorado +Cactus Shield=Escudo de Cacto +Enhanced Cactus Shield=Escudo de Cacto Melhorado +Steel Shield=Escudo de Aço +Bronze Shield=Escudo de Bronze +Diamond Shield=Escudo de Diamante +Gold Shield=Escudo de Ouro +Mithril Shield=Escudo de Mithril +Crystal Shield=Escudo de Cristal diff --git a/3d_armor/locale/3d_armor.ru.tr b/3d_armor/locale/3d_armor.ru.tr new file mode 100644 index 0000000..b817c79 --- /dev/null +++ b/3d_armor/locale/3d_armor.ru.tr @@ -0,0 +1,85 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1=3d_armor: Отдельный инвентарь брони является nil @1 +3d_armor: Player name is nil @1=3d_armor: Имя игрока является nil @1 +3d_armor: Player reference is nil @1=3d_armor: Ссылка игрока является nil @1 + +### armor.lua ### + +Admin Boots=ботинки админа +Admin Chestplate=бронежилет админа +Admin Helmet=шлем админа +Admin Leggings=гамаши админа +Bronze Boots=бронзовые ботинки +Bronze Chestplate=бронзовый бронежилет +Bronze Helmet=бронзовый шлем +Bronze Leggings=бронзовые гамаши +Cactus Boots=кактусовые ботинки +Cactus Chestplate=кактусовый бронежилет +Cactus Helmet=кактусовый шлем +Cactus Leggings=кактусовые гамаши +Crystal Boots=кристалловые ботинки +Crystal Chestplate=кристалловый бронежилет +Crystal Helmet=кристалловый шлем +Crystal Leggings=кристалловые гамаши +Diamond Boots=алмазные ботинки +Diamond Chestplate=алмазный бронежилет +Diamond Helmet=алмазный шлем +Diamond Leggings=алмазные гамаши +Gold Boots=золотые ботинки +Gold Chestplate=золотой бронежилет +Gold Helmet=золотой шлем +Gold Leggings=золотые гамаши +Mithril Boots=мифриловые ботинки +Mithril Chestplate=мифриловый бронежилет +Mithril Helmet=мифриловый шлем +Mithril Leggings=мифриловые гамаши +Steel Boots=стальные ботинки +Steel Chestplate=стальной бронежилет +Steel Helmet=стальной шлем +Steel Leggings=стальные гамаши +Wood Boots=деревянные ботинки +Wood Chestplate=деревянный бронежилет +Wood Helmet=деревянный шлем +Wood Leggings=деревянные гамаши + +### init.lua ### + +3d_armor: Failed to initialize player=3d_armor: не смог подготовить игрока +Fire=огонь +Heal=исцеление +Level=уровень +Radiation=излучение +Your @1 got destroyed!=твой(и) @1 был(и) разрушен(ы)! +Your @1 is almost broken!= +[3d_armor] Fire Nodes disabled=[3d_armor] блоки огня отключены + + +##### not used anymore ##### + +3d_armor_ip: Mod loaded but unused.=3d_armor_ip: мод загружен но не используется. +Back=назад +Armor=бронь +3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv: мод загружен но не используется. +Armor stand top=стойка для брони (верх) +Armor stand=стойка для брони +Armor Stand=стойка для брони +Locked Armor stand=защищенная стойка для брони +Armor Stand (owned by @1)=стойка для брони (принадлежит @1) +3d_armor_ui: Mod loaded but unused.=3d_armor_ui: мод загружен но не используется. +3d Armor=3D бронь +Armor not initialized!=бронь не подготовлена! +Admin Shield=щит админа +Wooden Shield=деревянный щит +Enhanced Wood Shield=улучшенный деревянный щит +Cactus Shield=кактусный щит +Enhanced Cactus Shield=улучшенный кактусный щит +Steel Shield=стальной щит +Bronze Shield=бронзовый щит +Diamond Shield=алмазный щит +Gold Shield=золотой щит +Mithril Shield=мифриловый щит +Crystal Shield=кристалловый щит diff --git a/3d_armor/locale/es.po b/3d_armor/locale/es.po deleted file mode 100644 index 8eeaf6e..0000000 --- a/3d_armor/locale/es.po +++ /dev/null @@ -1,384 +0,0 @@ -# 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 , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-06 18:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player name is nil @1" -msgstr "3d_armor: El nombre del jugador es nulo @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player inventory is nil @1" -msgstr "3d_armor: El inventario del jugador es nulo @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Detached armor inventory is nil @1" -msgstr "3d_armor: La armadura desconectada es nula @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player reference is nil @1" -msgstr "3d_armor: La referencia del jugador es nula @1" - -#: ../3d_armor/armor.lua -msgid "Admin Helmet" -msgstr "Casco de admin" - -#: ../3d_armor/armor.lua -msgid "Admin Chestplate" -msgstr "Peto de admin" - -#: ../3d_armor/armor.lua -msgid "Admin Leggings" -msgstr "Polainas de admin" - -#: ../3d_armor/armor.lua -msgid "Admin Boots" -msgstr "Botas de admin" - -#: ../3d_armor/armor.lua -msgid "Wood Helmet" -msgstr "Casco de madera" - -#: ../3d_armor/armor.lua -msgid "Wood Chestplate" -msgstr "Peto de madera" - -#: ../3d_armor/armor.lua -msgid "Wood Leggings" -msgstr "Polainas de madera" - -#: ../3d_armor/armor.lua -msgid "Wood Boots" -msgstr "Botas de madera" - -#: ../3d_armor/armor.lua -msgid "Cactus Helmet" -msgstr "Casco de cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Chestplate" -msgstr "Peto de cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Leggings" -msgstr "Polainas de cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Boots" -msgstr "Botas de cactus" - -#: ../3d_armor/armor.lua -msgid "Steel Helmet" -msgstr "Casco de acero" - -#: ../3d_armor/armor.lua -msgid "Steel Chestplate" -msgstr "Peto de acero" - -#: ../3d_armor/armor.lua -msgid "Steel Leggings" -msgstr "Polainas de acero" - -#: ../3d_armor/armor.lua -msgid "Steel Boots" -msgstr "Botas de acero" - -#: ../3d_armor/armor.lua -msgid "Bronze Helmet" -msgstr "Casco de bronce" - -#: ../3d_armor/armor.lua -msgid "Bronze Chestplate" -msgstr "Peto de bronce" - -#: ../3d_armor/armor.lua -msgid "Bronze Leggings" -msgstr "Polainas de bronce" - -#: ../3d_armor/armor.lua -msgid "Bronze Boots" -msgstr "Botas de bronce" - -#: ../3d_armor/armor.lua -msgid "Diamond Helmet" -msgstr "Casco de diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Chestplate" -msgstr "Peto de diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Leggings" -msgstr "Polainas de diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Boots" -msgstr "Botas de diamante" - -#: ../3d_armor/armor.lua -msgid "Gold Helmet" -msgstr "Casco de oro" - -#: ../3d_armor/armor.lua -msgid "Gold Chestplate" -msgstr "Peto de oro" - -#: ../3d_armor/armor.lua -msgid "Gold Leggings" -msgstr "Polainas de oro" - -#: ../3d_armor/armor.lua -msgid "Gold Boots" -msgstr "Botas de oro" - -#: ../3d_armor/armor.lua -msgid "Mithril Helmet" -msgstr "Casco de mitrilo" - -#: ../3d_armor/armor.lua -msgid "Mithril Chestplate" -msgstr "Peto de mitrilo" - -#: ../3d_armor/armor.lua -msgid "Mithril Leggings" -msgstr "Polainas de mitrilo" - -#: ../3d_armor/armor.lua -msgid "Mithril Boots" -msgstr "Botas de mitrilo" - -#: ../3d_armor/armor.lua -msgid "Crystal Helmet" -msgstr "Casco de cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Chestplate" -msgstr "Peto de cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Leggings" -msgstr "Polainas de cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Boots" -msgstr "Botas de cristal" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Radiation" -msgstr "Radiación" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Level" -msgstr "Nivel" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Heal" -msgstr "Salud" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Fire" -msgstr "Fuego" - -#: ../3d_armor/init.lua -msgid "Your @1 got destroyed!" -msgstr "¡Tu @1 fue destruído!" - -#: ../3d_armor/init.lua -msgid "3d_armor: Failed to initialize player" -msgstr "3d_armor: Fallo en la inicialización del jugador" - -#: ../3d_armor/init.lua -msgid "[3d_armor] Fire Nodes disabled" -msgstr "[3d_armor] Nodos de fuego desabilitados" - -#: ../3d_armor_ip/init.lua -msgid "3d_armor_ip: Mod loaded but unused." -msgstr "3d_armor_ip: Mod cargado, pero sin ser usado." - -#: ../3d_armor_ip/init.lua -msgid "Back" -msgstr "Volver" - -#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua -msgid "Armor" -msgstr "Armadura" - -#: ../3d_armor_sfinv/init.lua -msgid "3d_armor_sfinv: Mod loaded but unused." -msgstr "3d_armor_sfinv: Mod cargado, pero sin ser usado." - -#: ../3d_armor_stand/init.lua -msgid "Armor stand top" -msgstr "Parte arriba maniquí armadura" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand" -msgstr "Maniquí para armadura" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand" -msgstr "Maniquí para armadura" - -#: ../3d_armor_stand/init.lua -msgid "Locked Armor stand" -msgstr "Maniquí para armadura (bloqueado)" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand (owned by @1)" -msgstr "Maniquí para armadura (propiedad de @1)" - -#: ../3d_armor_ui/init.lua -msgid "3d_armor_ui: Mod loaded but unused." -msgstr "3d_armor_ui: Mod cargado, pero sin ser usado." - -#: ../3d_armor_ui/init.lua -msgid "3d Armor" -msgstr "Armadura 3d" - -#: ../3d_armor_ui/init.lua -msgid "Armor not initialized!" -msgstr "¡Armadura no inicializada!" - -#: ../hazmat_suit/init.lua -msgid "hazmat_suit: Mod loaded but unused." -msgstr "hazmat_suit: Mod cargado, pero sin ser usado." - -#: ../hazmat_suit/init.lua -msgid "Hazmat Helmet" -msgstr "Casco de hazmat" - -#: ../hazmat_suit/init.lua -msgid "Hazmat Chestplate" -msgstr "Peto de hazmat" - -#: ../hazmat_suit/init.lua -msgid "Hazmat Sleeve" -msgstr "Manga de hazmat" - -#: ../hazmat_suit/init.lua -msgid "Hazmat Leggins" -msgstr "Polainas de hazmat" - -#: ../hazmat_suit/init.lua -msgid "Hazmat Boots" -msgstr "Botas de hazmat" - -#: ../hazmat_suit/init.lua -msgid "Hazmat Suit" -msgstr "Traje de hazmat" - -#: ../shields/init.lua -msgid "Admin Shield" -msgstr "Escudo de admin" - -#: ../shields/init.lua -msgid "Wooden Shield" -msgstr "Escudo de madera" - -#: ../shields/init.lua -msgid "Enhanced Wood Shield" -msgstr "Escudo de madera mejorado" - -#: ../shields/init.lua -msgid "Cactus Shield" -msgstr "Escudo de cactus" - -#: ../shields/init.lua -msgid "Enhanced Cactus Shield" -msgstr "Escudo de cactus mejorado" - -#: ../shields/init.lua -msgid "Steel Shield" -msgstr "Escudo de acero" - -#: ../shields/init.lua -msgid "Bronze Shield" -msgstr "Escudo de bronce" - -#: ../shields/init.lua -msgid "Diamond Shield" -msgstr "Escudo de diamante" - -#: ../shields/init.lua -msgid "Gold Shield" -msgstr "Escudo de oro" - -#: ../shields/init.lua -msgid "Mithril Shield" -msgstr "Escudo de mitrilo" - -#: ../shields/init.lua -msgid "Crystal Shield" -msgstr "Escudo de cristal" - -#: ../technic_armor/init.lua -msgid "technic_armor: Mod loaded but unused." -msgstr "technic_armor: Mod cargado, pero no usado." - -#: ../technic_armor/init.lua -msgid "Lead" -msgstr "Plomo" - -#: ../technic_armor/init.lua -msgid "Brass" -msgstr "Latón" - -#: ../technic_armor/init.lua -msgid "Cast Iron" -msgstr "Hierro fundido" - -#: ../technic_armor/init.lua -msgid "Carbon Steel" -msgstr "Acero carbono" - -#: ../technic_armor/init.lua -msgid "Stainless Steel" -msgstr "Acero inoxidable" - -#: ../technic_armor/init.lua -msgid "Tin" -msgstr "Estaño" - -#: ../technic_armor/init.lua -msgid "Silver" -msgstr "Plata" - -#: ../technic_armor/init.lua -msgid "Helmet" -msgstr "Casco" - -#: ../technic_armor/init.lua -msgid "Chestplate" -msgstr "Peto" - -#: ../technic_armor/init.lua -msgid "Leggins" -msgstr "Polainas" - -#: ../technic_armor/init.lua -msgid "Boots" -msgstr "Botas" - -#: ../technic_armor/init.lua -msgid "Shield" -msgstr "Escudo" - -#. Translators: @1 stands for material and @2 for part of the armor, so that you could use a conjunction if in your language part name comes first then material (e.g. in french 'Silver Boots' is translated in 'Bottes en argent' by using '@2 en @1' as translated string) -#: ../technic_armor/init.lua -msgid "@1 @2" -msgstr "@2 de @1" diff --git a/3d_armor/locale/fr.po b/3d_armor/locale/fr.po deleted file mode 100644 index f2d258f..0000000 --- a/3d_armor/locale/fr.po +++ /dev/null @@ -1,295 +0,0 @@ -# French translation for 3D ARMOR MOD -# Copyright (C) 2018 by Stuart Jones -# This file is distributed under the same license as the 3D ARMOR MOD package. -# fat115 , 2017. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 21:24+0200\n" -"PO-Revision-Date: 2018-07-23 21:30+0200\n" -"Last-Translator: fat115 \n" -"Language-Team: \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.12\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player reference is nil @1" -msgstr "3d_armor : Référence au joueur non trouvée @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player name is nil @1" -msgstr "3d_armor : Nom du joueur non trouvé @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Detached armor inventory is nil @1" -msgstr "3d_armor : Inventaire détaché pour l'armure non trouvé @1" - -#: ../3d_armor/armor.lua -msgid "Admin Helmet" -msgstr "Casque d'admin" - -#: ../3d_armor/armor.lua -msgid "Admin Chestplate" -msgstr "Cuirasse d'admin" - -#: ../3d_armor/armor.lua -msgid "Admin Leggings" -msgstr "Jambières d'admin" - -#: ../3d_armor/armor.lua -msgid "Admin Boots" -msgstr "Bottes d'admin" - -#: ../3d_armor/armor.lua -msgid "Wood Helmet" -msgstr "Casque en bois" - -#: ../3d_armor/armor.lua -msgid "Wood Chestplate" -msgstr "Cuirasse en bois" - -#: ../3d_armor/armor.lua -msgid "Wood Leggings" -msgstr "Jambières en bois" - -#: ../3d_armor/armor.lua -msgid "Wood Boots" -msgstr "Bottes en bois" - -#: ../3d_armor/armor.lua -msgid "Cactus Helmet" -msgstr "Casque en cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Chestplate" -msgstr "Cuirasse en cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Leggings" -msgstr "Jambières en cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Boots" -msgstr "Bottes en cactus" - -#: ../3d_armor/armor.lua -msgid "Steel Helmet" -msgstr "Casque en acier" - -#: ../3d_armor/armor.lua -msgid "Steel Chestplate" -msgstr " = Cuirasse en acier" - -#: ../3d_armor/armor.lua -msgid "Steel Leggings" -msgstr "Jambières en acier" - -#: ../3d_armor/armor.lua -msgid "Steel Boots" -msgstr "Bottes en acier" - -#: ../3d_armor/armor.lua -msgid "Bronze Helmet" -msgstr "Casque en bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Chestplate" -msgstr "Cuirasse en bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Leggings" -msgstr "Jambières en bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Boots" -msgstr "Bottes en bronze" - -#: ../3d_armor/armor.lua -msgid "Diamond Helmet" -msgstr "Casque en diamant" - -#: ../3d_armor/armor.lua -msgid "Diamond Chestplate" -msgstr "Cuirasse en diamant" - -#: ../3d_armor/armor.lua -msgid "Diamond Leggings" -msgstr "Jambières en diamant" - -#: ../3d_armor/armor.lua -msgid "Diamond Boots" -msgstr "Bottes en diamant" - -#: ../3d_armor/armor.lua -msgid "Gold Helmet" -msgstr "Casque en or" - -#: ../3d_armor/armor.lua -msgid "Gold Chestplate" -msgstr "Cuirasse en or" - -#: ../3d_armor/armor.lua -msgid "Gold Leggings" -msgstr "Jambières en or" - -#: ../3d_armor/armor.lua -msgid "Gold Boots" -msgstr "Bottes en or" - -#: ../3d_armor/armor.lua -msgid "Mithril Helmet" -msgstr "Casque en mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Chestplate" -msgstr "Cuirasse en mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Leggings" -msgstr "Jambières en mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Boots" -msgstr "Bottes en mithril" - -#: ../3d_armor/armor.lua -msgid "Crystal Helmet" -msgstr "Casque en cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Chestplate" -msgstr "Cuirasse en cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Leggings" -msgstr "Jambières en cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Boots" -msgstr "Bottes en cristal" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Radiation" -msgstr "Radiation" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Level" -msgstr "Niveau" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Heal" -msgstr "Soins" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Fire" -msgstr "Fire" - -#: ../3d_armor/init.lua -msgid "Your @1 got destroyed!" -msgstr "Une partie de votre armure a été détruite : @1 !" - -#: ../3d_armor/init.lua -msgid "3d_armor: Failed to initialize player" -msgstr "3d_armor : Impossible d'initialiser le joueur" - -#: ../3d_armor/init.lua -msgid "[3d_armor] Fire Nodes disabled" -msgstr "[3d_armor] Noeuds de type feu désactivés" - -#: ../3d_armor_ip/init.lua -msgid "3d_armor_ip: Mod loaded but unused." -msgstr "3d_armor_ip : Mod chargé mais inutilisé." - -#: ../3d_armor_ip/init.lua -msgid "Back" -msgstr "Retour" - -#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua -msgid "Armor" -msgstr "Armure" - -#: ../3d_armor_sfinv/init.lua -msgid "3d_armor_sfinv: Mod loaded but unused." -msgstr "3d_armor_sfinv : Mod chargé mais inutilisé." - -#: ../3d_armor_stand/init.lua -msgid "Armor stand top" -msgstr "Haut de support d'armure" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand" -msgstr "Support d'armure" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand" -msgstr "Support d'armure" - -#: ../3d_armor_stand/init.lua -msgid "Locked Armor stand" -msgstr "Support d'armure verrouillé" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand (owned by @1)" -msgstr "Support d'armure (propriété de @1)" - -#: ../3d_armor_ui/init.lua -msgid "3d_armor_ui: Mod loaded but unused." -msgstr "3d_armor_ui : Mod chargé mais inutilisé." - -#: ../3d_armor_ui/init.lua -msgid "3d Armor" -msgstr "Armure 3d" - -#: ../3d_armor_ui/init.lua -msgid "Armor not initialized!" -msgstr "Armure non initialisée !" - -#: ../shields/init.lua -msgid "Admin Shield" -msgstr "Bouclier d'admin" - -#: ../shields/init.lua -msgid "Wooden Shield" -msgstr "Bouclier en bois" - -#: ../shields/init.lua -msgid "Enhanced Wood Shield" -msgstr "Bouclier en bois amélioré" - -#: ../shields/init.lua -msgid "Cactus Shield" -msgstr "Bouclier en cactus" - -#: ../shields/init.lua -msgid "Enhanced Cactus Shield" -msgstr "Bouclier en cactus amélioré" - -#: ../shields/init.lua -msgid "Steel Shield" -msgstr "Bouclier en acier" - -#: ../shields/init.lua -msgid "Bronze Shield" -msgstr "Bouclier en bronze" - -#: ../shields/init.lua -msgid "Diamond Shield" -msgstr "Bouclier en diamant" - -#: ../shields/init.lua -msgid "Gold Shield" -msgstr "Bouclier en or" - -#: ../shields/init.lua -msgid "Mithril Shield" -msgstr "Bouclier en mithril" - -#: ../shields/init.lua -msgid "Crystal Shield" -msgstr "Bouclier en cristal" diff --git a/3d_armor/locale/it.po b/3d_armor/locale/it.po deleted file mode 100644 index 5d6f46b..0000000 --- a/3d_armor/locale/it.po +++ /dev/null @@ -1,295 +0,0 @@ -# Italian translation for 3D ARMOR MOD -# Copyright (C) 2018 by Stuart Jones -# This file is distributed under the same license as the 3D ARMOR MOD package. -# Hamlet , 2017. -# -msgid "" -msgstr "" -"Project-Id-Version: Italian localization file for the 3D Armor module\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 21:24+0200\n" -"PO-Revision-Date: 2018-07-23 21:30+0200\n" -"Last-Translator: H4mlet \n" -"Language-Team: ITALIANO\n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.10\n" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player reference is nil @1" -msgstr "3d_armor: Il riferimento alla/al giocatrice/tore è nullo @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player name is nil @1" -msgstr "3d_armor: Il nome della/del gicatrice/tore è nullo @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Detached armor inventory is nil @1" -msgstr "3d_armor: L'inventario staccato dell'armatura è nullo @1" - -#: ../3d_armor/armor.lua -msgid "Admin Helmet" -msgstr "Elmo dell'amministratrice/tore" - -#: ../3d_armor/armor.lua -msgid "Admin Chestplate" -msgstr "Corazza dell'amministratrice/tore" - -#: ../3d_armor/armor.lua -msgid "Admin Leggings" -msgstr "Gambali dell'amministratrice/tore" - -#: ../3d_armor/armor.lua -msgid "Admin Boots" -msgstr "Stivali dell'amministratrice/tore" - -#: ../3d_armor/armor.lua -msgid "Wood Helmet" -msgstr "Elmo di legno" - -#: ../3d_armor/armor.lua -msgid "Wood Chestplate" -msgstr "Corazza di legno" - -#: ../3d_armor/armor.lua -msgid "Wood Leggings" -msgstr "Gambali di legno" - -#: ../3d_armor/armor.lua -msgid "Wood Boots" -msgstr "Stivali di legno" - -#: ../3d_armor/armor.lua -msgid "Cactus Helmet" -msgstr "Elmo di cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Chestplate" -msgstr "Corazza di cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Leggings" -msgstr "Gambali di cactus" - -#: ../3d_armor/armor.lua -msgid "Cactus Boots" -msgstr "Stivali di cactus" - -#: ../3d_armor/armor.lua -msgid "Steel Helmet" -msgstr "Elmo di acciaio" - -#: ../3d_armor/armor.lua -msgid "Steel Chestplate" -msgstr "Corazza di acciaio" - -#: ../3d_armor/armor.lua -msgid "Steel Leggings" -msgstr "Gambali di acciaio" - -#: ../3d_armor/armor.lua -msgid "Steel Boots" -msgstr "Stivali di acciaio" - -#: ../3d_armor/armor.lua -msgid "Bronze Helmet" -msgstr "Elmo di bronzo" - -#: ../3d_armor/armor.lua -msgid "Bronze Chestplate" -msgstr "Corazza di bronzo" - -#: ../3d_armor/armor.lua -msgid "Bronze Leggings" -msgstr "Gambali di bronzo" - -#: ../3d_armor/armor.lua -msgid "Bronze Boots" -msgstr "Stivali di bronzo" - -#: ../3d_armor/armor.lua -msgid "Diamond Helmet" -msgstr "Elmo di diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Chestplate" -msgstr "Corazza di diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Leggings" -msgstr "Gambali di diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Boots" -msgstr "Stivali di diamante" - -#: ../3d_armor/armor.lua -msgid "Gold Helmet" -msgstr "Elmo d'oro" - -#: ../3d_armor/armor.lua -msgid "Gold Chestplate" -msgstr "Corazza d'oro" - -#: ../3d_armor/armor.lua -msgid "Gold Leggings" -msgstr "Gambali d'oro" - -#: ../3d_armor/armor.lua -msgid "Gold Boots" -msgstr "Stivali d'oro" - -#: ../3d_armor/armor.lua -msgid "Mithril Helmet" -msgstr "Elmo di mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Chestplate" -msgstr "Corazza di mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Leggings" -msgstr "Gambali di mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Boots" -msgstr "Stivali di mithril" - -#: ../3d_armor/armor.lua -msgid "Crystal Helmet" -msgstr "Elmo di cristallo" - -#: ../3d_armor/armor.lua -msgid "Crystal Chestplate" -msgstr "Corazza di cristallo" - -#: ../3d_armor/armor.lua -msgid "Crystal Leggings" -msgstr "Gambali di cristallo" - -#: ../3d_armor/armor.lua -msgid "Crystal Boots" -msgstr "Stivali di cristallo" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Radiation" -msgstr "Radiazione" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Level" -msgstr "Livello" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Heal" -msgstr "Guarigione" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Fire" -msgstr "Fuoco" - -#: ../3d_armor/init.lua -msgid "Your @1 got destroyed!" -msgstr "Il/i vostro/i @1 è/sono stato/i distrutto/i!" - -#: ../3d_armor/init.lua -msgid "3d_armor: Failed to initialize player" -msgstr "3d_armor: Inizializzazione della/del giocatrice/tore fallita" - -#: ../3d_armor/init.lua -msgid "[3d_armor] Fire Nodes disabled" -msgstr "[3d_armor] Nodi fuoco disabilitati" - -#: ../3d_armor_ip/init.lua -msgid "3d_armor_ip: Mod loaded but unused." -msgstr "3d_armor_ip: Mod caricato ma inutilizzato." - -#: ../3d_armor_ip/init.lua -msgid "Back" -msgstr "Indietro" - -#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua -msgid "Armor" -msgstr "Armatura" - -#: ../3d_armor_sfinv/init.lua -msgid "3d_armor_sfinv: Mod loaded but unused." -msgstr "3d_armor_sfinv: Mod caricato ma inutilizzato." - -#: ../3d_armor_stand/init.lua -msgid "Armor stand top" -msgstr "Parte superiore del supporto per armatura" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand" -msgstr "Supporto per armatura" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand" -msgstr "Supporto per armatura" - -#: ../3d_armor_stand/init.lua -msgid "Locked Armor stand" -msgstr "Supporto per armatura chiuso a chiave" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand (owned by @1)" -msgstr "Supporto per armatura (di proprietà di @1)" - -#: ../3d_armor_ui/init.lua -msgid "3d_armor_ui: Mod loaded but unused." -msgstr "3d_armor_ui: Mod caricato ma inutilizzato." - -#: ../3d_armor_ui/init.lua -msgid "3d Armor" -msgstr "Armatura 3D" - -#: ../3d_armor_ui/init.lua -msgid "Armor not initialized!" -msgstr "Armatura non inizializzata!" - -#: ../shields/init.lua -msgid "Admin Shield" -msgstr "Scudo dell'amministratrice/tore" - -#: ../shields/init.lua -msgid "Wooden Shield" -msgstr "Scudo di legno" - -#: ../shields/init.lua -msgid "Enhanced Wood Shield" -msgstr "Scudo di legno migliorato" - -#: ../shields/init.lua -msgid "Cactus Shield" -msgstr "Scudo di cactus" - -#: ../shields/init.lua -msgid "Enhanced Cactus Shield" -msgstr "Scudo di cactus migliorato" - -#: ../shields/init.lua -msgid "Steel Shield" -msgstr "Scudo di acciaio" - -#: ../shields/init.lua -msgid "Bronze Shield" -msgstr "Scudo di bronzo" - -#: ../shields/init.lua -msgid "Diamond Shield" -msgstr "Scudo di diamante" - -#: ../shields/init.lua -msgid "Gold Shield" -msgstr "Scudo d'oro" - -#: ../shields/init.lua -msgid "Mithril Shield" -msgstr "Scudo di mithril" - -#: ../shields/init.lua -msgid "Crystal Shield" -msgstr "Scudo di cristallo" diff --git a/3d_armor/locale/ms.po b/3d_armor/locale/ms.po deleted file mode 100644 index 518e438..0000000 --- a/3d_armor/locale/ms.po +++ /dev/null @@ -1,296 +0,0 @@ -# Malay translation for 3D ARMOR MOD -# Copyright (C) 2018 by Stuart Jones -# This file is distributed under the same license as the 3D ARMOR MOD package. -# MuhdNurHidayat (MNH48) , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 21:21+0200\n" -"PO-Revision-Date: 2018-07-23 21:30+0200\n" -"Last-Translator: MuhdNurHidayat (MNH48) \n" -"Language-Team: \n" -"Language: ms\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player reference is nil @1" -msgstr "3d_armor: Rujukan pemain tiada nilai @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player name is nil @1" -msgstr "3d_armor: Nama pemain tiada nilai @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Detached armor inventory is nil @1" -msgstr "3d_armor: Inventori perisai terpisah tiada nilai @1" - -#: ../3d_armor/armor.lua -msgid "Admin Helmet" -msgstr "Helmet Pentadbir" - -#: ../3d_armor/armor.lua -msgid "Admin Chestplate" -msgstr "Perisai Dada Pentadbir" - -#: ../3d_armor/armor.lua -msgid "Admin Leggings" -msgstr "Perisai Kaki Pentadbir" - -#: ../3d_armor/armor.lua -msgid "Admin Boots" -msgstr "But Pentadbir" - -#: ../3d_armor/armor.lua -msgid "Wood Helmet" -msgstr "Helmet Kayu" - -#: ../3d_armor/armor.lua -msgid "Wood Chestplate" -msgstr "Perisai Dada Kayu" - -#: ../3d_armor/armor.lua -msgid "Wood Leggings" -msgstr "Perisai Kaki Kayu" - -#: ../3d_armor/armor.lua -msgid "Wood Boots" -msgstr "But Kayu" - -#: ../3d_armor/armor.lua -msgid "Cactus Helmet" -msgstr "Helmet Kaktus" - -#: ../3d_armor/armor.lua -msgid "Cactus Chestplate" -msgstr "Perisai Dada Kaktus" - -#: ../3d_armor/armor.lua -msgid "Cactus Leggings" -msgstr "Perisai Kaki Kaktus" - -#: ../3d_armor/armor.lua -msgid "Cactus Boots" -msgstr "But Kaktus" - -#: ../3d_armor/armor.lua -msgid "Steel Helmet" -msgstr "Helmet Keluli" - -#: ../3d_armor/armor.lua -msgid "Steel Chestplate" -msgstr "Perisai Dada Keluli" - -#: ../3d_armor/armor.lua -msgid "Steel Leggings" -msgstr "Perisai Kaki Keluli" - -#: ../3d_armor/armor.lua -msgid "Steel Boots" -msgstr "But Keluli" - -#: ../3d_armor/armor.lua -msgid "Bronze Helmet" -msgstr "Helmet Gangsa" - -#: ../3d_armor/armor.lua -msgid "Bronze Chestplate" -msgstr "Perisai Dada Gangsa" - -#: ../3d_armor/armor.lua -msgid "Bronze Leggings" -msgstr "Perisai Kaki Gangsa" - -#: ../3d_armor/armor.lua -msgid "Bronze Boots" -msgstr "But Gangsa" - -# 'Diamond' should be translated as 'intan' because the more common word 'berlian' is only specifically used for the gemstone diamond. -#: ../3d_armor/armor.lua -msgid "Diamond Helmet" -msgstr "Helmet Intan" - -#: ../3d_armor/armor.lua -msgid "Diamond Chestplate" -msgstr "Perisai Dada Intan" - -#: ../3d_armor/armor.lua -msgid "Diamond Leggings" -msgstr "Perisai Kaki Intan" - -#: ../3d_armor/armor.lua -msgid "Diamond Boots" -msgstr "But Intan" - -#: ../3d_armor/armor.lua -msgid "Gold Helmet" -msgstr "Helmet Emas" - -#: ../3d_armor/armor.lua -msgid "Gold Chestplate" -msgstr "Perisai Dada Emas" - -#: ../3d_armor/armor.lua -msgid "Gold Leggings" -msgstr "Perisai Kaki Emas" - -#: ../3d_armor/armor.lua -msgid "Gold Boots" -msgstr "But Emas" - -#: ../3d_armor/armor.lua -msgid "Mithril Helmet" -msgstr "Helmet Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Chestplate" -msgstr "Perisai Dada Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Leggings" -msgstr "Perisai Kaki Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Boots" -msgstr "But Mithril" - -#: ../3d_armor/armor.lua -msgid "Crystal Helmet" -msgstr "Helmet Kristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Chestplate" -msgstr "Perisai Dada Kristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Leggings" -msgstr "Perisai Kaki Kristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Boots" -msgstr "But Kristal" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Radiation" -msgstr "Radiasi" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Level" -msgstr "Tahap" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Heal" -msgstr "Pulih" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Fire" -msgstr "Api" - -#: ../3d_armor/init.lua -msgid "Your @1 got destroyed!" -msgstr "@1 anda telah musnah!" - -#: ../3d_armor/init.lua -msgid "3d_armor: Failed to initialize player" -msgstr "3d_armor: Gagal mengasalkan pemain" - -#: ../3d_armor/init.lua -msgid "[3d_armor] Fire Nodes disabled" -msgstr "[3d_armor] Nod-nod Api dilumpuhkan" - -#: ../3d_armor_ip/init.lua -msgid "3d_armor_ip: Mod loaded but unused." -msgstr "3d_armor_ip: Mods dimuatkan tetapi tidak digunakan." - -#: ../3d_armor_ip/init.lua -msgid "Back" -msgstr "Kembali" - -#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua -msgid "Armor" -msgstr "Perisai" - -#: ../3d_armor_sfinv/init.lua -msgid "3d_armor_sfinv: Mod loaded but unused." -msgstr "3d_armor_sfinv: Mods dimuatkan tetapi tidak digunakan." - -#: ../3d_armor_stand/init.lua -msgid "Armor stand top" -msgstr "Bhg atas dirian perisai" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand" -msgstr "Dirian perisai" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand" -msgstr "Dirian Perisai" - -#: ../3d_armor_stand/init.lua -msgid "Locked Armor stand" -msgstr "Dirian perisai Berkunci" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand (owned by @1)" -msgstr "Dirian Perisai (milik @1)" - -#: ../3d_armor_ui/init.lua -msgid "3d_armor_ui: Mod loaded but unused." -msgstr "3d_armor_ui: Mods dimuatkan tetapi tidak digunakan." - -#: ../3d_armor_ui/init.lua -msgid "3d Armor" -msgstr "Perisai 3d" - -#: ../3d_armor_ui/init.lua -msgid "Armor not initialized!" -msgstr "Perisai tidak diasalkan!" - -#: ../shields/init.lua -msgid "Admin Shield" -msgstr "Perisai Pegang Pentadbir" - -#: ../shields/init.lua -msgid "Wooden Shield" -msgstr "Perisai Pegang Kayu" - -#: ../shields/init.lua -msgid "Enhanced Wood Shield" -msgstr "Perisai Pegang Kayu Kukuh" - -#: ../shields/init.lua -msgid "Cactus Shield" -msgstr "Perisai Pegang Kaktus" - -#: ../shields/init.lua -msgid "Enhanced Cactus Shield" -msgstr "Perisai Pegang Kaktus Kukuh" - -#: ../shields/init.lua -msgid "Steel Shield" -msgstr "Perisai Pegang Keluli" - -#: ../shields/init.lua -msgid "Bronze Shield" -msgstr "Perisai Pegang Gangsa" - -#: ../shields/init.lua -msgid "Diamond Shield" -msgstr "Perisai Pegang Intan" - -#: ../shields/init.lua -msgid "Gold Shield" -msgstr "Perisai Pegang Emas" - -#: ../shields/init.lua -msgid "Mithril Shield" -msgstr "Perisai Pegang Mithril" - -#: ../shields/init.lua -msgid "Crystal Shield" -msgstr "Perisai Pegang Kristal" diff --git a/3d_armor/locale/pt.po b/3d_armor/locale/pt.po deleted file mode 100644 index 0166637..0000000 --- a/3d_armor/locale/pt.po +++ /dev/null @@ -1,295 +0,0 @@ -# LANGUAGE translation for 3D ARMOR MOD -# Copyright (C) 2018 by Stuart Jones -# This file is distributed under the same license as the 3D ARMOR MOD package. -# BrunoMine , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: 3d_armor\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 21:24+0200\n" -"PO-Revision-Date: 2018-11-08 13:12-0200\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" -"Last-Translator: BrunoMine \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language: pt\n" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player reference is nil @1" -msgstr "3d_armor: Referência Jogador é nula @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player name is nil @1" -msgstr "3d_armor: Nome de jogador é nulo @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Detached armor inventory is nil @1" -msgstr "3d_armor: Inventario avulso de armadura é nulo @1" - -#: ../3d_armor/armor.lua -msgid "Admin Helmet" -msgstr "Capacete de Administrador" - -#: ../3d_armor/armor.lua -msgid "Admin Chestplate" -msgstr "Peitoral de Administrador" - -#: ../3d_armor/armor.lua -msgid "Admin Leggings" -msgstr "Calças de Administrador" - -#: ../3d_armor/armor.lua -msgid "Admin Boots" -msgstr "Botas de Administrador" - -#: ../3d_armor/armor.lua -msgid "Wood Helmet" -msgstr "Capacete de Madeira" - -#: ../3d_armor/armor.lua -msgid "Wood Chestplate" -msgstr "Peitoral de Madeira" - -#: ../3d_armor/armor.lua -msgid "Wood Leggings" -msgstr "Calças de Madeira" - -#: ../3d_armor/armor.lua -msgid "Wood Boots" -msgstr "Botas de Madeira" - -#: ../3d_armor/armor.lua -msgid "Cactus Helmet" -msgstr "Capacete de Cacto" - -#: ../3d_armor/armor.lua -msgid "Cactus Chestplate" -msgstr "Peitoral de Cacto" - -#: ../3d_armor/armor.lua -msgid "Cactus Leggings" -msgstr "Calças de Cacto" - -#: ../3d_armor/armor.lua -msgid "Cactus Boots" -msgstr "Botas de Madeira" - -#: ../3d_armor/armor.lua -msgid "Steel Helmet" -msgstr "Capacete de Aço" - -#: ../3d_armor/armor.lua -msgid "Steel Chestplate" -msgstr "Peitoral de Aço" - -#: ../3d_armor/armor.lua -msgid "Steel Leggings" -msgstr "Calças de Aço" - -#: ../3d_armor/armor.lua -msgid "Steel Boots" -msgstr "Botas de Aço" - -#: ../3d_armor/armor.lua -msgid "Bronze Helmet" -msgstr "Capacete de Bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Chestplate" -msgstr "Peitoral de Bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Leggings" -msgstr "Calças de Bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Boots" -msgstr "Botas de Bronze" - -#: ../3d_armor/armor.lua -msgid "Diamond Helmet" -msgstr "Capacete de Diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Chestplate" -msgstr "Peitoral de Diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Leggings" -msgstr "Calças de Diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Boots" -msgstr "Botas de Diamante" - -#: ../3d_armor/armor.lua -msgid "Gold Helmet" -msgstr "Capacete de Ouro" - -#: ../3d_armor/armor.lua -msgid "Gold Chestplate" -msgstr "Peitoral de Ouro" - -#: ../3d_armor/armor.lua -msgid "Gold Leggings" -msgstr "Calças de Ouro" - -#: ../3d_armor/armor.lua -msgid "Gold Boots" -msgstr "Botas de Ouro" - -#: ../3d_armor/armor.lua -msgid "Mithril Helmet" -msgstr "Capacete de Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Chestplate" -msgstr "Peitoral de Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Leggings" -msgstr "Calças de Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Boots" -msgstr "Botas de Mithril" - -#: ../3d_armor/armor.lua -msgid "Crystal Helmet" -msgstr "Capacete de Cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Chestplate" -msgstr "Peitoral de Cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Leggings" -msgstr "Calças de Cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Boots" -msgstr "Botas de Cristal" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Radiation" -msgstr "Radiação" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Level" -msgstr "Nível" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Heal" -msgstr "Saúde" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Fire" -msgstr "Fogo" - -#: ../3d_armor/init.lua -msgid "Your @1 got destroyed!" -msgstr "@1 foi destruído(a)!" - -#: ../3d_armor/init.lua -msgid "3d_armor: Failed to initialize player" -msgstr "3d_armor: Falha ao inicializar jogador" - -#: ../3d_armor/init.lua -msgid "[3d_armor] Fire Nodes disabled" -msgstr "[3d_armor] Nodes de gofo desabilitados" - -#: ../3d_armor_ip/init.lua -msgid "3d_armor_ip: Mod loaded but unused." -msgstr "3d_armor_ip: Mod carregado mas inoperante." - -#: ../3d_armor_ip/init.lua -msgid "Back" -msgstr "Voltar" - -#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua -msgid "Armor" -msgstr "Armadura" - -#: ../3d_armor_sfinv/init.lua -msgid "3d_armor_sfinv: Mod loaded but unused." -msgstr "3d_armor_sfinv: Mod carregado mas inoperante." - -#: ../3d_armor_stand/init.lua -msgid "Armor stand top" -msgstr "Topo de estande de armadura" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand" -msgstr "Estande de armadura" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand" -msgstr "Estande de Armadura" - -#: ../3d_armor_stand/init.lua -msgid "Locked Armor stand" -msgstr "Estande de Armadura Trancada" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand (owned by @1)" -msgstr "Estande de Armadura (pertente a @1)" - -#: ../3d_armor_ui/init.lua -msgid "3d_armor_ui: Mod loaded but unused." -msgstr "3d_armor_ui: Mod carregado mas inoperante." - -#: ../3d_armor_ui/init.lua -msgid "3d Armor" -msgstr "3d Armor" - -#: ../3d_armor_ui/init.lua -msgid "Armor not initialized!" -msgstr "Armadura não inicializada!" - -#: ../shields/init.lua -msgid "Admin Shield" -msgstr "Escudo de Administrador" - -#: ../shields/init.lua -msgid "Wooden Shield" -msgstr "Escudo de Madeira" - -#: ../shields/init.lua -msgid "Enhanced Wood Shield" -msgstr "Escudo de Madeira Melhorado" - -#: ../shields/init.lua -msgid "Cactus Shield" -msgstr "Escudo de Cacto" - -#: ../shields/init.lua -msgid "Enhanced Cactus Shield" -msgstr "Escudo de Cacto Melhorado" - -#: ../shields/init.lua -msgid "Steel Shield" -msgstr "Escudo de Aço" - -#: ../shields/init.lua -msgid "Bronze Shield" -msgstr "Escudo de Bronze" - -#: ../shields/init.lua -msgid "Diamond Shield" -msgstr "Escudo de Diamante" - -#: ../shields/init.lua -msgid "Gold Shield" -msgstr "Escudo de Ouro" - -#: ../shields/init.lua -msgid "Mithril Shield" -msgstr "Escudo de Mithril" - -#: ../shields/init.lua -msgid "Crystal Shield" -msgstr "Escudo de Cristal" diff --git a/3d_armor/locale/pt_BR.po b/3d_armor/locale/pt_BR.po deleted file mode 100644 index b429d11..0000000 --- a/3d_armor/locale/pt_BR.po +++ /dev/null @@ -1,295 +0,0 @@ -# LANGUAGE translation for 3D ARMOR MOD -# Copyright (C) 2018 by Stuart Jones -# This file is distributed under the same license as the 3D ARMOR MOD package. -# BrunoMine , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: 3d_armor\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 21:24+0200\n" -"PO-Revision-Date: 2018-11-08 13:12-0200\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" -"Last-Translator: BrunoMine \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language: pt_BR\n" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player reference is nil @1" -msgstr "3d_armor: Referência Jogador é nula @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player name is nil @1" -msgstr "3d_armor: Nome de jogador é nulo @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Detached armor inventory is nil @1" -msgstr "3d_armor: Inventario avulso de armadura é nulo @1" - -#: ../3d_armor/armor.lua -msgid "Admin Helmet" -msgstr "Capacete de Administrador" - -#: ../3d_armor/armor.lua -msgid "Admin Chestplate" -msgstr "Peitoral de Administrador" - -#: ../3d_armor/armor.lua -msgid "Admin Leggings" -msgstr "Calças de Administrador" - -#: ../3d_armor/armor.lua -msgid "Admin Boots" -msgstr "Botas de Administrador" - -#: ../3d_armor/armor.lua -msgid "Wood Helmet" -msgstr "Capacete de Madeira" - -#: ../3d_armor/armor.lua -msgid "Wood Chestplate" -msgstr "Peitoral de Madeira" - -#: ../3d_armor/armor.lua -msgid "Wood Leggings" -msgstr "Calças de Madeira" - -#: ../3d_armor/armor.lua -msgid "Wood Boots" -msgstr "Botas de Madeira" - -#: ../3d_armor/armor.lua -msgid "Cactus Helmet" -msgstr "Capacete de Cacto" - -#: ../3d_armor/armor.lua -msgid "Cactus Chestplate" -msgstr "Peitoral de Cacto" - -#: ../3d_armor/armor.lua -msgid "Cactus Leggings" -msgstr "Calças de Cacto" - -#: ../3d_armor/armor.lua -msgid "Cactus Boots" -msgstr "Botas de Madeira" - -#: ../3d_armor/armor.lua -msgid "Steel Helmet" -msgstr "Capacete de Aço" - -#: ../3d_armor/armor.lua -msgid "Steel Chestplate" -msgstr "Peitoral de Aço" - -#: ../3d_armor/armor.lua -msgid "Steel Leggings" -msgstr "Calças de Aço" - -#: ../3d_armor/armor.lua -msgid "Steel Boots" -msgstr "Botas de Aço" - -#: ../3d_armor/armor.lua -msgid "Bronze Helmet" -msgstr "Capacete de Bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Chestplate" -msgstr "Peitoral de Bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Leggings" -msgstr "Calças de Bronze" - -#: ../3d_armor/armor.lua -msgid "Bronze Boots" -msgstr "Botas de Bronze" - -#: ../3d_armor/armor.lua -msgid "Diamond Helmet" -msgstr "Capacete de Diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Chestplate" -msgstr "Peitoral de Diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Leggings" -msgstr "Calças de Diamante" - -#: ../3d_armor/armor.lua -msgid "Diamond Boots" -msgstr "Botas de Diamante" - -#: ../3d_armor/armor.lua -msgid "Gold Helmet" -msgstr "Capacete de Ouro" - -#: ../3d_armor/armor.lua -msgid "Gold Chestplate" -msgstr "Peitoral de Ouro" - -#: ../3d_armor/armor.lua -msgid "Gold Leggings" -msgstr "Calças de Ouro" - -#: ../3d_armor/armor.lua -msgid "Gold Boots" -msgstr "Botas de Ouro" - -#: ../3d_armor/armor.lua -msgid "Mithril Helmet" -msgstr "Capacete de Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Chestplate" -msgstr "Peitoral de Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Leggings" -msgstr "Calças de Mithril" - -#: ../3d_armor/armor.lua -msgid "Mithril Boots" -msgstr "Botas de Mithril" - -#: ../3d_armor/armor.lua -msgid "Crystal Helmet" -msgstr "Capacete de Cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Chestplate" -msgstr "Peitoral de Cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Leggings" -msgstr "Calças de Cristal" - -#: ../3d_armor/armor.lua -msgid "Crystal Boots" -msgstr "Botas de Cristal" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Radiation" -msgstr "Radiação" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Level" -msgstr "Nível" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Heal" -msgstr "Saúde" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Fire" -msgstr "Fogo" - -#: ../3d_armor/init.lua -msgid "Your @1 got destroyed!" -msgstr "@1 foi destruído(a)!" - -#: ../3d_armor/init.lua -msgid "3d_armor: Failed to initialize player" -msgstr "3d_armor: Falha ao inicializar jogador" - -#: ../3d_armor/init.lua -msgid "[3d_armor] Fire Nodes disabled" -msgstr "[3d_armor] Nodes de gofo desabilitados" - -#: ../3d_armor_ip/init.lua -msgid "3d_armor_ip: Mod loaded but unused." -msgstr "3d_armor_ip: Mod carregado mas inoperante." - -#: ../3d_armor_ip/init.lua -msgid "Back" -msgstr "Voltar" - -#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua -msgid "Armor" -msgstr "Armadura" - -#: ../3d_armor_sfinv/init.lua -msgid "3d_armor_sfinv: Mod loaded but unused." -msgstr "3d_armor_sfinv: Mod carregado mas inoperante." - -#: ../3d_armor_stand/init.lua -msgid "Armor stand top" -msgstr "Topo de estande de armadura" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand" -msgstr "Estande de armadura" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand" -msgstr "Estande de Armadura" - -#: ../3d_armor_stand/init.lua -msgid "Locked Armor stand" -msgstr "Estande de Armadura Trancada" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand (owned by @1)" -msgstr "Estande de Armadura (pertente a @1)" - -#: ../3d_armor_ui/init.lua -msgid "3d_armor_ui: Mod loaded but unused." -msgstr "3d_armor_ui: Mod carregado mas inoperante." - -#: ../3d_armor_ui/init.lua -msgid "3d Armor" -msgstr "3d Armor" - -#: ../3d_armor_ui/init.lua -msgid "Armor not initialized!" -msgstr "Armadura não inicializada!" - -#: ../shields/init.lua -msgid "Admin Shield" -msgstr "Escudo de Administrador" - -#: ../shields/init.lua -msgid "Wooden Shield" -msgstr "Escudo de Madeira" - -#: ../shields/init.lua -msgid "Enhanced Wood Shield" -msgstr "Escudo de Madeira Melhorado" - -#: ../shields/init.lua -msgid "Cactus Shield" -msgstr "Escudo de Cacto" - -#: ../shields/init.lua -msgid "Enhanced Cactus Shield" -msgstr "Escudo de Cacto Melhorado" - -#: ../shields/init.lua -msgid "Steel Shield" -msgstr "Escudo de Aço" - -#: ../shields/init.lua -msgid "Bronze Shield" -msgstr "Escudo de Bronze" - -#: ../shields/init.lua -msgid "Diamond Shield" -msgstr "Escudo de Diamante" - -#: ../shields/init.lua -msgid "Gold Shield" -msgstr "Escudo de Ouro" - -#: ../shields/init.lua -msgid "Mithril Shield" -msgstr "Escudo de Mithril" - -#: ../shields/init.lua -msgid "Crystal Shield" -msgstr "Escudo de Cristal" diff --git a/3d_armor/locale/ru.po b/3d_armor/locale/ru.po deleted file mode 100644 index 4beee8a..0000000 --- a/3d_armor/locale/ru.po +++ /dev/null @@ -1,294 +0,0 @@ -# Russian translation for 3D ARMOR MOD -# Copyright (C) 2018 by Stuart Jones -# This file is distributed under the same license as the 3D ARMOR MOD package. -# CodeXP , 2018. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: 3d_armor\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 21:21+0200\n" -"PO-Revision-Date: 2018-07-23 21:30+0200\n" -"Last-Translator: CodeXP \n" -"Language-Team: \n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player reference is nil @1" -msgstr "3d_armor: Ссылка игрока является nil @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player name is nil @1" -msgstr "3d_armor: Имя игрока является nil @1" - -#: ../3d_armor/api.lua -msgid "3d_armor: Detached armor inventory is nil @1" -msgstr "3d_armor: Отдельный инвентарь брони является nil @1" - -#: ../3d_armor/armor.lua -msgid "Admin Helmet" -msgstr "шлем админа" - -#: ../3d_armor/armor.lua -msgid "Admin Chestplate" -msgstr "бронежилет админа" - -#: ../3d_armor/armor.lua -msgid "Admin Leggings" -msgstr "гамаши админа" - -#: ../3d_armor/armor.lua -msgid "Admin Boots" -msgstr "ботинки админа" - -#: ../3d_armor/armor.lua -msgid "Wood Helmet" -msgstr "деревянный шлем" - -#: ../3d_armor/armor.lua -msgid "Wood Chestplate" -msgstr "деревянный бронежилет" - -#: ../3d_armor/armor.lua -msgid "Wood Leggings" -msgstr "деревянные гамаши" - -#: ../3d_armor/armor.lua -msgid "Wood Boots" -msgstr "деревянные ботинки" - -#: ../3d_armor/armor.lua -msgid "Cactus Helmet" -msgstr "кактусовый шлем" - -#: ../3d_armor/armor.lua -msgid "Cactus Chestplate" -msgstr "кактусовый бронежилет" - -#: ../3d_armor/armor.lua -msgid "Cactus Leggings" -msgstr "кактусовые гамаши" - -#: ../3d_armor/armor.lua -msgid "Cactus Boots" -msgstr "кактусовые ботинки" - -#: ../3d_armor/armor.lua -msgid "Steel Helmet" -msgstr "стальной шлем" - -#: ../3d_armor/armor.lua -msgid "Steel Chestplate" -msgstr "стальной бронежилет" - -#: ../3d_armor/armor.lua -msgid "Steel Leggings" -msgstr "стальные гамаши" - -#: ../3d_armor/armor.lua -msgid "Steel Boots" -msgstr "стальные ботинки" - -#: ../3d_armor/armor.lua -msgid "Bronze Helmet" -msgstr "бронзовый шлем" - -#: ../3d_armor/armor.lua -msgid "Bronze Chestplate" -msgstr "бронзовый бронежилет" - -#: ../3d_armor/armor.lua -msgid "Bronze Leggings" -msgstr "бронзовые гамаши" - -#: ../3d_armor/armor.lua -msgid "Bronze Boots" -msgstr "бронзовые ботинки" - -#: ../3d_armor/armor.lua -msgid "Diamond Helmet" -msgstr "алмазный шлем" - -#: ../3d_armor/armor.lua -msgid "Diamond Chestplate" -msgstr "алмазный бронежилет" - -#: ../3d_armor/armor.lua -msgid "Diamond Leggings" -msgstr "алмазные гамаши" - -#: ../3d_armor/armor.lua -msgid "Diamond Boots" -msgstr "алмазные ботинки" - -#: ../3d_armor/armor.lua -msgid "Gold Helmet" -msgstr "золотой шлем" - -#: ../3d_armor/armor.lua -msgid "Gold Chestplate" -msgstr "золотой бронежилет" - -#: ../3d_armor/armor.lua -msgid "Gold Leggings" -msgstr "золотые гамаши" - -#: ../3d_armor/armor.lua -msgid "Gold Boots" -msgstr "золотые ботинки" - -#: ../3d_armor/armor.lua -msgid "Mithril Helmet" -msgstr "мифриловый шлем" - -#: ../3d_armor/armor.lua -msgid "Mithril Chestplate" -msgstr "мифриловый бронежилет" - -#: ../3d_armor/armor.lua -msgid "Mithril Leggings" -msgstr "мифриловые гамаши" - -#: ../3d_armor/armor.lua -msgid "Mithril Boots" -msgstr "мифриловые ботинки" - -#: ../3d_armor/armor.lua -msgid "Crystal Helmet" -msgstr "кристалловый шлем" - -#: ../3d_armor/armor.lua -msgid "Crystal Chestplate" -msgstr "кристалловый бронежилет" - -#: ../3d_armor/armor.lua -msgid "Crystal Leggings" -msgstr "кристалловые гамаши" - -#: ../3d_armor/armor.lua -msgid "Crystal Boots" -msgstr "кристалловые ботинки" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Radiation" -msgstr "излучение" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Level" -msgstr "уровень" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Heal" -msgstr "исцеление" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Fire" -msgstr "огонь" - -#: ../3d_armor/init.lua -msgid "Your @1 got destroyed!" -msgstr "твой(и) @1 был(и) разрушен(ы)!" - -#: ../3d_armor/init.lua -msgid "3d_armor: Failed to initialize player" -msgstr "3d_armor: не смог подготовить игрока" - -#: ../3d_armor/init.lua -msgid "[3d_armor] Fire Nodes disabled" -msgstr "[3d_armor] блоки огня отключены" - -#: ../3d_armor_ip/init.lua -msgid "3d_armor_ip: Mod loaded but unused." -msgstr "3d_armor_ip: мод загружен но не используется." - -#: ../3d_armor_ip/init.lua -msgid "Back" -msgstr "назад" - -#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua -msgid "Armor" -msgstr "бронь" - -#: ../3d_armor_sfinv/init.lua -msgid "3d_armor_sfinv: Mod loaded but unused." -msgstr "3d_armor_sfinv: мод загружен но не используется." - -#: ../3d_armor_stand/init.lua -msgid "Armor stand top" -msgstr "стойка для брони (верх)" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand" -msgstr "стойка для брони" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand" -msgstr "стойка для брони" - -#: ../3d_armor_stand/init.lua -msgid "Locked Armor stand" -msgstr "защищенная стойка для брони" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand (owned by @1)" -msgstr "стойка для брони (принадлежит @1)" - -#: ../3d_armor_ui/init.lua -msgid "3d_armor_ui: Mod loaded but unused." -msgstr "3d_armor_ui: мод загружен но не используется." - -#: ../3d_armor_ui/init.lua -msgid "3d Armor" -msgstr "3D бронь" - -#: ../3d_armor_ui/init.lua -msgid "Armor not initialized!" -msgstr "бронь не подготовлена!" - -#: ../shields/init.lua -msgid "Admin Shield" -msgstr "щит админа" - -#: ../shields/init.lua -msgid "Wooden Shield" -msgstr "деревянный щит" - -#: ../shields/init.lua -msgid "Enhanced Wood Shield" -msgstr "улучшенный деревянный щит" - -#: ../shields/init.lua -msgid "Cactus Shield" -msgstr "кактусный щит" - -#: ../shields/init.lua -msgid "Enhanced Cactus Shield" -msgstr "улучшенный кактусный щит" - -#: ../shields/init.lua -msgid "Steel Shield" -msgstr "стальной щит" - -#: ../shields/init.lua -msgid "Bronze Shield" -msgstr "бронзовый щит" - -#: ../shields/init.lua -msgid "Diamond Shield" -msgstr "алмазный щит" - -#: ../shields/init.lua -msgid "Gold Shield" -msgstr "золотой щит" - -#: ../shields/init.lua -msgid "Mithril Shield" -msgstr "мифриловый щит" - -#: ../shields/init.lua -msgid "Crystal Shield" -msgstr "кристалловый щит" diff --git a/3d_armor/locale/template.pot b/3d_armor/locale/template.pot deleted file mode 100644 index 0b0222c..0000000 --- a/3d_armor/locale/template.pot +++ /dev/null @@ -1,294 +0,0 @@ -# LANGUAGE translation for 3D ARMOR MOD -# Copyright (C) 2018 by Stuart Jones -# This file is distributed under the same license as the 3D ARMOR MOD package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-23 21:24+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player reference is nil @1" -msgstr "" - -#: ../3d_armor/api.lua -msgid "3d_armor: Player name is nil @1" -msgstr "" - -#: ../3d_armor/api.lua -msgid "3d_armor: Detached armor inventory is nil @1" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Admin Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Admin Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Admin Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Admin Boots" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Wood Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Wood Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Wood Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Wood Boots" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Cactus Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Cactus Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Cactus Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Cactus Boots" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Steel Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Steel Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Steel Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Steel Boots" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Bronze Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Bronze Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Bronze Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Bronze Boots" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Diamond Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Diamond Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Diamond Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Diamond Boots" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Gold Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Gold Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Gold Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Gold Boots" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Mithril Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Mithril Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Mithril Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Mithril Boots" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Crystal Helmet" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Crystal Chestplate" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Crystal Leggings" -msgstr "" - -#: ../3d_armor/armor.lua -msgid "Crystal Boots" -msgstr "" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Radiation" -msgstr "" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Level" -msgstr "" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Heal" -msgstr "" - -#: ../3d_armor/init.lua ../3d_armor_ui/init.lua -msgid "Fire" -msgstr "" - -#: ../3d_armor/init.lua -msgid "Your @1 got destroyed!" -msgstr "" - -#: ../3d_armor/init.lua -msgid "3d_armor: Failed to initialize player" -msgstr "" - -#: ../3d_armor/init.lua -msgid "[3d_armor] Fire Nodes disabled" -msgstr "" - -#: ../3d_armor_ip/init.lua -msgid "3d_armor_ip: Mod loaded but unused." -msgstr "" - -#: ../3d_armor_ip/init.lua -msgid "Back" -msgstr "" - -#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua -msgid "Armor" -msgstr "" - -#: ../3d_armor_sfinv/init.lua -msgid "3d_armor_sfinv: Mod loaded but unused." -msgstr "" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand top" -msgstr "" - -#: ../3d_armor_stand/init.lua -msgid "Armor stand" -msgstr "" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand" -msgstr "" - -#: ../3d_armor_stand/init.lua -msgid "Locked Armor stand" -msgstr "" - -#: ../3d_armor_stand/init.lua -msgid "Armor Stand (owned by @1)" -msgstr "" - -#: ../3d_armor_ui/init.lua -msgid "3d_armor_ui: Mod loaded but unused." -msgstr "" - -#: ../3d_armor_ui/init.lua -msgid "3d Armor" -msgstr "" - -#: ../3d_armor_ui/init.lua -msgid "Armor not initialized!" -msgstr "" - -#: ../shields/init.lua -msgid "Admin Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Wooden Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Enhanced Wood Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Cactus Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Enhanced Cactus Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Steel Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Bronze Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Diamond Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Gold Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Mithril Shield" -msgstr "" - -#: ../shields/init.lua -msgid "Crystal Shield" -msgstr "" diff --git a/3d_armor/locale/template.txt b/3d_armor/locale/template.txt new file mode 100644 index 0000000..cedd538 --- /dev/null +++ b/3d_armor/locale/template.txt @@ -0,0 +1,58 @@ +# textdomain: 3d_armor + + +### api.lua ### + +3d_armor: Detached armor inventory is nil @1= +3d_armor: Player name is nil @1= +3d_armor: Player reference is nil @1= + +### armor.lua ### + +Admin Boots= +Admin Chestplate= +Admin Helmet= +Admin Leggings= +Bronze Boots= +Bronze Chestplate= +Bronze Helmet= +Bronze Leggings= +Cactus Boots= +Cactus Chestplate= +Cactus Helmet= +Cactus Leggings= +Crystal Boots= +Crystal Chestplate= +Crystal Helmet= +Crystal Leggings= +Diamond Boots= +Diamond Chestplate= +Diamond Helmet= +Diamond Leggings= +Gold Boots= +Gold Chestplate= +Gold Helmet= +Gold Leggings= +Mithril Boots= +Mithril Chestplate= +Mithril Helmet= +Mithril Leggings= +Steel Boots= +Steel Chestplate= +Steel Helmet= +Steel Leggings= +Wood Boots= +Wood Chestplate= +Wood Helmet= +Wood Leggings= + +### init.lua ### + +3d_armor: Failed to initialize player= +Fire= +Heal= +Level= +Radiation= +Your @1 got destroyed!= +Your @1 is almost broken!= +[3d_armor] Fire Nodes disabled= diff --git a/3d_armor/mod.conf b/3d_armor/mod.conf new file mode 100644 index 0000000..ddf6e66 --- /dev/null +++ b/3d_armor/mod.conf @@ -0,0 +1,4 @@ +name = 3d_armor +depends = default +optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, bakedclay, moreores +description = Adds craftable armor that is visible to other players. diff --git a/3d_armor/textures/3d_armor_boots_wood.png b/3d_armor/textures/3d_armor_boots_wood.png index 50371af..d8a38d0 100644 Binary files a/3d_armor/textures/3d_armor_boots_wood.png and b/3d_armor/textures/3d_armor_boots_wood.png differ diff --git a/3d_armor/textures/3d_armor_helmet_gold.png b/3d_armor/textures/3d_armor_helmet_gold.png index eac5e6e..9835db6 100644 Binary files a/3d_armor/textures/3d_armor_helmet_gold.png and b/3d_armor/textures/3d_armor_helmet_gold.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_mithril.png b/3d_armor/textures/3d_armor_inv_helmet_mithril.png index 259f249..995dfe5 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_mithril.png and b/3d_armor/textures/3d_armor_inv_helmet_mithril.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_steel.png b/3d_armor/textures/3d_armor_inv_helmet_steel.png index 519ef9a..6c35ff1 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_steel.png and b/3d_armor/textures/3d_armor_inv_helmet_steel.png differ diff --git a/3d_armor/textures/3d_armor_trans.png b/3d_armor/textures/3d_armor_trans.png index 4a31242..7d407f8 100644 Binary files a/3d_armor/textures/3d_armor_trans.png and b/3d_armor/textures/3d_armor_trans.png differ diff --git a/3d_armor/textures/3d_armor_ui_form.png b/3d_armor/textures/3d_armor_ui_form.png index 993809f..a0ed004 100644 Binary files a/3d_armor/textures/3d_armor_ui_form.png and b/3d_armor/textures/3d_armor_ui_form.png differ diff --git a/3d_armor/textures/character_preview.png b/3d_armor/textures/character_preview.png index 82a0ae4..5afeb90 100644 Binary files a/3d_armor/textures/character_preview.png and b/3d_armor/textures/character_preview.png differ diff --git a/3d_armor_ip/description.txt b/3d_armor_ip/description.txt index 01e1b54..58b700e 100644 --- a/3d_armor_ip/description.txt +++ b/3d_armor_ip/description.txt @@ -1 +1 @@ -Adds 3d_armor page to the inventory plus +Adds 3d_armor page to the inventory plus. diff --git a/3d_armor_ip/init.lua b/3d_armor_ip/init.lua index 7701a70..f061200 100644 --- a/3d_armor_ip/init.lua +++ b/3d_armor_ip/init.lua @@ -1,5 +1,5 @@ -- support for i18n -local S = armor_i18n.gettext +local S = minetest.get_translator(minetest.get_current_modname()) local F = minetest.formspec_escape if not minetest.global_exists("inventory_plus") then diff --git a/3d_armor_ip/locale/3d_armor_ip.fr.tr b/3d_armor_ip/locale/3d_armor_ip.fr.tr new file mode 100644 index 0000000..5f540b1 --- /dev/null +++ b/3d_armor_ip/locale/3d_armor_ip.fr.tr @@ -0,0 +1,8 @@ +# textdomain: 3d_armor_ip + + +### init.lua ### + +3d_armor_ip: Mod loaded but unused.=3d_armor_ip : Mod chargé mais inutilisé. +Armor=Armure +Back=Retour diff --git a/3d_armor_ip/locale/template.txt b/3d_armor_ip/locale/template.txt new file mode 100644 index 0000000..133bce8 --- /dev/null +++ b/3d_armor_ip/locale/template.txt @@ -0,0 +1,8 @@ +# textdomain: 3d_armor_ip + + +### init.lua ### + +3d_armor_ip: Mod loaded but unused.= +Armor= +Back= diff --git a/3d_armor_ip/mod.conf b/3d_armor_ip/mod.conf new file mode 100644 index 0000000..0fe7f4e --- /dev/null +++ b/3d_armor_ip/mod.conf @@ -0,0 +1,4 @@ +name = 3d_armor_ip +depends = 3d_armor +optional_depends = inventory_plus +description = Adds 3d_armor page to the inventory plus. diff --git a/3d_armor_sfinv/description.txt b/3d_armor_sfinv/description.txt index 0ef2ae9..15f4e96 100644 --- a/3d_armor_sfinv/description.txt +++ b/3d_armor_sfinv/description.txt @@ -1 +1 @@ -Adds 3d_armor page to the sfinv inventory +Adds 3d_armor page to the sfinv inventory. diff --git a/3d_armor_sfinv/init.lua b/3d_armor_sfinv/init.lua index a937127..830ebbc 100644 --- a/3d_armor_sfinv/init.lua +++ b/3d_armor_sfinv/init.lua @@ -1,5 +1,5 @@ -- support for i18n -local S = armor_i18n.gettext +local S = minetest.get_translator(minetest.get_current_modname()) if not minetest.global_exists("sfinv") then minetest.log("warning", S("3d_armor_sfinv: Mod loaded but unused.")) diff --git a/3d_armor_sfinv/locale/3d_armor_sfinv.es.tr b/3d_armor_sfinv/locale/3d_armor_sfinv.es.tr new file mode 100644 index 0000000..ee72e52 --- /dev/null +++ b/3d_armor_sfinv/locale/3d_armor_sfinv.es.tr @@ -0,0 +1,7 @@ +# textdomain: 3d_armor_sfinv + + +### init.lua ### + +3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv : Mod cargado pero no activado. +Armor=Armadura diff --git a/3d_armor_sfinv/locale/3d_armor_sfinv.fr.tr b/3d_armor_sfinv/locale/3d_armor_sfinv.fr.tr new file mode 100644 index 0000000..f25bd11 --- /dev/null +++ b/3d_armor_sfinv/locale/3d_armor_sfinv.fr.tr @@ -0,0 +1,7 @@ +# textdomain: 3d_armor_sfinv + + +### init.lua ### + +3d_armor_sfinv: Mod loaded but unused.=3d_armor_sfinv : Mod chargé mais inutilisé. +Armor=Armure diff --git a/3d_armor_sfinv/locale/template.txt b/3d_armor_sfinv/locale/template.txt new file mode 100644 index 0000000..a3f01b5 --- /dev/null +++ b/3d_armor_sfinv/locale/template.txt @@ -0,0 +1,7 @@ +# textdomain: 3d_armor_sfinv + + +### init.lua ### + +3d_armor_sfinv: Mod loaded but unused.= +Armor= diff --git a/3d_armor_sfinv/mod.conf b/3d_armor_sfinv/mod.conf new file mode 100644 index 0000000..bc0eb89 --- /dev/null +++ b/3d_armor_sfinv/mod.conf @@ -0,0 +1,4 @@ +name = 3d_armor_sfinv +depends = 3d_armor +optional_depends = sfinv +description = Adds 3d_armor page to the sfinv inventory. diff --git a/3d_armor_stand/init.lua b/3d_armor_stand/init.lua index 6df145a..114f3de 100644 --- a/3d_armor_stand/init.lua +++ b/3d_armor_stand/init.lua @@ -1,5 +1,5 @@ -- support for i18n -local S = armor_i18n.gettext +local S = minetest.get_translator(minetest.get_current_modname()) local armor_stand_formspec = "size[8,7]" .. default.gui_bg .. @@ -97,7 +97,7 @@ local function update_entity(pos) yaw = math.pi / 2 end end - object:setyaw(yaw) + object:set_yaw(yaw) object:set_properties({textures={texture}}) end end diff --git a/3d_armor_stand/locale/3d_armor_stand.fr.tr b/3d_armor_stand/locale/3d_armor_stand.fr.tr new file mode 100644 index 0000000..7d4cd38 --- /dev/null +++ b/3d_armor_stand/locale/3d_armor_stand.fr.tr @@ -0,0 +1,10 @@ +# textdomain: 3d_armor_stand + + +### init.lua ### + +Armor Stand=Support d'armure +Armor Stand (owned by @1)=Support d'armure (propriété de @1) +Armor stand=Support d'armure +Armor stand top=Haut de support d'armure +Locked Armor stand=Support d'armure verrouillé diff --git a/3d_armor_stand/locale/template.txt b/3d_armor_stand/locale/template.txt new file mode 100644 index 0000000..25befcb --- /dev/null +++ b/3d_armor_stand/locale/template.txt @@ -0,0 +1,10 @@ +# textdomain: 3d_armor_stand + + +### init.lua ### + +Armor Stand= +Armor Stand (owned by @1)= +Armor stand= +Armor stand top= +Locked Armor stand= diff --git a/3d_armor_stand/mod.conf b/3d_armor_stand/mod.conf new file mode 100644 index 0000000..d1f1a4e --- /dev/null +++ b/3d_armor_stand/mod.conf @@ -0,0 +1,2 @@ +name = 3d_armor_stand +depends = 3d_armor diff --git a/3d_armor_ui/description.txt b/3d_armor_ui/description.txt index 873f876..e6bf11c 100644 --- a/3d_armor_ui/description.txt +++ b/3d_armor_ui/description.txt @@ -1 +1 @@ -Adds 3d_armor page to the unified inventory +Adds 3d_armor page to the unified inventory. diff --git a/3d_armor_ui/init.lua b/3d_armor_ui/init.lua index 9a2c439..ccec554 100644 --- a/3d_armor_ui/init.lua +++ b/3d_armor_ui/init.lua @@ -1,5 +1,5 @@ -- support for i18n -local S = armor_i18n.gettext +local S = minetest.get_translator(minetest.get_current_modname()) local F = minetest.formspec_escape local has_technic = minetest.get_modpath("technic") ~= nil diff --git a/3d_armor_ui/locale/3d_armor_ui.fr.tr b/3d_armor_ui/locale/3d_armor_ui.fr.tr new file mode 100644 index 0000000..b7538f6 --- /dev/null +++ b/3d_armor_ui/locale/3d_armor_ui.fr.tr @@ -0,0 +1,13 @@ +# textdomain: 3d_armor_ui + + +### init.lua ### + +3d Armor=Armure 3d +3d_armor_ui: Mod loaded but unused.=3d_armor_ui : Mod chargé mais inutilisé. +Armor=Armure +Armor not initialized!=Armure non initialisée ! +Fire=Feu +Heal=Soins +Level=Niveau +Radiation=Radiation diff --git a/3d_armor_ui/locale/template.txt b/3d_armor_ui/locale/template.txt new file mode 100644 index 0000000..be95c08 --- /dev/null +++ b/3d_armor_ui/locale/template.txt @@ -0,0 +1,13 @@ +# textdomain: 3d_armor_ui + + +### init.lua ### + +3d Armor= +3d_armor_ui: Mod loaded but unused.= +Armor= +Armor not initialized!= +Fire= +Heal= +Level= +Radiation= diff --git a/3d_armor_ui/mod.conf b/3d_armor_ui/mod.conf new file mode 100644 index 0000000..68eff85 --- /dev/null +++ b/3d_armor_ui/mod.conf @@ -0,0 +1,4 @@ +name = 3d_armor_ui +depends = 3d_armor +optional_depends = unified_inventory +description = Adds 3d_armor page to the unified inventory. diff --git a/LICENSE.md b/LICENSE.md index 56c93cd..f7793ff 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -7,3 +7,4 @@ Armor Textures: Copyright (C) 2017-2018 davidthecreator - CC-BY-SA 3.0 Special credit to Jordach and MirceaKitsune for providing the default 3d character model. +New armor/shield textures CC-BY-SA 3.0 / davidthecreator / https://forum.minetest.net/viewtopic.php?f=11&t=4654&start=800#p356448 diff --git a/README.md b/README.md index 204bf9d..57bcf62 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ Modpack - 3d Armor [0.4.13] =========================== +![3d_armor screenshot](https://github.com/minetest-mods/3d_armor/blob/master/screenshot.png) + + +![](https://github.com/minetest-mods/3d_armor/workflows/luacheck/badge.svg) +![](https://github.com/minetest-mods/3d_armor/workflows/integration-test/badge.svg) ### Table of Contents diff --git a/integration-test.sh b/integration-test.sh new file mode 100755 index 0000000..9169144 --- /dev/null +++ b/integration-test.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# simple integration test + +CFG=/tmp/minetest.conf +MTDIR=/tmp/mt +WORLDDIR=${MTDIR}/worlds/world + +cat < ${CFG} + enable_3d_armor_integration_test = true +EOF + +mkdir -p ${WORLDDIR} +chmod 777 ${MTDIR} -R +docker run --rm -i \ + -v ${CFG}:/etc/minetest/minetest.conf:ro \ + -v ${MTDIR}:/var/lib/minetest/.minetest \ + -v $(pwd):/var/lib/minetest/.minetest/worlds/world/worldmods/3d_armor \ + registry.gitlab.com/minetest/minetest/server:5.2.0 + +test -f ${WORLDDIR}/integration_test.json && exit 0 || exit 1 diff --git a/modpack.conf b/modpack.conf new file mode 100644 index 0000000..4e64251 --- /dev/null +++ b/modpack.conf @@ -0,0 +1,2 @@ +name = minetest-3d_armor +description = Visible player armor & wielded items. diff --git a/modpack.txt b/modpack.txt deleted file mode 100644 index e69de29..0000000 diff --git a/screenshot.png b/screenshot.png index c1f9e58..637944a 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/screenshot.xcf b/screenshot.xcf new file mode 100644 index 0000000..17ea7c9 Binary files /dev/null and b/screenshot.xcf differ diff --git a/settingtypes.txt b/settingtypes.txt index c6c90de..fdc2857 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -1,4 +1,3 @@ - [3d_armor] armor_material_wood (Enable wood armor) bool true @@ -38,12 +37,21 @@ armor_level_multiplier (Armor effectiveness multiplier) float 1 # eg: armor_heal_multiplier = 0 will disable healing altogether. armor_heal_multiplier (Armor healing multiplier) float 1 +# Armor set item names, remove or add items to include them or remove them from whats considered an Armor set. +armor_set_elements (Armor set items) string head torso legs feet shield + +# Bonus multiplier when wearing armor set, set to the same as armor_level_multiplier to disable +armor_set_multiplier (Armor Set Bonus multiplier) float 1.1 + # Enable water protection (periodically restores breath when activated). armor_water_protect (Enable water protection) bool true # Enable fire protection (defaults true if using ethereal mod). armor_fire_protect (Enable fire protection) bool false +# Enable fire damage from torches (defaults true if using ethereal mod). +armor_fire_protect_torch (Enable fire protection torch damage) bool false + # Enable punch damage effects. armor_punch_damage (Enable damage effects) bool true diff --git a/shields/init.lua b/shields/init.lua index c0d5890..b0e4fa4 100644 --- a/shields/init.lua +++ b/shields/init.lua @@ -1,8 +1,7 @@ -- support for i18n -local S = armor_i18n.gettext +local S = minetest.get_translator(minetest.get_current_modname()) local disable_sounds = minetest.settings:get_bool("shields_disable_sounds") -local use_moreores = minetest.get_modpath("moreores") local function play_sound_effect(player, name) if not disable_sounds and player then local pos = player:get_pos() @@ -18,8 +17,6 @@ end if minetest.global_exists("armor") and armor.elements then table.insert(armor.elements, "shield") - local mult = armor.config.level_multiplier or 1 - armor.config.level_multiplier = mult * 0.9 end -- Regisiter Shields @@ -69,6 +66,11 @@ if armor.materials.wood then {"default:steel_ingot"}, }, }) + minetest.register_craft({ + type = "fuel", + recipe = "shields:shield_wood", + burntime = 8, + }) end if armor.materials.cactus then @@ -108,6 +110,11 @@ if armor.materials.cactus then {"default:steel_ingot"}, }, }) + minetest.register_craft({ + type = "fuel", + recipe = "shields:shield_cactus", + burntime = 16, + }) end if armor.materials.steel then diff --git a/shields/locale/shields.fr.tr b/shields/locale/shields.fr.tr new file mode 100644 index 0000000..730c9bf --- /dev/null +++ b/shields/locale/shields.fr.tr @@ -0,0 +1,16 @@ +# textdomain: shields + + +### init.lua ### + +Admin Shield=Bouclier d'admin +Bronze Shield=Bouclier en bronze +Cactus Shield=Bouclier en cactus +Crystal Shield=Bouclier en cristal +Diamond Shield=Bouclier en diamant +Enhanced Cactus Shield=Bouclier en cactus amélioré +Enhanced Wood Shield=Bouclier en bois amélioré +Gold Shield=Bouclier en or +Mithril Shield=Bouclier en mithril +Steel Shield=Bouclier en acier +Wooden Shield=Bouclier en bois diff --git a/shields/locale/template.txt b/shields/locale/template.txt new file mode 100644 index 0000000..ecaffd7 --- /dev/null +++ b/shields/locale/template.txt @@ -0,0 +1,16 @@ +# textdomain: shields + + +### init.lua ### + +Admin Shield= +Bronze Shield= +Cactus Shield= +Crystal Shield= +Diamond Shield= +Enhanced Cactus Shield= +Enhanced Wood Shield= +Gold Shield= +Mithril Shield= +Steel Shield= +Wooden Shield= diff --git a/shields/mod.conf b/shields/mod.conf new file mode 100644 index 0000000..9a95629 --- /dev/null +++ b/shields/mod.conf @@ -0,0 +1,3 @@ +name = shields +depends = default, 3d_armor +description = Adds visible shields to 3d armor. diff --git a/shields/textures/shields_inv_shield_wood.png b/shields/textures/shields_inv_shield_wood.png index da40020..c14985f 100644 Binary files a/shields/textures/shields_inv_shield_wood.png and b/shields/textures/shields_inv_shield_wood.png differ diff --git a/shields/textures/shields_shield_admin_preview.png b/shields/textures/shields_shield_admin_preview.png index 86d2f9b..b31caf4 100644 Binary files a/shields/textures/shields_shield_admin_preview.png and b/shields/textures/shields_shield_admin_preview.png differ diff --git a/shields/textures/shields_shield_enhanced_cactus_preview.png b/shields/textures/shields_shield_enhanced_cactus_preview.png index 0da7f56..371bbf5 100644 Binary files a/shields/textures/shields_shield_enhanced_cactus_preview.png and b/shields/textures/shields_shield_enhanced_cactus_preview.png differ diff --git a/shields/textures/shields_shield_mithril_preview.png b/shields/textures/shields_shield_mithril_preview.png index 209dc80..6b0023b 100644 Binary files a/shields/textures/shields_shield_mithril_preview.png and b/shields/textures/shields_shield_mithril_preview.png differ diff --git a/wieldview/README.txt b/wieldview/README.txt index ffa5ef0..3a8b640 100644 --- a/wieldview/README.txt +++ b/wieldview/README.txt @@ -21,3 +21,7 @@ Wield image transformation: To apply a simple transformation to the item in hand, add the group “wieldview_transform” to the item definition. The group rating equals one of the numbers used for the [transform texture modifier of the Lua API. + +Disabling the feature in-game: If you want to hide the wielded item +you can add an INT metadata to the player called "show_wielded_item" and set +it to 2 (any other value will show the wielded item again). diff --git a/wieldview/init.lua b/wieldview/init.lua index 45f9fca..f0edeac 100644 --- a/wieldview/init.lua +++ b/wieldview/init.lua @@ -54,6 +54,9 @@ wieldview.update_wielded_item = function(self, player) return end if self.wielded_item[name] then + if player:get_meta():get_int("show_wielded_item") == 2 then + item = "" + end if self.wielded_item[name] == item then return end @@ -66,9 +69,12 @@ end minetest.register_on_joinplayer(function(player) local name = player:get_player_name() wieldview.wielded_item[name] = "" - minetest.after(0, function(player) - wieldview:update_wielded_item(player) - end, player) + minetest.after(0, function() + local pplayer = minetest.get_player_by_name(name) + if player then + wieldview:update_wielded_item(pplayer) + end + end) end) minetest.register_globalstep(function(dtime) @@ -80,4 +86,3 @@ minetest.register_globalstep(function(dtime) time = 0 end end) - diff --git a/wieldview/mod.conf b/wieldview/mod.conf new file mode 100644 index 0000000..c5f4812 --- /dev/null +++ b/wieldview/mod.conf @@ -0,0 +1,3 @@ +name = wieldview +depends = 3d_armor +description = Makes hand wielded items visible to other players.