Merge remote-tracking branch 'upstream/master' into french
This commit is contained in:
biobak committed
commit
8fbc67cf3d
13 files changed
+33
-23
No files matched your search
@@ -18,6 +18,7 @@ EID.descriptions[languageCode].languageName = "English"
|
||||
-- Fonts to be used with this language pack
|
||||
EID.descriptions[languageCode].fonts = {{name="default"}, {name="inverted"}, {name="borderless"}}
|
||||
|
||||
|
||||
---------- Collectibles ----------
|
||||
EID.descriptions[languageCode].collectibles={
|
||||
{"1", "The Sad Onion", "↑ {{Tears}} +0.7 Tears up"},
|
||||
|
||||
@@ -19,7 +19,7 @@ EID.descriptions[languageCode].custom = {} -- table for custom entity descriptio
|
||||
EID.descriptions[languageCode].languageName = "French"
|
||||
|
||||
-- Fonts to be used with this language pack
|
||||
EID.descriptions[languageCode].fonts = EID.descriptions["en_us"].fonts
|
||||
EID.descriptions[languageCode].fonts = {{name="default", textboxWidth = 135}, {name="inverted", textboxWidth = 135}, {name="borderless", textboxWidth = 135}}
|
||||
|
||||
EID.descriptions["fr"].collectibles={
|
||||
{"1", "Oignon Triste", "↑ Débit {{ColorLime}}+0.7"},
|
||||
|
||||
@@ -1107,7 +1107,7 @@ EID.descriptions[languageCode].AchievementWarningText = "Achievementy jsou zaká
|
||||
|
||||
EID.descriptions[languageCode].OldGameVersionWarningText = "Tvoje verze Repentance není aktuální!#Oficiálně je podporována pouze ta nejnovější verze (1.7.9)#(Toto varování lze vypnout v konfiguraci)"
|
||||
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "Modované předměty by mohly způsobit nepřesnost výpočtu receptu na výrobu!#Použij režim zobrazení Žádné recepty (Itempool Percentages) nebo vypni zobrazení u Craftovacího Pytlíku, pokud jsou tvé recepty nesprávné#(Toto varování lze deaktivovat v konfiguraci)"
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "Modované předměty by mohly způsobit nepřesnost výpočtu receptu na výrobu!#Použij režim zobrazení Žádné recepty (Item Probability) nebo vypni zobrazení u Craftovacího Pytlíku, pokud jsou tvé recepty nesprávné#(Toto varování lze deaktivovat v konfiguraci)"
|
||||
|
||||
|
||||
-- If Debug enabled, add overwrite tables to the languagepack in order for the language completion script to be able to compare them
|
||||
|
||||
@@ -1123,10 +1123,11 @@ EID.descriptions[languageCode].PandorasBoxStrangeKeyEffect = "Instead, consumes
|
||||
EID.descriptions[languageCode].AchievementWarningTitle = "{{ColorYellow}}{{Warning}} WARNING {{Warning}}"
|
||||
EID.descriptions[languageCode].AchievementWarningText = "Achievements are disabled!#In order to enable progression and achievements, you first need to kill Mom (Depths II) without any mods enabled.#(If you've defeated Mom, this message is a bug and can be ignored)#(This warning can be disabled in the config)"
|
||||
|
||||
EID.descriptions[languageCode].OldGameVersionWarningText = "Your version of Repentance is not up-to-date!#Only the newest version (1.7.9) is officially supported#(This warning can be disabled in the config)"
|
||||
EID.descriptions[languageCode].OldGameVersionWarningText = "EID is updated for the newest Steam version#Your game version is not officially supported, so some descriptions and features will be inaccurate#(This warning can be disabled in the config)"
|
||||
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "Modded items could make the crafting recipe calculation inaccurate!#Use the Itempool Percentages display mode or turn off the Bag of Crafting display if your recipes are incorrect#(This warning can be disabled in the config)"
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "Modded items could make the crafting recipe calculation inaccurate!#Use the Item Probability display mode or turn off the Bag of Crafting display if your recipes are incorrect#(This warning can be disabled in the config)"
|
||||
|
||||
EID.descriptions[languageCode].ResultsWithX = "(Results with {1})"
|
||||
|
||||
-- If Debug enabled, add overwrite tables to the languagepack in order for the language completion script to be able to compare them
|
||||
if EID.enableDebug then
|
||||
|
||||
@@ -1129,7 +1129,7 @@ EID.descriptions[languageCode].AchievementWarningText = "実績無効！#実績
|
||||
|
||||
EID.descriptions[languageCode].OldGameVersionWarningText = "ゲームがアップデート されていません#最新バージョンのみが サポートされています#この警告は設定で無効に できます"
|
||||
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "MODのアイテムが原因で クラフトレシピの表示が 不正確になる可能性が あります#その場合、Itempool Percentages モードか、非表示にして ください#この警告は設定で無効に できます"
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "MODのアイテムが原因で クラフトレシピの表示が 不正確になる可能性が あります#その場合、Item Probability モードか、非表示にして ください#この警告は設定で無効に できます"
|
||||
|
||||
|
||||
-- If Debug enabled, add overwrite tables to the languagepack in order for the language completion script to be able to compare them
|
||||
|
||||
@@ -1084,7 +1084,7 @@ EID.descriptions[languageCode].AchievementWarningText = "Достижения о
|
||||
|
||||
EID.descriptions[languageCode].OldGameVersionWarningText = "Ваша версия Repentance не обновлена!#Только самая последняя версия официально поддерживается (1.7.9)#(Это предупреждение можно выключить в конфиге)"
|
||||
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "Предметы из модов могут сделать расчёт крафтов неточным!#Используйте режим отображения \"Itempool Percentages\" или отключите отображение Крафт-Мешка, если ваши рецепты неверны#(Это предупреждение можно выключить в конфиге)"
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "Предметы из модов могут сделать расчёт крафтов неточным!#Используйте режим отображения \"Item Probability\" или отключите отображение Крафт-Мешка, если ваши рецепты неверны#(Это предупреждение можно выключить в конфиге)"
|
||||
|
||||
|
||||
-- If Debug enabled, add overwrite tables to the languagepack in order for the language completion script to be able to compare them
|
||||
|
||||
@@ -244,7 +244,7 @@ local repCollectibles={
|
||||
[554] = {"554", "Tengo miedo", "{{Fear}} Asusta a los enemigos en un radio pequeño a tu alrededor"}, -- Muy fantasmagórico
|
||||
[555] = {"555", "Cuchilla dorada", "{{Coin}} Convierte 5 monedas en#{{ArrowUp}} {{Damage}} Daño +1.2 en la habitación actual"}, -- Navaja de oro
|
||||
[556] = {"556", "Sulfuro", "{{Collectible118}} Activa el efecto de Azufre en la habitación actual"}, -- Sulfuro
|
||||
[557] = {"557", "Galleta de la suerte", "Puede generar: #Una fortuna #{{SoulHeart}} Unq Corazón de alma#{{Card}} Una Carta#{{Trinket}} Un Trinket#{{Rune}} Una Runa o Piedra de alma"}, -- Galleta de la fortuna
|
||||
[557] = {"557", "Galleta de la suerte", "Puede generar: #Una fortuna #{{SoulHeart}} Un Corazón de Alma#{{Card}} Una Carta#{{Trinket}} Un Trinket#{{Rune}} Una Runa o Piedra de alma"}, -- Galleta de la fortuna
|
||||
[558] = {"558", "Dolor de ojo", "Posibilidad de disparar de 1 a 2 lágrimas adicionales en direcciones aleatorias"}, -- Dolor de ojo
|
||||
[559] = {"559", "120 voltios", "Da descargas de energía a los enemigos cercanos#La electricidad inflige el 75 % de tu daño"}, -- 120 voltios
|
||||
[560] = {"560", "Duele...", "Suelta un círculo de 10 lágrimas cuando te golpean#↑ {{Tears}} Lágrimas +1.2 con el primer golpe#↑ {{Tears}} Lágrimas +0.4 por cada golpe adicional"}, -- ¡Eso duele!
|
||||
@@ -1111,7 +1111,7 @@ EID.descriptions[languageCode].AchievementWarningTitle = "{{ColorYellow}}!!! ADV
|
||||
EID.descriptions[languageCode].AchievementWarningText = "¡Los logros están deshabilitados!#Para poder progresar en el juego, primero debes vencer a Mamá (Depths II) sin mods habilitados.#(Si ya derrotaste a Mamá, este mensaje es un bug, ignóralo)#(Este aviso puede ser desactivado en la configuración)"
|
||||
EID.descriptions[languageCode].OutdatedModWarningText = "¡Un mod sin actualizar está reduciendo la cantidad de objetos! Esto puede causar crasheos, especialmente al entrar al area de la Pieza del cuchillo 2#Por favor, desinstala los mods con el archivo resources/items.xml desactualizado"
|
||||
EID.descriptions[languageCode].OldGameVersionWarningText = "Tu versión de Repentance no es la más reciente#La versión más reciente es la única con soporte oficial (1.7.9)#(Este aviso puede ser desactivado en la configuración)"
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "Los objetos modeados pueden provocar cálculos incorrectos#Usa el modo Itempool Percentages o desactiva el cálculo de la Bolsa de trabajo si es que los cálculos son incorrectos#(Este aviso puede ser desactivado en la configuración)"
|
||||
EID.descriptions[languageCode].ModdedRecipesWarningText = "Los objetos modeados pueden provocar cálculos incorrectos#Usa el modo Item Probability o desactiva el cálculo de la Bolsa de trabajo si es que los cálculos son incorrectos#(Este aviso puede ser desactivado en la configuración)"
|
||||
-- Warnings end
|
||||
|
||||
-- False PHD modifier
|
||||
|
||||
+9
-1
@@ -1452,15 +1452,23 @@ function EID:getEntityData(entity, str)
|
||||
end
|
||||
|
||||
-- Function to fix font compatibility. Resets config font to a value compatible with your current language
|
||||
function EID:fixDefinedFont()
|
||||
function EID:fixDefinedFont(forceRefresh)
|
||||
local curLang = EID:getLanguage()
|
||||
local curFont = EID.Config["FontType"]
|
||||
|
||||
-- If our currently loaded font is still valid, we don't need to reset values
|
||||
for _, v in ipairs(EID.descriptions[curLang].fonts) do
|
||||
if curFont == v.name then
|
||||
-- Load the new language's line height / textbox width
|
||||
if (forceRefresh) then
|
||||
EID.Config["LineHeight"] = EID.descriptions[curLang].fonts[1].lineHeight or EID.DefaultConfig["LineHeight"]
|
||||
EID.Config["TextboxWidth"] = EID.descriptions[curLang].fonts[1].textboxWidth or EID.DefaultConfig["TextboxWidth"]
|
||||
end
|
||||
return false
|
||||
end
|
||||
end
|
||||
EID.Config["FontType"] = EID.descriptions[curLang].fonts[1].name
|
||||
-- On new font load, reset line height / textbox width to the default values if there's no defined height/width
|
||||
EID.Config["LineHeight"] = EID.descriptions[curLang].fonts[1].lineHeight or EID.DefaultConfig["LineHeight"]
|
||||
EID.Config["TextboxWidth"] = EID.descriptions[curLang].fonts[1].textboxWidth or EID.DefaultConfig["TextboxWidth"]
|
||||
return true
|
||||
|
||||
@@ -184,7 +184,7 @@ local componentShifts = {
|
||||
{0x00000011, 0x0000000F, 0x0000001A}
|
||||
}
|
||||
|
||||
-- The icon each item pool will use in the "Itempool Percentages" display
|
||||
-- The icon each item pool will use in the "Item Probability" display
|
||||
local poolToIcon = { [0]="{{TreasureRoom}}",[1]="{{Shop}}",[2]="{{BossRoom}}",[3]="{{DevilRoom}}",[4]="{{AngelRoom}}",
|
||||
[5]="{{SecretRoom}}",[7]="{{PoopRoomIcon}}",[8]="{{GoldenChestRoomIcon}}",[9]="{{RedChestRoomIcon}}",[12]="{{CursedRoom}}",[26]="{{Planetarium}}" }
|
||||
|
||||
@@ -269,7 +269,7 @@ function EID:getBagOfCraftingID(Variant, SubType)
|
||||
return nil
|
||||
end
|
||||
|
||||
-- "Itempool Percentages" MODE: Get percentages of what quality / item pool a given set of 8 ingredients can yield
|
||||
-- "Item Probability" MODE: Get percentages of what quality / item pool a given set of 8 ingredients can yield
|
||||
function EID:simulateBagOfCrafting(componentsTable)
|
||||
local components = componentsTable
|
||||
local compTotalWeight = 0
|
||||
@@ -1068,13 +1068,13 @@ function EID:handleBagOfCraftingRendering(ignoreRefreshRate)
|
||||
local tableToCraftingIconsFunc = EID.tableToCraftingIconsMerged
|
||||
if EID.Config["BagOfCraftingDisplayIcons"] then tableToCraftingIconsFunc = EID.tableToCraftingIconsFull end
|
||||
|
||||
-- Pickups Only / Itempool Percentages Mode display
|
||||
-- Pickups Only / Item Probability Mode display
|
||||
if EID.Config["BagOfCraftingDisplayRecipesMode"] == "Pickups Only" then
|
||||
EID:appendToDescription(customDescObj, getHotkeyString())
|
||||
EID:appendToDescription(customDescObj, getFloorItemsString(false, roomItems))
|
||||
EID:addDescriptionToPrint(customDescObj)
|
||||
return true
|
||||
elseif EID.Config["BagOfCraftingDisplayRecipesMode"] == "Itempool Percentages" then
|
||||
elseif EID.Config["BagOfCraftingDisplayRecipesMode"] == "Item Probability" then
|
||||
if not EID.RefreshBagTextbox and prevDesc ~= "" and not EID.OptionChanged then
|
||||
EID:appendToDescription(customDescObj, prevDesc)
|
||||
EID:addDescriptionToPrint(customDescObj)
|
||||
|
||||
+3
-3
@@ -339,12 +339,12 @@ EID.UserConfig = {
|
||||
-- Default = "always"
|
||||
["DisplayBagOfCrafting"] = "always",
|
||||
-- Display modes for the Bag of Crafting display
|
||||
-- Options: "Recipe List", "Preview Only", "Itempool Percentages", "Pickups Only"
|
||||
-- Options: "Recipe List", "Preview Only", "Item Probability", "Pickups Only"
|
||||
-- The "Recipe List" is a detailed calculated list of recipes based on what you have available on the floor
|
||||
-- "Preview Only" shows the description of the item you can currently craft in your bag
|
||||
-- "Itempool Percentages" shows percentages of what item you might get from your bag / best option on the floor, for a more intended experience
|
||||
-- "Item Probability" shows percentages of what item you might get from your bag / best option on the floor, for a more intended experience
|
||||
-- "Pickups Only" just shows the room/floor pickup count
|
||||
-- ("Itempool Percentages" is recommended if you have modded items)
|
||||
-- ("Item Probability" is recommended if you have modded items)
|
||||
-- Default = "Recipe List"
|
||||
["BagOfCraftingDisplayRecipesMode"] = "Recipe List",
|
||||
-- Hide the recipe list when in battle
|
||||
|
||||
+3
-3
@@ -324,7 +324,7 @@ if MCMLoaded then
|
||||
else
|
||||
EID.Config["Language"] = EID.Languages[currentNum]
|
||||
end
|
||||
local isFixed = EID:fixDefinedFont()
|
||||
local isFixed = EID:fixDefinedFont(true)
|
||||
if isFixed then
|
||||
EID:loadFont(EID.modPath .. "resources/font/eid_"..EID.Config["FontType"]..".fnt")
|
||||
end
|
||||
@@ -602,7 +602,7 @@ if MCMLoaded then
|
||||
EID:AddNumberSetting("Crafting", "DisplayBagOfCrafting", "Show Display", 1, #bagDisplays, { displayingTab = "Crafting", indexOf = bagDisplays, infoText = {"Always = Always show Results", "Hold = Show when holding up bag", "Never = Disable Bag of Crafting feature"}})
|
||||
|
||||
-- Bag of Crafting Display Mode
|
||||
local bagDisplayModes = {"Recipe List","Preview Only","Itempool Percentages","Pickups Only"}
|
||||
local bagDisplayModes = {"Recipe List","Item Probability","Preview Only","Pickups Only"}
|
||||
EID:AddNumberSetting("Crafting", "BagOfCraftingDisplayRecipesMode", "Display Mode", 1, #bagDisplayModes, { indexOf = bagDisplayModes,
|
||||
infoText = {"Toggle showing a list of recipes, an item preview when bag is full, what item pool/quality you might get, or only the floor pickups"}})
|
||||
|
||||
@@ -615,7 +615,7 @@ if MCMLoaded then
|
||||
|
||||
-- Bag of Crafting 8 icons toggle
|
||||
EID:AddBooleanSetting("Crafting", "BagOfCraftingDisplayIcons", "Show Recipes/Best Bag as", {onText = "8 Icons", offText = "Groups",
|
||||
infoText = "Choose if you want recipes (and the Best Quality bag in Itempool Percentages Mode) shown as 8 icons, or as grouped ingredients"})
|
||||
infoText = "Choose if you want recipes (and the Best Quality bag in Item Probability Mode) shown as 8 icons, or as grouped ingredients"})
|
||||
-- Modded Recipes toggle
|
||||
EID:AddBooleanSetting("Crafting", "BagOfCraftingModdedRecipes", "Load Modded Item Recipes (WIP)", {
|
||||
infoText = {"Enable or disable basic modded item support", "If you have a lot of modded items, it will slow down game launch"}})
|
||||
|
||||
+3
-3
@@ -209,7 +209,7 @@ if MCMLoaded and MCM and MCM.i18n == "Chinese" then
|
||||
{"Displayed Recipes","配方显示数量"},
|
||||
{"Hide in Battle","战斗时隐藏"},
|
||||
{"Pickups Only","仅掉落物"},
|
||||
{"Itempool Percentages","物品池百分比"},
|
||||
{"Item Probability","物品池百分比"},
|
||||
{"Show Recipes/Best Bag as","配方/最佳组合显示方式"},
|
||||
{"8 Icons","8图标"},
|
||||
{"Groups","分组"},
|
||||
@@ -402,7 +402,7 @@ if MCMLoaded and MCM and MCM.i18n == "Chinese" then
|
||||
= "切换显示配方列表,袋满时的道具预览,道具池/品质信息,或地面上的掉落物",
|
||||
["Hides the Bag of Crafting info when in a fight"] = "在战斗中隐藏合成宝袋信息",
|
||||
["Show the text for the Hide/Preview and Recipe List hotkeys"] = "显示切换隐藏/预览和配方列表的热键",
|
||||
["Choose if you want recipes (and the Best Quality bag in Itempool Percentages Mode) shown as 8 icons, or as grouped ingredients"]
|
||||
["Choose if you want recipes (and the Best Quality bag in Item Probability Mode) shown as 8 icons, or as grouped ingredients"]
|
||||
= "切换配方显示模式(或无配方模式下的最佳品质)为8个图标, 或者分组显示",
|
||||
["Enable or disable basic modded item support"] = "开关基础的模组道具支持",
|
||||
["If you have a lot of modded items, it will slow down game launch"] = "如果模组道具太多，游戏会变卡",
|
||||
@@ -417,7 +417,7 @@ if MCMLoaded and MCM and MCM.i18n == "Chinese" then
|
||||
= "如果开启,每个配方会显示两行,第一行是名字,第二行是配方",
|
||||
["Press this to clear all currently detected items on the floor"] = "按此键清除所有当前房间中已检测的物品",
|
||||
["Press this to clear all currently detected items on the bag"] = "按此键清除所有当前袋中已检测的物品",
|
||||
["Choose if you want recipes (and the Best Quality bag in Itempool Percentages Mode) shown as 8 icons, or as grouped ingredients"]
|
||||
["Choose if you want recipes (and the Best Quality bag in Item Probability Mode) shown as 8 icons, or as grouped ingredients"]
|
||||
= "选择使用八个图标还是分组 显示配方(或无配方模式的最佳组合)",
|
||||
["Press this key to toggle the crafting display, allowing you to check descriptions of items/pickups on the floor"]
|
||||
= "按此键切换合成袋的显示，以预览地面上的道具/掉落物描述",
|
||||
|
||||
+1
-1
@@ -320,7 +320,7 @@ if REPENTANCE then
|
||||
end
|
||||
end
|
||||
if hasCarBattery then
|
||||
EID:appendToDescription(descObj, " (Results with {{Collectible356}})")
|
||||
EID:appendToDescription(descObj, " " .. EID:getDescriptionEntry("ResultsWithX"):gsub("{1}", "{{Collectible356}}"))
|
||||
end
|
||||
if firstID ~= 0 and EID.TabPreviewID == 0 then
|
||||
EID.TabPreviewID = firstID
|
||||
|
||||
Reference in new issue
Block a user