From e95216fbc47bfee926b518b468dccfe600351663 Mon Sep 17 00:00:00 2001 From: daniel-Jones Date: Mon, 22 Aug 2016 12:43:10 +0930 Subject: 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. --- csgo_images.qrc | 125 ++++++++++++++++++-------------- csgo_stats.pro.user | 2 +- game_integration_window.cpp | 66 ++++++++++++++++- game_integration_window.h | 14 +++- game_integration_window.ui | 118 ++++++++++++++++++++++++++---- stats_display_window.h | 76 +++++++++---------- weapons/ak47.png | Bin 899 -> 0 bytes weapons/aug.png | Bin 1060 -> 0 bytes weapons/awp.png | Bin 586 -> 0 bytes weapons/bizon.png | Bin 1599 -> 0 bytes weapons/cz75a.png | Bin 1637 -> 0 bytes weapons/deagle.png | Bin 645 -> 0 bytes weapons/decoy.png | Bin 980 -> 0 bytes weapons/decoy_impact.png | Bin 2198 -> 0 bytes weapons/elite.png | Bin 1001 -> 0 bytes weapons/famas.png | Bin 868 -> 0 bytes weapons/fiveseven.png | Bin 562 -> 0 bytes weapons/flashbang.png | Bin 1144 -> 0 bytes weapons/flashbang_impact.png | Bin 2198 -> 0 bytes weapons/g3sg1.png | Bin 966 -> 0 bytes weapons/galil.png | Bin 896 -> 0 bytes weapons/glock.png | Bin 606 -> 0 bytes weapons/grenade.png | Bin 756 -> 0 bytes weapons/headshot.png | Bin 753 -> 0 bytes weapons/hegrenade.png | Bin 821 -> 0 bytes weapons/hegrenade_impact.png | Bin 2094 -> 0 bytes weapons/hkp2000.png | Bin 846 -> 0 bytes weapons/incgreande.png | Bin 766 -> 0 bytes weapons/incgreande_impact.png | Bin 2441 -> 0 bytes weapons/knife.png | Bin 1129 -> 0 bytes weapons/m249.png | Bin 896 -> 0 bytes weapons/m4a1.png | Bin 1300 -> 0 bytes weapons/mac10.png | Bin 938 -> 0 bytes weapons/mag7.png | Bin 1009 -> 0 bytes weapons/molotov.png | Bin 646 -> 0 bytes weapons/molotov_impact.png | Bin 2258 -> 0 bytes weapons/mp7.png | Bin 996 -> 0 bytes weapons/mpn.png | Bin 1218 -> 0 bytes weapons/negev.png | Bin 1800 -> 0 bytes weapons/nova.png | Bin 2851 -> 0 bytes weapons/p250.png | Bin 841 -> 0 bytes weapons/p90.png | Bin 814 -> 0 bytes weapons/penetrate.png | Bin 867 -> 0 bytes weapons/revenge.png | Bin 1757 -> 0 bytes weapons/revolver.png | Bin 998 -> 0 bytes weapons/sawedoff.png | Bin 2396 -> 0 bytes weapons/scar17.png | Bin 1327 -> 0 bytes weapons/scar20.png | Bin 1750 -> 0 bytes weapons/scout.png | Bin 745 -> 0 bytes weapons/sg550.png | Bin 842 -> 0 bytes weapons/sg552.png | Bin 1019 -> 0 bytes weapons/sg556.png | Bin 1282 -> 0 bytes weapons/smokegrenade.png | Bin 589 -> 0 bytes weapons/smokegrenade_impact.png | Bin 2287 -> 0 bytes weapons/ssg08.png | Bin 1391 -> 0 bytes weapons/taser.png | Bin 1071 -> 0 bytes weapons/tec9.png | Bin 999 -> 0 bytes weapons/ump45.png | Bin 949 -> 0 bytes weapons/usp.png | Bin 1009 -> 0 bytes weapons/weapon_ak47.png | Bin 0 -> 899 bytes weapons/weapon_aug.png | Bin 0 -> 1060 bytes weapons/weapon_awp.png | Bin 0 -> 586 bytes weapons/weapon_bizon.png | Bin 0 -> 1599 bytes weapons/weapon_c4.png | Bin 0 -> 1629 bytes weapons/weapon_cz75a.png | Bin 0 -> 1637 bytes weapons/weapon_deagle.png | Bin 0 -> 645 bytes weapons/weapon_decoy.png | Bin 0 -> 980 bytes weapons/weapon_decoy_impact.png | Bin 0 -> 2198 bytes weapons/weapon_elite.png | Bin 0 -> 1001 bytes weapons/weapon_famas.png | Bin 0 -> 868 bytes weapons/weapon_fiveseven.png | Bin 0 -> 562 bytes weapons/weapon_flashbang.png | Bin 0 -> 1144 bytes weapons/weapon_flashbang_impact.png | Bin 0 -> 2198 bytes weapons/weapon_g3sg1.png | Bin 0 -> 966 bytes weapons/weapon_galil.png | Bin 0 -> 896 bytes weapons/weapon_glock.png | Bin 0 -> 606 bytes weapons/weapon_grenade.png | Bin 0 -> 756 bytes weapons/weapon_headshot.png | Bin 0 -> 753 bytes weapons/weapon_hegrenade.png | Bin 0 -> 821 bytes weapons/weapon_hegrenade_impact.png | Bin 0 -> 2094 bytes weapons/weapon_hkp2000.png | Bin 0 -> 846 bytes weapons/weapon_incgreande_impact.png | Bin 0 -> 2441 bytes weapons/weapon_incgrenade.png | Bin 0 -> 766 bytes weapons/weapon_knife.png | Bin 0 -> 1129 bytes weapons/weapon_knife_falchion.png | Bin 0 -> 1204 bytes weapons/weapon_knife_flip.png | Bin 0 -> 997 bytes weapons/weapon_knife_gut.png | Bin 0 -> 912 bytes weapons/weapon_knife_karambit.png | Bin 0 -> 883 bytes weapons/weapon_knife_m9_bayonet.png | Bin 0 -> 1109 bytes weapons/weapon_knife_push.png | Bin 0 -> 1965 bytes weapons/weapon_knife_survival_bowie.png | Bin 0 -> 1594 bytes weapons/weapon_knife_t.png | Bin 0 -> 1129 bytes weapons/weapon_m249.png | Bin 0 -> 896 bytes weapons/weapon_m4a1.png | Bin 0 -> 1300 bytes weapons/weapon_m4a1_silencer.png | Bin 0 -> 1779 bytes weapons/weapon_m9_bayonet.png | Bin 0 -> 1109 bytes weapons/weapon_mac10.png | Bin 0 -> 938 bytes weapons/weapon_mag7.png | Bin 0 -> 1009 bytes weapons/weapon_molotov.png | Bin 0 -> 646 bytes weapons/weapon_molotov_impact.png | Bin 0 -> 2258 bytes weapons/weapon_mp7.png | Bin 0 -> 996 bytes weapons/weapon_mp9.png | Bin 0 -> 1218 bytes weapons/weapon_mpn.png | Bin 0 -> 1218 bytes weapons/weapon_negev.png | Bin 0 -> 1800 bytes weapons/weapon_nova.png | Bin 0 -> 2851 bytes weapons/weapon_p250.png | Bin 0 -> 841 bytes weapons/weapon_p90.png | Bin 0 -> 814 bytes weapons/weapon_penetrate.png | Bin 0 -> 867 bytes weapons/weapon_revenge.png | Bin 0 -> 1757 bytes weapons/weapon_revolver.png | Bin 0 -> 998 bytes weapons/weapon_sawedoff.png | Bin 0 -> 2396 bytes weapons/weapon_scar17.png | Bin 0 -> 1327 bytes weapons/weapon_scar20.png | Bin 0 -> 1750 bytes weapons/weapon_scout.png | Bin 0 -> 745 bytes weapons/weapon_sg550.png | Bin 0 -> 842 bytes weapons/weapon_sg552.png | Bin 0 -> 1019 bytes weapons/weapon_sg556.png | Bin 0 -> 1282 bytes weapons/weapon_smokegrenade.png | Bin 0 -> 589 bytes weapons/weapon_smokegrenade_impact.png | Bin 0 -> 2287 bytes weapons/weapon_ssg08.png | Bin 0 -> 1391 bytes weapons/weapon_taser.png | Bin 0 -> 1071 bytes weapons/weapon_tec9.png | Bin 0 -> 999 bytes weapons/weapon_ump45.png | Bin 0 -> 949 bytes weapons/weapon_usp.png | Bin 0 -> 1009 bytes weapons/weapon_usp_silencer.png | Bin 0 -> 983 bytes weapons/weapon_xm1014.png | Bin 0 -> 745 bytes weapons/xm1014.png | Bin 745 -> 0 bytes 127 files changed, 290 insertions(+), 111 deletions(-) delete mode 100644 weapons/ak47.png delete mode 100644 weapons/aug.png delete mode 100644 weapons/awp.png delete mode 100644 weapons/bizon.png delete mode 100644 weapons/cz75a.png delete mode 100644 weapons/deagle.png delete mode 100644 weapons/decoy.png delete mode 100644 weapons/decoy_impact.png delete mode 100644 weapons/elite.png delete mode 100644 weapons/famas.png delete mode 100644 weapons/fiveseven.png delete mode 100644 weapons/flashbang.png delete mode 100644 weapons/flashbang_impact.png delete mode 100644 weapons/g3sg1.png delete mode 100644 weapons/galil.png delete mode 100644 weapons/glock.png delete mode 100644 weapons/grenade.png delete mode 100644 weapons/headshot.png delete mode 100644 weapons/hegrenade.png delete mode 100644 weapons/hegrenade_impact.png delete mode 100644 weapons/hkp2000.png delete mode 100644 weapons/incgreande.png delete mode 100644 weapons/incgreande_impact.png delete mode 100644 weapons/knife.png delete mode 100644 weapons/m249.png delete mode 100644 weapons/m4a1.png delete mode 100644 weapons/mac10.png delete mode 100644 weapons/mag7.png delete mode 100644 weapons/molotov.png delete mode 100644 weapons/molotov_impact.png delete mode 100644 weapons/mp7.png delete mode 100644 weapons/mpn.png delete mode 100644 weapons/negev.png delete mode 100644 weapons/nova.png delete mode 100644 weapons/p250.png delete mode 100644 weapons/p90.png delete mode 100644 weapons/penetrate.png delete mode 100644 weapons/revenge.png delete mode 100644 weapons/revolver.png delete mode 100644 weapons/sawedoff.png delete mode 100644 weapons/scar17.png delete mode 100644 weapons/scar20.png delete mode 100644 weapons/scout.png delete mode 100644 weapons/sg550.png delete mode 100644 weapons/sg552.png delete mode 100644 weapons/sg556.png delete mode 100644 weapons/smokegrenade.png delete mode 100644 weapons/smokegrenade_impact.png delete mode 100644 weapons/ssg08.png delete mode 100644 weapons/taser.png delete mode 100644 weapons/tec9.png delete mode 100644 weapons/ump45.png delete mode 100644 weapons/usp.png create mode 100644 weapons/weapon_ak47.png create mode 100644 weapons/weapon_aug.png create mode 100644 weapons/weapon_awp.png create mode 100644 weapons/weapon_bizon.png create mode 100644 weapons/weapon_c4.png create mode 100644 weapons/weapon_cz75a.png create mode 100644 weapons/weapon_deagle.png create mode 100644 weapons/weapon_decoy.png create mode 100644 weapons/weapon_decoy_impact.png create mode 100644 weapons/weapon_elite.png create mode 100644 weapons/weapon_famas.png create mode 100644 weapons/weapon_fiveseven.png create mode 100644 weapons/weapon_flashbang.png create mode 100644 weapons/weapon_flashbang_impact.png create mode 100644 weapons/weapon_g3sg1.png create mode 100644 weapons/weapon_galil.png create mode 100644 weapons/weapon_glock.png create mode 100644 weapons/weapon_grenade.png create mode 100644 weapons/weapon_headshot.png create mode 100644 weapons/weapon_hegrenade.png create mode 100644 weapons/weapon_hegrenade_impact.png create mode 100644 weapons/weapon_hkp2000.png create mode 100644 weapons/weapon_incgreande_impact.png create mode 100644 weapons/weapon_incgrenade.png create mode 100644 weapons/weapon_knife.png create mode 100644 weapons/weapon_knife_falchion.png create mode 100644 weapons/weapon_knife_flip.png create mode 100644 weapons/weapon_knife_gut.png create mode 100644 weapons/weapon_knife_karambit.png create mode 100644 weapons/weapon_knife_m9_bayonet.png create mode 100644 weapons/weapon_knife_push.png create mode 100644 weapons/weapon_knife_survival_bowie.png create mode 100644 weapons/weapon_knife_t.png create mode 100644 weapons/weapon_m249.png create mode 100644 weapons/weapon_m4a1.png create mode 100644 weapons/weapon_m4a1_silencer.png create mode 100644 weapons/weapon_m9_bayonet.png create mode 100644 weapons/weapon_mac10.png create mode 100644 weapons/weapon_mag7.png create mode 100644 weapons/weapon_molotov.png create mode 100644 weapons/weapon_molotov_impact.png create mode 100644 weapons/weapon_mp7.png create mode 100644 weapons/weapon_mp9.png create mode 100644 weapons/weapon_mpn.png create mode 100644 weapons/weapon_negev.png create mode 100644 weapons/weapon_nova.png create mode 100644 weapons/weapon_p250.png create mode 100644 weapons/weapon_p90.png create mode 100644 weapons/weapon_penetrate.png create mode 100644 weapons/weapon_revenge.png create mode 100644 weapons/weapon_revolver.png create mode 100644 weapons/weapon_sawedoff.png create mode 100644 weapons/weapon_scar17.png create mode 100644 weapons/weapon_scar20.png create mode 100644 weapons/weapon_scout.png create mode 100644 weapons/weapon_sg550.png create mode 100644 weapons/weapon_sg552.png create mode 100644 weapons/weapon_sg556.png create mode 100644 weapons/weapon_smokegrenade.png create mode 100644 weapons/weapon_smokegrenade_impact.png create mode 100644 weapons/weapon_ssg08.png create mode 100644 weapons/weapon_taser.png create mode 100644 weapons/weapon_tec9.png create mode 100644 weapons/weapon_ump45.png create mode 100644 weapons/weapon_usp.png create mode 100644 weapons/weapon_usp_silencer.png create mode 100644 weapons/weapon_xm1014.png delete mode 100644 weapons/xm1014.png 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 @@ icons/CT.png icons/T.png - - weapons/ak47.png - weapons/aug.png - weapons/awp.png - weapons/bizon.png - weapons/cz75a.png - weapons/deagle.png - weapons/decoy.png - weapons/decoy_impact.png - weapons/elite.png - weapons/famas.png - weapons/fiveseven.png - weapons/flashbang.png - weapons/flashbang_impact.png - weapons/g3sg1.png - weapons/galil.png - weapons/glock.png - weapons/grenade.png - weapons/headshot.png - weapons/hegrenade.png - weapons/hegrenade_impact.png - weapons/hkp2000.png - weapons/incgreande.png - weapons/incgreande_impact.png - weapons/knife.png - weapons/m4a1.png - weapons/mac10.png - weapons/mag7.png - weapons/molotov.png - weapons/molotov_impact.png - weapons/mp7.png - weapons/mpn.png - weapons/negev.png - weapons/nova.png - weapons/p250.png - weapons/p90.png - weapons/penetrate.png - weapons/revenge.png - weapons/revolver.png - weapons/sawedoff.png - weapons/scar17.png - weapons/scar20.png - weapons/scout.png - weapons/sg550.png - weapons/sg552.png - weapons/sg556.png - weapons/smokegrenade.png - weapons/smokegrenade_impact.png - weapons/ssg08.png - weapons/taser.png - weapons/tec9.png - weapons/ump45.png - weapons/usp.png - weapons/xm1014.png - weapons/m249.png - maps/ar_baggage.png maps/ar_monastery.png @@ -110,4 +54,73 @@ maps/images/de_train.png maps/images/de_vertigo.png + + weapons/weapon_ak47.png + weapons/weapon_aug.png + weapons/weapon_awp.png + weapons/weapon_bizon.png + weapons/weapon_c4.png + weapons/weapon_cz75a.png + weapons/weapon_deagle.png + weapons/weapon_decoy.png + weapons/weapon_decoy_impact.png + weapons/weapon_elite.png + weapons/weapon_famas.png + weapons/weapon_fiveseven.png + weapons/weapon_flashbang.png + weapons/weapon_flashbang_impact.png + weapons/weapon_g3sg1.png + weapons/weapon_galil.png + weapons/weapon_glock.png + weapons/weapon_grenade.png + weapons/weapon_headshot.png + weapons/weapon_hegrenade.png + weapons/weapon_hegrenade_impact.png + weapons/weapon_hkp2000.png + weapons/weapon_incgreande_impact.png + weapons/weapon_incgrenade.png + weapons/weapon_knife.png + weapons/weapon_knife_falchion.png + weapons/weapon_knife_flip.png + weapons/weapon_knife_gut.png + weapons/weapon_knife_push.png + weapons/weapon_knife_survival_bowie.png + weapons/weapon_knife_t.png + weapons/weapon_m249.png + weapons/weapon_m4a1.png + weapons/weapon_m4a1_silencer.png + weapons/weapon_m9_bayonet.png + weapons/weapon_mac10.png + weapons/weapon_mag7.png + weapons/weapon_molotov.png + weapons/weapon_molotov_impact.png + weapons/weapon_mp7.png + weapons/weapon_mp9.png + weapons/weapon_mpn.png + weapons/weapon_negev.png + weapons/weapon_nova.png + weapons/weapon_p250.png + weapons/weapon_p90.png + weapons/weapon_penetrate.png + weapons/weapon_revenge.png + weapons/weapon_revolver.png + weapons/weapon_sawedoff.png + weapons/weapon_scar17.png + weapons/weapon_scar20.png + weapons/weapon_scout.png + weapons/weapon_sg550.png + weapons/weapon_sg552.png + weapons/weapon_sg556.png + weapons/weapon_smokegrenade.png + weapons/weapon_smokegrenade_impact.png + weapons/weapon_ssg08.png + weapons/weapon_taser.png + weapons/weapon_tec9.png + weapons/weapon_ump45.png + weapons/weapon_usp.png + weapons/weapon_usp_silencer.png + weapons/weapon_xm1014.png + weapons/weapon_knife_karambit.png + weapons/weapon_knife_m9_bayonet.png + 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 @@ - + EnvironmentId 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("
"); ui->t_label->setText("
"); + /* 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("" + game.player_map["name"].toString() + ""); + if (game.player_map["name"].toString().length() > 9) /* username too long */ + { + ui->player_name_label->setText("" + game.player_map["name"].toString().left(9) + "[...]"); + } else + ui->player_name_label->setText("" + game.player_map["name"].toString() + ""); ui->player_score_label->setText("Score: " + game.stats_map["score"].toString()); ui->ct_score_label->setText("
" + game.ct_score_map["score"].toString() + "
"); ui->t_score_label->setText("
" + game.t_score_map["score"].toString() + "
"); ui->round_number_label->setText("
Round
" + game.map_map["round"].toString() + "
"); 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(""); + else + ui->weapon_1_label->setText(""); + if (game.weapon_2_map["name"].toString() != "") + ui->weapon_2_label->setText("
" + 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("
" + 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("
" + 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("
" + 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("
" + 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("
" + 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("
" + 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("
" + 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("
" + 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 #include #include +#include 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 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 @@ 0 0 - 400 - 300 + 426 + 457 @@ -19,44 +19,37 @@ - - - - map_picture - - - - + <html><head/><body><p><span style=" font-size:14pt;">player_name</span></p></body></html> - + player_team - + player_score - + kills_count - + deaths_count @@ -65,6 +58,103 @@ + + + + map_picture + + + + + + + + + Weapons + + + + + + + + + + + + + + + Qt::AutoText + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 map_labels; QList 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 weapon_labels; QList stat_labels; diff --git a/weapons/ak47.png b/weapons/ak47.png deleted file mode 100644 index 9c95e48..0000000 Binary files a/weapons/ak47.png and /dev/null differ diff --git a/weapons/aug.png b/weapons/aug.png deleted file mode 100644 index b6e5be2..0000000 Binary files a/weapons/aug.png and /dev/null differ diff --git a/weapons/awp.png b/weapons/awp.png deleted file mode 100644 index b61853c..0000000 Binary files a/weapons/awp.png and /dev/null differ diff --git a/weapons/bizon.png b/weapons/bizon.png deleted file mode 100644 index f0bbc7d..0000000 Binary files a/weapons/bizon.png and /dev/null differ diff --git a/weapons/cz75a.png b/weapons/cz75a.png deleted file mode 100644 index d5a8ba9..0000000 Binary files a/weapons/cz75a.png and /dev/null differ diff --git a/weapons/deagle.png b/weapons/deagle.png deleted file mode 100644 index 91cc1cd..0000000 Binary files a/weapons/deagle.png and /dev/null differ diff --git a/weapons/decoy.png b/weapons/decoy.png deleted file mode 100644 index 78077ef..0000000 Binary files a/weapons/decoy.png and /dev/null differ diff --git a/weapons/decoy_impact.png b/weapons/decoy_impact.png deleted file mode 100644 index dd58723..0000000 Binary files a/weapons/decoy_impact.png and /dev/null differ diff --git a/weapons/elite.png b/weapons/elite.png deleted file mode 100644 index b7752e3..0000000 Binary files a/weapons/elite.png and /dev/null differ diff --git a/weapons/famas.png b/weapons/famas.png deleted file mode 100644 index 0881cf2..0000000 Binary files a/weapons/famas.png and /dev/null differ diff --git a/weapons/fiveseven.png b/weapons/fiveseven.png deleted file mode 100644 index 1a56666..0000000 Binary files a/weapons/fiveseven.png and /dev/null differ diff --git a/weapons/flashbang.png b/weapons/flashbang.png deleted file mode 100644 index b8439ce..0000000 Binary files a/weapons/flashbang.png and /dev/null differ diff --git a/weapons/flashbang_impact.png b/weapons/flashbang_impact.png deleted file mode 100644 index dd58723..0000000 Binary files a/weapons/flashbang_impact.png and /dev/null differ diff --git a/weapons/g3sg1.png b/weapons/g3sg1.png deleted file mode 100644 index 1e28143..0000000 Binary files a/weapons/g3sg1.png and /dev/null differ diff --git a/weapons/galil.png b/weapons/galil.png deleted file mode 100644 index e45807f..0000000 Binary files a/weapons/galil.png and /dev/null differ diff --git a/weapons/glock.png b/weapons/glock.png deleted file mode 100644 index fff7fc6..0000000 Binary files a/weapons/glock.png and /dev/null differ diff --git a/weapons/grenade.png b/weapons/grenade.png deleted file mode 100644 index 6b0fb26..0000000 Binary files a/weapons/grenade.png and /dev/null differ diff --git a/weapons/headshot.png b/weapons/headshot.png deleted file mode 100644 index 38fc625..0000000 Binary files a/weapons/headshot.png and /dev/null differ diff --git a/weapons/hegrenade.png b/weapons/hegrenade.png deleted file mode 100644 index f37d5de..0000000 Binary files a/weapons/hegrenade.png and /dev/null differ diff --git a/weapons/hegrenade_impact.png b/weapons/hegrenade_impact.png deleted file mode 100644 index 4c2793b..0000000 Binary files a/weapons/hegrenade_impact.png and /dev/null differ diff --git a/weapons/hkp2000.png b/weapons/hkp2000.png deleted file mode 100644 index 43665ad..0000000 Binary files a/weapons/hkp2000.png and /dev/null differ diff --git a/weapons/incgreande.png b/weapons/incgreande.png deleted file mode 100644 index 2aa1b07..0000000 Binary files a/weapons/incgreande.png and /dev/null differ diff --git a/weapons/incgreande_impact.png b/weapons/incgreande_impact.png deleted file mode 100644 index 1ae4ad4..0000000 Binary files a/weapons/incgreande_impact.png and /dev/null differ diff --git a/weapons/knife.png b/weapons/knife.png deleted file mode 100644 index 89a5743..0000000 Binary files a/weapons/knife.png and /dev/null differ diff --git a/weapons/m249.png b/weapons/m249.png deleted file mode 100644 index 8939e6f..0000000 Binary files a/weapons/m249.png and /dev/null differ diff --git a/weapons/m4a1.png b/weapons/m4a1.png deleted file mode 100644 index 700e301..0000000 Binary files a/weapons/m4a1.png and /dev/null differ diff --git a/weapons/mac10.png b/weapons/mac10.png deleted file mode 100644 index c862676..0000000 Binary files a/weapons/mac10.png and /dev/null differ diff --git a/weapons/mag7.png b/weapons/mag7.png deleted file mode 100644 index d88324b..0000000 Binary files a/weapons/mag7.png and /dev/null differ diff --git a/weapons/molotov.png b/weapons/molotov.png deleted file mode 100644 index 983e33f..0000000 Binary files a/weapons/molotov.png and /dev/null differ diff --git a/weapons/molotov_impact.png b/weapons/molotov_impact.png deleted file mode 100644 index 051a40e..0000000 Binary files a/weapons/molotov_impact.png and /dev/null differ diff --git a/weapons/mp7.png b/weapons/mp7.png deleted file mode 100644 index ef27b31..0000000 Binary files a/weapons/mp7.png and /dev/null differ diff --git a/weapons/mpn.png b/weapons/mpn.png deleted file mode 100644 index 908dcf7..0000000 Binary files a/weapons/mpn.png and /dev/null differ diff --git a/weapons/negev.png b/weapons/negev.png deleted file mode 100644 index 453f03d..0000000 Binary files a/weapons/negev.png and /dev/null differ diff --git a/weapons/nova.png b/weapons/nova.png deleted file mode 100644 index 0d3a0bb..0000000 Binary files a/weapons/nova.png and /dev/null differ diff --git a/weapons/p250.png b/weapons/p250.png deleted file mode 100644 index a005908..0000000 Binary files a/weapons/p250.png and /dev/null differ diff --git a/weapons/p90.png b/weapons/p90.png deleted file mode 100644 index 2b1d5d0..0000000 Binary files a/weapons/p90.png and /dev/null differ diff --git a/weapons/penetrate.png b/weapons/penetrate.png deleted file mode 100644 index 5fc0073..0000000 Binary files a/weapons/penetrate.png and /dev/null differ diff --git a/weapons/revenge.png b/weapons/revenge.png deleted file mode 100644 index f4618aa..0000000 Binary files a/weapons/revenge.png and /dev/null differ diff --git a/weapons/revolver.png b/weapons/revolver.png deleted file mode 100644 index b945557..0000000 Binary files a/weapons/revolver.png and /dev/null differ diff --git a/weapons/sawedoff.png b/weapons/sawedoff.png deleted file mode 100644 index 4285e61..0000000 Binary files a/weapons/sawedoff.png and /dev/null differ diff --git a/weapons/scar17.png b/weapons/scar17.png deleted file mode 100644 index 3faf47d..0000000 Binary files a/weapons/scar17.png and /dev/null differ diff --git a/weapons/scar20.png b/weapons/scar20.png deleted file mode 100644 index c71ecac..0000000 Binary files a/weapons/scar20.png and /dev/null differ diff --git a/weapons/scout.png b/weapons/scout.png deleted file mode 100644 index 9437ebe..0000000 Binary files a/weapons/scout.png and /dev/null differ diff --git a/weapons/sg550.png b/weapons/sg550.png deleted file mode 100644 index 65bcfc0..0000000 Binary files a/weapons/sg550.png and /dev/null differ diff --git a/weapons/sg552.png b/weapons/sg552.png deleted file mode 100644 index 483ffac..0000000 Binary files a/weapons/sg552.png and /dev/null differ diff --git a/weapons/sg556.png b/weapons/sg556.png deleted file mode 100644 index 0fcae10..0000000 Binary files a/weapons/sg556.png and /dev/null differ diff --git a/weapons/smokegrenade.png b/weapons/smokegrenade.png deleted file mode 100644 index ed12214..0000000 Binary files a/weapons/smokegrenade.png and /dev/null differ diff --git a/weapons/smokegrenade_impact.png b/weapons/smokegrenade_impact.png deleted file mode 100644 index 107687a..0000000 Binary files a/weapons/smokegrenade_impact.png and /dev/null differ diff --git a/weapons/ssg08.png b/weapons/ssg08.png deleted file mode 100644 index cae430a..0000000 Binary files a/weapons/ssg08.png and /dev/null differ diff --git a/weapons/taser.png b/weapons/taser.png deleted file mode 100644 index 64a4442..0000000 Binary files a/weapons/taser.png and /dev/null differ diff --git a/weapons/tec9.png b/weapons/tec9.png deleted file mode 100644 index e73e3e1..0000000 Binary files a/weapons/tec9.png and /dev/null differ diff --git a/weapons/ump45.png b/weapons/ump45.png deleted file mode 100644 index 3075ad4..0000000 Binary files a/weapons/ump45.png and /dev/null differ diff --git a/weapons/usp.png b/weapons/usp.png deleted file mode 100644 index db7a44c..0000000 Binary files a/weapons/usp.png and /dev/null differ diff --git a/weapons/weapon_ak47.png b/weapons/weapon_ak47.png new file mode 100644 index 0000000..9c95e48 Binary files /dev/null and b/weapons/weapon_ak47.png differ diff --git a/weapons/weapon_aug.png b/weapons/weapon_aug.png new file mode 100644 index 0000000..b6e5be2 Binary files /dev/null and b/weapons/weapon_aug.png differ diff --git a/weapons/weapon_awp.png b/weapons/weapon_awp.png new file mode 100644 index 0000000..b61853c Binary files /dev/null and b/weapons/weapon_awp.png differ diff --git a/weapons/weapon_bizon.png b/weapons/weapon_bizon.png new file mode 100644 index 0000000..f0bbc7d Binary files /dev/null and b/weapons/weapon_bizon.png differ diff --git a/weapons/weapon_c4.png b/weapons/weapon_c4.png new file mode 100644 index 0000000..94be707 Binary files /dev/null and b/weapons/weapon_c4.png differ diff --git a/weapons/weapon_cz75a.png b/weapons/weapon_cz75a.png new file mode 100644 index 0000000..d5a8ba9 Binary files /dev/null and b/weapons/weapon_cz75a.png differ diff --git a/weapons/weapon_deagle.png b/weapons/weapon_deagle.png new file mode 100644 index 0000000..91cc1cd Binary files /dev/null and b/weapons/weapon_deagle.png differ diff --git a/weapons/weapon_decoy.png b/weapons/weapon_decoy.png new file mode 100644 index 0000000..78077ef Binary files /dev/null and b/weapons/weapon_decoy.png differ diff --git a/weapons/weapon_decoy_impact.png b/weapons/weapon_decoy_impact.png new file mode 100644 index 0000000..dd58723 Binary files /dev/null and b/weapons/weapon_decoy_impact.png differ diff --git a/weapons/weapon_elite.png b/weapons/weapon_elite.png new file mode 100644 index 0000000..b7752e3 Binary files /dev/null and b/weapons/weapon_elite.png differ diff --git a/weapons/weapon_famas.png b/weapons/weapon_famas.png new file mode 100644 index 0000000..0881cf2 Binary files /dev/null and b/weapons/weapon_famas.png differ diff --git a/weapons/weapon_fiveseven.png b/weapons/weapon_fiveseven.png new file mode 100644 index 0000000..1a56666 Binary files /dev/null and b/weapons/weapon_fiveseven.png differ diff --git a/weapons/weapon_flashbang.png b/weapons/weapon_flashbang.png new file mode 100644 index 0000000..b8439ce Binary files /dev/null and b/weapons/weapon_flashbang.png differ diff --git a/weapons/weapon_flashbang_impact.png b/weapons/weapon_flashbang_impact.png new file mode 100644 index 0000000..dd58723 Binary files /dev/null and b/weapons/weapon_flashbang_impact.png differ diff --git a/weapons/weapon_g3sg1.png b/weapons/weapon_g3sg1.png new file mode 100644 index 0000000..1e28143 Binary files /dev/null and b/weapons/weapon_g3sg1.png differ diff --git a/weapons/weapon_galil.png b/weapons/weapon_galil.png new file mode 100644 index 0000000..e45807f Binary files /dev/null and b/weapons/weapon_galil.png differ diff --git a/weapons/weapon_glock.png b/weapons/weapon_glock.png new file mode 100644 index 0000000..fff7fc6 Binary files /dev/null and b/weapons/weapon_glock.png differ diff --git a/weapons/weapon_grenade.png b/weapons/weapon_grenade.png new file mode 100644 index 0000000..6b0fb26 Binary files /dev/null and b/weapons/weapon_grenade.png differ diff --git a/weapons/weapon_headshot.png b/weapons/weapon_headshot.png new file mode 100644 index 0000000..38fc625 Binary files /dev/null and b/weapons/weapon_headshot.png differ diff --git a/weapons/weapon_hegrenade.png b/weapons/weapon_hegrenade.png new file mode 100644 index 0000000..f37d5de Binary files /dev/null and b/weapons/weapon_hegrenade.png differ diff --git a/weapons/weapon_hegrenade_impact.png b/weapons/weapon_hegrenade_impact.png new file mode 100644 index 0000000..4c2793b Binary files /dev/null and b/weapons/weapon_hegrenade_impact.png differ diff --git a/weapons/weapon_hkp2000.png b/weapons/weapon_hkp2000.png new file mode 100644 index 0000000..43665ad Binary files /dev/null and b/weapons/weapon_hkp2000.png differ diff --git a/weapons/weapon_incgreande_impact.png b/weapons/weapon_incgreande_impact.png new file mode 100644 index 0000000..1ae4ad4 Binary files /dev/null and b/weapons/weapon_incgreande_impact.png differ diff --git a/weapons/weapon_incgrenade.png b/weapons/weapon_incgrenade.png new file mode 100644 index 0000000..2aa1b07 Binary files /dev/null and b/weapons/weapon_incgrenade.png differ diff --git a/weapons/weapon_knife.png b/weapons/weapon_knife.png new file mode 100644 index 0000000..89a5743 Binary files /dev/null and b/weapons/weapon_knife.png differ diff --git a/weapons/weapon_knife_falchion.png b/weapons/weapon_knife_falchion.png new file mode 100644 index 0000000..fe54809 Binary files /dev/null and b/weapons/weapon_knife_falchion.png differ diff --git a/weapons/weapon_knife_flip.png b/weapons/weapon_knife_flip.png new file mode 100644 index 0000000..051e44a Binary files /dev/null and b/weapons/weapon_knife_flip.png differ diff --git a/weapons/weapon_knife_gut.png b/weapons/weapon_knife_gut.png new file mode 100644 index 0000000..765a032 Binary files /dev/null and b/weapons/weapon_knife_gut.png differ diff --git a/weapons/weapon_knife_karambit.png b/weapons/weapon_knife_karambit.png new file mode 100644 index 0000000..335bc1e Binary files /dev/null and b/weapons/weapon_knife_karambit.png differ diff --git a/weapons/weapon_knife_m9_bayonet.png b/weapons/weapon_knife_m9_bayonet.png new file mode 100644 index 0000000..8e7f725 Binary files /dev/null and b/weapons/weapon_knife_m9_bayonet.png differ diff --git a/weapons/weapon_knife_push.png b/weapons/weapon_knife_push.png new file mode 100644 index 0000000..8695c1a Binary files /dev/null and b/weapons/weapon_knife_push.png differ diff --git a/weapons/weapon_knife_survival_bowie.png b/weapons/weapon_knife_survival_bowie.png new file mode 100644 index 0000000..1a6ab64 Binary files /dev/null and b/weapons/weapon_knife_survival_bowie.png differ diff --git a/weapons/weapon_knife_t.png b/weapons/weapon_knife_t.png new file mode 100644 index 0000000..89a5743 Binary files /dev/null and b/weapons/weapon_knife_t.png differ diff --git a/weapons/weapon_m249.png b/weapons/weapon_m249.png new file mode 100644 index 0000000..8939e6f Binary files /dev/null and b/weapons/weapon_m249.png differ diff --git a/weapons/weapon_m4a1.png b/weapons/weapon_m4a1.png new file mode 100644 index 0000000..700e301 Binary files /dev/null and b/weapons/weapon_m4a1.png differ diff --git a/weapons/weapon_m4a1_silencer.png b/weapons/weapon_m4a1_silencer.png new file mode 100644 index 0000000..805b855 Binary files /dev/null and b/weapons/weapon_m4a1_silencer.png differ diff --git a/weapons/weapon_m9_bayonet.png b/weapons/weapon_m9_bayonet.png new file mode 100644 index 0000000..8e7f725 Binary files /dev/null and b/weapons/weapon_m9_bayonet.png differ diff --git a/weapons/weapon_mac10.png b/weapons/weapon_mac10.png new file mode 100644 index 0000000..c862676 Binary files /dev/null and b/weapons/weapon_mac10.png differ diff --git a/weapons/weapon_mag7.png b/weapons/weapon_mag7.png new file mode 100644 index 0000000..d88324b Binary files /dev/null and b/weapons/weapon_mag7.png differ diff --git a/weapons/weapon_molotov.png b/weapons/weapon_molotov.png new file mode 100644 index 0000000..983e33f Binary files /dev/null and b/weapons/weapon_molotov.png differ diff --git a/weapons/weapon_molotov_impact.png b/weapons/weapon_molotov_impact.png new file mode 100644 index 0000000..051a40e Binary files /dev/null and b/weapons/weapon_molotov_impact.png differ diff --git a/weapons/weapon_mp7.png b/weapons/weapon_mp7.png new file mode 100644 index 0000000..ef27b31 Binary files /dev/null and b/weapons/weapon_mp7.png differ diff --git a/weapons/weapon_mp9.png b/weapons/weapon_mp9.png new file mode 100644 index 0000000..908dcf7 Binary files /dev/null and b/weapons/weapon_mp9.png differ diff --git a/weapons/weapon_mpn.png b/weapons/weapon_mpn.png new file mode 100644 index 0000000..908dcf7 Binary files /dev/null and b/weapons/weapon_mpn.png differ diff --git a/weapons/weapon_negev.png b/weapons/weapon_negev.png new file mode 100644 index 0000000..453f03d Binary files /dev/null and b/weapons/weapon_negev.png differ diff --git a/weapons/weapon_nova.png b/weapons/weapon_nova.png new file mode 100644 index 0000000..0d3a0bb Binary files /dev/null and b/weapons/weapon_nova.png differ diff --git a/weapons/weapon_p250.png b/weapons/weapon_p250.png new file mode 100644 index 0000000..a005908 Binary files /dev/null and b/weapons/weapon_p250.png differ diff --git a/weapons/weapon_p90.png b/weapons/weapon_p90.png new file mode 100644 index 0000000..2b1d5d0 Binary files /dev/null and b/weapons/weapon_p90.png differ diff --git a/weapons/weapon_penetrate.png b/weapons/weapon_penetrate.png new file mode 100644 index 0000000..5fc0073 Binary files /dev/null and b/weapons/weapon_penetrate.png differ diff --git a/weapons/weapon_revenge.png b/weapons/weapon_revenge.png new file mode 100644 index 0000000..f4618aa Binary files /dev/null and b/weapons/weapon_revenge.png differ diff --git a/weapons/weapon_revolver.png b/weapons/weapon_revolver.png new file mode 100644 index 0000000..b945557 Binary files /dev/null and b/weapons/weapon_revolver.png differ diff --git a/weapons/weapon_sawedoff.png b/weapons/weapon_sawedoff.png new file mode 100644 index 0000000..4285e61 Binary files /dev/null and b/weapons/weapon_sawedoff.png differ diff --git a/weapons/weapon_scar17.png b/weapons/weapon_scar17.png new file mode 100644 index 0000000..3faf47d Binary files /dev/null and b/weapons/weapon_scar17.png differ diff --git a/weapons/weapon_scar20.png b/weapons/weapon_scar20.png new file mode 100644 index 0000000..c71ecac Binary files /dev/null and b/weapons/weapon_scar20.png differ diff --git a/weapons/weapon_scout.png b/weapons/weapon_scout.png new file mode 100644 index 0000000..9437ebe Binary files /dev/null and b/weapons/weapon_scout.png differ diff --git a/weapons/weapon_sg550.png b/weapons/weapon_sg550.png new file mode 100644 index 0000000..65bcfc0 Binary files /dev/null and b/weapons/weapon_sg550.png differ diff --git a/weapons/weapon_sg552.png b/weapons/weapon_sg552.png new file mode 100644 index 0000000..483ffac Binary files /dev/null and b/weapons/weapon_sg552.png differ diff --git a/weapons/weapon_sg556.png b/weapons/weapon_sg556.png new file mode 100644 index 0000000..0fcae10 Binary files /dev/null and b/weapons/weapon_sg556.png differ diff --git a/weapons/weapon_smokegrenade.png b/weapons/weapon_smokegrenade.png new file mode 100644 index 0000000..ed12214 Binary files /dev/null and b/weapons/weapon_smokegrenade.png differ diff --git a/weapons/weapon_smokegrenade_impact.png b/weapons/weapon_smokegrenade_impact.png new file mode 100644 index 0000000..107687a Binary files /dev/null and b/weapons/weapon_smokegrenade_impact.png differ diff --git a/weapons/weapon_ssg08.png b/weapons/weapon_ssg08.png new file mode 100644 index 0000000..cae430a Binary files /dev/null and b/weapons/weapon_ssg08.png differ diff --git a/weapons/weapon_taser.png b/weapons/weapon_taser.png new file mode 100644 index 0000000..64a4442 Binary files /dev/null and b/weapons/weapon_taser.png differ diff --git a/weapons/weapon_tec9.png b/weapons/weapon_tec9.png new file mode 100644 index 0000000..e73e3e1 Binary files /dev/null and b/weapons/weapon_tec9.png differ diff --git a/weapons/weapon_ump45.png b/weapons/weapon_ump45.png new file mode 100644 index 0000000..3075ad4 Binary files /dev/null and b/weapons/weapon_ump45.png differ diff --git a/weapons/weapon_usp.png b/weapons/weapon_usp.png new file mode 100644 index 0000000..db7a44c Binary files /dev/null and b/weapons/weapon_usp.png differ diff --git a/weapons/weapon_usp_silencer.png b/weapons/weapon_usp_silencer.png new file mode 100644 index 0000000..e9e474f Binary files /dev/null and b/weapons/weapon_usp_silencer.png differ diff --git a/weapons/weapon_xm1014.png b/weapons/weapon_xm1014.png new file mode 100644 index 0000000..6dbe910 Binary files /dev/null and b/weapons/weapon_xm1014.png differ diff --git a/weapons/xm1014.png b/weapons/xm1014.png deleted file mode 100644 index 6dbe910..0000000 Binary files a/weapons/xm1014.png and /dev/null differ -- cgit v1.2.3