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.

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

Feature - Disband Other Factions #1617

Merged
merged 7 commits into from
Dec 16, 2022
Merged

Conversation

dmccoystephenson
Copy link
Member

@dmccoystephenson dmccoystephenson commented Nov 27, 2022

The changes in this PR allow players to disband other factions if they have permission.

closes #1613

@dmccoystephenson dmccoystephenson changed the base branch from main to develop November 27, 2022 21:13
@dmccoystephenson
Copy link
Member Author

French translations are required for the following:

CommandFactionDisbandOthersNoPermission=You don't have permission to disband other factions.
CommandFactionDisbandSpecifiedFactionNotFound=The specified faction wasn't found.

@dmccoystephenson dmccoystephenson marked this pull request as draft December 3, 2022 19:50
if (faction.members.size != 1) {
sender.sendMessage("$RED${plugin.language["CommandFactionDisbandFactionMustBeEmpty"]}")
return@Runnable
else {
Copy link
Member

Choose a reason for hiding this comment

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

This should be on the same line as the closing brace

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed!

return@Runnable
}

val nameOfFaction = args.joinToString(" ");
Copy link
Member

Choose a reason for hiding this comment

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

Needs update to onTabComplete to complete faction names

Copy link
Member Author

Choose a reason for hiding this comment

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

Added tab complete (used declare war tab complete).

@@ -1016,3 +1016,5 @@ FactionDisbandedZeroPowerNotificationBody=Your faction, {0}, was disbanded as it
Teleporting=Teleporting in {0} seconds...
TeleportationCancelled=Teleportation cancelled.
PowerIncreased=You feel stronger. Your power has increased by {0}.
CommandFactionDisbandOthersNoPermission=You don't have permission to disband other factions.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
CommandFactionDisbandOthersNoPermission=You don't have permission to disband other factions.
CommandFactionDisbandOthersNoPermission=You don''t have permission to disband other factions.

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed!

@@ -1016,3 +1016,5 @@ FactionDisbandedZeroPowerNotificationBody=Your faction, {0}, was disbanded as it
Teleporting=Teleporting in {0} seconds...
TeleportationCancelled=Teleportation cancelled.
PowerIncreased=You feel stronger. Your power has increased by {0}.
CommandFactionDisbandOthersNoPermission=You don't have permission to disband other factions.
CommandFactionDisbandSpecifiedFactionNotFound=The specified faction wasn't found.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
CommandFactionDisbandSpecifiedFactionNotFound=The specified faction wasn't found.
CommandFactionDisbandSpecifiedFactionNotFound=The specified faction wasn''t found.

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed!

@@ -1016,3 +1016,5 @@ FactionDisbandedZeroPowerNotificationBody=Your faction, {0}, was disbanded as it
Teleporting=Teleporting in {0} seconds...
TeleportationCancelled=Teleportation cancelled.
PowerIncreased=You feel stronger. Your power has increased by {0}.
CommandFactionDisbandOthersNoPermission=You don't have permission to disband other factions.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
CommandFactionDisbandOthersNoPermission=You don't have permission to disband other factions.
CommandFactionDisbandOthersNoPermission=You don''t have permission to disband other factions.

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed!

@@ -1016,3 +1016,5 @@ FactionDisbandedZeroPowerNotificationBody=Your faction, {0}, was disbanded as it
Teleporting=Teleporting in {0} seconds...
TeleportationCancelled=Teleportation cancelled.
PowerIncreased=You feel stronger. Your power has increased by {0}.
CommandFactionDisbandOthersNoPermission=You don't have permission to disband other factions.
CommandFactionDisbandSpecifiedFactionNotFound=The specified faction wasn't found.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
CommandFactionDisbandSpecifiedFactionNotFound=The specified faction wasn't found.
CommandFactionDisbandSpecifiedFactionNotFound=The specified faction wasn''t found.

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed!

@dmccoystephenson dmccoystephenson marked this pull request as ready for review December 15, 2022 05:54
@dmccoystephenson
Copy link
Member Author

This is ready for re-review @alyphen

@dmccoystephenson dmccoystephenson merged commit e5ba611 into develop Dec 16, 2022
@dmccoystephenson dmccoystephenson deleted the feature/disband-others branch December 16, 2022 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow /f disband to operate on a specified faction with permission
2 participants