Skip to content

Lingering Lava/Waterfall info and clickbox after user clicks (and other cleanups) #46

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

Open
LouisGameDev wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Lingering Lava/Waterfall info and clickbox after user clicks (and other cleanups) #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f31d4ca
minor: Moved TOOL_TICK_CYCLE into the Stage enum for cleanliness
LouisGameDev Nov 24, 2024
c4827ec
overlay3d:organize and clean up code flow
LouisGameDev Nov 25, 2024
08c1de5
rename:HeatActionStateMachine -> HeatChangerStateMachine
LouisGameDev Nov 25, 2024
11a442f
rename:actionname -> actionName
LouisGameDev Nov 25, 2024
340ef66
heat-changer: new "pending" state for when setup, but not ticked yet.
LouisGameDev Nov 25, 2024
894e9ee
heatchanger-statemachine: always call stop(), even when not idle. To …
LouisGameDev Nov 25, 2024
0bdb760
overlay3d:now draw overlay when statemachine is in pending state; req…
LouisGameDev Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,31 +307,32 @@ public void onMenuOptionClicked(MenuOptionClicked event)
}
}


// Could not find a varbit to capture, so capture the menu-option directly.
// start the HeatActionStateMachine when varbit begins to update in onVarbitChanged()
// start the HeatChangerStateMachine when varbit begins to update in onVarbitChanged()
if (event.getMenuOption().startsWith("Heat-preform"))
{
state.heatActionStateMachine.stop();
state.heatActionStateMachine.setup(false, true, "heats");
state.heatChangerStateMachine.stop();
state.heatChangerStateMachine.setup(false, true, "Heats");
}
else if (event.getMenuOption().startsWith("Dunk-preform"))
{
state.heatActionStateMachine.stop();
state.heatActionStateMachine.setup(true, true, "dunks");
state.heatChangerStateMachine.stop();
state.heatChangerStateMachine.setup(true, true, "Dunks");
}
else if (event.getMenuOption().startsWith("Cool-preform"))
{
state.heatActionStateMachine.stop();
state.heatActionStateMachine.setup(false, false, "cools");
state.heatChangerStateMachine.stop();
state.heatChangerStateMachine.setup(false, false, "Cools");
}
else if (event.getMenuOption().startsWith("Quench-preform"))
{
state.heatActionStateMachine.stop();
state.heatActionStateMachine.setup(true, false, "quenches");
state.heatChangerStateMachine.stop();
state.heatChangerStateMachine.setup(true, false, "Quenches");
}
else if (!state.heatActionStateMachine.isIdle()) // canceled heating/cooling, stop the heating state-machine
else // canceled heating/cooling, stop the heating state-machine
{
state.heatActionStateMachine.stop();
state.heatChangerStateMachine.stop();
}

});
Expand Down Expand Up @@ -395,24 +396,24 @@ public void onVarbitChanged(VarbitChanged event)
// sign check: num * num > 0 == same sign
if (delta != -1)
{
if (state.heatActionStateMachine.getActionname() != null)
if (state.heatChangerStateMachine.getActionName() != null)
{
// if the state-machine is idle, start it
if (state.heatActionStateMachine.isIdle())
if (state.heatChangerStateMachine.isIdle())
{
state.heatActionStateMachine.start(state, config, previousHeat);
state.heatChangerStateMachine.start(state, config, previousHeat);
}
state.heatActionStateMachine.onTick();
state.heatChangerStateMachine.onTick();
}

if (config.debugging())
{
client.addChatMessage(ChatMessageType.GAMEMESSAGE, "",
"Heat: <col=FF0000>" + event.getValue() + "</col>" +
"Delta: <col=00FFFF>" + delta + "</col> " +
"Heating Ticks: <col=00FFFF>" + state.heatActionStateMachine.heatingTicks + "</col>" +
" Cooling Ticks: <col=00FFFF>" + state.heatActionStateMachine.coolingTicks + "</col>" +
" Remaining Ticks: <col=00FFFF>" + state.heatActionStateMachine.getRemainingDuration(), "");
"Heating Ticks: <col=00FFFF>" + state.heatChangerStateMachine.heatingTicks + "</col>" +
" Cooling Ticks: <col=00FFFF>" + state.heatChangerStateMachine.coolingTicks + "</col>" +
" Remaining Ticks: <col=00FFFF>" + state.heatChangerStateMachine.getRemainingDuration(), "");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class EasyGiantsFoundryState
private final List<Stage> stages = new ArrayList<>();
private double heatRangeRatio = 0;

public final HeatActionStateMachine heatActionStateMachine = new HeatActionStateMachine();
public final HeatChangerStateMachine heatChangerStateMachine = new HeatChangerStateMachine();

public void reset()
{
Expand Down
Loading