aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge Hotfix into develop

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-07 19:34:31 +02:00
parent d17038f107 9caba94199
commit 3f502f8bf6
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab/issue_templates/Bug.md Normal file
View File

@@ -0,0 +1,12 @@
### Bug:
#### Was läuft falsch?
#### Gibt es eine Fehlermeldung?
#### Wie kann man den Fehler reproduzieren?
/label ~Bug

2
ReallifeGamemode.Client/util/animationSync.ts
View File

@@ -83,12 +83,10 @@
mp.events.addDataHandler("AnimationData", (entity, string) => { mp.events.addDataHandler("AnimationData", (entity, string) => {
entity.clearTasksImmediately(); entity.clearTasksImmediately();
if (animationBreakTimer) { if (animationBreakTimer) {
clearInterval(animationBreakTimer); clearInterval(animationBreakTimer);
animationBreakTimer = null; animationBreakTimer = null;
} }
if (string == null) { if (string == null) {
blockInput = false; blockInput = false;
return; return;

18
ReallifeGamemode.Client/util/weapondamage.ts
View File

@@ -21,86 +21,74 @@
let modifier = 1; let modifier = 1;
let meelemodifier = 1; let meelemodifier = 1;
blockInput = (mp.game.weapon.getWeapontypeGroup(player.weapon) != 2685387236);
switch (player.weapon) { switch (player.weapon) {
case 0x1B06D571: //Pistol case 0x1B06D571: //Pistol
modifier = 0.4; modifier = 0.4;
meelemodifier = 1; meelemodifier = 1;
blockInput = true; //mp.gui.chat.push("PistolModifier: " + modifier);
break; break;
case 0xBFE256D4: //Pistol_MK2 case 0xBFE256D4: //Pistol_MK2
modifier = 0.4; modifier = 0.4;
meelemodifier = 1; meelemodifier = 1;
blockInput = true;
break; break;
case 0x5EF9FEC4: //Combatpistol case 0x5EF9FEC4: //Combatpistol
modifier = 0.5; modifier = 0.5;
meelemodifier = 1; meelemodifier = 1;
blockInput = true;
break; break;
case 0x99AEEB3B: //Pistol50 case 0x99AEEB3B: //Pistol50
modifier = 0.35; modifier = 0.35;
meelemodifier = 1; meelemodifier = 1;
blockInput = true;
break; break;
case 0x2BE6766B: //SMG case 0x2BE6766B: //SMG
modifier = 0.25; modifier = 0.25;
meelemodifier = 1; meelemodifier = 1;
blockInput = true;
break; break;
case 0x1D073A89: //Pumpshotgun case 0x1D073A89: //Pumpshotgun
modifier = 0.2; modifier = 0.2;
meelemodifier = 1; meelemodifier = 1;
blockInput = true;
break; break;
case 0x83BF0278: //Cabinerifle case 0x83BF0278: //Cabinerifle
modifier = 0.2; modifier = 0.2;
meelemodifier = 1; meelemodifier = 1;
blockInput = true;
break; break;
case 0x624FE830: //Compactrifle case 0x624FE830: //Compactrifle
modifier = 0.2; modifier = 0.2;
meelemodifier = 0.1; meelemodifier = 0.1;
blockInput = true;
break; break;
case 0x05FC3C11: //Sniperrifle case 0x05FC3C11: //Sniperrifle
modifier = 0.5; modifier = 0.5;
meelemodifier = 1; meelemodifier = 1;
blockInput = true;
break; break;
case 0xA2719263: //Meele Umarmed Fist case 0xA2719263: //Meele Umarmed Fist
meelemodifier = 0.1; meelemodifier = 0.1;
modifier = 1; modifier = 1;
blockInput = false;
//mp.gui.chat.push("FistModifier: " + meelemodifier); //mp.gui.chat.push("FistModifier: " + meelemodifier);
break; break;
case 0x958A4A8F: //Meele Baseball Bat case 0x958A4A8F: //Meele Baseball Bat
meelemodifier = 0.15; meelemodifier = 0.15;
modifier = 1; modifier = 1;
blockInput = false;
break; break;
case 0x8BB05FD7: //Meele Flashlight case 0x8BB05FD7: //Meele Flashlight
meelemodifier = 0.1; meelemodifier = 0.1;
modifier = 1; modifier = 1;
blockInput = false;
break; break;
case 0xD8DF3C3C: //Meele Knuckle case 0xD8DF3C3C: //Meele Knuckle
meelemodifier = 0.1; meelemodifier = 0.1;
modifier = 1; modifier = 1;
blockInput = false;
//mp.gui.chat.push("KnuckleModifier: " + meelemodifier); //mp.gui.chat.push("KnuckleModifier: " + meelemodifier);
break; break;
case 0x678B81B1: //Meele Nightstick case 0x678B81B1: //Meele Nightstick
meelemodifier = 0.1; meelemodifier = 0.1;
modifier = 1; modifier = 1;
blockInput = false;
break; break;
default: default:
modifier = 1; modifier = 1;
meelemodifier = 1; meelemodifier = 1;
blockInput = false;
break; break;
} }