Implement attacksets, skin config, weapon config, tier system, tweaks and fixes

.vscode/snippets.code-snippets

@@ -1,16 +1,16 @@
 {
-	"Add BFP comment": {
-		"prefix": ".BFP",
-		"body": "// BFP - ${0:description}",
-		"description": "Add `// BFP` comment"
+	"Add BFPR comment": {
+		"prefix": ".BFPR",
+		"body": "// BFPR - ${0:description}",
+		"description": "Add `// BFPR` comment"
 	},
 	"Com_Printf": {
 		"prefix": ".pr",
 		"body": "Com_Printf( \"${1:prop}: ${2:%d}\\n\", ${1:prop} );"
 	},
 	"Cmd Add Command": {
 		"prefix": ".cmd",
-		"body": "void Cmd_BFP_${1:functionName}_f( gentity_t* ent ) {\n\n}"
+		"body": "void Cmd_BFPR_${1:functionName}_f( gentity_t* ent ) {\n\n}"
 	},
 	"Declare cg_ cvar (use only in cgame/cg_cvar.h)": {
 		"prefix": ".CG_CVAR",

Makefile

@@ -398,7 +398,9 @@ CGOBJ_ = \
   $(B)/cgame/bg_misc.o \
   $(B)/cgame/bg_pmove.o \
   $(B)/cgame/bg_slidemove.o \
+  $(B)/cgame/bg_weaponconfig.o \
   $(B)/cgame/cg_consolecmds.o \
+  $(B)/cgame/cg_aura.o \
   $(B)/cgame/cg_draw.o \
   $(B)/cgame/cg_drawtools.o \
   $(B)/cgame/cg_effects.o \
@@ -413,6 +415,7 @@ CGOBJ_ = \
   $(B)/cgame/cg_predict.o \
   $(B)/cgame/cg_scoreboard.o \
   $(B)/cgame/cg_servercmds.o \
+  $(B)/cgame/cg_skinconfig.o \
   $(B)/cgame/cg_snapshot.o \
   $(B)/cgame/cg_trails.o \
   $(B)/cgame/cg_view.o \
@@ -445,6 +448,7 @@ QAOBJ_ = \
   $(B)/game/bg_misc.o \
   $(B)/game/bg_pmove.o \
   $(B)/game/bg_slidemove.o \
+  $(B)/game/bg_weaponconfig.o \
   $(B)/game/g_active.o \
   $(B)/game/g_arenas.o \
   $(B)/game/g_bot.o \
@@ -492,10 +496,8 @@ UIOBJ_ = \
   $(B)/ui/ui_display.o \
   $(B)/ui/ui_gameinfo.o \
   $(B)/ui/ui_ingame.o \
-  $(B)/ui/ui_mem.o \
   $(B)/ui/ui_menu.o \
   $(B)/ui/ui_mfield.o \
-  $(B)/ui/ui_mp3decoder.o \
   $(B)/ui/ui_network.o \
   $(B)/ui/ui_options.o \
   $(B)/ui/ui_playermodel.o \

MakefileQVM

@@ -57,7 +57,7 @@ ifndef DESTDIR
   DESTDIR = .
 endif
 
-PK3 = $(DESTDIR)/pak9.pk3
+PK3 = $(DESTDIR)/bfpr.pk3
 MOUNTDIR = source
 
 QADIR = $(MOUNTDIR)/game
@@ -78,7 +78,7 @@ UI_CFLAGS = -DQ3UI -I$(UIDIR)
 
 QA_SRC = \
  g_main $(QADIR)/g_syscalls.asm \
- bg_misc bg_lib bg_pmove bg_slidemove \
+ bg_misc bg_lib bg_pmove bg_slidemove bg_weaponconfig \
  q_math q_shared \
  ai_bfp ai_dmnet ai_dmq3 ai_team ai_main ai_chat ai_cmd ai_vcmd \
  g_active g_arenas g_bot g_client g_cmds g_combat g_items g_mem g_misc \
@@ -91,10 +91,10 @@ QA_SRC = \
 
 CG_SRC = \
  cg_main $(CGDIR)/cg_syscalls.asm \
- cg_consolecmds cg_draw cg_drawtools cg_effects cg_ents cg_event cg_info \
+ cg_aura cg_consolecmds cg_draw cg_drawtools cg_effects cg_ents cg_event cg_info \
  cg_localents cg_marks cg_particles cg_players cg_playerstate cg_predict cg_scoreboard \
- cg_servercmds cg_snapshot cg_trails cg_view cg_weapons \
- bg_slidemove bg_pmove bg_lib bg_misc \
+ cg_servercmds cg_skinconfig cg_snapshot cg_trails cg_view cg_weapons \
+ bg_weaponconfig bg_slidemove bg_pmove bg_lib bg_misc \
  q_math q_shared \
 
 #############################################################################
@@ -106,7 +106,6 @@ UI_SRC = \
  ui_cdkey ui_ingame ui_serverinfo ui_confirm ui_setup \
  bg_misc bg_lib \
  q_math q_shared \
- ui_mem ui_mp3decoder \
  ui_gameinfo ui_atoms ui_bfpoptions ui_connect ui_controls2 ui_demo2 ui_mfield \
  ui_credits ui_menu ui_options ui_display ui_sound ui_network ui_playermodel \
  ui_players ui_preferences ui_qmenu ui_servers2 ui_sparena \

build.bat

@@ -22,7 +22,7 @@ set NO_JTS=0
 rem If NO_MAP=1 is set, these directories and .map files won't be available if the operation compiled successfully
 set NO_MAP=1
 
-rem Remove binaries, intermediate and pak9.pk3 if these are already here to clean up
+rem Remove binaries, intermediate and bfpr.pk3 if these are already here to clean up
 if exist %~dp0\binaries\ (
   echo    The directory called binaries exists, removing...
   rd binaries /s /q
@@ -33,9 +33,9 @@ if exist %~dp0\intermediate\ (
  rd intermediate /q /s
 )
 
-if exist %~dp0\pak9.pk3 (
-  echo    pak9.pk3 exists, removing...
-  del pak9.pk3
+if exist %~dp0\bfpr.pk3 (
+  echo    bfpr.pk3 exists, removing...
+  del bfpr.pk3
 )
 
 @echo on
@@ -99,7 +99,7 @@ if %ERRORLEVEL% NEQ 0 (
 )
 
 @echo on
-..\tools\bin\7za.exe a -tzip ..\pak9.pk3 vm
+..\tools\bin\7za.exe a -tzip ..\bfpr.pk3 vm
 cd ..
 
 @echo off
@@ -124,15 +124,15 @@ if not "%1" == "" (
     echo.
     goto :quit
   )
-  if exist pak9.pk3 (
+  if exist bfpr.pk3 (
     echo.
-    move pak9.pk3 "%1"
-    echo    pak9.pk3 has been moved successfully!
+    move bfpr.pk3 "%1"
+    echo    bfpr.pk3 has been moved successfully!
     echo.
   ) else (
     echo.
     echo *************************************
-    echo    ERROR: pak9.pk3 doesn't exist
+    echo    ERROR: bfpr.pk3 doesn't exist
     echo *************************************
     echo.
   )