From fece85e59eff4aa753b32bc435fdb6cded2cc228 Mon Sep 17 00:00:00 2001 From: "C.S. Melis" Date: Wed, 28 Sep 2022 14:48:42 +0200 Subject: [PATCH] Make trade lane lights easier to see Essentially made the lights twice as large. Also the green light blink every second or so. I couldn't create new lights since that would cause crashes on vanilla servers. Instead I edited and used existing lights. The TradeLaneGreen light isn't used anyway. This commit also fixes an issue where trade lanes in some Border Worlds systems were missing 2 green lights. Those have now been added. --- DATA/EQUIPMENT/light_equip.ini | 8 +- DATA/SOLAR/loadouts.ini | 286 +++++++++++++++++---------------- 2 files changed, 148 insertions(+), 146 deletions(-) diff --git a/DATA/EQUIPMENT/light_equip.ini b/DATA/EQUIPMENT/light_equip.ini index bdf363a..fa88b53 100644 --- a/DATA/EQUIPMENT/light_equip.ini +++ b/DATA/EQUIPMENT/light_equip.ini @@ -332,11 +332,11 @@ glow_size = 8 [Light] nickname = TradeLaneGreen inherit = Green -bulb_size = 10 -glow_size = 75 +bulb_size = 1 +glow_size = 16 flare_cone = 180, 90 -avg_delay = 2 -blink_duration = 2 +avg_delay = 1 +blink_duration = 1.5 [Light] nickname = Blue diff --git a/DATA/SOLAR/loadouts.ini b/DATA/SOLAR/loadouts.ini index fc8cde6..3d54d89 100644 --- a/DATA/SOLAR/loadouts.ini +++ b/DATA/SOLAR/loadouts.ini @@ -564,22 +564,22 @@ equip = infinite_power equip = TLR_shield_gen01, HpShield01 equip = Small_station_turret, HpTurret_S1_01 equip = Small_station_turret, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 -equip = SlowXLargeGreen, HpRedLight07 -equip = SlowXLargeGreen, HpRedLight08 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = telescope @@ -3960,22 +3960,22 @@ equip = ge_s_scanner_02 equip = TLR_shield_gen01, HpShield01 equip = br_Small_station_turret01_mark02, HpTurret_S1_01 equip = br_Small_station_turret01_mark02, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 -equip = SlowXLargeGreen, HpRedLight07 -equip = SlowXLargeGreen, HpRedLight08 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = trade_lane_ring_br_02 @@ -3985,22 +3985,22 @@ equip = ge_s_scanner_02 equip = TLR_shield_gen01, HpShield01 equip = br_Small_station_turret01_mark03, HpTurret_S1_01 equip = br_Small_station_turret01_mark03, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 -equip = SlowXLargeGreen, HpRedLight07 -equip = SlowXLargeGreen, HpRedLight08 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = trade_lane_ring_li_01 @@ -4010,22 +4010,22 @@ equip = ge_s_scanner_02 equip = TLR_shield_gen01, HpShield01 equip = li_Small_station_turret01_mark01, HpTurret_S1_01 equip = li_Small_station_turret01_mark01, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 -equip = SlowXLargeGreen, HpRedLight07 -equip = SlowXLargeGreen, HpRedLight08 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = trade_lane_ring_li_02 @@ -4035,22 +4035,22 @@ equip = ge_s_scanner_02 equip = TLR_shield_gen01, HpShield01 equip = li_Small_station_turret01_mark02, HpTurret_S1_01 equip = li_Small_station_turret01_mark02, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 -equip = SlowXLargeGreen, HpRedLight07 -equip = SlowXLargeGreen, HpRedLight08 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = trade_lane_ring_li_03 @@ -4060,20 +4060,22 @@ equip = ge_s_scanner_02 equip = TLR_shield_gen01, HpShield01 equip = li_Small_station_turret01_mark03, HpTurret_S1_01 equip = li_Small_station_turret01_mark03, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = trade_lane_ring_ku_01 @@ -4083,22 +4085,22 @@ equip = ge_s_scanner_02 equip = TLR_shield_gen01, HpShield01 equip = ku_Small_station_turret01_mark03, HpTurret_S1_01 equip = ku_Small_station_turret01_mark03, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 -equip = SlowXLargeGreen, HpRedLight07 -equip = SlowXLargeGreen, HpRedLight08 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = trade_lane_ring_rh_01 @@ -4108,22 +4110,22 @@ equip = ge_s_scanner_02 equip = TLR_shield_gen01, HpShield01 equip = rh_Small_station_turret01_mark03, HpTurret_S1_01 equip = rh_Small_station_turret01_mark03, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 -equip = SlowXLargeGreen, HpRedLight07 -equip = SlowXLargeGreen, HpRedLight08 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = trade_lane_ring_co_01 @@ -4133,22 +4135,22 @@ equip = ge_s_scanner_02 equip = TLR_shield_gen01, HpShield01 equip = co_Small_station_turret01_mark03, HpTurret_S1_01 equip = co_Small_station_turret01_mark03, HpTurret_S1_02 -equip = SlowXLargeRed, HpGreenLight01 -equip = SlowXLargeRed, HpGreenLight02 -equip = SlowXLargeRed, HpGreenLight03 -equip = SlowXLargeRed, HpGreenLight04 -equip = SlowXLargeRed, HpGreenLight05 -equip = SlowXLargeRed, HpGreenLight06 -equip = SlowXLargeRed, HpGreenLight07 -equip = SlowXLargeRed, HpGreenLight08 -equip = SlowXLargeGreen, HpRedLight01 -equip = SlowXLargeGreen, HpRedLight02 -equip = SlowXLargeGreen, HpRedLight03 -equip = SlowXLargeGreen, HpRedLight04 -equip = SlowXLargeGreen, HpRedLight05 -equip = SlowXLargeGreen, HpRedLight06 -equip = SlowXLargeGreen, HpRedLight07 -equip = SlowXLargeGreen, HpRedLight08 +equip = LargeRedTrade, HpGreenLight01 +equip = LargeRedTrade, HpGreenLight02 +equip = LargeRedTrade, HpGreenLight03 +equip = LargeRedTrade, HpGreenLight04 +equip = LargeRedTrade, HpGreenLight05 +equip = LargeRedTrade, HpGreenLight06 +equip = LargeRedTrade, HpGreenLight07 +equip = LargeRedTrade, HpGreenLight08 +equip = TradeLaneGreen, HpRedLight01 +equip = TradeLaneGreen, HpRedLight02 +equip = TradeLaneGreen, HpRedLight03 +equip = TradeLaneGreen, HpRedLight04 +equip = TradeLaneGreen, HpRedLight05 +equip = TradeLaneGreen, HpRedLight06 +equip = TradeLaneGreen, HpRedLight07 +equip = TradeLaneGreen, HpRedLight08 [Loadout] nickname = space_police01_br_01