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

Punishes players who are not participating in the siege with war sick… #28

Merged
merged 38 commits into from
Jan 21, 2021

Conversation

ceeedric
Copy link
Contributor

@ceeedric ceeedric commented Jan 14, 2021

Description:

It has been a rule in most servers with siege war that you cannot be at a siege zone without a military rank or without being allied to either side, this is to ensure both sides are able to fight without having to worry about other players coming to troll as killing them has no award in siege points. This PR gives those trolls war sickness, which is a combination of potion effects that will make any player aware that they should not be at the siege zone or that they need to sort out their alliances or military ranks.

Players that do not want to participate in the siege but happen to live in the siege zone will receive a special type of war sickness which only includes Weakness V, this is to assure they actually dont participate as they deal no damage but they can still build in their own town


New Nodes/Commands/ConfigOptions:

2 Config options:
punish_non_siege_participants_in_siege_zone.enable_sickness - This is to toggle sickness on and off.
punish_non_siege_participants_in_siege_zone.seconds_warning - This is how long a player has to leave the siege zone before they get war sickness. No warning will be given if this is set to 0


Relevant Issue ticket:


  • [x ] I have tested this pull request for defects on a server.

By making this pull request, I represent that I have the right to waive copyright and related rights to my contribution, and agree that all copyright and related rights in my contributions are waived, and I acknowledge that the TownyAdvanced organization has the copyright to use and modify my contribution under the Towny License for perpetuity.

@ceeedric
Copy link
Contributor Author

This could probably be merged with the war sickness for peaceful players somehow. The only thing is that punishing peaceful players in a siege is not configurable and this is.

@LlmDl LlmDl added the enhancement New feature or request label Jan 14, 2021
@ceeedric ceeedric requested a review from LlmDl January 14, 2021 21:40
LlmDl
LlmDl previously approved these changes Jan 14, 2021
LlmDl
LlmDl previously approved these changes Jan 14, 2021
Copy link
Member

@LlmDl LlmDl left a comment

Choose a reason for hiding this comment

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

This has my okay, as long as Goosius feels this is a good addition to make, as he knows the gameplay better than I.

@Goosius1
Copy link
Collaborator

Goosius1 commented Jan 15, 2021

  • Yes I think this is good!, well done Ceeedric.
  • It may certainly suit some servers well and reduce trolling.
  • However there are a few downsides to enabling the setting because it would restrict the movements of {battlefield reporters, mercenaries, fighting nomads, fighting non-nation towns, secret allies, and unaligned explorers/visitors/traders who happen to be in the area}. Some servers may certainly be ok with these effects, others might not like them.
  • Thus do make the default config value in the code here to be "false"

Copy link
Collaborator

@Goosius1 Goosius1 left a comment

Choose a reason for hiding this comment

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

3 comments added, 2 to address

@LlmDl LlmDl added this to the 0.0.7 milestone Jan 15, 2021
Copy link
Collaborator

@Goosius1 Goosius1 left a comment

Choose a reason for hiding this comment

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

(as per previous comment)

@Goosius1
Copy link
Collaborator

Goosius1 commented Jan 20, 2021

  • This PR has 1 code code conflict now (just in english.yml)
  • Pls resolve


#War sickness
msg_you_received_war_sickness: '&cYou are not a participant of this siege and cannot be in the Siege Zone. Please leave to remove the war sickness. Common causes of war sickness: being in a peaceful town, not having a military rank or not being allied to either side.'
msg_you_will_get_sickness: '&c&cYou are not a participant of this siege and cannot be in the Siege Zone. Please leave or you will receive war sickness in %s seconds.'
Copy link
Collaborator

Choose a reason for hiding this comment

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

🚧
These two war sickness fields above should be moved to the bottom of the file, i.e. under the 'Added in 0.06' comment

Copy link
Collaborator

@Goosius1 Goosius1 left a comment

Choose a reason for hiding this comment

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

1 comment (very small standard change to english.yml)

msg_inventory_degrade_warning: '&4WARNING: &cSome of your gear is close to breaking due to inventory degradation.'
msg_swa_remove_siege_success: '&bSuccessfully removed siege.'
msg_war_siege_occupied_towns_cannot_surrender: '&cOccupied towns cannot surrender.'

Copy link
Collaborator

Choose a reason for hiding this comment

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

🚧
This file is showing a lot of changes in the "github pr files" view, even though your PR only adds 2 fields. This is generally risky to review. If at all possible, pls try to get ONLY these 2 fields showing up as the change. Perhaps grab a copy of the file from master, add the two fields, then replace the file in this branch.

Copy link
Collaborator

@Goosius1 Goosius1 left a comment

Choose a reason for hiding this comment

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

2 small comments

Copy link
Collaborator

@Goosius1 Goosius1 left a comment

Choose a reason for hiding this comment

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

✔️ Approved!

@Goosius1 Goosius1 merged commit 445b58b into TownyAdvanced:master Jan 21, 2021
@ceeedric ceeedric deleted the war_sickness branch January 21, 2021 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants