aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--advtrains_train_subway/init.lua57
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon.pngbin3618 -> 2102 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_inv.pngbin900 -> 842 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line.pngbin0 -> 155 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line0.pngbin1224 -> 222 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line0_.pngbin0 -> 166 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line1.pngbin1203 -> 218 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line1_.pngbin0 -> 172 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line2.pngbin1230 -> 229 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line2_.pngbin0 -> 173 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line3.pngbin1230 -> 219 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line3_.pngbin0 -> 168 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line4.pngbin1226 -> 237 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line4_.pngbin0 -> 169 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line5.pngbin1231 -> 228 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line5_.pngbin0 -> 173 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line6.pngbin1227 -> 227 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line6_.pngbin0 -> 174 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line7.pngbin1226 -> 233 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line7_.pngbin0 -> 169 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line8.pngbin1233 -> 218 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line8_.pngbin0 -> 167 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line9.pngbin1235 -> 228 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line9_.pngbin0 -> 173 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_lineX.pngbin1244 -> 239 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_0.pngbin0 -> 165 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_1.pngbin0 -> 170 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_2.pngbin0 -> 171 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_3.pngbin0 -> 165 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_4.pngbin0 -> 166 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_5.pngbin0 -> 171 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_6.pngbin0 -> 171 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_7.pngbin0 -> 166 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_8.pngbin0 -> 167 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_line_9.pngbin0 -> 171 bytes
-rw-r--r--advtrains_train_subway/textures/advtrains_subway_wagon_livery.pngbin0 -> 26276 bytes
36 files changed, 40 insertions, 17 deletions
diff --git a/advtrains_train_subway/init.lua b/advtrains_train_subway/init.lua
index c51758d..add961b 100644
--- a/advtrains_train_subway/init.lua
+++ b/advtrains_train_subway/init.lua
@@ -98,23 +98,46 @@ advtrains.register_wagon("subway_wagon", {
custom_on_step = function(self, dtime, data, train)
--set line number
local line = nil
- if train.line then
- local lint = string.sub(train.line, 1, 1)
- line = tonumber(lint)
- if lint=="X" then line="X" end
- end
- if line and line~=self.line_cache then
- local new_line_tex="advtrains_subway_wagon.png^advtrains_subway_wagon_line"..line..".png"
- self.object:set_properties({
- textures={new_line_tex},
- })
- self.line_cache=line
- elseif self.line_cache~=nil and line==nil then
- self.object:set_properties({
- textures=self.textures,
- })
- self.line_cache=nil
- end
+ if train.line and self.line_cache ~= train.line then
+ self.line_cache=train.line
+ local lint = train.line
+ if string.sub(train.line, 1, 1) == "S" then
+ lint = string.sub(train.line,2)
+ end
+ if string.len(lint) == 1 then
+ if lint=="X" then line="X" end
+ line = tonumber(lint)
+ elseif string.len(lint) == 2 then
+ if tonumber(lint) then
+ line = lint
+ end
+ end
+ if line then
+ local new_line_tex="advtrains_subway_wagon.png"
+ if type(line)=="number" or line == "X" then
+ new_line_tex = new_line_tex.."^advtrains_subway_wagon_line"..line..".png"
+ else
+ local num = tonumber(line)
+ local red = math.fmod(line*67+101, 255)
+ local green = math.fmod(line*97+109, 255)
+ local blue = math.fmod(line*73+127, 255)
+ new_line_tex = new_line_tex..string.format("^(advtrains_subway_wagon_line.png^[colorize:#%X%X%X%X%X%X)^(advtrains_subway_wagon_line%s_.png^advtrains_subway_wagon_line_%s.png", math.floor(red/16), math.fmod(red,16), math.floor(green/16), math.fmod(green,16), math.floor(blue/16), math.fmod(blue,16), string.sub(line, 1, 1), string.sub(line, 2, 2))
+ if red + green + blue > 512 then
+ new_line_tex = new_line_tex .. "^[colorize:#000)"
+ else
+ new_line_tex = new_line_tex .. ")"
+ end
+ end
+ self.object:set_properties({
+ textures={new_line_tex},
+ })
+ elseif self.line_cache~=nil and line==nil then
+ self.object:set_properties({
+ textures=self.textures,
+ })
+ self.line_cache=nil
+ end
+ end
end,
}, S("Subway Passenger Wagon"), "advtrains_subway_wagon_inv.png")
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon.png b/advtrains_train_subway/textures/advtrains_subway_wagon.png
index 079d797..c2d18ed 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png b/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png
index 1d0e809..c3fef1d 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line.png
new file mode 100644
index 0000000..dcd5005
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line0.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line0.png
index c656d97..b853ef2 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line0.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line0.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line0_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line0_.png
new file mode 100644
index 0000000..a4ba30b
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line0_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png
index ad596df..fe35193 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png
Binary files differ
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 0000000..d731f68
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line1_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line2.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line2.png
index 7dbe679..78b4f80 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line2.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line2.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line2_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line2_.png
new file mode 100644
index 0000000..42d094c
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line2_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png
index 3ccb6fb..19e3af1 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png
Binary files differ
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 0000000..608206c
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line3_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png
index 67d7def..eb8dc39 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png
Binary files differ
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 0000000..1fbdbf0
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line4_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png
index 1af9e9c..a1a50d9 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png
Binary files differ
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 0000000..5e78cc2
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line5_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png
index e48c6ed..f804880 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png
Binary files differ
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 0000000..9e11041
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line6_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png
index 8ed26e7..0587719 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png
Binary files differ
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 0000000..edfe9b1
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line7_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png
index 4e19353..45de3bd 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png
Binary files differ
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 0000000..efd125b
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line8_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png
index a79d7a7..a5dfd1d 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png
Binary files differ
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 0000000..09a3c7f
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line9_.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_lineX.png b/advtrains_train_subway/textures/advtrains_subway_wagon_lineX.png
index 6f74877..4b142c1 100644
--- a/advtrains_train_subway/textures/advtrains_subway_wagon_lineX.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_lineX.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_0.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_0.png
new file mode 100644
index 0000000..6dbece0
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_0.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_1.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_1.png
new file mode 100644
index 0000000..e65cfe0
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_1.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_2.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_2.png
new file mode 100644
index 0000000..6064893
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_2.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_3.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_3.png
new file mode 100644
index 0000000..a51e943
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_3.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_4.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_4.png
new file mode 100644
index 0000000..73ea576
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_4.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_5.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_5.png
new file mode 100644
index 0000000..c278680
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_5.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_6.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_6.png
new file mode 100644
index 0000000..c4e6bcb
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_6.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_7.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_7.png
new file mode 100644
index 0000000..afe0814
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_7.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_8.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_8.png
new file mode 100644
index 0000000..56108a0
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_8.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_9.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_9.png
new file mode 100644
index 0000000..6d5b411
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_line_9.png
Binary files differ
diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_livery.png b/advtrains_train_subway/textures/advtrains_subway_wagon_livery.png
new file mode 100644
index 0000000..2702871
--- /dev/null
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_livery.png
Binary files differ