diff --git a/assets/shop/os/CrystallizedHeatResistantSteel.png b/assets/shop/os/CrystallizedHeatResistantSteel.png new file mode 100644 index 000000000..3a4478504 Binary files /dev/null and b/assets/shop/os/CrystallizedHeatResistantSteel.png differ diff --git a/assets/shop/os/DevelopmentMaterialT1.png b/assets/shop/os/DevelopmentMaterialT1.png new file mode 100644 index 000000000..423017786 Binary files /dev/null and b/assets/shop/os/DevelopmentMaterialT1.png differ diff --git a/assets/shop/os/DevelopmentMaterialT2.png b/assets/shop/os/DevelopmentMaterialT2.png new file mode 100644 index 000000000..9e1949ea9 Binary files /dev/null and b/assets/shop/os/DevelopmentMaterialT2.png differ diff --git a/assets/shop/os/DevelopmentMaterialT3.png b/assets/shop/os/DevelopmentMaterialT3.png new file mode 100644 index 000000000..813734c9e Binary files /dev/null and b/assets/shop/os/DevelopmentMaterialT3.png differ diff --git a/assets/shop/os/EnergyStorageDevice.png b/assets/shop/os/EnergyStorageDevice.png new file mode 100644 index 000000000..eb5e005f7 Binary files /dev/null and b/assets/shop/os/EnergyStorageDevice.png differ diff --git a/assets/shop/os/GearDesign PlanT2.png b/assets/shop/os/GearDesign PlanT2.png new file mode 100644 index 000000000..99b0fbb96 Binary files /dev/null and b/assets/shop/os/GearDesign PlanT2.png differ diff --git a/assets/shop/os/GearPartPrototype.png b/assets/shop/os/GearPartPrototype.png new file mode 100644 index 000000000..ad26d7370 Binary files /dev/null and b/assets/shop/os/GearPartPrototype.png differ diff --git a/assets/shop/os/GearPartSpecialized.png b/assets/shop/os/GearPartSpecialized.png new file mode 100644 index 000000000..bd8cad0c8 Binary files /dev/null and b/assets/shop/os/GearPartSpecialized.png differ diff --git a/assets/shop/os/LoggerAbyssalT4.png b/assets/shop/os/LoggerAbyssalT4.png new file mode 100644 index 000000000..7d18eb77d Binary files /dev/null and b/assets/shop/os/LoggerAbyssalT4.png differ diff --git a/assets/shop/os/LoggerAbyssalT5.png b/assets/shop/os/LoggerAbyssalT5.png new file mode 100644 index 000000000..c59c1b652 Binary files /dev/null and b/assets/shop/os/LoggerAbyssalT5.png differ diff --git a/assets/shop/os/LoggerAbyssalT6.png b/assets/shop/os/LoggerAbyssalT6.png new file mode 100644 index 000000000..fa30893b9 Binary files /dev/null and b/assets/shop/os/LoggerAbyssalT6.png differ diff --git a/assets/shop/os/LoggerObscureT5.png b/assets/shop/os/LoggerObscureT5.png new file mode 100644 index 000000000..6476f565a Binary files /dev/null and b/assets/shop/os/LoggerObscureT5.png differ diff --git a/assets/shop/os/LoggerObscureT6.png b/assets/shop/os/LoggerObscureT6.png new file mode 100644 index 000000000..6599bf894 Binary files /dev/null and b/assets/shop/os/LoggerObscureT6.png differ diff --git a/assets/shop/os/LoggerObscureT6_2.png b/assets/shop/os/LoggerObscureT6_2.png new file mode 100644 index 000000000..5f4b9e391 Binary files /dev/null and b/assets/shop/os/LoggerObscureT6_2.png differ diff --git a/assets/shop/os/NanoceramicAlloy.png b/assets/shop/os/NanoceramicAlloy.png new file mode 100644 index 000000000..f16d62d3d Binary files /dev/null and b/assets/shop/os/NanoceramicAlloy.png differ diff --git a/assets/shop/os/OrdnanceTestingReportT1.png b/assets/shop/os/OrdnanceTestingReportT1.png new file mode 100644 index 000000000..896e8b9b9 Binary files /dev/null and b/assets/shop/os/OrdnanceTestingReportT1.png differ diff --git a/assets/shop/os/OrdnanceTestingReportT2.png b/assets/shop/os/OrdnanceTestingReportT2.png new file mode 100644 index 000000000..46923e780 Binary files /dev/null and b/assets/shop/os/OrdnanceTestingReportT2.png differ diff --git a/assets/shop/os/OrdnanceTestingReportT3.png b/assets/shop/os/OrdnanceTestingReportT3.png new file mode 100644 index 000000000..e3a0425ff Binary files /dev/null and b/assets/shop/os/OrdnanceTestingReportT3.png differ diff --git a/assets/shop/os/PlateRandomT4.png b/assets/shop/os/PlateRandomT4.png new file mode 100644 index 000000000..6d93950c8 Binary files /dev/null and b/assets/shop/os/PlateRandomT4.png differ diff --git a/assets/shop/os/RepairPackFull.png b/assets/shop/os/RepairPackFull.png new file mode 100644 index 000000000..8218f7dc6 Binary files /dev/null and b/assets/shop/os/RepairPackFull.png differ diff --git a/assets/shop/os/RepairPackFull2.png b/assets/shop/os/RepairPackFull2.png new file mode 100644 index 000000000..2eacdd617 Binary files /dev/null and b/assets/shop/os/RepairPackFull2.png differ diff --git a/assets/shop/os/TuningCombatT2.png b/assets/shop/os/TuningCombatT2.png new file mode 100644 index 000000000..157b8b7ff Binary files /dev/null and b/assets/shop/os/TuningCombatT2.png differ diff --git a/assets/shop/os/TuningCombatT2_2.png b/assets/shop/os/TuningCombatT2_2.png new file mode 100644 index 000000000..a096bb2c2 Binary files /dev/null and b/assets/shop/os/TuningCombatT2_2.png differ diff --git a/assets/shop/os/TuningCombatT2_3.png b/assets/shop/os/TuningCombatT2_3.png new file mode 100644 index 000000000..42aca94e7 Binary files /dev/null and b/assets/shop/os/TuningCombatT2_3.png differ diff --git a/assets/shop/os/TuningOffenseT2.png b/assets/shop/os/TuningOffenseT2.png new file mode 100644 index 000000000..dbb6bebab Binary files /dev/null and b/assets/shop/os/TuningOffenseT2.png differ diff --git a/assets/shop/os/TuningSurvivalT2.png b/assets/shop/os/TuningSurvivalT2.png new file mode 100644 index 000000000..03b886965 Binary files /dev/null and b/assets/shop/os/TuningSurvivalT2.png differ diff --git a/assets/shop/os/TuringSampleCombat_2.png b/assets/shop/os/TuringSampleCombat_2.png new file mode 100644 index 000000000..4e70ad357 Binary files /dev/null and b/assets/shop/os/TuringSampleCombat_2.png differ diff --git a/assets/shop/os/TuringSampleCombat_3.png b/assets/shop/os/TuringSampleCombat_3.png new file mode 100644 index 000000000..f95a0a882 Binary files /dev/null and b/assets/shop/os/TuringSampleCombat_3.png differ diff --git a/assets/shop/os/TuringSampleOffence_2.png b/assets/shop/os/TuringSampleOffence_2.png new file mode 100644 index 000000000..b7b117f95 Binary files /dev/null and b/assets/shop/os/TuringSampleOffence_2.png differ diff --git a/assets/shop/os/TuringSampleSurvival_2.png b/assets/shop/os/TuringSampleSurvival_2.png new file mode 100644 index 000000000..99f26798c Binary files /dev/null and b/assets/shop/os/TuringSampleSurvival_2.png differ diff --git a/module/os_handler/shop.py b/module/os_handler/shop.py index 9917b5970..dae7c73d7 100644 --- a/module/os_handler/shop.py +++ b/module/os_handler/shop.py @@ -113,9 +113,13 @@ class OSShopHandler(OSStatus, MapEventHandler): Item: """ self.os_shop_get_coins() - items = self.os_shop_get_items(name=False) + items = self.os_shop_get_items(name=True) + logger.attr('CL1 enabled', self.is_cl1_enabled) for item in items: + if self.is_cl1_enabled: + if item.name == 'PurpleCoins': + continue if item.cost == 'YellowCoins': if item.price > self._shop_yellow_coins: continue