Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

September 2019 Update mod fixes #407

Merged
merged 1 commit into from Apr 3, 2020
Merged

September 2019 Update mod fixes #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -7,3 +7,5 @@ cqui_settings_local.sql
.bak
*.bak
.DS_Store
/.settings/
/.buildpath
6 changes: 3 additions & 3 deletions Assets/UI/Popups/policyreminderpopup.lua
View file
Open in desktop
Expand Up @@ -61,8 +61,8 @@ function ShowPolicyReminderPopup(player:number, civic:number)
Controls.UnlockStack:ReprocessAnchoring();

Controls.ChangeGovernmentButton:SetText(Locale.Lookup("LOC_GOVT_CHANGE_POLICIES"));
Controls.ChangeGovernmentButton:ClearCallback( eLClick );
Controls.ChangeGovernmentButton:RegisterCallback( eLClick, OnChangePolicy );
Controls.ChangeGovernmentButton:ClearCallback( Mouse.eLClick );
Controls.ChangeGovernmentButton:RegisterCallback( Mouse.eLClick, OnChangePolicy );
Controls.ChangeGovernmentButton:RegisterCallback( Mouse.eMouseEnter, function() UI.PlaySound("Main_Menu_Mouse_Over"); end);

-- Show Change Government Button
Expand Down Expand Up @@ -117,7 +117,7 @@ end
function Initialize()
ContextPtr:SetHide(true)
-- Controls Events
Controls.CloseButton:RegisterCallback( eLClick, OnClose );
Controls.CloseButton:RegisterCallback( Mouse.eLClick, OnClose );
Controls.CloseButton:RegisterCallback( Mouse.eMouseEnter, function() UI.PlaySound("Main_Menu_Mouse_Over"); end);
ContextPtr:SetInputHandler( OnInputHandler, true );
-- CQUI Events
Expand Down
10 changes: 5 additions & 5 deletions Assets/UI/Popups/techciviccompletedpopup.lua
View file
Open in desktop
Expand Up @@ -110,13 +110,13 @@ function ShowCivicCompletedPopup( player:number, civic:number, quote:string, aud
-- Update Government Button depending on if we unlocked a new government type
if isCivicUnlockGovernmentType then
Controls.ChangeGovernmentButton:SetText(Locale.Lookup("LOC_GOVT_GOVERNMENT_UNLOCKED"));
Controls.ChangeGovernmentButton:ClearCallback( eLClick );
Controls.ChangeGovernmentButton:RegisterCallback( eLClick, OnChangeGovernment );
Controls.ChangeGovernmentButton:ClearCallback( Mouse.eLClick );
Controls.ChangeGovernmentButton:RegisterCallback( Mouse.eLClick, OnChangeGovernment );
Controls.ChangeGovernmentButton:RegisterCallback( Mouse.eMouseEnter, function() UI.PlaySound("Main_Menu_Mouse_Over"); end);
else
Controls.ChangeGovernmentButton:SetText(Locale.Lookup("LOC_GOVT_CHANGE_POLICIES"));
Controls.ChangeGovernmentButton:ClearCallback( eLClick );
Controls.ChangeGovernmentButton:RegisterCallback( eLClick, OnChangePolicy );
Controls.ChangeGovernmentButton:ClearCallback( Mouse.eLClick );
Controls.ChangeGovernmentButton:RegisterCallback( Mouse.eLClick, OnChangePolicy );
Controls.ChangeGovernmentButton:RegisterCallback( Mouse.eMouseEnter, function() UI.PlaySound("Main_Menu_Mouse_Over"); end);
end

Expand Down Expand Up @@ -463,7 +463,7 @@ function Initialize()
ContextPtr:SetShutdown( OnShutdown );
ContextPtr:SetShowHandler( OnShow );

Controls.CloseButton:RegisterCallback( eLClick, OnClose );
Controls.CloseButton:RegisterCallback( Mouse.eLClick, OnClose );
Controls.CloseButton:RegisterCallback( Mouse.eMouseEnter, function() UI.PlaySound("Main_Menu_Mouse_Over"); end);

-- LUA Events
Expand Down
7 changes: 7 additions & 0 deletions Assets/UI/actionpanel.lua
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@ include( "InstanceManager" );
include( "SupportFunctions" );
include("Civ6Common"); -- IsTutorialRunning()
include("PopupDialog");
include( "GameCapabilities" );

-- ===========================================================================
-- CONSTANTS
Expand Down Expand Up @@ -364,6 +365,12 @@ end
-- Set the era rotation and tooltip.
-- ===========================================================================
function RealizeEraIndicator()

if HasCapability("CAPABILITY_ERAS")==false then
Controls.EraIndicator:SetHide( true );
return;
end

local displayEra :number = 1;
local pPlayer = Players[Game.GetLocalPlayer()];
if pPlayer ~= nil then
Expand Down
11 changes: 11 additions & 0 deletions CQUI.modinfo
View file
Open in desktop
Expand Up @@ -263,6 +263,7 @@
<File>Integrations/ML/Lenses/ModLens_Resource.xml</File>
<File>Integrations/ML/Lenses/ModLens_Resource.lua</File>
<File>Integrations/ML/DLC/Expansion1/UI/Replacements/MinimapPanel.xml</File>
<File>Integrations/ML/DLC/Expansion2/UI/Replacements/MinimapPanel.xml</File>
<File>Integrations/BES/UI/espionagesupport.lua</File>
<File>Integrations/BES/UI/Choosers/espionagechooser.lua</File>
<File>Integrations/BES/UI/Choosers/espionagechooser.xml</File>
Expand Down Expand Up @@ -952,6 +953,16 @@
</Items>
</ImportFiles>

<ImportFiles id="MORELENSES_EXPANSION2_FILES" criteria="Expansion2">
<Properties>
<LoadOrder>102</LoadOrder>
</Properties>
<Items>
<File>Integrations/ML/DLC/Expansion2/UI/Replacements/MinimapPanel.xml</File>
</Items>
</ImportFiles>


<LocalizedText id="MORELENSES_TEXT">
<Items>
<File Priority="1">Integrations/ML/Text/morelenses_text.xml</File>
Expand Down
2 changes: 1 addition & 1 deletion Integrations/BES/UI/Choosers/espionagechooser.lua
View file
Open in desktop
Expand Up @@ -1055,7 +1055,7 @@ function Initialize()
Controls.CloseButton:RegisterCallback( Mouse.eMouseEnter, function() UI.PlaySound("Main_Menu_Mouse_Over"); end);

-- Filter Pulldown
Controls.FilterButton:RegisterCallback( eLClick, UpdateFilterArrow );
Controls.FilterButton:RegisterCallback( Mouse.eLClick, UpdateFilterArrow );
Controls.DestinationFilterPulldown:RegisterSelectionCallback( OnFilterSelected );

-- District Filter Panel
Expand Down
2 changes: 1 addition & 1 deletion Integrations/BES/UI/PartialScreens/espionageoverview.lua
View file
Open in desktop
Expand Up @@ -1240,7 +1240,7 @@ function Initialize()
Controls.CapturedEnemyOperativeContainer:RegisterSizeChanged( OnCapturedEnemyOperativeContainerSizeChanged );

-- Filter Pulldown
Controls.FilterButton:RegisterCallback( eLClick, UpdateFilterArrow );
Controls.FilterButton:RegisterCallback( Mouse.eLClick, UpdateFilterArrow );
Controls.DestinationFilterPulldown:RegisterSelectionCallback( OnFilterSelected );

-- District Filter Panel
Expand Down
2 changes: 1 addition & 1 deletion Integrations/BTS/UI/Choosers/traderoutechooser.lua
View file
Open in desktop
Expand Up @@ -1397,7 +1397,7 @@ function Initialize()
InitButton(Controls.Header_CloseButton, OnClose )

-- Filter
Controls.FilterButton:RegisterCallback( eLClick, UpdateFilterArrow );
Controls.FilterButton:RegisterCallback( Mouse.eLClick, UpdateFilterArrow );
Controls.DestinationFilterPulldown:RegisterSelectionCallback( OnFilterSelected );

-- Control events - checkboxes
Expand Down
4 changes: 2 additions & 2 deletions Integrations/BTS/UI/tradeoverview.lua
View file
Open in desktop
Expand Up @@ -2303,11 +2303,11 @@ function Initialize()
InitButton(Controls.TurnsToCompleteSortButton, OnSortByTurnsToComplete, OnNotSortByTurnsToComplete)

--Filter Pulldown
Controls.OverviewFilterButton:RegisterCallback( eLClick, UpdateFilterArrow );
Controls.OverviewFilterButton:RegisterCallback( Mouse.eLClick, UpdateFilterArrow );
Controls.OverviewDestinationFilterPulldown:RegisterSelectionCallback( OnFilterSelected );

-- Group By Pulldown
Controls.OverviewGroupByButton:RegisterCallback( eLClick, UpdateGroupByArrow );
Controls.OverviewGroupByButton:RegisterCallback( Mouse.eLClick, UpdateGroupByArrow );
Controls.OverviewGroupByPulldown:RegisterSelectionCallback( OnGroupBySelected );

InitButton(Controls.GroupExpandAllCheckBox, OnGroupExpandAll)
Expand Down
97 changes: 97 additions & 0 deletions Integrations/ML/DLC/Expansion2/UI/Replacements/MinimapPanel.xml
View file
Open in desktop
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Context>

<SlideAnim Size="parent,parent" ID="Pause" Begin="0,0" End="0,160" Function="Root" Speed="4" Cycle="Once" Stopped="1"/>

<Grid ID="LensPanel" Anchor="L,T" AnchorSide="I,O" Offset="-10,-5" Size="230,326" Texture="Tracker_OptionsBacking.dds" SliceCorner="55,61" SliceSize="1,1" SliceTextureSize="121,119" ConsumeAllMouse="1" Hidden="1">
<Label Anchor="C,T" String="{LOC_HUD_LENSES:upper}" Offset="-6,10" Style="FontFlair16" Color0="106,93,69,255" Color1="0,0,0,150" Color2="146,133,109,255" FontStyle="Glow" SmallCaps="20" SmallCapsLeading="0" SmallCapsType="EveryWord" KerningAdjustment="0"/>
<ScrollPanel ID="LensChooserList" Offset="36,35" Size="parent,parent-65" Style="ScrollPanelWithLeftBar">
<Stack ID="LensToggleStack" Anchor="L,T" StackGrowth="Bottom" Offset="-5,0" StackPadding="-3" >
<RadioButton ID="ReligionLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_RELIGION_LENS" AllowClickOff="1" ToolTip="LOC_HUD_RELIGION_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="ContinentLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_CONTINENT_LENS" AllowClickOff="1" ToolTip="LOC_HUD_CONTINENT_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="AppealLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_APPEAL_LENS" AllowClickOff="1" ToolTip="LOC_HUD_APPEAL_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="WaterLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_WATER_LENS" AllowClickOff="1" ToolTip="LOC_HUD_WATER_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="GovernmentLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_GOVERNMENT_LENS" AllowClickOff="1" ToolTip="LOC_HUD_GOVERNMENT_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="OwnerLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_OWNER_LENS" AllowClickOff="1" ToolTip="LOC_HUD_OWNER_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="TourismLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_TOURISM_LENS" AllowClickOff="1" ToolTip="LOC_HUD_TOURISM_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="EmpireLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_EMPIRE_LENS" AllowClickOff="1" ToolTip="LOC_HUD_EMPIRE_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="LoyaltyLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_CULTURAL_IDENTITY_LENS" AllowClickOff="1" ToolTip="LOC_HUD_CULTURAL_IDENTITY_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
<RadioButton ID="PowerLensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="LOC_HUD_POWER_LENS" AllowClickOff="1" ToolTip="LOC_HUD_POWER_LENS_TOOLTIP" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
</Stack>
</ScrollPanel>
<Image Texture="Controls_ButtonExtendSmall" TextureOffset="0,60" Size="20,20" Anchor="L,B" Offset="22,10"/>
</Grid>

<Grid ID="MapOptionsPanel" Anchor="L,T" AnchorSide="I,O" Size="220,119" Offset="-10,-5" Texture="Tracker_OptionsBacking.dds" SliceCorner="55,61" SliceSize="1,1" SliceTextureSize="121,119" ConsumeAllMouse="1" Hidden="1">
<Label ID="MapOptionsLabel" Anchor="C,T" String="{LOC_HUD_MAP_OPTIONS:upper}" Offset="-6,10" Style="FontFlair16" Color0="106,93,69,255" Color1="0,0,0,150" Color2="146,133,109,255" FontStyle="Glow" SmallCaps="20" SmallCapsLeading="0" SmallCapsType="EveryWord" KerningAdjustment="0"/>
<ScrollPanel ID="MapOptionsList" Anchor="C,B" Offset="10,30" Size="parent,parent-60" AutoScrollBar="1" Vertical="1">
<Stack ID="MapOptionsStack" Anchor="R,C" StackGrowth="Bottom" Offset="25,0" StackPadding="1" >
<CheckBox ID="ToggleGridButton" IsChecked="1" Offset="10,4" TextOffset="-5,0" String="LOC_HUD_MAP_SHOW_GRID" ToolTip="LOC_HUD_MAP_TOGGLE_GRID" Style="WhiteSemiBold14" ButtonTexture="Controls_Checkbox.dds" ButtonSize="17,17" CheckTexture="Controls_Checkbox.dds" CheckSize="17,17" CheckTextureOffset="0,17" Anchor="R,T"/>
<CheckBox ID="ToggleResourcesButton" IsChecked="1" Offset="10,4" TextOffset="-5,0" String="LOC_HUD_MAP_SHOW_RESOURCES" ToolTip="LOC_HUD_TOGGLE_RESOURCE_ICONS" Style="WhiteSemiBold14" ButtonTexture="Controls_Checkbox.dds" ButtonSize="17,17" CheckTexture="Controls_Checkbox.dds" CheckSize="17,17" CheckTextureOffset="0,17" Anchor="R,T"/>
<CheckBox ID="ToggleYieldsButton" IsChecked="0" Offset="10,4" TextOffset="-5,0" String="LOC_HUD_MAP_SHOW_YIELDS" ToolTip="LOC_HUD_TOGGLE_YIELD_ICONS" Style="WhiteSemiBold14" ButtonTexture="Controls_Checkbox.dds" ButtonSize="17,17" CheckTexture="Controls_Checkbox.dds" CheckSize="17,17" CheckTextureOffset="0,17" Anchor="R,T"/>
</Stack>
<ScrollBar Style="ScrollVerticalBarHighContrast" Anchor="L,C" Offset="0,0" AnchorSide="I,I" Size="4,90"/>
</ScrollPanel>
<Image Texture="Controls_ButtonExtendSmall" TextureOffset="0,60" Size="20,20" Anchor="L,B" Offset="20,10"/>
</Grid>

<Container Size="300,200" ID="MiniMap" Anchor="L,B" Offset="-3,0" >
<SlideAnim Size="parent,parent" ID="CollapseAnim" Begin="0,0" End="0,195" Function="OutQuint" FunctionPower="1" Speed="2" Cycle="Once" Stopped="1">
<SlideAnim Size="parent,parent" ID="ExpandAnim" Begin="0,0" End="0,-195" Function="OutQuint" FunctionPower="3" Speed="2" Cycle="Once" Stopped="1">
<Grid ID="MinimapBacking" Texture="MiniMap_WoodBacking" Anchor ="L,B" Offset="-5,2" Size="282,201" SliceCorner="18,94" SliceSize="246,4">
<Image Texture="MiniMap_WoodBackingTile" Anchor="C,C" Size="Parent-25,Parent-100" StretchMode="Tile"/>
</Grid>
<Image ID="MinimapContainer" Anchor ="L,B" Texture="Parchment_Pattern" ToolTip="LOC_HUD_MINIMAP_TOOLTIP" Size="256,256" StretchMode="Tile" Offset="18,21">
<Image ID="MinimapImage" Anchor ="C,C" Texture="MiniMap_BG.dds" ToolTip="LOC_HUD_MINIMAP_TOOLTIP" Size="256,256" StretchMode="Fill" Sampler="Linear"/>

<Button ID="CollapseButton" Anchor="R,T" AnchorSide="I,O" Offset="3,3" Size="47,16" Hidden="0" Texture="Controls_Collapse.dds" ToolTip="LOC_HUD_MINIMAP_COLLAPSE_TOOLTIP" />
<Button ID="ExpandButton" Anchor="R,T" AnchorSide="I,O" Offset="3,3" Size="47,16" Hidden="1" ConsumeAllMouse="1" Texture="Controls_ButtonExtend.dds" ToolTip="LOC_HUD_MINIMAP_EXPAND_TOOLTIP" />

<Grid Texture="MiniMap_Frame" Size="parent+10,parent+12" SliceCorner="18,40" SliceTextureSize="37,149" Offset="-5,-5"/>
<Stack ID="OptionsStack" Anchor="L,T" AnchorSide="I,O" Offset="0,-4" StackGrowth="Right" Padding="-6">
<CheckBox ID="LensButton" Offset="0,1" Anchor="L,C" UseSelectedTextures="1" ButtonSize="44,44" ButtonTexture="LaunchBar_Hook_ButtonMedium" Style="ButtonNormalText" ToolTip="LOC_HUD_LENSES" CheckTexture="Controls_Bolt" CheckColor="0,0,0,0">
<Image Texture="MiniMap_Lenses" Size="36,36" Anchor="C,C" Offset="-4,-1"/>
</CheckBox>
<CheckBox ID="MapOptionsButton" UseSelectedTextures="1" Anchor="L,C" ButtonSize="40,40" ButtonTexture="LaunchBar_Hook_ButtonMinimap" Style="ButtonNormalText" ToolTip="LOC_HUD_MAP_OPTIONS" CheckTexture="Controls_Bolt" CheckColor="0,0,0,0">
<Image Texture="Minimap_MapOptions" Size="22,22" Anchor="C,C"/>
</CheckBox>
<CheckBox ID="MapPinListButton" UseSelectedTextures="1" Anchor="L,C" ButtonSize="40,40" ButtonTexture="LaunchBar_Hook_ButtonMinimap" Style="ButtonNormalText" ToolTip="LOC_HUD_MAP_TOGGLE_MAP_PIN_LIST" CheckTexture="Controls_Bolt" CheckColor="0,0,0,0">
<Image Texture="MiniMap_MapPins" Size="24,24" Anchor="C,C"/>
<Container ID="MapPinListPanel" Anchor="L,T" Offset="-9,-35" Size="auto,auto" Hidden="1">
<LuaContext FileName="MapPinListPanel"/>
</Container>
</CheckBox>
<CheckBox ID="MapSearchButton" UseSelectedTextures="1" Anchor="L,C" ButtonSize="40,40" ButtonTexture="LaunchBar_Hook_ButtonMinimap" Style="ButtonNormalText" ToolTip="LOC_HUD_MAP_SEARCH" CheckTexture="Controls_Bolt" CheckColor="0,0,0,0">
<Image Texture="MiniMap_Search" Size="24,24" Anchor="C,C" Offset="0,-1"/>
<Container ID="MapSearchPanel" Anchor="L,T" Offset="-9,-35" Size="auto,auto" Hidden="1">
<LuaContext FileName="MapSearchPanel"/>
</Container>
</CheckBox>
<CheckBox ID="CQUI_OptionsButton" UseSelectedTextures="1" Anchor="L,C" ButtonSize="40,40" ButtonTexture="LaunchBar_Hook_ButtonSmall" Style="ButtonNormalText" ToolTip="LOC_CQUI_NAME" CheckTexture="Controls_Bolt" CheckColor="0,0,0,0">
<Image Texture="Stats30" Icon="ICON_RESOURCE_TOBACCO" Size="35,35" Anchor="C,C"/>
</CheckBox>
<Button ID="StrategicSwitcherButton" Anchor="L,C" Size="40,40" Texture="LaunchBar_Hook_ButtonMinimap" Style="ButtonNormalText" ToolTip="LOC_HUD_TOGGLE_STRATEGY_VIEW">
<Image ID="SwitcherImage" Texture="MiniMap_StrategicSwitcher" Size="24,24" Anchor="C,C"/>
</Button>
<Button ID="FullscreenMapButton" Anchor="L,C" Size="40,40" Texture="LaunchBar_Hook_ButtonMinimap" Style="ButtonNormalText" ToolTip="LOC_HUD_FULLSCREEN_MAP">
<Image Texture="MiniMap_Full" Size="24,24" Anchor="C,C"/>
</Button>
</Stack>
</Image>
<Container Anchor="L,B" Offset="7,8">
<Meter ID="CompassArm" Offset="-169,-152" Texture="MiniMap_CompassSide.dds" Percent=".25" Follow="1" Speed="4" Size="320,320"/>
<Image Anchor="L,B" Offset="0,-6" Texture="MiniMap_CompassBase.dds" />
</Container>
</SlideAnim>
</SlideAnim>
</Container>

<Instance Name="LensButtonInstance">
<RadioButton ID="LensButton" RadioGroup="ActiveLens" TextOffset="-5,0" String="$LensName$" AllowClickOff="1" Style="WhiteSemiBold14" Offset="10,4" ButtonTexture="Controls_RadioButtonLarge.dds" ButtonSize="35,35" CheckTexture="Controls_RadioButtonLarge.dds" CheckSize="35,35" CheckTextureOffset="0,140" Anchor="L,T" BoxOnLeft="1"/>
</Instance>

<Instance Name="MapOptionInstance">
<CheckBox ID="ToggleButton" Offset="10,4" TextOffset="-5,0" String="$OptionName$" Style="WhiteSemiBold14" ButtonTexture="Controls_Checkbox.dds" ButtonSize="17,17" CheckTexture="Controls_Checkbox.dds" CheckSize="17,17" CheckTextureOffset="0,17" Anchor="R,T"/>
</Instance>

</Context>
2 changes: 2 additions & 0 deletions Integrations/ML/Lenses/ModLens_CitizenManagement.lua
View file
Open in desktop
Expand Up @@ -91,6 +91,8 @@ local function OnInitialize()
end

local CitizenManagementEntry = {
LensButtonText = "LOC_HUD_CITIZEN_MANAGEMENT_LENS",
LensButtonTooltip = "LOC_HUD_CITIZEN_MANAGEMENT_LENS_TOOLTIP",
Initialize = OnInitialize,
GetColorPlotTable = OnGetColorPlotTable
}
Expand Down
8 changes: 8 additions & 0 deletions Integrations/ML/Text/morelenses_text.xml
View file
Open in desktop
Expand Up @@ -3,6 +3,14 @@
<BaseGameText>
<!-- ENGLISH -->

<!-- Missing Citizen management Lens -->
<Row Tag="LOC_HUD_CITIZEN_MANAGEMENT_LENS">
<Text>Builder</Text>
</Row>
<Row Tag="LOC_HUD_CITIZEN_MANAGEMENT_LENS_TOOLTIP">
<Text>Highlights what hexes the builder can work on</Text>
</Row>

<!-- Builder Lens -->
<Row Tag="LOC_HUD_BUILDER_LENS">
<Text>Builder</Text>
Expand Down