diff --git a/src/en/wizden-staff/maintainer/hotfix-procedure.md b/src/en/wizden-staff/maintainer/hotfix-procedure.md index af854957c..bc9031c4c 100644 --- a/src/en/wizden-staff/maintainer/hotfix-procedure.md +++ b/src/en/wizden-staff/maintainer/hotfix-procedure.md @@ -4,10 +4,10 @@ Not following this procedure/policy will result in disiplinary action being take ## Requirements - **Three maintainers must *sign-off*** (Aproval is required, reviewing is reccommended but optional) on a hotfix PR for it to be merged. This can be bypassed in an emergency, for a critical fix. - The Hotfix procedure only applies to PRs being merged straight to "stable". **When merging bugfixes to master, this procedure does NOT apply, use the normal PR procedure instead!** -- All Hotfixes must adhere to the normal [PR Review Procedure](../maintainer/hotfix-procedure.md) in addition to any requirements listed here. +- All Hotfixes must adhere to the normal [PR Review Procedure](../maintainer/review-procedure.md) in addition to any requirements listed here. - Hotfixes must be tagged with the "Hotfix" and relevant department/game area tags. - Hotfixes are for fixing bugs only and not adding new content or minor balance adjustments. *If a balance issue is bad enough to majorly impact game quality, it should be considered a bug and is eligable for a hotfix. This is up to maintainer judgement, but if you are unsure it's recommended to create a discussion thread prefixed with "HOTFIX-PRNumber". ## Policy - Whether a PR should be classifed as a bug fix or not is up to the maintainers reviewing the PR. But in general, a bug fix adjusts existing content/code to fix an issue without dramatically changing the game or adding new content. -- Balancing changes are usually not bug fixes. A balancing change adjusts tuning values on a gameplay system/mechanic to change gameplay to be more in line with the intended experience. If the experience before the change is still playable then the balancing change is not a bug fix, however if the gameplay is *causing major issues for players/admins* then a balancing change can be considered as a bugfix in this case. \ No newline at end of file +- Balancing changes are usually not bug fixes. A balancing change adjusts tuning values on a gameplay system/mechanic to change gameplay to be more in line with the intended experience. If the experience before the change is still playable then the balancing change is not a bug fix, however if the gameplay is *causing major issues for players/admins* then a balancing change can be considered as a bugfix in this case. diff --git a/src/en/wizden-staff/maintainer/maintainer-policy.md b/src/en/wizden-staff/maintainer/maintainer-policy.md index 0c8358b25..2e27085d3 100644 --- a/src/en/wizden-staff/maintainer/maintainer-policy.md +++ b/src/en/wizden-staff/maintainer/maintainer-policy.md @@ -7,6 +7,6 @@ This policy applies in addition to the [General Staff](../staff-policy.md) and [ ## Reviews and Feedback - All maintainers must follow the [PR Review](../maintainer/review-procedure.md) and [Hotfix Procedures](../maintainer/hotfix-procedure.md) when they apply. - Maintainers should try to the best of their ability, to keep PR authors informed on the status of their PRs. -- Maintainers should keep public criticism of code *constructive* and avoid making comments in regards to the authors of the code. **Harsh but fair** citicism of code is *acceptable*, but criticism of it's author is not. +- Maintainers should keep public criticism of code *constructive* and avoid making comments in regards to the authors of the code. **Harsh but fair** citicism of code is *acceptable*, but criticism of its author is not. - Maintainers should try to perform code reviews *whenever possible*, getting content into the game is everyone's responsibility. - If there is a conflict around game design between something in the docs and someone's idea, what is detailed in the documentation takes precedent. If a change to specific documentation is needed, it should be brought up with the respective work group for discussion and changes should be made to the documentation if needed. diff --git a/src/en/wizden-staff/staff-policy.md b/src/en/wizden-staff/staff-policy.md index b45118bdc..e916ad2d5 100644 --- a/src/en/wizden-staff/staff-policy.md +++ b/src/en/wizden-staff/staff-policy.md @@ -19,7 +19,7 @@ This document aims to create a safe and healthy environment while fostering posi For conflicts specifically involving staff members (Maintainers, Art Directors, Project Managers, or Wizards), refer to the detailed Staff Conflict Resolution Policy. This document outlines the specific procedures for addressing staff conflicts, including immediate reporting, mediation, resolution options, and documentation. ## Policy Violations Members found in breach—such as through harassment, discrimination, or personal attacks—will face disciplinary actions ranging from warnings to removal from the project. All reports will be taken seriously and investigated promptly, ensuring fairness and confidentiality. Our goal is to maintain a positive environment where all members feel safe and valued. -Encouragement of Reporting +## Encouragement of Reporting We encourage all team members to promptly report any policy violations. It is essential to foster a culture of accountability where everyone feels safe to speak up. Reports can be made confidentially, and individuals who come forward will be protected against retaliation. ## Feedback Mechanism Members are encouraged to provide feedback on this policy to ensure it meets the project's needs. Suggestions for improvement can be submitted anonymously via forums or direct messages to HR members. The HR team will review regular feedback for necessary adjustments.