rearrange feature specific modules into appropriate directories

gamemodes/irresistible/cnr/_cnr.pwn

@@ -18,16 +18,11 @@
 #include "irresistible\cnr\entrances.pwn"
 #include "irresistible\cnr\checkpoints.pwn"
 #include "irresistible\cnr\wanted_level.pwn"
+#include "irresistible\cnr\jobs.pwn"
+#include "irresistible\cnr\model_preview.pwn"
 
 // reliant on core definitions
 #include "irresistible\cnr\auth\_auth.pwn"
-#include "irresistible\cnr\vip\_vip.pwn"
-#include "irresistible\cnr\jobs.pwn"
-#include "irresistible\cnr\experience.pwn"
-#include "irresistible\cnr\ammunation.pwn"
-#include "irresistible\cnr\irresistibleguard.pwn"
-#include "irresistible\cnr\player_settings.pwn"
-#include "irresistible\cnr\model_preview.pwn"
 
 // discord feature
 #include "irresistible\cnr\discord\_discord.pwn"

gamemodes/irresistible/cnr/features/_features.pwn

@@ -7,7 +7,9 @@
 
 /* ** Includes ** */
 
+#include "irresistible\cnr\features\vip\_vip.pwn"
 #include "irresistible\cnr\features\player\_player.pwn"
+#include "irresistible\cnr\features\ammunation\_ammunation.pwn"
 #include "irresistible\cnr\features\stocks\_stocks.pwn"
 #include "irresistible\cnr\features\houses\_houses.pwn"
 #include "irresistible\cnr\features\vehicles\_vehicles.pwn"
@@ -24,6 +26,7 @@
 // #include "irresistible\cnr\features\eastereggs.pwn"
 
 // other
+#include "irresistible\cnr\features\ammunation.pwn"
 #include "irresistible\cnr\features\movie_mode.pwn"
 #include "irresistible\cnr\features\passive_mode.pwn"
 #include "irresistible\cnr\features\server_rules.pwn"

gamemodes/irresistible/cnr/features/ammunation/_ammunation.pwn

@@ -0,0 +1,9 @@
+/*
+ * Irresistible Gaming (c) 2018
+ * Developed by Lorenc
+ * Module: cnr\features\player\_player.pwn
+ * Purpose: encloses all ammu-nation/weapon dealing modules & components (cnr)
+ */
+
+/* ** Includes ** */
+#include "irresistible\cnr\features\ammunation\ammunation.pwn"

gamemodes/irresistible/cnr/features/player/_player.pwn

@@ -6,5 +6,8 @@
  */
 
 /* ** Includes ** */
+#include "irresistible\cnr\features\player\experience.pwn"
+#include "irresistible\cnr\features\player\player_settings.pwn"
+#include "irresistible\cnr\features\player\irresistibleguard.pwn"
 #include "irresistible\cnr\features\player\streaks.pwn"
 #include "irresistible\cnr\features\player\weapon_stats.pwn"

gamemodes/irresistible/cnr/features/player/experience.pwn

@@ -1,7 +1,7 @@
 /*
  * Irresistible Gaming (c) 2018
  * Developed by Lorenc
- * Module: cnr\experience.pwn
+ * Module: cnr\features\player\experience.pwn
  * Purpose: player experience system 2.0
  */
 

gamemodes/irresistible/cnr/features/vip/_vip.pwn

@@ -0,0 +1,12 @@
+/*
+ * Irresistible Gaming (c) 2018
+ * Developed by Lorenc
+ * Module: cnr\vip\_vip.pwn
+ * Purpose: encloses all vip modules & components (cnr)
+ */
+
+/* ** Includes ** */
+#include "irresistible\cnr\features\vip\coin_market.pwn"
+#include "irresistible\cnr\features\vip\coin_generation.pwn"
+#include "irresistible\cnr\features\vip\redeem_code.pwn"
+#include "irresistible\cnr\features\vip\player_market.pwn"

gamemodes/irresistible/cnr/features/vip/coin_market.pwn

@@ -753,4 +753,6 @@ static stock CheckPlayerVipExpiry( playerid )
         p_VIPWep2{ playerid } = 0;
         p_VIPWep3{ playerid } = 0;
 	}
-}
+}
+
+stock IsPlayerPlatinumVIP( playerid ) return p_VIPLevel[ playerid ] >= VIP_PLATINUM;

gamemodes/irresistible/cnr/jobs.pwn

@@ -76,7 +76,7 @@ CMD:playerjobs( playerid, params[ ] )
 
 /* ** Functions ** */
 stock IsPlayerJob( playerid, jobid ) {
-	return ( p_Job{ playerid } == jobid ) || ( p_VIPLevel[ playerid ] >= VIP_PLATINUM && p_VIPJob{ playerid } == jobid );
+	return ( p_Job{ playerid } == jobid ) || ( IsPlayerPlatinumVIP( playerid ) && p_VIPJob{ playerid } == jobid );
 }
 
 stock GetJobIDFromName( const job_name[ ] )

gamemodes/irresistible/cnr/vip/_vip.pwn

@@ -1,12 +0,0 @@
-/*
- * Irresistible Gaming (c) 2018
- * Developed by Lorenc
- * Module: cnr\vip\_vip.pwn
- * Purpose: encloses all vip modules & components (cnr)
- */
-
-/* ** Includes ** */
-#include "irresistible\cnr\vip\coin_market.pwn"
-#include "irresistible\cnr\vip\coin_generation.pwn"
-#include "irresistible\cnr\vip\redeem_code.pwn"
-#include "irresistible\cnr\vip\player_market.pwn"