Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ranger whitelist fix #309

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
id: N14WeaponRevolverCaptainMagnun
description: A true freedom fighter carries his flag everywhere, even on his gun. Uses .44 magnum ammo.
components:
- type: Gun
fireRate: 2
- type: Sprite
sprite: _Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi
- type: Clothing
Expand Down Expand Up @@ -89,6 +91,8 @@
id: N14Weaponwildwhisper
description: Its said that after a troublemaker get shoot down with this revolver some words are whispered to their ears, no one knows what the question is, but the awnser is always "innocent". Uses .45-70 gov't ammo.
components:
- type: Gun
fireRate: 2
- type: Sprite
sprite: _Nuclear14/Objects/Weapons/Guns/Revolvers/wild_whisper.rsi
- type: Clothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
minAngle: 24
maxAngle: 45
angleIncrease: 4
angleDecay: 16
angleDecay: 16
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
- type: ItemSlots
Expand Down Expand Up @@ -85,9 +85,9 @@
maxAngle: -38
- type: Gun
minAngle: 24
maxAngle: 45
maxAngle: 50
angleIncrease: 4
angleDecay: 16
angleDecay: 16
fireRate: 4
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
Expand Down Expand Up @@ -144,7 +144,7 @@
minAngle: 24
maxAngle: 45
angleIncrease: 4
angleDecay: 16
angleDecay: 16
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
selectedMode: FullAuto
Expand Down Expand Up @@ -204,7 +204,7 @@
minAngle: 24
maxAngle: 45
angleIncrease: 4
angleDecay: 16
angleDecay: 16
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg
fireRate: 5
Expand Down Expand Up @@ -259,10 +259,10 @@
minAngle: -21
maxAngle: -43
- type: Gun
minAngle: 24
maxAngle: 45
minAngle: 18
maxAngle: 40
angleIncrease: 4
angleDecay: 16
angleDecay: 16
fireRate: 5
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
Expand Down Expand Up @@ -316,13 +316,13 @@
autoEject: true
- type: Wieldable
- type: GunWieldBonus
minAngle: -22
maxAngle: -59
minAngle: -23
maxAngle: -56
- type: Gun
minAngle: 24
maxAngle: 60
angleIncrease: 4
angleDecay: 16
angleDecay: 16
fireRate: 2
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
Expand Down Expand Up @@ -375,12 +375,12 @@
- type: Wieldable
- type: GunWieldBonus
minAngle: -21
maxAngle: -43
maxAngle: -40
- type: Gun
minAngle: 24
maxAngle: 45
maxAngle: 48
angleIncrease: 4
angleDecay: 16
angleDecay: 16
fireRate: 4
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
- type: Item
sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi
- type: Gun
fireRate: 10
fireRate: 9
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
selectedMode: Fullauto
availableModes:
- Fullauto
minAngle: 8
maxAngle: 16
angleIncrease: 4
maxAngle: 48
angleIncrease: 6
angleDecay: 16
- type: Wieldable
- type: GunWieldBonus
Expand Down Expand Up @@ -82,7 +82,7 @@
availableModes:
- FullAuto
minAngle: 12
maxAngle: 24
maxAngle: 40
angleIncrease: 4
angleDecay: 16
- type: Wieldable
Expand Down Expand Up @@ -142,7 +142,7 @@
availableModes:
- Fullauto
minAngle: 8
maxAngle: 16
maxAngle: 56
angleIncrease: 4
angleDecay: 16
- type: Wieldable
Expand Down Expand Up @@ -202,7 +202,7 @@
availableModes:
- Fullauto
minAngle: 8
maxAngle: 16
maxAngle: 56
angleIncrease: 4
angleDecay: 16
- type: Wieldable
Expand Down Expand Up @@ -317,7 +317,7 @@
availableModes:
- Fullauto
minAngle: 8
maxAngle: 16
maxAngle: 24
angleIncrease: 4
angleDecay: 16
- type: Wieldable
Expand Down Expand Up @@ -374,7 +374,7 @@
availableModes:
- Fullauto
minAngle: 8
maxAngle: 16
maxAngle: 30
angleIncrease: 4
angleDecay: 16
- type: Wieldable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
minAngle: 24
maxAngle: 105
angleIncrease: 4
angleDecay: 16
angleDecay: 16
- type: BallisticAmmoProvider
whitelist:
tags:
- N14Cartridge308Rifle
capacity: 10
proto: N14Cartridge308Rifle
- type: Gun
fireRate: 2

- type: entity
name: Anti-Materiel rifle
Expand All @@ -51,9 +53,11 @@
maxAngle: 105
angleIncrease: 4
angleDecay: 16
- type: Gun
fireRate: 1.2

- type: entity
name: .50 NCR rifle
name: .50 NCR rifle
parent: N14WeaponAntiMateriel
id: N14Weapon50NcrRifle
description: A try by the NCR to make .50 ammo a standart on normal infantry, very cheap but it will deal a lot of damage. Uses .50 anti-material ammo.
Expand Down Expand Up @@ -89,8 +93,8 @@
minAngle: 24
maxAngle: 105
angleIncrease: 4
angleDecay: 16
fireRate: 1
angleDecay: 16
fireRate: 2
- type: BallisticAmmoProvider
whitelist:
tags:
Expand All @@ -111,7 +115,7 @@
- type: Item
sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi
- type: Gun
fireRate: 1
fireRate: 1.2

- type: entity
name: brush gun
Expand Down Expand Up @@ -150,7 +154,7 @@
tags:
- N14Cartridge308Rifle
capacity: 1
proto: N14Cartridge308Rifle
proto: N14Cartridge308Rifle

- type: entity
name: varmint rifle
Expand All @@ -172,10 +176,12 @@
minAngle: 24
maxAngle: 105
angleIncrease: 4
angleDecay: 16
angleDecay: 16
- type: BallisticAmmoProvider
whitelist:
tags:
- N14Cartridge5.56Rifle
capacity: 15
proto: N14Cartridge5.56Rifle
- type: Gun
fireRate: 2
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
name: Republic Ranger
description: the most experienced and robust soldiers form part of this elite group of the NCR army, lead troops or act by yourself under the orders of the republic.
playTimeTracker: NCRRanger
setPreference: false
requirements:
- !type:DepartmentTimeRequirement
department: NCR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
name: Republic Ranger Veteran
description: the most experienced and robust soldiers form part of this elite group of the NCR army, lead troops or act by yourself under the orders of the republic.
playTimeTracker: NCRRangerVeteran
setPreference: false
requirements:
- !type:DepartmentTimeRequirement
department: NCR
Expand Down
Loading