Stedd
/
FPSGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Weapon tuning

This commit is contained in:
Stedd 2022-11-06 15:11:13 +01:00
parent ca9c8ad52e
commit 4bb297eff3
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Player/Prefabs/PlayerCapsule.prefab
View File

@ -66,15 +66,19 @@ MonoBehaviour:
_ammoSlots: _ammoSlots:
- <AmmoType>k__BackingField: 0 - <AmmoType>k__BackingField: 0
<MaxBeltAmmoAmount>k__BackingField: 10 <MaxBeltAmmoAmount>k__BackingField: 10
<StartingBeltAmmoAmount>k__BackingField: 2
<CurrentBeltAmmoAmount>k__BackingField: 0 <CurrentBeltAmmoAmount>k__BackingField: 0
- <AmmoType>k__BackingField: 1 - <AmmoType>k__BackingField: 1
<MaxBeltAmmoAmount>k__BackingField: 30 <MaxBeltAmmoAmount>k__BackingField: 30
<StartingBeltAmmoAmount>k__BackingField: 10
<CurrentBeltAmmoAmount>k__BackingField: 0 <CurrentBeltAmmoAmount>k__BackingField: 0
- <AmmoType>k__BackingField: 2 - <AmmoType>k__BackingField: 2
<MaxBeltAmmoAmount>k__BackingField: 200 <MaxBeltAmmoAmount>k__BackingField: 200
<StartingBeltAmmoAmount>k__BackingField: 45
<CurrentBeltAmmoAmount>k__BackingField: 0 <CurrentBeltAmmoAmount>k__BackingField: 0
- <AmmoType>k__BackingField: 3 - <AmmoType>k__BackingField: 3
<MaxBeltAmmoAmount>k__BackingField: 15 <MaxBeltAmmoAmount>k__BackingField: 15
<StartingBeltAmmoAmount>k__BackingField: 6
<CurrentBeltAmmoAmount>k__BackingField: 0 <CurrentBeltAmmoAmount>k__BackingField: 0
_S_currentBeltAmmoAmount: {fileID: 11400000, guid: f19d1fc1d5102a545800f4f8273640b1, type: 2} _S_currentBeltAmmoAmount: {fileID: 11400000, guid: f19d1fc1d5102a545800f4f8273640b1, type: 2}
_currentWeaponAmmoType: 0 _currentWeaponAmmoType: 0

3
Assets/Weapons/Prefabs/Crossbow.prefab
View File

@ -80,7 +80,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ammoType: 0 _ammoType: 0
_index: 0
_range: 100 _range: 100
_weaponDamage: 100 _weaponDamage: 100
_timeBetweenShots: 2 _timeBetweenShots: 2
@ -89,6 +88,7 @@ MonoBehaviour:
_muzzleFlash: {fileID: 0} _muzzleFlash: {fileID: 0}
_bulletImpact: {fileID: 252487699782519274, guid: 82851982cb47c134a8403ffcb052b9d2, type: 3} _bulletImpact: {fileID: 252487699782519274, guid: 82851982cb47c134a8403ffcb052b9d2, type: 3}
_ammo: {fileID: 1537282594975695390} _ammo: {fileID: 1537282594975695390}
_index: 0
_canShoot: 0 _canShoot: 0
--- !u!114 &1537282594975695390 --- !u!114 &1537282594975695390
MonoBehaviour: MonoBehaviour:
@ -106,7 +106,6 @@ MonoBehaviour:
_maxMagAmmoAmount: 1 _maxMagAmmoAmount: 1
_currentMagAmmoAmount: 0 _currentMagAmmoAmount: 0
_ammoBelt: {fileID: 0} _ammoBelt: {fileID: 0}
_S_currentBeltAmmoAmount: {fileID: 11400000, guid: f19d1fc1d5102a545800f4f8273640b1, type: 2}
_S_currentMagAmmoAmount: {fileID: 11400000, guid: 9a77ec14c64717643bed1c6e7a3885ae, type: 2} _S_currentMagAmmoAmount: {fileID: 11400000, guid: 9a77ec14c64717643bed1c6e7a3885ae, type: 2}
--- !u!114 &7047714336720636310 --- !u!114 &7047714336720636310
MonoBehaviour: MonoBehaviour:

8
Assets/Weapons/Prefabs/Handgun.prefab
View File

