diff --git a/assets/shop/os/LoggerAbyssalT4.png b/assets/shop/os/LoggerAbyssalT4.png index 7d18eb77d..68322be4c 100644 Binary files a/assets/shop/os/LoggerAbyssalT4.png and b/assets/shop/os/LoggerAbyssalT4.png differ diff --git a/assets/shop/os/LoggerAbyssalT3.png b/assets/shop/os/LoggerObscureT2.png similarity index 100% rename from assets/shop/os/LoggerAbyssalT3.png rename to assets/shop/os/LoggerObscureT2.png diff --git a/assets/shop/os/LoggerAbyssalT3_2.png b/assets/shop/os/LoggerObscureT2_2.png similarity index 100% rename from assets/shop/os/LoggerAbyssalT3_2.png rename to assets/shop/os/LoggerObscureT2_2.png diff --git a/assets/shop/os/LoggerAbyssalT3_3.png b/assets/shop/os/LoggerObscureT2_3.png similarity index 100% rename from assets/shop/os/LoggerAbyssalT3_3.png rename to assets/shop/os/LoggerObscureT2_3.png diff --git a/assets/shop/os/LoggerObscureT3.png b/assets/shop/os/LoggerObscureT3.png new file mode 100644 index 000000000..d8b8cdd05 Binary files /dev/null and b/assets/shop/os/LoggerObscureT3.png differ diff --git a/assets/shop/os/LoggerObscureT4.png b/assets/shop/os/LoggerObscureT4.png new file mode 100644 index 000000000..7d18eb77d Binary files /dev/null and b/assets/shop/os/LoggerObscureT4.png differ diff --git a/assets/shop/os/LoggerAbyssalT4_0.png b/assets/shop/os/LoggerObscureT4_0.png similarity index 100% rename from assets/shop/os/LoggerAbyssalT4_0.png rename to assets/shop/os/LoggerObscureT4_0.png diff --git a/assets/shop/os/LoggerAbyssalT4_1.png b/assets/shop/os/LoggerObscureT4_1.png similarity index 100% rename from assets/shop/os/LoggerAbyssalT4_1.png rename to assets/shop/os/LoggerObscureT4_1.png diff --git a/config/template.json b/config/template.json index 99ffce4f3..aac2acf1b 100644 --- a/config/template.json +++ b/config/template.json @@ -1738,7 +1738,7 @@ }, "OpsiShop": { "PresetFilter": "max_benefit_meta", - "CustomFilter": "LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins\n> GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart\n> OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1\n> METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator" + "CustomFilter": "LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerAbyssalT4 > LoggerObscureT6 > LoggerObscureT5 > LoggerObscureT4 > LoggerObscureT3 > ActionPoint > PurpleCoins\n> GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart\n> OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1\n> METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator" }, "Storage": { "Storage": {} diff --git a/module/config/argument/args.json b/module/config/argument/args.json index b91a53eea..60c69e301 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -8729,7 +8729,7 @@ }, "CustomFilter": { "type": "textarea", - "value": "LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins\n> GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart\n> OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1\n> METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator" + "value": "LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerAbyssalT4 > LoggerObscureT6 > LoggerObscureT5 > LoggerObscureT4 > LoggerObscureT3 > ActionPoint > PurpleCoins\n> GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart\n> OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1\n> METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator" } }, "Storage": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 6bfbedcc6..5fb541157 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -713,7 +713,7 @@ OpsiShop: - all - custom CustomFilter: |- - LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins + LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerAbyssalT4 > LoggerObscureT6 > LoggerObscureT5 > LoggerObscureT4 > LoggerObscureT3 > ActionPoint > PurpleCoins > GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart > OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1 > METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 6ef4cd93f..7a2c2243d 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -108,4 +108,4 @@ "GameManager" ] } -} +} \ No newline at end of file diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 3367f6532..1f45f2f65 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -411,7 +411,7 @@ class GeneratedConfig: # Group `OpsiShop` OpsiShop_PresetFilter = 'max_benefit_meta' # max_benefit, max_benefit_meta, no_meta, all, custom - OpsiShop_CustomFilter = 'LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins\n> GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart\n> OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1\n> METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator' + OpsiShop_CustomFilter = 'LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerAbyssalT4 > LoggerObscureT6 > LoggerObscureT5 > LoggerObscureT4 > LoggerObscureT3 > ActionPoint > PurpleCoins\n> GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart\n> OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1\n> METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator' # Group `OpsiVoucher` OpsiVoucher_Filter = 'LoggerAbyssal > LoggerObscure > Book > Coin > Fragment' diff --git a/module/os_shop/preset.py b/module/os_shop/preset.py index 6c52de8e4..cd3312c1a 100644 --- a/module/os_shop/preset.py +++ b/module/os_shop/preset.py @@ -7,27 +7,27 @@ OS_SHOP = { # 5: Rubbish 'max_benefit': """ - LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins > + LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerAbyssalT4 > LoggerObscureT6 > LoggerObscureT5 > LoggerObscureT4 > LoggerObscureT3 > ActionPoint > PurpleCoins > GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart > OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1 """, 'max_benefit_meta': """ - LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins > + LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerAbyssalT4 > LoggerObscureT6 > LoggerObscureT5 > LoggerObscureT4 > LoggerObscureT3 > ActionPoint > PurpleCoins > GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart > OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1 > METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator """, 'no_meta': """ - LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins > + LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerAbyssalT4 > LoggerObscureT6 > LoggerObscureT5 > LoggerObscureT4 > LoggerObscureT3 > ActionPoint > PurpleCoins > GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart > OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1 > - LoggerAbyssalT3 > DevelopmentMaterialT1 > TuningT2 > TuningSample > EnergyStorageDevice > RepairPack + LoggerObscureT2 > DevelopmentMaterialT1 > TuningT2 > TuningSample > EnergyStorageDevice > RepairPack """, 'all': """ - LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins > + LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerAbyssalT4 > LoggerObscureT6 > LoggerObscureT5 > LoggerObscureT4 > LoggerObscureT3 > ActionPoint > PurpleCoins > GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart > OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1 > METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator > - LoggerAbyssalT3 > DevelopmentMaterialT1 > TuningT2 > TuningSample > EnergyStorageDevice > RepairPack + LoggerObscureT2 > DevelopmentMaterialT1 > TuningT2 > TuningSample > EnergyStorageDevice > RepairPack """ }