nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-12 23:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/nzp-team/quakec

Browse source
This commit is contained in:
Steam Deck User 2023-02-27 10:28:09 -05:00
commit 4662bf7409
3 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/server/entities/machines.qc
View file

@ -1456,11 +1456,12 @@ void() Float_Change =
if (self.wait <= time)
{
tpspot = find(world, classname, "mystery_box_tp_spot");
if (tpspot && self.owner.spins > 3) {
if (tpspot != world && self.owner.spins > 3) {
teddygen = random();
//bprint(PRINT_HIGH, "found tp spot\n");
} else {
teddygen = 0;
//bprint(PRINT_HIGH, "no spots\n");
//bprint(PRINT_HIGH, "no tp spot or spins < 3\n");
}
self.velocity = '0 0 0';
@ -1470,6 +1471,7 @@ void() Float_Change =
self.weapon = r;
self.nextthink = time + 5;
self.think = Float_Decrease;
//bprint(PRINT_HIGH, "spot not found, or teddygun is > 0.7\n");
return;
}
else {

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

@ -439,6 +439,8 @@ void(float side) W_AdvanceAnim =
endframe = GetFrame(self.weapon, RELOAD_END);
delay = getWeaponDelay(self.weapon, RELOAD);
reloadcancelframe = GetFrame(self.weapon, RELOAD_CANCEL);
if (self.perks & P_SPEED) delay *= 0.5;
modelname = GetWeaponModel(self.weapon, 0);

70
source/shared/weapon_defines.qc
View file

@ -1153,16 +1153,20 @@ float(float wep, float delaytype) getWeaponDelay =
return 0.12;
case W_BROWNING:
if (delaytype == RELOAD_EMP)
return 2.5;
return 2;
if (delaytype == RELOAD_PAR)
return 3.5;
return 3;
if (delaytype == RELOAD)
return 3.5;
return 4.0;
else if (delaytype == FIRE)
return 0.104;
case W_ACCELERATOR:
if (delaytype == RELOAD_EMP)
return 2;
if (delaytype == RELOAD_PAR)
return 3;
if (delaytype == RELOAD)
return 7;
return 4;
else if (delaytype == FIRE)
return 0.088;
case W_DB:
@ -1388,7 +1392,7 @@ vector GetWeaponADSPos(float wep) {
return [2.7, 1.90, 1.27];
case W_BROWNING:
case W_ACCELERATOR:
return [-1.6, 7.7, 6.5];
return [-4.6, 3.95, 1.68];
case W_DB:
case W_BORE:
case W_SAWNOFF:
@ -1511,7 +1515,7 @@ vector GetWeaponADSOfs_PSP(float wep) =
return [-7700, 2200, 0];
case W_BROWNING:
case W_ACCELERATOR:
return [-15200, 11620, 0];
return [-8000, 3020, -7000];
case W_PTRS:
case W_PENETRATOR:
return [-14000, 5386.9, 0];
@ -1738,37 +1742,37 @@ float(float wep, float frametype, optional float z) GetFrame =
case FIRE_START:
return 1;
case FIRE_END:
return 3;
case RELOAD_EMPTY_START:
return 26;
case RELOAD_EMPTY_END:
return 44;
return 2;
case RELOAD_PART_START:
return 4;
case RELOAD_PART_END:
return 44;
return 24;
case RELOAD_EMPTY_START:
return 57;
case RELOAD_EMPTY_END:
return 72;
case RELOAD_START:
return 45;
return 25;
case RELOAD_END:
return 77;
return 54;
case SPRINT_IN_START:
return 92;
return 75;
case SPRINT_IN_END:
return 93;
return 76;
case SPRINT_OUT_START:
return 95;
return 76;
case SPRINT_OUT_END:
return 96;
return 77;
case TAKE_OUT_START:
return 100;
return 79;
case TAKE_OUT_END:
return 103;
return 81;
case PUT_OUT_START:
return 97;
return 77;
case PUT_OUT_END:
return 100;
return 79;
case RELOAD_CANCEL:
return 16;
return 37;
}
break;
case W_SAWNOFF:
@ -2975,25 +2979,21 @@ void (float wep, float anim_style, float dualwep, float curweaponframe) PlayWeap
break;
case W_BROWNING:
case W_ACCELERATOR:
if (curweaponframe == 9) {
if (curweaponframe == 6 || curweaponframe == 60) {
sound (self ,5, "sounds/weapons/browning/boltback.wav", 1, ATTN_NORM);
} else if (curweaponframe == 16) {
} else if (curweaponframe == 16 || curweaponframe == 69) {
sound (self ,5, "sounds/weapons/browning/topopen.wav", 1, ATTN_NORM);
} else if (curweaponframe == 22) {
} else if (curweaponframe == 21) {
sound (self ,5, "sounds/weapons/browning/chainoff.wav", 1, ATTN_NORM);
} else if (curweaponframe == 32) {
sound (self ,5, "sounds/weapons/browning/boltback.wav", 1, ATTN_NORM);
} else if (curweaponframe == 39) {
sound (self ,5, "sounds/weapons/browning/topopen.wav", 1, ATTN_NORM);
} else if (curweaponframe == 49) {
} else if (curweaponframe == 27) {
sound (self ,5, "sounds/weapons/browning/chainon.wav", 1, ATTN_NORM);
} else if (curweaponframe == 53) {
} else if (curweaponframe == 30) {
sound (self ,5, "sounds/weapons/browning/chainplace.wav", 1, ATTN_NORM);
} else if (curweaponframe == 58) {
} else if (curweaponframe == 36) {
sound (self ,5, "sounds/weapons/browning/topclose.wav", 1, ATTN_NORM);
} else if (curweaponframe == 61) {
} else if (curweaponframe == 41) {
sound (self ,5, "sounds/weapons/browning/tophit.wav", 1, ATTN_NORM);
} else if (curweaponframe == 70) {
} else if (curweaponframe == 48) {
sound (self ,5, "sounds/weapons/browning/boltforward.wav", 1, ATTN_NORM);
}
break;