Updated file and code structure, store player wanted level

thecodeah · thecodeah · commit bdfe8b08ab66 · 2019-07-17T19:50:10.000+03:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,8 +23,6 @@ Modules that aren't main modules are called sub-modules. These modules must be n
 
 ## Code structure
 - Description of package or module
-- Internal Packages
-    - Internal packages are all packages from the game-mode itself that this package depends on.
 - External Packages
     - External packages are all non-game-mode packages (Includes, Plugins) that this package depends on.
 - Declarations
@@ -33,6 +31,8 @@ Modules that aren't main modules are called sub-modules. These modules must be n
         - `// Player variables`
     - There is a sub-section for NativeHook variables (PawnPlus).
         - `// Hooks`
+- Internal Packages
+    - Internal packages are all packages from the game-mode itself that this package depends on and vice versa.
 - API
     - This part contains code that’ll be used by other packages. 
     - All functions and forwards must be documented.
diff --git a/gamemodes/opencnr.pwn b/gamemodes/opencnr.pwn
@@ -52,8 +52,6 @@
 #include <player>
 #include <businesses>
 #include <vehicles>
-#include <knockout>
-#include <nametag>
 #include <airdrop>
 
 #if defined DEV_BUILD
diff --git a/gamemodes/opencnr/airdrop/airdrop.inc b/gamemodes/opencnr/airdrop/airdrop.inc
@@ -1,11 +1,5 @@
 // The airdrop package spawns and handles airdrops.
 
-// -
-// Internal Packages
-// -
-
-#include <anticheat>
-
 // -
 // External Packages
 // -
@@ -14,6 +8,12 @@
 #include <YSI\y_timers>
 #include <PickupEx>
 
+// -
+// Internal Packages
+// -
+
+#include <anticheat>
+
 // -
 // Declarations
 // -
diff --git a/gamemodes/opencnr/anticheat/anticheat-money.inc b/gamemodes/opencnr/anticheat/anticheat-money.inc
@@ -3,16 +3,16 @@
 // the players server-sided money.
 
 // -
-// Internal Packages
+// External Packages
 // -
 
-#include <player>
+#include <YSI\y_timers>
 
 // -
-// External Packages
+// Internal Packages
 // -
 
-#include <YSI\y_timers>
+#include <player>
 
 // -
 // API
diff --git a/gamemodes/opencnr/anticheat/anticheat-teleportation.inc b/gamemodes/opencnr/anticheat/anticheat-teleportation.inc
@@ -1,12 +1,6 @@
 // The teleporation module prevents unauthorized teleportation by checking the
 // players location and hooks the native position manipulation functions.
 
-// -
-// Internal Packages
-// -
-
-#include <utils>
-
 // -
 // External Packages
 // -
@@ -34,6 +28,12 @@ static bool:justTeleported[MAX_PLAYERS];
 static NativeHook:hookv_SetPlayerPos;
 static NativeHook:hookv_PutPlayerInVehicle;
 
+// -
+// Internal Packages
+// -
+
+#include <utils>
+
 // -
 // API
 // -
diff --git a/gamemodes/opencnr/businesses/businesses-clerks.inc b/gamemodes/opencnr/businesses/businesses-clerks.inc
@@ -2,12 +2,6 @@
 // and provides a callback which is called is called  when a player aims at a
 // clerk actor.
 
-// -
-// Internal Packages
-// -
-
-#include <portals>
-
 // -
 // Declarations
 // -
@@ -40,6 +34,12 @@ static bool:isActorClerk[MAX_ACTORS];
 // Player variables
 static playerAimAtClerkCooldown[MAX_PLAYERS];
 
+// -
+// Internal Packages
+// -
+
+#include <portals>
+
 // -
 // API
 // -
diff --git a/gamemodes/opencnr/businesses/businesses-robbery.inc b/gamemodes/opencnr/businesses/businesses-robbery.inc
@@ -1,12 +1,5 @@
 // The businesses-robbery module handles business robberies.
 
-// -
-// Internal Packages
-// -
-
-#include <anticheat>
-#include <roles>
-
 // -
 // External Packages
 // -
@@ -25,6 +18,13 @@ static playerRobbingBusiness[MAX_PLAYERS];
 static Float:robberyProgress[MAX_PLAYERS];
 static PlayerBar:playerRobberyProgressbar[MAX_PLAYERS];
 