@ -46,10 +46,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01ef216392c8f33409f2efcd91f4e510, type: 3} m_Script: {fileID: 11500000, guid: 01ef216392c8f33409f2efcd91f4e510, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ammoType: 2 _ammoType: 1
_range: 100 _range: 100
_weaponDamage: 25 _weaponDamage: 16.666666
_timeBetweenShots: 0.5 _timeBetweenShots: 0.25
_timeBetweenReloads: 1.5 _timeBetweenReloads: 1.5
_fpCamera: {fileID: 0} _fpCamera: {fileID: 0}
_muzzleFlash: {fileID: 0} _muzzleFlash: {fileID: 0}
@ -70,7 +70,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ammoType: 1 _ammoType: 1
_maxMagAmmoAmount: 4 _maxMagAmmoAmount: 12
_currentMagAmmoAmount: 0 _currentMagAmmoAmount: 0
_ammoBelt: {fileID: 0} _ammoBelt: {fileID: 0}
_S_currentMagAmmoAmount: {fileID: 11400000, guid: 9a77ec14c64717643bed1c6e7a3885ae, type: 2} _S_currentMagAmmoAmount: {fileID: 11400000, guid: 9a77ec14c64717643bed1c6e7a3885ae, type: 2}

4
Assets/Weapons/Prefabs/MachineGun.prefab
View File

@ -48,9 +48,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01ef216392c8f33409f2efcd91f4e510, type: 3} m_Script: {fileID: 11500000, guid: 01ef216392c8f33409f2efcd91f4e510, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ammoType: 1 _ammoType: 2
_range: 100 _range: 100
_weaponDamage: 4 _weaponDamage: 9.090909
_timeBetweenShots: 0.1 _timeBetweenShots: 0.1
_timeBetweenReloads: 1.5 _timeBetweenReloads: 1.5
_fpCamera: {fileID: 0} _fpCamera: {fileID: 0}

9
Assets/Weapons/Prefabs/Revolver.prefab
View File

@ -51,15 +51,15 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ammoType: 3 _ammoType: 3
_index: 0
_range: 100 _range: 100
_weaponDamage: 50 _weaponDamage: 33.333332
_timeBetweenShots: 1 _timeBetweenShots: 0.35
_timeBetweenReloads: 1.5 _timeBetweenReloads: 1.5
_fpCamera: {fileID: 0} _fpCamera: {fileID: 0}
_muzzleFlash: {fileID: 6070271853189258210} _muzzleFlash: {fileID: 6070271853189258210}
_bulletImpact: {fileID: 252487699782519274, guid: 82851982cb47c134a8403ffcb052b9d2, type: 3} _bulletImpact: {fileID: 252487699782519274, guid: 82851982cb47c134a8403ffcb052b9d2, type: 3}
_ammo: {fileID: 8817107657672854186} _ammo: {fileID: 8817107657672854186}
_index: 0
_canShoot: 0 _canShoot: 0
--- !u!114 &8817107657672854186 --- !u!114 &8817107657672854186
MonoBehaviour: MonoBehaviour:
@ -74,10 +74,9 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_ammoType: 3 _ammoType: 3
_maxMagAmmoAmount: 7 _maxMagAmmoAmount: 6
_currentMagAmmoAmount: 3 _currentMagAmmoAmount: 3
_ammoBelt: {fileID: 0} _ammoBelt: {fileID: 0}
_S_currentBeltAmmoAmount: {fileID: 11400000, guid: f19d1fc1d5102a545800f4f8273640b1, type: 2}
_S_currentMagAmmoAmount: {fileID: 11400000, guid: 9a77ec14c64717643bed1c6e7a3885ae, type: 2} _S_currentMagAmmoAmount: {fileID: 11400000, guid: 9a77ec14c64717643bed1c6e7a3885ae, type: 2}
--- !u!114 &3637412066234339666 --- !u!114 &3637412066234339666
MonoBehaviour: MonoBehaviour:

3
Assets/Weapons/Scripts/AmmoBelt.cs
View File

@ -21,6 +21,7 @@ public class AmmoBelt : MonoBehaviour
{ {
[field: SerializeField] public AmmoType AmmoType { get; set; } [field: SerializeField] public AmmoType AmmoType { get; set; }
[field: SerializeField] public int MaxBeltAmmoAmount { get; set; } [field: SerializeField] public int MaxBeltAmmoAmount { get; set; }
[field: SerializeField] public int StartingBeltAmmoAmount { get; set; }
[field: SerializeField] public int CurrentBeltAmmoAmount { get; set; } [field: SerializeField] public int CurrentBeltAmmoAmount { get; set; }
} }
@ -46,7 +47,7 @@ public class AmmoBelt : MonoBehaviour
{ {
foreach (AmmoSlot ammoSlot in _ammoSlots) foreach (AmmoSlot ammoSlot in _ammoSlots)
{ {
ammoSlot.CurrentBeltAmmoAmount = ammoSlot.MaxBeltAmmoAmount; ammoSlot.CurrentBeltAmmoAmount = ammoSlot.StartingBeltAmmoAmount;
} }
} }