2022.7.24

CoconutKR · Jul 23, 2022 · d3ed518 · d3ed518
1 parent 23bef3c
commit d3ed518
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 82 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,10 +1,14 @@
-2022.06.?? (예정)
+2022.?? (예정)
 -----
 * 스펙 실제화, 동력분산식 적용
 
+2022.07.24
+* GT26CW (그래픽 변경, 가문비님 제작)
+* 공통객차 (도색변경으로 추가된 EMU-150 객차형, 빨강, 녹색, 흰색 도색 테스트용 발전차 도색 모두 제거됨.) 관련 사항은 향후 별도 객차형 추가시 추가될 예정.
+
 2022.06.26
 * 공통객차 (도색변경으로 EMU-150 객차형 빨강, 녹색, 흰색 도색 추가, 테스트용 발전차 도색 추가)
-* GT26CW (코레일, 철도청 도색)
+* GT26CW (코레일, 철도청 도색 추가, 갑종회송 가능하도록 기관차 연결조건 제거)
 * GTX (스프라이트 변경)
 
 2022.06.07

diff --git a/ko_train_set_plus.pnml b/ko_train_set_plus.pnml
@@ -12,7 +12,7 @@ grf {
 	name :                             string(STR_GRF_NAME_WITH_VER);
 	desc :                             string(STR_GRF_DESC);
 	url :                              string(STR_GRF_URL);
-	version :                          220628;
+	version :                          220724;
 	min_compatible_version :           1;
 
 	// Parameters 매개변수

diff --git a/lang/english.lng b/lang/english.lng
@@ -70,11 +70,6 @@ STR_REFIT_LIVERY_NRT2_B                             :(Nuriro DD Blue Color)
 STR_REFIT_LIVERY_NRT2_G                             :(Nuriro DD Green Color)
 STR_REFIT_LIVERY_NRT2_W                             :(Nuriro DD White Color)
 
-STR_REFIT_LIVERY_EMU150R_car_wagon                  :(EMU-150 Car Wagon Red Color)
-STR_REFIT_LIVERY_EMU150G_car_wagon                  :(EMU-150 Car Wagon Green Color)
-STR_REFIT_LIVERY_EMU150W_car_wagon                  :(EMU-150 Car Wagon White Color)
-STR_REFIT_LIVERY_Empty_car_wagon                    :(Test Car)
-
 # Errors
 STR_ERROR_NO_ATTACH                                 :You can't attach this car here
 STR_ERROR_NOT_ENOUGH_LENGTH4                        :It's too short. It should be equal or more than 4 cars at least.

diff --git a/lang/korean.lng b/lang/korean.lng
@@ -70,11 +70,6 @@ STR_REFIT_LIVERY_NRT2_B                             :(누리로 DD 파랑도색)
 STR_REFIT_LIVERY_NRT2_G                             :(누리로 DD 녹색도색)
 STR_REFIT_LIVERY_NRT2_W                             :(누리로 DD 흰색도색)
 
-STR_REFIT_LIVERY_EMU150R_car_wagon                  :(EMU-150 객차형 빨강도색)
-STR_REFIT_LIVERY_EMU150G_car_wagon                  :(EMU-150 객차형 녹색도색)
-STR_REFIT_LIVERY_EMU150W_car_wagon                  :(EMU-150 객차형 흰색도색)
-STR_REFIT_LIVERY_Empty_car_wagon                    :(발전차)
-
 # Errors
 STR_ERROR_NO_ATTACH                                 :여기에 이 차량을 붙일 수 없습니다
 STR_ERROR_NOT_ENOUGH_LENGTH4                        :열차 길이가 너무 짧습니다. 최소한 4량 이상을 연결해야 합니다.

diff --git a/src/locomotive/GT26CW/GT26CW.png b/src/locomotive/GT26CW/GT26CW.png
diff --git a/src/wagon/passenger_wagon/generator_car.png b/src/wagon/passenger_wagon/generator_car.png
diff --git a/src/wagon/passenger_wagon/passenger_car.png b/src/wagon/passenger_wagon/passenger_car.png
diff --git a/src/wagon/passenger_wagon/passenger_car_32bpp.png b/src/wagon/passenger_wagon/passenger_car_32bpp.png
diff --git a/src/wagon/passenger_wagon/passenger_wagon.pnml b/src/wagon/passenger_wagon/passenger_wagon.pnml
@@ -37,14 +37,12 @@ item (FEAT_TRAINS, KTS_Passenger_Car, 1061){
 	}
 
     graphics {
-		default:						sw_Passenge_car_wagon;
+		default:						sw_Passenge_wagon;
 		purchase:						set_wagon_purchase;
         loading_speed:                  25;
         cost_factor:                    10;
         running_cost_factor:            50;
-        length:                         sw_Passenge_car_wagon_length_in_custom;
-        cargo_capacity:                 sw_Passenge_car_wagon_capacity_in_custom;
-        cargo_subtype_text:             sw_Passenge_car_wagon_cargo_subtype;
+        cargo_subtype_text:             sw_Passenger_wagon_cargo_subtype_text;
 		additional_text:                string(STR_REFIT_train_configuration);
         }
 	}
