From d5ad82d457527a86e1d248c784521da1e3b91d79 Mon Sep 17 00:00:00 2001 From: Kelton Date: Sat, 17 Aug 2024 11:11:53 +0300 Subject: [PATCH] blacklist modifications + SI modifications --- docs/factions/department-rules.en.md | 4 ++-- docs/factions/department-rules.md | 4 ++-- docs/factions/gang-rules.en.md | 2 ++ docs/factions/gang-rules.md | 2 ++ docs/factions/peaceful-and-mixt-faction-rules.en.md | 2 ++ docs/factions/peaceful-and-mixt-faction-rules.md | 2 ++ docs/factions/peaceful/school-instructors.en.md | 4 ++-- docs/factions/peaceful/school-instructors.md | 8 ++++---- docs/leaders/leader-rules.en.md | 2 +- docs/leaders/leader-rules.md | 2 +- 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/docs/factions/department-rules.en.md b/docs/factions/department-rules.en.md index edc21a6..a7c4346 100644 --- a/docs/factions/department-rules.en.md +++ b/docs/factions/department-rules.en.md @@ -582,8 +582,8 @@ More serious matters: mockery, insults, links to insulting/vulgar songs, etc. ### Blacklist Warnings -- 1 warning: excessive severe insults towards a member or the faction, disruption of a member's duty, inappropriate DM/DB, kamikaze. -- 2 warnings: vulgar language, excessive DM/DB, excessive disruption of a member during their duty or activities, tampering with entrance tests alongside a 3-month ban. +- 1 warning: excessive severe insults towards a member or the faction, disruption of a member's duty. +- 2 warnings: vulgar language, excessive disruption of a member during their duty or activities, tampering with entrance tests alongside a 3-month ban. !!! example "Info note" Blacklisting will not be granted to departments for things that can be sanctioned with a wanted status.
diff --git a/docs/factions/department-rules.md b/docs/factions/department-rules.md index 9797290..898dee3 100644 --- a/docs/factions/department-rules.md +++ b/docs/factions/department-rules.md @@ -582,8 +582,8 @@ Lucruri mai serioase: bataie de joc, jigniri, linkuri cu melodii jignitoare/vulg ### Avertismente Blacklist -- 1 avertisment: jigniri grave, in exces la adresa membrului sau a factiunii, incurcarea membrului sa-si faca datoria, DM/DB aiurea, kamikaze. -- 2 avertismente: limbaj vulgar, DM/DB excesiv, deranj excesiv a membrului cand si face datoria sau la activitati, fraudarea testelor de intrare alaturi de o interdictie de 3 luni. +- 1 avertisment: jigniri grave, in exces la adresa membrului sau a factiunii, incurcarea membrului sa-si faca datoria. +- 2 avertismente: limbaj vulgar, deranj excesiv a membrului cand si face datoria sau la activitati, fraudarea testelor de intrare alaturi de o interdictie de 3 luni. !!! example "Nota informativa" Nu se va acorda blacklist la departamente pentru lucruri care se pot sanctiona cu wanted.
diff --git a/docs/factions/gang-rules.en.md b/docs/factions/gang-rules.en.md index e444e64..9e52d48 100644 --- a/docs/factions/gang-rules.en.md +++ b/docs/factions/gang-rules.en.md @@ -199,6 +199,8 @@ More serious matters: mockery, insults, links to insulting/vulgar songs, etc. 9.1.4 Players on the blacklist can be constantly killed [exception for departments] until they pay the blacklist fee, except in Safe Zones and during important activities such as events, markets, legal jobs, auctions, etc. +9.1.5 For DM/DB actions, a player can only be blacklisted if they have not already been sanctioned through [/emergency] or reported within the faction and punished for it, to avoid double penalization of players. (sanctions: Faction Warn for the first offense, Rank Down if it continues). + ### Blacklist Warnings - 1 warning: excessive severe insults towards a member or the faction, disruption of a member's duty, inappropriate DM/DB, kamikaze, /q on tie. diff --git a/docs/factions/gang-rules.md b/docs/factions/gang-rules.md index 698ff55..4499a42 100644 --- a/docs/factions/gang-rules.md +++ b/docs/factions/gang-rules.md @@ -199,6 +199,8 @@ Lucruri mai serioase: bataie de joc, jigniri, linkuri cu melodii jignitoare/vulg 9.1.4 Jucatorii aflati pe blacklist pot fi omorati constant [exceptie la departamente] pana cand platesc blacklistul, exceptand in Safe Zone si la activitati importante precum evenimente, targuri, joburi legale, licitatii etc. +9.1.5 Pentru actiunile de DM/DB jucatorul va putea fi pus pe blacklist doar daca acesta nu a fost deja sanctionat prin [/emergency] sau reclamat in cadrul factiunii si sanctionat pentru asta, pentru a evita sanctionarea dubla a jucatorilor. (sanctiuni: Faction Warn prima abatere, Rank Down daca continua). + ### Avertismente Blacklist - 1 avertisment: jigniri grave, in exces la adresa membrului sau a factiunii, incurcarea membrului sa-si faca datoria, DM/DB aiurea, kamikaze, /q on tie. diff --git a/docs/factions/peaceful-and-mixt-faction-rules.en.md b/docs/factions/peaceful-and-mixt-faction-rules.en.md index 8ad04e6..e863556 100644 --- a/docs/factions/peaceful-and-mixt-faction-rules.en.md +++ b/docs/factions/peaceful-and-mixt-faction-rules.en.md @@ -214,6 +214,8 @@ More serious matters: mockery, insults, links to insulting/vulgar songs, etc. 9.1.4 Players on the blacklist can be constantly killed [exception for departments] until they pay the blacklist fee, except in Safe Zones and during important activities such as events, markets, legal jobs, auctions, etc. +9.1.5 For DM/DB actions, a player can only be blacklisted if they have not already been sanctioned through [/emergency] or reported within the faction and punished for it, to avoid double penalization of players. (sanctions: Faction Warn for the first offense, Rank Down if it continues). + ### Blacklist Warnings - 1 warning: excessive severe insults towards a member or the faction, disruption of a member's duty, inappropriate DM/DB, kamikaze, /q on tie. diff --git a/docs/factions/peaceful-and-mixt-faction-rules.md b/docs/factions/peaceful-and-mixt-faction-rules.md index cdeb223..3214ed1 100644 --- a/docs/factions/peaceful-and-mixt-faction-rules.md +++ b/docs/factions/peaceful-and-mixt-faction-rules.md @@ -214,6 +214,8 @@ Lucruri mai serioase: bataie de joc, jigniri, linkuri cu melodii jignitoare/vulg 9.1.4 Jucatorii aflati pe blacklist pot fi omorati constant [exceptie la departamente] pana cand platesc blacklistul, exceptand in Safe Zone si la activitati importante precum evenimente, targuri, joburi legale, licitatii etc. +9.1.5 Pentru actiunile de DM/DB jucatorul va putea fi pus pe blacklist doar daca acesta nu a fost deja sanctionat prin [/emergency] sau reclamat in cadrul factiunii si sanctionat pentru asta, pentru a evita sanctionarea dubla a jucatorilor. (sanctiuni: Faction Warn prima abatere, Rank Down daca continua). + ### Avertismente Blacklist - 1 avertisment: jigniri grave, in exces la adresa membrului sau a factiunii, incurcarea membrului sa-si faca datoria, DM/DB aiurea, kamikaze, /q on tie. diff --git a/docs/factions/peaceful/school-instructors.en.md b/docs/factions/peaceful/school-instructors.en.md index 6bc410c..777d8c0 100644 --- a/docs/factions/peaceful/school-instructors.en.md +++ b/docs/factions/peaceful/school-instructors.en.md @@ -131,10 +131,10 @@ It is recommended to have as many screenshots as possible to demonstrate that yo 5.6 If the client fails the test, you must explain where they went wrong. You can advise them to check the forum topic [Testul Fiecarei Licente](https://forum.b-zone.ro/topic/246142--) to be better prepared in the future. -5.7 If the client is AFK, wait for them for 5 minutes and gather evidence in the meantime, and if they do not return in the game, you can postpone the license tests/command. +5.7 If the client is AFK, wait for them for 5 minutes and gather evidence in the meantime, and if they do not return in the game, you can fail the license tests / cancel the command. !!! example "Exemple" - Xulescu (ID) postpones the test for Weapon License (AFK). + Xulescu (ID) failed the test for Weapon License (AFK). 5.8 It is forbidden to steal clients. If you find a player on the street/CNN/etc., ask on [/sx] if anyone has accepted them (sanction: Faction Warn). diff --git a/docs/factions/peaceful/school-instructors.md b/docs/factions/peaceful/school-instructors.md index 245d83f..6d5824f 100644 --- a/docs/factions/peaceful/school-instructors.md +++ b/docs/factions/peaceful/school-instructors.md @@ -113,7 +113,7 @@ Este recomandat sa aveti cat mai multe poze pentru a putea demonstra ca ati sust !!! example "Exemple" Xulescu (367) la mine pentru toate licentele.
- Yulescu (102) la mine pentru Flying, Sailing, Weapon Licenses. + Yulescu (102) la mine pentru licentele de Flying, Sailing, Weapon Licenses. Cine nu respecta aceasta regula va fi sanctionat (sanctiune: Faction Warn). @@ -121,7 +121,7 @@ Este recomandat sa aveti cat mai multe poze pentru a putea demonstra ca ati sust !!! example "Exemple" Xulescu (257) la mine pentru toate licentele, Nivel 50+.
- Yulescu (341) la mine pentru Flying, Sailing, Weapon Licenses, Nivel 50+. + Yulescu (341) la mine pentru licentele de Flying, Sailing, Weapon Licenses, Nivel 50+. 5.3 Anuntati licentele cu numele lor complet si corect: Fishing, Sailing, Flying, Weapon, Materials Licenses. NU prescurtati, NU le anuntati in Romana (sanctiune: Faction Warn). @@ -131,10 +131,10 @@ Este recomandat sa aveti cat mai multe poze pentru a putea demonstra ca ati sust 5.6 Daca clientul pica testul trebuie sa ii explicati unde a gresit. Il puteti sfatui sa verifice pe forum topicul [Testul Fiecarei Licente](https://forum.b-zone.ro/topic/246142--) pentru a fi mai pregatit pe viitor. -5.7 In cazul in care clientul este AFK, il asteptati 5 minute si intre timp strangeti dovezi, iar daca nu revine in game puteti sa amanati testele de licente/comanda. +5.7 In cazul in care clientul este AFK, il asteptati 5 minute si intre timp strangeti dovezi, iar daca nu revine in game puteti sa ii picati testele de licente / anulati comanda. !!! example "Exemplu" - Xulescu (ID) amana testul pentru Weapon License (AFK). + Xulescu (ID) a picat testul pentru Weapon License (AFK). 5.8 Este interzis sa furati clienti. In cazul in care gasiti un jucator pe strada/CNN/etc., intrebati pe [/sx] daca l-a acceptat cineva (sanctiune: Faction Warn). diff --git a/docs/leaders/leader-rules.en.md b/docs/leaders/leader-rules.en.md index f0ff24e..29136fe 100644 --- a/docs/leaders/leader-rules.en.md +++ b/docs/leaders/leader-rules.en.md @@ -128,7 +128,7 @@ For example, if you promoted a subleader on October 1st, another one on October 4th, and another one on October 8th, the next date you can appoint another subleader is November 1st, the second one on November 4th, and the third one on November 8th. -2.1.3 Rules for choosing subleaders for peaceful factions, departments, hitmen: +2.1.3 Rules for choosing subleaders for peaceful factions, departments, mixt: - you have a maximum of one week from when you received the position to promote a single subleader from outside the faction (they must have a previous rank 3 in any faction in the past 2 years) or from among any of the faction members. - subsequent subleaders will only be promoted from within the faction among members of at least rank 3. diff --git a/docs/leaders/leader-rules.md b/docs/leaders/leader-rules.md index 5777bb6..32b46f2 100644 --- a/docs/leaders/leader-rules.md +++ b/docs/leaders/leader-rules.md @@ -129,7 +129,7 @@ mari de 5 zile. De exemplu, ai promovat un sublider pe 01.10, unul in data de 04.10 si unul in data de 08.10. Urmatoarea data cand poti acorda un alt sublider este 01.11, al doilea pe 04.11 si al treilea pe 08.11. -2.1.3 Reguli alegere sublideri pentru factiuni pasnice, departamente, hitmen: +2.1.3 Reguli alegere sublideri pentru factiuni pasnice, departamente, mixte: - aveti maxim o saptamana de cand ati primit functia sa promovati un singur sublider din afara factiunii (trebuie sa aiba un rank 3 anterior intr-o factiune in ultimii 2 ani de zile) sau oricare dintre membrii factiunii voastre. - urmatorii sublideri vor fi promovati numai din interiorul factiunii dintre membrii de minim rank 3.