+// -
+// Internal Packages
+// -
+
+#include <anticheat>
+#include <player-roles>
+
 // -
 // Internal
 // -
diff --git a/gamemodes/opencnr/businesses/businesses.inc b/gamemodes/opencnr/businesses/businesses.inc
@@ -2,14 +2,6 @@
 // clerk initialization and provides an API to retrieve information related
 // to businesses.
 
-// -
-// Internal Packages
-// -
-
-#include <anticheat>
-#include <storage>
-#include <portals>
-
 // -
 // External Packages
 // -
@@ -35,6 +27,12 @@ new Iterator:Business<MAX_BUSINESSES>;
 // Player variables
 static playerInBusiness[MAX_PLAYERS];
 
+// -
+// Internal Packages
+// -
+
+#include <portals>
+
 // -
 // API
 // -
diff --git a/gamemodes/opencnr/player-auth/player-auth-login.inc b/gamemodes/opencnr/player-auth/player-auth-login.inc
@@ -5,7 +5,6 @@
 // External Packages
 // -
 
-#include <storage>
 #include <easyDialog>
 #include <samp_bcrypt>
 
diff --git a/gamemodes/opencnr/player-auth/player-auth-registration.inc b/gamemodes/opencnr/player-auth/player-auth-registration.inc
@@ -5,7 +5,6 @@
 // External Packages
 // -
 
-#include <storage>
 #include <easyDialog>
 #include <samp_bcrypt>
 
diff --git a/gamemodes/opencnr/player-auth/player-auth.inc b/gamemodes/opencnr/player-auth/player-auth.inc
@@ -1,10 +1,4 @@
-// The player-auth packages handles user authentication.
-
-// -
-// Internal Packages
-// -
-
-#include <storage>
+// The player-auth packages handle user authentication.
 
 // -
 // Declarations
diff --git a/gamemodes/opencnr/player-class-selection/player-class-selection.inc b/gamemodes/opencnr/player-class-selection/player-class-selection.inc
@@ -1,18 +1,19 @@
-// The class-selection package is a dependency of the player-lifecycle package
-// and handles the class-selection flow.
+// The class-selection package is a dependency of the player package and handles
+// the class-selection flow.
 
 // -
-// Internal Packages
+// External Packages
 // -
 
-#include <player-auth>
-#include <roles>
+#include <YSI\y_timers>
 
 // -
-// External Packages
+// Internal Packages
 // -
 
-#include <YSI\y_timers>
+#include <player-roles>
+
+#include <player-auth>
 
 // -
 // Internal
@@ -52,11 +53,22 @@ hook OnPlayerSpawn(playerid)
 
 hook OnPlayerAuthenticated(playerid)
 {
-    PromptRoleSelection(playerid);
+    new wantedLevel = GetUserWantedLevel(db_handle, playerData[playerid][E_PLAYER_USER_ID]);
+    
+    if(wantedLevel > 0)
+    {
+        SetPlayerRole(playerid, PLAYER_ROLE_ROBBER);
+        SetPlayerWantedLevel(playerid, wantedLevel);
+    }
+    else
+    {
+        PromptRoleSelection(playerid);
+    }
+
     return 1;
 }
 