diff --git a/src/wagon/passenger_wagon/passenger_wagon_graphic.pnml b/src/wagon/passenger_wagon/passenger_wagon_graphic.pnml
@@ -14,38 +14,4 @@ spriteset(set_wagon, "src\wagon\passenger_wagon\passenger_wagon.png") {
 
 spriteset(set_wagon_r, "src\wagon\passenger_wagon\passenger_wagon.png") {
     wagon_1F_r(80, 0)
-}
-
-/*--------------------------------------------------------------------
-2. 객차형
---------------------------------------------------------------------*/
-spriteset(set_EMU_150R_wagon, "src\wagon\passenger_wagon\passenger_car.png") {
-    wagon_1F_F(80, 0)
-}
-
-alternative_sprites(set_EMU_150R_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src\wagon\passenger_wagon\passenger_car_32bpp.png"){
-    wagon_1F_F(80, 0)
-}
-
-spriteset(set_EMU_150G_wagon, "src\wagon\passenger_wagon\passenger_car.png") {
-    wagon_1F_F(80, 27)
-}
-
-alternative_sprites(set_EMU_150G_wagon, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "src\wagon\passenger_wagon\passenger_car_32bpp.png"){
-    wagon_1F_F(80, 27)
-}
-
-spriteset(set_EMU_150W_wagon, "src\wagon\passenger_wagon\passenger_car.png") {
-    wagon_1F_F(80, 54)
-}
-
-/*--------------------------------------------------------------------
-3. 발전차
---------------------------------------------------------------------*/
-spriteset(set_Emtpy_wagon, "src\wagon\passenger_wagon\generator_car.png") {
-    wagon_1F_F_mini_7(80, 0)
-}
-
-spriteset(set_Emtpy_wagon_r, "src\wagon\passenger_wagon\generator_car.png") {
-    wagon_1F_F_r_mini_7(80, 0)
 }
diff --git a/src/wagon/passenger_wagon/passenger_wagon_switch.pnml b/src/wagon/passenger_wagon/passenger_wagon_switch.pnml
@@ -29,34 +29,3 @@ switch(FEAT_TRAINS, SELF, sw_Passenge_wagon, (position_in_vehid_chain + 1) <= (n
     set_wagon_r;
 }
 
-/*--------------------------------------------------------------------
-2. 객차형
---------------------------------------------------------------------*/
-switch(FEAT_TRAINS, SELF, sw_Passenge_car_wagon_cargo_subtype, cargo_subtype) {
-    1: return string(STR_REFIT_LIVERY_EMU150G_car_wagon);   // EMU-150 녹색
-    2: return string(STR_REFIT_LIVERY_EMU150W_car_wagon);   // EMU-150 흰색
-    3: return string(STR_REFIT_LIVERY_Empty_car_wagon);     // 발전차
-    return string(STR_REFIT_LIVERY_EMU150R_car_wagon);
-}
-
-switch(FEAT_TRAINS, SELF, sw_Passenge_car_wagon, cargo_subtype) {
-    1: set_EMU_150G_wagon;    // EMU-150 녹색
-    2: set_EMU_150W_wagon;    // EMU-150 흰색
-    3: set_Emtpy_wagon;        // 발전차
-    set_EMU_150R_wagon;
-}
-
-switch(FEAT_TRAINS, SELF, sw_Passenge_car_wagon_capacity_in_custom, cargo_subtype) {
-    1: return 72;
-    2: return 72;
-    3: return 0;
-       72;
-}
-
-switch(FEAT_TRAINS, SELF, sw_Passenge_car_wagon_length_in_custom, cargo_subtype) {
-    1: return 8;
-    2: return 8;
-    3: return 7;
-       8;
-}
-