From fabaa3e2bd338e5de3b17cda662c0779e216e3aa Mon Sep 17 00:00:00 2001 From: notnotmelon Date: Sat, 6 Jan 2024 12:25:33 -0600 Subject: [PATCH] 9:59:57 --- locale/en/tips.cfg | 6 +++--- locale/ru/tips.cfg | 4 ++-- scripts/turd/turd.lua | 8 ++++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/locale/en/tips.cfg b/locale/en/tips.cfg index 5c88de94..688875a3 100644 --- a/locale/en/tips.cfg +++ b/locale/en/tips.cfg @@ -8,8 +8,8 @@ pydrive=[item=pydrive] Logistic stations ocula=[item=ocula] Ocula vatbrain=[item=vat-brain] Vat-brain symbiosis=[item=ulric-infusion] Symbiosis -turd=[item=cottongut-pup] T.U.R.D. -turd-title=[item=cottongut-pup] Technological upgrade and research device +turd=[item=manure] T.U.R.D. +turd-title=[item=manure] Technological upgrade and research device biofluid=[item=guano] Biofluid network [pywiki-descriptions] @@ -39,7 +39,7 @@ unavailable=Unavailable no-research=Needs research not-selected=Not selected unselect=Reverse selection -unselect-migrate=Reverse selection (free for __1__ seconds) +unselect-migrate=Reverse selection (free for __1__:__2__:__3__) open-in-tech-tree=Open in tech tree adjusted-speed=[font=default-semibold][color=255,230,192]Real speed: [/color][/font]__1__% admin-needed=Only a server administrator can select T.U.R.D. options. diff --git a/locale/ru/tips.cfg b/locale/ru/tips.cfg index 96df3121..55606297 100644 --- a/locale/ru/tips.cfg +++ b/locale/ru/tips.cfg @@ -8,8 +8,8 @@ pydrive=[item=pydrive] Логистические станции ocula=[item=ocula] Окула vatbrain=[item=vat-brain] Мозг-в-колбе symbiosis=[item=ulric-infusion] Симбиоз -turd=[item=cottongut-pup] Т.У.Р.Д. -turd-title=[item=cottongut-pup] Технологические улучшения и разработка деталей +turd=[item=manure] Т.У.Р.Д. +turd-title=[item=manure] Технологические улучшения и разработка деталей biofluid=[item=guano] Сеть биожидкости [pywiki-descriptions] diff --git a/scripts/turd/turd.lua b/scripts/turd/turd.lua index b8eb9c56..05f7c2cc 100644 --- a/scripts/turd/turd.lua +++ b/scripts/turd/turd.lua @@ -69,9 +69,13 @@ local function update_confirm_button(element, player, researched_technologies) elseif selected_upgrade == element.tags.sub_tech_name then if has_turd_migration(force_index, selected_upgrade)then local ticks_remaining = global.turd_migrations[force_index][selected_upgrade] - game.tick - local seconds_remaining = math.floor(ticks_remaining / 60) + local hours = math.floor(ticks_remaining / 216000) + local minutes = math.floor(ticks_remaining / 3600) % 60 + local seconds = math.floor(ticks_remaining / 60) % 60 + if minutes < 10 then minutes = '0' .. minutes end + if seconds < 10 then seconds = '0' .. seconds end element.style = 'confirm_button_without_tooltip' - element.caption = {'turd.unselect-migrate', seconds_remaining} + element.caption = {'turd.unselect-migrate', hours, minutes, seconds} elseif (global.turd_reset_remaining[force_index] or 0) > 0 then element.style = 'confirm_button_without_tooltip' element.caption = {'turd.unselect'}