Little projectile enhancements (#764)

*  Little projectile enhancements

*  Lets see if this fixes my fuck up

* Im a weapon smoothbrain. This fixes caliber folders name
This commit is contained in:
AJCM-git
2020-03-01 04:09:30 -04:00
committed by GitHub
parent 196950fb7e
commit 81ab31659b
24 changed files with 72 additions and 76 deletions

View File

@@ -2,7 +2,7 @@
id: bullet_10mm
name: 10mm Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_10mmf
name: 10mm Bullet (Flash)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_10mmhv
name: 10mm Bullet (High-Velocity)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_10mml
name: 10mm Bullet (L)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_10mmp
name: 10mm Bullet (Practice)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_10mmr
name: 10mm Bullet (Rubber)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,9 +2,9 @@
id: pellet_12g
name: 12g Pellet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
damages:
Brute: 10
Brute: 10

View File

@@ -2,9 +2,9 @@
id: bullet_20mm
name: 20mm Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
damages:
Brute: 10
Brute: 10

View File

@@ -2,7 +2,7 @@
id: bullet_24mm
name: 24mm Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_24mmf
name: 24mm Bullet (Flash)
parent: bullet_basef
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_24mmhv
name: 24mm Bullet (High-Velocity)
parent: bullet_basehv
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 27
@@ -35,7 +35,7 @@
id: bullet_24mml
name: 24mm Bullet (L)
parent: bullet_basel
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_24mmp
name: 24mm Bullet (Practice)
parent: bullet_basep
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_24mmr
name: 24mm Bullet (Rubber)
parent: bullet_baser
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_45mm
name: .45mm Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_45mmf
name: .45mm Bullet (Flash)
parent: bullet_basef
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_45mmhv
name: .45mm Bullet (High-Velocity)
parent: bullet_basehv
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_45mml
name: .45mm Bullet (L)
parent: bullet_basel
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_45mmp
name: .45mm Bullet (Practice)
parent: bullet_basep
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_45mmr
name: .45mm Bullet (Rubber)
parent: bullet_baser
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_556mm
name: 5.56mm Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_556mmf
name: 5.56mm Bullet (Flash)
parent: bullet_basef
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_556mmhv
name: 5.56mm Bullet (High-Velocity)
parent: bullet_basehv
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_556mml
name: 5.56mm Bullet (L)
parent: bullet_basel
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_556mmp
name: 5.56mm Bullet (Practice)
parent: bullet_basep
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_556mmr
name: 5.56mm Bullet (Rubber)
parent: bullet_baser
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_65mm
name: 6.5mm Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_65mmf
name: 6.5mm Bullet (Flash)
parent: bullet_basef
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_65mmhv
name: 6.5mm Bullet (High-Velocity)
parent: bullet_basehv
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_65mml
name: 6.5mm Bullet (L)
parent: bullet_basel
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_65mmp
name: 6.5mm Bullet (Practice)
parent: bullet_basep
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_65mmr
name: 6.5mm Bullet (Rubber)
parent: bullet_baser
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_762mm
name: 7.62mm Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_762mmf
name: 7.62mm Bullet (Flash)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_762mmhv
name: 7.62mm Bullet (High-Velocity)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_762mml
name: 7.62mm Bullet (L)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_762mmp
name: 7.62mm Bullet (Practice)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_762mmr
name: 7.62mm Bullet (Rubber)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_9mm
name: 9mm Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_9mmf
name: 9mm Bullet (Flash)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_9mmhv
name: 9mm Bullet (High-Velocity)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_9mml
name: 9mm Bullet (L)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_9mmp
name: 9mm Bullet (Practice)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_9mmr
name: 9mm Bullet (Rubber)
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_32
name: .32 Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_32f
name: .32 Bullet (Flash)
parent: bullet_basef
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_32hv
name: .32 Bullet (High-Velocity)
parent: bullet_basehv
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_32l
name: .32 Bullet (L)
parent: bullet_basel
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_32p
name: .32 Bullet (Practice)
parent: bullet_basep
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_32r
name: .32 Bullet (Rubber)
parent: bullet_baser
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_357
name: .357 Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_357f
name: .357 Bullet (Flash)
parent: bullet_basef
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_357hv
name: .357 Bullet (High-Velocity)
parent: bullet_basehv
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_357l
name: .357 Bullet (L)
parent: bullet_basel
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_357p
name: .357 Bullet (Practice)
parent: bullet_basep
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_357r
name: .357 Bullet (Rubber)
parent: bullet_baser
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_44
name: .44 Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_44f
name: .44 Bullet (Flash)
parent: bullet_basef
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_44hv
name: .44 Bullet (High-Velocity)
parent: bullet_basehv
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_44l
name: .44 Bullet (L)
parent: bullet_basel
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_44p
name: .44 Bullet (Practice)
parent: bullet_basep
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_44r
name: .44 Bullet (Rubber)
parent: bullet_baser
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,7 +2,7 @@
id: bullet_50
name: .50 cal Bullet
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -13,7 +13,7 @@
id: bullet_50f
name: .50 cal Bullet (Flash)
parent: bullet_basef
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -24,7 +24,7 @@
id: bullet_50hv
name: .50 cal Bullet (High-Velocity)
parent: bullet_basehv
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 30
@@ -35,7 +35,7 @@
id: bullet_50l
name: .50 cal Bullet (L)
parent: bullet_basel
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -46,7 +46,7 @@
id: bullet_50p
name: .50 cal Bullet (Practice)
parent: bullet_basep
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20
@@ -57,7 +57,7 @@
id: bullet_50r
name: .50 cal Bullet (Rubber)
parent: bullet_baser
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
velocity: 20

View File

@@ -2,9 +2,10 @@
- type: entity
id: bullet_base
name: bullet_base
description: If you can see this you're dead!
description: If you can see this you're probably dead!
abstract: true
components:
- type: Clickable
- type: Sprite
directional: false
texture: Objects/Projectiles/bullet.png
@@ -34,7 +35,6 @@
id: bullet_basef
name: Base Bullet Flash
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
@@ -46,7 +46,6 @@
id: bullet_basehv
name: Base Bullet High-Velocity
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
@@ -58,7 +57,6 @@
id: bullet_basel
name: Base Bullet L
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
@@ -70,7 +68,6 @@
id: bullet_basep
name: Base Bullet Practice
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile
@@ -82,7 +79,6 @@
id: bullet_baser
name: Base Bullet Rubber
parent: bullet_base
description: If you can see this you're dead!
abstract: true
components:
- type: Projectile