diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts
index 2b4c1f3d..2f1b3ae1 100644
--- a/ReallifeGamemode.Client/util/weapondamage.ts
+++ b/ReallifeGamemode.Client/util/weapondamage.ts
@@ -71,91 +71,317 @@ export default function weapondamageUtil(globalData: IGlobalData) {
         blockInput = (mp.game.weapon.getWeapontypeGroup(player.weapon) != 2685387236);
 
         switch (player.weapon) {
-            case 0x1B06D571: //Pistol
-                modifier = 0.4;
-                meelemodifier = 1;
-                //mp.gui.chat.push("PistolModifier: " + modifier);
-                break;
-            case 0xBFE256D4: //Pistol_MK2
+            case 0x1B06D571: // pistol
                 modifier = 0.4;
                 meelemodifier = 1;
                 break;
-            case 0x5EF9FEC4: //Combatpistol
+            case 0xBFE256D4: // pistol_mk2
+                modifier = 0.4;
+                meelemodifier = 1;
+                break;
+            case 0x5EF9FEC4: // combatpistol
                 modifier = 0.5;
                 meelemodifier = 1;
                 break;
-            case 0x99AEEB3B: //Pistol50
-                modifier = 0.35;
-                meelemodifier = 1;
-                break;
-            case 0x2BE6766B: //SMG
-                modifier = 0.25;
-                meelemodifier = 1;
-                break;
-            case 0x0A3D4D34: //Combat PDW
+            case 0x22D8FE39: // appistol
                 modifier = 0.185;
                 meelemodifier = 1;
                 break;
-            case 0xBFEFFF6D: //assaultrifle
-                modifier = 0.225;
+            case 0x3656C8C1: // stungun
+                modifier = 0;
                 meelemodifier = 1;
                 break;
-            case 0x1D073A89: //Pumpshotgun
+            case 0x99AEEB3B: // pistol50
+                modifier = 0.35;
+                meelemodifier = 1;
+                break;
+            case 0xBFD21232: // snspistol
+                modifier = 0.25;
+                meelemodifier = 1;
+                break;
+            case 0x88374054: // snspistol_mk2
+                modifier = 0.26;
+                meelemodifier = 1;
+                break;
+            case 0xD205520E: // heavypistol
                 modifier = 0.2;
                 meelemodifier = 1;
                 break;
-            case 0x83BF0278: //Cabinerifle
+            case 0x83839C4: // vintagepistol
                 modifier = 0.2;
                 meelemodifier = 1;
                 break;
-            case 0x624FE830: //Compactrifle
-                modifier = 0.2;
-                meelemodifier = 0.1;
+            case 0x47757124: // flaregun
+                modifier = 0;
+                meelemodifier = 1;
                 break;
-            case 0x05FC3C11: //Sniperrifle
+            case 0xDC4DB296: // marksmanpistol
+                modifier = 0.25;
+                meelemodifier = 1;
+                break;
+            case 0xC1B3C3D1: // revolver
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0xCB96392F: // revolver_mk2
+                modifier = 0.16;
+                meelemodifier = 1;
+                break;
+            case 0x97EA20B8: // doubleaction
+                modifier = 0.23;
+                meelemodifier = 1;
+                break;
+            case 0xAF3696A1: // raypistol
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0x2B5EF5EC: // ceramicpistol
+                modifier = 0.25;
+                meelemodifier = 1;
+                break;
+            case 0x917F6C8C: // navyrevolver
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0x57A4368C: // gadgetpistol
+                modifier = 0.25;
+                meelemodifier = 1;
+                break;
+
+
+            case 0x13532244: // microsmg
+                modifier = 0.25;
+                meelemodifier = 1;
+                break;
+            case 0x2BE6766B: // smg
+                modifier = 0.25;
+                meelemodifier = 1;
+                break;
+            case 0x78A97CD0: // smg_mk2
+                modifier = 0.23;
+                meelemodifier = 1;
+                break;
+            case 0xEFE7E2DF: // assaultsmg
+                modifier = 0.259;
+                meelemodifier = 1;
+                break;
+            case 0x0A3D4D34: // combatpdw
+                modifier = 0.185;
+                meelemodifier = 1;
+                break;
+            case 0xDB1AA450: // machinepistol
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0xBD248B55: // minismg
+                modifier = 0.21;
+                meelemodifier = 1;
+                break;
+            case 0x476BF155: // raycarbine
+                modifier = 0.1;
+                meelemodifier = 1;
+                break;
+
+
+            case 0x1D073A89: // pumpshotgun
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0x555AF99A: // pumpshotgun_mk2
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0x7846A318: // sawnoffshotgun
+                modifier = 0.15;
+                meelemodifier = 1;
+                break;
+            case 0xE284C527: // assaultshotgun
+                modifier = 0.1;
+                meelemodifier = 1;
+                break;
+            case 0x9D61E50F: // bullpupshotgun
+                modifier = 0.35;
+                meelemodifier = 1;
+                break;
+            case 0xA89CB99E: // musket
                 modifier = 0.5;
                 meelemodifier = 1;
                 break;
-            case 0xA2719263: //Meele Umarmed Fist
+            case 0x3AABBBAA: // heavyshotgun
+                modifier = 0.11;
+                meelemodifier = 1;
+                break;
+            case 0xEF951FBB: // dbshotgun
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0x12E82D3D: // autoshotgun
+                modifier = 0.12;
+                meelemodifier = 1;
+                break;
+            case 0x5A96BA4: // combatshotgun
+                modifier = 0.19;
+                meelemodifier = 1;
+                break;
+
+
+            // TODO
+            case 0xBFEFFF6D: // assaultrifle
+                modifier = 0.225;
+                meelemodifier = 1;
+                break;
+            case 0x394F415C: // assaultrifle_mk2
+                modifier = 0.15;
+                meelemodifier = 1;
+                break;
+            case 0x83BF0278: // carbinerifle
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0xFAD1F1C9: // carbinerifle_mk2
+                modifier = 0.22;
+                meelemodifier = 1;
+                break;
+            case 0xAF113F99: // advancedrifle
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0xC0A3098D: // specialcarbine
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0x969C3D67: // specialcarbine_mk2
+                modifier = 0.23;
+                meelemodifier = 1;
+                break;
+            case 0x7F229F94: // bullpuprifle
+                modifier = 0.18;
+                meelemodifier = 1;
+                break;
+            case 0x84D6FAFD: // bullpuprifle_mk2
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0x624FE830: // compactrifle
+                modifier = 0.2;
+                meelemodifier = 0.1;
+                break;
+            case 0x9D1F17E6: // militaryrifle
+                modifier = 0.22;
+                meelemodifier = 1;
+                break;
+
+
+            case 0x9D07F764: // mg
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0x7FD62962: // combatmg
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0xDBBD7280: // combatmg_mk2
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0x61012683: // gusenberg
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+
+
+            case 0x05FC3C11: // sniperrifle
+                modifier = 0.5;
+                meelemodifier = 1;
+                break;
+            case 0x0C472FE2: // heavysniper
+                modifier = 0.17;
+                meelemodifier = 1;
+                break;
+            case 0xA914799: // heavysniper_mk2
+                modifier = 0.19;
+                meelemodifier = 1;
+                break;
+            case 0xC734385A: // marksmanrifle
+                modifier = 0.15;
+                meelemodifier = 1;
+                break;
+            case 0x6A6C02E0: // marksmanrifle_mk2
+                modifier = 0.12;
+                meelemodifier = 1;
+                break;
+
+
+            case 0xB1CA77B1: // rpg
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0xA284510B: // grenadelauncher
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0x4DD2DC56: // grenadelauncher_smoke
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0x42BF8A85: // minigun
+                modifier = 0.1;
+                meelemodifier = 1;
+                break;
+            case 0x7F7497E5: // firework
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0x6D544C99: // railgun
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0x63AB0442: // hominglauncher
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0x0781FE4A: // compactlauncher
+                modifier = 0;
+                meelemodifier = 1;
+                break;
+            case 0xB62D1F67: // rayminigun
+                modifier = 0.1;
+                meelemodifier = 1;
+                break;
+
+            
+            
+            case 0xA2719263: // unarmed
                 meelemodifier = 0.1;
                 modifier = 1;
-                //mp.gui.chat.push("FistModifier: " + meelemodifier);
                 break;
-            case 0x958A4A8F: //Meele Baseball Bat
+            case 0x958A4A8F: // bat
                 meelemodifier = 0.15;
                 modifier = 1;
                 break;
-            case 0x8BB05FD7: //Meele Flashlight
+            case 0x8BB05FD7: // flashlight
                 meelemodifier = 0.1;
                 modifier = 1;
-
                 break;
-            case 0xD8DF3C3C: //Meele Knuckle
+            case 0xD8DF3C3C: // knuckle
                 meelemodifier = 0.1;
                 modifier = 1;
-
-                //mp.gui.chat.push("KnuckleModifier: " + meelemodifier);
                 break;
-            case 0x678B81B1: //Meele Nightstick
+            case 0x678B81B1: // nightstick
                 meelemodifier = 0.1;
                 modifier = 1;
-
-                break;
-            case 0xEFE7E2DF: // Assault SMG
-                meelemodifier = 1;
-                modifier = 0.259
-
                 break;
             default:
                 modifier = 1;
                 meelemodifier = 1;
-
                 break;
         }
+
         mp.game.invoke("0xCE07B9F7817AADA3", player, modifier);
         mp.game.invoke("0x4A3DC7ECCC321032", player, meelemodifier);
         //mp.gui.chat.push("Modifier: " + modifier + "MeeleModifier: " +meelemodifier);
     });
+
     mp.events.add('SERVER:WeaponModifier2', (player, modifier, meelemodifier) => {
         //mp.gui.chat.push("Modifier steht jetzt auf" + modifier);
         //mp.players.local.setWeaponDamageModifier(modifier);