dkanus/NicePack
dkanus/NicePack
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Wiki Activity

Patch [Version 0.3.4 "Private balance round #3"]

Browse source
This commit is contained in:
Anton Tarasenko 2021-06-11 21:10:09 +07:00
commit c536198a52
76 changed files with 376 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sources/Weapons/BaseWeaponClasses/Pistols/NiceDualies.uc
View file

@ -1,4 +1,5 @@
class NiceDualies extends NiceWeapon;
var bool startedWithFullPistol;
var class<NiceSingle> SingleClass;
var name altFlashBoneName;
var name altTPAnim;
@ -45,6 +46,22 @@ simulated function SetupDualReloadEvents(){
record.eventFrame = rightInsert;
relEvents[relEvents.Length] = record;
}
exec simulated function ClientReloadMeNow(){
startedWithFullPistol = false;
if ( MagAmmoRemLeftClient >= GetSingleMagCapacity()
|| MagAmmoRemRightClient >= GetSingleMagCapacity()) {
startedWithFullPistol = true;
}
super.ClientReloadMeNow();
}
simulated function float GetCurrentReloadMult(){
local float normalMultiplier;
normalMultiplier = super.GetCurrentReloadMult();
if (startedWithFullPistol) {
return normalMultiplier * 2;
}
return normalMultiplier;
}
// Don't use that one for dualies
simulated function AddReloadedAmmo(){}
// Use this one

2
sources/Weapons/BaseWeaponClasses/Pistols/NiceSingle.uc
View file

@ -50,7 +50,7 @@ function ServerSwitchToOtherSingle(){
MagAmmoRemaining = otherMagazine;
otherMagazine = swap;
ClientSetMagSize(MagAmmoRemaining, bRoundInChamber);
//nicePawn.ClientChangeWeapon(self);
nicePawn.ClientChangeWeapon(self);
}
function ServerSwitchToDual(){
local int m;