diff --git a/item_ids.tsv b/item_ids.tsv index 18ccb49..75eab6c 100644 --- a/item_ids.tsv +++ b/item_ids.tsv @@ -656,6 +656,8 @@ 3025 Salvage Robot Station 3029 Station Hull Window red 3 with asteroid 3044 floor +3062 Body Storage +3068 Robot Storage 3069 Laser Rifle 3070 Laser Pistol 3071 Plasma Clustergun diff --git a/research-images/Page 1.jpg b/research-images/Page 1.jpg new file mode 100644 index 0000000..fd9260a Binary files /dev/null and b/research-images/Page 1.jpg differ diff --git a/research-images/Page 2.jpg b/research-images/Page 2.jpg new file mode 100644 index 0000000..74613f2 Binary files /dev/null and b/research-images/Page 2.jpg differ diff --git a/research-images/Page 3.jpg b/research-images/Page 3.jpg new file mode 100644 index 0000000..fd110d9 Binary files /dev/null and b/research-images/Page 3.jpg differ diff --git a/research-images/Page 4.jpg b/research-images/Page 4.jpg new file mode 100644 index 0000000..d83ad35 Binary files /dev/null and b/research-images/Page 4.jpg differ diff --git a/research-images/research_scratch.txt b/research-images/research_scratch.txt new file mode 100644 index 0000000..e05c846 --- /dev/null +++ b/research-images/research_scratch.txt @@ -0,0 +1,117 @@ +MEDICAL AND AUGMENTATION + +Medical Bed - 120,60,15 +Hypersleep Chamber - 150,50,20 +x2 Hypersleep Tank - 200,80,30 +Surgical Enhancement Facility - 180,80,40 +Anatomical Augmentation - 80,50,25 +Nanotech Augmentation - 90,60,32 +Neural Augmentation - 100,55,35 +Prefrontal Microcontroller - 75,30,20 + +----- + +INDUSTRY + +Industry 01 - 50,5 +Industry 02 - 80,12 + +Metal Refinery - 80,20 +Microweaver - 60,25 +Chemical Refinery - 140,45,8 +Energy Refinery - 110,50,10 + +Assember - 90,10 +Optotronics Fabricator - 400,100,50 +Advanced Assember - 200,80,50 + +----- + +CREW EQUIPMENT + +Item Fabricator - 150,40,6 +Laser Weapons - 150,50,25 +Bulletproof Vest - 50,20,5 +Sentry Gun X1 - 100,40,20 +Enslavement Facility - 140,80,25 +Plasma Weapons - 180,60,30 +Armored Vest - 60,30,12 + +------ + +RESEARCH + +Research Lab - N/A +Research Workbench - 100,20,5 + +----- + +SHIP SYSTEMS + +Navigation Console - 60,20 +Weapons Console -125,15 +Shields Console - 125,15 +Operations Console - 60,10 +X1 Hyperdrive - 140,40,12 +Rocket Turret - 180,75,12 +Energy Turret - 160,55,10 +Shield Generator - 180,40,12 +Scanner - 150,40,10 +Targeting Jammer - 400,250,120 + +----- + +POWER + +Power Capacity Node - 120,60,5 +Solar Panel - 180,50,10 +X1 Power Generator - 130,70,10 +X2 Power Generator - 300,60,30 +X3 Power Generator - 320,120,50 + +----- + +ENTERTAINMENT + +Jukebox - 120,50,10 +Arcade Machine - 125,60,20 + +----- + +ROBOTICS + +Robotics 01 - 80,20,10 +Logistics Robot Station - 150,50,25 +Salvage Robot Station - 200,75,50 + +------ + +ROGUE BOTS + +Hamster(flybot) - 25,10 +Chimp(walkerbot) - 25,10 +Rogue Bot Architecture - 70,40,10 + +----- + +ALIEN TECHNOLOGY + +Crawler - 25,10 +Hauler - 30,15 +Alien Hive Core - 40,25 +Evolving Alien Core - 50,30 +Advanced Nutrition 02 - 150,40,20 + +----- + +BOTANY + +Botany - 40 +Autopsy Table - 40 +Fibres - 80,20 +Botany 02 - 50,20,5 +Composter - 85,15 +Advanced Nutrition - 100,25,10 +Artificial Meat - 140,60,20 +Grains and Hops - 100,30,10 +Alcoholic Bar Machine - 120,25,10 \ No newline at end of file diff --git a/research2.tsv b/research2.tsv index ab3fc84..7232d5f 100644 --- a/research2.tsv +++ b/research2.tsv @@ -3,39 +3,39 @@ 2532 Unknown 2533 Unknown 2539 Unknown -2559 Unknown +2559 Medical Bed 2563 Unknown 2564 Unknown -2565 Unknown -2566 Unknown +2565 Solar Panel +2566 X2 Power Generator 2567 Unknown -2568 Unknown -2569 Unknown +2568 Power Capacity Node +2569 Item Fabricator 2570 Unknown -2571 Unknown +2571 Assembler 2572 Unknown 2573 Unknown 2575 Unknown 2576 Unknown 2577 Unknown -2589 Unknown -2590 Unknown +2589 Weapons Console +2590 Shields Console 2591 Unknown 2592 Unknown -2594 Unknown +2594 X1 Power Generator 2595 Unknown 2596 Unknown 2597 Unknown 2598 Unknown 2599 Unknown 2600 Unknown -2601 Unknown +2601 Targeting Jammer 2602 Unknown 2604 Unknown 2605 Unknown 2606 Unknown 2607 Unknown -2612 Unknown +2612 Metal Refinery 2613 Unknown 2614 Unknown 2617 Unknown @@ -46,20 +46,20 @@ 2628 Unknown 2629 Unknown 2630 Unknown -2694 Unknown +2694 Optotronics Fabricator 2847 Unknown 3024 Unknown 3025 Unknown 3114 Unknown -3115 Unknown +3115 Research Workbench 3116 Unknown -3119 Unknown -3122 Unknown +3119 Navigation Console +3122 Operations Console 3124 Unknown 3125 Unknown 3127 Unknown -3128 Unknown -3129 Unknown +3128 Industry 01 +3129 Industry 02 3130 Unknown 3417 Unknown 3420 Unknown diff --git a/sheditor.py b/sheditor.py index c99da82..66355b4 100644 --- a/sheditor.py +++ b/sheditor.py @@ -18,6 +18,7 @@ storage_ids = { 82: {"name": "Small storage", "capacity": 50}, 632: {"name": "Large storage", "capacity": 250}, 3062: {"name": "Body storage", "capacity": 20}, + 3068: {"name": "Robot storage", "capacity": 20}, } console = rich.console.Console(highlight=False) @@ -53,6 +54,7 @@ class Item: self.name = name self.quantity = quantity + class ResearchItem: research_ids = None @@ -270,9 +272,12 @@ class Ship: def redistribute_storage(self): normal_storage_areas = [sa for sa in self.storage_areas if sa.is_normal_storage] total = 0 + area_capacity = 0 for area in normal_storage_areas: total += area.get_total_occupancy() - print(total) + area_capacity += storage_ids[area.type_id]['capacity'] + console.print("Total used: {}".format(total)) + console.print("Total actual capacity: {}".format(area_capacity)) def consolidate_weapons(self): normal_storage_areas = [sa for sa in self.storage_areas if sa.is_normal_storage] @@ -574,6 +579,9 @@ class GameData: def redistribute(self): for ship in self.ships: + if ship.owner != 'Player': + continue + console.print(ship.name) ship.redistribute_storage() def list_research(self):