Added new weapon images and other icons. Game integrations now works well - gives basic game info such as the weapons in use, ammo, score etc. Many other fixes and changes. There exists code for graph integration, but I never finished them and thus they are hidden by default.

73 files changed, 290 insertions, 111 deletions

diff --git a/csgo_images.qrc b/csgo_images.qrc
index 7c4dd35..a5c0149 100644
--- a/csgo_images.qrc
+++ b/csgo_images.qrc
@@ -7,62 +7,6 @@
         <file>icons/CT.png</file>
         <file>icons/T.png</file>
     </qresource>
-    <qresource prefix="/weapons">
-        <file>weapons/ak47.png</file>
-        <file>weapons/aug.png</file>
-        <file>weapons/awp.png</file>
-        <file>weapons/bizon.png</file>
-        <file>weapons/cz75a.png</file>
-        <file>weapons/deagle.png</file>
-        <file>weapons/decoy.png</file>
-        <file>weapons/decoy_impact.png</file>
-        <file>weapons/elite.png</file>
-        <file>weapons/famas.png</file>
-        <file>weapons/fiveseven.png</file>
-        <file>weapons/flashbang.png</file>
-        <file>weapons/flashbang_impact.png</file>
-        <file>weapons/g3sg1.png</file>
-        <file>weapons/galil.png</file>
-        <file>weapons/glock.png</file>
-        <file>weapons/grenade.png</file>
-        <file>weapons/headshot.png</file>
-        <file>weapons/hegrenade.png</file>
-        <file>weapons/hegrenade_impact.png</file>
-        <file>weapons/hkp2000.png</file>
-        <file>weapons/incgreande.png</file>
-        <file>weapons/incgreande_impact.png</file>
-        <file>weapons/knife.png</file>
-        <file>weapons/m4a1.png</file>
-        <file>weapons/mac10.png</file>
-        <file>weapons/mag7.png</file>
-        <file>weapons/molotov.png</file>
-        <file>weapons/molotov_impact.png</file>
-        <file>weapons/mp7.png</file>
-        <file>weapons/mpn.png</file>
-        <file>weapons/negev.png</file>
-        <file>weapons/nova.png</file>
-        <file>weapons/p250.png</file>
-        <file>weapons/p90.png</file>
-        <file>weapons/penetrate.png</file>
-        <file>weapons/revenge.png</file>
-        <file>weapons/revolver.png</file>
-        <file>weapons/sawedoff.png</file>
-        <file>weapons/scar17.png</file>
-        <file>weapons/scar20.png</file>
-        <file>weapons/scout.png</file>
-        <file>weapons/sg550.png</file>
-        <file>weapons/sg552.png</file>
-        <file>weapons/sg556.png</file>
-        <file>weapons/smokegrenade.png</file>
-        <file>weapons/smokegrenade_impact.png</file>
-        <file>weapons/ssg08.png</file>
-        <file>weapons/taser.png</file>
-        <file>weapons/tec9.png</file>
-        <file>weapons/ump45.png</file>
-        <file>weapons/usp.png</file>
-        <file>weapons/xm1014.png</file>
-        <file>weapons/m249.png</file>
-    </qresource>
     <qresource prefix="/maps">
         <file>maps/ar_baggage.png</file>
         <file>maps/ar_monastery.png</file>
@@ -110,4 +54,73 @@
         <file>maps/images/de_train.png</file>
         <file>maps/images/de_vertigo.png</file>
     </qresource>
