From ee3f6f68649e4ae67133c47122f90c070283a280 Mon Sep 17 00:00:00 2001 From: Nicholas Duffy Date: Sun, 15 Mar 2020 20:43:31 -0600 Subject: [PATCH 1/3] Add FO weapons --- src/data/changelog.yaml | 3 ++ src/data/content-status.yaml | 4 +- src/data/weapons.yaml | 98 ++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 2 deletions(-) diff --git a/src/data/changelog.yaml b/src/data/changelog.yaml index 45d1335..1aeb48d 100644 --- a/src/data/changelog.yaml +++ b/src/data/changelog.yaml @@ -1,4 +1,7 @@ --- +- date: "2020-03-15" + items: + - item: Add Fully Operational weapons. - date: "2020-03-14" items: - item: Add advanced price filter. See table price filters for >=, >, <=, < filtering. diff --git a/src/data/content-status.yaml b/src/data/content-status.yaml index 765c52f..e3347bf 100644 --- a/src/data/content-status.yaml +++ b/src/data/content-status.yaml @@ -2517,8 +2517,8 @@ - book: Fully Operational resource: Weapons source: Viluppo - entered: No - audited: No + entered: Yes + audited: Yes - book: Gadgets and Gear resource: Abilities source: The Outer Rim diff --git a/src/data/weapons.yaml b/src/data/weapons.yaml index 7e8d668..5a5c208 100644 --- a/src/data/weapons.yaml +++ b/src/data/weapons.yaml @@ -3779,3 +3779,101 @@ special: Linked 1 index: 04196a88-99d9-4018-83ef-ca37d68a4869:51 generatedId: f3b675d5-7e84-4551-a282-2c20bbf741e6 +- category: Energy + name: Arakyd LJ-40 Concussion Carbine + skill: Ranged [Heavy] + damage: 8 + crit: 3 + range: Short + encumbrance: 4 + hp: 1 + price: 2500 + restricted: true + rarity: 8 + special: Blast 4, Concussive 1, Knockdown, Limited Ammo 3 + index: Fully Operational:38 + generatedId: 3d96f64c-59ea-41cd-b3c0-0ea99fd04e10 +- category: Energy + name: BlasTech DH-17c Short Carbine + skill: Ranged [Heavy] + damage: 4 + crit: 3 + range: Medium + encumbrance: 3 + hp: 2 + price: 950 + restricted: false + rarity: 6 + special: Auto-fire, Stun Setting + index: Fully Operational:39 + generatedId: e654cd49-dfb5-4c80-8612-79ba78a87698 +- category: Other + name: Czerka M9 "Boomer" Heavy Pistol + skill: Ranged [Light] + damage: 5 + crit: 3 + range: Medium + encumbrance: 3 + hp: 2 + price: 1000 + restricted: false + rarity: 6 + special: Blast 5, Cumbersome 2, Inaccurate 1 + index: Fully Operational:39 + generatedId: cd3e4d29-b3ed-435b-b524-79d220ae5523 +- category: Other + name: Mk VIII Gravitic Mortar Launcher + skill: Gunnery + damage: 4 + crit: "-" + range: Long + encumbrance: 6 + hp: 1 + price: 2800 + restricted: true + rarity: 7 + special: Inaccurate 1, Prepare 1 + index: Fully Operational:39 + generatedId: 76ce5644-f981-479b-b7fd-aff14b7ce80e +- category: Grenade + name: BKX-4 "Shockwave" Grenade + skill: Ranged [Light] + damage: 10 + crit: 5 + range: Short + encumbrance: 1 + hp: 0 + price: 150 + restricted: true + rarity: 5 + special: Blast 8, Knockdown, Disorient 5, Limited Ammo 1 + index: Fully Operational:39 + generatedId: 5dcb6021-cc8d-4362-9035-4b682688205d +- category: Grenade + name: WP-19 Incendiary Grenade + skill: Ranged [Light] + damage: 8 + crit: 3 + range: Short + encumbrance: 1 + hp: 0 + price: 125 + restricted: true + rarity: 6 + special: Blast 8, Burn 4, Limited Ammo 1 + index: Fully Operational:40 + generatedId: 190fa433-b5c7-49e6-bbdd-5fcf2905b203 +- category: Grenade + name: WW-41 CryoBan Grenade + skill: Ranged [Light] + damage: 8 + crit: 2 + range: Short + encumbrance: 1 + hp: 0 + price: 220 + restricted: false + rarity: 7 + special: Blast 6, Disorient 3, Ensnare 3, Limited Ammo 1, Vicious 2 + index: Fully Operational:40 + generatedId: 4cfcdfe1-0887-49d4-940c-6992fdeb95ee From b9c3dd079816487aacfa86044ce21ed1a20b7575 Mon Sep 17 00:00:00 2001 From: Nicholas Duffy Date: Sun, 15 Mar 2020 20:44:17 -0600 Subject: [PATCH 2/3] Add FO armor --- src/data/armor.yaml | 40 ++++++++++++++++++++++++++++++++++++ src/data/changelog.yaml | 2 +- src/data/content-status.yaml | 4 ++-- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/data/armor.yaml b/src/data/armor.yaml index 760975d..b337ac3 100644 --- a/src/data/armor.yaml +++ b/src/data/armor.yaml @@ -878,3 +878,43 @@ rarity: 8 index: 076c8898-25fe-48aa-8b04-0c702133d05e:42 generatedId: fa3f54ae-8d58-423f-8676-d1a27006574e +- name: "Alliance Engineer's Helmet and Vest" + defense: 0 + soak: 1 + price: 75 + restricted: false + encumbrance: 1 + hp: 0 + rarity: 1 + index: Fully Operational:42 + generatedId: 4de3170b-2a2e-42b9-a6c6-815ad3be2051 +- name: Creshaldyne EOD-Mk II Explosives Disposal Armor + defense: 0 + soak: 4 + price: 5300 + restricted: false + encumbrance: 8 + hp: 0 + rarity: 6 + index: Fully Operational:42 + generatedId: 7be67f35-6297-4511-b27d-2e5120ebe43e +- name: "Fabricators' Protective Gear" + defense: 0 + soak: 1 + price: 450 + restricted: false + encumbrance: 1 + hp: 0 + rarity: 1 + index: Fully Operational:43 + generatedId: 0f8bdca7-71e1-4db2-be52-53b6f2a1b6d2 +- name: Pioneer Armor + defense: 0 + soak: 1 + price: 200 + restricted: false + encumbrance: 2 + hp: 1 + rarity: 4 + index: Fully Operational:43 + generatedId: 1d296197-f5fb-4483-9d43-4c4d083f9ead diff --git a/src/data/changelog.yaml b/src/data/changelog.yaml index 1aeb48d..53c21b1 100644 --- a/src/data/changelog.yaml +++ b/src/data/changelog.yaml @@ -1,7 +1,7 @@ --- - date: "2020-03-15" items: - - item: Add Fully Operational weapons. + - item: Add Fully Operational weapons and armor. - date: "2020-03-14" items: - item: Add advanced price filter. See table price filters for >=, >, <=, < filtering. diff --git a/src/data/content-status.yaml b/src/data/content-status.yaml index e3347bf..ec695a7 100644 --- a/src/data/content-status.yaml +++ b/src/data/content-status.yaml @@ -2457,8 +2457,8 @@ - book: Fully Operational resource: Armor source: Viluppo - entered: No - audited: No + entered: Yes + audited: Yes - book: Fully Operational resource: Creatures source: Viluppo From 7b5f50ca1c0adbe1982e528abb492b581ea177fd Mon Sep 17 00:00:00 2001 From: Nicholas Duffy Date: Sun, 15 Mar 2020 20:54:04 -0600 Subject: [PATCH 3/3] Fix FO index name --- src/data/armor.yaml | 8 ++++---- src/data/weapons.yaml | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/data/armor.yaml b/src/data/armor.yaml index b337ac3..e5647eb 100644 --- a/src/data/armor.yaml +++ b/src/data/armor.yaml @@ -886,7 +886,7 @@ encumbrance: 1 hp: 0 rarity: 1 - index: Fully Operational:42 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:42 generatedId: 4de3170b-2a2e-42b9-a6c6-815ad3be2051 - name: Creshaldyne EOD-Mk II Explosives Disposal Armor defense: 0 @@ -896,7 +896,7 @@ encumbrance: 8 hp: 0 rarity: 6 - index: Fully Operational:42 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:42 generatedId: 7be67f35-6297-4511-b27d-2e5120ebe43e - name: "Fabricators' Protective Gear" defense: 0 @@ -906,7 +906,7 @@ encumbrance: 1 hp: 0 rarity: 1 - index: Fully Operational:43 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:43 generatedId: 0f8bdca7-71e1-4db2-be52-53b6f2a1b6d2 - name: Pioneer Armor defense: 0 @@ -916,5 +916,5 @@ encumbrance: 2 hp: 1 rarity: 4 - index: Fully Operational:43 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:43 generatedId: 1d296197-f5fb-4483-9d43-4c4d083f9ead diff --git a/src/data/weapons.yaml b/src/data/weapons.yaml index 5a5c208..14aeb0a 100644 --- a/src/data/weapons.yaml +++ b/src/data/weapons.yaml @@ -3791,7 +3791,7 @@ restricted: true rarity: 8 special: Blast 4, Concussive 1, Knockdown, Limited Ammo 3 - index: Fully Operational:38 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:38 generatedId: 3d96f64c-59ea-41cd-b3c0-0ea99fd04e10 - category: Energy name: BlasTech DH-17c Short Carbine @@ -3805,7 +3805,7 @@ restricted: false rarity: 6 special: Auto-fire, Stun Setting - index: Fully Operational:39 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:39 generatedId: e654cd49-dfb5-4c80-8612-79ba78a87698 - category: Other name: Czerka M9 "Boomer" Heavy Pistol @@ -3819,7 +3819,7 @@ restricted: false rarity: 6 special: Blast 5, Cumbersome 2, Inaccurate 1 - index: Fully Operational:39 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:39 generatedId: cd3e4d29-b3ed-435b-b524-79d220ae5523 - category: Other name: Mk VIII Gravitic Mortar Launcher @@ -3833,7 +3833,7 @@ restricted: true rarity: 7 special: Inaccurate 1, Prepare 1 - index: Fully Operational:39 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:39 generatedId: 76ce5644-f981-479b-b7fd-aff14b7ce80e - category: Grenade name: BKX-4 "Shockwave" Grenade @@ -3847,7 +3847,7 @@ restricted: true rarity: 5 special: Blast 8, Knockdown, Disorient 5, Limited Ammo 1 - index: Fully Operational:39 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:39 generatedId: 5dcb6021-cc8d-4362-9035-4b682688205d - category: Grenade name: WP-19 Incendiary Grenade @@ -3861,7 +3861,7 @@ restricted: true rarity: 6 special: Blast 8, Burn 4, Limited Ammo 1 - index: Fully Operational:40 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:40 generatedId: 190fa433-b5c7-49e6-bbdd-5fcf2905b203 - category: Grenade name: WW-41 CryoBan Grenade @@ -3875,5 +3875,5 @@ restricted: false rarity: 7 special: Blast 6, Disorient 3, Ensnare 3, Limited Ammo 1, Vicious 2 - index: Fully Operational:40 + index: ced537f4-dfe1-4d4e-8030-b97752b46805:40 generatedId: 4cfcdfe1-0887-49d4-940c-6992fdeb95ee