Skip to content

Add deploy while moving to Saboteur#21661

Merged
penev92 merged 1 commit into
OpenRA:bleedfrom
PunkPun:deploy
Dec 27, 2024
Merged

Add deploy while moving to Saboteur#21661
penev92 merged 1 commit into
OpenRA:bleedfrom
PunkPun:deploy

Conversation

@PunkPun

@PunkPun PunkPun commented Dec 2, 2024

Copy link
Copy Markdown
Member

Enabling cloak should not be interfering with the current actors activity

@PunkPun PunkPun added this to the Next Release milestone Dec 2, 2024
Comment thread OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeployWithCharge.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeployWithCharge.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeployWithCharge.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
Comment thread OpenRA.Mods.Common/Traits/Conditions/ToggleChargedConditionOnOrder.cs Outdated
public readonly bool CanCancelCondition = false;

[Desc("Should we interrupt the current activity and wait for it to finish?")]
public readonly bool CancelsCurrentOrders = false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the use case of this flag? We have GrantConditionOnDeploy for things that "deploy" (i.e. cancel current orders). It would be better to keep the "OnDeploy" terminology for that use case and keep this trait separate.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grant condition on deploy doesn't do charge, the usecase is the general flexibility conditions allow to modders. The condition may trigger something that needs the unit to be stationary

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Charge-vs-not and Deploy-vs-activate are orthogonal features. The timed-condition-on-deploy feature should be either a feature of GrantConditionOnDeploy or a separate GrantChargedConditionOnDeploy trait.

Comment thread OpenRA.Mods.Common/Traits/Conditions/GrantChargedConditionOnToggle.cs Outdated
[Desc("Allow deploying on specified charge to grant a condition for a specified duration.")]
public class GrantConditionOnDeployWithChargeInfo : PausableConditionalTraitInfo, IRulesetLoaded
[Desc("Grant a condition via player orders for a specified amount of time.")]
public class GrantChargedConditionOnToggleInfo : PausableConditionalTraitInfo, IRulesetLoaded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses "Toggle" but most of the fields below use "Activat(ed|ion)". Can we standardise on Activation if this must have a suffix? (I still don't think it needs one.)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do use the name toggle for toggle actions

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤷
Screenshot 2024-12-21 at 15 54 05

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ToggleState

@PunkPun PunkPun force-pushed the deploy branch 2 times, most recently from 1f6f506 to ac4d6a7 Compare December 21, 2024 15:56
Comment thread OpenRA.Mods.Common/Traits/Conditions/GrantChargedConditionOnToggle.cs Outdated
[Desc("Can " + nameof(ActivatedCondition) + " be canceled turned off manually?")]
public readonly bool CanCancelCondition = false;

[Desc("Should we interrupt the current activity")]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"... if not queued" is an important bit of information here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it makes it more confusing, in the same way my addition was

Also allow deploying without cancelling current activity, and make saboteurs use it

@penev92 penev92 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The naming disagreements aside, thanks for the fix.

@penev92 penev92 merged commit 8b44782 into OpenRA:bleed Dec 27, 2024
@penev92

penev92 commented Dec 27, 2024

Copy link
Copy Markdown
Member

Changelog

Commit on prep-2411:
e0d893b

@PunkPun PunkPun deleted the deploy branch December 27, 2024 16:49
@Mailaender

Mailaender commented Jul 21, 2025

Copy link
Copy Markdown
Member

The commit message has a typo.

@PunkPun

PunkPun commented Jul 21, 2025

Copy link
Copy Markdown
Member Author

It's a merged PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants