Skip to content

Commit

Permalink
v1.1.3 - Added bindable hotkey for intrinsics control panel
Browse files Browse the repository at this point in the history
  • Loading branch information
hamstar0 committed Mar 1, 2020
1 parent a69fa2f commit f7ec80d
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 16 deletions.
9 changes: 7 additions & 2 deletions Intrinsics/MyMod.cs
Expand Up @@ -16,7 +16,10 @@ partial class IntrinsicsMod : Mod {

internal Item TradeItem = new Item();
internal bool IsTrading = false;
internal UIIntrinsicsDialog IntrinsicsDialog;
internal UIIntrinsicsDialog ControlPanelDialog;

internal ModHotKey ControlPanelHotkey;


////////////////

Expand All @@ -35,8 +38,10 @@ partial class IntrinsicsMod : Mod {
public override void Load() {
ModContent.GetInstance<ImpartmentContractItem>()?.LoadContent();

this.ControlPanelHotkey = this.RegisterHotKey( "Control Panel", "P" );

if( !Main.dedServ ) {
this.IntrinsicsDialog = new UIIntrinsicsDialog();
this.ControlPanelDialog = new UIIntrinsicsDialog();
this.InitializeControlsUI();
}
}
Expand Down
20 changes: 15 additions & 5 deletions Intrinsics/MyPlayer.cs
@@ -1,13 +1,14 @@
using HamstarHelpers.Helpers.Debug;
using Intrinsics.Items;
using Intrinsics.NetProtocols;
using Intrinsics.NPCs;
using System;
using System;
using System.Collections.Generic;
using Terraria;
using Terraria.GameInput;
using Terraria.ID;
using Terraria.ModLoader;
using Terraria.ModLoader.IO;
using HamstarHelpers.Helpers.Debug;
using Intrinsics.Items;
using Intrinsics.NetProtocols;
using Intrinsics.NPCs;


namespace Intrinsics {
Expand Down Expand Up @@ -230,5 +231,14 @@ partial class IntrinsicsPlayer : ModPlayer {
this.PrevSelectedItem = null;
}
}


////////////////

public override void ProcessTriggers( TriggersSet triggersSet ) {
if( IntrinsicsMod.Instance.ControlPanelHotkey.JustPressed ) {
IntrinsicsMod.Instance.ControlPanelDialog.Open();
}
}
}
}
16 changes: 8 additions & 8 deletions Intrinsics/UI/UI.cs
Expand Up @@ -67,10 +67,10 @@ partial class IntrinsicsControlsUI : UIState {
////

this.Label.OnClick += ( evt, elem ) => {
IntrinsicsMod.Instance.IntrinsicsDialog.Open();
IntrinsicsMod.Instance.ControlPanelDialog.Open();
};
this.ButtonOpenDialog.OnClick += ( evt, elem ) => {
IntrinsicsMod.Instance.IntrinsicsDialog.Open();
IntrinsicsMod.Instance.ControlPanelDialog.Open();
};

////
Expand Down Expand Up @@ -102,12 +102,12 @@ partial class IntrinsicsControlsUI : UIState {
public void UpdateLayout() {
var mymod = IntrinsicsMod.Instance;

int x = mymod.Config.ControlsPositionX >= 0 ?
mymod.Config.ControlsPositionX :
Main.screenWidth + mymod.Config.ControlsPositionX;
int y = mymod.Config.ControlsPositionY >= 0 ?
mymod.Config.ControlsPositionY :
Main.screenHeight + mymod.Config.ControlsPositionY;
int x = mymod.Config.ControlsPositionX >= 0
? mymod.Config.ControlsPositionX
: Main.screenWidth + mymod.Config.ControlsPositionX;
int y = mymod.Config.ControlsPositionY >= 0
? mymod.Config.ControlsPositionY
: Main.screenHeight + mymod.Config.ControlsPositionY;

this.Recalculate();

Expand Down
2 changes: 1 addition & 1 deletion Intrinsics/build.txt
@@ -1,6 +1,6 @@
author = hamstar
version = 1.1.3
displayName = Intrinsics
modReferences = HamstarHelpers@5.2.1
modReferences = HamstarHelpers@5.5.0
buildIgnore = *.csproj, *.user, *.bat, obj\*, bin\*, .vs\*, .git\*
homepage = https://forums.terraria.org/index.php?threads/intrinsics.80322/

0 comments on commit f7ec80d

Please sign in to comment.