summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.lua10
-rw-r--r--locale/de.txt6
-rw-r--r--locale/template.txt6
3 files changed, 7 insertions, 15 deletions
diff --git a/init.lua b/init.lua
index a57e253..2cc6f17 100644
--- a/init.lua
+++ b/init.lua
@@ -123,7 +123,7 @@ local toolcaps_to_text = function(tool_capabilities)
if tool_capabilities.full_punch_interval ~= nil then
punch = tool_capabilities.full_punch_interval
end
- formstring = formstring .. string.format(S("Full punch interval: %d s"), punch)
+ formstring = formstring .. string.format(S("Full punch interval: %.1f s"), punch)
formstring = formstring .. "\n\n"
local groupcaps = tool_capabilities.groupcaps
@@ -314,14 +314,10 @@ doc.new_category("nodes", {
-- Global factoids
--- Direct interaction with the player
---- Damage (very important)
- if data.def.damage_per_second > 1 then
+ if data.def.damage_per_second ~= nil and data.def.damage_per_second ~= 1 then
datastring = datastring .. string.format(S("This block causes a damage of %d hit points per second."), data.def.damage_per_second) .. "\n"
elseif data.def.damage_per_second == 1 then
datastring = datastring .. string.format(S("This block causes a damage of %d hit point per second."), data.def.damage_per_second) .. "\n"
- elseif data.def.damage_per_second < -1 then
- datastring = datastring .. string.format(S("This block heals %d hit points per second."), data.def.damage_per_second) .. "\n"
- elseif data.def.damage_per_second == -1 then
- datastring = datastring .. string.format(S("This block heals %d hit point per second."), data.def.damage_per_second) .. "\n"
end
if data.def.drowning > 1 then
datastring = datastring .. string.format(S("This block decreases your breath and causes a drowning damage of %d hit points every 2 seconds."), data.def.drowning) .. "\n"
@@ -469,7 +465,7 @@ doc.new_category("nodes", {
if #nodes == 1 then
datastring = datastring .. string.format(S("This block connects to this block: %s."), nstring) .. "\n"
elseif #nodes > 1 then
- datastring = datastring .. string.format(S("This block connects to these block: %s."), nstring) .. "\n"
+ datastring = datastring .. string.format(S("This block connects to these blocks: %s."), nstring) .. "\n"
end
local gstring, gcount = groups_to_string(groups)
diff --git a/locale/de.txt b/locale/de.txt
index 532dbc0..46a0a0b 100644
--- a/locale/de.txt
+++ b/locale/de.txt
@@ -21,7 +21,7 @@ Building this block is completely silent. = Das Bauen dieses Blocks ist völlig
Collidable: %s = Kollidiert: %s
Description: %s = Beschreibung: %s
Falling blocks can go through this block; they destroy it when doing so. = Fallende Blöcke können diesen Block durchdringen; sie zerstören ihn dabei.
-Full punch interval: %d s = Schlagintervall: %d s
+Full punch interval: %.1f s = Schlagintervall: %.1f s
Hand = Hand
Hold it in your hand, then leftclick to eat it. = Halten Sie es in Ihrer Hand, dann klicken Sie mit der linken Maustaste, um es zu essen.
Hold it in your hand, then leftclick to eat it. But why would you want to do this? = Halten Sie es in Ihrer Hand, dann klicken Sie mit der linken Maustaste, um es zu essen. Aber warum sollten Sie das tun wollen?
@@ -70,13 +70,11 @@ This block causes a damage of %d hit point per second. = Dieser Block richtet ei
This block causes a damage of %d hit points per second. = Dieser Block richtet einen Schaden von %d Trefferpunkten pro Sekunde an.
This block connects to blocks of the %s group. = Dieser Block verbindet sich mit Blöcken der Gruppe »%s«.
This block connects to blocks of the following groups: %s. = Dieser Block verbindet sich mit Blöcken der folgenden Gruppen: %s.
-This block connects to these block: %s. = Dieser Block verbindet sich mit den folgenden Block: %s.
+This block connects to these blocks: %s. = Dieser Block verbindet sich mit den folgenden Blöcken: %s.
This block connects to this block: %s. = Dieser Block verbindet sich mit diesem Block: %s.
This block decreases your breath and causes a drowning damage of %d hit point every 2 seconds. = Dieser Block reduziert Ihren Atem und verursacht beim Ertrinken einen Schaden von %d Trefferpunkt alle 2 Sekunden.
This block decreases your breath and causes a drowning damage of %d hit points every 2 seconds. = Dieser Block reduziert Ihren Atem und verursacht beim Ertrinken einen Schaden von %d Trefferpunkten alle 2 Sekunden.
This block glows faintly. It is barely noticable. = Dieser Block leuchtet schwach. Es ist kaum merklich.
-This block heals %d hit point per second. = Dieser Block heilt %d Trefferpunkt pro Sekunde.
-This block heals %d hit points per second. = Dieser Block heilt %d Trefferpunkte pro Sekunde.
This block is a bright light source. = Dieser Block ist eine helle Lichtquelle.
This block is a building block for creating various buildings. = Dieser Block ist für den Bau diverser Gebäude vorgesehen.
This block is a light source of medium luminance. = Dieser Block ist eine mittelstarke Lichtquelle.
diff --git a/locale/template.txt b/locale/template.txt
index a9d02cb..0aa3b07 100644
--- a/locale/template.txt
+++ b/locale/template.txt
@@ -21,7 +21,7 @@ Building this block is completely silent. =
Collidable: %s =
Description: %s =
Falling blocks can go through this block; they destroy it when doing so. =
-Full punch interval: %d s =
+Full punch interval: %.1f s =
Hand =
Hold it in your hand, then leftclick to eat it. =
Hold it in your hand, then leftclick to eat it. But why would you want to do this? =
@@ -70,13 +70,11 @@ This block causes a damage of %d hit point per second. =
This block causes a damage of %d hit points per second. =
This block connects to blocks of the %s group. =
This block connects to blocks of the following groups: %s. =
-This block connects to these block: %s. =
+This block connects to these blocks: %s. =
This block connects to this block: %s. =
This block decreases your breath and causes a drowning damage of %d hit point every 2 seconds. =
This block decreases your breath and causes a drowning damage of %d hit points every 2 seconds. =
This block glows faintly. It is barely noticable. =
-This block heals %d hit point per second. =
-This block heals %d hit points per second. =
This block is a bright light source. =
This block is a building block for creating various buildings. =
This block is a light source of medium luminance. =