Skip to content

Commit

Permalink
blacklist modifications + SI modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
KeltonMVP committed Aug 17, 2024
1 parent 2ce939e commit d5ad82d
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 12 deletions.
4 changes: 2 additions & 2 deletions docs/factions/department-rules.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,8 @@ More serious matters: mockery, insults, links to insulting/vulgar songs, etc.

### Blacklist Warnings

- <span style="color:orange;">1 warning:</span> excessive severe insults towards a member or the faction, disruption of a member's duty, inappropriate DM/DB, kamikaze.
- <span style="color:red;">2 warnings:</span> vulgar language, excessive DM/DB, excessive disruption of a member during their duty or activities, tampering with entrance tests alongside a 3-month ban.
- <span style="color:orange;">1 warning:</span> excessive severe insults towards a member or the faction, disruption of a member's duty.
- <span style="color:red;">2 warnings:</span> 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. </br>
Expand Down
4 changes: 2 additions & 2 deletions docs/factions/department-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,8 @@ Lucruri mai serioase: bataie de joc, jigniri, linkuri cu melodii jignitoare/vulg

### Avertismente Blacklist

- <span style="color:orange;">1 avertisment:</span> jigniri grave, in exces la adresa membrului sau a factiunii, incurcarea membrului sa-si faca datoria, DM/DB aiurea, kamikaze.
- <span style="color:red;">2 avertismente:</span> 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.
- <span style="color:orange;">1 avertisment:</span> jigniri grave, in exces la adresa membrului sau a factiunii, incurcarea membrului sa-si faca datoria.
- <span style="color:red;">2 avertismente:</span> 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.</br>
Expand Down
2 changes: 2 additions & 0 deletions docs/factions/gang-rules.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ More serious matters: mockery, insults, links to insulting/vulgar songs, etc.

<span style="color:var(--pink);">9.1.4</span> 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.

<span style="color:var(--pink);">9.1.5</span> For DM/DB actions, a player can only be blacklisted if they have not already been sanctioned through [<span style="color:var(--pink);">/emergency</span>] or reported within the faction and punished for it, to avoid double penalization of players. (<span style="color:red;">sanctions: Faction Warn for the first offense</span>, <span style="color:red;">Rank Down</span> if it continues).

### Blacklist Warnings

- <span style="color:orange;">1 warning:</span> excessive severe insults towards a member or the faction, disruption of a member's duty, inappropriate DM/DB, kamikaze, /q on tie.
Expand Down
2 changes: 2 additions & 0 deletions docs/factions/gang-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ Lucruri mai serioase: bataie de joc, jigniri, linkuri cu melodii jignitoare/vulg

<span style="color:var(--pink);">9.1.4</span> 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.

<span style="color:var(--pink);">9.1.5</span> Pentru actiunile de DM/DB jucatorul va putea fi pus pe blacklist doar daca acesta nu a fost deja sanctionat prin [<span style="color:var(--pink);">/emergency</span>] sau reclamat in cadrul factiunii si sanctionat pentru asta, pentru a evita sanctionarea dubla a jucatorilor. (<span style="color:red;">sanctiuni: Faction Warn prima</span> abatere, <span style="color:red;">Rank Down</span> daca continua).

### Avertismente Blacklist

- <span style="color:orange;">1 avertisment:</span> jigniri grave, in exces la adresa membrului sau a factiunii, incurcarea membrului sa-si faca datoria, DM/DB aiurea, kamikaze, /q on tie.
Expand Down
2 changes: 2 additions & 0 deletions docs/factions/peaceful-and-mixt-faction-rules.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ More serious matters: mockery, insults, links to insulting/vulgar songs, etc.

<span style="color:var(--pink);">9.1.4</span> 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.

<span style="color:var(--pink);">9.1.5</span> For DM/DB actions, a player can only be blacklisted if they have not already been sanctioned through [<span style="color:var(--pink);">/emergency</span>] or reported within the faction and punished for it, to avoid double penalization of players. (<span style="color:red;">sanctions: Faction Warn for the first offense</span>, <span style="color:red;">Rank Down</span> if it continues).

### Blacklist Warnings

- <span style="color:orange;">1 warning:</span> excessive severe insults towards a member or the faction, disruption of a member's duty, inappropriate DM/DB, kamikaze, /q on tie.
Expand Down
2 changes: 2 additions & 0 deletions docs/factions/peaceful-and-mixt-faction-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ Lucruri mai serioase: bataie de joc, jigniri, linkuri cu melodii jignitoare/vulg

<span style="color:var(--pink);">9.1.4</span> 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.