+    <qresource prefix="/weapons">
+        <file>weapons/weapon_ak47.png</file>
+        <file>weapons/weapon_aug.png</file>
+        <file>weapons/weapon_awp.png</file>
+        <file>weapons/weapon_bizon.png</file>
+        <file>weapons/weapon_c4.png</file>
+        <file>weapons/weapon_cz75a.png</file>
+        <file>weapons/weapon_deagle.png</file>
+        <file>weapons/weapon_decoy.png</file>
+        <file>weapons/weapon_decoy_impact.png</file>
+        <file>weapons/weapon_elite.png</file>
+        <file>weapons/weapon_famas.png</file>
+        <file>weapons/weapon_fiveseven.png</file>
+        <file>weapons/weapon_flashbang.png</file>
+        <file>weapons/weapon_flashbang_impact.png</file>
+        <file>weapons/weapon_g3sg1.png</file>
+        <file>weapons/weapon_galil.png</file>
+        <file>weapons/weapon_glock.png</file>
+        <file>weapons/weapon_grenade.png</file>
+        <file>weapons/weapon_headshot.png</file>
+        <file>weapons/weapon_hegrenade.png</file>
+        <file>weapons/weapon_hegrenade_impact.png</file>
+        <file>weapons/weapon_hkp2000.png</file>
+        <file>weapons/weapon_incgreande_impact.png</file>
+        <file>weapons/weapon_incgrenade.png</file>
+        <file>weapons/weapon_knife.png</file>
+        <file>weapons/weapon_knife_falchion.png</file>
+        <file>weapons/weapon_knife_flip.png</file>
+        <file>weapons/weapon_knife_gut.png</file>
+        <file>weapons/weapon_knife_push.png</file>
+        <file>weapons/weapon_knife_survival_bowie.png</file>
+        <file>weapons/weapon_knife_t.png</file>
+        <file>weapons/weapon_m249.png</file>
+        <file>weapons/weapon_m4a1.png</file>
+        <file>weapons/weapon_m4a1_silencer.png</file>
+        <file>weapons/weapon_m9_bayonet.png</file>
+        <file>weapons/weapon_mac10.png</file>
+        <file>weapons/weapon_mag7.png</file>
+        <file>weapons/weapon_molotov.png</file>
+        <file>weapons/weapon_molotov_impact.png</file>
+        <file>weapons/weapon_mp7.png</file>
+        <file>weapons/weapon_mp9.png</file>
+        <file>weapons/weapon_mpn.png</file>
+        <file>weapons/weapon_negev.png</file>
+        <file>weapons/weapon_nova.png</file>
+        <file>weapons/weapon_p250.png</file>
+        <file>weapons/weapon_p90.png</file>
+        <file>weapons/weapon_penetrate.png</file>
+        <file>weapons/weapon_revenge.png</file>
+        <file>weapons/weapon_revolver.png</file>
+        <file>weapons/weapon_sawedoff.png</file>
+        <file>weapons/weapon_scar17.png</file>
+        <file>weapons/weapon_scar20.png</file>
+        <file>weapons/weapon_scout.png</file>
+        <file>weapons/weapon_sg550.png</file>
+        <file>weapons/weapon_sg552.png</file>
+        <file>weapons/weapon_sg556.png</file>
+        <file>weapons/weapon_smokegrenade.png</file>
+        <file>weapons/weapon_smokegrenade_impact.png</file>
+        <file>weapons/weapon_ssg08.png</file>
+        <file>weapons/weapon_taser.png</file>
+        <file>weapons/weapon_tec9.png</file>
+        <file>weapons/weapon_ump45.png</file>
+        <file>weapons/weapon_usp.png</file>
+        <file>weapons/weapon_usp_silencer.png</file>
+        <file>weapons/weapon_xm1014.png</file>
+        <file>weapons/weapon_knife_karambit.png</file>
+        <file>weapons/weapon_knife_m9_bayonet.png</file>
+    </qresource>
 </RCC>
diff --git a/csgo_stats.pro.user b/csgo_stats.pro.user
index b44f029..cb5aa3b 100644
--- a/csgo_stats.pro.user
+++ b/csgo_stats.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.3, 2016-08-14T16:55:30. -->
+<!-- Written by QtCreator 4.0.3, 2016-08-21T13:40:08. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/game_integration_window.cpp b/game_integration_window.cpp
index b929b41..acb9eda 100644
--- a/game_integration_window.cpp
+++ b/game_integration_window.cpp
@@ -14,6 +14,12 @@ game_integration_window::game_integration_window(QWidget *parent) :
     ui->t_label->setTextFormat(Qt::RichText);
     ui->ct_label->setText("<center><img src=:/icons/icons/CT.png></center>");
     ui->t_label->setText("<center><img src=:/icons/icons/T.png></center>");
+    /* fill our weapon_labels with 8 labels */
+    for (int x = 0; x < 8; x++)
+    {
+        game.weapon_labels << new QLabel(this);
+        game.weapon_labels.at(x)->setTextFormat(Qt::RichText);
+    }
 }
 
 game_integration_window::~game_integration_window()
@@ -53,6 +59,16 @@ void game_integration_window::handle_data(QString data)
         game.stats_map = game.player_map["match_stats"].toMap();
         game.ct_score_map = game.map_map["team_ct"].toMap();
         game.t_score_map = game.map_map["team_t"].toMap();
+        game.weapon_1_map = game.weapon_map["weapon_0"].toMap();
+        game.weapon_2_map = game.weapon_map["weapon_1"].toMap();
+        game.weapon_3_map = game.weapon_map["weapon_2"].toMap();
+        game.weapon_4_map = game.weapon_map["weapon_3"].toMap();
+        game.weapon_5_map = game.weapon_map["weapon_4"].toMap();
+        game.weapon_6_map = game.weapon_map["weapon_5"].toMap();
+        game.weapon_7_map = game.weapon_map["weapon_6"].toMap();
+        game.weapon_8_map = game.weapon_map["weapon_7"].toMap();
+        game.weapon_9_map = game.weapon_map["weapon_8"].toMap();
+        game.weapon_10_map = game.weapon_map["weapon_9"].toMap();
         display_data();
     }
 }
@@ -78,13 +94,61 @@ void game_integration_window::display_data()
         if (game.current_team == "CT")
             ui->player_team_label->setText("Counter Terrorist");
     }
