From 9bec09343e93147edba7d03e58cdf8350c5a78ec Mon Sep 17 00:00:00 2001 From: aBlueShadow Date: Thu, 2 Feb 2023 12:11:26 +0100 Subject: [PATCH 1/8] lua minigame for micrometeorites --- scripts/utils_micrometeorites.lua | 133 ++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 scripts/utils_micrometeorites.lua diff --git a/scripts/utils_micrometeorites.lua b/scripts/utils_micrometeorites.lua new file mode 100644 index 0000000000..b167cfe1d3 --- /dev/null +++ b/scripts/utils_micrometeorites.lua @@ -0,0 +1,133 @@ +-- Utils for micrometeorite point defense +----------- +-- Usage -- +----------- +-- For each player ship you want to add micrometeorites for: + +-- In init function: +-- MicroMeteorites:init([playership]) + +-- In update function: +-- MicroMeteorites:update(delta,[playership]) + +require('utils.lua') + +MicroMeteorites ={} + +function MicroMeteorites:init(player_ship) + player_ship.micrometeorite_impact_time=5 -- time to react after warning + player_ship.micrometeorite_delay_min=20 -- minimal... + player_ship.micrometeorite_delay_max=30 -- ...and maximal delay between two impact warnings + + player_ship.micrometeorite_impact_countdown=player_ship.micrometeorite_impact_time + player_ship.micrometeorite_time=math.random(player_ship.micrometeorite_delay_min,player_ship.micrometeorite_delay_max) + player_ship.micrometeorite_phase = 1 + + player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) + player_ship:addCustomButton("Weapons","point_defense_btn_left","« LEFT",function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right","» Right",function () MicroMeteorites:fired(2,player_ship) end,12) +end + +function MicroMeteorites:remove(player_ship) + player_ship:removeCustom("point_defense_info") + player_ship:removeCustom("point_defense_btn_left") + player_ship:removeCustom("point_defense_btn_right") + player_ship.micrometeorite_phase = 0 +end + + +function MicroMeteorites:update(delta,player_ship) + if player_ship.micrometeorite_phase == 1 then + MicroMeteorites:timer(delta,player_ship) + end + if player_ship.micrometeorite_phase == 2 then + MicroMeteorites:incoming(delta,player_ship) + end +end + +function MicroMeteorites:timer(delta,player_ship) + if (not player_ship:getShieldsActive()) and player_ship:hasPlayerAtPosition("Weapons") then -- do not bother the player when shields are up or no weapons officer is around (tactical and single pilot are busy enough) + player_ship.micrometeorite_time = player_ship.micrometeorite_time - delta + if player_ship.micrometeorite_time <= 0 then + player_ship.micrometeorite_direction = math.random(1,2) + player_ship.micrometeorite_phase = 2 + player_ship:addCustomInfo("Weapons","point_defense_info","!!! IMPACT IMMINENT !!!",10) + end + end + +end + +function MicroMeteorites:incoming(delta,player_ship) + + player_ship.micrometeorite_impact_time=player_ship.micrometeorite_impact_time-delta + + if player_ship.micrometeorite_impact_time < player_ship.micrometeorite_impact_countdown-1 then + player_ship.micrometeorite_impact_countdown=player_ship.micrometeorite_impact_countdown-1 + print (player_ship.micrometeorite_impact_countdown) + if player_ship.micrometeorite_direction==1 then + player_ship:addCustomButton("Weapons","point_defense_btn_left","« ".."Left in".." "..(player_ship.micrometeorite_impact_countdown),function () MicroMeteorites:fired(1,player_ship) end,11) + else + player_ship:addCustomButton("Weapons","point_defense_btn_right","« ".."Right in".." "..(player_ship.micrometeorite_impact_countdown),function () MicroMeteorites:fired(2,player_ship) end,12) + end + end + + if player_ship.micrometeorite_impact_time <= 0 then + player_ship.micrometeorite_impact_time=5 + x, y = player_ship:getPosition() + if player_ship.micrometeorite_direction==1 then + explosion_angle=math.random(315,350)+player_ship:getRotation() + else if player_ship.micrometeorite_direction==2 then + explosion_angle=math.random(10,45)+player_ship:getRotation() + end + end + xx, yy = vectorFromAngle(explosion_angle, 150) + ExplosionEffect():setPosition(x+xx,y+yy):setSize(10) + player_ship:takeDamage(5,"kinetic",x+xx,y+yy) + + player_ship.micrometeorite_impact_countdown=5 + player_ship.micrometeorite_time=math.random(player_ship.micrometeorite_delay_min,player_ship.micrometeorite_delay_max) + + --reset info and buttons + player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) + player_ship:addCustomButton("Weapons","point_defense_btn_left","« LEFT",function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right","» Right",function () MicroMeteorites:fired(2,player_ship) end,12) + + player_ship.micrometeorite_phase=1 + end + +end + +function MicroMeteorites:fired(button_direction,player_ship) + if player_ship:getSystemHeat("beamweapons")<0.99 and player_ship:getSystemHealth("beamweapons")>0.0 and player_ship:getSystemPower("beamweapons")>0.1 then + print (player_ship:getSystemHeat("beamweapons")) + x, y = player_ship:getPosition() + if button_direction==1 then + beam_angle=math.random(315,350)+player_ship:getRotation() + else if button_direction==2 then + beam_angle=math.random(10,45)+player_ship:getRotation() + end + end + xx, yy = vectorFromAngle(beam_angle, 200*player_ship.micrometeorite_impact_time+100) + debris=Artifact():setPosition(x+xx, y+yy):setRadarTraceColor(255,200,100); + if player_ship.micrometeorite_direction==button_direction then + player_ship.micrometeorite_impact_time=5 + player_ship.micrometeorite_impact_countdown=5 + player_ship.micrometeorite_time=math.random(player_ship.micrometeorite_delay_min,player_ship.micrometeorite_delay_max) + + --reset info and buttons + player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) + player_ship:addCustomButton("Weapons","point_defense_btn_left","« LEFT",function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right","» Right",function () MicroMeteorites:fired(2,player_ship) end,12) + + player_ship.micrometeorite_phase=1 + BeamEffect():setSource(player_ship, 0, 0, 0):setTarget(debris, 0, 0):setDuration(0.5):setRing(false):setTexture("texture/beam_blue.png") + ExplosionEffect():setPosition(x+xx,y+yy):setSize(5) + player_ship.micrometeorite_direction=0 + else + BeamEffect():setSource(player_ship, 0, 0, 0):setTarget(debris, 0, 0):setDuration(0.5):setRing(false):setTexture("texture/beam_blue.png") + player_ship:setSystemHeat("beamweapons", player_ship:getSystemHeat("beamweapons")+0.1) -- some heat to prevent button spamming + end + debris:destroy() + end +end + From e4dbfa2a571b1b80fc7f58d3a570cfa76a8d5fd6 Mon Sep 17 00:00:00 2001 From: aBlueShadow Date: Thu, 2 Feb 2023 12:56:15 +0100 Subject: [PATCH 2/8] added translation tags --- scripts/utils_micrometeorites.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/utils_micrometeorites.lua b/scripts/utils_micrometeorites.lua index b167cfe1d3..867b5b8b5c 100644 --- a/scripts/utils_micrometeorites.lua +++ b/scripts/utils_micrometeorites.lua @@ -24,8 +24,8 @@ function MicroMeteorites:init(player_ship) player_ship.micrometeorite_phase = 1 player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left","« LEFT",function () MicroMeteorites:fired(1,player_ship) end,11) - player_ship:addCustomButton("Weapons","point_defense_btn_right","» Right",function () MicroMeteorites:fired(2,player_ship) end,12) + player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« LEFT"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) end function MicroMeteorites:remove(player_ship) @@ -51,7 +51,7 @@ function MicroMeteorites:timer(delta,player_ship) if player_ship.micrometeorite_time <= 0 then player_ship.micrometeorite_direction = math.random(1,2) player_ship.micrometeorite_phase = 2 - player_ship:addCustomInfo("Weapons","point_defense_info","!!! IMPACT IMMINENT !!!",10) + player_ship:addCustomInfo("Weapons","point_defense_info",_("!!! IMPACT IMMINENT !!!"),10) end end @@ -65,9 +65,9 @@ function MicroMeteorites:incoming(delta,player_ship) player_ship.micrometeorite_impact_countdown=player_ship.micrometeorite_impact_countdown-1 print (player_ship.micrometeorite_impact_countdown) if player_ship.micrometeorite_direction==1 then - player_ship:addCustomButton("Weapons","point_defense_btn_left","« ".."Left in".." "..(player_ship.micrometeorite_impact_countdown),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_left","« ".._("Left in").." "..(player_ship.micrometeorite_impact_countdown),function () MicroMeteorites:fired(1,player_ship) end,11) else - player_ship:addCustomButton("Weapons","point_defense_btn_right","« ".."Right in".." "..(player_ship.micrometeorite_impact_countdown),function () MicroMeteorites:fired(2,player_ship) end,12) + player_ship:addCustomButton("Weapons","point_defense_btn_right","« ".._("Right in").." "..(player_ship.micrometeorite_impact_countdown),function () MicroMeteorites:fired(2,player_ship) end,12) end end @@ -89,8 +89,8 @@ function MicroMeteorites:incoming(delta,player_ship) --reset info and buttons player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left","« LEFT",function () MicroMeteorites:fired(1,player_ship) end,11) - player_ship:addCustomButton("Weapons","point_defense_btn_right","» Right",function () MicroMeteorites:fired(2,player_ship) end,12) + player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« LEFT"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) player_ship.micrometeorite_phase=1 end @@ -116,8 +116,8 @@ function MicroMeteorites:fired(button_direction,player_ship) --reset info and buttons player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left","« LEFT",function () MicroMeteorites:fired(1,player_ship) end,11) - player_ship:addCustomButton("Weapons","point_defense_btn_right","» Right",function () MicroMeteorites:fired(2,player_ship) end,12) + player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« LEFT"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) player_ship.micrometeorite_phase=1 BeamEffect():setSource(player_ship, 0, 0, 0):setTarget(debris, 0, 0):setDuration(0.5):setRing(false):setTexture("texture/beam_blue.png") From b946041065ced7a32416dfce8ae9365031bca58c Mon Sep 17 00:00:00 2001 From: aBlueShadow Date: Fri, 3 Feb 2023 13:43:22 +0100 Subject: [PATCH 3/8] fix inconsistent case of LEFT and Right --- scripts/utils_micrometeorites.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/utils_micrometeorites.lua b/scripts/utils_micrometeorites.lua index 867b5b8b5c..6920bb6947 100644 --- a/scripts/utils_micrometeorites.lua +++ b/scripts/utils_micrometeorites.lua @@ -24,7 +24,7 @@ function MicroMeteorites:init(player_ship) player_ship.micrometeorite_phase = 1 player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« LEFT"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« Left"),function () MicroMeteorites:fired(1,player_ship) end,11) player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) end @@ -89,7 +89,7 @@ function MicroMeteorites:incoming(delta,player_ship) --reset info and buttons player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« LEFT"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« Left"),function () MicroMeteorites:fired(1,player_ship) end,11) player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) player_ship.micrometeorite_phase=1 @@ -116,7 +116,7 @@ function MicroMeteorites:fired(button_direction,player_ship) --reset info and buttons player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« LEFT"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« Left"),function () MicroMeteorites:fired(1,player_ship) end,11) player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) player_ship.micrometeorite_phase=1 From 6f14ba4bf2646087316d7b7fe38ab2830fae8c1b Mon Sep 17 00:00:00 2001 From: aBlueShadow Date: Sun, 5 Feb 2023 18:36:36 +0100 Subject: [PATCH 4/8] Added german translation --- scripts/locale/utils_micrometeorites.de.po | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 scripts/locale/utils_micrometeorites.de.po diff --git a/scripts/locale/utils_micrometeorites.de.po b/scripts/locale/utils_micrometeorites.de.po new file mode 100644 index 0000000000..aabc694446 --- /dev/null +++ b/scripts/locale/utils_micrometeorites.de.po @@ -0,0 +1,33 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: de_DE\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 3.1.1\n" + +#: scripts/utils_micrometeorites.lua:17 +msgid "Micrometeorite Defense" +msgstr "Mikrometeoriten-Abwehr" + +#: scripts/utils_micrometeorites.lua:18 +msgid "!!! IMPACT IMMINENT !!!" +msgstr "!!! EINSCHLAG STEHT BEVOR !!!" + +#: scripts/utils_micrometeorites.lua:19 +msgid "Right" +msgstr "Rechts" + +#: scripts/utils_micrometeorites.lua:20 +msgid "Left" +msgstr "Links" + +#: scripts/utils_micrometeorites.lua:21 +msgid "in" +msgstr "in" From 9717d60895002574f8089f36f301e21feead3baa Mon Sep 17 00:00:00 2001 From: aBlueShadow Date: Sun, 14 Jan 2024 23:44:19 +0100 Subject: [PATCH 5/8] some tweaks and fixes --- scripts/utils_micrometeorites.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/utils_micrometeorites.lua b/scripts/utils_micrometeorites.lua index 6920bb6947..ace1448732 100644 --- a/scripts/utils_micrometeorites.lua +++ b/scripts/utils_micrometeorites.lua @@ -1,3 +1,4 @@ + -- Utils for micrometeorite point defense ----------- -- Usage -- @@ -24,8 +25,8 @@ function MicroMeteorites:init(player_ship) player_ship.micrometeorite_phase = 1 player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« Left"),function () MicroMeteorites:fired(1,player_ship) end,11) - player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) + player_ship:addCustomButton("Weapons","point_defense_btn_left","« ".._("Left"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right","» ".._("Right"),function () MicroMeteorites:fired(2,player_ship) end,12) end function MicroMeteorites:remove(player_ship) @@ -36,7 +37,7 @@ function MicroMeteorites:remove(player_ship) end -function MicroMeteorites:update(delta,player_ship) +function MicroMeteorites:update(delta,player_ship) if player_ship.micrometeorite_phase == 1 then MicroMeteorites:timer(delta,player_ship) end @@ -45,6 +46,7 @@ function MicroMeteorites:update(delta,player_ship) end end + function MicroMeteorites:timer(delta,player_ship) if (not player_ship:getShieldsActive()) and player_ship:hasPlayerAtPosition("Weapons") then -- do not bother the player when shields are up or no weapons officer is around (tactical and single pilot are busy enough) player_ship.micrometeorite_time = player_ship.micrometeorite_time - delta @@ -63,7 +65,6 @@ function MicroMeteorites:incoming(delta,player_ship) if player_ship.micrometeorite_impact_time < player_ship.micrometeorite_impact_countdown-1 then player_ship.micrometeorite_impact_countdown=player_ship.micrometeorite_impact_countdown-1 - print (player_ship.micrometeorite_impact_countdown) if player_ship.micrometeorite_direction==1 then player_ship:addCustomButton("Weapons","point_defense_btn_left","« ".._("Left in").." "..(player_ship.micrometeorite_impact_countdown),function () MicroMeteorites:fired(1,player_ship) end,11) else @@ -89,9 +90,9 @@ function MicroMeteorites:incoming(delta,player_ship) --reset info and buttons player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« Left"),function () MicroMeteorites:fired(1,player_ship) end,11) - player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) - + player_ship:addCustomButton("Weapons","point_defense_btn_left","« ".._("Left"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right","» ".._("Right"),function () MicroMeteorites:fired(2,player_ship) end,12) + player_ship.micrometeorite_phase=1 end @@ -99,7 +100,6 @@ end function MicroMeteorites:fired(button_direction,player_ship) if player_ship:getSystemHeat("beamweapons")<0.99 and player_ship:getSystemHealth("beamweapons")>0.0 and player_ship:getSystemPower("beamweapons")>0.1 then - print (player_ship:getSystemHeat("beamweapons")) x, y = player_ship:getPosition() if button_direction==1 then beam_angle=math.random(315,350)+player_ship:getRotation() @@ -116,15 +116,15 @@ function MicroMeteorites:fired(button_direction,player_ship) --reset info and buttons player_ship:addCustomInfo("Weapons","point_defense_info",_("MicroMeteorite Defense"),10) - player_ship:addCustomButton("Weapons","point_defense_btn_left",_("« Left"),function () MicroMeteorites:fired(1,player_ship) end,11) - player_ship:addCustomButton("Weapons","point_defense_btn_right",_("» Right"),function () MicroMeteorites:fired(2,player_ship) end,12) + player_ship:addCustomButton("Weapons","point_defense_btn_left","« ".._("Left"),function () MicroMeteorites:fired(1,player_ship) end,11) + player_ship:addCustomButton("Weapons","point_defense_btn_right","» ".._("Right"),function () MicroMeteorites:fired(2,player_ship) end,12) player_ship.micrometeorite_phase=1 - BeamEffect():setSource(player_ship, 0, 0, 0):setTarget(debris, 0, 0):setDuration(0.5):setRing(false):setTexture("texture/beam_blue.png") + BeamEffect():setSource(player_ship, 0, 0, 0):setTarget(debris, 0, 0):setDuration(0.5):setRing(false):setTexture("texture/beam_blue.png"):setBeamFireSoundPower(0.1) ExplosionEffect():setPosition(x+xx,y+yy):setSize(5) player_ship.micrometeorite_direction=0 else - BeamEffect():setSource(player_ship, 0, 0, 0):setTarget(debris, 0, 0):setDuration(0.5):setRing(false):setTexture("texture/beam_blue.png") + BeamEffect():setSource(player_ship, 0, 0, 0):setTarget(debris, 0, 0):setDuration(0.5):setRing(false):setTexture("texture/beam_blue.png"):setBeamFireSoundPower(0.1) player_ship:setSystemHeat("beamweapons", player_ship:getSystemHeat("beamweapons")+0.1) -- some heat to prevent button spamming end debris:destroy() From a7886ba3407f5a4c1d1f0b1e94eed9f1bb1b1332 Mon Sep 17 00:00:00 2001 From: aBlueShadow Date: Sun, 14 Jan 2024 23:46:00 +0100 Subject: [PATCH 6/8] updateAll() function for easier usage --- scripts/utils_micrometeorites.lua | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/utils_micrometeorites.lua b/scripts/utils_micrometeorites.lua index ace1448732..dcdbc1a5a7 100644 --- a/scripts/utils_micrometeorites.lua +++ b/scripts/utils_micrometeorites.lua @@ -1,15 +1,15 @@ - -- Utils for micrometeorite point defense ----------- -- Usage -- ----------- --- For each player ship you want to add micrometeorites for: +-- Place this line somewhere in the update function: +-- MicroMeteorites:updateAll(delta) --- In init function: +-- To add MicroMeteorites to a ship -- MicroMeteorites:init([playership]) --- In update function: --- MicroMeteorites:update(delta,[playership]) +-- To remove MicroMeteorites from a ship: +-- MicroMeteorites:remove([playership]) require('utils.lua') @@ -46,6 +46,13 @@ function MicroMeteorites:update(delta,player_ship) end end +function MicroMeteorites:updateAll(delta) + for _, p in ipairs(getActivePlayerShips()) do + if p ~= nil then + MicroMeteorites:update(delta,p) + end + end +end function MicroMeteorites:timer(delta,player_ship) if (not player_ship:getShieldsActive()) and player_ship:hasPlayerAtPosition("Weapons") then -- do not bother the player when shields are up or no weapons officer is around (tactical and single pilot are busy enough) From a497bb19dc39a59ea690b9ae3e2cd7c3fcc70a29 Mon Sep 17 00:00:00 2001 From: aBlueShadow Date: Sun, 14 Jan 2024 23:46:49 +0100 Subject: [PATCH 7/8] update de translation --- scripts/locale/utils_micrometeorites.de.po | 34 +++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/scripts/locale/utils_micrometeorites.de.po b/scripts/locale/utils_micrometeorites.de.po index aabc694446..78cf107846 100644 --- a/scripts/locale/utils_micrometeorites.de.po +++ b/scripts/locale/utils_micrometeorites.de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: \n" +"PO-Revision-Date: 2023-11-20 11:57+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -11,23 +11,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.1.1\n" +"X-Poedit-Basepath: .\n" -#: scripts/utils_micrometeorites.lua:17 -msgid "Micrometeorite Defense" +#: scripts/utils_micrometeorites.lua:26 scripts/utils_micrometeorites.lua:91 +#: scripts/utils_micrometeorites.lua:118 +msgid "MicroMeteorite Defense" msgstr "Mikrometeoriten-Abwehr" -#: scripts/utils_micrometeorites.lua:18 -msgid "!!! IMPACT IMMINENT !!!" -msgstr "!!! EINSCHLAG STEHT BEVOR !!!" +#: scripts/utils_micrometeorites.lua:27 scripts/utils_micrometeorites.lua:92 +#: scripts/utils_micrometeorites.lua:119 +msgid "Left" +msgstr "Links" -#: scripts/utils_micrometeorites.lua:19 +#: scripts/utils_micrometeorites.lua:28 scripts/utils_micrometeorites.lua:93 +#: scripts/utils_micrometeorites.lua:120 msgid "Right" msgstr "Rechts" -#: scripts/utils_micrometeorites.lua:20 -msgid "Left" -msgstr "Links" +#: scripts/utils_micrometeorites.lua:54 +msgid "!!! IMPACT IMMINENT !!!" +msgstr "!!! EINSCHLAG STEHT BEVOR !!!" + +#: scripts/utils_micrometeorites.lua:68 +msgid "Left in" +msgstr "Links in" -#: scripts/utils_micrometeorites.lua:21 -msgid "in" -msgstr "in" +#: scripts/utils_micrometeorites.lua:70 +msgid "Right in" +msgstr "Rechts in" From 5f95470ab2ea0ef1f95519938880a917bc79ea14 Mon Sep 17 00:00:00 2001 From: aBlueShadow Date: Thu, 16 Apr 2026 07:33:34 +0200 Subject: [PATCH 8/8] Fix utils_micrometeorites.lua for ECS --- scripts/utils_micrometeorites.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/utils_micrometeorites.lua b/scripts/utils_micrometeorites.lua index dcdbc1a5a7..9313f7348b 100644 --- a/scripts/utils_micrometeorites.lua +++ b/scripts/utils_micrometeorites.lua @@ -116,6 +116,7 @@ function MicroMeteorites:fired(button_direction,player_ship) end xx, yy = vectorFromAngle(beam_angle, 200*player_ship.micrometeorite_impact_time+100) debris=Artifact():setPosition(x+xx, y+yy):setRadarTraceColor(255,200,100); + debris.components.lifetime = {lifetime=.01} if player_ship.micrometeorite_direction==button_direction then player_ship.micrometeorite_impact_time=5 player_ship.micrometeorite_impact_countdown=5 @@ -134,7 +135,6 @@ function MicroMeteorites:fired(button_direction,player_ship) BeamEffect():setSource(player_ship, 0, 0, 0):setTarget(debris, 0, 0):setDuration(0.5):setRing(false):setTexture("texture/beam_blue.png"):setBeamFireSoundPower(0.1) player_ship:setSystemHeat("beamweapons", player_ship:getSystemHeat("beamweapons")+0.1) -- some heat to prevent button spamming end - debris:destroy() end end