<span style="color:var(--pink);">9.1.5</span> Pentru actiunile de DM/DB jucatorul va putea fi pus pe blacklist doar daca acesta nu a fost deja sanctionat prin [<span style="color:var(--pink);">/emergency</span>] sau reclamat in cadrul factiunii si sanctionat pentru asta, pentru a evita sanctionarea dubla a jucatorilor. (<span style="color:red;">sanctiuni: Faction Warn prima</span> abatere, <span style="color:red;">Rank Down</span> daca continua).

### Avertismente Blacklist

- <span style="color:orange;">1 avertisment:</span> jigniri grave, in exces la adresa membrului sau a factiunii, incurcarea membrului sa-si faca datoria, DM/DB aiurea, kamikaze, /q on tie.
Expand Down
4 changes: 2 additions & 2 deletions docs/factions/peaceful/school-instructors.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ It is recommended to have as many screenshots as possible to demonstrate that yo

<span style="color:var(--pink);">5.6</span> 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.

<span style="color:var(--pink);">5.7</span> 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.
<span style="color:var(--pink);">5.7</span> 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).

<span style="color:var(--pink);">5.8</span> It is forbidden to steal clients. If you find a player on the street/CNN/etc., ask on [<span style="color:var(--pink);">/sx</span>] if anyone has accepted them (<span style="color:red;">sanction: Faction Warn</span>).

Expand Down
8 changes: 4 additions & 4 deletions docs/factions/peaceful/school-instructors.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ Este recomandat sa aveti cat mai multe poze pentru a putea demonstra ca ati sust

!!! example "Exemple"
Xulescu (367) la mine pentru toate licentele.<br/>
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 (<span style="color:red;">sanctiune: Faction Warn</span>).

<span style="color:var(--pink);">5.2</span> Cu jucatorii Level 50+ procedati in acest fel: cereti [<span style="color:var(--pink);">/requestlicenses</span>], ii intrebati ce licente vor si anuntati ca e la voi pentru acele licente, iar apoi ii dati [<span style="color:var(--pink);">/givelicense</span>] (<span style="color:red;">sanctiune: Avertisment Verbal</span> la prima abatere, <span style="color:red;">Faction Warn</span> la urmatoarea).

!!! example "Exemple"
Xulescu (257) la mine pentru toate licentele, Nivel 50+.<br/>
Yulescu (341) la mine pentru Flying, Sailing, Weapon Licenses, Nivel 50+.
Yulescu (341) la mine pentru licentele de Flying, Sailing, Weapon Licenses, Nivel 50+.

<span style="color:var(--pink);">5.3</span> Anuntati licentele cu numele lor complet si corect: Fishing, Sailing, Flying, Weapon, Materials Licenses. NU prescurtati, NU le anuntati in Romana (<span style="color:red;">sanctiune: Faction Warn</span>).

Expand All @@ -131,10 +131,10 @@ Este recomandat sa aveti cat mai multe poze pentru a putea demonstra ca ati sust

<span style="color:var(--pink);">5.6</span> 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.

<span style="color:var(--pink);">5.7</span> 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.
<span style="color:var(--pink);">5.7</span> 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).

<span style="color:var(--pink);">5.8</span> Este interzis sa furati clienti. In cazul in care gasiti un jucator pe strada/CNN/etc., intrebati pe [<span style="color:var(--pink);">/sx</span>] daca l-a acceptat cineva (<span style="color:red;">sanctiune: Faction Warn</span>).

Expand Down
2 changes: 1 addition & 1 deletion docs/leaders/leader-rules.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<span style="color:var(--pink);">2.1.3</span> Rules for choosing subleaders for <span style="color:orange;">peaceful factions, departments, hitmen:</span>
<span style="color:var(--pink);">2.1.3</span> Rules for choosing subleaders for <span style="color:orange;">peaceful factions, departments, mixt:</span>

- you have a maximum of one week from when you received the position to promote <span style="color:var(--pink);">a single subleader</span> 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.
Expand Down
2 changes: 1 addition & 1 deletion docs/leaders/leader-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<span style="color:var(--pink);">2.1.3</span> Reguli alegere sublideri pentru <span style="color:orange;">factiuni pasnice, departamente, hitmen:</span>
<span style="color:var(--pink);">2.1.3</span> Reguli alegere sublideri pentru <span style="color:orange;">factiuni pasnice, departamente, mixte:</span>

- aveti maxim o saptamana de cand ati primit functia sa promovati <span style="color:var(--pink);">un singur sublider</span> 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.
Expand Down

0 comments on commit d5ad82d

Please sign in to comment.