From dfa01857767ff66fba2f29b3663b17d22911e00b Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:12:03 -0700 Subject: [PATCH 01/17] Remove manual 1165 from all --- groups/all.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/groups/all.yml b/groups/all.yml index c95ca9e7..32f1dd7a 100644 --- a/groups/all.yml +++ b/groups/all.yml @@ -1,7 +1,4 @@ --- -types: - - 1165 - include: - _asteroid - _celestial From ea07f0b5b52d254f04b58c98c8fa81b021319896 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:30:58 -0700 Subject: [PATCH 02/17] Add new fighters --- groups/_fighter.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/groups/_fighter.yml b/groups/_fighter.yml index 488b107a..724b0f0f 100644 --- a/groups/_fighter.yml +++ b/groups/_fighter.yml @@ -3,3 +3,6 @@ types: - 1537 - 1652 - 1653 + - 4777 + - 4778 + - 4779 From b9450e845d24b6a24d268b4c83310655403e7022 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:31:30 -0700 Subject: [PATCH 03/17] Add new structures --- groups/_structure.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/groups/_structure.yml b/groups/_structure.yml index badf27d0..03fdf10e 100644 --- a/groups/_structure.yml +++ b/groups/_structure.yml @@ -9,3 +9,5 @@ types: - 2015 - 2016 - 2017 + - 4644 + - 4744 From df86ca37bb6da1ccbbf1fcad49e76ed56ce2d028 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:31:57 -0700 Subject: [PATCH 04/17] Add new orbitals --- groups/_orbitals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/groups/_orbitals.yml b/groups/_orbitals.yml index 62faa6e0..0b09c9a7 100644 --- a/groups/_orbitals.yml +++ b/groups/_orbitals.yml @@ -2,3 +2,4 @@ types: - 1025 - 1106 + - 4736 From 2d45658bdc20006462b07ef2e1a6e0f94a421c0c Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:33:32 -0700 Subject: [PATCH 05/17] Add new entities --- groups/_entity.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/groups/_entity.yml b/groups/_entity.yml index 520ec4fa..1dc2a694 100644 --- a/groups/_entity.yml +++ b/groups/_entity.yml @@ -190,3 +190,44 @@ types: - 4128 - 4105 - 4130 + - 4431 + - 4432 + - 4433 + - 4434 + - 4494 + - 4501 + - 4569 + - 4570 + - 4571 + - 4572 + - 4573 + - 4574 + - 4576 + - 4577 + - 4636 + - 4637 + - 4638 + - 4647 + - 4648 + - 4649 + - 4650 + - 4651 + - 4652 + - 4653 + - 4654 + - 4655 + - 4656 + - 4673 + - 4712 + - 4737 + - 4771 + - 4795 + - 4796 + - 4797 + - 4798 + - 4799 + - 4800 + - 4801 + - 4802 + - 4803 + - 4804 From ad682f81960771c437dd8a629f76f67e11448a38 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:34:10 -0700 Subject: [PATCH 06/17] Add new asteroids --- groups/_asteroid.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/groups/_asteroid.yml b/groups/_asteroid.yml index 8dc07284..3c10b225 100644 --- a/groups/_asteroid.yml +++ b/groups/_asteroid.yml @@ -32,3 +32,15 @@ types: - 4029 - 4030 - 4031 + - 4094 + - 4161 + - 4513 + - 4514 + - 4515 + - 4516 + - 4568 + - 4755 + - 4756 + - 4757 + - 4758 + - 4759 From cfb89672cea64aae242940bdba63562f2b3a2a30 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:35:07 -0700 Subject: [PATCH 07/17] Add new celestials --- groups/_celestial.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/groups/_celestial.yml b/groups/_celestial.yml index 1b164067..e4055d32 100644 --- a/groups/_celestial.yml +++ b/groups/_celestial.yml @@ -41,4 +41,10 @@ types: - 4081 - 4094 - 4100 - - 4081 + - 4168 + - 4547 + - 4548 + - 4549 + - 4713 + - 4719 + - 4745 From 9f230b6ede9336d227eb64fae91184621bece369 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:35:27 -0700 Subject: [PATCH 08/17] Add new ship --- groups/_ship.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/groups/_ship.yml b/groups/_ship.yml index 54d5fa25..251269fe 100644 --- a/groups/_ship.yml +++ b/groups/_ship.yml @@ -46,3 +46,4 @@ types: - 1538 - 1972 - 2001 + - 4594 From 110a402fc574bc402765223d5b663c1b09631327 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:37:15 -0700 Subject: [PATCH 09/17] Add new deployables --- groups/_deployable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/groups/_deployable.yml b/groups/_deployable.yml index 34bb39b7..88a62ef8 100644 --- a/groups/_deployable.yml +++ b/groups/_deployable.yml @@ -12,3 +12,5 @@ types: - 4093 - 4107 - 4137 + - 4477 + - 4499 From 6f026252d715abb906b0ea54ba859e98fe52bd1b Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:39:44 -0700 Subject: [PATCH 10/17] Add Lancer Dreadnought --- groups/_ship-dreadnought.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/groups/_ship-dreadnought.yml b/groups/_ship-dreadnought.yml index 5fba0f36..23635af0 100644 --- a/groups/_ship-dreadnought.yml +++ b/groups/_ship-dreadnought.yml @@ -1,3 +1,4 @@ --- types: - 485 + - 4594 From 9e2a3c80e8710e906c58166efa1da444e6c5e3ea Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 21:45:41 -0700 Subject: [PATCH 11/17] Add _orbitals-skyhook --- groups/_orbitals-skyhook.yml | 3 +++ presets/dscan-skirmish-short.yml | 1 + presets/extra-warpout.yml | 1 + 3 files changed, 5 insertions(+) create mode 100644 groups/_orbitals-skyhook.yml diff --git a/groups/_orbitals-skyhook.yml b/groups/_orbitals-skyhook.yml new file mode 100644 index 00000000..b0449796 --- /dev/null +++ b/groups/_orbitals-skyhook.yml @@ -0,0 +1,3 @@ +--- +types: + - 4736 diff --git a/presets/dscan-skirmish-short.yml b/presets/dscan-skirmish-short.yml index f88b255b..902ce3db 100644 --- a/presets/dscan-skirmish-short.yml +++ b/presets/dscan-skirmish-short.yml @@ -9,6 +9,7 @@ groups: - _celestial-force_field - _celestial-planet - _orbitals-orbital_infrastructure + - _orbitals-skyhook - _celestial-asteroid_belt - _celestial-entosis_command_node states: diff --git a/presets/extra-warpout.yml b/presets/extra-warpout.yml index 7150c0f9..49aee660 100644 --- a/presets/extra-warpout.yml +++ b/presets/extra-warpout.yml @@ -6,5 +6,6 @@ groups: - common-minimal - _celestial-planet - _orbitals-orbital_infrastructure + - _orbitals-skyhook states: - all From 73ed580f746de4ba8f0ca20390ab0d69ae8b5272 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 22:01:10 -0700 Subject: [PATCH 12/17] Add new entities-asteroid --- groups/entities-asteroid.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/groups/entities-asteroid.yml b/groups/entities-asteroid.yml index 68165ca2..f37f9205 100644 --- a/groups/entities-asteroid.yml +++ b/groups/entities-asteroid.yml @@ -12,3 +12,13 @@ types: - 1690 - 1691 - 1692 + - 4795 + - 4796 + - 4797 + - 4798 + - 4799 + - 4800 + - 4801 + - 4802 + - 4803 + - 4804 From 4e1a4ebe1da9e72b343fc533b73604e161d2c4a7 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 22:02:17 -0700 Subject: [PATCH 13/17] Add entities-homefront and entities-insurgency --- groups/entities-homefront.yml | 12 ++++++++++++ groups/entities-insurgency.yml | 15 +++++++++++++++ groups/rats-neutral.yml | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 groups/entities-homefront.yml create mode 100644 groups/entities-insurgency.yml diff --git a/groups/entities-homefront.yml b/groups/entities-homefront.yml new file mode 100644 index 00000000..57411ca4 --- /dev/null +++ b/groups/entities-homefront.yml @@ -0,0 +1,12 @@ +--- +types: + - 4569 + - 4570 + - 4571 + - 4572 + - 4573 + - 4574 + - 4576 + - 4577 + - 4737 + - 4771 diff --git a/groups/entities-insurgency.yml b/groups/entities-insurgency.yml new file mode 100644 index 00000000..634917c6 --- /dev/null +++ b/groups/entities-insurgency.yml @@ -0,0 +1,15 @@ +--- +types: + - 4637 + - 4638 + - 4647 + - 4648 + - 4649 + - 4650 + - 4651 + - 4652 + - 4653 + - 4654 + - 4655 + - 4656 + - 4673 diff --git a/groups/rats-neutral.yml b/groups/rats-neutral.yml index 61c1a4ee..28ae9333 100644 --- a/groups/rats-neutral.yml +++ b/groups/rats-neutral.yml @@ -25,4 +25,6 @@ include: - entities-asteroid - entities-hidden_zenith - entities-roaming + - entities-homefront + - entities-insurgency - entities-◆ From 65ca981815e40f0fd125be3b45b59a70d337a2b5 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 22:06:23 -0700 Subject: [PATCH 14/17] Add new faction warfare entities --- groups/entities-faction_warfare-amarr.yml | 1 + groups/entities-faction_warfare-caldari.yml | 1 + groups/entities-faction_warfare-gallente.yml | 1 + groups/entities-faction_warfare-minmatar.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/groups/entities-faction_warfare-amarr.yml b/groups/entities-faction_warfare-amarr.yml index 096ba5c8..c9968d67 100644 --- a/groups/entities-faction_warfare-amarr.yml +++ b/groups/entities-faction_warfare-amarr.yml @@ -4,3 +4,4 @@ types: - 1175 - 1179 - 1183 + - 4431 diff --git a/groups/entities-faction_warfare-caldari.yml b/groups/entities-faction_warfare-caldari.yml index f4bfd87c..2dea47dc 100644 --- a/groups/entities-faction_warfare-caldari.yml +++ b/groups/entities-faction_warfare-caldari.yml @@ -4,3 +4,4 @@ types: - 1176 - 1180 - 1184 + - 4432 diff --git a/groups/entities-faction_warfare-gallente.yml b/groups/entities-faction_warfare-gallente.yml index ab8bdb90..f6655487 100644 --- a/groups/entities-faction_warfare-gallente.yml +++ b/groups/entities-faction_warfare-gallente.yml @@ -4,3 +4,4 @@ types: - 1177 - 1181 - 1185 + - 4433 diff --git a/groups/entities-faction_warfare-minmatar.yml b/groups/entities-faction_warfare-minmatar.yml index 50e5083e..3c7c96cf 100644 --- a/groups/entities-faction_warfare-minmatar.yml +++ b/groups/entities-faction_warfare-minmatar.yml @@ -4,3 +4,4 @@ types: - 1178 - 1182 - 1186 + - 4434 From 3a6ff04fbcae955f665e8ed3f3fdf6d9ede756d1 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 22:17:35 -0700 Subject: [PATCH 15/17] Add new entity objects to groups --- groups/_entity-control_point.yml | 3 +++ groups/_entity-guided_entities.yml | 3 +++ groups/_entity-pirate_entities.yml | 3 +++ groups/entities-mission.yml | 1 + groups/rats-neutral.yml | 2 ++ 5 files changed, 12 insertions(+) create mode 100644 groups/_entity-control_point.yml create mode 100644 groups/_entity-guided_entities.yml create mode 100644 groups/_entity-pirate_entities.yml diff --git a/groups/_entity-control_point.yml b/groups/_entity-control_point.yml new file mode 100644 index 00000000..b9b32dc7 --- /dev/null +++ b/groups/_entity-control_point.yml @@ -0,0 +1,3 @@ +--- +types: + - 4494 diff --git a/groups/_entity-guided_entities.yml b/groups/_entity-guided_entities.yml new file mode 100644 index 00000000..236e6952 --- /dev/null +++ b/groups/_entity-guided_entities.yml @@ -0,0 +1,3 @@ +--- +types: + - 4712 diff --git a/groups/_entity-pirate_entities.yml b/groups/_entity-pirate_entities.yml new file mode 100644 index 00000000..b9dcf26e --- /dev/null +++ b/groups/_entity-pirate_entities.yml @@ -0,0 +1,3 @@ +--- +types: + - 4636 diff --git a/groups/entities-mission.yml b/groups/entities-mission.yml index 8e59c8c4..96e33295 100644 --- a/groups/entities-mission.yml +++ b/groups/entities-mission.yml @@ -48,3 +48,4 @@ types: - 1006 - 1007 - 1465 + - 4501 diff --git a/groups/rats-neutral.yml b/groups/rats-neutral.yml index 28ae9333..f69d6b1f 100644 --- a/groups/rats-neutral.yml +++ b/groups/rats-neutral.yml @@ -6,6 +6,7 @@ include: - _entity-destructible_sentry_gun - _entity-irregular - _entity-pirate_drone + - _entity-pirate_entities - _entity-protective_sentry_gun - _entity-invading - _entity-retaliating @@ -14,6 +15,7 @@ include: - _entity-rogue_drone - _entity-roaming_sleepers_cruiser - _entity-drifters_battleship + - _entity-guided_entities - _npc-mission_npc - _npc-pirate_npc - entities-abyssal From 5232c7998d73ce1bdd64921a64b228473b82b5be Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 22:24:10 -0700 Subject: [PATCH 16/17] Add interstellar shipcaster and beacon --- groups/_celestial-interstellar_shipcaster.yml | 3 +++ groups/_celestial-interstellar_shipcaster_beacon.yml | 3 +++ groups/common-minimal-ships.yml | 1 + groups/common-minimal.yml | 1 + groups/gates.yml | 1 + presets/brackets-minimal.yml | 1 + presets/brackets-pvp.yml | 1 + 7 files changed, 11 insertions(+) create mode 100644 groups/_celestial-interstellar_shipcaster.yml create mode 100644 groups/_celestial-interstellar_shipcaster_beacon.yml diff --git a/groups/_celestial-interstellar_shipcaster.yml b/groups/_celestial-interstellar_shipcaster.yml new file mode 100644 index 00000000..cc0b046e --- /dev/null +++ b/groups/_celestial-interstellar_shipcaster.yml @@ -0,0 +1,3 @@ +--- +types: + - 4549 diff --git a/groups/_celestial-interstellar_shipcaster_beacon.yml b/groups/_celestial-interstellar_shipcaster_beacon.yml new file mode 100644 index 00000000..b0f35518 --- /dev/null +++ b/groups/_celestial-interstellar_shipcaster_beacon.yml @@ -0,0 +1,3 @@ +--- +types: + - 4547 diff --git a/groups/common-minimal-ships.yml b/groups/common-minimal-ships.yml index 804694ca..9fa190f3 100644 --- a/groups/common-minimal-ships.yml +++ b/groups/common-minimal-ships.yml @@ -1,4 +1,5 @@ --- include: - beacons + - _celestial-interstellar_shipcaster_beacon - _celestial-sun diff --git a/groups/common-minimal.yml b/groups/common-minimal.yml index 1d0c5a17..08da5e4d 100644 --- a/groups/common-minimal.yml +++ b/groups/common-minimal.yml @@ -1,6 +1,7 @@ --- include: - _charge-scanner_probe + - _celestial-interstellar_shipcaster_beacon - beacons - bombs - bubbles diff --git a/groups/gates.yml b/groups/gates.yml index 02644783..d57e16dc 100644 --- a/groups/gates.yml +++ b/groups/gates.yml @@ -5,6 +5,7 @@ include: - _celestial-disrupted_gate - _celestial-wormhole - _celestial-abyssal-trace + - _celestial-interstellar_shipcaster - _starbase-jump_portal_array - _structure-jump_gates - _structure-stargate diff --git a/presets/brackets-minimal.yml b/presets/brackets-minimal.yml index b67c26e5..85ce150a 100644 --- a/presets/brackets-minimal.yml +++ b/presets/brackets-minimal.yml @@ -4,6 +4,7 @@ symbol: ❏ brackets level: 1 groups: - _celestial-sun + - _celestial-interstellar_shipcaster_beacon - beacons - gates - bombs diff --git a/presets/brackets-pvp.yml b/presets/brackets-pvp.yml index 2f45234a..f4855af7 100644 --- a/presets/brackets-pvp.yml +++ b/presets/brackets-pvp.yml @@ -16,6 +16,7 @@ groups: - _celestial-wreck - _celestial-force_field - _deployable + - _celestial-interstellar_shipcaster_beacon - beacons - bubbles - rats From b9e4b4be9a8dbd1e93f1e7d8a4ca6ff6f6fa020d Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 6 Oct 2024 22:24:48 -0700 Subject: [PATCH 17/17] Add _celestial-compressed_gas to pve-harvestables --- groups/_celestial-compressed_gas.yml | 3 +++ presets/pve-harvestables.yml | 1 + 2 files changed, 4 insertions(+) create mode 100644 groups/_celestial-compressed_gas.yml diff --git a/groups/_celestial-compressed_gas.yml b/groups/_celestial-compressed_gas.yml new file mode 100644 index 00000000..8d8ec7b1 --- /dev/null +++ b/groups/_celestial-compressed_gas.yml @@ -0,0 +1,3 @@ +--- +types: + - 4168 diff --git a/presets/pve-harvestables.yml b/presets/pve-harvestables.yml index 499b2568..9795e989 100644 --- a/presets/pve-harvestables.yml +++ b/presets/pve-harvestables.yml @@ -6,5 +6,6 @@ groups: - common-pve - _asteroid - _celestial-harvestable_cloud + - _celestial-compressed_gas states: - hostile