-hook OnPlayerSelectedRole(playerid, role)
+hook OnPlayerSetRole(playerid, role)
 {
     if(IsPlayerInAnyVehicle(playerid))
     {
diff --git a/gamemodes/opencnr/player-knockout/player-knockout.inc b/gamemodes/opencnr/player-knockout/player-knockout.inc
@@ -1,12 +1,6 @@
 // The knockout package puts the player in a knockout state when the player is
 // about to die and handles respawning.
 
-// -
-// Internal Packages
-// -
-
-#include <anticheat>
-
 // -
 // External Packages
 // -
diff --git a/gamemodes/opencnr/player-nametag/player-nametag.inc b/gamemodes/opencnr/player-nametag/player-nametag.inc
diff --git a/gamemodes/opencnr/player-prison/player-prison.inc b/gamemodes/opencnr/player-prison/player-prison.inc
@@ -5,9 +5,8 @@
 // Internal Packages
 // -
 
-#include <anticheat>
-#include <knockout>
-#include <roles>
+#include <player-knockout>
+#include <player-roles>
 
 // -
 // External Packages
diff --git a/gamemodes/opencnr/player-roles/player-roles-cops.inc b/gamemodes/opencnr/player-roles/player-roles-cops.inc
@@ -5,8 +5,8 @@
 // Internal Packages
 // -
 
-#include <knockout>
-#include <prison>
+#include <player-knockout>
+#include <player-prison>
 #include <utils>
 
 // -
@@ -50,7 +50,7 @@ stock IsPoliceVehicle(vehicleid)
 
 #include <YSI\y_hooks>
 
-hook OnPlayerSelectedRole(playerid, role)
+hook OnPlayerSetRole(playerid, role)
 {
     if(role == PLAYER_ROLE_COP)
     {
diff --git a/gamemodes/opencnr/player-roles/player-roles-robbers.inc b/gamemodes/opencnr/player-roles/player-roles-robbers.inc
@@ -64,7 +64,7 @@ public hookf_SetPlayerWantedLevel(playerid, level)
     return SetPlayerWantedLevel(playerid, level);
 }
 
-hook OnPlayerSelectedRole(playerid, role)
+hook OnPlayerSetRole(playerid, role)
 {
     if(role == PLAYER_ROLE_ROBBER)
     {
diff --git a/gamemodes/opencnr/player-roles/player-roles.inc b/gamemodes/opencnr/player-roles/player-roles.inc
@@ -1,18 +1,12 @@
 // roles serves the role-selection dialog and provides an API for retrieving
 // role-related information.
 
-// -
-// Internal Packages
-// -
-
-#include <knockout>
-#include <prison>
-
 // -
 // External Packages
 // -
 
 #include <Pawn.CMD>
+#include <easyDialog>
 
 // -
 // Declarations
@@ -28,13 +22,19 @@ enum /* Player Roles */
 static playerRole[MAX_PLAYERS];
 static lastRoleChange[MAX_PLAYERS];
 
+// -
+// Internal Packages
+// -
+
+#include <player-knockout>
+#include <player-prison>
+
 // -
 // API
 // -
 
-// OnPlayerSelectedRole is called when a player has selected a role from the
-// role-selection dialog.
-forward OnPlayerSelectedRole(playerid, role);
+// OnPlayerSetRole is called when a players role has been set by SetPlayerRole.
+forward OnPlayerSetRole(playerid, role);
 
 // PromptRoleSelection prompts the role/class selection dialog where the user
 // can select his role.
@@ -47,6 +47,15 @@ stock PromptRoleSelection(playerid)
     );
 }
 
+// SetPlayerRole sets the specified players role.
+stock SetPlayerRole(playerid, role)
+{
+    playerRole[playerid] = role;
+    lastRoleChange[playerid] = gettime();
+
+    CallLocalFunction("OnPlayerSetRole", "dd", playerid, role);
+}
+
 // GetPlayerRole returns the specified users role ID.
 stock GetPlayerRole(playerid)
 {
@@ -73,8 +82,8 @@ stock GetRolePlayerCount(roleID)
 // Internal
 // -
 
-#include "roles-cops"
-#include "roles-robbers"
+#include "player-roles-cops"
+#include "player-roles-robbers"
 #include <YSI\y_hooks>
 
 hook OnPlayerConnect(playerid)
@@ -100,10 +109,7 @@ Dialog:OnRoleDialog(playerid, response, listitem, inputtext[])
                     {
                         if(!IsPlayerArrested(playerid))
                         {
-                            playerRole[playerid] = listitem;
-                            lastRoleChange[playerid] = gettime();
-
-                            CallLocalFunction("OnPlayerSelectedRole", "dd", playerid, listitem);
+                            SetPlayerRole(playerid, listitem);
                         }
                         else
                         {
diff --git a/gamemodes/opencnr/player/player.inc b/gamemodes/opencnr/player/player.inc
diff --git a/gamemodes/opencnr/portals/portals.inc b/gamemodes/opencnr/portals/portals.inc
diff --git a/gamemodes/opencnr/storage/storage-users.inc b/gamemodes/opencnr/storage/storage-users.inc
diff --git a/pawn.json b/pawn.json
diff --git a/sql.sql b/sql.sql
