nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-25 21:31:28 +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-03-02 22:07:48 -05:00
commit 7b0cee2d15
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1714,6 +1714,7 @@ void() Load_Mbox_Data =
for (float i = 0; i < 25; i++) { for (float i = 0; i < 25; i++) {
BoxWeapons[i] = 1; BoxWeapons[i] = 1;
} }
fclose(file);
} else { } else {
// Parse each Line and write the Data into our Array. // Parse each Line and write the Data into our Array.
for (float i = 0; i < 25; i++) { for (float i = 0; i < 25; i++) {
@ -1739,6 +1740,8 @@ void() Load_Mbox_Data =
precache_extra(Getweaponid(i)); precache_extra(Getweaponid(i));
} }
} }
fclose(file);
} }
void() mystery_box = void() mystery_box =

42
source/shared/weapon_defines.qc
View file

@ -1075,12 +1075,12 @@ float(float wep, float delaytype) getWeaponDelay =
return 0.5; return 0.5;
case W_FG: case W_FG:
if (delaytype == RELOAD) if (delaytype == RELOAD)
return 2.6; return 3.0;
else if (delaytype == FIRE) else if (delaytype == FIRE)
return 0.075; return 0.075;
case W_IMPELLER: case W_IMPELLER:
if (delaytype == RELOAD) if (delaytype == RELOAD)
return 2.6; return 3.0;
else if (delaytype == FIRE) else if (delaytype == FIRE)
return 0.068; return 0.068;
case W_GEWEHR: case W_GEWEHR:
@ -1293,7 +1293,7 @@ vector GetWeaponADSPos(float wep) {
return [2.0, 2.9, 1.0]; return [2.0, 2.9, 1.0];
case W_FG: case W_FG:
case W_IMPELLER: case W_IMPELLER:
return [-6.5, 7.4, 3.27]; return [-6.5, 5.85, .88];
case W_GEWEHR: case W_GEWEHR:
case W_COMPRESSOR: case W_COMPRESSOR:
return [-0.2, 2.55, 2.63]; return [-0.2, 2.55, 2.63];
@ -1382,7 +1382,7 @@ vector GetWeaponADSOfs_PSP(float wep) =
return [-3903.3, 2564.5, 0]; return [-3903.3, 2564.5, 0];
case W_FG: case W_FG:
case W_IMPELLER: case W_IMPELLER:
return [-14800, 6000, 0]; return [-11798, 1800, -5000];
case W_RAY: case W_RAY:
case W_PORTER: case W_PORTER:
return [-12700, 2086.9, 0]; return [-12700, 2086.9, 0];
@ -1738,31 +1738,31 @@ float(float wep, float frametype, optional float z) GetFrame =
switch (frametype) switch (frametype)
{ {
case FIRE_START: case FIRE_START:
return 1; return 0;
case FIRE_END: case FIRE_END:
return 3; return 2;
case RELOAD_START: case RELOAD_START:
return 41; return 3;
case RELOAD_END: case RELOAD_END:
return 88;
case SPRINT_IN_START:
return 29; return 29;
case SPRINT_IN_START:
return 35;
case SPRINT_IN_END: case SPRINT_IN_END:
return 33; return 36;
case SPRINT_OUT_START: case SPRINT_OUT_START:
return 34; return 36;
case SPRINT_OUT_END: case SPRINT_OUT_END:
return 37; return 37;
case TAKE_OUT_START: case TAKE_OUT_START:
return 8; return 32;
case TAKE_OUT_END: case TAKE_OUT_END:
return 15; return 34;
case PUT_OUT_START: case PUT_OUT_START:
return 3; return 30;
case PUT_OUT_END: case PUT_OUT_END:
return 7; return 32;
case RELOAD_CANCEL: case RELOAD_CANCEL:
return 64; return 15;
} }
break; break;
case W_GEWEHR: case W_GEWEHR:
@ -2917,13 +2917,13 @@ void (float wep, float anim_style, float dualwep, float curweaponframe) PlayWeap
break; break;
case W_FG: case W_FG:
case W_IMPELLER: case W_IMPELLER:
if (curweaponframe == 43) { if (curweaponframe == 6) {
sound (self ,5, "sounds/weapons/fg42/magout.wav", 1, ATTN_NORM); sound (self ,5, "sounds/weapons/fg42/magout.wav", 1, ATTN_NORM);
} else if (curweaponframe == 60) { } else if (curweaponframe == 14) {
sound (self ,5, "sounds/weapons/fg42/magin.wav", 1, ATTN_NORM); sound (self ,5, "sounds/weapons/fg42/magin.wav", 1, ATTN_NORM);
} else if (curweaponframe == 72) { } else if (curweaponframe == 23) {
sound (self ,5, "sounds/weapons/fg42/boltback.wav", 1, ATTN_NORM); sound (self ,5, "sounds/weapons/fg42/boltback.wav", 1, ATTN_NORM);
} else if (curweaponframe == 77) { } else if (curweaponframe == 26) {
sound (self ,5, "sounds/weapons/fg42/boltforward.wav", 1, ATTN_NORM); sound (self ,5, "sounds/weapons/fg42/boltforward.wav", 1, ATTN_NORM);
} }
break; break;
@ -3921,7 +3921,7 @@ vector (float wep) GetWeaponFlash_Offset =
return [3899, -5021, 78199]; return [3899, -5021, 78199];
case W_FG: case W_FG:
case W_IMPELLER: case W_IMPELLER:
return [14000, -12000, 110000]; return [14000, -10000, 70000];
case W_GEWEHR: case W_GEWEHR:
case W_COMPRESSOR: case W_COMPRESSOR:
return [6500, -8500, 65000]; return [6500, -8500, 65000];