Mustang and Sally Update

Code for Mustang and Sally

still need to get positions for dual wielded muzzle flash
This commit is contained in:
DerpedCrusader 2023-10-27 01:38:43 -07:00
parent 03e8dde46b
commit 49ce8480f4

View file

@ -1065,13 +1065,13 @@ float(float wep, float delaytype) getWeaponDelay =
return 0.3; return 0.3;
case W_BIATCH: case W_BIATCH:
if (delaytype == RELOAD) if (delaytype == RELOAD)
return 1.8; return 1.66;
else if (delaytype == FIRE) else if (delaytype == FIRE)
return 0.225; return 0.225;
else if (delaytype == PUTOUT) else if (delaytype == PUTOUT)
return 0.4; return 0.15;
else if (delaytype == TAKEOUT) else if (delaytype == TAKEOUT)
return 0.3; return 0.60;
case W_ARMAGEDDON: case W_ARMAGEDDON:
case W_KAR: case W_KAR:
if (delaytype == RELOAD) if (delaytype == RELOAD)
@ -1748,31 +1748,31 @@ float(float wep, float frametype, optional float z) GetFrame =
case FIRE_END: case FIRE_END:
return 2; return 2;
case RELOAD_START: case RELOAD_START:
return 3; return 20;
case RELOAD_END: case RELOAD_END:
return 36; return 49;
case SPRINT_IN_START: case SPRINT_IN_START:
return 33; return 9;
case SPRINT_IN_END: case SPRINT_IN_END:
return 34; return 11;
case SPRINT_START: case SPRINT_START:
return 44; return 12;
case SPRINT_END: case SPRINT_END:
return 43; return 16;
case SPRINT_OUT_START: case SPRINT_OUT_START:
return 50; return 17;
case SPRINT_OUT_END: case SPRINT_OUT_END:
return 42; return 18;
case TAKE_OUT_START: case TAKE_OUT_START:
return 39; return 5;
case TAKE_OUT_END: case TAKE_OUT_END:
return 42; return 8;
case PUT_OUT_START: case PUT_OUT_START:
return 36; return 3;
case PUT_OUT_END: case PUT_OUT_END:
return 39; return 5;
case RELOAD_CANCEL: case RELOAD_CANCEL:
return 13; return 30;
} }
break; break;
case W_KAR: case W_KAR:
@ -3463,12 +3463,14 @@ void (float wep, float anim_style, float dualwep, float curweaponframe) PlayWeap
} }
break; break;
case W_BIATCH: case W_BIATCH:
if (curweaponframe == 10) { if (curweaponframe == 23) {
sound (self ,5, "sounds/weapons/colt/magout.wav", 1, ATTN_NORM); sound (self ,5, "sounds/weapons/colt/magout.wav", 1, ATTN_NORM);
} else if (curweaponframe == 19) { } else if (curweaponframe ==30) {
sound (self ,5, "sounds/weapons/colt/magin.wav", 1, ATTN_NORM); sound (self ,5, "sounds/weapons/colt/magin.wav", 1, ATTN_NORM);
} else if(curweaponframe == 26) { } else if(curweaponframe == 36) {
sound (self ,5, "sounds/weapons/colt/slide.wav", 1, ATTN_NORM); sound (self ,5, "sounds/weapons/biatch/slideback.wav", 1, ATTN_NORM);
} else if(curweaponframe == 42) {
sound (self ,5, "sounds/weapons/biatch/sliderelease.wav", 1, ATTN_NORM);
} }
break; break;
case W_TESLA: case W_TESLA:
@ -3502,6 +3504,8 @@ void(float weptype) precache_extra =
case W_COLT: case W_COLT:
case W_BIATCH: case W_BIATCH:
precache_sound("sounds/weapons/colt/shoot.wav"); precache_sound("sounds/weapons/colt/shoot.wav");
precache_sound("sounds/weapons/biatch/slideback.wav");
precache_sound("sounds/weapons/biatch/sliderelease.wav");
precache_sound("sounds/weapons/colt/magout.wav"); precache_sound("sounds/weapons/colt/magout.wav");
precache_sound("sounds/weapons/colt/magin.wav"); precache_sound("sounds/weapons/colt/magin.wav");
precache_sound("sounds/weapons/colt/slide.wav"); precache_sound("sounds/weapons/colt/slide.wav");