-    ui->player_name_label->setText("<font size = 15>" + game.player_map["name"].toString() + "</font>");
+    if (game.player_map["name"].toString().length() > 9) /* username too long */
+    {
+        ui->player_name_label->setText("<font size = 15>" + game.player_map["name"].toString().left(9) + "[...]</font>");
+    } else
+        ui->player_name_label->setText("<font size = 15>" + game.player_map["name"].toString() + "</font>");
     ui->player_score_label->setText("Score: " + game.stats_map["score"].toString());
     ui->ct_score_label->setText("<center>" + game.ct_score_map["score"].toString() + "</center>");
     ui->t_score_label->setText("<center>" + game.t_score_map["score"].toString() + "</center>");
     ui->round_number_label->setText("<center><font size = 10> Round <br />" + game.map_map["round"].toString() + "</font></center>");
     ui->kills_label->setText("Kills: " + game.stats_map["kills"].toString());
     ui->deaths_label->setText("Deaths: " + game.stats_map["deaths"].toString());
+    /* weapons */
+    /* TODO: find a better way? */
+    if (game.weapon_1_map["name"].toString() != "")
+        ui->weapon_1_label->setText("<img src=:/weapons/weapons/" + game.weapon_1_map["name"].toString() + ".png>");
+    else
+        ui->weapon_1_label->setText("");
+    if (game.weapon_2_map["name"].toString() != "")
+        ui->weapon_2_label->setText("<img src=:/weapons/weapons/" + game.weapon_2_map["name"].toString() + ".png><br />" + game.weapon_2_map["ammo_clip"].toString() + " " + game.weapon_2_map["ammo_reserve"].toString());
+    else
+        ui->weapon_2_label->setText("");
+    if (game.weapon_3_map["name"].toString() != "")
+        ui->weapon_3_label->setText("<img src=:/weapons/weapons/" + game.weapon_3_map["name"].toString() + ".png><br />" + game.weapon_3_map["ammo_clip"].toString() + " " + game.weapon_3_map["ammo_reserve"].toString());
+    else
+        ui->weapon_3_label->setText("");
+    if (game.weapon_4_map["name"].toString() != "")
+        ui->weapon_4_label->setText("<img src=:/weapons/weapons/" + game.weapon_4_map["name"].toString() + ".png><br />" + game.weapon_4_map["ammo_clip"].toString() + " " + game.weapon_4_map["ammo_reserve"].toString());
+    else
+        ui->weapon_4_label->setText("");
+    if (game.weapon_5_map["name"].toString() != "")
+        ui->weapon_5_label->setText("<img src=:/weapons/weapons/" + game.weapon_5_map["name"].toString() + ".png><br />" + game.weapon_5_map["ammo_clip"].toString() + " " + game.weapon_5_map["ammo_reserve"].toString());
+    else
+        ui->weapon_5_label->setText("");
+    if (game.weapon_6_map["name"].toString() != "")
+        ui->weapon_6_label->setText("<img src=:/weapons/weapons/" + game.weapon_6_map["name"].toString() + ".png><br />" + game.weapon_6_map["ammo_clip"].toString() + " " + game.weapon_6_map["ammo_reserve"].toString());
+    else
+        ui->weapon_6_label->setText("");
+    if (game.weapon_7_map["name"].toString() != "")
+        ui->weapon_7_label->setText("<img src=:/weapons/weapons/" + game.weapon_7_map["name"].toString() + ".png><br />" + game.weapon_7_map["ammo_clip"].toString() + " " + game.weapon_7_map["ammo_reserve"].toString());
+    else
+        ui->weapon_7_label->setText("");
+    if (game.weapon_8_map["name"].toString() != "")
+        ui->weapon_8_label->setText("<img src=:/weapons/weapons/" + game.weapon_8_map["name"].toString() + ".png><br />" + game.weapon_8_map["ammo_clip"].toString() + " " + game.weapon_8_map["ammo_reserve"].toString());
+    else
+        ui->weapon_8_label->setText("");
+    if (game.weapon_9_map["name"].toString() != "")
+        ui->weapon_9_label->setText("<img src=:/weapons/weapons/" + game.weapon_9_map["name"].toString() + ".png><br />" + game.weapon_9_map["ammo_clip"].toString() + " " + game.weapon_9_map["ammo_reserve"].toString());
+    else
+        ui->weapon_9_label->setText("");
+    if (game.weapon_10_map["name"].toString() != "")
+        ui->weapon_10_label->setText("<img src=:/weapons/weapons/" + game.weapon_10_map["name"].toString() + ".png><br />" + game.weapon_10_map["ammo_clip"].toString() + " " + game.weapon_10_map["ammo_reserve"].toString());
+    else
+        ui->weapon_10_label->setText("");
+
+
 }
 
 void game_integration_window::showEvent(QShowEvent *ev)
