From 7f98df2ac238183b3434f0cdce2cb143e0f61383 Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 23 Oct 2024 21:52:32 +0100 Subject: [PATCH] Change: WIP on updating cargo classes to 2024 scheme --- src/cargo.py | 82 +++++++++++++++++--------- src/cargos/acid.py | 2 +- src/cargos/aggregates.py | 2 +- src/cargos/alcohol.py | 2 +- src/cargos/aluminia.py | 2 +- src/cargos/aluminium.py | 2 +- src/cargos/ammonia.py | 2 +- src/cargos/ammonium_nitrate.py | 2 +- src/cargos/bauxite.py | 2 +- src/cargos/beans.py | 2 +- src/cargos/building_materials.py | 2 +- src/cargos/carbon_black.py | 2 +- src/cargos/cassava.py | 2 +- src/cargos/cast_iron.py | 2 +- src/cargos/cement.py | 2 +- src/cargos/chemicals.py | 2 +- src/cargos/chlorine.py | 2 +- src/cargos/chromite_ore.py | 2 +- src/cargos/clay.py | 2 +- src/cargos/cleaning_agents.py | 2 +- src/cargos/coal.py | 2 +- src/cargos/coal_tar.py | 2 +- src/cargos/coffee.py | 2 +- src/cargos/coke.py | 2 +- src/cargos/concrete_products.py | 2 +- src/cargos/copper.py | 2 +- src/cargos/copper_concentrate.py | 2 +- src/cargos/copper_ore.py | 2 +- src/cargos/edible_oil.py | 2 +- src/cargos/electrical_parts.py | 2 +- src/cargos/engineering_supplies.py | 2 +- src/cargos/ethylene.py | 2 +- src/cargos/explosives.py | 2 +- src/cargos/farm_supplies.py | 2 +- src/cargos/ferroalloys.py | 2 +- src/cargos/ferrochrome.py | 2 +- src/cargos/fertiliser.py | 2 +- src/cargos/fish.py | 2 +- src/cargos/food.py | 2 +- src/cargos/food_additives.py | 2 +- src/cargos/forgings_and_castings.py | 2 +- src/cargos/formic_acid.py | 4 +- src/cargos/fruits.py | 2 +- src/cargos/furniture.py | 2 +- src/cargos/glass.py | 2 +- src/cargos/goods.py | 2 +- src/cargos/grain.py | 2 +- src/cargos/hardware.py | 2 +- src/cargos/hydrochloric_acid.py | 2 +- src/cargos/iron_ore.py | 2 +- src/cargos/kaolin.py | 2 +- src/cargos/limestone.py | 2 +- src/cargos/livestock.py | 2 +- src/cargos/logs.py | 2 +- src/cargos/lye.py | 2 +- src/cargos/maize.py | 2 +- src/cargos/manganese.py | 2 +- src/cargos/metal.py | 2 +- src/cargos/methanol.py | 2 +- src/cargos/milk.py | 2 +- src/cargos/naphtha.py | 2 +- src/cargos/nickel.py | 2 +- src/cargos/nitrates.py | 2 +- src/cargos/nitrogen.py | 2 +- src/cargos/nuts.py | 2 +- src/cargos/oil.py | 2 +- src/cargos/oxygen.py | 2 +- src/cargos/packaging.py | 2 +- src/cargos/paints_and_coatings.py | 2 +- src/cargos/paper.py | 2 +- src/cargos/peat.py | 2 +- src/cargos/petrol.py | 2 +- src/cargos/pharmaceuticals.py | 2 +- src/cargos/phosphate.py | 2 +- src/cargos/phosphoric_acid.py | 2 +- src/cargos/pig_iron.py | 2 +- src/cargos/pipework.py | 2 +- src/cargos/plant_fibres.py | 2 +- src/cargos/plastics.py | 2 +- src/cargos/potash.py | 2 +- src/cargos/propylene.py | 2 +- src/cargos/pumps_and_valves.py | 2 +- src/cargos/pyrite_ore.py | 2 +- src/cargos/quicklime.py | 2 +- src/cargos/raw_latex.py | 2 +- src/cargos/rebar.py | 2 +- src/cargos/recyclables.py | 2 +- src/cargos/rubber.py | 2 +- src/cargos/salt.py | 2 +- src/cargos/sand.py | 2 +- src/cargos/scrap_metal.py | 2 +- src/cargos/seals_belts_and_hoses.py | 2 +- src/cargos/slag.py | 2 +- src/cargos/soda_ash.py | 2 +- src/cargos/steel.py | 2 +- src/cargos/steel_billets_and_blooms.py | 2 +- src/cargos/steel_forgings.py | 2 +- src/cargos/steel_ingots.py | 2 +- src/cargos/steel_merchant_bar.py | 2 +- src/cargos/steel_pipe.py | 2 +- src/cargos/steel_sections.py | 2 +- src/cargos/steel_sheet.py | 2 +- src/cargos/steel_slab.py | 2 +- src/cargos/steel_tube.py | 2 +- src/cargos/steel_wire_rod.py | 2 +- src/cargos/sugar_beet.py | 2 +- src/cargos/sugarcane.py | 2 +- src/cargos/sulphur.py | 2 +- src/cargos/sulphuric_acid.py | 2 +- src/cargos/textiles.py | 2 +- src/cargos/timber.py | 2 +- src/cargos/tin.py | 2 +- src/cargos/tinplate.py | 2 +- src/cargos/tyre_cord.py | 2 +- src/cargos/tyres.py | 2 +- src/cargos/urea.py | 2 +- src/cargos/vehicle_bodies.py | 2 +- src/cargos/vehicle_engines.py | 2 +- src/cargos/vehicle_parts.py | 2 +- src/cargos/vehicles.py | 2 +- src/cargos/welding_consumables.py | 2 +- src/cargos/wool.py | 2 +- src/cargos/yarn.py | 2 +- src/cargos/zinc.py | 2 +- src/docs/doc_helper.py | 23 ++++++-- 125 files changed, 195 insertions(+), 158 deletions(-) diff --git a/src/cargo.py b/src/cargo.py index af438b053..1f059ea85 100644 --- a/src/cargo.py +++ b/src/cargo.py @@ -52,6 +52,60 @@ def __init__(self, id, **kwargs): if len(self.economy_variations) == 0: utils.echo_message(self.id + " is not used in any economy") + # validation + self.validate_cargo_classes() + + def validate_cargo_classes(self): + # crude, not intended to solve everything + disallowed_pairs = [("CC_FOOD_GRADE", "CC_NON_FOOD_GRADE")] + for disallowed_pair in disallowed_pairs: + if (disallowed_pair[0] in self.cargo_classes) and ( + disallowed_pair[1] in self.cargo_classes + ): + raise BaseException( + self.id + + " sets both " + + disallowed_pair[0] + + " and " + + disallowed_pair[1] + + " which is not supported" + ) + for cargo_class in self.cargo_classes: + # CC_GAS doesn't bother validating for food-grade bits as of 2024, food-grade gases tends to not be relevant + if cargo_class in [ + "CC_EXPRESS", + "CC_PIECE_GOODS", + "CC_OPEN_BULK", + "CC_COVERED_BULK", + "CC_LIQUID", + "CC_POWDERIZED", + ]: + if ("CC_FOOD_GRADE" not in self.cargo_classes) and ( + "CC_NON_FOOD_GRADE" not in self.cargo_classes + ): + raise BaseException( + self.id + + " should set one of CC_FOOD_GRADE or CC_NON_FOOD_GRADE" + ) + if cargo_class in ["CC_GAS", "CC_COVERED_BULK", "CC_POWDERIZED", "CC_FLATBED"]: + if ( + ("CC_PIECE_GOODS" not in self.cargo_classes) + and ("CC_OPEN_BULK" not in self.cargo_classes) + and ("CC_LIQUID" not in self.cargo_classes) + ): + raise BaseException( + self.id + + " should have a fallback set (CC_PIECE_GOODS, CC_OPEN_BULK or CC_LIQUID" + ) + if cargo_class in ["CC_FLATBED", "CC_REFRIGERATED"]: + if ( + ("CC_PIECE_GOODS" not in self.cargo_classes) + and ("CC_EXPRESS" not in self.cargo_classes) + ): + raise BaseException( + self.id + + " should have a fallback set (CC_PIECE_GOODS or CC_EXPRESS" + ) def get_numeric_id(self, economy): return self.economy_variations[economy].get("numeric_id") @@ -78,34 +132,6 @@ def get_property_declaration(self, property_name, economy=None): value = self.get_property(property_name, economy) return property_name + ": " + str(value) + ";" - def validate_cargo_classes(self): - # as of October 2024, I concluded that whilst the fundamental classes are useful, the extra 'exclude only' classes are not worth the candle - # (1) there's no clear heuristic for when to set them or not - # - IRL both pipe and farm machines are 'oversized', but STPP was setting CC_OVERSIZED, whilst FMSP was not - # - there's no compelling evidence about how, or even if, these extra classes are useful to vehicle set authors - # (2) setting them is likely to lead to unpredictable effects which are hard to reason about, whereas not setting them is easy to reason about - # https://newgrf-specs.tt-wiki.net/wiki/Action0/Cargos#CargoClasses_.2816.29 and https://newgrf-specs.tt-wiki.net/wiki/NML:Cargos#Cargo_classes - - # so we only permit the fundamental classes - allowed_cargo_classes = [ - "CC_PASSENGERS", - "CC_MAIL", - "CC_EXPRESS", - "CC_ARMOURED", - "CC_BULK", - "CC_PIECE_GOODS", - "CC_LIQUID", - "NO_CARGO_CLASS", - ] - for cargo_class in self.cargo_classes: - if cargo_class not in allowed_cargo_classes: - raise BaseException( - self.id - + " defines cargo class " - + cargo_class - + " which is not permitted." - ) - @property def properties_for_gs(self): result = {} diff --git a/src/cargos/acid.py b/src/cargos/acid.py index 7009449ae..207993f13 100644 --- a/src/cargos/acid.py +++ b/src/cargos/acid.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.5", # extra realism, per forum suggestion Nov 2017 is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="ACID", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_ACID)", diff --git a/src/cargos/aggregates.py b/src/cargos/aggregates.py index ce78f57bc..b0f15466b 100644 --- a/src/cargos/aggregates.py +++ b/src/cargos/aggregates.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="GRVL", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_AGGREGATES)", diff --git a/src/cargos/alcohol.py b/src/cargos/alcohol.py index 6e68849b9..b6115cfd3 100644 --- a/src/cargos/alcohol.py +++ b/src/cargos/alcohol.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.1", # such realism - I looked up the weight of 1L of beer, heavier than water :P is_freight="1", - cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_LIQUID"], + cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_LIQUID", "CC_FOOD_GRADE"], cargo_label="BEER", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_ALCOHOL)", diff --git a/src/cargos/aluminia.py b/src/cargos/aluminia.py index f6c92b57e..e4ec4982e 100644 --- a/src/cargos/aluminia.py +++ b/src/cargos/aluminia.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="ALO_", # Aluminium Oxide units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_ALUMINIA)", diff --git a/src/cargos/aluminium.py b/src/cargos/aluminium.py index 784fc854c..96fafd0ab 100644 --- a/src/cargos/aluminium.py +++ b/src/cargos/aluminium.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="ALUM", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_ALUMINIUM)", diff --git a/src/cargos/ammonia.py b/src/cargos/ammonia.py index f33362c2d..b03925c97 100644 --- a/src/cargos/ammonia.py +++ b/src/cargos/ammonia.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.60", # extra realism per forum suggestion is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_GAS", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="NH3_", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_AMMONIA)", diff --git a/src/cargos/ammonium_nitrate.py b/src/cargos/ammonium_nitrate.py index 9a1a67ab8..8f851dbb7 100644 --- a/src/cargos/ammonium_nitrate.py +++ b/src/cargos/ammonium_nitrate.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.60", # extra realism per forum suggestion is_freight="1", - cargo_classes = ["CC_BULK", "CC_PIECE_GOODS"], + cargo_classes = ["CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="NHNO", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_AMMONIUM_NITRATE)", diff --git a/src/cargos/bauxite.py b/src/cargos/bauxite.py index 33f3efe9b..e8550ffe7 100644 --- a/src/cargos/bauxite.py +++ b/src/cargos/bauxite.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="AORE", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_BAUXITE)", diff --git a/src/cargos/beans.py b/src/cargos/beans.py index f6aed10b8..c4745c3ce 100644 --- a/src/cargos/beans.py +++ b/src/cargos/beans.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_FOOD_GRADE"], cargo_label="BEAN", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_BEANS)", diff --git a/src/cargos/building_materials.py b/src/cargos/building_materials.py index 5ff4bd9cb..45cd91e16 100644 --- a/src/cargos/building_materials.py +++ b/src/cargos/building_materials.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS", "CC_BULK"], + cargo_classes = ["CC_PIECE_GOODS", "CC_COVERED_BULK", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="BDMT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_BUILDING_MATERIALS)", diff --git a/src/cargos/carbon_black.py b/src/cargos/carbon_black.py index 3afa40bf7..aa2f5691d 100644 --- a/src/cargos/carbon_black.py +++ b/src/cargos/carbon_black.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS", "CC_BULK"], + cargo_classes = ["CC_PIECE_GOODS", "CC_COVERED_BULK", "CC_POWDERIZED", "CC_NON_FOOD_GRADE"], cargo_label="CBLK", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_CARBON_BLACK)", diff --git a/src/cargos/cassava.py b/src/cargos/cassava.py index f5865d0d5..a20c73efd 100644 --- a/src/cargos/cassava.py +++ b/src/cargos/cassava.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_COVERED_BULK", "CC_FOOD_GRADE"], cargo_label="CASS", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_CASSAVA)", diff --git a/src/cargos/cast_iron.py b/src/cargos/cast_iron.py index a3af8062e..e62de975a 100644 --- a/src/cargos/cast_iron.py +++ b/src/cargos/cast_iron.py @@ -9,7 +9,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="CSTI", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_CAST_IRON)", diff --git a/src/cargos/cement.py b/src/cargos/cement.py index e2c2e4631..b795e8d51 100644 --- a/src/cargos/cement.py +++ b/src/cargos/cement.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_POWDERIZED", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="CMNT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_CEMENT)", diff --git a/src/cargos/chemicals.py b/src/cargos/chemicals.py index 96ba17163..4a5a96120 100644 --- a/src/cargos/chemicals.py +++ b/src/cargos/chemicals.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.2", # extra realism, per forum suggestion Nov 2017 is_freight="1", - cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS"], + cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS", "CC_GAS", "CC_NON_FOOD_GRADE"], cargo_label="RFPR", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_CHEMICALS)", diff --git a/src/cargos/chlorine.py b/src/cargos/chlorine.py index 749acf922..7721efb33 100644 --- a/src/cargos/chlorine.py +++ b/src/cargos/chlorine.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="2.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_GAS", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="CHLO", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_CHLORINE)", diff --git a/src/cargos/chromite_ore.py b/src/cargos/chromite_ore.py index d7870169e..29d9152b4 100644 --- a/src/cargos/chromite_ore.py +++ b/src/cargos/chromite_ore.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="CHRO", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_CHROMITE_ORE)", diff --git a/src/cargos/clay.py b/src/cargos/clay.py index 8eddeec1a..3cc864c1f 100644 --- a/src/cargos/clay.py +++ b/src/cargos/clay.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="CLAY", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_CLAY)", diff --git a/src/cargos/cleaning_agents.py b/src/cargos/cleaning_agents.py index 69fae3111..60e92bc42 100644 --- a/src/cargos/cleaning_agents.py +++ b/src/cargos/cleaning_agents.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS"], + cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="SOAP", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_CLEANING_AGENTS)", diff --git a/src/cargos/coal.py b/src/cargos/coal.py index a7971b89a..5f65f7b00 100644 --- a/src/cargos/coal.py +++ b/src/cargos/coal.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="COAL", units_of_cargo="TTD_STR_TONS", items_of_cargo="TTD_STR_QUANTITY_COAL", diff --git a/src/cargos/coal_tar.py b/src/cargos/coal_tar.py index ec9ee8e9f..44ae774ea 100644 --- a/src/cargos/coal_tar.py +++ b/src/cargos/coal_tar.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="CTAR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_COAL_TAR)", diff --git a/src/cargos/coffee.py b/src/cargos/coffee.py index 9ccb2ba19..488a48ecf 100644 --- a/src/cargos/coffee.py +++ b/src/cargos/coffee.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.25", # IRL coffee is lighter even than this, but eh is_freight="1", - cargo_classes = ["CC_PIECE_GOODS", "CC_EXPRESS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_EXPRESS", "CC_FOOD_GRADE"], cargo_label="JAVA", units_of_cargo="TTD_STR_BAGS", items_of_cargo="string(STR_CARGO_UNIT_COFFEE)", diff --git a/src/cargos/coke.py b/src/cargos/coke.py index 3a45facba..c6fbb0c1f 100644 --- a/src/cargos/coke.py +++ b/src/cargos/coke.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="COKE", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_COKE)", diff --git a/src/cargos/concrete_products.py b/src/cargos/concrete_products.py index 3f740560f..e962e8744 100644 --- a/src/cargos/concrete_products.py +++ b/src/cargos/concrete_products.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="CCPR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_CONCRETE_PRODUCTS)", diff --git a/src/cargos/copper.py b/src/cargos/copper.py index b070c149e..b4a5876f4 100644 --- a/src/cargos/copper.py +++ b/src/cargos/copper.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="COPR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_COPPER)", diff --git a/src/cargos/copper_concentrate.py b/src/cargos/copper_concentrate.py index eb9a6c5fe..affffcbf2 100644 --- a/src/cargos/copper_concentrate.py +++ b/src/cargos/copper_concentrate.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="COCO", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_COPPER_CONCENTRATE)", diff --git a/src/cargos/copper_ore.py b/src/cargos/copper_ore.py index b2888210f..e4a0a9bed 100644 --- a/src/cargos/copper_ore.py +++ b/src/cargos/copper_ore.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="CORE", units_of_cargo="TTD_STR_TONS", items_of_cargo="TTD_STR_QUANTITY_COPPER_ORE", diff --git a/src/cargos/edible_oil.py b/src/cargos/edible_oil.py index c9d6908a2..b7bd15e6a 100644 --- a/src/cargos/edible_oil.py +++ b/src/cargos/edible_oil.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS", "CC_LIQUID"], + cargo_classes = ["CC_PIECE_GOODS", "CC_LIQUID", "CC_FOOD_GRADE"], cargo_label="EOIL", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_EDIBLE_OIL)", diff --git a/src/cargos/electrical_parts.py b/src/cargos/electrical_parts.py index f2dadb56f..ae388d280 100644 --- a/src/cargos/electrical_parts.py +++ b/src/cargos/electrical_parts.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="POWR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_ELECTRICAL_PARTS)", diff --git a/src/cargos/engineering_supplies.py b/src/cargos/engineering_supplies.py index 430eead70..cc780223b 100644 --- a/src/cargos/engineering_supplies.py +++ b/src/cargos/engineering_supplies.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.65", is_freight="1", - cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS"], + cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="ENSP", units_of_cargo="TTD_STR_CRATES", items_of_cargo="string(STR_CARGO_UNIT_ENGINEERING_SUPPLIES)", diff --git a/src/cargos/ethylene.py b/src/cargos/ethylene.py index dc7180b79..dc7bb30d8 100644 --- a/src/cargos/ethylene.py +++ b/src/cargos/ethylene.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="2.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="C2H4", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_ETHYLENE)", diff --git a/src/cargos/explosives.py b/src/cargos/explosives.py index 06afbd034..8fbd4fb05 100644 --- a/src/cargos/explosives.py +++ b/src/cargos/explosives.py @@ -9,7 +9,7 @@ weight="0.25", is_freight="1", # armoured is a deliberate choice for explosives, tested with 10 of the major vehicle grfs in 2024, worked well - cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_ARMOURED"], + cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_ARMOURED", "CC_NON_FOOD_GRADE"], cargo_label="BOOM", units_of_cargo="TTD_STR_CRATES", items_of_cargo="string(STR_CARGO_UNIT_EXPLOSIVES)", diff --git a/src/cargos/farm_supplies.py b/src/cargos/farm_supplies.py index 1e51182cd..73cf12889 100644 --- a/src/cargos/farm_supplies.py +++ b/src/cargos/farm_supplies.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.65", is_freight="1", - cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS"], + cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="FMSP", units_of_cargo="TTD_STR_CRATES", items_of_cargo="string(STR_CARGO_UNIT_FMSP)", diff --git a/src/cargos/ferroalloys.py b/src/cargos/ferroalloys.py index 1c95e2492..3bfba73e8 100644 --- a/src/cargos/ferroalloys.py +++ b/src/cargos/ferroalloys.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK", "CC_PIECE_GOODS"], + cargo_classes = ["CC_OPEN_BULK", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="FEAL", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_FERROALLOYS)", diff --git a/src/cargos/ferrochrome.py b/src/cargos/ferrochrome.py index 835895329..197d640b5 100644 --- a/src/cargos/ferrochrome.py +++ b/src/cargos/ferrochrome.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="FECR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_FERROCHROME)", diff --git a/src/cargos/fertiliser.py b/src/cargos/fertiliser.py index 7313302ea..61305134c 100644 --- a/src/cargos/fertiliser.py +++ b/src/cargos/fertiliser.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS", "CC_BULK"], + cargo_classes = ["CC_PIECE_GOODS", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="FERT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_FERTILISER)", diff --git a/src/cargos/fish.py b/src/cargos/fish.py index 1bdf6a2d7..bce486be2 100644 --- a/src/cargos/fish.py +++ b/src/cargos/fish.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_EXPRESS"], + cargo_classes = ["CC_EXPRESS", "CC_REFRIGERATED", "CC_FOOD_GRADE"], cargo_label="FISH", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_FISH)", diff --git a/src/cargos/food.py b/src/cargos/food.py index d452eed4d..480b1208d 100644 --- a/src/cargos/food.py +++ b/src/cargos/food.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_EXPRESS"], + cargo_classes = ["CC_EXPRESS", "CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_LIQUID", "CC_FOOD_GRADE", "CC_REFRIGERATED"], cargo_label="FOOD", # apart from TOWNGROWTH_PASSENGERS and TOWNGROWTH_MAIL, FIRS does not set any town growth effects; this has the intended effect of disabling food / water requirements for towns in desert and above snowline units_of_cargo="TTD_STR_TONS", diff --git a/src/cargos/food_additives.py b/src/cargos/food_additives.py index 38c8f75eb..183e22a0c 100644 --- a/src/cargos/food_additives.py +++ b/src/cargos/food_additives.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID", "CC_BULK", "CC_PIECE_GOODS"], + cargo_classes = ["CC_LIQUID", "CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_FOOD_GRADE"], cargo_label="ENUM", # yes it's a terrible pun on several things at once - LordAro suggested it units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_FOOD_ADDITIVES)", diff --git a/src/cargos/forgings_and_castings.py b/src/cargos/forgings_and_castings.py index 7fb9f25a2..1f785601b 100644 --- a/src/cargos/forgings_and_castings.py +++ b/src/cargos/forgings_and_castings.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="FOCA", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_FORGINGS_AND_CASTINGS)", diff --git a/src/cargos/formic_acid.py b/src/cargos/formic_acid.py index 5f2a0b742..fbd65324b 100644 --- a/src/cargos/formic_acid.py +++ b/src/cargos/formic_acid.py @@ -6,9 +6,9 @@ unit_name="string(STR_CARGO_NAME_FORMIC_ACID)", type_abbreviation="string(STR_CID_FORMIC_ACID)", sprite="NEW_CARGO_SPRITE", - weight="1.2", # extra realism, per forum suggestion Nov 2017 + weight="1.2", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="FORM", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_FORMIC_ACID)", diff --git a/src/cargos/fruits.py b/src/cargos/fruits.py index c655384d5..a31888a66 100644 --- a/src/cargos/fruits.py +++ b/src/cargos/fruits.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS"], + cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_REFRIGERATED", "CC_COVERED_BULK", "CC_FOOD_GRADE"], cargo_label="FRUT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_FRUITS)", diff --git a/src/cargos/furniture.py b/src/cargos/furniture.py index c3ef67817..0d317c933 100644 --- a/src/cargos/furniture.py +++ b/src/cargos/furniture.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="FURN", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_FURNITURE)", diff --git a/src/cargos/glass.py b/src/cargos/glass.py index ae2c35998..43541d579 100644 --- a/src/cargos/glass.py +++ b/src/cargos/glass.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="GLAS", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_GLASS)", diff --git a/src/cargos/goods.py b/src/cargos/goods.py index 9d3bc1b1b..ad3069405 100644 --- a/src/cargos/goods.py +++ b/src/cargos/goods.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.5", is_freight="1", - cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS"], + cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="GOOD", units_of_cargo="TTD_STR_CRATES", items_of_cargo="TTD_STR_QUANTITY_GOODS", diff --git a/src/cargos/grain.py b/src/cargos/grain.py index 0230ddfa3..baf7a7784 100644 --- a/src/cargos/grain.py +++ b/src/cargos/grain.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_FOOD_GRADE"], cargo_label="GRAI", units_of_cargo="TTD_STR_TONS", items_of_cargo="TTD_STR_QUANTITY_GRAIN", diff --git a/src/cargos/hardware.py b/src/cargos/hardware.py index ca1f30dfa..2ccec7c60 100644 --- a/src/cargos/hardware.py +++ b/src/cargos/hardware.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS", "CC_EXPRESS"], # express because delivered to towns + cargo_classes = ["CC_PIECE_GOODS", "CC_EXPRESS", "CC_NON_FOOD_GRADE"], # express because delivered to towns cargo_label="HWAR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_HARDWARE)", diff --git a/src/cargos/hydrochloric_acid.py b/src/cargos/hydrochloric_acid.py index d359600b8..3ddc16392 100644 --- a/src/cargos/hydrochloric_acid.py +++ b/src/cargos/hydrochloric_acid.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.5", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="HYAC", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_HYDROCHLORIC_ACID)", diff --git a/src/cargos/iron_ore.py b/src/cargos/iron_ore.py index 9830366da..a30397bf1 100644 --- a/src/cargos/iron_ore.py +++ b/src/cargos/iron_ore.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="IORE", units_of_cargo="TTD_STR_TONS", items_of_cargo="TTD_STR_QUANTITY_IRON_ORE", diff --git a/src/cargos/kaolin.py b/src/cargos/kaolin.py index 449c43c38..af018b356 100644 --- a/src/cargos/kaolin.py +++ b/src/cargos/kaolin.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK", "CC_LIQUID"], + cargo_classes = ["CC_OPEN_BULK", "CC_LIQUID", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="KAOL", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_KAOLIN)", diff --git a/src/cargos/limestone.py b/src/cargos/limestone.py index 73379f598..7e7cdd82f 100644 --- a/src/cargos/limestone.py +++ b/src/cargos/limestone.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="LIME", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_LIMESTONE)", diff --git a/src/cargos/livestock.py b/src/cargos/livestock.py index 4167e4dfe..0041eb7a4 100644 --- a/src/cargos/livestock.py +++ b/src/cargos/livestock.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.1875", # average weight of a shetland pony apparently (and no we don't eat ponies, but eh) is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_WEIRD", "CC_NON_FOOD_GRADE"], cargo_label="LVST", units_of_cargo="TTD_STR_ITEMS", items_of_cargo="TTD_STR_QUANTITY_LIVESTOCK", diff --git a/src/cargos/logs.py b/src/cargos/logs.py index d4b0e9e1b..bf3e26f22 100644 --- a/src/cargos/logs.py +++ b/src/cargos/logs.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], # for legacy compatibility WOOD label is used as there is very wide support for it # but as a name string that has proven ambiguous in games - conflates with finished wood products (lumber, finished timber etc) cargo_label="WOOD", diff --git a/src/cargos/lye.py b/src/cargos/lye.py index b82eed8bf..927e46793 100644 --- a/src/cargos/lye.py +++ b/src/cargos/lye.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.5", # extra realism, per forum suggestion Nov 2017 is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="LYE_", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_LYE)", diff --git a/src/cargos/maize.py b/src/cargos/maize.py index 82d302234..4a2f31f8e 100644 --- a/src/cargos/maize.py +++ b/src/cargos/maize.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_FOOD_GRADE"], cargo_label="MAIZ", units_of_cargo="TTD_STR_TONS", items_of_cargo="TTD_STR_QUANTITY_MAIZE", diff --git a/src/cargos/manganese.py b/src/cargos/manganese.py index d439fc1bf..90a46f16f 100644 --- a/src/cargos/manganese.py +++ b/src/cargos/manganese.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="MNO2", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_MANGANESE)", diff --git a/src/cargos/metal.py b/src/cargos/metal.py index 7af81cd21..5350759d5 100644 --- a/src/cargos/metal.py +++ b/src/cargos/metal.py @@ -9,7 +9,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="METL", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_METAL)", diff --git a/src/cargos/methanol.py b/src/cargos/methanol.py index 7c52c4587..7645ddb3d 100644 --- a/src/cargos/methanol.py +++ b/src/cargos/methanol.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="2.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="MEOH", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_METHANOL)", diff --git a/src/cargos/milk.py b/src/cargos/milk.py index 821d1a591..e8dfd8781 100644 --- a/src/cargos/milk.py +++ b/src/cargos/milk.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.1", is_freight="1", - cargo_classes = ["CC_EXPRESS", "CC_LIQUID"], + cargo_classes = ["CC_EXPRESS", "CC_LIQUID", "CC_FOOD_GRADE", "CC_REFRIGERATED"], cargo_label="MILK", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_MILK)", diff --git a/src/cargos/naphtha.py b/src/cargos/naphtha.py index facbc059e..18f3d73e1 100644 --- a/src/cargos/naphtha.py +++ b/src/cargos/naphtha.py @@ -10,7 +10,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.8", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="NAPH", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_NAPHTHA)", diff --git a/src/cargos/nickel.py b/src/cargos/nickel.py index 5e3ae668f..ad26e7e35 100644 --- a/src/cargos/nickel.py +++ b/src/cargos/nickel.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="NICK", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_NICKEL)", diff --git a/src/cargos/nitrates.py b/src/cargos/nitrates.py index 7ffed7edf..2dc1e7e23 100644 --- a/src/cargos/nitrates.py +++ b/src/cargos/nitrates.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="NITR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_NITRATES)", diff --git a/src/cargos/nitrogen.py b/src/cargos/nitrogen.py index c23b4601f..d0580d7fc 100644 --- a/src/cargos/nitrogen.py +++ b/src/cargos/nitrogen.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_GAS", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="N7__", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_NITROGEN)", diff --git a/src/cargos/nuts.py b/src/cargos/nuts.py index 16df2a4a5..ab9e8e63f 100644 --- a/src/cargos/nuts.py +++ b/src/cargos/nuts.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.25", # IRL sacks of nuts are lighter even than this, but eh is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_COVERED_BULK", "CC_FOOD_GRADE"], cargo_label="NUTS", units_of_cargo="TTD_STR_BAGS", items_of_cargo="string(STR_CARGO_UNIT_NUTS)", diff --git a/src/cargos/oil.py b/src/cargos/oil.py index 39ed821a1..139880795 100644 --- a/src/cargos/oil.py +++ b/src/cargos/oil.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.9", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="OIL_", units_of_cargo="TTD_STR_LITERS", items_of_cargo="TTD_STR_QUANTITY_OIL", diff --git a/src/cargos/oxygen.py b/src/cargos/oxygen.py index 82bc229a6..10c28bf34 100644 --- a/src/cargos/oxygen.py +++ b/src/cargos/oxygen.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_GAS", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="O2__", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_OXYGEN)", diff --git a/src/cargos/packaging.py b/src/cargos/packaging.py index 513b35e69..ed027bfa3 100644 --- a/src/cargos/packaging.py +++ b/src/cargos/packaging.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.65", is_freight="1", - cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS"], + cargo_classes = ["CC_EXPRESS", "CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="MNSP", # MNSP label preserved in FIRS v3 for backwards compatibility, may remove in v4 units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_PACKAGING)", diff --git a/src/cargos/paints_and_coatings.py b/src/cargos/paints_and_coatings.py index 4628126a7..098376cf7 100644 --- a/src/cargos/paints_and_coatings.py +++ b/src/cargos/paints_and_coatings.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS"], + cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="COAT", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_PAINTS_AND_COATINGS)", diff --git a/src/cargos/paper.py b/src/cargos/paper.py index 5b35dfc9c..c953ea5f9 100644 --- a/src/cargos/paper.py +++ b/src/cargos/paper.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="PAPR", units_of_cargo="TTD_STR_TONS", items_of_cargo="TTD_STR_QUANTITY_PAPER", diff --git a/src/cargos/peat.py b/src/cargos/peat.py index f0a6a869b..55a8b5f85 100644 --- a/src/cargos/peat.py +++ b/src/cargos/peat.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="PEAT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_PEAT)", diff --git a/src/cargos/petrol.py b/src/cargos/petrol.py index 0965c694e..626e6ca79 100644 --- a/src/cargos/petrol.py +++ b/src/cargos/petrol.py @@ -10,7 +10,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.8", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="PETR", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_PETROL)", diff --git a/src/cargos/pharmaceuticals.py b/src/cargos/pharmaceuticals.py index 49fb2e3a4..e6d804fee 100644 --- a/src/cargos/pharmaceuticals.py +++ b/src/cargos/pharmaceuticals.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_EXPRESS"], + cargo_classes = ["CC_REFRIGERATED", "CC_EXPRESS"], cargo_label="FOOD", units_of_cargo="TTD_STR_TONS", items_of_cargo="TTD_STR_QUANTITY_FOOD", diff --git a/src/cargos/phosphate.py b/src/cargos/phosphate.py index abb92862d..702658f78 100644 --- a/src/cargos/phosphate.py +++ b/src/cargos/phosphate.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="PHOS", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_PHOSPHATE)", diff --git a/src/cargos/phosphoric_acid.py b/src/cargos/phosphoric_acid.py index 992b873d6..9bb0f57c8 100644 --- a/src/cargos/phosphoric_acid.py +++ b/src/cargos/phosphoric_acid.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.5", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="PHAC", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_PHOSPHORIC_ACID)", diff --git a/src/cargos/pig_iron.py b/src/cargos/pig_iron.py index 3cc7716fc..92739ab9d 100644 --- a/src/cargos/pig_iron.py +++ b/src/cargos/pig_iron.py @@ -9,7 +9,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="IRON", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_PIG_IRON)", diff --git a/src/cargos/pipework.py b/src/cargos/pipework.py index a5cd10a42..8c45d3130 100644 --- a/src/cargos/pipework.py +++ b/src/cargos/pipework.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="PPWK", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_PIPEWORK)", diff --git a/src/cargos/plant_fibres.py b/src/cargos/plant_fibres.py index 5c4a4deaf..99fcb778d 100644 --- a/src/cargos/plant_fibres.py +++ b/src/cargos/plant_fibres.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.2", is_freight="1", - cargo_classes = ["CC_BULK", "CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="FICR", units_of_cargo="TTD_STR_ITEMS", items_of_cargo="string(STR_CARGO_UNIT_FIBRES)", diff --git a/src/cargos/plastics.py b/src/cargos/plastics.py index 621a5fa44..fb43dd843 100644 --- a/src/cargos/plastics.py +++ b/src/cargos/plastics.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS", "CC_BULK"], + cargo_classes = ["CC_PIECE_GOODS", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="PLAS", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_PLASTICS)", diff --git a/src/cargos/potash.py b/src/cargos/potash.py index 6f863e175..de275a557 100644 --- a/src/cargos/potash.py +++ b/src/cargos/potash.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="POTA", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_POTASH)", diff --git a/src/cargos/propylene.py b/src/cargos/propylene.py index 6973e1220..a7317541f 100644 --- a/src/cargos/propylene.py +++ b/src/cargos/propylene.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="2.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_GAS", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="C3H6", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_PROPYLENE)", diff --git a/src/cargos/pumps_and_valves.py b/src/cargos/pumps_and_valves.py index 8ca8fe99e..89eb8e5e2 100644 --- a/src/cargos/pumps_and_valves.py +++ b/src/cargos/pumps_and_valves.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="PUMP", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_PUMPS_AND_VALVES)", diff --git a/src/cargos/pyrite_ore.py b/src/cargos/pyrite_ore.py index cd4c11a14..8842d68cf 100644 --- a/src/cargos/pyrite_ore.py +++ b/src/cargos/pyrite_ore.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="PORE", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_PYRITE_ORE)", diff --git a/src/cargos/quicklime.py b/src/cargos/quicklime.py index 77f071826..3d14e889d 100644 --- a/src/cargos/quicklime.py +++ b/src/cargos/quicklime.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_POWDERIZED", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="QLME", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_QUICKLIME)", diff --git a/src/cargos/raw_latex.py b/src/cargos/raw_latex.py index 847a70595..ad03a1c79 100644 --- a/src/cargos/raw_latex.py +++ b/src/cargos/raw_latex.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="LATX", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_RAW_LATEX)", diff --git a/src/cargos/rebar.py b/src/cargos/rebar.py index bc5b0e4a0..d91bf6873 100644 --- a/src/cargos/rebar.py +++ b/src/cargos/rebar.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="RBAR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_REBAR)", diff --git a/src/cargos/recyclables.py b/src/cargos/recyclables.py index f5ef6a226..0bbc6d968 100644 --- a/src/cargos/recyclables.py +++ b/src/cargos/recyclables.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK", "CC_PIECE_GOODS"], + cargo_classes = ["CC_OPEN_BULK", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="RCYC", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_RECYCLABLES)", diff --git a/src/cargos/rubber.py b/src/cargos/rubber.py index c953187d5..d7ec9f77d 100644 --- a/src/cargos/rubber.py +++ b/src/cargos/rubber.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_PIECE_GOODS", "CC_COVERED_BULK", "CC_POWDERIZED", "CC_NON_FOOD_GRADE"], cargo_label="RUBR", units_of_cargo="TTD_STR_LITERS", items_of_cargo="TTD_STR_QUANTITY_RUBBER", diff --git a/src/cargos/salt.py b/src/cargos/salt.py index 833185cee..f1b2118e1 100644 --- a/src/cargos/salt.py +++ b/src/cargos/salt.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="SALT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SALT)", diff --git a/src/cargos/sand.py b/src/cargos/sand.py index 262b31be0..6fb67787e 100644 --- a/src/cargos/sand.py +++ b/src/cargos/sand.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="SAND", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SAND)", diff --git a/src/cargos/scrap_metal.py b/src/cargos/scrap_metal.py index fb70a2614..032c7e1ad 100644 --- a/src/cargos/scrap_metal.py +++ b/src/cargos/scrap_metal.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="SCMT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SCRAP_METAL)", diff --git a/src/cargos/seals_belts_and_hoses.py b/src/cargos/seals_belts_and_hoses.py index 09c71ead7..de2b9c306 100644 --- a/src/cargos/seals_belts_and_hoses.py +++ b/src/cargos/seals_belts_and_hoses.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="SEAL", # could have been HOSE or BELT or SHAB, but eh units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SEALS_HOSES_AND_BELTS)", diff --git a/src/cargos/slag.py b/src/cargos/slag.py index 3933e559f..d73b06116 100644 --- a/src/cargos/slag.py +++ b/src/cargos/slag.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_NON_FOOD_GRADE"], cargo_label="SLAG", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SLAG)", diff --git a/src/cargos/soda_ash.py b/src/cargos/soda_ash.py index d15d24ddf..f7f63250e 100644 --- a/src/cargos/soda_ash.py +++ b/src/cargos/soda_ash.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_COVERED_BULK", "CC_PIECE_GOODS", "CC_POWDERIZED", "CC_NON_FOOD_GRADE"], cargo_label="SASH", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SODA_ASH)", diff --git a/src/cargos/steel.py b/src/cargos/steel.py index c3f9e475e..8f5b139b4 100644 --- a/src/cargos/steel.py +++ b/src/cargos/steel.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STEL", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL)", diff --git a/src/cargos/steel_billets_and_blooms.py b/src/cargos/steel_billets_and_blooms.py index 5cb3db016..ed356849e 100644 --- a/src/cargos/steel_billets_and_blooms.py +++ b/src/cargos/steel_billets_and_blooms.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STBL", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_BILLETS_AND_BLOOMS)", diff --git a/src/cargos/steel_forgings.py b/src/cargos/steel_forgings.py index dc1cfc372..10c383185 100644 --- a/src/cargos/steel_forgings.py +++ b/src/cargos/steel_forgings.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="FOCA", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_FORGINGS)", diff --git a/src/cargos/steel_ingots.py b/src/cargos/steel_ingots.py index c773f0042..c6dd641fa 100644 --- a/src/cargos/steel_ingots.py +++ b/src/cargos/steel_ingots.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STIG", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_INGOTS)", diff --git a/src/cargos/steel_merchant_bar.py b/src/cargos/steel_merchant_bar.py index fb99ce4df..8d95dd796 100644 --- a/src/cargos/steel_merchant_bar.py +++ b/src/cargos/steel_merchant_bar.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STBR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_MERCHANT_BAR)", diff --git a/src/cargos/steel_pipe.py b/src/cargos/steel_pipe.py index ddbb4ed34..d57c63687 100644 --- a/src/cargos/steel_pipe.py +++ b/src/cargos/steel_pipe.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STPP", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_PIPE)", diff --git a/src/cargos/steel_sections.py b/src/cargos/steel_sections.py index 0671adb78..bb6c91a80 100644 --- a/src/cargos/steel_sections.py +++ b/src/cargos/steel_sections.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STSE", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_SECTIONS)", diff --git a/src/cargos/steel_sheet.py b/src/cargos/steel_sheet.py index cea570bec..bead983af 100644 --- a/src/cargos/steel_sheet.py +++ b/src/cargos/steel_sheet.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STSH", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_SHEET)", diff --git a/src/cargos/steel_slab.py b/src/cargos/steel_slab.py index c5ff477ff..11af4b722 100644 --- a/src/cargos/steel_slab.py +++ b/src/cargos/steel_slab.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STSL", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_SLAB)", diff --git a/src/cargos/steel_tube.py b/src/cargos/steel_tube.py index 1b39aec6c..6abf8af91 100644 --- a/src/cargos/steel_tube.py +++ b/src/cargos/steel_tube.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STTB", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_TUBE)", diff --git a/src/cargos/steel_wire_rod.py b/src/cargos/steel_wire_rod.py index 63c5eaa6b..5af032949 100644 --- a/src/cargos/steel_wire_rod.py +++ b/src/cargos/steel_wire_rod.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="STWR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_STEEL_WIRE_ROD)", diff --git a/src/cargos/sugar_beet.py b/src/cargos/sugar_beet.py index d598fe42c..b4974f926 100644 --- a/src/cargos/sugar_beet.py +++ b/src/cargos/sugar_beet.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_FOOD_GRADE"], cargo_label="SGBT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SUGAR_BEET)", diff --git a/src/cargos/sugarcane.py b/src/cargos/sugarcane.py index 7e75bbb74..24ab5d9d8 100644 --- a/src/cargos/sugarcane.py +++ b/src/cargos/sugarcane.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK"], + cargo_classes = ["CC_OPEN_BULK", "CC_WEIRD"], cargo_label="SGCN", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SUGARCANE)", diff --git a/src/cargos/sulphur.py b/src/cargos/sulphur.py index 8e7ef4e1c..287b7728d 100644 --- a/src/cargos/sulphur.py +++ b/src/cargos/sulphur.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK", "CC_LIQUID"], + cargo_classes = ["CC_OPEN_BULK", "CC_LIQUID", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="SULP", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_SULPHUR)", diff --git a/src/cargos/sulphuric_acid.py b/src/cargos/sulphuric_acid.py index 77e26c645..43bfdcd5e 100644 --- a/src/cargos/sulphuric_acid.py +++ b/src/cargos/sulphuric_acid.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.5", is_freight="1", - cargo_classes = ["CC_LIQUID"], + cargo_classes = ["CC_LIQUID", "CC_NON_FOOD_GRADE"], cargo_label="SUAC", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_SULPHURIC_ACID)", diff --git a/src/cargos/textiles.py b/src/cargos/textiles.py index 5737ca977..b970a5c9d 100644 --- a/src/cargos/textiles.py +++ b/src/cargos/textiles.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="TEXT", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_TEXTILES)", diff --git a/src/cargos/timber.py b/src/cargos/timber.py index 400e21cc2..0e49952fe 100644 --- a/src/cargos/timber.py +++ b/src/cargos/timber.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_BULK", "CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="WDPR", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_TIMBER)", diff --git a/src/cargos/tin.py b/src/cargos/tin.py index 384bafc59..84527a058 100644 --- a/src/cargos/tin.py +++ b/src/cargos/tin.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="TIN_", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_TIN)", diff --git a/src/cargos/tinplate.py b/src/cargos/tinplate.py index 122c5c332..6ca265125 100644 --- a/src/cargos/tinplate.py +++ b/src/cargos/tinplate.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="TINP", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_TINPLATE)", diff --git a/src/cargos/tyre_cord.py b/src/cargos/tyre_cord.py index 0b9680c47..c58cce58f 100644 --- a/src/cargos/tyre_cord.py +++ b/src/cargos/tyre_cord.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="TYCO", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_TYRE_CORD)", diff --git a/src/cargos/tyres.py b/src/cargos/tyres.py index 26f898c85..489b1b38a 100644 --- a/src/cargos/tyres.py +++ b/src/cargos/tyres.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="TYRE", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_TYRES)", diff --git a/src/cargos/urea.py b/src/cargos/urea.py index 7271b5b2a..175122a1c 100644 --- a/src/cargos/urea.py +++ b/src/cargos/urea.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID", "CC_BULK"], + cargo_classes = ["CC_LIQUID", "CC_COVERED_BULK", "CC_NON_FOOD_GRADE"], cargo_label="UREA", units_of_cargo="TTD_STR_LITERS", items_of_cargo="string(STR_CARGO_UNIT_UREA)", diff --git a/src/cargos/vehicle_bodies.py b/src/cargos/vehicle_bodies.py index 3158f4961..46127f61e 100644 --- a/src/cargos/vehicle_bodies.py +++ b/src/cargos/vehicle_bodies.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="VBOD", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_VEHICLE_BODIES)", diff --git a/src/cargos/vehicle_engines.py b/src/cargos/vehicle_engines.py index daba9fc8b..971d4a47f 100644 --- a/src/cargos/vehicle_engines.py +++ b/src/cargos/vehicle_engines.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="VENG", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_VEHICLE_ENGINES)", diff --git a/src/cargos/vehicle_parts.py b/src/cargos/vehicle_parts.py index 6985355d0..b9fb7c167 100644 --- a/src/cargos/vehicle_parts.py +++ b/src/cargos/vehicle_parts.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="VPTS", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_VEHICLE_PARTS)", diff --git a/src/cargos/vehicles.py b/src/cargos/vehicles.py index 72b1e70b2..819f37fed 100644 --- a/src/cargos/vehicles.py +++ b/src/cargos/vehicles.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="VEHI", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_VEHICLES)", diff --git a/src/cargos/welding_consumables.py b/src/cargos/welding_consumables.py index 69e9f827f..54ae69afb 100644 --- a/src/cargos/welding_consumables.py +++ b/src/cargos/welding_consumables.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_LIQUID", "CC_EXPRESS", "CC_PIECE_GOODS"], + cargo_classes = ["CC_LIQUID", "CC_EXPRESS", "CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="WELD", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_WELDING_CONSUMABLES)", diff --git a/src/cargos/wool.py b/src/cargos/wool.py index cdfd2ac46..a9d2c7321 100644 --- a/src/cargos/wool.py +++ b/src/cargos/wool.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.2", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="WOOL", units_of_cargo="TTD_STR_ITEMS", items_of_cargo="string(STR_CARGO_UNIT_WOOL)", diff --git a/src/cargos/yarn.py b/src/cargos/yarn.py index 7b18524bc..fce7067da 100644 --- a/src/cargos/yarn.py +++ b/src/cargos/yarn.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="0.2", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_NON_FOOD_GRADE"], cargo_label="YARN", units_of_cargo="TTD_STR_ITEMS", items_of_cargo="string(STR_CARGO_UNIT_YARN)", diff --git a/src/cargos/zinc.py b/src/cargos/zinc.py index 71ce03d2c..f508164f8 100644 --- a/src/cargos/zinc.py +++ b/src/cargos/zinc.py @@ -8,7 +8,7 @@ sprite="NEW_CARGO_SPRITE", weight="1.0", is_freight="1", - cargo_classes = ["CC_PIECE_GOODS"], + cargo_classes = ["CC_PIECE_GOODS", "CC_FLATBED", "CC_NON_FOOD_GRADE"], cargo_label="ZINC", units_of_cargo="TTD_STR_TONS", items_of_cargo="string(STR_CARGO_UNIT_ZINC)", diff --git a/src/docs/doc_helper.py b/src/docs/doc_helper.py index 44d27e98c..963064334 100755 --- a/src/docs/doc_helper.py +++ b/src/docs/doc_helper.py @@ -35,14 +35,23 @@ def get_cargo_name(self, cargo): def pretty_print_cargo_classes(self, cargo): result = [] + # order of dict key corresponds to sort order of cargos when pretty-printed pretty_names = { - "CC_ARMOURED": "Armoured", - "CC_BULK": "Bulk (uncountable)", + "CC_PASSENGERS": "Passengers", + "CC_MAIL": "Mail", "CC_EXPRESS": "Express", + "CC_ARMOURED": "Armoured", + "CC_PIECE_GOODS": "Piece Goods", + "CC_OPEN_BULK": "Open Bulk", + "CC_COVERED_BULK": "Covered Bulk", "CC_LIQUID": "Liquid", - "CC_MAIL": "Mail", - "CC_PASSENGERS": "Passengers", - "CC_PIECE_GOODS": "Piece Goods (countable)", + "CC_GAS": "Gas", + "CC_POWDERIZED": "Powderized", + "CC_FLATBED": "Flatbed", + "CC_REFRIGERATED": "Refrigerated", + "CC_WEIRD": "Weird", + "CC_FOOD_GRADE": "Food-Grade", + "CC_NON_FOOD_GRADE": "Non-Food-Grade", } for cargo_class in cargo.cargo_classes: if cargo_class not in pretty_names: @@ -53,7 +62,9 @@ def pretty_print_cargo_classes(self, cargo): + cargo.id + ")" ) - else: + + for cargo_class in pretty_names: + if cargo_class in cargo.cargo_classes: result.append(pretty_names[cargo_class]) return ", ".join(result)