Policy update from TMW2 Merge

6 files changed, 55 insertions, 3 deletions

diff --git a/policies/code-of-conduct.md b/policies/code-of-conduct.md
new file mode 100644
index 0000000..eb22bf6
--- /dev/null
+++ b/policies/code-of-conduct.md
@@ -0,0 +1,12 @@
+---
+name: Code of Conduct
+description: Staff Code of Conduct
+aliases: [coc, conduct]
+---
+
+# Code of Conduct
+
+- All contributors are welcome regardless of their background or convictions.
+- All humans can be mistaken and learn from their errors. Including staff.
+- We do believe in dialectics, discussions, arguments, proving one's case, patience, understanding and taking everything for what it is.
+
diff --git a/policies/constitution.md b/policies/constitution.md
index 3a96ac4..5521954 100644
--- a/policies/constitution.md
+++ b/policies/constitution.md
@@ -15,6 +15,7 @@ autoupdate:
 - The purpose of the TMWT is to make or delegate decisions regarding the running of The Mana World (TMW).
 - There are different scopes under TMWT's authority in order to balance and separate the projects responsibility and management.
 - TMWT understands that all members are here to help each other fulfil the common vision of making a Open Source 2D MMORPG.
+- TMWT may keep subprojects not directly related to the goal but which provide support or shares the same meta universe as The Mana World.
 - Someone can hold part or all of a role and not be a TMWT member, but they need to have the required knowledge or experience to fulfill that role.
 - To become a TMWT member, you need to gain in membership in the one of the following categories of contributors; Game Master, Server Admin, or Developer and must be approved by a majority of TMWT.
 - In the event that no TMWT members remain, but roles are fulfilled by non-TMWT members, those members may assume TMWT title to fulfill TMWT's duties to the best of their ability.
diff --git a/policies/game-rules.md b/policies/game-rules.md
index 26838a6..006b991 100644
--- a/policies/game-rules.md
+++ b/policies/game-rules.md
@@ -1,6 +1,6 @@
 ---
-name: Game Rules
-description: Rules observed in-game
+name: Legacy/Evolved Game Rules
+description: Rules observed in-game for Legacy and Evolved games
 aliases: [rules, game]
 
 autoupdate:
@@ -8,7 +8,7 @@ autoupdate:
   wiki: Game_Rules
 ---
 
-# Game Rules
+# Legacy/Evolved Game Rules
 
 ## 1. Do not AFK bot
 This means you are not allowed to perform any AFK (away from keyboard) activity, apart from standing idle.
diff --git a/policies/ml-game-rules.md b/policies/ml-game-rules.md
new file mode 100644
index 0000000..c1e1436
--- /dev/null
+++ b/policies/ml-game-rules.md
@@ -0,0 +1,34 @@
+---
+name: Moubootaur Legends Game Rules
+description: Rules observed in-game for Moubootaur games
+aliases: [mlrules, mlgame]
+
+autoupdate:
+  forums: {forum: 1, topic: 2922, post: 25061}
+  wiki: Moubootaur_Legends:Rules
+---
+
+# Moubootaur Legends Game Rules
+
+1. You must be at the computer to play. Using a bot **while at computer** will be tolerated.
+Failure to respond to other players and/or GMs in a timely manner will be viewed as unacceptable AFK botting.
+And you'll spend a night in the jail.
+2. Do not spam nor flood. This includes repeating yourself, or spamming an action (eg. trying to skip a dialog like a crazy clicker).
+3. Do not trade invalid items, or try to cheat on trades.
+4. Respect other players. This includes but is not limited to using offensive language in nicknames or chat, and begging items or favours to other players.
+5. The public chat is to be understood by everyone. Therefore, try to use english when possible.
+6. Do not create multi accounts. A person may only hold one account and as many chars as allowed by the server/client. Staff members with special privileges in-game may have a second account without those privileges.
+7. The use of real money for ingame items/experience/etc. is strictly prohibted, except by sponsoring.
+8. Admit when you're wrong. An early ruling may be given if you're caught lying, trying to fool or otherwise mislead a GM.
+9. Do not logout at Botcheck area or at Jail. We cannot unjail an offline player. If you believe you're right and was jailed in error, keep your ground and explain calmly what happened in Court House Forum. The staff will calmly analyse the situation. If you were jailed without guilt, an apology may be sent to you by ingame mail.
+10. Players found out to be exploiting bugs, intentionally or unknowingly, may be required to return any undue advantage obtained by it.
+
+
+---
+
+### Disclaimers
+
+- Please do not share your password with anyone. We are not responsible for account theft or similar types of scam. And try to use unique passwords for each account you create.
+- The rules are subject to change, a notice in game, on the forums and on IRC will be given every time there is a modification.
+- A ban on the account is a ban on the player/person unless otherwise specified. Any new or secondary accounts may be instantly banned for ban evasion upon recognition.
+- The Mana World is an entity of [SOFTWARE IN THE PUBLIC INTEREST, INC](https://www.spi-inc.org/corporate/certificate-of-incorporation/). and is subject to United States law. Anything illegal under the [U.S. Code](https://www.law.cornell.edu/uscode/text) is *de facto* illegal on The Mana World.
diff --git a/policies/privacy-policy.md b/policies/privacy-policy.md
index 6b21dd0..35f6f5f 100644
--- a/policies/privacy-policy.md
+++ b/policies/privacy-policy.md
@@ -195,6 +195,10 @@ encrypted in transit.
 Additionally, the game servers may or may not log the chat, which is deleted within
 a week, and the game servers also log other actions such as trade logs for a few
 months. Other logs, such as authentication logs, are kept for longer.
+Chat log is hashed to SHA256 before being saved on Moubootaur Legends only.
+
+The logs and game data may be used in an anonymous way for analytical purposes,
+such as identifying trends, bugs, unused content and improve the game in overall.
 
 Do note that game staff is subject to a different agreement than this privacy
 policy, as most administrative or moderation actions are logged and made available
diff --git a/policies/social-convention.md b/policies/social-convention.md
index 34e33fc..0029a78 100644
--- a/policies/social-convention.md
+++ b/policies/social-convention.md
@@ -21,3 +21,4 @@ These guidelines can be used by any MMO game.
 - Try to talk to someone before you send them a trade request, they may not be interested.
 - Keep potentially dangerous personal information private. Posting private and personal information in the wrong location can have serious consequences. Divulging too much information could give people with bad intentions valuable knowledge.
 - Always try to report game bugs and cases of abuse from other players, in most cases you are doing a favour to the community.
+- Staff is volunteering their free time to the game, they're not full time employees and gain nothing out of it. Therefore, treat them with respect.