diff --git a/game_integration_window.h b/game_integration_window.h
index 80eae3e..cd0833f 100644
--- a/game_integration_window.h
+++ b/game_integration_window.h
@@ -8,6 +8,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QLabel>
 
 namespace Ui {
 class game_integration_window;
@@ -31,16 +32,27 @@ private:
         QJsonDocument json_doc;
         QJsonObject json_object;
         QVariantMap main_map;
-         QVariantMap map_map;
+        QVariantMap map_map;
         QVariantMap player_map;
         QVariantMap round_map;
         QVariantMap weapon_map;
         QVariantMap stats_map;
         QVariantMap ct_score_map;
         QVariantMap t_score_map;
+        QVariantMap weapon_1_map;
+        QVariantMap weapon_2_map;
+        QVariantMap weapon_3_map;
+        QVariantMap weapon_4_map;
+        QVariantMap weapon_5_map;
+        QVariantMap weapon_6_map;
+        QVariantMap weapon_7_map;
+        QVariantMap weapon_8_map;
+        QVariantMap weapon_9_map;
+        QVariantMap weapon_10_map;
         QString current_user_id;
         QString current_map;
         QString current_team;
+        QList<QLabel *> weapon_labels;
     } game;
 
 protected:
diff --git a/game_integration_window.ui b/game_integration_window.ui
index 07776a5..0212757 100644
--- a/game_integration_window.ui
+++ b/game_integration_window.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>426</width>
+    <height>457</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,44 +19,37 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QFormLayout" name="player_layout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="map_picture_label">
-       <property name="text">
-        <string>map_picture</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="1">
       <layout class="QFormLayout" name="player_info_layout">
-       <item row="0" column="0">
+       <item row="1" column="0">
         <widget class="QLabel" name="player_name_label">
          <property name="text">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;player_name&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="player_team_label">
          <property name="text">
           <string>player_team</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="player_score_label">
          <property name="text">
           <string>player_score</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="kills_label">
          <property name="text">
           <string>kills_count</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="deaths_label">
          <property name="text">
           <string>deaths_count</string>
@@ -65,6 +58,103 @@
        </item>
       </layout>
      </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="map_picture_label">
+       <property name="text">
+        <string>map_picture</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="weapons_label">
+     <property name="text">
+      <string>Weapons</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="weapons_layout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="weapon_1_label">
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="weapon_2_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QLabel" name="weapon_3_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QLabel" name="weapon_4_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="weapon_5_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="weapon_6_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLabel" name="weapon_7_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLabel" name="weapon_8_label">
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="weapon_9_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="weapon_10_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
diff --git a/stats_display_window.h b/stats_display_window.h
index 5da3bc9..aef88c3 100644
--- a/stats_display_window.h
+++ b/stats_display_window.h
@@ -63,53 +63,53 @@ private:
             {"de_nuke", ":/maps/maps/de_nuke.png", "", "", "", ""},
             {"de_train", ":/maps/maps/de_train.png", "", "", "", ""},
             {"de_lake", ":/maps/maps/de_lake.png", "", "", "", ""},
-            {"de_stmarc", ":/maps/maps/images/de_stmarc.png", "", "", "", ""},
+            {"de_stmarc", ":/maps/maps/de_stmarc.png", "", "", "", ""},
             {"de_safehouse", ":/maps/maps/de_safehouse.png", "" "", "" , ""},
             {"ar_baggage", ":/maps/maps/ar_baggage.png", "", "", "", ""},
-            {"ar_shoots", ":/maps/maps/images/ar_shoots.png", "", "", "", ""},
+            {"ar_shoots", ":/maps/maps/ar_shoots.png", "", "", "", ""},
             {"de_bank", ":/maps/maps/de_bank.png", "", "", "", ""},
