diff --git a/industry/cargos/beans.py b/industry/cargos/beans.py new file mode 100644 index 00000000..df31b7fa --- /dev/null +++ b/industry/cargos/beans.py @@ -0,0 +1,13 @@ +import grf +from industry.lib.cargo import ACargo, CargoUnit + +the_cargo = ACargo( + 0x13, + b"BEAN", + grf.CargoClass.BULK, + units_text=CargoUnit.TONNE, + is_freight=1, + penalty1=4, + penalty2=40, + base_price=119, +) diff --git a/industry/cargos/coffee.py b/industry/cargos/coffee.py new file mode 100644 index 00000000..4289b11a --- /dev/null +++ b/industry/cargos/coffee.py @@ -0,0 +1,13 @@ +import grf +from industry.lib.cargo import ACargo, CargoUnit + +the_cargo = ACargo( + 0x14, + b"JAVA", + grf.CargoClass.EXPRESS | grf.CargoClass.PIECE_GOODS, + units_text=CargoUnit.BAG, + is_freight=1, + penalty1=0, + penalty2=26, + base_price=173, +) diff --git a/industry/cargos/copper.py b/industry/cargos/copper.py new file mode 100644 index 00000000..c4dc7ea8 --- /dev/null +++ b/industry/cargos/copper.py @@ -0,0 +1,13 @@ +import grf +from industry.lib.cargo import ACargo, CargoUnit + +the_cargo = ACargo( + 0x15, + b"COPR", + grf.CargoClass.PIECE_GOODS, + units_text=CargoUnit.TONNE, + is_freight=1, + penalty1=7, + penalty2=255, + base_price=146, +) diff --git a/industry/cargos/nitrates.py b/industry/cargos/nitrates.py new file mode 100644 index 00000000..eca16b3c --- /dev/null +++ b/industry/cargos/nitrates.py @@ -0,0 +1,13 @@ +import grf +from industry.lib.cargo import ACargo, CargoUnit + +the_cargo = ACargo( + 0x1B, + b"NITR", + grf.CargoClass.BULK, + units_text=CargoUnit.TONNE, + is_freight=1, + penalty1=30, + penalty2=255, + base_price=103, +) diff --git a/industry/cargos/wool.py b/industry/cargos/wool.py new file mode 100644 index 00000000..2b935e90 --- /dev/null +++ b/industry/cargos/wool.py @@ -0,0 +1,14 @@ +import grf +from industry.lib.cargo import ACargo, CargoUnit + +the_cargo = ACargo( + 0x1C, + b"WOOL", + grf.CargoClass.PIECE_GOODS | grf.CargoClass.COVERED, + weight=3, + units_text=CargoUnit.ITEM, + is_freight=1, + penalty1=8, + penalty2=48, + base_price=111, +) diff --git a/industry/lang/english-uk.lng b/industry/lang/english-uk.lng index 2d34fd39..b0c4dd7c 100644 --- a/industry/lang/english-uk.lng +++ b/industry/lang/english-uk.lng @@ -136,70 +136,79 @@ STR_PARAM_NIGHT_MODE_AUTO_DETECT:Auto Detect STR_PARAM_NIGHT_MODE_DISABLED :Disabled STR_PARAM_NIGHT_MODE_ENABLED :Enabled -STR_CARGO_NAME_BEER :Alcohol -STR_CARGO_NAME_BOOM :Explosives -STR_CARGO_NAME_COAL :Coal -STR_CARGO_NAME_CORE :Copper Ore -STR_CARGO_NAME_DIAM :Diamonds -STR_CARGO_NAME_ENSP :Engineering Supplies -STR_CARGO_NAME_FERT :Fertiliser -STR_CARGO_NAME_FISH :Fish -STR_CARGO_NAME_FMSP :Farm Supplies -STR_CARGO_NAME_FOOD :Food -STR_CARGO_NAME_FRUT :Fruit -STR_CARGO_NAME_GOLD :Gold -STR_CARGO_NAME_GOOD :Goods -STR_CARGO_NAME_GRAI :Grain -STR_CARGO_NAME_IORE :Iron Ore -STR_CARGO_NAME_KAOL :China Clay -STR_CARGO_NAME_LVST :Livestock -STR_CARGO_NAME_MAIL :Mail -STR_CARGO_NAME_MAIZ :Maize -STR_CARGO_NAME_MILK :Milk -STR_CARGO_NAME_NH3_ :Ammonia -STR_CARGO_NAME_OIL_ :Oil -STR_CARGO_NAME_PAPR :Paper -STR_CARGO_NAME_PASS :Passengers -STR_CARGO_NAME_PEAT :Peat -STR_CARGO_NAME_PHOS :Phosphate -STR_CARGO_NAME_PORE :Pyrite Ore -STR_CARGO_NAME_POTA :Potash -STR_CARGO_NAME_RFPR :Chemicals -STR_CARGO_NAME_RUBR :Rubber -STR_CARGO_NAME_SAND :Sand -STR_CARGO_NAME_SCMT :Scrap Metal -STR_CARGO_NAME_STEL :Steel -STR_CARGO_NAME_SULP :Sulphur -STR_CARGO_NAME_TRWK :Tired Workers -STR_CARGO_NAME_VALU :Valuables -STR_CARGO_NAME_WATR :Water -STR_CARGO_NAME_WDPR :Timber -STR_CARGO_NAME_WHEA :Wheat -STR_CARGO_NAME_WOOD :Logs -STR_CARGO_NAME_WRKR :Workers -STR_CARGO_NAME_ZINC :Zinc +STR_CARGO_NAME_BEAN :Beans +STR_CARGO_NAME_BEER :Alcohol +STR_CARGO_NAME_BOOM :Explosives +STR_CARGO_NAME_COAL :Coal +STR_CARGO_NAME_COPR :Copper +STR_CARGO_NAME_CORE :Copper Ore +STR_CARGO_NAME_DIAM :Diamonds +STR_CARGO_NAME_ENSP :Engineering Supplies +STR_CARGO_NAME_FERT :Fertiliser +STR_CARGO_NAME_FISH :Fish +STR_CARGO_NAME_FMSP :Farm Supplies +STR_CARGO_NAME_FOOD :Food +STR_CARGO_NAME_FRUT :Fruit +STR_CARGO_NAME_GOLD :Gold +STR_CARGO_NAME_GOOD :Goods +STR_CARGO_NAME_GRAI :Grain +STR_CARGO_NAME_IORE :Iron Ore +STR_CARGO_NAME_JAVA :Coffee +STR_CARGO_NAME_KAOL :China Clay +STR_CARGO_NAME_LVST :Livestock +STR_CARGO_NAME_MAIL :Mail +STR_CARGO_NAME_MAIZ :Maize +STR_CARGO_NAME_MILK :Milk +STR_CARGO_NAME_NH3_ :Ammonia +STR_CARGO_NAME_NITR :Nitrates +STR_CARGO_NAME_OIL_ :Oil +STR_CARGO_NAME_PAPR :Paper +STR_CARGO_NAME_PASS :Passengers +STR_CARGO_NAME_PEAT :Peat +STR_CARGO_NAME_PHOS :Phosphate +STR_CARGO_NAME_PORE :Pyrite Ore +STR_CARGO_NAME_POTA :Potash +STR_CARGO_NAME_RFPR :Chemicals +STR_CARGO_NAME_RUBR :Rubber +STR_CARGO_NAME_SAND :Sand +STR_CARGO_NAME_SCMT :Scrap Metal +STR_CARGO_NAME_STEL :Steel +STR_CARGO_NAME_SULP :Sulphur +STR_CARGO_NAME_TRWK :Tired Workers +STR_CARGO_NAME_VALU :Valuables +STR_CARGO_NAME_WATR :Water +STR_CARGO_NAME_WDPR :Timber +STR_CARGO_NAME_WHEA :Wheat +STR_CARGO_NAME_WOOD :Logs +STR_CARGO_NAME_WOOL :Wool +STR_CARGO_NAME_WRKR :Workers +STR_CARGO_NAME_ZINC :Zinc +STR_CARGO_UNIT_BEAN :{COMMA}{NBSP}bag{P "" s} of beans STR_CARGO_UNIT_BEER :{VOLUME} of alcohol STR_CARGO_UNIT_BOOM :{WEIGHT} of explosives STR_CARGO_UNIT_COAL :{WEIGHT} of coal +STR_CARGO_UNIT_COPR :{WEIGHT} of copper STR_CARGO_UNIT_CORE :{WEIGHT} of copper ore -STR_CARGO_UNIT_DIAM :{WEIGHT} of diamonds +STR_CARGO_UNIT_DIAM :{COMMA}{NBSP}bag{P "" s} of diamonds STR_CARGO_UNIT_ENSP :{WEIGHT} of engineering supplies STR_CARGO_UNIT_FERT :{WEIGHT} of fertiliser STR_CARGO_UNIT_FISH :{WEIGHT} of fish STR_CARGO_UNIT_FMSP :{WEIGHT} of farm supplies STR_CARGO_UNIT_FOOD :{WEIGHT} of food STR_CARGO_UNIT_FRUT :{WEIGHT} of fruit -STR_CARGO_UNIT_GOLD :{WEIGHT} of gold +STR_CARGO_UNIT_GOLD :{COMMA}{NBSP}bag{P "" s} of gold STR_CARGO_UNIT_GOOD :{WEIGHT} of goods STR_CARGO_UNIT_GRAI :{WEIGHT} of grain STR_CARGO_UNIT_IORE :{WEIGHT} of iron ore +STR_CARGO_UNIT_JAVA :{SIGNED_WORD} sack{P 0 "" s} of coffee STR_CARGO_UNIT_KAOL :{WEIGHT} of china clay -STR_CARGO_UNIT_LVST :{WEIGHT} of livestock -STR_CARGO_UNIT_MAIL :{WEIGHT} of mail +STR_CARGO_UNIT_LVST :{COMMA}{NBSP}item{P "" s} of livestock +STR_CARGO_UNIT_MAIL :{COMMA}{NBSP}bag{P "" s} of mail STR_CARGO_UNIT_MAIZ :{WEIGHT} of maize STR_CARGO_UNIT_MILK :{VOLUME} of milk STR_CARGO_UNIT_NH3_ :{VOLUME} ammonia +STR_CARGO_UNIT_NITR :{WEIGHT} of nitrates STR_CARGO_UNIT_OIL_ :{VOLUME} of oil STR_CARGO_UNIT_PAPR :{WEIGHT} of paper STR_CARGO_UNIT_PASS :{SIGNED_WORD} passenger{P 0 "" s} @@ -214,11 +223,12 @@ STR_CARGO_UNIT_SCMT :{WEIGHT} of scrap metal STR_CARGO_UNIT_STEL :{WEIGHT} of steel STR_CARGO_UNIT_SULP :{WEIGHT} of sulphur STR_CARGO_UNIT_TRWK :{SIGNED_WORD} tired worker{P 0 "" s} -STR_CARGO_UNIT_VALU :{WEIGHT} of valuables +STR_CARGO_UNIT_VALU :{COMMA}{NBSP}bag{P "" s} of valuables STR_CARGO_UNIT_WATR :{VOLUME} of water STR_CARGO_UNIT_WDPR :{WEIGHT} of timber STR_CARGO_UNIT_WHEA :{WEIGHT} of wheat STR_CARGO_UNIT_WOOD :{WEIGHT} of logs +STR_CARGO_UNIT_WOOL :{COMMA}{NBSP}item{P "" s} of wool STR_CARGO_UNIT_WRKR :{SIGNED_WORD} worker{P 0 "" s} STR_CARGO_UNIT_ZINC :{WEIGHT} of zinc