Merge branch 'wofsauge:master' into master
This commit is contained in:
4 files changed
+88
-9
No files matched your search
@@ -30,6 +30,9 @@ EID.UserConfig = {
|
|||||||
-- Change the size of the info boxes. Range: [0,...,1]
|
-- Change the size of the info boxes. Range: [0,...,1]
|
||||||
-- Default = 1
|
-- Default = 1
|
||||||
["Scale"] = 1,
|
["Scale"] = 1,
|
||||||
|
-- Press or hold the key to change scale.
|
||||||
|
-- Default = Keyboard.KEY_F5
|
||||||
|
["ScaleKey"] = Keyboard.KEY_F5,
|
||||||
-- Set the background transparency. Range: [0,...,1]
|
-- Set the background transparency. Range: [0,...,1]
|
||||||
-- Default = 0.75
|
-- Default = 0.75
|
||||||
["Transparency"] = 0.75,
|
["Transparency"] = 0.75,
|
||||||
@@ -344,6 +347,7 @@ EID.DefaultConfig = {
|
|||||||
["FontType"] = "default",
|
["FontType"] = "default",
|
||||||
["TextboxWidth"] = 115,
|
["TextboxWidth"] = 115,
|
||||||
["Scale"] = 1,
|
["Scale"] = 1,
|
||||||
|
["ScaleKey"] = Keyboard.KEY_F5,
|
||||||
["Transparency"] = 0.75,
|
["Transparency"] = 0.75,
|
||||||
["HUDOffset"] = 10,
|
["HUDOffset"] = 10,
|
||||||
["XPosition"] = 60,
|
["XPosition"] = 60,
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ local game = Game()
|
|||||||
require("eid_config")
|
require("eid_config")
|
||||||
EID.Config = EID.UserConfig
|
EID.Config = EID.UserConfig
|
||||||
EID.Config.Version = "3.2" -- note: changing this will reset everyone's settings to default!
|
EID.Config.Version = "3.2" -- note: changing this will reset everyone's settings to default!
|
||||||
EID.ModVersion = "4.12"
|
EID.ModVersion = "4.13"
|
||||||
EID.DefaultConfig.Version = EID.Config.Version
|
EID.DefaultConfig.Version = EID.Config.Version
|
||||||
EID.isHidden = false
|
EID.isHidden = false
|
||||||
EID.player = nil
|
EID.player = nil
|
||||||
@@ -371,6 +371,69 @@ if REPENTANCE then
|
|||||||
EID:AddCallback(ModCallbacks.MC_PRE_USE_ITEM, EID.CheckVoidAbsorbs, CollectibleType.COLLECTIBLE_VOID)
|
EID:AddCallback(ModCallbacks.MC_PRE_USE_ITEM, EID.CheckVoidAbsorbs, CollectibleType.COLLECTIBLE_VOID)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
--------------------------Handle Scale Shortcut----------------------------
|
||||||
|
|
||||||
|
local scaleMin = 0.1
|
||||||
|
local scaleMax = 2
|
||||||
|
local scaleSpeed = 0.01 -- scale size per frame
|
||||||
|
local scaleToBigger = true
|
||||||
|
local scaleHoldFrame = 0
|
||||||
|
local function handleScaleKey()
|
||||||
|
local ScaleKey = EID.Config["ScaleKey"]
|
||||||
|
|
||||||
|
-- press and hold ScaleKey
|
||||||
|
if Input.IsButtonPressed(ScaleKey, 0) then
|
||||||
|
if scaleHoldFrame > 60 then
|
||||||
|
local scaleConfigName = (EID.Config["DisplayMode"] == "local" and "LocalScale" or "Scale")
|
||||||
|
if scaleToBigger then
|
||||||
|
local newScale = EID.Scale + scaleSpeed
|
||||||
|
|
||||||
|
EID.Scale = newScale
|
||||||
|
EID.Config[scaleConfigName] = newScale
|
||||||
|
|
||||||
|
if newScale > scaleMax then
|
||||||
|
scaleToBigger = false
|
||||||
|
end
|
||||||
|
else
|
||||||
|
local newScale = EID.Scale - scaleSpeed
|
||||||
|
|
||||||
|
EID.Scale = newScale
|
||||||
|
EID.Config[scaleConfigName] = newScale
|
||||||
|
|
||||||
|
if newScale < scaleMin then
|
||||||
|
scaleToBigger = true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
scaleHoldFrame = scaleHoldFrame + 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
-- press ScaleKey
|
||||||
|
if Input.IsButtonTriggered(ScaleKey, 0) then
|
||||||
|
scaleHoldFrame = 0
|
||||||
|
local scale
|
||||||
|
local scaleConfigName = (EID.Config["DisplayMode"] == "local" and "LocalScale" or "Scale")
|
||||||
|
|
||||||
|
scale = EID.Scale
|
||||||
|
|
||||||
|
-- switch between 1, 1.5 and 0.5
|
||||||
|
|
||||||
|
if math.abs(scale - 1) < 0.01 then
|
||||||
|
scale = 1.5
|
||||||
|
elseif math.abs(scale - 1.5) < 0.01 then
|
||||||
|
scale = 0.5
|
||||||
|
elseif math.abs(scale - 0.5) < 0.01 then
|
||||||
|
scale = 1
|
||||||
|
else
|
||||||
|
scale = 1
|
||||||
|
end
|
||||||
|
|
||||||
|
EID.Config[scaleConfigName] = scale
|
||||||
|
EID.Scale = scale
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
---------------------------Printing Functions------------------------------
|
---------------------------Printing Functions------------------------------
|
||||||
|
|
||||||
@@ -860,6 +923,8 @@ local function onRender(t)
|
|||||||
if Input.IsButtonTriggered(EID.Config["HideKey"], 0) or Input.IsButtonTriggered(EID.Config["HideButton"], EID.player.ControllerIndex) then
|
if Input.IsButtonTriggered(EID.Config["HideKey"], 0) or Input.IsButtonTriggered(EID.Config["HideButton"], EID.player.ControllerIndex) then
|
||||||
EID.isHidden = not EID.isHidden
|
EID.isHidden = not EID.isHidden
|
||||||
end
|
end
|
||||||
|
|
||||||
|
handleScaleKey()
|
||||||
|
|
||||||
if ModConfigMenu and ModConfigMenu.IsVisible and ModConfigMenu.Config["Mod Config Menu"].HideHudInMenu and EID.MCMCompat_isDisplayingEIDTab ~= "Visuals" and EID.MCMCompat_isDisplayingEIDTab ~= "Crafting" then --if the mod config menu exists, is opened and Hide Hud is enabled, and ModConfigMenu isn't currently in the "Visuals" or "Crafting" tab of EID
|
if ModConfigMenu and ModConfigMenu.IsVisible and ModConfigMenu.Config["Mod Config Menu"].HideHudInMenu and EID.MCMCompat_isDisplayingEIDTab ~= "Visuals" and EID.MCMCompat_isDisplayingEIDTab ~= "Crafting" then --if the mod config menu exists, is opened and Hide Hud is enabled, and ModConfigMenu isn't currently in the "Visuals" or "Crafting" tab of EID
|
||||||
return
|
return
|
||||||
|
|||||||
+13
-8
@@ -29,7 +29,7 @@ This mod displays detailed information about all items, trinkets, cards, runes a
|
|||||||
[b]Press F2 to hide/show the descriptions![/b]
|
[b]Press F2 to hide/show the descriptions![/b]
|
||||||
|
|
||||||
[img]https://i.imgur.com/NqSBJqj.png[/img]
|
[img]https://i.imgur.com/NqSBJqj.png[/img]
|
||||||
[img]https://i.imgur.com/Hkv0pcO.png[/img]
|
[img]https://i.imgur.com/unoJRAB.png[/img]
|
||||||
[table]
|
[table]
|
||||||
[tr]
|
[tr]
|
||||||
[th]ENGLISH[/th]
|
[th]ENGLISH[/th]
|
||||||
@@ -39,11 +39,6 @@ This mod displays detailed information about all items, trinkets, cards, runes a
|
|||||||
[th]FRENCH[/th]
|
[th]FRENCH[/th]
|
||||||
[th]PORTUGUESE[/th]
|
[th]PORTUGUESE[/th]
|
||||||
[th]BRAZILIAN PORTUGUESE[/th]
|
[th]BRAZILIAN PORTUGUESE[/th]
|
||||||
[th]BULGARIAN[/th]
|
|
||||||
[th]TURKISH[/th]
|
|
||||||
[th]POLISH[/th]
|
|
||||||
[th]KOREAN[/th]
|
|
||||||
[th]CHINESE[/th]
|
|
||||||
[/tr]
|
[/tr]
|
||||||
[tr]
|
[tr]
|
||||||
[td]by Wofsauge[/td]
|
[td]by Wofsauge[/td]
|
||||||
@@ -53,9 +48,19 @@ This mod displays detailed information about all items, trinkets, cards, runes a
|
|||||||
[td]by Nicolas Delvaux[/td]
|
[td]by Nicolas Delvaux[/td]
|
||||||
[td]by Marcelino Cruz[/td]
|
[td]by Marcelino Cruz[/td]
|
||||||
[td]by LuanRoger, NotZin02[/td]
|
[td]by LuanRoger, NotZin02[/td]
|
||||||
|
[/tr][tr]
|
||||||
|
[th]GERMAN[/th]
|
||||||
|
[th]BULGARIAN[/th]
|
||||||
|
[th]TURKISH[/th]
|
||||||
|
[th]POLISH[/th]
|
||||||
|
[th]KOREAN[/th]
|
||||||
|
[th]CHINESE[/th]
|
||||||
|
[/tr]
|
||||||
|
[tr]
|
||||||
|
[td]by Jake[/td]
|
||||||
[td]by TST_Gogo_, Gothika_47[/td]
|
[td]by TST_Gogo_, Gothika_47[/td]
|
||||||
[td]by Cagdas Salur, Mert Dutal[/td]
|
[td]by Cagdas Salur, Mert Dutal[/td]
|
||||||
[td]by Rickyy, Kennyluz,DimonoKingoKongo, MERITT[/td]
|
[td]by Rickyy, Kennyluz, DimonoKingoKongo, MERITT[/td]
|
||||||
[td]by Blackcreamtea, 미카[/td]
|
[td]by Blackcreamtea, 미카[/td]
|
||||||
[td]by Xheepey87, frto027[/td]
|
[td]by Xheepey87, frto027[/td]
|
||||||
[/tr]
|
[/tr]
|
||||||
@@ -98,7 +103,7 @@ https://moddingofisaac.com/mod/1079/external-item-descriptions
|
|||||||
- Jake for the sweet [b]German[/b] language pack
|
- Jake for the sweet [b]German[/b] language pack
|
||||||
- Blackcreamtea and 미카 for the awesome [b]Korean[/b] language pack
|
- Blackcreamtea and 미카 for the awesome [b]Korean[/b] language pack
|
||||||
- [url=https://steamcommunity.com/id/whytefang/]adc[/url] for creating an awesome new Languagepack and providing ideas for new functionalities</description>
|
- [url=https://steamcommunity.com/id/whytefang/]adc[/url] for creating an awesome new Languagepack and providing ideas for new functionalities</description>
|
||||||
<version>4.12</version>
|
<version>4.13</version>
|
||||||
<visibility>Public</visibility>
|
<visibility>Public</visibility>
|
||||||
<tag id="Lua"/>
|
<tag id="Lua"/>
|
||||||
<tag id="Items"/>
|
<tag id="Items"/>
|
||||||
|
|||||||
@@ -1081,6 +1081,11 @@ if MCMLoaded then
|
|||||||
Info = {"Change text size. CAN BE HARD TO READ IN SOME SETTINGS!"}
|
Info = {"Change text size. CAN BE HARD TO READ IN SOME SETTINGS!"}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
-- SCALE Hotkey
|
||||||
|
EID:AddHotkeySetting("Visuals",
|
||||||
|
"ScaleKey", "Toggle Scale (Keyboard)",
|
||||||
|
"Press or hold this key to toggle the scale.", false)
|
||||||
|
|
||||||
-- Transparency
|
-- Transparency
|
||||||
MCM.AddSetting(
|
MCM.AddSetting(
|
||||||
"EID",
|
"EID",
|
||||||
|
|||||||
Reference in new issue
Block a user