From f4e3a14b3f657f59c296e29e8b5fec40c42f6a22 Mon Sep 17 00:00:00 2001 From: Optera Date: Wed, 30 Aug 2023 07:57:16 +0200 Subject: [PATCH] Version: 1.18.5 Date: 2023-08-30 Features: - moved logistic ports to their own technology - new icon for logistic ports --- .graphics/LTN train-stop.xcf | Bin 35704 -> 49920 bytes changelog.txt | 6 +++++ graphics/icons/port.png | Bin 0 -> 9732 bytes graphics/technology/lsn_technology.png | Bin 0 -> 14058 bytes info.json | 2 +- locale/de/base.cfg | 1 + locale/en/base.cfg | 1 + prototypes/entities.lua | 3 +++ prototypes/items.lua | 3 +++ prototypes/technology.lua | 32 +++++++++++++++++++++---- 10 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 graphics/icons/port.png create mode 100644 graphics/technology/lsn_technology.png diff --git a/.graphics/LTN train-stop.xcf b/.graphics/LTN train-stop.xcf index 83ee88dca77487017f93de0dbb3b0acaa7063d0d..a2ccd27c52531d872985dc4e7618cfb9b3446d86 100644 GIT binary patch delta 14268 zcmb`Nd2}4rmGG-28-s1UU|W0d``)eIH+8EQt*usDOSh!9B+IgF3EQ$I+mbB|aF+Pda7SteYEKCy~PiP1?~S5`D4+@V-$0gf5}Sq8?4km%1Xnhtc+}AWou5R zK48=1K~^4rn3ZQrS$Y3uRzC1CD=F&2Sg}ALcw&02c-?JFSmTl(kt`6O^1+Jk<_p1y4s4Fja{Atl;2kIs~bGMp`3S1*uDlW_! zYf1#&)1GK$`Tj+jEU1gvboBlUyP~hI5VkM6T!}gv%v|}&-P5hfQo+d!+mi#gl%K{6 zwRj5fT$E$a2iUk$XvcI8GCJ9 zos+f#dC}Chg|&~2vvMqV|M+S)O^@e1Vw^OBIcVzJR1vuFyz*~v{_elt{_#ryHc9}O z-~H|HKKic@Uwz?c02b=v3ol~wv(G;H@Q?5Q$Ax!a|K5a=nmPL~KY8U>pMUbF&p!S9 z?ce?M`M(`+F;W+Y&-~N#KY#t@mw)-2H(&gR2Y0muP1L0=6UXj4d*AVs=jrdBKi=X= z*v!<$q5V4>+meA`W^#8^ZM>t}VnW-#k>*t2;PCe0-u6UmoyKUQW`_3e+}_eWc~@t2 zVhQ^R~Ua&t{g$YwJRRcz07mBQz4@?w!vZSw#s9$+*woc#or^8k;jTy!+|i zb;Z;=Z_FELr%yJLdItMP_qZ*_Dv3(x^@Vq}+0izT9%+k2!l4?6GuqM=b=lC?ml=-w z{lU7HL}Ft)>2Z3|wkb1Kt5oVWMvK*;x0+1V*v3p>yG~rD*6AopDzhlGDw~m->)F<& zP*g3UW<&A5dcV?aq-J~Qp@E>u6f36Y#tz@zs*q!OnV}JnR?@t4>fuL@9oXeE>xgaZ zfJw1InmYQ#V`nDQ{#Gs4(X+WzuP&2DM(*CTvCieHSL(6L-TfJt$}`;R4m--$tGr>U zmKX<80Yz%SELY0Q%8h=fNQ2|BZD-1)G0_?oMakAn%s!9FM9m&MG}2V(R$_BR8gC$K zH&Rz0e*EM_vejoRre^KowrJR7Gf=a49!fTw%qr|lO{6wlt23dkE?yn-swGRPx!UGV zi$a6N)%sfF23Z{zH-3a}uF{*SOB>re0`{IA6m{#0sfUS-y6KA>#HC$2l;z+2PlVq!LN_O1ZAusI(X;`itrF zr^nK1AI_9gS1uD-tSUWrX5!u*X^TgVoi<6UM3riEr>pVKKtw83Ik7u(Q$!}krq2ee zLne#Ofu^AYQ*nvWOwD&#GmnufM0p zr==ts=z2zxlw)!*L|kZ(Ua9IvjZ(D?l#(!=z?o$db3N4sz?EiQM!Ri(ln z_K)pOG##37Yg1FZGp&Au4C@&?Ff@GEzMl32KX~f+EM78L{85L2sN1)VN*FDwCt3soA63Aa?4|crj2L4m*V# zmIwrELmf?(RaP@~tsxeR3X7<#D^%EtrdwPt-t)ct=@wr!Cd+DXu-}pa2`N91oaX+@IfBeYQ=~Kr~ zoO|lrk$OkGn)Gtda6_^s5a`~wv%aP=X(bLlI6BnS(K|G}ZEMfQcuP!eK=0eSdw6?G z)8tfpZ6e(juMx{#Sn(h|I&xp{QfVL@@YZ+K=i=7j$k0C>#%G_pvC-|0<>J=Bmf@$n zR|%*!_MpSldT%4n?Zy7gz^GlVE)&WWHh0a=B!-@go7($ZYHNcve!C+aZ;CjqXzNK0 zMZCV6SUizPrdnKfH`=<>yMuBWtx@aDX067cHDDZ^>F!CWs!A1Fe0WQQMwv#55pyoJ zrBx!YBx}8~C+bm{Fm82jPWkl)61GO~nrfDlu$AuXw`)X=JEk6d_~^v2oe5j%zO+`p zPTY3*@$+XU+C2&4_nnz$wY*ds8oFywYuG_M>zKIJ(cM-pcMT<6HPt0+6`ooqZguv= zz4DElOftD-Ly6AkVB*%6p$47Gpu(^vUsq-FxN#h2>50v;u!DrHN~Oma#bA5&8;>5{ z)70d$;0m_Yv_`_lYFyP@Cz@kAgABXk4~Bv@TBCucX2T6emqQ`KxD{+@Gs#p~p5Ga* z(~Bdddxs9zS8C0aApTX-Z|k}fpV~(c@AtaMEcbLJ`ZtHuqsN|l?D%*>?Z!K2QeBC* z9$)g%`R_h?Y`o4Kl9T69XDS&r+^((dzwf@`UaLDSB0+g$x?Zo4(gu;#ASpEmLS80r zb@sHD3#F1OS?QYFv_Yqbc+SLVrrN8kl8D7+w~5qdodV<57Z0AhZ?vu5tHEJVmx`(k zW~B~0ICglXQ}4uqnAMBQh2>;uuhzA?L!wHh9eX3y1tnrEa@J??8%)(`qUW}Z?`sfa zWS(<`tZo~LTMr*UKIJEm+KcIp?GCpYM)oIsC!_~}_ zHkH}bDLej(bzTu7TzQbvao-*2dn_hlgHs9aqn5UlbhVr3N;3|rCKNVF2e z)^eG|L6t}%(o3sk z3WEW|R;u2l)ELY{Q?xDJ)!Nw9P=leWch5b$ zC&z|*Hf z13QMdH#bclYzxIPRt3azGWG*^j@-AYNahcE-Sw&ZW{r^SH#Tn@{DxqMx@RBUnjceRpTS5GoS$3ry%zt?7~ zjW5A6>~D}rvAE7mrdlOz7@7FSLo~f_ zyVXFpSe==6wQQ{@dH4B8Pw#7U$4RVe?`lveO2jo=4(@IVRoi0<(&e^P(kgdsjoWIf z*R7VhLK5QZZRrM=IFZpyWa9PfwLZI$Y(n}6V=B2;slZ@*M}^+wCM)mmeZ7%dhm3?O zxyu`&Nvt}1?#RyiMwbbftu>ISt<_s`DR17}SgX>~#84H8 zCG-*{S;@9gOe-Ya+j(#zR-r+kZm3WAtX;zxs*c>f*X1OGmHM)&w?CBHb>v&$JUSLv zI!UN%OUIKvv?nq3=y#qtI$mcCGO?2605Yrl8Q1WR)t&afyy#DZZ_w{DxXM%WzKrE9-ZDy!dL&U zu{t64aLy7iJ1rzsJ#^&Aqz5+xIDIV}ZB7%0s`ID%{SK27$7ZG@-RW^DajQ8M)2tSS ztyLr#w|8e6J>sp02OBKwHz;V2w~F+zZPT`-tM_oHQbXygZC*!(0(;nf=Z?n6fqf2D z+x{Kt7Ozf%_3Rk$8=M?ZwN8BhaeDti*g|?eJ~ljYWOJzZksm&M`uIr9p~8LhOlv$4 zY}RPIPMw|{O;x(xYO=#}xh>VU5``fWjoD;tDyua#d78RizM!paWszWZg`+vVq1=SA zDpV7yEyGxKtJvP&s?fM_UfWvYo%nC(N~>06G$~taaYbjkQ|)HEJ`%RBTWN3Z^pa53 zo9+x48yxjb6~$sttzAd{mx(twVz?={RIL$76gs_%gsPy^Bv;cCnY2t=Rw~x&l^ClG zZojNjT&We8OJzDev&AyVRXU?quj95@0vGkaf?LiGL^Cj0;0$ev!^Bc1C?EnfiZOEe1 zoKxoCTxBFC%pPQv+hP8lc+CVOcYe2d;#nFRWZJt+T-Eqoqjz(CFG{(|kggoXRpTXw-hDqTFULs9l1{I&f%z)2-v4%!<)ioUZcQBh^z8J2*UGvY& z*gD0}VwrY|I*LX8xe6OaW8q(6oySo=h4UF&f){Q@!yDL$?_r|`u^Shcqu~WKynwC3 zVM0R@1^sx-t60VQY!O_$gb$2U*t9qB`NIrd_6vLgbqmb@_fn>1IAI?PUk3Qb>v)%x zGhLm9nHK6hXsSZfitJLze*5<3&#|U|#;S$409?lN0P5$_;r>vL4Sa7kKosS-(eT<5 z($)XLt{%jO{S4(Hl=QbynL_0Vj?gb}!<$FZ>*`Tv(D3_}*yJ^ztbqAvZnIGHrN6ip zuFs7La9u2|IrQVNF2DEFr%yY3s8I^r{^pNwfpUCJvW~)rJ^%8HElZ)4nuFhd^x+Gz zme{u6l@Tq44b+vhKl#-spMCzj=f~GjOKHgNsq(fF`_(PS&K^I1z9m6&3v}~REt7j_ zBsI9bH&JKA+>kY;&a^V-ZM!q_xXs)DpN>=Y?7YV;>la zgln8FQ5%!J^YDofW8OrMVcfOqP1TIuAzf)C_Uk=eiX!TIyk5zc4nq`qK^XB1Hlamtk%=)Ou8rMZdASldx)#d12js5^`fZ5Y+QP)kBAj~Y?+ z>EsGkl|kdCuGPsjYAwC&Q}hR%sq7m+LKj7k$TA-B+)F=+GaiwB>%$LT%(5Oam8Qka zn4Ed;mmh!n*?Z58F+(+4W=j(D)&3)=kDohNA7^r_v=R-Id2py>Xj@M_W?(XF+s-6d z^GL5W?Cr>Tgif`NorQtnZo!(M=U((5^oXznf-)xirvBQX-$BPCR;HM?L&sQ`=-w^Y z=*$`|dJy)aT5=mRYu8h)a-5yUsDd#YU<=#ubibx?>fs4H>k&Yxv5H8OFY7@mdWJhI^q%aN`ub8dj!=!ghOg3!}?HD zSHn^$qq6is-`3GPh-v%5G&`iHpGoD= zBiBFFF}SU}Il}saI(ZtM4A;)U$R=6PooZ&IgGzA+>kIt@J=AKy>m=qzU+~)?KuehX zJ(*CzYl}zBOr6Q8qd~@;8kMNDxaBr6W{YSU6OyjCH%ZYKVnG>W)#wKiTD^TCj zH<_Ave1Djf(;8^jo|;U#NhEUnY%2vTnm3qm)>}HMm0F{+7S(j1p}s;~i=|(6$|X{1 zsa8p%gIuT85ntFxT^EF-5=tN_r*Quvq~`2^JC^mOR54WIZV4Y^S4vpD2!J5g)gIdJA_#Bzq0XetiP~t}1}P5ED(k zz}$k_M6cpbhuB_z9ZlI1fHr)#&Mg!KKgVs;yKMSOB|hLO3g8%;%dz) z(m+lzyK+kT`kbOtRuRb9vX)TuI3hTP z>^Yz1luMifb99l73NHSOV&b;kAJU%~o)U%v;Xi9A*W~mNN^&wlYflbn5juu5M=hKF z5A}l_)e0$Ett)rC>LDeF;q1a zfKWgn6n!&=f&vr@7AO=4p`ZYSLR%h$fZkP*4CuK>-K_ z1t1jM1fgg`p1O=p`ZYTfuLnz3HP;fJZg2fPurk;QQDD5QM@wkq4n5A3|X#Z-h`ZQYefkc@zp}3Q#DR8O(=JXv~LDIB2nE1FDBvL!%vI7Xg@OeN1w4fUoz(XjUJ{Ce@jN%{^1|tSS0W5-0*liv{(L9BMMHC7+3WdS`Mhb-x z3NGeDC@2J>aLn={6wKTJp=g#uK>-Q{`4kE+)MXw=QIrJ=04bO$0HkpJ=MyQ&CsNqUJR*g*JRk*yfD{_@ zffTSnioTIZVVQYE3JMS@TusT$O+X6$FAqpT0U!knKnj57h!k){3Y|Siq<|+-0v<>K z52P?g<$x4$KnnYbK#C?r3OFJK9FfAfl_OG6fJl)hBaylhNTD$wNI@YW1&e?b%@HXm zM5KTxQn>5ni4@GTL`qo*-7ZWL5X?a8n3J@t^iPT~s1vdjJvfbi=6bV~>R8avSMSl$?kG>NJm<$juyTLY+rVs1wu#1T~>fP!j;6rcxlN2?%N` z0fL%wH6Y4x^LY*f~sB@%=wqiLPYC@GmO{j9HsSLp$K}|+j0k>q!K#;x0 zFeMyLo+IHXbMOewJTbzG202WGI?sksXL(SZj#x3lLm(U}LVkddAGGth2X&tD5S;@% zs1ulj?=gHfyq6FhAOr{Pgx(-@ttUE9Z^*qIy&-xlox?YnAovCdzCoSf8zkcr1C9gY z8zA@wM>##~28P~X7KYvc(i_xydV@MoZ&2sy4Hm=E8&o-ZgDTD88ysZ@-!P+0;V4tr z2&O6Hpod+$b^K=CViXasrNQK4=JV-&Erzfbh$OMTA z>I9SEzg=E3%7l#oVIycKTm%t!jOaWUA@_1z1od`~i=a-p2oNrUI^iNT0D=)52;?F_ zxCq*jivYt#P-nOZAQwTM=OU={Tm*HVi(oMv7eSTdBB*j)gt#){B1Tw+Jfsp)2-eTA z5RQWY!$3IrK`=rIi$bPz5=jRE4IJfIj5ioNhcy;>2E!$CEMqapU>F9C_!pRl3upF+@%x4IgCZ8RkAYU1ftN2v`3i1^J z3i8ze3i6cz3i46F20;8tC_1JIJx8&9DlJAq_&5pz#8D6cj)DMhtc(HNm?S(K1>x5; zN&>7=5I~KB0BIBiKocYKW~MR%XfaLTED8c-Q4j!&f)G~}gs`F@L=`I|1eNrG0890F^RY>W>@Cj`J5}CS PDh@fI!+FBk!FkqlERZ4 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 IEo>P0Kd?=OGynhq literal 0 HcmV?d00001 diff --git a/info.json b/info.json index 40e68a0..0f6c46f 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "LogisticTrainNetwork", - "version": "1.18.4", + "version": "1.18.5", "title": "LTN - Logistic Train Network", "author": "Optera", "contact": "https://forums.factorio.com/memberlist.php?mode=viewprofile&u=21729", diff --git a/locale/de/base.cfg b/locale/de/base.cfg index 8b30c4c..eb8a8f6 100644 --- a/locale/de/base.cfg +++ b/locale/de/base.cfg @@ -25,6 +25,7 @@ ltn-port=__ENTITY__ltn-port__ [technology-name] logistic-train-network=Logistisches Bahnnetzwerk +logistic-ship-network=Logistisches Schiffsnetzwerk [technology-description] logistic-train-network=Logistik Haltestellen fordern Gegenstände und Flüssigkeiten an oder stellen sie zur Verfügung und ermöglichen automatisch generierte Fahrpläne. diff --git a/locale/en/base.cfg b/locale/en/base.cfg index 52e661b..b68215e 100644 --- a/locale/en/base.cfg +++ b/locale/en/base.cfg @@ -25,6 +25,7 @@ ltn-port=__ENTITY__ltn-port__ [technology-name] logistic-train-network=Logistic Train Network +logistic-ship-network=Logistic Ship Network [technology-description] logistic-train-network=Logistic Train Stops request and provide items and fluids for automatically generated train schedules. diff --git a/prototypes/entities.lua b/prototypes/entities.lua index 81e54f2..bddde04 100644 --- a/prototypes/entities.lua +++ b/prototypes/entities.lua @@ -215,6 +215,9 @@ if mods["cargo-ships"] then port.next_upgrade = "ltn-port" ltn_port = flib.copy_prototype(port, "ltn-port") + ltn_port.icon = "__LogisticTrainNetwork__/graphics/icons/port.png" + ltn_port.icon_size = 64 + ltn_port.icon_mipmaps = 4 ltn_port.next_upgrade = nil ltn_port.selection_box = {{-0.01, -0.6}, {1.9, 0.6}} -- ltn_port.collision_box = {{-0.01, -0.1}, {1.9, 0.4}} diff --git a/prototypes/items.lua b/prototypes/items.lua index 85c8707..78b617c 100644 --- a/prototypes/items.lua +++ b/prototypes/items.lua @@ -35,6 +35,9 @@ data:extend({ -- support for cargo ship ports if mods["cargo-ships"] then ltn_port =flib.copy_prototype(data.raw["item"]["port"], "ltn-port") + ltn_port.icon = "__LogisticTrainNetwork__/graphics/icons/port.png" + ltn_port.icon_size = 64 + ltn_port.icon_mipmaps = 4 ltn_port.order = ltn_port.order.."-c" data:extend({ diff --git a/prototypes/technology.lua b/prototypes/technology.lua index 40969e2..1c7a35b 100644 --- a/prototypes/technology.lua +++ b/prototypes/technology.lua @@ -34,9 +34,31 @@ data:extend({ -- support for cargo ship ports if mods["cargo-ships"] then - table.insert( data.raw["technology"]["logistic-train-network"].effects, - { - type = "unlock-recipe", - recipe = "ltn-port" - } ) + data:extend({ + { + type = "technology", + name = "logistic-ship-network", + icon = "__LogisticTrainNetwork__/graphics/technology/lsn_technology.png", + icon_size = 128, + icon_mipmaps = 1, + prerequisites = {"circuit-network", "automated_water_transport" }, + effects = + { + { + type = "unlock-recipe", + recipe = "ltn-port" + } + }, + unit = + { + count = 300, + ingredients = { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + }, + time = 30 + }, + order = "c-g-d" + } + }) end