-            {"ar_monas", ":/maps/maps/images/ar_monastery.png", "" "", "", ""},
-            {"de_vertigo", ":/maps/maps/images/de_vertigo.png", "", "", "", ""},
-            {"de_sugarcane", ":/maps/maps/images/de_sugarcane.png", "", "", "", ""},
+            {"ar_monas", ":/maps/maps/ar_monastery.png", "" "", "", ""},
+            {"de_vertigo", ":/maps/maps/de_vertigo.png", "", "", "", ""},
+            {"de_sugarcane", ":/maps/maps//de_sugarcane.png", "", "", "", ""},
             {"cs_militia", ":/maps/maps/cs_militia.png", "", "", "", ""},
         };
         QList<QLabel *> map_labels;
         QList<QLabel *> map_stat_labels;
         QString weapons[33][6] = {
         /*weapon name | image location | kills | shots | hits | ratio of hits to shots */
-            {"ak47", ":/weapons/weapons/ak47.png", "0", "0", "0", "0"},
-            {"awp", ":/weapons/weapons/awp.png", "0", "0", "0", "0"},
-            {"p90", ":/weapons/weapons/p90.png", "0", "0", "0", "0"},
-            {"deagle", ":/weapons/weapons/deagle.png", "0", "0", "0", "0"},
-            {"m4", ":/weapons/weapons/m4a1.png", "0", "0", "0", "0"},
-            {"knife", ":/weapons/weapons/knife.png", "0", "0", "0", "0"},
-            {"fiveseven", ":/weapons/weapons/fiveseven.png", "0", "0", "0", "0"},
-            {"hkp2000", ":/weapons/weapons/hkp2000.png", "0", "0", "0", "0"},
-            {"glock", ":/weapons/weapons/glock.png", "0", "0", "0", "0"},
-            {"p250", ":/weapons/weapons/p250.png", "0", "0", "0", "0"},
-            {"mp7", ":/weapons/weapons/mp7.png", "0", "0", "0", "0"},
-            {"galil", ":/weapons/weapons/galil.png", "0", "0", "0", "0"},
-            {"ump45", ":/weapons/weapons/ump45.png", "0", "0", "0", "0"},
-            {"tec9", ":/weapons/weapons/tec9.png", "0", "0", "0", "0"},
-            {"negev", ":/weapons/weapons/negev.png", "0", "0", "0", "0"},
-            {"m249", ":/weapons/weapons/m249.png", "0", "0", "0", "0"},
-            {"g3sg1", ":/weapons/weapons/g3sg1.png", "0", "0", "0", "0"},
-            {"scar20", ":/weapons/weapons/scar20.png", "0", "0", "0", "0"},
-            {"aug", ":/weapons/weapons/aug.png", "0", "0", "0", "0"},
-            {"sg556", ":/weapons/weapons/sg556.png", "0", "0", "0", "0"},
-            {"nova", ":/weapons/weapons/nova.png", "0", "0", "0", "0"},
-            {"sawedoff", ":/weapons/weapons/sawedoff.png", "0", "0", "0", "0"},
-            {"xm1014", ":/weapons/weapons/xm1014.png", "0", "0", "0", "0"},
-            {"mag7", ":/weapons/weapons/mag7.png", "0", "0", "0", "0"},
-            {"mp9", ":/weapons/weapons/mpn.png", "0", "0", "0", "0"},
-            {"ssg08", ":/weapons/weapons/ssg08.png", "0", "0", "0", "0"},
-            {"bizon", ":/weapons/weapons/bizon.png", "0", "0", "0", "0"},
-            {"mac10", ":/weapons/weapons/mac10.png", "0", "0", "0", "0"},
-            {"famas", ":/weapons/weapons/famas.png", "0", "0", "0", "0"},
-            {"hegrenade", ":/weapons/weapons/hegrenade.png", "0", "0", "0", "0"},
-            {"elite", ":/weapons/weapons/elite.png", "0", "0", "0", "0"},
-            {"taser", ":/weapons/weapons/taser.png", "0", "0", "0", "0"},
-            {"molotov", ":/weapons/weapons/molotov.png", "0", "0", "0", "0"},
+            {"ak47", ":/weapons/weapons/weapon_ak47.png", "0", "0", "0", "0"},
+            {"awp", ":/weapons/weapons/weapon_awp.png", "0", "0", "0", "0"},
+            {"p90", ":/weapons/weapons/weapon_p90.png", "0", "0", "0", "0"},
+            {"deagle", ":/weapons/weapons/weapon_deagle.png", "0", "0", "0", "0"},
+            {"m4", ":/weapons/weapons/weapon_m4a1.png", "0", "0", "0", "0"},
+            {"knife", ":/weapons/weapons/weapon_knife.png", "0", "0", "0", "0"},
+            {"fiveseven", ":/weapons/weapons/weapon_fiveseven.png", "0", "0", "0", "0"},
+            {"hkp2000", ":/weapons/weapons/weapon_hkp2000.png", "0", "0", "0", "0"},
+            {"glock", ":/weapons/weapons/weapon_glock.png", "0", "0", "0", "0"},
+            {"p250", ":/weapons/weapons/weapon_p250.png", "0", "0", "0", "0"},
+            {"mp7", ":/weapons/weapons/weapon_mp7.png", "0", "0", "0", "0"},
+            {"galil", ":/weapons/weapons/weapon_galil.png", "0", "0", "0", "0"},
+            {"ump45", ":/weapons/weapons/weapon_ump45.png", "0", "0", "0", "0"},
+            {"tec9", ":/weapons/weapons/weapon_tec9.png", "0", "0", "0", "0"},
+            {"negev", ":/weapons/weapons/weapon_negev.png", "0", "0", "0", "0"},
+            {"m249", ":/weapons/weapons/weapon_m249.png", "0", "0", "0", "0"},
+            {"g3sg1", ":/weapons/weapons/weapon_g3sg1.png", "0", "0", "0", "0"},
+            {"scar20", ":/weapons/weapons/weapon_scar20.png", "0", "0", "0", "0"},
+            {"aug", ":/weapons/weapons/weapon_aug.png", "0", "0", "0", "0"},
+            {"sg556", ":/weapons/weapons/weapon_sg556.png", "0", "0", "0", "0"},
+            {"nova", ":/weapons/weapons/weapon_nova.png", "0", "0", "0", "0"},
+            {"sawedoff", ":/weapons/weapons/weapon_sawedoff.png", "0", "0", "0", "0"},
+            {"xm1014", ":/weapons/weapons/weapon_xm1014.png", "0", "0", "0", "0"},
+            {"mag7", ":/weapons/weapons/weapon_mag7.png", "0", "0", "0", "0"},
+            {"mp9", ":/weapons/weapons/weapon_mpn.png", "0", "0", "0", "0"},
+            {"ssg08", ":/weapons/weapons/weapon_ssg08.png", "0", "0", "0", "0"},
+            {"bizon", ":/weapons/weapons/weapon_bizon.png", "0", "0", "0", "0"},
+            {"mac10", ":/weapons/weapons/weapon_mac10.png", "0", "0", "0", "0"},
+            {"famas", ":/weapons/weapons/weapon_famas.png", "0", "0", "0", "0"},
+            {"hegrenade", ":/weapons/weapons/weapon_hegrenade.png", "0", "0", "0", "0"},
+            {"elite", ":/weapons/weapons/weapon_elite.png", "0", "0", "0", "0"},
+            {"taser", ":/weapons/weapons/weapon_taser.png", "0", "0", "0", "0"},
+            {"molotov", ":/weapons/weapons/weapon_molotov.png", "0", "0", "0", "0"},
         };
         QList<QLabel *> weapon_labels;
         QList<QLabel *> stat_labels;
