Update: Support FIRS 5.x

Author: telk5093

docs/changelog.md

@@ -1,3 +1,7 @@
+2.9.0+
+-----
+ * 변경: FIRS 5.x 화물 지원
+
 2.9.0
 -----
  * 추가: 우편차 생활물류 트레인 도색 [#480]

ko_train_set.pnml

@@ -40,6 +40,10 @@ cargotable {
     SCMT, SLAG, SASH, LYE_, STST, STSE, STSH, STWR, GRVL, SULP, WDPR, TYRE, VBOD, VENG, VPTS, VEHI,
     WOOL, ZINC,
 
+    // FIRS (from 5.0.0)
+    CCPR, FEAL, FOCA, HWAR, N7__, PPWK, PUMP, RBAR, SEAL, STBL, STBR, STIG, STPP, STSL, STTB, TYCO,
+    WELD,
+
     // Improved Town Industries (based on 2.13)
     WSTE, WDCH, SCPR
 }

src/wagon/box_car/box_car.pnml

@@ -53,7 +53,12 @@ item(FEAT_TRAINS, ko_train_BOX_CAR, 5916) {
         cargo_capacity:                 36;
         refittable_cargo_classes:       NO_CARGO_CLASS;
         non_refittable_cargo_classes:   NO_CARGO_CLASS;
-        cargo_allow_refit:              [LVST, GRAI, PAPR, WHEA, SUGR, CTCD, CMNT, POWR, BOOM, FECR, FERT, SALT, SAND, SLAG, SASH, GRVL, SULP, WDPR, VENG, VPTS, WOOL, SCPR];
+        cargo_allow_refit:              [
+                                            LVST, GRAI, PAPR, WHEA, SUGR, CTCD, CMNT, POWR, BOOM, FECR,
+                                            FERT, SALT, SAND, SLAG, SASH, GRVL, SULP, WDPR, VENG, VPTS,
+                                            WOOL, SCPR, CCPR, FOCA, HWAR, RBAR, SEAL, STBL, STBR, STIG,
+                                            STTB, TYCO, WELD
+                                        ];
         cargo_disallow_refit:           [];
         loading_speed:                  5;
 

src/wagon/flat_car/flat_car.pnml

@@ -44,7 +44,10 @@ item(FEAT_TRAINS, ko_train_FLAT_CAR, 5910) {
         cargo_capacity:                 25;
         refittable_cargo_classes:       NO_CARGO_CLASS;
         non_refittable_cargo_classes:   NO_CARGO_CLASS;
-        cargo_allow_refit:              [GOOD, VALU, FOOD, BATT, SWET, TOYS, FISH, BOOM, JAVA, GLAS, POWR, NUTS, MNSP, VPTS];
+        cargo_allow_refit:              [
+                                            GOOD, VALU, FOOD, BATT, SWET, TOYS, FISH, BOOM, JAVA, GLAS,
+                                            POWR, NUTS, MNSP, VPTS, PPWK, PUMP, STBL, STPP, STSL, STTB
+                                        ];
         cargo_disallow_refit:           [];
         loading_speed:                  5;
 

src/wagon/hopper_car/hopper_car.pnml

@@ -44,11 +44,13 @@ item(FEAT_TRAINS, ko_train_HOPPER_CAR, 5911) {
         cargo_capacity:                 25;
         refittable_cargo_classes:       NO_CARGO_CLASS;
         non_refittable_cargo_classes:   NO_CARGO_CLASS;
-        cargo_allow_refit:              [COAL, IORE, WHEA, FRUT, MAIZ, CORE, CTCD, SUGR, TOFF, AORE, BEAN,
-                                         CLAY, COAL, CORE, FRUT, GOLD, GRAI, GRVL, IORE, POTA, LIME, MNO2,
-                                         PHOS, PORE, RCYC, SALT, SAND, SCMT, SLAG, FERT, NITR, CMNT, SASH,
-                                         SGBT, QLME, PLAS, FECR, CBLK, CASS, BDMT, PEAT, COKE, KAOL, WSTE,
-                                         WDCH];
+        cargo_allow_refit:              [
+                                            COAL, IORE, WHEA, FRUT, MAIZ, CORE, CTCD, SUGR, TOFF, AORE,
+                                            BEAN, CLAY, COAL, CORE, FRUT, GOLD, GRAI, GRVL, IORE, POTA,
+                                            LIME, MNO2, PHOS, PORE, RCYC, SALT, SAND, SCMT, SLAG, FERT,
+                                            NITR, CMNT, SASH, SGBT, QLME, PLAS, FECR, CBLK, CASS, BDMT,
+                                            PEAT, COKE, KAOL, WSTE, WDCH, FEAL
+                                        ];
         cargo_disallow_refit:           [];
         loading_speed:                  5;
 
@@ -87,6 +89,7 @@ item(FEAT_TRAINS, ko_train_HOPPER_CAR, 5911) {
         QLME:                           sw_HOPPER_CAR_LIME_wagon;
         PLAS:                           sw_HOPPER_CAR_LIME_wagon;
         MNO2:                           sw_HOPPER_CAR_MNO2_wagon;
+        FEAL:                           sw_HOPPER_CAR_MNO2_wagon;   //TODO> offer Ferroalloys graphic
         FECR:                           sw_HOPPER_CAR_MNO2_wagon;
         PHOS:                           sw_HOPPER_CAR_PHOS_wagon;
         PORE:                           sw_HOPPER_CAR_PORE_wagon;

src/wagon/stake_car/stake_car.pnml

@@ -44,9 +44,11 @@ item(FEAT_TRAINS, ko_train_STAKE_CAR, 5914) {
         cargo_capacity:                 25;
         refittable_cargo_classes:       NO_CARGO_CLASS;
         non_refittable_cargo_classes:   NO_CARGO_CLASS;
-        cargo_allow_refit:              [BUBL, COPR, ENSP, FMSP, PAPR, PIPE, STSE, STEL, VPTS, VENG, VBOD,
-                                         VEHI, WDPR, WOOD, WOOL, FICR, STAL, ALUM, STCB, CSTI, IRON, STST,
-                                         STSH, STWR, ZINC, TYRE, METL, SCPR];
+        cargo_allow_refit:              [
+                                            BUBL, COPR, ENSP, FMSP, PAPR, PIPE, STSE, STEL, VPTS, VENG,
+                                            VBOD, VEHI, WDPR, WOOD, WOOL, FICR, STAL, ALUM, STCB, CSTI,
+                                            IRON, STST, STSH, STWR, ZINC, TYRE, METL, SCPR
+                                        ];
         cargo_disallow_refit:           [];
         loading_speed:                  5;
 

src/wagon/tank_car/tank_car.pnml

@@ -44,7 +44,10 @@ item(FEAT_TRAINS, ko_train_TANK_CAR, 5913) {
         cargo_capacity:                 36;
         refittable_cargo_classes:       bitmask(CC_LIQUID);
         non_refittable_cargo_classes:   NO_CARGO_CLASS;
-        cargo_allow_refit:              [OIL_, WATR, COLA, FZDR, ACID, CHLO, MILK, RUBR, PLST, BEER, EOIL, PETR, RFPR];
+        cargo_allow_refit:              [
+                                            OIL_, WATR, COLA, FZDR, ACID, CHLO, MILK, RUBR, PLST, BEER,
+                                            EOIL, PETR, RFPR, N7__
+                                        ];
         cargo_disallow_refit:           [KAOL];
         loading_speed:                  5;