Fix: tracks not using fences correctly

Brickblock1 · Apr 21, 2024 · c385b05 · c385b05
1 parent 3efdaf0
commit c385b05
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 13 deletions.
diff --git a/lang/english.lng b/lang/english.lng
@@ -5,7 +5,7 @@ STR_GRF_NAME_NARROW	    :SETS: Narrow Gauge
 STR_GRF_DESC_STANDARD	:{GOLD}Standardised Expanded Track Set: Standard Gauge{}{}A track set that adds a customisable roster of multi-voltage track types that follow the standardised track scheme! {}{}{COPYRIGHT}2024 {BLUE}Brickblock1{GOLD}{}Licenced under GPL{NBSP}v2. Check licence for details.{}{}Credit:{}SUKTS: {BLUE}UnholyPhish{GOLD} and {BLUE}Gwyd{GOLD}{}Industrial trackset: {BLUE}Erato et al{GOLD}.{}Tunnel foundations: {BLUE}SAC{GOLD}, taken from ISR/DWE-style objects.
 STR_GRF_DESC_NARROW	    :{GOLD}Standardised Expanded Track Set: Narrow Gauge{}{}A track set that adds a customisable roster of multi-voltage track types that follow the standardised track scheme! {}{}{COPYRIGHT}2024 {BLUE}Brickblock1{GOLD}{}Licenced under GPL{NBSP}v2. Check licence for details.{}{}Credit:{}SUKTS: {BLUE}UnholyPhish{GOLD} and {BLUE}Gwyd{GOLD}{}Industrial trackset: {BLUE}Erato et al{GOLD}.{}Tunnel foundations: {BLUE}SAC{GOLD}, taken from ISR/DWE-style objects.
 
-STR_GRF_URL             :https://www.tt-forums.net/viewtopic.php?t=90786
+STR_GRF_URL             :https://brickblock1.github.io/Standardised-Expanded-Track-Set--SETS/
 
 STR_PARAM_SPEEDLIMITS_DESC			:Turn on track speed limits.
 

diff --git a/sets_narrow.grf b/sets_narrow.grf
diff --git a/sets_narrow.nml b/sets_narrow.nml
@@ -65,13 +65,12 @@ grf{
  			name:    string(STR_PARAM_GFX_FENCE_NAME);
  			desc:    string(STR_PARAM_GFX_FENCE_DESC);
  			min_value: 0;
- 			max_value: 3;
+ 			max_value: 2;
  			def_value: 0;
  			names: {
  				0: string(STR_PARAM_GFX_FENCE_ALL);
- 				1: string(STR_PARAM_GFX_FENCE_MOST);
- 				2: string(STR_PARAM_GFX_FENCE_SOME);
- 				3: string(STR_PARAM_GFX_FENCE_NONE);
+ 				1: string(STR_PARAM_GFX_FENCE_SOME);
+ 				2: string(STR_PARAM_GFX_FENCE_NONE);
  			};
 		}
 	}

diff --git a/sets_standard.grf b/sets_standard.grf
diff --git a/sets_standard.nml b/sets_standard.nml
@@ -2011,7 +2011,7 @@ switch(FEAT_RAILTYPES, SELF, sw_depot_SCAN, depot_type){
 
 // Fences?
 
-switch(FEAT_RAILTYPES, SELF, sw_fences_SCAN, fence_number < 2){
+switch(FEAT_RAILTYPES, SELF, sw_fences_SCAN, fence_number < 3){
 	1 : gfx_fences_SCAN ;
 	gfx_blank ;
 }
@@ -4508,7 +4508,7 @@ switch(FEAT_RAILTYPES, SELF, sw_depot_SCA3, depot_type){
 
 // Fences?
 
-switch(FEAT_RAILTYPES, SELF, sw_fences_SCA3, fence_number < 2){
+switch(FEAT_RAILTYPES, SELF, sw_fences_SCA3, fence_number < 3){
 	1 : gfx_fences_SCA3 ;
 	gfx_blank ;
 }

diff --git a/src/RAIL/SCAN.pnml b/src/RAIL/SCAN.pnml
@@ -57,7 +57,7 @@ switch(FEAT_RAILTYPES, SELF, sw_depot_SCAN, depot_type){
 
 // Fences?
 
-switch(FEAT_RAILTYPES, SELF, sw_fences_SCAN, fence_number < 2){
+switch(FEAT_RAILTYPES, SELF, sw_fences_SCAN, fence_number < 3){
 	1 : gfx_fences_SCAN ;
 	gfx_blank ;
 }

diff --git a/src/SAA3/SCA3.pnml b/src/SAA3/SCA3.pnml
@@ -57,7 +57,7 @@ switch(FEAT_RAILTYPES, SELF, sw_depot_SCA3, depot_type){
 
 // Fences?
 
-switch(FEAT_RAILTYPES, SELF, sw_fences_SCA3, fence_number < 2){
+switch(FEAT_RAILTYPES, SELF, sw_fences_SCA3, fence_number < 3){
 	1 : gfx_fences_SCA3 ;
 	gfx_blank ;
 }

diff --git a/src/header_narrow.pnml b/src/header_narrow.pnml
@@ -63,13 +63,12 @@ grf{
  			name:    string(STR_PARAM_GFX_FENCE_NAME);
  			desc:    string(STR_PARAM_GFX_FENCE_DESC);
  			min_value: 0;
- 			max_value: 3;
+ 			max_value: 2;
  			def_value: 0;
  			names: {
  				0: string(STR_PARAM_GFX_FENCE_ALL);
- 				1: string(STR_PARAM_GFX_FENCE_MOST);
- 				2: string(STR_PARAM_GFX_FENCE_SOME);
- 				3: string(STR_PARAM_GFX_FENCE_NONE);
+ 				1: string(STR_PARAM_GFX_FENCE_SOME);
+ 				2: string(STR_PARAM_GFX_FENCE_NONE);
  			};
 		}
 	}