diff --git a/weapons/ak47.png b/weapons/weapon_ak47.png
index 9c95e48..9c95e48 100644
--- a/weapons/ak47.png
+++ b/weapons/weapon_ak47.png
diff --git a/weapons/aug.png b/weapons/weapon_aug.png
index b6e5be2..b6e5be2 100644
--- a/weapons/aug.png
+++ b/weapons/weapon_aug.png
diff --git a/weapons/awp.png b/weapons/weapon_awp.png
index b61853c..b61853c 100644
--- a/weapons/awp.png
+++ b/weapons/weapon_awp.png
diff --git a/weapons/bizon.png b/weapons/weapon_bizon.png
index f0bbc7d..f0bbc7d 100644
--- a/weapons/bizon.png
+++ b/weapons/weapon_bizon.png
diff --git a/weapons/weapon_c4.png b/weapons/weapon_c4.png
new file mode 100644
index 0000000..94be707
--- /dev/null
+++ b/weapons/weapon_c4.png
diff --git a/weapons/cz75a.png b/weapons/weapon_cz75a.png
index d5a8ba9..d5a8ba9 100644
--- a/weapons/cz75a.png
+++ b/weapons/weapon_cz75a.png
diff --git a/weapons/deagle.png b/weapons/weapon_deagle.png
index 91cc1cd..91cc1cd 100644
--- a/weapons/deagle.png
+++ b/weapons/weapon_deagle.png
diff --git a/weapons/decoy.png b/weapons/weapon_decoy.png
index 78077ef..78077ef 100644
--- a/weapons/decoy.png
+++ b/weapons/weapon_decoy.png
diff --git a/weapons/decoy_impact.png b/weapons/weapon_decoy_impact.png
index dd58723..dd58723 100644
--- a/weapons/decoy_impact.png
+++ b/weapons/weapon_decoy_impact.png
diff --git a/weapons/elite.png b/weapons/weapon_elite.png
index b7752e3..b7752e3 100644
--- a/weapons/elite.png
+++ b/weapons/weapon_elite.png
diff --git a/weapons/famas.png b/weapons/weapon_famas.png
index 0881cf2..0881cf2 100644
--- a/weapons/famas.png
+++ b/weapons/weapon_famas.png
diff --git a/weapons/fiveseven.png b/weapons/weapon_fiveseven.png
index 1a56666..1a56666 100644
--- a/weapons/fiveseven.png
+++ b/weapons/weapon_fiveseven.png
diff --git a/weapons/flashbang.png b/weapons/weapon_flashbang.png
index b8439ce..b8439ce 100644
--- a/weapons/flashbang.png
+++ b/weapons/weapon_flashbang.png
diff --git a/weapons/flashbang_impact.png b/weapons/weapon_flashbang_impact.png
index dd58723..dd58723 100644
--- a/weapons/flashbang_impact.png
+++ b/weapons/weapon_flashbang_impact.png
diff --git a/weapons/g3sg1.png b/weapons/weapon_g3sg1.png
index 1e28143..1e28143 100644
--- a/weapons/g3sg1.png
+++ b/weapons/weapon_g3sg1.png
diff --git a/weapons/galil.png b/weapons/weapon_galil.png
index e45807f..e45807f 100644
--- a/weapons/galil.png
+++ b/weapons/weapon_galil.png
diff --git a/weapons/glock.png b/weapons/weapon_glock.png
index fff7fc6..fff7fc6 100644
--- a/weapons/glock.png
+++ b/weapons/weapon_glock.png
diff --git a/weapons/grenade.png b/weapons/weapon_grenade.png
index 6b0fb26..6b0fb26 100644
--- a/weapons/grenade.png
+++ b/weapons/weapon_grenade.png
diff --git a/weapons/headshot.png b/weapons/weapon_headshot.png
index 38fc625..38fc625 100644
--- a/weapons/headshot.png
+++ b/weapons/weapon_headshot.png
diff --git a/weapons/hegrenade.png b/weapons/weapon_hegrenade.png
index f37d5de..f37d5de 100644
--- a/weapons/hegrenade.png
+++ b/weapons/weapon_hegrenade.png
diff --git a/weapons/hegrenade_impact.png b/weapons/weapon_hegrenade_impact.png
index 4c2793b..4c2793b 100644
--- a/weapons/hegrenade_impact.png
+++ b/weapons/weapon_hegrenade_impact.png
diff --git a/weapons/hkp2000.png b/weapons/weapon_hkp2000.png
index 43665ad..43665ad 100644
--- a/weapons/hkp2000.png
+++ b/weapons/weapon_hkp2000.png
diff --git a/weapons/incgreande_impact.png b/weapons/weapon_incgreande_impact.png
index 1ae4ad4..1ae4ad4 100644
--- a/weapons/incgreande_impact.png
+++ b/weapons/weapon_incgreande_impact.png
diff --git a/weapons/incgreande.png b/weapons/weapon_incgrenade.png
index 2aa1b07..2aa1b07 100644
--- a/weapons/incgreande.png
+++ b/weapons/weapon_incgrenade.png
diff --git a/weapons/knife.png b/weapons/weapon_knife.png
index 89a5743..89a5743 100644
--- a/weapons/knife.png
+++ b/weapons/weapon_knife.png
diff --git a/weapons/weapon_knife_falchion.png b/weapons/weapon_knife_falchion.png
new file mode 100644
index 0000000..fe54809
--- /dev/null
+++ b/weapons/weapon_knife_falchion.png
diff --git a/weapons/weapon_knife_flip.png b/weapons/weapon_knife_flip.png
new file mode 100644
index 0000000..051e44a
--- /dev/null
+++ b/weapons/weapon_knife_flip.png
diff --git a/weapons/weapon_knife_gut.png b/weapons/weapon_knife_gut.png
new file mode 100644
index 0000000..765a032
--- /dev/null
+++ b/weapons/weapon_knife_gut.png
diff --git a/weapons/weapon_knife_karambit.png b/weapons/weapon_knife_karambit.png
new file mode 100644
index 0000000..335bc1e
--- /dev/null
+++ b/weapons/weapon_knife_karambit.png
diff --git a/weapons/weapon_knife_m9_bayonet.png b/weapons/weapon_knife_m9_bayonet.png
new file mode 100644
index 0000000..8e7f725
--- /dev/null
+++ b/weapons/weapon_knife_m9_bayonet.png
diff --git a/weapons/weapon_knife_push.png b/weapons/weapon_knife_push.png
new file mode 100644
index 0000000..8695c1a
--- /dev/null
+++ b/weapons/weapon_knife_push.png
diff --git a/weapons/weapon_knife_survival_bowie.png b/weapons/weapon_knife_survival_bowie.png
new file mode 100644
index 0000000..1a6ab64
--- /dev/null
+++ b/weapons/weapon_knife_survival_bowie.png
diff --git a/weapons/weapon_knife_t.png b/weapons/weapon_knife_t.png
new file mode 100644
index 0000000..89a5743
--- /dev/null
+++ b/weapons/weapon_knife_t.png
diff --git a/weapons/m249.png b/weapons/weapon_m249.png
index 8939e6f..8939e6f 100644
--- a/weapons/m249.png
+++ b/weapons/weapon_m249.png
diff --git a/weapons/m4a1.png b/weapons/weapon_m4a1.png
index 700e301..700e301 100644
--- a/weapons/m4a1.png
+++ b/weapons/weapon_m4a1.png
diff --git a/weapons/weapon_m4a1_silencer.png b/weapons/weapon_m4a1_silencer.png
new file mode 100644
index 0000000..805b855
--- /dev/null
+++ b/weapons/weapon_m4a1_silencer.png
diff --git a/weapons/weapon_m9_bayonet.png b/weapons/weapon_m9_bayonet.png
new file mode 100644
index 0000000..8e7f725
--- /dev/null
+++ b/weapons/weapon_m9_bayonet.png
diff --git a/weapons/mac10.png b/weapons/weapon_mac10.png
index c862676..c862676 100644
--- a/weapons/mac10.png
+++ b/weapons/weapon_mac10.png
diff --git a/weapons/mag7.png b/weapons/weapon_mag7.png
index d88324b..d88324b 100644
--- a/weapons/mag7.png
+++ b/weapons/weapon_mag7.png
diff --git a/weapons/molotov.png b/weapons/weapon_molotov.png
index 983e33f..983e33f 100644
--- a/weapons/molotov.png
+++ b/weapons/weapon_molotov.png
diff --git a/weapons/molotov_impact.png b/weapons/weapon_molotov_impact.png
index 051a40e..051a40e 100644
--- a/weapons/molotov_impact.png
+++ b/weapons/weapon_molotov_impact.png
diff --git a/weapons/mp7.png b/weapons/weapon_mp7.png
index ef27b31..ef27b31 100644
--- a/weapons/mp7.png
+++ b/weapons/weapon_mp7.png
diff --git a/weapons/mpn.png b/weapons/weapon_mp9.png
index 908dcf7..908dcf7 100644
--- a/weapons/mpn.png
+++ b/weapons/weapon_mp9.png
diff --git a/weapons/weapon_mpn.png b/weapons/weapon_mpn.png
new file mode 100644
index 0000000..908dcf7
--- /dev/null
+++ b/weapons/weapon_mpn.png
diff --git a/weapons/negev.png b/weapons/weapon_negev.png
index 453f03d..453f03d 100644
--- a/weapons/negev.png
+++ b/weapons/weapon_negev.png
diff --git a/weapons/nova.png b/weapons/weapon_nova.png
index 0d3a0bb..0d3a0bb 100644
--- a/weapons/nova.png
+++ b/weapons/weapon_nova.png
diff --git a/weapons/p250.png b/weapons/weapon_p250.png
index a005908..a005908 100644
--- a/weapons/p250.png
+++ b/weapons/weapon_p250.png
diff --git a/weapons/p90.png b/weapons/weapon_p90.png
index 2b1d5d0..2b1d5d0 100644
--- a/weapons/p90.png
+++ b/weapons/weapon_p90.png
diff --git a/weapons/penetrate.png b/weapons/weapon_penetrate.png
index 5fc0073..5fc0073 100644
--- a/weapons/penetrate.png
+++ b/weapons/weapon_penetrate.png
diff --git a/weapons/revenge.png b/weapons/weapon_revenge.png
index f4618aa..f4618aa 100644
--- a/weapons/revenge.png
+++ b/weapons/weapon_revenge.png
diff --git a/weapons/revolver.png b/weapons/weapon_revolver.png
index b945557..b945557 100644
--- a/weapons/revolver.png
+++ b/weapons/weapon_revolver.png
diff --git a/weapons/sawedoff.png b/weapons/weapon_sawedoff.png
index 4285e61..4285e61 100644
--- a/weapons/sawedoff.png
+++ b/weapons/weapon_sawedoff.png
diff --git a/weapons/scar17.png b/weapons/weapon_scar17.png
index 3faf47d..3faf47d 100644
--- a/weapons/scar17.png
+++ b/weapons/weapon_scar17.png
diff --git a/weapons/scar20.png b/weapons/weapon_scar20.png
index c71ecac..c71ecac 100644
--- a/weapons/scar20.png
+++ b/weapons/weapon_scar20.png
diff --git a/weapons/scout.png b/weapons/weapon_scout.png
index 9437ebe..9437ebe 100644
--- a/weapons/scout.png
+++ b/weapons/weapon_scout.png
diff --git a/weapons/sg550.png b/weapons/weapon_sg550.png
index 65bcfc0..65bcfc0 100644
--- a/weapons/sg550.png
+++ b/weapons/weapon_sg550.png
diff --git a/weapons/sg552.png b/weapons/weapon_sg552.png
index 483ffac..483ffac 100644
--- a/weapons/sg552.png
+++ b/weapons/weapon_sg552.png
diff --git a/weapons/sg556.png b/weapons/weapon_sg556.png
index 0fcae10..0fcae10 100644
--- a/weapons/sg556.png
+++ b/weapons/weapon_sg556.png
diff --git a/weapons/smokegrenade.png b/weapons/weapon_smokegrenade.png
index ed12214..ed12214 100644
--- a/weapons/smokegrenade.png
+++ b/weapons/weapon_smokegrenade.png
diff --git a/weapons/smokegrenade_impact.png b/weapons/weapon_smokegrenade_impact.png
index 107687a..107687a 100644
--- a/weapons/smokegrenade_impact.png
+++ b/weapons/weapon_smokegrenade_impact.png
diff --git a/weapons/ssg08.png b/weapons/weapon_ssg08.png
index cae430a..cae430a 100644
--- a/weapons/ssg08.png
+++ b/weapons/weapon_ssg08.png
diff --git a/weapons/taser.png b/weapons/weapon_taser.png
index 64a4442..64a4442 100644
--- a/weapons/taser.png
+++ b/weapons/weapon_taser.png
diff --git a/weapons/tec9.png b/weapons/weapon_tec9.png
index e73e3e1..e73e3e1 100644
--- a/weapons/tec9.png
+++ b/weapons/weapon_tec9.png
diff --git a/weapons/ump45.png b/weapons/weapon_ump45.png
index 3075ad4..3075ad4 100644
--- a/weapons/ump45.png
+++ b/weapons/weapon_ump45.png
diff --git a/weapons/usp.png b/weapons/weapon_usp.png
index db7a44c..db7a44c 100644
--- a/weapons/usp.png
+++ b/weapons/weapon_usp.png
diff --git a/weapons/weapon_usp_silencer.png b/weapons/weapon_usp_silencer.png
new file mode 100644
index 0000000..e9e474f
--- /dev/null
+++ b/weapons/weapon_usp_silencer.png
diff --git a/weapons/xm1014.png b/weapons/weapon_xm1014.png
index 6dbe910..6dbe910 100644
--- a/weapons/xm1014.png
+++ b/weapons/weapon_xm1014.png