nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-02-16 17:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: Have browning use RELOAD_PART and RELOAD_END

Browse source
This commit is contained in:
Steam Deck User 2023-02-17 12:25:30 -05:00
parent 0435d8cafb
commit 6cadd1d0e2
2 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/server/weapons/weapon_core.qc
View file

@ -399,12 +399,7 @@ void() ContinueReload = //Special reloads
}
self.reloadinterupted = FALSE;
} else if (self.currentmag < getWeaponMag(self.weapon)) {
if (self.weapon == W_BROWNING || self.weapon == W_ACCELERATOR) {
delay = 4;
startframe = 45;
endframe = 77;
endanimfunc = W_Give_Ammo;
} else if (self.weapon == W_KAR_SCOPE || self.weapon == W_HEADCRACKER) {
if (self.weapon == W_KAR_SCOPE || self.weapon == W_HEADCRACKER) {
self.currentmag++;
self.currentammo = self.currentammo - 1;
delay = 0.8;
@ -512,22 +507,7 @@ void(float side) W_Reload =
delay = getWeaponDelay(self.weapon,RELOAD);
void(optional float t) endanimfunc = SUB_Null;
// TODO: Make browning use new reload status frames
if (self.weapon == W_BROWNING || self.weapon == W_ACCELERATOR) {
if (!self.currentmag) {
startframe = 26;
endframe = 77;
reloadcancelframe = 45;
delay = 6;
endanimfunc = W_Give_Ammo;
} else if (self.currentmag > 0) {
startframe = 4;
endframe = 25;
reloadcancelframe = 0;
delay = 3.5;
endanimfunc = ContinueReload;
}
} else if (self.weapon == W_KAR_SCOPE || self.weapon == W_HEADCRACKER ){
if (self.weapon == W_KAR_SCOPE || self.weapon == W_HEADCRACKER ){
startframe = 14;
endframe = 18;
reloadcancelframe = 0;

18
source/shared/weapon_defines.qc
View file

@ -1152,8 +1152,12 @@ float(float wep, float delaytype) getWeaponDelay =
else if (delaytype == FIRE)
return 0.12;
case W_BROWNING:
if (delaytype == RELOAD_EMP)
return 2.5;
if (delaytype == RELOAD_PAR)
return 3.5;
if (delaytype == RELOAD)
return 7;
return 3.5;
else if (delaytype == FIRE)
return 0.104;
case W_ACCELERATOR:
@ -1735,10 +1739,18 @@ float(float wep, float frametype, optional float z) GetFrame =
return 1;
case FIRE_END:
return 3;
case RELOAD_START:
case RELOAD_EMPTY_START:
return 26;
case RELOAD_EMPTY_END:
return 44;
case RELOAD_PART_START:
return 4;
case RELOAD_PART_END:
return 44;
case RELOAD_START:
return 45;
case RELOAD_END:
return 37;
return 77;
case SPRINT_IN_START:
return 92;
case SPRINT_IN_END: