More tinkering to remove conflicts

BRTrains · Jul 6, 2021 · 11f02af · 11f02af
1 parent d666fd3
commit 11f02af
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/trains/ExpressCoach.pnml b/src/trains/ExpressCoach.pnml
@@ -23,6 +23,7 @@ spriteset(spriteset_ExpressCoach_First, "gfx/Express_Coaches.png") {
     tmpl_coach_33(0, 63)
 }
 
+
 item (FEAT_TRAINS, item_ExpressCoach_RWS, 10001) {
     property {
         name:                           string(STR_ExpressCoach_RWS_Name);

diff --git a/src/trains/Thomas.pnml b/src/trains/Thomas.pnml
@@ -1,3 +1,22 @@
+spriteset(spriteset_Thomas_Purchase, "gfx/Thomas_Percy_AnnieClarabel.png") {
+    tmpl_purchase(0, 0)
+}
+
+spriteset(spriteset_Thomas, "gfx/Thomas_Percy_AnnieClarabel.png") {
+    tmpl_thomas(0, 13)
+}
+
+
+switch (FEAT_TRAINS, SELF, sw_duplicity_available, param_duplicity) {
+    1: 0;
+}
+
+switch (FEAT_TRAINS, SELF, sw_thomas_available, count_veh_id(10011)) {
+    0: VEHICLE_NEVER_EXPIRES;
+    sw_duplicity_available;
+
+}
+
 
 item (FEAT_TRAINS, item_Thomas, 10011) {
     property {

diff --git a/src/trains/Toby.pnml b/src/trains/Toby.pnml
@@ -132,7 +132,6 @@ item (FEAT_TRAINS, item_Elsie, 10073) {
         can_attach_wagon:                   CB_RESULT_ATTACH_ALLOW;
         default:                            spriteset_Elsie;
         purchase:                           spriteset_Elsie_Purchase;
-        colour_mapping:                     return PALETTE_CC_FIRST;
-
+        colour_mapping:                     return PALETTE_CC_FIRST;    
 	}
 }