diff --git a/corrections.py b/corrections.py index b976a5a8..78db29ec 100644 --- a/corrections.py +++ b/corrections.py @@ -50,6 +50,11 @@ 'ALLOYS': DELETED, 'PLASTICS': DELETED, 'COMBAT STABILISERS': DELETED, + 'CONSUMER TECH': 'Consumer Technology', + 'DOM. APPLIANCES': 'Domestic Appliances', + 'FRUIT AND VEGETABLES': 'Fruit And Vegetables', + 'NON-LETHAL WPNS': 'Non-Lethal Weapons', + } def correctSystem(oldName): diff --git a/data/AltItemNames.csv b/data/AltItemNames.csv index d8346726..42c3ac12 100644 --- a/data/AltItemNames.csv +++ b/data/AltItemNames.csv @@ -1,10 +1,10 @@ unq:!name@Category.category_id,unq:name@Item.item_id,unq:alt_name -'Consumer Items','Consumer Tech','consumertechnology' -'Consumer Items','Dom. Appliances','domesticappliances' +'Consumer Items','Consumer Technology','consumertechnology' +'Consumer Items','Domestic Appliances','domesticappliances' 'Legal Drugs','Narcotics','basicnarcotics' 'Machinery','Microbial Furnaces','heliostaticfurnaces' 'Medicines','Agri-Medicines','agriculturalmedicines' 'Technology','H.E. Suits','hazardousenvironmentsuits' 'Technology','Land Enrichment Systems','terrainenrichmentsystems' -'Weapons','Non-Lethal Wpns','nonlethalweapons' +'Weapons','Non-Lethal Weapons','nonlethalweapons' 'Weapons','Reactive Armour','reactivearmour' diff --git a/data/Item.csv b/data/Item.csv index fdb1f6ce..2d8d4649 100644 --- a/data/Item.csv +++ b/data/Item.csv @@ -4,14 +4,14 @@ unq:name@Category.category_id,unq:name,ui_order 'Chemicals','Mineral Oil',3 'Chemicals','Pesticides',4 'Consumer Items','Clothing',1 -'Consumer Items','Consumer Tech',2 -'Consumer Items','Dom. Appliances',3 +'Consumer Items','Consumer Technology',2 +'Consumer Items','Domestic Appliances',3 'Foods','Algae',1 'Foods','Animal Meat',2 'Foods','Coffee',3 'Foods','Fish',4 'Foods','Food Cartridges',5 -'Foods','Fruit and Vegetables',6 +'Foods','Fruit And Vegetables',6 'Foods','Grain',7 'Foods','Synthetic Meat',8 'Foods','Tea',9 @@ -75,6 +75,6 @@ unq:name@Category.category_id,unq:name,ui_order 'Waste','Chemical Waste',2 'Waste','Scrap',3 'Weapons','Battle Weapons',1 -'Weapons','Non-Lethal Wpns',2 +'Weapons','Non-Lethal Weapons',2 'Weapons','Personal Weapons',3 'Weapons','Reactive Armour',4