Skip to content

Counter and Slider mode for Trigger Trigger #105

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
Und3rDragon wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Counter and Slider mode for Trigger Trigger #105

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion Code/TriggerTrigger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ public TriggerTrigger(EntityData data, Vector2 offset) : base(data, offset) {
absoluteValue = data.Bool("absoluteValue", false);

flag = data.Attr("flag", "");
counterName = data.Attr("counterName", "");
sliderName = data.Attr("sliderName", "");
counterValue = data.Attr("counterValue", "0");
sliderValue = data.Attr("sliderValue", "0");
deaths = data.Int("deaths", -1);
dashCount = data.Int("dashCount", 0);
requiredSpeed = data.Float("requiredSpeed", 0f);
Expand Down Expand Up @@ -263,6 +267,42 @@ public bool GetActivateCondition(Player player) {
case ActivationTypes.DashCount:
result = Compare(player.Dashes, dashCount);
break;
case ActivationTypes.Counter:
if (!string.IsNullOrEmpty(counterName))
{
if (!string.IsNullOrEmpty(counterValue))
{
if (int.TryParse(counterValue, out int n))
{
result = Compare(SceneAs<Level>().Session.GetCounter(counterName), n);
break;
}

result = Compare(SceneAs<Level>().Session.GetCounter(counterName),
SceneAs<Level>().Session.GetCounter(counterValue));
break;
}
}
result = false;
break;
case ActivationTypes.Slider:
if (!string.IsNullOrEmpty(sliderName))
{
if (!string.IsNullOrEmpty(sliderValue))
{
if (float.TryParse(sliderValue, out float m))
{
result = Compare(SceneAs<Level>().Session.GetSlider(sliderName), m);
break;
}

result = Compare(SceneAs<Level>().Session.GetSlider(sliderName),
SceneAs<Level>().Session.GetSlider(sliderValue));
break;
}
}
result = false;
break;
case ActivationTypes.DeathsInRoom:
result = Compare(SceneAs<Level>().Session.DeathsInCurrentLevel, deaths);
break;
Expand Down Expand Up @@ -608,7 +648,8 @@ public static void UpdateFreezeInput()
private Vector2[] nodes;
private bool oneUse;
public ActivationTypes activationType;
private string flag;
private string flag, counterName, sliderName;
private string counterValue, sliderValue;
private int deaths;
private int dashCount;
private float requiredSpeed;
Expand Down Expand Up @@ -663,6 +704,8 @@ public enum ActivationTypes {
OnInput,
OnGrounded,
OnPlayerState,
Counter,
Slider
};
public enum InputTypes {
Left,
Expand Down
2 changes: 2 additions & 0 deletions Loenn/lang/en_gb.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ triggers.vitellary/resetdoortrigger.placements.name.reset_door_trigger=Reset Doo
triggers.vitellary/timedfadetrigger.placements.name.timed_fade_trigger=Timed Fade Trigger
triggers.vitellary/triggertrigger.placements.name.coremode=Trigger Trigger (Core Mode)
triggers.vitellary/triggertrigger.placements.name.flag=Trigger Trigger (Flag)
triggers.vitellary/triggertrigger.placements.name.counter=Trigger Trigger (Counter)
triggers.vitellary/triggertrigger.placements.name.slider=Trigger Trigger (Slider)
triggers.vitellary/triggertrigger.placements.name.dashing=Trigger Trigger (Dashing)
triggers.vitellary/triggertrigger.placements.name.dashcount=Trigger Trigger (Dash Count)
triggers.vitellary/triggertrigger.placements.name.deathsinroom=Trigger Trigger (Deaths In Room)
Expand Down
18 changes: 18 additions & 0 deletions Loenn/triggers/trigger_trigger.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ local activationTypes = {
["On Input"] = "OnInput",
["Grounded"] = "OnGrounded",
["Player State"] = "OnPlayerState",
["Counter"] = "Counter",
["Slider"] = "Slider",
}

local comparisonTypes = {
Expand Down Expand Up @@ -97,6 +99,10 @@ function triggerTrigger.ignoredFields(entity)
"includeCoyote",
"includeWallJump",
"resetAfterJump",
"counterValue",
"sliderValue",
"counterName",
"sliderName",
}

local function doNotIgnore(value)
Expand Down Expand Up @@ -152,6 +158,14 @@ function triggerTrigger.ignoredFields(entity)
doNotIgnore("resetAfterJump")
elseif atype == "OnPlayerState" then
doNotIgnore("playerState")
elseif atype == "Counter" then
doNotIgnore("counterValue")
doNotIgnore("counterName")
iscomparison = true
elseif atype == "Slider" then
doNotIgnore("sliderName")
doNotIgnore("sliderValue")
iscomparison = true
end

if iscomparison then
Expand Down Expand Up @@ -197,6 +211,10 @@ for _, mode in pairs(activationTypes) do
includeCoyote = false,
includeWallJump = true,
resetAfterJump = false,
counterValue = "0",
sliderValue = "0.0",
counterName = "counter",
sliderName = "slider",
}
}
table.insert(triggerTrigger.placements, placement)
Expand Down