From 11d6a12ce7752c7640c3cb85e76814ebeb3f94ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20P=C3=A9rez-Cerezo?= Date: Mon, 23 Oct 2017 13:33:27 +0200 Subject: [PATCH] Set wagon line number --- advtrains/wagons.lua | 7 +++++++ advtrains_luaautomation/atc_rail.lua | 4 ++++ .../textures/advtrains_subway_wagon_line1.png | Bin 0 -> 1203 bytes .../textures/advtrains_subway_wagon_line10.png | Bin 0 -> 1224 bytes .../textures/advtrains_subway_wagon_line2.png | Bin 0 -> 1230 bytes .../textures/advtrains_subway_wagon_line3.png | Bin 0 -> 1230 bytes .../textures/advtrains_subway_wagon_line4.png | Bin 0 -> 1226 bytes .../textures/advtrains_subway_wagon_line5.png | Bin 0 -> 1231 bytes .../textures/advtrains_subway_wagon_line6.png | Bin 0 -> 1227 bytes .../textures/advtrains_subway_wagon_line7.png | Bin 0 -> 1226 bytes .../textures/advtrains_subway_wagon_line8.png | Bin 0 -> 1233 bytes .../textures/advtrains_subway_wagon_line9.png | Bin 0 -> 1235 bytes 12 files changed, 11 insertions(+) create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line1.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line10.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line2.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line3.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line4.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line5.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line6.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line7.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line8.png create mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line9.png diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua index 567b560..715f501 100644 --- a/advtrains/wagons.lua +++ b/advtrains/wagons.lua @@ -291,6 +291,13 @@ function wagon:on_step(dtime) local gp=self:train() local fct=self.wagon_flipped and -1 or 1 + --set line number + if self.name == "advtrains:subway_wagon" and gp.line then + self.object:set_properties({ + textures={"advtrains_subway_wagon.png^advtrains_subway_wagon_line"..gp.line..".png"}, + visual_size = text_scale, + }) + end --door animation if self.doors then if (self.door_anim_timer or 0)<=0 then diff --git a/advtrains_luaautomation/atc_rail.lua b/advtrains_luaautomation/atc_rail.lua index 3ec82c8..1fae28d 100644 --- a/advtrains_luaautomation/atc_rail.lua +++ b/advtrains_luaautomation/atc_rail.lua @@ -58,6 +58,10 @@ function r.fire_event(pos, evtdata) train.atc_arrow=atc_arrow return true end, + set_line = function(line) + train.line = line + return true + end, atc_reset = function(cmd) if not train_id then return false end assertt(cmd, "string") diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png new file mode 100644 index 0000000000000000000000000000000000000000..ad596df6ec94de4f6fa69fb88450371959cb5d38 GIT binary patch literal 1203 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4H!+(Yg3=I3$c^(Fe za29w(7Bet#3xhBt!>la(GZBMVUDD46krMvU|?uqcp&zVkzOtvwP!R0&_m#ZxV)JOpTOkuL{OQ;;OXk; Jvd$@?2>?gpIVk`D literal 0 HcmV?d00001 diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line10.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line10.png new file mode 100644 index 0000000000000000000000000000000000000000..c656d9706fb3f3b7a72fde509facfcbc152d225e GIT binary patch literal 1224 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4HkOqRE&b#Y@6lZ}) zWHAE+w=f7ZGR&GI0Tg5}@$_|Nf5;`y%_2LuH`s=OfhE+_#WAGf*4x{TTn7|*SR5|@ z|8F@@WY3onre($ow%XI~2FWsmj2#8^34sRvR@DU#W_P<^$};DDjbQQ;HZHcmZlKS= z+92QZ|DQ=8nE7rO+u{T4A`A=;j0_AS3>GD}8qXON3YhKnHBTN{R(;Xbfj+JswPiE} bFhd~DcT=JI_c`qQEkJUfu6{1-oD!MEaktaqI1kgS-t20xS*& z*B1VruG;%x{)8U^29{}7H@HvA&K3gd9R>6Xf%sEy2Qo}$zy4I5rXzm9X1Ab0esbJg z-pW&~4;U1-lxcnwTOPx}#~_x$@Pw&=VM7A9g7^V_Ghk%$GW1-%_B62WTwpOHA47%j lUw(QydDNcK5I_ro14(%$m0~eUq5X^?8BbR~mvv4FO#sJuM*{!= literal 0 HcmV?d00001 diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png new file mode 100644 index 0000000000000000000000000000000000000000..3ccb6fb80bc726b3f8cd1c557c3c6c09694ea9c6 GIT binary patch literal 1230 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4H!+#K5uy^@npa^Gy zM`SSr1Gg{;GcwGYBLNg-FY)wsWq-&e&Sj))+%@A80|QI6r;B4q#jUruEQJ~r1XvCn z{dE7pX~pjv!io*=E*Q=9l?Yb?Y8(ah3V|QNMoey}C*HnpZJITSJ7L~sju}h06xC1b ziecbl@D^`4z3@j#!70`S3>yxzIp{I4GDtJ*WKgs0VPME%NVqe7Q#=DuowQhkYyPp_ mANlF!>QQ?}LjWxV4$S6L*smldaQMA8NXFCE&t;ucLK6TR1xZK% literal 0 HcmV?d00001 diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png new file mode 100644 index 0000000000000000000000000000000000000000..67d7def1ca3d0772c4ae5ce96e87e09af6d36c19 GIT binary patch literal 1226 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4HkgjK7SoUs;5Rk=L z;1OBOz`!jG!i)^F=12eq*-JcqUD+RUiF28-2Bc13$H2f6?&;zfQgQ3;O+&5*10L23 zA$zueeNtFje6itWb@6n0uAfToBU3m7&`_^rM3@}W1gxL=$VXJF7^2>72hjhkLB h9<^sQ1kggDVV$0Kl^V~kndh89GM=t}F6*2UngET7NA&;z literal 0 HcmV?d00001 diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png new file mode 100644 index 0000000000000000000000000000000000000000..1af9e9c4a6249e89f3df7447bee193bd4f94ef69 GIT binary patch literal 1231 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4H!+(Y)3=D6>I{kqn zoCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#A(uFpsesC2Cl&?F!Z*MVjH7M|~ z2K44-9$#I2i**slm5hDm&Gu}!k4ypT90l|WfecM;#=TcEH#MFkw zQ%CpMY>HtJV>r}pCBa*BfQdnW-BXQb<19TO^X&R3K~I@}oLI!d@PL)!S7(*v?jMZY r40k>-3ed~dqxOu309pt%oSYMIPCR4dMSftZ#K7R`>gTe~DWM4fZ|_W8 literal 0 HcmV?d00001 diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png new file mode 100644 index 0000000000000000000000000000000000000000..e48c6ed34b80e6d2007106fb647539f278717af4 GIT binary patch literal 1227 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4HkOqRE&b#Y@6lZ}) zWHAE+w=f7ZGR&GI0Tg5}@$_|Nf5;`yWhPr_pIgPiz!Kr<;uunK>+P+JybT5%tOt_r z)ThQAI5s~_`A+T!4$sCC9+07o*+nfe4Dpsz7#Lz05>~Iey>YF)0mFe7{sua^ hc+{HF5Won5l43@dy;2erkKP8CN}jHMF6*2UngGE>M>7Bb literal 0 HcmV?d00001 diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed26e7f024ab901a15ddea154ea4b8dd2cdac51 GIT binary patch literal 1226 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4HLnR2-S1fJ=if|Tq zL>4nJa0`PlBg3pY5H=O_J>^JTowWod2Kuy7+AtRT^vIyZoR#3$k(7Cz~W#~ zCnd*l{+gU;4$I`zKAsuxX5IGX1Zo`xbP9n6{Z#FQtwE>0ep~*1-dWZS=QCN~T#BmR zb2aKLs{(_-%?gq9_RBF0)iPlR;@4UxdG}d~D*&Cw#E^0FmOX@Z#w8cXrjvU|tr-mg bj1X8X?XXGdgLsw3ERd9^tDnm{r-UW|_*z8e literal 0 HcmV?d00001 diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png new file mode 100644 index 0000000000000000000000000000000000000000..4e19353416fce33ae3ee2fb85f8532a21c782ec0 GIT binary patch literal 1233 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4H!+!=jh6{^*6k>rQ zoCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#A(uFpCCj8UH%l29SmHcg978H@y}h-Ow?RRG zHNfE9Lgg3#f?sg#;@GB^k<-F-Py6M+)|S(Sia`CNfLFVdQ&MBb@0Mg@1-~a#s literal 0 HcmV?d00001 diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png new file mode 100644 index 0000000000000000000000000000000000000000..a79d7a760046f11fb37c55549e23db62a99378af GIT binary patch literal 1235 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn25lDE4H!+#K5uy^@npa^Gy zM`SSr1Gg{;GcwGYBLNg-FY)wsWq-&e&SfQfIdGK=0|QHfr;B4q#jUru422vF1Xu$M z-yP+&&{ltta&gwd43(qL_C|f)eluS^mK~^l6woOI4$Pk<7;tCbv-A1OR8O)7oKIl6 zGU@owdk+1+dJL=$FV=N`%q%>`x`5%r2~h`-h}*w^%DQJ)>} s0>{AkW7Qw|>E!59Yequ=Jp>NS7XI=<(d5Mq*Bu}!Pgg&ebxsLQ0Or(Gd;kCd literal 0 HcmV?d00001