From 5f33d46370c7439437bcf4b35eb16bfd29b81ae1 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 11 Oct 2025 17:30:38 +0200 Subject: [PATCH] 2.0.20 --- Bio_Industries_2/changelog.txt | 12 + Bio_Industries_2/control.lua | 5 +- Bio_Industries_2/data-updates.lua | 15 +- Bio_Industries_2/data.lua | 1 - .../biofarm_pipes/Bio_Farm-pipe-E_l.png | Bin 1192 -> 0 bytes .../biofarm_pipes/Bio_Farm-pipe-E_r.png | Bin 1429 -> 0 bytes .../biofarm_pipes/Bio_Farm-pipe-N_l.png | Bin 1819 -> 0 bytes .../biofarm_pipes/Bio_Farm-pipe-N_r.png | Bin 1708 -> 0 bytes .../biofarm_pipes/Bio_Farm-pipe-S_l.png | Bin 1609 -> 0 bytes .../biofarm_pipes/Bio_Farm-pipe-S_r.png | Bin 1587 -> 0 bytes .../biofarm_pipes/Bio_Farm-pipe-W_l.png | Bin 1420 -> 0 bytes .../biofarm_pipes/Bio_Farm-pipe-W_r.png | Bin 944 -> 0 bytes .../assembling-machine-3-pipe-E.png} | Bin .../assembling-machine-3-pipe-N-exp.png} | Bin .../assembling-machine-3-pipe-S.png} | Bin .../assembling-machine-3-pipe-W.png} | Bin .../pipe/assembling-machine-3-pipe-E.png | Bin 1214 -> 0 bytes .../pipe/assembling-machine-3-pipe-N.png | Bin 1473 -> 0 bytes .../pipe/assembling-machine-3-pipe-S.png | Bin 1950 -> 0 bytes .../pipe/assembling-machine-3-pipe-W.png | Bin 1341 -> 0 bytes .../bio_reactor/pipes/bioreactor-pipe-e.png | Bin 554 -> 1205 bytes .../bio_reactor/pipes/bioreactor-pipe-s.png | Bin 916 -> 1952 bytes .../bio_reactor/pipes/bioreactor-pipe-w.png | Bin 553 -> 1033 bytes .../pipes/hr_bioreactor-pipe-e.png | Bin 1205 -> 0 bytes .../pipes/hr_bioreactor-pipe-s.png | Bin 1952 -> 0 bytes .../pipes/hr_bioreactor-pipe-w.png | Bin 1033 -> 0 bytes .../graphics/icons/fertilizer_sulfur.png | Bin 8501 -> 9857 bytes .../icons/{ => old}/bi_wood_resin_pulp.png | Bin .../graphics/icons/old/fertilizer_sulfur.png | Bin 0 -> 8501 bytes .../graphics/icons/old/plastic_bar_1.png | Bin 0 -> 2696 bytes .../graphics/icons/plastic_bar_1.png | Bin 2696 -> 5905 bytes Bio_Industries_2/info.json | 5 +- Bio_Industries_2/locale/en/recipe-name.cfg | 2 +- .../Bio_Farm/compatible_recipes.lua | 9 +- .../prototypes/Bio_Farm/entities.lua | 194 ++++++---- Bio_Industries_2/prototypes/Bio_Farm/item.lua | 333 +++++------------ .../prototypes/Bio_Farm/pipeConnectors.lua | 342 ------------------ .../prototypes/Bio_Fuel/entities.lua | 277 ++++++++------ .../prototypes/Bio_Fuel/pipeConnectors.lua | 76 ---- .../prototypes/Bio_Fuel/recipe.lua | 178 ++------- .../prototypes/Bio_Garden/entities.lua | 5 + .../prototypes/Bio_Garden/recipe.lua | 45 +-- .../prototypes/Bio_Solar_Farm/recipe.lua | 53 +-- .../prototypes/Bio_Turret/entity.lua | 59 +-- .../prototypes/Bio_Turret/item.lua | 11 +- .../prototypes/Bio_Turret/recipe.lua | 160 +++----- .../prototypes/Bio_Tweaks/recipe.lua | 54 +-- .../Wood_Products/containers-entities.lua | 32 +- .../Wood_Products/containers-item.lua | 27 +- .../Wood_Products/containers-recipe.lua | 81 ++--- .../prototypes/Wood_Products/entities.lua | 61 +--- .../prototypes/Wood_Products/item.lua | 49 +-- .../prototypes/Wood_Products/rail.lua | 18 +- .../prototypes/Wood_Products/recipe.lua | 121 +++---- Bio_Industries_2/remote.lua | 73 ++++ 55 files changed, 681 insertions(+), 1617 deletions(-) delete mode 100644 Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_r.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_r.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_l.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_r.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_r.png rename Bio_Industries_2/graphics/entities/bio_greenhouse/{pipe/hr-assembling-machine-3-pipe-E.png => biogreenhouse_pipes/assembling-machine-3-pipe-E.png} (100%) rename Bio_Industries_2/graphics/entities/bio_greenhouse/{pipe/hr-assembling-machine-3-pipe-N-exp.png => biogreenhouse_pipes/assembling-machine-3-pipe-N-exp.png} (100%) rename Bio_Industries_2/graphics/entities/bio_greenhouse/{pipe/hr-assembling-machine-3-pipe-S.png => biogreenhouse_pipes/assembling-machine-3-pipe-S.png} (100%) rename Bio_Industries_2/graphics/entities/bio_greenhouse/{pipe/hr-assembling-machine-3-pipe-W.png => biogreenhouse_pipes/assembling-machine-3-pipe-W.png} (100%) delete mode 100644 Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-E.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-N.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-S.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-W.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-e.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-s.png delete mode 100644 Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-w.png rename Bio_Industries_2/graphics/icons/{ => old}/bi_wood_resin_pulp.png (100%) create mode 100644 Bio_Industries_2/graphics/icons/old/fertilizer_sulfur.png create mode 100644 Bio_Industries_2/graphics/icons/old/plastic_bar_1.png delete mode 100644 Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua delete mode 100644 Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua create mode 100644 Bio_Industries_2/remote.lua diff --git a/Bio_Industries_2/changelog.txt b/Bio_Industries_2/changelog.txt index 3e26f12..61df087 100644 --- a/Bio_Industries_2/changelog.txt +++ b/Bio_Industries_2/changelog.txt @@ -1,4 +1,16 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.20 +Date: 12.09.2025 + Changes: + - Code Clean up + - More Updates to Bob's Compatibility + - Added a few milestones +--------------------------------------------------------------------------------------------------- +Version: 2.0.19 +Date: 11.09.2025 + Bug Fixes: + - Fix Bio Reactor graphic shift when selecting a recipe with 3 fluid inputs. +--------------------------------------------------------------------------------------------------- Version: 2.0.18 Date: 10.09.2025 Bug Fixes: diff --git a/Bio_Industries_2/control.lua b/Bio_Industries_2/control.lua index fb3669f..c9237e1 100644 --- a/Bio_Industries_2/control.lua +++ b/Bio_Industries_2/control.lua @@ -18,12 +18,9 @@ require("util") require("libs/util_ext") require("control_tree") require("control_arboretum") +require("remote") -- milestones ----************** Used for Testing ----- ---require ("Test_Spawn") ----************* - local function Create_dummy_force() -- Create dummy force for musk floor if electric grid overlay should NOT be shown in map view diff --git a/Bio_Industries_2/data-updates.lua b/Bio_Industries_2/data-updates.lua index f7c9bfc..1afb9d0 100644 --- a/Bio_Industries_2/data-updates.lua +++ b/Bio_Industries_2/data-updates.lua @@ -602,8 +602,6 @@ end -- Replace Bob's Resin with BI Resin if data.raw.item["bob-resin"] then - --data.raw.item["bob-resin"] = nil -- Remove Bob's resin - if data.raw.recipe["bob-resin-wood"] then thxbob.lib.recipe.remove_result("bob-resin-wood", "bob-resin") thxbob.lib.recipe.add_result("bob-resin-wood", { @@ -611,7 +609,7 @@ if data.raw.item["bob-resin"] then name = "resin", amount = 1 }) - BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-wood'") + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-wood'") end if data.raw.recipe["bob-resin-oil"] then @@ -621,19 +619,14 @@ if data.raw.item["bob-resin"] then name = "resin", amount = 1 }) - BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-oil'") + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-oil'") end if data.raw.recipe["bob-rubber"] then data.raw.recipe["bob-rubber"].icon = ICONPATH_BA .. "rubber.png" data.raw.recipe["bob-rubber"].icon_size = 32 - thxbob.lib.recipe.remove_result("bob-rubber", "bob-resin") - thxbob.lib.recipe.add_result("bob-rubber", { - type = "item", - name = "resin", - amount = 1 - }) - BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-rubber'") + thxbob.lib.recipe.replace_ingredient("bob-rubber", "bob-resin", "resin") + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-rubber'") end if data.raw.recipe["bob-phenolic-board"] then diff --git a/Bio_Industries_2/data.lua b/Bio_Industries_2/data.lua index 3762d4e..9ca4147 100644 --- a/Bio_Industries_2/data.lua +++ b/Bio_Industries_2/data.lua @@ -46,7 +46,6 @@ require("prototypes.Bio_Farm.item") require("prototypes.Bio_Farm.recipe") require("prototypes.Bio_Farm.liquids") require("prototypes.Bio_Farm.recipe-categories") -require("prototypes.Bio_Farm.pipeConnectors") require("prototypes.Bio_Farm.technology") require("prototypes.Bio_Farm.tree_entities") diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png deleted file mode 100644 index b88fcdf85dc7b8e4212730f3831586feb03bb848..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1192 zcmeAS@N?(olHy`uVBq!ia0vp^LO^W5!3-p|OKwFlFfi>1@Ck8sFYsX%7Xu0=BqRVy zl7X*m@I8}XZ z4sme?Ee5}kfT)DXu*hH?6CEXO4ILew(8yq)AU`K>cVjzq4Fe5VUr!w~Lm$ThJwclL4x3OeblS?Q?R8)<9Hi<@XDx)^F1s>o}~%Xyh<+3Bi!nrN!Yh`AYQ z>nlhZs>;|KXhb+!1=*RUWG04K>AUKvL|L0;I2hWf%4a&+IO@nL3iFsKNX0o?C#1$C zdDthV$IFXwXSzrV?AETr;+V+VFsFGX@g1@5s~R#2 z{B65Z{i}j3T2g`wT{My{6({z!B-?3r7v(pGdL}!YqAFw{NO*RDP>D8$LKDk4x>fXzx-LREyzQI@OB-@!>oaY0pPqK!^hN>FP{ z_0$Q?^>t-EowZ8BoW1!u6(LT6W;$w;BHH47RdEsVF4me7f_eFAHI-Rrazbv#`r6XM z>1ko1wq{{YR_Y=g8Ya5hk^%vCrZI6LmP!)3R;G@gPQJl@A>o0#GJ+;5G7fs`Ch}tD z=G<+-xKAz#@(X6zTPrbTA~WL>CL=qWKBsB@3#_M3lD@XEvt<3@rJH&_ZGQCps`|U0 zqk=2U%pGs<``zjAPvAv<<=4Vfr`N5%@y+v68{Z~_TOS*_9b$f@vbFt+yb>&atNHAg zDO+>ry_vq`WJFQ?w51_T3=E7mo-U3d5|VEZ+Il%Vim+XHe{bjKG&M(Gf+xTH*}#!tHU8Ltax zOLVcx7_N59JQPrrTD-&Mygtv-Z8wiuOmkHYh{-Pz=vuZ$@>HAN;`>FHHJx?S@34K3 zIVE|@Bl>}lzf{|)Gc%iceS-}|Qm-k+c*(Myx-~&TeWyg@r(-HCeQ%o<&hcFCu}>{& z#ZA|z6YaY9B(BKvQ|+=0Oj@zWK6|0o@gVLiPZmfi{@?L;j`WJzopr0Exnxp#T5? diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_r.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_r.png deleted file mode 100644 index befc747c7d898250a80518af9efb153160a2cc73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1429 zcmXX^2~5*>6fWXG%2`_4f=I#M2jf0^mwzu>N?QtlXrc6=v{25L8)RG=h$w?Obb?IS zz+_Q`Ii{i;9+?N53d2N)Fo?qN91@*6HR4v|e#!gZ_j^~qyu4jXx!4mL0EIvxo{~g? z%He$-7QV&Vfz*n5H3Z@eQOeSUVw=p(_kGIopnh-kfpGVGABQ4* zJ`i_5ggXl1h`1yDw!mQ@d3$@Hkd9(^BqHBn;BgsT4jqE~f073h0Y$(Zjh-k3B?#>b zgEVo5j>6-S_wyiiCiF&In4h6JG8kw^-KheLz6w;K#b{+JvVPStAViA?rT^CzF>sY_Co40^2HqK}LU zZ74P=<@|bslEaL(zA;_eT~}(>DY?A3 z)Krnhph^JfnP8$`BhjUctSWY{R<2cvt(mOqLKCRuTe4*uB><-IWm29oC81O=F=ffx zD@`0W9Y-aqt3}!q5;YJOB)fAfr01F5saKng|1!kQvrYzrB5As1dKb{`bk*lPHlCm?DAVAMy zQ>dY2294m@BsY>u#h}QTAVCBr0*46;4j=>~r7;vyBvlek#`?JE5||PAKsCVVEG<%T zVyP%Ef??jxW4*_7)-QRF7uEE|)9>cG z-1+4kIC5{sK57!wNcX&QX+AZ>Yx#!Z6+8NH!&X+4s7youWm)^C6 zZS%lP9UNKcbq!ByRt$S=z5VaXW7jMHJQcdEFLebxe>8h@$g0NU36mS)Z9Bj0T3c+_ z&#OAJ(4jy{{-8-Q((%vZ<$KVtQ?$+rQCj#UZ7K zgMX@=Xkuo_M-I3R0)G4EC(MuBeZ5M%`dwEb7njc@U&@h}WDjYYU^t+6B=gsB1aaGnrAdh#tdyq$LFqlm6i;a!X Y{1vbJU#p$sZ#!-aA`!|3qky61KTP8KK>z>% diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png deleted file mode 100644 index fc348f05ed4d65b2f1be9cd37f4d04d4ee49bfa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1819 zcmV+$2juvPP)jwYs0KwV$fAmZ-0kq^+2zuAir{o~W**sjZ~1v#PVTvbMUcvbegy z!^6eN%FNHq&e7D=*V56|$H&Ua$IQgV$HKzI!@t40ySu-?!LhcuzO${xwz0jfrL?Q3 zs;Q=|u&=ADtDvH!otl@DkdKj>pOcrGjF+5`o1mMfsHc^Sn2Cjdkd}LllzWVocZ!pH zi<5MSk8y>IZh?ttfr?>#gkE=mTyuj`aDYv4gkOG%aE_UHlAeB}uYj#m;b#7>9Wl=|QTT_N?Wt5wqrL3&C zxw*o^#>2(N#l^@+a7^0S+}GFJ)706}(bmq;)XL7&zQxJ9!Ns<~#<9G@u(rFZxW1*d zyrHnSpR2T)thJS>v0i(SX^NP0kehUoopzI+dX=Gpo281LtBRqjjH0Z6m8GzgfwGHq zr-*Z_gJ_<9YngXzlyhH_ZB>eCT!n3CdSqU5VOwllQ*l{IZ&6BhP)Bf4Ky67oVn{q& zOhsQ$M_*A)V^vLPPe)ZqK~O_HO+YQ=&H!(ahD>*DCH7g}KC?P*6 z95x~wE+QN%9vLSc79bfBArA>H5ePXJ1SJ3f836zc1pxp6022-gFeo5IFDX(uE?GJ* zVLvigK{-+^9KWB8jd*g2WKNG_NPbsC6jfMX0001@bW%=J{{H^?`TqL*{P*wf_xJDb z@A>cV@A>)fva742ot&?`wZP1=sGX3EpP#I|$jHFb*vQMnyRg;O)!@|AEgt~sf~$*eUz%W$Ay4(Z(dbVPDMB#0ul`f1rZq+8!$mm zT3}vRQ9mX|Q&(w&i;H`7X?KT=k(i;Trm3v2ueZ0^$g+WHX?1^$jR3&`yjlPN12joQ zK~#9!jno5_EXfka@qc7ydw4zXt!>-3ZQHhO+p)H#qqS{Y8lhEPu~RG69sCZ8UrOjd z?0wlLha9}uWjcbtGna1i&RcK2`_6mszO(Tbdmg332#|R7$AekCckblQ6_3eANB+DJ zLkc9`-Y)btT>iVZKADEXcV#=p9hD841(+;R;GM1GzLr8uJ$yEiZ1`Yi>Fmvyj&P7$ zWQfd*g)J-19nl9f7C-BDvwj%Hc%P{je|E=s@UBses=0+z^_1ruH@0SZ|E@D;`e?>) z&F8+Fv0CF;ArYcX_*d@&yuCqd{*9@7>y5dAw`Me(MCVLapb~o$5%q|Fa`07tqMyI5 zhM2wZ{A?e5{QvL2r(7PW7J7#sHyiU)Tl9%V)n{Yj`H=Z2?_)D0Hb|s~B0y;RGFzzE z8}&uuSt94-AUIbl^Sg|f^!)5#Zn;aX7sI>+*<5gdE6-k~(2vySPmlFSnOq~j&dO#M z5L)Am1Vnr+>wrT#XH54edbPXFeU)({)Xd@^R~&GHr?2&ACx95~%q&m3#^YYP#|ZY5 z7x&2G4Ffy)w9Tr*n9h*S@Zy4N%wF6jjy5{iz=`)EZ;7~C69GtN9MJK8y$EbZBi;;y zZ%LfKsRug2kts^Gtl0%9xiw`zo8=V5of>Y>c1sM61NH#5r0m zNRZw55u3o|=^p#+yXS%{YD??bi4%3)m@zHuthn+jtFNwS>re(Wd+)XX0xPHnouKM& zy)Bbpez|2I&}A+!9oOmfP;S_pwJFen^MmfW`vn(cKRjVjKpEtNR&J z(l(v{QB}PK)tgoCy!Wx?R3Fr#B^gzH^j`hLop;@vPDa#2&Ncu5002ov JPDHLkV1mq)g(?65 diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_r.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_r.png deleted file mode 100644 index 42f3876d422877c2df20cfe49c762fd20f7295dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1708 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 diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png deleted file mode 100644 index 3b246d3e8afc9466d4375caecb20faa2e69609ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1420 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoc!3-o}6qM0+McKrn2I~rW%^@@t$5@c0i5nLi{}9qCDba z&Cx!#@+y@{@!{#=5BX-PrRVIH>ndOV`SDr)j-YKnTgT6%`s+WOj| z!EQ-$e*U(`b$O|?>&w-&)pT?;b#*lpqP$9CLwkxc+VbN2N;C74{L7OgYf~dDvJ!KW z0-MsJ(i8j~?5vBDVr;A}Jl<QlrCsJ(I%yLw((YecWB0Y!f4b(xXFcZ7tqm$x91#bkI|f@;29vb#<>u zO-l7Ojk48`urrQuvCs2y4Yjwai14V653Gp`%t?u>Ey##*F=|K(EednW4)H0Dad$K` zZOG4Q9wN!f#LdPM>ugn!8kZRpoERBW znjTw~o!p)j9_Qvz8tH#|PG4I>uqYP`FeQ}6L{=rm@9VD8mK0GJ=S%Q$nUoQg9q75f zrK~+OetBI`uy+RLyoy`Djs`3PN+_rS2ypD{U-gqW9dbI66Y_z_hb{NN%AhW7yi;GmAdk?Ny4tvYzw6DbwS5HkDVF zx~KepwpEMq&5gRhUoTI$-CbH+W2DBG@c7-7+x+h?ynLAXjA=vZ`HPRY$6fq+=Gn&J zM!_75f*%)-W^cK-)gmva=1b0vZRVfv+~h9F5#4@4ig$zR$Dm6;tG~RjOS;_D{L#Vb z(N*p9?~OK`pB?O8bh0(obNc+$+LQ|$7U~xjJuvQm_TIa0`qA5r&6_trd@cU$sFz!& zQKkKo`yc!dGd?>rV{6L(HvZb`?k_LC8WisenzTkSR7_OWS*0rb pzwSi5Mo0bAqwDv4{xJUso7UpF65b|UCcq@c;OXk;vd$@?2>>wp{M-Nl diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_r.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_r.png deleted file mode 100644 index e6e00ede16bc4fd6e1568ce549292767b7518c04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 944 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoc!3-oF~!3q!1s z6B9L-lmxO(H8eG3#Z{$5bQL5uWW@{`J91JjI+*EW|%I#?W?($0Py@aE-v8_X>sI{xPVbV0E$(!DsWxXfD z_~dX`#dGs-Tr59d2?}w2oA57HlXdIs)0-7zgjfG`%QbrP?&tHLPyT)GK6|82uaOaG z{7+98#}JL+yXWn_nH>dKKg_)At2gJEaEpmn#8TlS_Dk1hvRcosxo=_^?;t25Xt=0z z-gaa2?8;==GMgQ2*pLGel-8HP@N+yn0x5` aOLmUkMIX-WW_$+>1O`u6KbLh*2~7Y`dJl#G diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-E.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-E.png rename to Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-E.png diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-N-exp.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-N-exp.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-N-exp.png rename to Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-N-exp.png diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-S.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-S.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-S.png rename to Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-S.png diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-W.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-W.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-W.png rename to Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-W.png diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-E.png deleted file mode 100644 index 8275572318c31355587bb2110c0facf0c63a885b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1214 zcmV;v1VQ_WP)2az4o(`sB#ns-HtZ`i8+HBfqh}uOAij z*mL`zJ_;1MN^iaV#Lm}W+52`+aLsDS6+r_>M?T%NW*~PQSi^tXw5{O2|IWd|;d1#v zCY^p2z~(Axqli?5kq%0?P*GvWUAJ%ke88T1Vb|{6`$oSxwzaZu*PuzNcedx6{MBjE z8w40O_aWAF3#m2Qmj4zB4EkyL3oOJ|B8?-Ux zie;=+3jfkL!$U=CvuzZYPbR&UOhT)Y%ESw*u)R@H%S21|Ys@{_|GENj2 zAP7S|&m-_c+EGFx1)bImgKM|5?a>$6e%qaF8_4$t6C{oWmL-US0I$=+4;8gqn?%{P zREBKD=EtKSF~2y^K*hbrWU^@0!EqddZWk3r1Q9IEH^`PM6pE`^SIN^~>SJtrmRhi~ z_v8m3*+bkk$dshBuz>G%QRxir+7%X?5fhVRB!0lHYd7$~9UG`l&-4br`s|lZCY#2J z19t4#PQBH{?W-_1Q^m3b<7ZEBc6ypxTx0y)1p?3O4bCpkek`s0S!ojDB<8Pbl}w+@ z+-!>^Q6xw%2O0J}^ei1Op&JLi!SjnM8rrnwc}HgS#q$$5!e9wWTM61;f-*2uJ;l3k zzrdMl6(^nU4FY^Q`t|oV_ItS%F6op-CkU~HMXTKfdj+90z)W)$#@Mvl(X~MUH`h5} zce^vL>ktPKcD|3!{1x1MfpcfhptT__B(=rn^?|4VG_6uWzhseMtB_*3pGKpN=Y<$; z*s^&urEHFt7hWF-@Y7U0;)>vl6cK?Rp^PAoBSKszXXZFDRV7K1>jweKh4_uWtVQIv zQBIb2vyOE8xHvUQlxVazO9Q_hSH}X+|H%@HbS6c6(IZI=xkBlm-&6OxO9KH0O5)8F z8j&Of#?bYAbZ!9S7y_l14z>d`l6S(fjAN6sKq;FQ`69y`x8gYN(!pP=p)M8FTdp0` zU#@WF(j~?x#uz()ktp()4gw@r_FyIF|KYk0m6d&3Mae4eBifibK-ny_lVgpb z>{?HnB-0UuZmfe105&&JJJ8>dFTyMW{dGRE-l*?s@>v;dIYgoYd`=0mM| c9QN}28@^UO>-UKg>;M1&07*qoM6N<$f=xt8_W%F@ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-N.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-N.png deleted file mode 100644 index 58f4c755fbdc1a453521f4a8aab8d11cd1cfff10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1473 zcmV;y1wQ(TP)GwjUjjxOusL9+1%T=2jXA%a&Rpn;$Of&z%2 zLOv!42q+)~1S4PqflZ>sjcZ~Id(37wv)Q@(?&_|->U?dnK1Fmw;t&43K)nyoub#Jf zDZxABvG3pi*}65nKVQ&#v&YYUvDZB~E!~0Wk47)pzHxnbzt?SbyH7p){LNduOa7ob!rC#YBh^oei{+e@ZI1rP>d%oedWPl zeCK;V@ZYn{k01I>Wp}6dusi7e$n(Y=pD(ajDUmkg4i=nFl|2;cti4#<_)3k@;c{NBTVb(sg_^tih0(nG)NR zrmeji0Ok2CsZ@$ylY~NGTf-|?Z|;2f z$jQ`g8-P#Uw{k@~NuGQ4b>>d2@%PD_e)7H#v3_caeA=XxGf8_7mjkr8kC6LVdqsUFN@_5fM)t>l@p3>_H!II7VsKm@mztxm_GF2E`_yki>HZWXeQO zX31vjytUiFANhnMfz`24g(M8eR2Iu%7kutaL>;{`{hn3|O z-rU%vQZ6wyl|&>J3h5%JPM%=77$=p=VYvj&&;7FM}b(>sfigvxm`sp>$1*u$yQ_ETADi!7yme5rnd(=nEOw(!) zkfuq#lwd{}xL8;{mtf%H$^cLLNGCv51l4AT<$I6Q?{s-bGPY%nUDxOE%{|Ut_#kE` z$I?<6ySYQF(dF`={>s+Q9;@Y9nx2E*88G=M0gYrjkMvz;Q<7w;lZ~6SC(n9)2O%Xb zdq5#q;NY+!fS>W7B!K5NB0SqFT>SJUetGNH$U%?Y*RHXD`DqpxVtBq!F>i9O?a|rW zz>Gm>C^_%~JlDf@Knk7IRGLr`K#1G(XxCkYfGh!aeUD>tv10*%eA|Vq0ImRd_}gFm zRkv?_YqY;>;iqjh_VX|fh=G}dtIOxMF1Kw2kZgczz%SeXc~$T`B2KJ2QCmqMHs*|unNpY zwn|hujLeCehEYQ)1Ve=AsjA`#(85qElQ>e!NRBw*0A5t*zuW&A14u_=A>c-lQC+kW b@PFc;ZtYFP^haG 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 diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-e.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-e.png index 6111448f38693abea74860e3abb4a4ed6b54ae58..53a6e383d12fc26ef00d80026e92e4862fd5b884 100644 GIT binary patch literal 1205 zcmV;m1WNmfP)=8XFuO92zDjBuYm|1Ox;S4-Od_85tQF78Vv26ciH@64}|=iFjQX7Z)2F z8y_7R7#J8F931`q{fTl-4Gj%ZKp=E$VKOi-T2n*E!^5&=Q@*I77#0#lGaO$|H99L8 zNj@wkB_RoOeparF&ghM6G*as+M|9RaIPNX1%MP>K)b}V8$P#F8}i1_G1EWt@40!&l@00V(ZL_t(|UhUS&a_UAD24IlX zY6L=v$zVIa=~45{IC#kWKUGf4uDZFEZsJ8&shkBHzWVFe>4wrk4aN>0d~dL0X@J4v z!M`*APq^6_0sfVCCW;-`UAUhbWB29vA4PW7OLsX6g6Y!1?r+P-$EVkiTbJcp>dwcL z$@BB`<71Y$@%0)$)m_eX(pe7)+P}ZqZJ5_=e|Y-%y~y|qe=Zqp#Xb5A5W*cEjGDf0TL+TDm6dC)b(qaX{bB; zqHz|M?dg0zLhhvqb-N1295@^#Er!YV1sXH2~ z6#%WC7-Plme5&iquG3zYp(?vak!Y?Z>vrd3#i6T?E~h|kptNaN^KrTCPW-jgP;9M( z@fO(!8S(2?uyD8A9ZwhCvIf>_4$mcl!d0ae+uhEvEd6OM=EE(l%Z^fUrL?-K#oqE# zOP8<$BJC)mjK(}W!YOo(j$(H`op=ySBF;oin*x3Xo04hiD)0%!B4{8u6%blwdTK4^ zW8@KAMky7PQ@B{P0je##9!`iSWfUcX#-gk#H&H0-BM(Uu#X`iQsVFa*fv$ov>;Mtf zAf~LPv}D3SM?)VG1Z5M!V@hdTR$4l+7RxEb0*w^qylt7F14G$h=tC-j*o1SD9hu-- zik;OQVu?(mlqX3nSS2V>t+o1CwXV3QRPaOr!#x;p`yBvHV-7V2rdZgQPY8hrOOjMs zBULxiM~e2b3B6BYUtm)SG=&lX4EuuA&sf>pl$cVn1*ZV9s)3XeBr&F1>k%|So)<;7 zZ6^{LDYn!p_!CHt4u}0-$UAhg4Ek8G2r3|Cq>if^_`UTIBFNm;aiIakN~B_8%o}j} z21DPrmG#W2Ac2k`*0v=fGJ(&5*}Ch#0a$1%rRO-t0`6)#1?x}j$;6AiExuQF9e{-y zkNvH;b&M43Y8e0yV5V>(fST}3wGDz%Kah`&63=Gv;xPI-cS2_mFYsjFptFaE8B|z( zllB|?1_e3z#oi13I<$YFxR}CE+uVQJ&12fU{pStaZpcJT84L7H#jyzIVr)LaZpGxcugXge`u$SX~nReIYC5X zt8Xd*0010xQchC<6%2m+=4JMi3HvE#L()Z$282Z0oo9{!eKAEr-YNQ}%1^ zpkv_r!Nb$mR)-xa8J=I7>bh3PFAJdSs->v<9%071vetQCV2p3r>vdV`df%k16TPn6 zb=nZZ8_#vV>22CEgMl~AIxYFS<0(~ao|~zi@*RUSQ(~5FjURvXK=E1T*SgrBj(M&~j$7~!$4z|zXB=OPh(E6vm15QmGuhr*s+yDRo07*qoM6N<$f+4NlTL1t6 diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-s.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-s.png index 46d9864cbbbc50a87e903f6a5599f505260c2186..df32b61bf10b0129fbe069b08a60becbf75bfe9a 100644 GIT binary patch literal 1952 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 Dc6Y7c literal 553 zcmV+^0@nSBP)4-gOs1_oVWUltb@1_lI$XG=sxLW5x(Yg#lYD=Hiq6BrH!Tu(AfKQJdE8GLP9 zeO@&|IV&+L9$8RHT0IpG2?ani8#yv1D;o(uJ~@$tX)+D~MnpbhYinLxR%uf+qmFb? zEE1Y|DL^I&jBGJxMhI_97OR6LVL&SAXR_k}0016zQchCEykre$Un!ft& z{@6=O-SpVTn0~{O{_Rc2{r~_014%?dRCr#+&&P6uFcgMSfxuX%8Dl%uYV?kKegEeQ z8%LL9nMJ)vSPv909IA? zU~_W`ER}U4=|YB r*>uQ#UMh2SG>&NGC!wY8pnvEKq7E9c3tP0f00000NkvXXu0mjfT*A~1 diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-e.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-e.png deleted file mode 100644 index 53a6e383d12fc26ef00d80026e92e4862fd5b884..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1205 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 Dc6Y7c diff --git a/Bio_Industries_2/graphics/icons/fertilizer_sulfur.png b/Bio_Industries_2/graphics/icons/fertilizer_sulfur.png index 14ab8facce9bb2cffd90a4f32b58a73e7f0ab7a8..470e5d527414bf5ac6b8608fd5b556c91b413dee 100644 GIT binary patch literal 9857 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 literal 8501 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 diff --git a/Bio_Industries_2/graphics/icons/bi_wood_resin_pulp.png b/Bio_Industries_2/graphics/icons/old/bi_wood_resin_pulp.png similarity index 100% rename from Bio_Industries_2/graphics/icons/bi_wood_resin_pulp.png rename to Bio_Industries_2/graphics/icons/old/bi_wood_resin_pulp.png diff --git a/Bio_Industries_2/graphics/icons/old/fertilizer_sulfur.png b/Bio_Industries_2/graphics/icons/old/fertilizer_sulfur.png new file mode 100644 index 0000000000000000000000000000000000000000..14ab8facce9bb2cffd90a4f32b58a73e7f0ab7a8 GIT binary patch literal 8501 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 literal 0 HcmV?d00001 diff --git a/Bio_Industries_2/graphics/icons/old/plastic_bar_1.png b/Bio_Industries_2/graphics/icons/old/plastic_bar_1.png new file mode 100644 index 0000000000000000000000000000000000000000..0e41055cfc25881e340946bc7d5beec68eae02de GIT binary patch literal 2696 zcmV;33U~F1P)@g zo}Qk#xVXByy0nfbj$kC3XFW9+0Y(`HnKuiGiHWdY7?4^W8yg#{s;Z8Tju;pih=_$HS8s1`i-&u|tW@~;_-R=x&9Ym1I2FvXfWeYVs#qD{u77=feMCe=#KgqQ%ggNS z?EnA&d0{!yu~c9^AjGFo(7j^Gqap9cXf_}O)P^F^RT>2V08l6pV=xM5JSYFcht!~0 zm`N4Jd^WmqG{c`?n>i7jW*Yzh|FE#IfkYKB6av%J)8*ym;Nalc*x2IY;@aBU*Vot1 z&d%@e@Amfg)z#I<$H(O4gwvss6?!+tpET2q@<+%{rw^$B0M}isHmvy?CiR_x^Pq?MMXuV zgCS8-QE5p8j*gC6K^9g!17ArQd|oY>n3$lTpinvp=;-KZOBGBk0eDgdQYHkFWH#Wv zU6V`@x0W;Qp+En{Q}obsl$4Zqc6NkxQcWlgb4wuq=8NgZXZ!p6|M87lCj|cWxZ9*- zzJx{KmPTeoC4)l=dPx|skT3t~c%o=6sC-M(msbDSYR!vC#d>h9&Kf?T7^ zs;r*c>e%Z1z_GH|&%(#En)?O_{;2KOq5uE~9!W$&RCr$Pmi2oTcNWHnKtd=Xmf0}vmr&EAX|!`^QKY>PvHxIZWUi5hWY@M`0M=zv4dk4^jm z+Kl;@$Iej^wv-IES5|F_1~}s$9UX2v^2dPh{9V8QJ<qoN>6sbtj_%c1$cR`EDDe z3is$Io=|9G)=ec>2VA9b<;M-UcCO`0o7-|aem&q_<7Ws^^^<58{yt^V zD9nw`&6aZuUWInY`UWSAgN_oNxZ(hyskG&t`xfu`xyCCa&hdVOw=ZrT;HRzw^^#uYNfw>Y8~JgE@SJ!AOh4Com>z9 z+tS#SdwzU0aHp@uF4Y<|z%cx5?G7`HuC9UBYY5QrX2P1wPx6I2CPINgOSM+ptkE?0 zX{2^7Zjh{*)!uevyJO(9YdRQ0MfK|`n^qlgU_NnnwreSDw~tKW_=rL(l`8BSt^4`- zRbAe488Zd|(4>>p)fM#$et2vJaCW)Pf4j}zCWnOTc(k6XRyt7rs}K!*U8=KgA#h^1091;XRl+0;dA z>S@K){W-749k@5<@izKLa2(pN1sF5BT1f-qO0U^jEu)KA3>90zJ(%#1&f(50{*DQ^ z-@PzC?`$-Pq5U>&J>Z%v!$lepi($gmCcTI*R{?=TJ9aklpQqllc22Z4i5nY7%m$6( z$cESP8zmPmT)5dp0vbHi&ahff7l~MMSO!y=vgZtT5|+_1CvMhhar`u-U#IWiz5eCR zrY4=P4C?#)oz7mpUQee30S$tCcr$h=ak0}HYM%Dvn(YZ2>vKkDzPzb}dWoc=sDIiy zNfYVmdIW$NOaY-hj=ha6jPz-LP4%|;aaPXV>tB_D8lc`YJ=x1*K>|I5hiJn&pML^>>GgUbKz5Z%E|((!z#@ZC9{q?K@B^h%NT_%@Sws9! zKjjtF>qW?eih%?Ox%>e^2n(gsi!xfFlB-S+<_rb-h)_>Q08)TKffzvG009vSK28m+>fop;%bfXUK%g&^kgoM0cC}#)}(jf+P1?LeHk^h-w z3>wuex9+UTmlX;Lm?gwmA&`Sqt0N56LjsqU5=(*D^%BHTas_hU0~2}?N}*=6BMg$j z<{*OdMXFgQ?99)UnP8#yd?4@_`e>;n9tNe__epnX99^9uz|pY54ZqaWRNv6A5sypA1OhI>HP!aqf_ebF0D!1UuFaOo3b_P}7Yy=Y5F#J| zfDmS;#gvl$FI{|Q5B3e({7OxJe#8VBLyx|v2&E0RC;MN_eeMxI+>dr=qo;#3fd~v0 z$JG6>{l(muu}26V4jYWZgcb@h>gg(B+O3E6Pd|k{S_wOAY_*wi+bSL(MoE<4Dt*xY zY4HCzdbZqVt3^5JydWlo)#bo^pJFxGdXJ5aZ7E^o)*-yZ} zlM-IL+*3?x|M5-4hUlokju>;p}@K*QD&1}IGDP?nxjp!C2%dpdMl zXz6L8Y+dNE6=)KmgpjZ#WOK-FJ8`_*lB~sAENh$l{o(gff-C%S9QkmT zl_MG+fW-s^gMR$^nSb0kJnOM982)4FdG$}LXuiSazP%IpFwKcaQH57+q++>tZoPf!b zDkeR&?2=cGcDYdluxiyROE}STEf;V)E0Bo}AQn%ss+mDzFomIH?>Db&XvonTkHOE1 z-`xC{$_1yI5=tQ&^dTqTiJ0F5lf4j*awq0bF1_G`=YIU&(JVb`07^r@`s!dZQdtn(S%s(I7H*Lw3)=Ytd3Bm3b6u1jflo>eh zi94@4Z8S@d3IK*UPw&1HIAK*~C7DLnd?42ApQa+j%8EQpY&1MW#P;hH!HLnfOl zNC&URC_bYCz=On1>7kf5o!wrb@klhH@$8?dn1RI|||@O#2DMzih_0buBh zd)gLL{R{2+C@pbn^TuM)PnZB748{huka)=@=Z}lhCHw`^xqBnVjjx5Ps!E)4i2&e3)uejF`}>fw*>{09+>_O(DLF86PJpDK63+Aj>*ga*ZGe^aGF&%^)o15%=xP ztFErTB6se$x2#;b@^X1}G+)Ei$?kVznLIV?>}ye2H3ueR8W0nUM3NZjZAC&%($n4y zlf{98@=8(rYP9Xx2BebM-5ypQt$y@$28#>hk^g@3=1U%t#kFuH{Gjir0&vemCoD)s zd&e{0GyIiF{O4%q0OX{>cnW$bWJbs~ebOdDy;j6M_SA6y}>G{{RNPZ3y-C!XfrldByvcqn6 zX5vA#Hol9^Yt|#s(+0EEE`n!ZwE%X94aMW9p~zhWq>~7Gx{*mHv2JrSEY?C;a;->P z@?fy#qyDssXx_XZruN>4?z-xXt7JK&(D2tVTsow%N;1E_p72)&hmzV8s=v){*UC}J z0SHVel+fyj{v;$TWLs;ymrMhJK%`Qs%6sp<_eE-h_Tb1ZEZX2OY#ik8UA$jSG)j4(h_ze@cH@?k0r9_ zI;fnMJ41ixZgh5bz+f=IXf(oNv1q)!y!?v4z5L?aPd@qREDoY+{L7c;o#af$&a56+ zfD&ghYUZAfq@>#Ma44M|=+2muL4<=rIICyEXe~uN*nzY%KpA8|k`}{|i`flzT8iwb zs>behYq4d0JL)Fnqq4%9sh?AUReQP&3!Mck#3T=#q%3X_8u7bmTw`I&-fmI5#6iz# z|NG^1db|9f{U7vDD)a+(@e9US8nzq*`uqEbHGm)}rC_t!P&cvu^!oa_jc>g1#@#(z z)<1pYxwBWA3X4>Z=y=n68_~OaEvg$9AQTK5x;p!nt<;Um$+O{W`w&B7ezsEa_<J*pL>=QeS^mU_c|32(#YJsOWsyV+y?cb0p(S{Y-Od98pQVIsq0-8ZiP7cgw zGsyGv^Ch(|xu>MzyyD!PWPa%cH(DC^11gCRH*|{A??Z*V1jj>OcfCiWw+%pllN7 zND%hzZN^E?j(I^(6p?@jWfcW*l$N5>mO=OK-3TYlm@s#aIKe#hdxl`nNg)#Q!MA4v z94dr7e@DhIpaeR7sG3*@!;l}I{W}r$c1fP##0lq3$MRMCq2hqUWmWCF`q42E%gmZl zr={zM1>nt2$3}Be;UI;Gi??sx*M~K$H(+aHr*`^mKa_0tVoi8!?g1eg3C4}9(z+?7 zkjZ2;A3)&=2D#hig0~Oo?(pFEPp(B%PaI*d53QX6yzr0hsFNFBA|6NSxLT+IA9{DT ziUt|r5!H^Rb6~BVs9Ji1D64ZJ-|0f-#Clk)3YKEIv>B8{fF|tnh4I3>t;yCMeQC4R zd`IhmDu3*MRzJ#(9TtGEfBpU`wN(o&k%3~Qa|$HgOh8lnSOVF$uZKTPc;vxgwGL;C z#g&thmzT$Npp+UWnuAhG1EaLO0u#<%hWMmYaPj;Js4vN&qSl3~2^BbbY85_Q@jL=; zO_C3^pt!Oq<8&9G>6N!Koh?0R-Q9ttrweCad=`qUrXXML1#c}r9qotVcr?nX42`jHlC-il+w!CKW6at-9iZ1w$6{;-g|D776EkMaR0M#+lUP>j00^94DWz$JfDM|% zS&Nrp_Ql^peCnlQ$39$nUOft&1?YbBE%a`B52-{%MLiy@Ua<+a^`#O`OsJn#sUngg zrc!C-I4s!L9>lnbl^E>o!Tt~SBOzJoJx^{Och+4m8-Ka{?G9~&SwABJ;Pd%T9g_EL z+@y2PjhJ>~?O?UD8o7DZpw}lw;Y2KL(x^{ttkV}oWH1SD!hthRuE&z={!@~bw6;_# zC8sAu00;!<pJnmXDkg1FYryBP=vzLNl2MWz-*5c_otAK0r~Qtz+U45 zPkzDDdy$))tIbEDlcKsxDXq>j+jPY{LFIt!Kgz!#>74f*jjLU9Z zyRt2O;f|#B=dOwFXP)}7`;N75x30YNzh0l+u;iYFOMkuck&7RE>9Qq{zB%=sbvv7W zyJk(dOg$uY*zbq{u=l{gfMju60it*Ep2ekEXzOqlC<<*WC}t`FG&b zWw)Z_tXok%zV_7b{pe>uH@HvPa^=rn{MH{|d+)*9|Fr6Y7hijGr;JGn>EG#?1#Afk@s-rO+UhSe)t5gyX`la^_9h% z;M_b{Q%VVV2CWV9p(#*!f}oQ$AN1vO0>MUtQC40Kt3(!uBu%_jm6es%&zm>*smC9G z{Lxi%Uy*)Ep)r3ABaM{w)tpQw5aDIR@7J`Tr>6&jKtQwW>PZda7cPZ!+%!y>bsmZ< zCL>2OJZ_kqS4wGuBkRL^hY$tf^7pOKVO8er_lI>FS5ZCoc$-Uv;dI`!Y;@p$8X z_uY3E`yGys)IK5rU0q#60s=K4LoEmd{F?C8262$k9V9nnHs@&ZoWgUXxXWD z0v}4cX0Tl;H9Um#kT{P{oR{m;#}pJ4)PMQQr^|KXjk|{j9c5ue0A%9Z2L{4&k@2gT zTs#DXOfVQAAeuRNB~ughwNo~k2!P=eAaEbtv`JE4rIdE6th4=4qL36`CtV|yQo~(2 z)-2AEoO9|RP#a7p<2~88%i%$zD2xceIp>`7?Docoz9fEN2Z4x2V**4>10fU&2{8Q{ z5PmTaZrUUua6|g$bWXuYCINwM6pZ!ked(vKw{bqb%>H^==SnFJOs+>QATKB=gtN?b zy3<*+cGd|7*C4S>5OiW2LC}fyY+`>B+sHW|*CiM(SB081Y2uT7;lg(e z>~kbKEC3w1bm`9`x8HvI1tQ>5@e6?gF$E((l1bOI>z4KUM*S(SekF(hPX+B zK+cWoAdoAiw0@8epDT4hwFv@Anzb*1AZeAXAC6&FDW&-z&d)U=ACnwHRaI5xNhh83 z2E(N^9rima066-^7ngTY8+L8m`T#>>B9YY0fF{9k85M0H5ZT(m4H=CFEh{uiV#B&Y zk|L!POrjMmlQ@4i@zg0alP9(l5Y}1FCeFcm*~WQDT!Wyq&1$v4F{l zHEIBqQd&xR&rk0EfvEi=vHu;^25JK7P;HPta)V3ADI2vMft%unbtzbV=N!n>ClD-?C_IT^ zP(%1!CqCDyPyS}GY13x4a^*@iH#ZyQz|MH+u0PJ!pX=P97skT7man{f=gysrBtz7+ zAu7IsKnU`hdC(;28wf}ukwbu1>gHFg?-J`(`H-MBH){?bdUQ=yhK_wV1Yh0Bq&fk4O!$c-+p znS@1NkJA(=C^-cu0IZX^PjV8=Bnn4jnLtnrbRxJUuh)a^+qYx&>eZ>Hrly007hncC z_E7pv0B|ybaN})1?V*E|2(VOu$P5l1h!leS$EkDxLAkffHCy8xM-9-0XPF>SV4brM z>jZ|UOHQKDRDFV>6Sc0ry)CnO^A?_ZiYia@ll3``md0y^5q>^10NHagT)JG2IfC{M zAu)pi$snVWD;&rh=q#xT)Cis!1=qEKWeP~42?B|Aof8BK%=I`{=REb@^7i=cw^yr8 zn>K0oPQgj+qf;~*&C|=-{Bs3>6JL4d4O{6TTbuVhKuuusBpX(`@Ujt2H3_xIIEj5lBQ>*=_2u=MEn+Ds z4Y56&K6e20$r&!&+uIj)bab>Fc)K*H-648Vz{d#=#(MKv<<#pjXhD6~>If>}q8@6uU#ahU8A6YlGkKKS&#lMuWU$&C!x1o-zR-86C70wAY|_uqeCQ+bv>@|uny5&#NL zqTo7F_@Z3HwO!uOr@k!trvX5TUV3RoE5qfkUAu0O4T2`YQ{78ax4FZq}dDd1sowE<8_UxzAKNSFd(de2rzbh%R%$A(tLuvzo zpf-q!fM(I%-Hp9_TR>nKMYe7G2rE{s0EMUEB!WX>N&373s;2V$yaT6=YJ!}imbpn?G@x7U+O=EJ+f#57L88E% zgIwB%Pkr0|uA}-#Y0mM513+zHxO5nNr;4C|6QME!h-8r=jl|n)ui!*bjdRl^>Bl6; zcS^N!$@UP!pw{eDedTN7mI2=Yk(*+kz7*=^k6+Zhcbld?zVJH~2 zLBiq<@@^p|LTjfk@&8$dx6h*ToIjh6O91o@QX6K}+Q+%w?td+|+hd+w#rTX4=zI_?2rl;B2>6&?2g94o=~dH){(9f|*|{Il-+e*pjh n|Nm(?1QY-O00v1!K~w_(ZT>wq{4bXG00000NkvXXu0mjf&uUY# literal 2696 zcmV;33U~F1P)@g zo}Qk#xVXByy0nfbj$kC3XFW9+0Y(`HnKuiGiHWdY7?4^W8yg#{s;Z8Tju;pih=_$HS8s1`i-&u|tW@~;_-R=x&9Ym1I2FvXfWeYVs#qD{u77=feMCe=#KgqQ%ggNS z?EnA&d0{!yu~c9^AjGFo(7j^Gqap9cXf_}O)P^F^RT>2V08l6pV=xM5JSYFcht!~0 zm`N4Jd^WmqG{c`?n>i7jW*Yzh|FE#IfkYKB6av%J)8*ym;Nalc*x2IY;@aBU*Vot1 z&d%@e@Amfg)z#I<$H(O4gwvss6?!+tpET2q@<+%{rw^$B0M}isHmvy?CiR_x^Pq?MMXuV zgCS8-QE5p8j*gC6K^9g!17ArQd|oY>n3$lTpinvp=;-KZOBGBk0eDgdQYHkFWH#Wv zU6V`@x0W;Qp+En{Q}obsl$4Zqc6NkxQcWlgb4wuq=8NgZXZ!p6|M87lCj|cWxZ9*- zzJx{KmPTeoC4)l=dPx|skT3t~c%o=6sC-M(msbDSYR!vC#d>h9&Kf?T7^ zs;r*c>e%Z1z_GH|&%(#En)?O_{;2KOq5uE~9!W$&RCr$Pmi2oTcNWHnKtd=Xmf0}vmr&EAX|!`^QKY>PvHxIZWUi5hWY@M`0M=zv4dk4^jm z+Kl;@$Iej^wv-IES5|F_1~}s$9UX2v^2dPh{9V8QJ<qoN>6sbtj_%c1$cR`EDDe z3is$Io=|9G)=ec>2VA9b<;M-UcCO`0o7-|aem&q_<7Ws^^^<58{yt^V zD9nw`&6aZuUWInY`UWSAgN_oNxZ(hyskG&t`xfu`xyCCa&hdVOw=ZrT;HRzw^^#uYNfw>Y8~JgE@SJ!AOh4Com>z9 z+tS#SdwzU0aHp@uF4Y<|z%cx5?G7`HuC9UBYY5QrX2P1wPx6I2CPINgOSM+ptkE?0 zX{2^7Zjh{*)!uevyJO(9YdRQ0MfK|`n^qlgU_NnnwreSDw~tKW_=rL(l`8BSt^4`- zRbAe488Zd|(4>>p)fM#$et2vJaCW)Pf4j}zCWnOTc(k6XRyt7rs}K!*U8=KgA#h^1091;XRl+0;dA z>S@K){W-749k@5<@izKLa2(pN1sF5BT1f-qO0U^jEu)KA3>90zJ(%#1&f(50{*DQ^ z-@PzC?`$-Pq5U>&J>Z%v!$lepi($gmCcTI*R{?=TJ9aklpQqllc22Z4i5nY7%m$6( z$cESP8zmPmT)5dp0vbHi&ahff7l~MMSO!y=vgZtT5|+_1CvMhhar`u-U#IWiz5eCR zrY4=P4C?#)oz7mpUQee30S$tCcr$h=ak0}HYM%Dvn(YZ2>vKkDzPzb}dWoc=sDIiy zNfYVmdIW$NOaY-hj=ha6jPz-LP4%|;aaPXV>tB_D8lc`YJ=x1*K>|I5hiJn&pML^>>GgUbKz5Z%E|((!z#@ZC9{q?K@B^h%NT_%@Sws9! zKjjtF>qW?eih%?Ox%>e^2n(gsi!xfFlB-S+<_rb-h)_>Q08)TKffzvG009vSK28m+>fop;%bfXUK%g&^kgoM0cC}#)}(jf+P1?LeHk^h-w z3>wuex9+UTmlX;Lm?gwmA&`Sqt0N56LjsqU5=(*D^%BHTas_hU0~2}?N}*=6BMg$j z<{*OdMXFgQ?99)UnP8#yd?4@_`e>;n9tNe__epnX99^9uz|pY54ZqaWRNv6A5sypA1OhI>HP!aqf_ebF0D!1UuFaOo3b_P}7Yy=Y5F#J| zfDmS;#gvl$FI{|Q5B3e({7OxJe#8VBLyx|v2&E0RC;MN_eeMxI+>dr=qo;#3fd~v0 z$JG6>{l(muu}26V4jYWZgcb@h>gg(B+O3E6Pd|k{S_wOAY_*wi+bSL(MoE<4Dt*xY zY4HCzdbZqVt3^5JydWlo)#bo^pJFxGdXJ5aZ7E^o)*-yZ} zlM-IL+*3?x|M5-4= 2.0.55", diff --git a/Bio_Industries_2/locale/en/recipe-name.cfg b/Bio_Industries_2/locale/en/recipe-name.cfg index fec772c..7563a82 100644 --- a/Bio_Industries_2/locale/en/recipe-name.cfg +++ b/Bio_Industries_2/locale/en/recipe-name.cfg @@ -116,7 +116,7 @@ bi-sulfur-angels=Bio-__ITEM__sulfur__ ## angelsrefining, BioTech, Krastorio/Krastorio2 bi-sand=__ITEM__sand__ from __ITEM__stone-crushed__ ## bobelectronics -bi-press-wood=Pressed wood +bi-press-wood=Wooden board ## Industrial Revolution bi-crushed-stone-1_IR=__ITEM__gravel__ from __ITEM__stone__ bi-crushed-stone-2_IR=__ITEM__gravel__ from __ITEM__concrete__ diff --git a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua index 89e09f3..488b49d 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua @@ -330,11 +330,11 @@ if data.raw.item["bob-wooden-board"] and mods["bobelectronics"] then type = "recipe", name = "bi-press-wood", localised_name = {"recipe-name.bi-press-wood"}, - icon = ICONPATH_BA .. "bi_wooden_board.png", + icon = ICONPATH_BA .. "bi_wooden_board_shiny.png", icon_size = 64, icons = { { - icon = ICONPATH_BA .. "bi_wooden_board.png", + icon = ICONPATH_BA .. "bi_wooden_board_shiny.png", icon_size = 64, } }, @@ -361,10 +361,7 @@ if data.raw.item["bob-wooden-board"] and mods["bobelectronics"] then }) thxbob.lib.tech.add_recipe_unlock("electronics", "bi-press-wood") - if mods["ShinyBobGFX"] or mods["ShinyBobGFX_Continued"] then - data.raw["recipe"]["bi-press-wood"].icon = ICONPATH_BA .. "bi_wooden_board_shiny.png" - data.raw["recipe"]["bi-press-wood"].icon_size = 64 - end + end diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua index 069bfcf..fd8ee4e 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua @@ -4,10 +4,107 @@ local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local ENTITYPATH_BIO = BioInd.modRoot .. "/graphics/entities/" local REMNANTSPATH = BioInd.modRoot .. "/graphics/entities/remnants/" -require("prototypes.Bio_Farm.pipeConnectors") + require("util") +-- Pipes +------------------------------------------------------------------------------------ +-- Bio farm -- +------------------------------------------------------------------------------------ + +function biofarmpipepictures() + return + { + north = { + filename = "__core__/graphics/empty.png", + priority = "low", + width = 1, + height = 1, + }, + east = + { + filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/bio_farm-pipe-E.png", + priority = "extra-high", + width = 42, + height = 76, + shift = util.by_pixel(-24.5, 1), + scale = 0.5 + + }, + south = + { + filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/bio_farm-pipe-S.png", + priority = "extra-high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5 + + }, + west = + { + filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/bio_farm-pipe-W.png", + priority = "extra-high", + width = 39, + height = 73, + shift = util.by_pixel(25.75, 1.25), + scale = 0.5 + + } + } +end + +------------------------------------------------------------------------------------ +-- Bio Greenhouse -- +------------------------------------------------------------------------------------ + +function biogreenhousepipepictures() + return + { + north = { + filename = ENTITYPATH_BIO .. "bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-N-exp.png", + priority = "extra-high", + width = 171, + height = 152, + shift = util.by_pixel(2.25, 13.5), + scale = 0.5 + }, + east = + { + filename = ENTITYPATH_BIO .. "bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-E.png", + priority = "extra-high", + width = 42, + height = 76, + shift = util.by_pixel(-24.5, 1), + scale = 0.5 + + }, + south = + { + filename = ENTITYPATH_BIO .. "bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-S.png", + priority = "extra-high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5 + + }, + west = + { + filename = ENTITYPATH_BIO .. "bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-W.png", + priority = "extra-high", + width = 39, + height = 73, + shift = util.by_pixel(25.75, 1.25), + scale = 0.5 + + } + } +end + + + inv_extension2 = { filename = ENTITYPATH_BIO .. "bio_terraformer/arboretum.png", priority = "high", @@ -146,24 +243,17 @@ data:extend({ { type = "assembling-machine", name = "bi-bio-farm", - icon = ICONPATH_E .. "bio_Farm_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_Farm_Icon.png", - icon_size = 64, - } - }, + icons = {{ icon = ICONPATH_E .. "bio_Farm_Icon.png", icon_size = 64, }}, flags = { "placeable-neutral", "placeable-player", "player-creation" }, minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-farm" }, - max_health = 250, + max_health = 350, corpse = "bi-bio-farm-remnant", dying_explosion = "medium-explosion", resistances = { { type = "fire", percent = 70 } }, fluid_boxes = { { production_type = "input", - pipe_picture = assembler3pipepictures(), + pipe_picture = biofarmpipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -171,7 +261,7 @@ data:extend({ }, { production_type = "input", - pipe_picture = assembler3pipepictures(), + pipe_picture = biofarmpipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -179,10 +269,8 @@ data:extend({ }, }, fluid_boxes_off_when_no_fluid_recipe = true, - collision_box = { { -4.2, -4.2 }, { 4.2, 4.2 } }, selection_box = { { -4.5, -4.5 }, { 4.5, 4.5 } }, - graphics_set = { animation = { layers = { @@ -209,8 +297,9 @@ data:extend({ }, working_visualisations = { { - light = { intensity = 1.2, size = 9 }, + light = { intensity = 1.4, size = 10 }, effect = "flicker", + apply_recipe_tint = "primary", constant_speed = true, fadeout = true, animation = { @@ -226,7 +315,6 @@ data:extend({ } } }, - crafting_categories = { "biofarm-mod-farm" }, crafting_speed = 1, energy_source = { @@ -290,14 +378,7 @@ data:extend({ { type = "assembling-machine", name = "bi-bio-greenhouse", - icon = ICONPATH_E .. "bio_greenhouse.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_greenhouse.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_E .. "bio_greenhouse.png", icon_size = 64, } }, flags = { "placeable-neutral", "placeable-player", "player-creation" }, minable = { hardness = 0.2, mining_time = 0.25, result = "bi-bio-greenhouse" }, collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, @@ -324,7 +405,7 @@ data:extend({ fluid_boxes = { { production_type = "input", - pipe_picture = assembler3pipepictures(), + pipe_picture = biogreenhousepipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -358,6 +439,9 @@ data:extend({ working_visualisations = { { light = { intensity = 1, size = 6 }, + draw_as_light = true, + effect = "flicker", + apply_recipe_tint = "primary", animation = { filename = ENTITYPATH_BIO .. "bio_greenhouse/bio_greenhouse_light_anim.png", width = 192, @@ -366,7 +450,6 @@ data:extend({ scale = 0.5, animation_speed = 0.1, shift = { 0, -0.5 }, - draw_as_light = true } } } @@ -413,14 +496,7 @@ data:extend({ { type = "assembling-machine", name = "bi-cokery", - icon = ICONPATH_E .. "cokery.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "cokery.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_E .. "cokery.png", icon_size = 64, } }, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! se_allow_in_space = true, @@ -435,33 +511,6 @@ data:extend({ module_specification = { module_slots = 2 }, allowed_effects = { "consumption", "speed", "pollution" }, graphics_set = { - -- Idle animation (1 frame) - --[[ - idle_animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_cokery/cokery_idle.png", - priority = "high", - width = 256, - height = 256, - frame_count = 1, - repeat_count = 16, -- match working animation - shift = { 0.5, -0.5 }, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_cokery/cokery_shadow.png", - width = 334, - height = 126, - frame_count = 1, - repeat_count = 16, -- match working animation - draw_as_shadow = true, - shift = { 1.5, -0.5 }, - scale = 0.5 - } - } - }, - ]] -- Working animation (16 frames) animation = { layers = { @@ -940,14 +989,7 @@ data:extend({ name = "bi-arboretum-area", localised_name = { "entity-name.bi-arboretum" }, localised_description = { "entity-description.bi-arboretum" }, - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_E .. "arboretum_Icon.png", icon_size = 64, }}, flags = { "not-deconstructable", "not-on-map", "placeable-off-grid", "not-repairable" }, open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, @@ -991,14 +1033,7 @@ data:extend({ { type = "assembling-machine", name = "bi-arboretum", - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_E .. "arboretum_Icon.png", icon_size = 64, }}, flags = { "placeable-neutral", "placeable-player", "player-creation" }, placeable_by = { item = "bi-arboretum-area", count = 1 }, -- Fixes that entity couldn't be blueprinted minable = { hardness = 0.2, mining_time = 0.5, result = "bi-arboretum-area" }, @@ -1009,7 +1044,7 @@ data:extend({ fluid_boxes = { { production_type = "input", - pipe_picture = assembler3pipepictures(), + --pipe_picture = assembler3pipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -1017,7 +1052,7 @@ data:extend({ }, { production_type = "input", - pipe_picture = assembler3pipepictures(), + --pipe_picture = assembler3pipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -1077,6 +1112,7 @@ data:extend({ close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, module_specification = {}, }, + --- Corpse { type = "corpse", diff --git a/Bio_Industries_2/prototypes/Bio_Farm/item.lua b/Bio_Industries_2/prototypes/Bio_Farm/item.lua index 94417fd..23f3026 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/item.lua @@ -11,20 +11,12 @@ data:extend( { type = "item", name = "bi-seed", - icon = ICONPATH .. "bio_seed.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_seed.png", - icon_size = 64, - } - }, - icon_mipmaps = 4, + icons = { {icon = ICONPATH .. "bio_seed.png", icon_size = 64, }}, pictures = { - { size = 64, filename = ICONPATHMIPS.."bio_seed_1.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."bio_seed_2.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."bio_seed_3.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."bio_seed_4.png", scale = 0.25 } + { size = 64, filename = ICONPATHMIPS.."bio_seed_1.png", scale = 0.25, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."bio_seed_2.png", scale = 0.25, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."bio_seed_3.png", scale = 0.25, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."bio_seed_4.png", scale = 0.25, mipmap_count = 4 } }, category = "biofarm-mod-greenhouse", subgroup = "bio-bio-farm", @@ -32,7 +24,7 @@ data:extend( fuel_value = "0.5MJ", fuel_category = "chemical", stack_size= 800, - weight = 0.1 * kg, + weight = 10 * kg, }, ---- Seedling @@ -41,25 +33,17 @@ data:extend( name = "seedling", localised_name = {"entity-name.seedling"}, localised_description = {"entity-description.seedling"}, - icon = ICONPATH .. "Seedling.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling.png", - icon_size = 64, - } - }, - icon_mipmaps = 9, + icons = { {icon = ICONPATH .. "Seedling.png", icon_size = 64, }}, pictures = { - { size = 64, filename = ICONPATHMIPS.."seedling_1.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_2.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_3.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_4.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_5.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_6.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_7.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_8.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_9.png", scale = 0.25 } + { size = 64, filename = ICONPATHMIPS.."seedling_1.png", scale = 0.25, mipmap_count = 9 }, + { size = 64, filename = ICONPATHMIPS.."seedling_2.png", scale = 0.25, mipmap_count = 9 }, + { size = 64, filename = ICONPATHMIPS.."seedling_3.png", scale = 0.25, mipmap_count = 9 }, + { size = 64, filename = ICONPATHMIPS.."seedling_4.png", scale = 0.25, mipmap_count = 9 }, + { size = 64, filename = ICONPATHMIPS.."seedling_5.png", scale = 0.25, mipmap_count = 9 }, + { size = 64, filename = ICONPATHMIPS.."seedling_6.png", scale = 0.25, mipmap_count = 9 }, + { size = 64, filename = ICONPATHMIPS.."seedling_7.png", scale = 0.25, mipmap_count = 9 }, + { size = 64, filename = ICONPATHMIPS.."seedling_8.png", scale = 0.25, mipmap_count = 9 }, + { size = 64, filename = ICONPATHMIPS.."seedling_9.png", scale = 0.25, mipmap_count = 9 } }, subgroup = "bio-bio-farm", order = "x[bi]-b[bi-seedling]", @@ -67,7 +51,7 @@ data:extend( fuel_value = "0.5MJ", fuel_category = "chemical", stack_size= 400, - weight = 0.2 * kg, + weight = 20 * kg, }, ----Bio Farm @@ -76,14 +60,7 @@ data:extend( name= "bi-bio-farm", localised_name = {"entity-name.bi-bio-farm"}, localised_description = {"entity-description.bi-bio-farm"}, - icon = ICONPATH_E .. "bio_Farm_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_Farm_Icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_Farm_Icon.png", icon_size = 64, }}, subgroup = "production-machine", order = "x[bi]-ab[bi-bio-farm]", place_result = "bi-bio-farm", @@ -97,14 +74,7 @@ data:extend( name= "bi-bio-greenhouse", localised_name = {"entity-name.bi-bio-greenhouse"}, localised_description = {"entity-description.bi-bio-greenhouse"}, - icon = ICONPATH_E .. "bio_greenhouse.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_greenhouse.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_greenhouse.png", icon_size = 64, }}, subgroup = "production-machine", order = "x[bi]-aa[bi-bio-greenhouse]", place_result = "bi-bio-greenhouse", @@ -116,19 +86,12 @@ data:extend( { type = "item", name = "bi-cokery", - icon = ICONPATH_E .. "cokery.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "cokery.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "cokery.png", icon_size = 64, }}, subgroup = "production-machine", order = "x[bi]-b[bi-cokery]", place_result = "bi-cokery", stack_size = 10, - weight = 1 * kg, + weight = 100 * kg, }, --- Stone Crusher @@ -137,14 +100,7 @@ data:extend( name = "bi-stone-crusher", localised_name = {"entity-name.bi-stone-crusher"}, localised_description = {"entity-description.bi-stone-crusher"}, - icon = ICONPATH_E .. "stone_crusher.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "stone_crusher.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "stone_crusher.png", icon_size = 64, }}, subgroup = "production-machine", order = "x[bi]-c[bi-stone-crusher]", place_result = "bi-stone-crusher", @@ -156,47 +112,32 @@ data:extend( { type = "item", name = "bi-woodpulp", - icon = ICONPATH .. "woodpulp_64.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "woodpulp_64.png", - icon_size = 64, - } - }, - icon_mipmaps = 4, + icons = { {icon = ICONPATH .. "woodpulp_64.png", icon_size = 64, }}, pictures = { - { size = 64, filename = ICONPATHMIPS.."woodpulp_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."woodpulp_1.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."woodpulp_2.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."woodpulp_3.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."woodpulp_4.png", scale = 0.2, mipmap_count = 4 } }, fuel_value = "1MJ", fuel_category = "chemical", subgroup = "raw-material", order = "a-b[bi-woodpulp]", stack_size = 800, - weight = 0.15 * kg, + weight = 15 * kg, }, --- Wood Bricks { type = "item", name = "wood-bricks", - icon = ICONPATH .. "Fuel_Brick.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "Fuel_Brick.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "Fuel_Brick.png", icon_size = 64, }}, subgroup = "bio-bio-farm-raw", order = "a[bi]-a-bx[bi-woodbrick]", fuel_category = "chemical", fuel_value = "160MJ", stack_size = 200, - weight = 4 * kg, + weight = 40 * kg, }, @@ -204,66 +145,43 @@ data:extend( { type = "item", name = "bi-ash", - icon = ICONPATH .. "ash.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "ash.png", - icon_size = 64, - } - }, - icon_mipmaps = 4, + icons = { {icon = ICONPATH .. "ash.png", icon_size = 64, }}, pictures = { - { size = 64, filename = ICONPATHMIPS.."ash_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."ash_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."ash_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."ash_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."ash_1.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."ash_2.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."ash_3.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."ash_4.png", scale = 0.2, mipmap_count = 4 } }, subgroup = "raw-material", order = "a[bi]-a-b[bi-ash]", stack_size = 400, - weight = 0.125 * kg, + weight = 12 * kg, }, --- Charcoal { type = "item", name = "wood-charcoal", - icon = ICONPATH .. "charcoal.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "charcoal.png", - icon_size = 64, - } - }, - icon_mipmaps = 4, + icons = { {icon = ICONPATH .. "charcoal.png", icon_size = 64, }}, pictures = { - { size = 64, filename = ICONPATHMIPS.."charcoal_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."charcoal_1.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."charcoal_2.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."charcoal_3.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."charcoal_4.png", scale = 0.2, mipmap_count = 4 } }, fuel_value = "6MJ", fuel_category = "chemical", subgroup = "raw-material", order = "a[bi]-a-c[charcoal]", stack_size = 400, - weight = 1 * kg, + weight = 10 * kg, }, --- Coke Coal / Pellet Coke for Angels { type = "item", name = "pellet-coke", - icon = ICONPATH .. "coke-coal.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "coke-coal.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "coke-coal.png", icon_size = 64, }}, fuel_value = "28MJ", fuel_category = "chemical", fuel_acceleration_multiplier = 1.2, @@ -271,7 +189,7 @@ data:extend( subgroup = "raw-material", order = "a[bi]-a-g[bi-coke-coal]", stack_size = 400, - weight = 2.5 * kg, + weight = 25 * kg, }, @@ -279,25 +197,17 @@ data:extend( { type = "item", name = "stone-crushed", - icon = ICONPATH .. "crushed-stone.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "crushed-stone.png", - icon_size = 64, - } - }, - icon_mipmaps = 4, + icons = { {icon = ICONPATH .. "crushed-stone.png", icon_size = 64, }}, pictures = { - { size = 64, filename = ICONPATHMIPS.."crush_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."crush_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."crush_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."crush_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."crush_1.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."crush_2.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."crush_3.png", scale = 0.2, mipmap_count = 4 }, + { size = 64, filename = ICONPATHMIPS.."crush_4.png", scale = 0.2, mipmap_count = 4 } }, subgroup = "raw-material", order = "a[bi]-a-z[stone-crushed]", stack_size = 400, - weight = 1 * kg, + weight = 20 * kg, }, @@ -305,21 +215,14 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-basic", - icon = ICONPATH_W .. "seed_bomb_icon_b.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "seed_bomb_icon_b.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_W .. "seed_bomb_icon_b.png", icon_size = 64, }}, ammo_category = "rocket", ammo_type = { - range_modifier = 3, - cooldown_modifier = 3, - target_type = "position", - category = "rocket", - action = { + range_modifier = 3, + cooldown_modifier = 3, + target_type = "position", + category = "rocket", + action = { type = "direct", action_delivery = { type = "projectile", @@ -331,7 +234,7 @@ data:extend( subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-a", stack_size = 10, - weight = 5 * kg, + weight = 50 * kg, }, @@ -339,21 +242,14 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-standard", - icon = ICONPATH_W .. "seed_bomb_icon_s.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "seed_bomb_icon_s.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_W .. "seed_bomb_icon_s.png", icon_size = 64, }}, ammo_category = "rocket", ammo_type = { - range_modifier = 3, - cooldown_modifier = 3, - target_type = "position", - category = "rocket", - action = { + range_modifier = 4, + cooldown_modifier = 3, + target_type = "position", + category = "rocket", + action = { type = "direct", action_delivery = { type = "projectile", @@ -365,7 +261,7 @@ data:extend( subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-b", stack_size = 10, - weight = 5 * kg, + weight = 50 * kg, }, @@ -373,21 +269,14 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-advanced", - icon = ICONPATH_W .. "seed_bomb_icon_a.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "seed_bomb_icon_a.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_W .. "seed_bomb_icon_a.png", icon_size = 64, }}, ammo_category = "rocket", ammo_type = { - range_modifier = 3, - cooldown_modifier = 3, - target_type = "position", - category = "rocket", - action = { + range_modifier = 5, + cooldown_modifier = 3, + target_type = "position", + category = "rocket", + action = { type = "direct", action_delivery = { type = "projectile", @@ -399,40 +288,26 @@ data:extend( subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-c", stack_size = 10, - weight = 5 * kg, + weight = 50 * kg, }, --- Arboretum (Entity) { type= "item", name= "bi-arboretum-area", - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "arboretum_Icon.png", icon_size = 64, }}, subgroup = "production-machine", order = "x[bi]-a[bi-arboretum]", place_result = "bi-arboretum-area", stack_size= 10, - weight = 400 * kg, + weight = 500 * kg, }, --- Arboretum Hidden Recipe { type = "item", name = "bi-arboretum-r1", - icon = ICONPATH .. "Seedling_b.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling_b.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "Seedling_b.png", icon_size = 64, }}, hidden = true, subgroup = "terrain", order = "bi-arboretum-r1", @@ -443,14 +318,7 @@ data:extend( { type = "item", name = "bi-arboretum-r2", - icon = ICONPATH .. "bi_change_1.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_change_1.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bi_change_1.png", icon_size = 64, }}, hidden = true, subgroup = "terrain", order = "bi-arboretum-r2", @@ -461,14 +329,7 @@ data:extend( { type = "item", name = "bi-arboretum-r3", - icon = ICONPATH .. "bi_change_2.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_change_2.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bi_change_2.png", icon_size = 64, }}, hidden = true, subgroup = "terrain", order = "bi-arboretum-r3", @@ -479,14 +340,7 @@ data:extend( { type = "item", name = "bi-arboretum-r4", - icon = ICONPATH .. "bi_change_plant_1.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_change_plant_1.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bi_change_plant_1.png", icon_size = 64, }}, hidden = true, subgroup = "terrain", order = "bi-arboretum-r4", @@ -497,15 +351,8 @@ data:extend( { type = "item", name = "bi-arboretum-r5", - icon = ICONPATH .. "bi_change_plant_2.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_change_plant_2.png", - icon_size = 64, - } - }, - hidden = true, + icons = { {icon = ICONPATH .. "bi_change_plant_2.png", icon_size = 64, }}, + hidden = true, subgroup = "terrain", order = "bi-arboretum-r5", stack_size = 1 @@ -519,36 +366,22 @@ data:extend( { type = "item", name = "fertilizer", - icon = ICONPATH .. "fertilizer.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "fertilizer.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "fertilizer.png", icon_size = 64, }}, subgroup = "intermediate-product", order = "b[fertilizer]", stack_size = 200, - weight = 5 * kg, + weight = 40 * kg, }, --- Adv fertilizer { type = "item", name = "bi-adv-fertilizer", - icon = ICONPATH .. "fertilizer_advanced.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "fertilizer_advanced.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "fertilizer_advanced.png", icon_size = 64, }}, subgroup = "intermediate-product", order = "b[fertilizer]-b[bi-adv-fertilizer]", stack_size = 200, - weight = 5 * kg, + weight = 40 * kg, }, }) diff --git a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua deleted file mode 100644 index 92a79bd..0000000 --- a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua +++ /dev/null @@ -1,342 +0,0 @@ -local BioInd = require('common')('Bio_Industries_2') - -local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ENTITYPATH_BIO = "__Bio_Industries_2__/graphics/entities/" - - -function assembler2pipepicturesCokery() - return - { - north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = util.by_pixel(2.25, 13.5), - scale = 0.5, - }, - east = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png", - priority = "extra-high", - width = 42, - height = 76, - shift = util.by_pixel(-24.5, 1), - scale = 0.5, - }, - south = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = util.by_pixel(0, -31.25), - scale = 0.5, - }, - west = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png", - priority = "extra-high", - width = 39, - height = 73, - shift = util.by_pixel(25.75, 1.25), - scale = 0.5, - } - } -end - - -function assembler2pipepicturesCokery() - return - { - north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = {0.09375, 0.4375} - }, - east = { - filename = "__base__/graphics/entity/assembling-machine-2/pipe-east.png", - priority = "extra-high", - width = 41, - height = 40, - shift = {-0.71875, 0} - }, - south = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = {0.0625, -1} - }, - west = { - filename = "__base__/graphics/entity/assembling-machine-2/pipe-west.png", - priority = "extra-high", - width = 41, - height = 40, - shift = {0.78125, 0.03125} - } - } -end - - -function pipecoverspicturesCokery() - return { - north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - scale = 0.5 - }, - east = { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - south = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - scale = 0.5 - }, - west = { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - } - } -end - - -function assembler2pipepicturesBioreactor() - return - { - north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 71, - height = 38, - shift = util.by_pixel(2.25, 13.5), - scale = 0.5, - }, - east = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png", - priority = "extra-high", - width = 42, - height = 76, - shift = util.by_pixel(-24.5, 1), - scale = 0.5, - }, - south = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-S.png", - priority = "extra-high", - width = 88, - height = 61, - shift = util.by_pixel(0, -31.25), - scale = 0.5, - }, - west = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png", - priority = "extra-high", - width = 39, - height = 73, - shift = util.by_pixel(25.75, 1.25), - scale = 0.5, - } - } -end - - - -function pipecoverspicturesBioreactor() - return { - north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - scale = 0.5 - }, - east = { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - south = { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - west = { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - } - } - -end - - -function BioFarm_Pipe_Connectors_Left() - return - { - north = { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png", - priority = "extra-high", - width = 51, - height = 35, - shift = {0.25, 1}, - }, - east = { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png", - priority = "extra-high", - width = 18, - height = 48, - shift = {-1, -0.25}, - }, - south = { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/Bio_Farm-pipe-S_l.png", - priority = "extra-high", - width = 49, - height = 25, - shift = {0.5, -1}, - }, - west = { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png", - priority = "extra-high", - width = 16, - height = 51, - shift = {0.5, 0.5}, - } - } -end - - -function bio_farm_pipe_pictures() - return - { - north = { - filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-N.png", - priority = "extra-high", - width = 71, - height = 38, - shift = util.by_pixel(2.25, 13.5), - scale = 0.5, - }, - east = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - }, - south = { - filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-S.png", - priority = "extra-high", - width = 88, - height = 61, - shift = util.by_pixel(0, -31.25), - scale = 0.5, - }, - west = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - } - } -end - -bio_farm_pipe_covers_pictures = function() - return { - north = { - layers = { - { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north-shadow.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5, - draw_as_shadow = true - }, - }, - }, - east = { - layers = { - { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", - priority = "extra-high", - width = 128, - height = 128, - shift = {-0.22, 0}, - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east-shadow.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5, - shift = {-0.22, 0}, - draw_as_shadow = true - }, - }, - }, - south = { - layers = { - { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south-shadow.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5, - draw_as_shadow = true - }, - }, - }, - west = { - layers = { - { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", - priority = "extra-high", - width = 128, - height = 128, - shift = {0.2, 0}, - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west-shadow.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5, - shift = {0.2, 0}, - draw_as_shadow = true - }, - }, - } - } -end \ No newline at end of file diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua index 1cb969a..b35cb7b 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua @@ -8,26 +8,63 @@ local REMNANTSPATH = BioInd.modRoot .. "/graphics/entities/remnants/" require("util") -require("prototypes.Bio_Fuel.pipeConnectors") +--require("prototypes.Bio_Fuel.pipeConnectors") -bio_boiler_tint = { r = 0.5, g = 0.5, b = 0.1, a = 0.7 } -- Changed for 0.18.29: We always want to make advanced fertilizer, so we need to -- unlock the bio-reactor and the most basic recipe for algae biomass even if -- BI.Settings.BI_Bio_Fuel has been turned off! + + +------------------------------------------------------------------------------------ +-- Bio reactor -- +------------------------------------------------------------------------------------ +-- Pipes +function assembler2pipepicturesBioreactor() + return { + north = { + filename = "__core__/graphics/empty.png", + priority = "low", + width = 1, + height = 1, + shift = util.by_pixel(2.5, 14), + }, + east = { + filename = ENTITYPATH_BIO .. "bio_reactor/pipes/bioreactor-pipe-e.png", + priority = "low", + width = 42, + height = 76, + shift = util.by_pixel(-24.5, 1), + scale = 0.5, + }, + south = { + filename = ENTITYPATH_BIO .. "bio_reactor/pipes/bioreactor-pipe-s.png", + priority = "low", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5, + }, + west = { + filename = ENTITYPATH_BIO .. "bio_reactor/pipes/bioreactor-pipe-w.png", + priority = "low", + width = 39, + height = 73, + shift = util.by_pixel(25.75, 1.25), + scale = 0.5, + }, + } +end + + + + data:extend({ -- BIO_REACTOR { type = "assembling-machine", name = "bi-bio-reactor", - icon = ICONPATH_E .. "bioreactor.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bioreactor.png", - icon_size = 64, - } - }, + icons = {{ icon = ICONPATH_E .. "bioreactor.png", icon_size = 64 }}, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! se_allow_in_space = true, @@ -35,105 +72,121 @@ data:extend({ minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-reactor" }, max_health = 100, corpse = "bi-bio-reactor-remnant", - fluid_boxes = { - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -1 } } } - }, - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.east, position = { 1, 0 } } } - }, - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.south, position = { 0, 1 } } } - }, - { - production_type = "output", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = 1, - pipe_connections = { { flow_direction = "output", direction = defines.direction.west, position = { -1, -1 } } } - }, - { - production_type = "output", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = 1, - pipe_connections = { { flow_direction = "output", direction = defines.direction.west, position = { -1, 1 } } } - }, - }, + fluid_boxes = { + { + production_type = "input", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_area = 10, + base_level = -1, + pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -1 } } }, + -- pipe_connections = {{ type = "input", position = {0, -2} }}, + render_layer = "higher-object-under", + }, + { + production_type = "input", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_area = 10, + base_level = -1, + pipe_connections = { { flow_direction = "input", direction = defines.direction.east, position = { 1, 0 } } }, + -- pipe_connections = {{ type = "input", position = {2, 0} }}, + render_layer = "higher-object-under", + }, + { + production_type = "input", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_area = 10, + base_level = -1, + pipe_connections = { { flow_direction = "input", direction = defines.direction.south, position = { 0, 1 } } }, + --pipe_connections = {{ type = "input", position = {0, 2} }}, + render_layer = "higher-object-under", + }, + { + production_type = "output", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_area = 10, + base_level = 1, + pipe_connections = { { flow_direction = "output", direction = defines.direction.west, position = { -1, -1 } } }, + --pipe_connections = {{ type = "output", position = {-2, -1} }}, + render_layer = "higher-object-under", + }, + { + production_type = "output", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_area = 10, + base_level = 1, + pipe_connections = { { flow_direction = "output", direction = defines.direction.west, position = { -1, 1 } } }, + --pipe_connections = {{ type = "output", position = {-2, 1} }}, + render_layer = "higher-object-under", + }, + + }, fluid_boxes_off_when_no_fluid_recipe = true, collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, - graphics_set = { - -- Idle animation (1 frame) - idle_animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_idle.png", - priority = "high", - width = 182, - height = 256, - frame_count = 1, - repeat_count = 18, -- match working animation - shift = { 0, -0.5 }, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_shadow.png", - width = 270, - height = 256, - frame_count = 1, - repeat_count = 18, -- match working animation - draw_as_shadow = true, - shift = { 0.5, -0.5 }, - scale = 0.5 - } - } - }, - -- Working animation (16 frames) - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_anim.png", - priority = "high", - width = 182, - height = 256, - frame_count = 18, - line_length = 6, - animation_speed = 0.4, - shift = { 0, 0.25 }, - scale = 0.5 + graphics_set = { + -- Base animation (idle state) - Factorio 2.0 syntax + animation = { + layers = { + { + filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_idle.png", + priority = "high", + width = 182, + height = 256, + frame_count = 1, + repeat_count = 18, -- match working animation frame count + shift = { 0, -0.125 }, -- Consistent shift (converted from -0.5 to tiles) + scale = 0.5 + }, + { + filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_shadow.png", + width = 270, + height = 256, + frame_count = 1, + repeat_count = 18, -- match working animation frame count + draw_as_shadow = true, + shift = { 0.5, -0.125 }, -- Consistent shift with main sprite + scale = 0.5 + } + } }, - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_anim.png", - width = 182, - height = 256, - frame_count = 1, - repeat_count = 18, -- match working animation - draw_as_shadow = true, - shift = { 0.5, 0.25 }, - scale = 0.5 + + -- Working visualizations - triggers when recipe is active + working_visualisations = { + { + -- Main working animation + animation = { + layers = { + { + filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_anim.png", + priority = "high", + width = 182, + height = 256, + frame_count = 18, + line_length = 6, + animation_speed = 0.4, + shift = { 0, -0.125 }, -- FIXED: Same shift as idle animation + scale = 0.5 + } + } + }, + -- This ensures the working animation plays over the idle animation + always_draw = false, -- Only draw when working + apply_recipe_tint = "primary", -- Optional: tint based on recipe + } } - } - } - }, + }, + energy_source = { type = "electric", usage_priority = "secondary-input" @@ -193,21 +246,16 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-bio-boiler", localised_name = { "entity-name.bi-bio-boiler" }, localised_description = { "entity-description.bi-bio-boiler" }, - icon = ICONPATH_E .. "bio_boiler.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_boiler.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_boiler.png", icon_size = 64,} }, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! se_allow_in_space = true, flags = { "placeable-neutral", "player-creation" }, minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-boiler" }, max_health = 300, - corpse = "small-remnants", + corpse = "boiler-remnants", + dying_explosion = "boiler-explosion", + impact_category = "metal-large", mode = "output-to-separate-pipe", resistances = { { @@ -285,7 +333,6 @@ if BI.Settings.BI_Bio_Fuel then height = 221, shift = util.by_pixel(-1.25, 5.25), scale = 0.5, - --tint = bio_boiler_tint, }, { filename = ENTITYPATH .. "boiler-N-shadow.png", @@ -309,7 +356,6 @@ if BI.Settings.BI_Bio_Fuel then height = 301, shift = util.by_pixel(-3, 1.25), scale = 0.5, - --tint = bio_boiler_tint, }, { filename = ENTITYPATH .. "boiler-E-shadow.png", @@ -333,7 +379,6 @@ if BI.Settings.BI_Bio_Fuel then height = 192, shift = util.by_pixel(4, 13), scale = 0.5, - --tint = bio_boiler_tint, }, { filename = ENTITYPATH .. "boiler-S-shadow.png", @@ -357,7 +402,6 @@ if BI.Settings.BI_Bio_Fuel then height = 273, shift = util.by_pixel(1.5, 7.75), scale = 0.5, - --tint = bio_boiler_tint, }, { filename = ENTITYPATH .. "boiler-W-shadow.png", @@ -379,7 +423,6 @@ if BI.Settings.BI_Bio_Fuel then height = 36, shift = util.by_pixel(33.5, -13.5), scale = 0.5, - tint = bio_boiler_tint, }, }, fire_flicker_enabled = true, diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua deleted file mode 100644 index 57f06b6..0000000 --- a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua +++ /dev/null @@ -1,76 +0,0 @@ -local BioInd = require('common')('Bio_Industries_2') - -local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ENTITYPATH = "__base__/graphics/entity/assembling-machine-2/" -local PIPEPATH = "__base__/graphics/entity/pipe-covers/" - -function assembler2pipepicturesBioreactor() - return { - north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = util.by_pixel(2.25, 13.5), - scale = 0.5, - }, - east = { - filename = ENTITYPATH .. "assembling-machine-2-pipe-E.png", - priority = "extra-high", - width = 42, - height = 76, - shift = util.by_pixel(-24.5, 1), - scale = 0.5, - }, - south = { - filename = ENTITYPATH .. "assembling-machine-2-pipe-S.png", - priority = "extra-high", - width = 88, - height = 61, - shift = util.by_pixel(0, -31.25), - scale = 0.5, - }, - west = { - filename = ENTITYPATH .. "assembling-machine-2-pipe-W.png", - priority = "extra-high", - width = 39, - height = 73, - shift = util.by_pixel(25.75, 1.25), - scale = 0.5, - } - } -end - - -function pipecoverspicturesBioreactor() - return { - north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - scale = 0.5 - }, - east = { - filename = PIPEPATH .. "pipe-cover-east.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - south = { - filename = PIPEPATH .. "pipe-cover-south.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - west = { - filename = PIPEPATH .. "pipe-cover-west.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - } - } -end diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua index 22b0c67..13f368a 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua @@ -6,6 +6,7 @@ local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -- Changed for 0.18.29: We always want to make advanced fertilizer, so we need to -- unlock the bio-reactor and the most basic recipe for algae biomass even if -- BI.Settings.BI_Bio_Fuel has been turned off! + data:extend({ -- BIO Reactor (ENTITY)-- { @@ -13,14 +14,7 @@ data:extend({ name = "bi-bio-reactor", localised_name = {"entity-name.bi-bio-reactor"}, localised_description = {"entity-description.bi-bio-reactor"}, - icon = ICONPATH_E .. "bioreactor.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bioreactor.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bioreactor.png", icon_size = 64, } }, enabled = false, energy_required = 20, ingredients = { @@ -36,20 +30,14 @@ data:extend({ subgroup = "bio-bio-fuel-fluid", order = "a", }, + -- BIOMASS 1 -- { type = "recipe", name = "bi-biomass-1", localised_name = {"recipe-name.bi-biomass-1"}, localised_description = {"recipe-description.bi-biomass-1"}, - icon = ICONPATH .. "biomass_1.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "biomass_1.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "biomass_1.png", icon_size = 64, } }, category = "biofarm-mod-bioreactor", energy_required = 10, ingredients = { @@ -77,14 +65,7 @@ if BI.Settings.BI_Bio_Fuel then { type = "recipe", name = "bi-basic-gas-processing", - icon = ICONPATH .. "bi_basic_gas_processing.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_basic_gas_processing.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bi_basic_gas_processing.png", icon_size = 64, } }, category = "chemistry", enabled = false, energy_required = 5, @@ -112,14 +93,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-bio-boiler", localised_name = {"entity-name.bi-bio-boiler"}, localised_description = {"entity-description.bi-bio-boiler"}, - icon = ICONPATH_E .. "bio_boiler.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_boiler.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_boiler.png", icon_size = 64, } }, enabled = false, energy_required = 10, ingredients = { @@ -143,14 +117,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-cellulose-1", localised_name = {"recipe-name.bi-cellulose-1"}, localised_description = {"recipe-description.bi-cellulose-1"}, - icon = ICONPATH .. "cellulose.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "cellulose.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "cellulose.png", icon_size = 64, } }, category = "chemistry", energy_required = 20, ingredients = { @@ -175,14 +142,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-cellulose-2", localised_name = {"recipe-name.bi-cellulose-2"}, localised_description = {"recipe-description.bi-cellulose-2"}, - icon = ICONPATH .. "cellulose_2.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "cellulose_2.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "cellulose_2.png", icon_size = 64, } }, category = "chemistry", energy_required = 5, ingredients = { @@ -211,23 +171,12 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-plastic-1", localised_name = {"recipe-name.bi-plastic-1"}, localised_description = {"recipe-description.bi-plastic-1"}, - icon = ICONPATH .. "plastic_bar_1.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "plastic_bar_1.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "plastic_bar_1.png", icon_size = 64, } }, category = "chemistry", - --subgroup = "raw-material", energy_required = 1, ingredients = { {type = "fluid", name = "steam", amount = 10}, - -- Let's use woodpulp instead of wood for the new version! Not changing this - -- for 0.18.34/1.1.4 to avoid an additional (potentially factory-breaking) - -- change shortly before the new release will change so many things anyway! - {type = "item", name = "wood", amount = 10}, + {type = "item", name = "bi-woodpulp", amount = 20}, {type = "fluid", name = "light-oil", amount = 20}, }, results = { @@ -240,7 +189,7 @@ if BI.Settings.BI_Bio_Fuel then allow_productivity = true, subgroup = "bio-bio-fuel-solid", order = "g[plastic-bar-1]", - -- This is a custom property for use by "Krastorio 2" (it will change + -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", }, @@ -251,14 +200,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-plastic-2", localised_name = {"recipe-name.bi-plastic-2"}, localised_description = {"recipe-description.bi-plastic-2"}, - icon = ICONPATH .. "plastic_bar_2.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "plastic_bar_2.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "plastic_bar_2.png", icon_size = 64, } }, category = "chemistry", energy_required = 1, ingredients = { @@ -283,14 +225,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-2", localised_name = {"recipe-name.bi-biomass-2"}, localised_description = {"recipe-description.bi-biomass-2"}, - icon = ICONPATH .. "biomass_2.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "biomass_2.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "biomass_2.png", icon_size = 64, } }, category = "biofarm-mod-bioreactor", energy_required = 60, ingredients = { @@ -316,14 +251,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-3", localised_name = {"recipe-name.bi-biomass-3"}, localised_description = {"recipe-description.bi-biomass-3"}, - icon = ICONPATH .. "biomass_3.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "biomass_3.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "biomass_3.png", icon_size = 64, } }, category = "biofarm-mod-bioreactor", energy_required = 10, ingredients = { @@ -350,14 +278,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-conversion-1", localised_name = {"recipe-name.bi-biomass-conversion-1"}, localised_description = {"recipe-description.bi-biomass-conversion-1"}, - icon = ICONPATH .. "bio_conversion_1.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_conversion_1.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bio_conversion_1.png", icon_size = 64, } }, category = "oil-processing", enabled = false, always_show_made_in = true, @@ -382,14 +303,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-conversion-2", localised_name = {"recipe-name.bi-biomass-conversion-2"}, localised_description = {"recipe-description.bi-biomass-conversion-2"}, - icon = ICONPATH .. "bio_conversion_2.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_conversion_2.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bio_conversion_2.png", icon_size = 64, } }, category = "oil-processing", enabled = false, always_show_made_in = true, @@ -414,14 +328,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-conversion-3", localised_name = {"recipe-name.bi-biomass-conversion-3"}, localised_description = {"recipe-description.bi-biomass-conversion-3"}, - icon = ICONPATH .. "bio_conversion_3.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_conversion_3.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bio_conversion_3.png", icon_size = 64, } }, category = "oil-processing", enabled = false, always_show_made_in = true, @@ -451,14 +358,7 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-conversion-4", localised_name = {"recipe-name.bi-biomass-conversion-4"}, localised_description = {"recipe-description.bi-biomass-conversion-4"}, - icon = ICONPATH .. "bio_conversion_4.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_conversion_4.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bio_conversion_4.png", icon_size = 64, } }, category = "oil-processing", enabled = false, always_show_made_in = true, @@ -488,16 +388,7 @@ if BI.Settings.BI_Bio_Fuel then { type = "recipe", name = "bi-battery", - icon = ICONPATH .. "bio_battery.png", - icon_size = 64, - icon_mipmaps = 4, - icons = { - { - icon = ICONPATH .. "bio_battery.png", - icon_size = 64, - icon_mipmaps = 4, - } - }, + icons = { {icon = ICONPATH .. "bio_battery.png", icon_size = 64, } }, category = "chemistry", energy_required = 5, ingredients = { @@ -527,14 +418,7 @@ if BI.Settings.BI_Bio_Fuel then { type = "recipe", name = "bi-acid", - icon = ICONPATH .. "bio_acid.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_acid.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bio_acid.png", icon_size = 64, } }, category = "chemistry", energy_required = 10, ingredients = { @@ -557,20 +441,13 @@ if BI.Settings.BI_Bio_Fuel then }, subgroup = "bio-bio-fuel-other", order = "a", - }, + }, -- Sulfuric acid to Sulfur -- { type = "recipe", name = "bi-sulfur", - icon = ICONPATH .. "bio_sulfur.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_sulfur.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bio_sulfur.png", icon_size = 64, } }, category = "chemistry", energy_required = 10, ingredients = { @@ -587,20 +464,13 @@ if BI.Settings.BI_Bio_Fuel then allow_productivity = true, subgroup = "bio-bio-fuel-solid", order = "i1", - }, + }, -- Sulfuric acid to Sulfur --IF ANGELS INSTALLED (More Expensice) { type = "recipe", name = "bi-sulfur-angels", - icon = ICONPATH .. "bio_sulfur.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_sulfur.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "bio_sulfur.png", icon_size = 64, } }, category = "chemistry", energy_required = 10, ingredients = { diff --git a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua index 791a747..10aa244 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua @@ -62,6 +62,7 @@ data:extend({ sound = { { filename = "__Bio_Industries_2__/sound/rainforest_ambience.ogg", volume = 0.8 } }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, apparent_volume = 1.5, + max_sounds_per_type = 3, }, crafting_categories = { "clean-air" }, source_inventory_size = 1, @@ -84,6 +85,7 @@ data:extend({ -- won't be affected by beacons! allowed_effects = { "consumption", "speed" }, }, + ---- corpse { type = "corpse", @@ -201,6 +203,7 @@ data:extend({ sound = { { filename = "__Bio_Industries_2__/sound/rainforest_ambience.ogg", volume = 1 } }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.8 }, apparent_volume = 1.5, + max_sounds_per_type = 3, }, crafting_categories = { "clean-air" }, source_inventory_size = 1, @@ -224,6 +227,7 @@ data:extend({ allowed_effects = { "consumption", "speed" }, }, + --- corpse { type = "corpse", name = "bi-bio-garden-large-remnant", @@ -381,6 +385,7 @@ data:extend({ sound = { { filename = "__Bio_Industries_2__/sound/rainforest_ambience.ogg", volume = 1.8 } }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.9 }, apparent_volume = 2, + max_sounds_per_type = 3, }, crafting_categories = { "clean-air" }, source_inventory_size = 1, diff --git a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua index 678ffc5..179b121 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua @@ -12,14 +12,7 @@ data:extend({ name = "bi-bio-garden", localised_name = {"entity-name.bi-bio-garden"}, localised_description = {"entity-description.bi-bio-garden"}, - icon = ICONPATH_E .. "bio_garden_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_garden_icon.png", icon_size = 64, } }, enabled = false, energy_required = 10, ingredients = { @@ -44,14 +37,7 @@ data:extend({ name = "bi-bio-garden-lagre", localised_name = {"entity-name.bi-bio-garden-lagre"}, localised_description = {"entity-description.bi-bio-garden-lagre"}, - icon = ICONPATH_E .. "bio_garden_large_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_large_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_garden_large_icon.png", icon_size = 64, } }, enabled = false, energy_required = 15, ingredients = { @@ -76,14 +62,7 @@ data:extend({ name = "bi-bio-garden-huge", localised_name = {"entity-name.bi-bio-garden-huge"}, localised_description = {"entity-description.bi-bio-garden-huge"}, - icon = ICONPATH_E .. "bio_garden_huge_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_huge_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_garden_huge_icon.png", icon_size = 64, } }, enabled = false, energy_required = 15, ingredients = { @@ -106,14 +85,7 @@ data:extend({ { type = "recipe", name = "bi-purified-air-1", - icon = ICONPATH .. "clean-air_mk1.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "clean-air_mk1.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "clean-air_mk1.png", icon_size = 64, } }, order = "zzz-clean-air", category = "clean-air", subgroup = "bio-bio-gardens-fluid", @@ -137,14 +109,7 @@ data:extend({ { type = "recipe", name = "bi-purified-air-2", - icon = ICONPATH .. "clean-air_mk2.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "clean-air_mk2.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "clean-air_mk2.png", icon_size = 64, } }, order = "zzz-clean-air2", category = "clean-air", subgroup = "bio-bio-gardens-fluid", diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua index 7966f88..749a4ef 100644 --- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua @@ -13,14 +13,7 @@ if BI.Settings.BI_Solar_Additions then name = "bi-bio-solar-farm", localised_name = {"entity-name.bi-bio-solar-farm"}, localised_description = {"entity-description.bi-bio-solar-farm"}, - icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", icon_size = 64, } }, enabled = false, energy_required = 60, ingredients = { @@ -41,16 +34,9 @@ if BI.Settings.BI_Solar_Additions then { type = "recipe", name = "bi-solar-boiler-hidden-panel", - localised_name = {"entity-name.bi-solar-boiler"}, + localised_name = {"entity-name.bi-solar-boiler"}, localised_description = {"entity-description.bi-solar-boiler"}, - icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", icon_size = 64, } }, enabled = false, energy_required = 15, ingredients = { @@ -73,14 +59,7 @@ if BI.Settings.BI_Solar_Additions then name = "bi-solar-mat", localised_name = {"entity-name.bi-solar-mat"}, localised_description = {"entity-description.bi-solar-mat"}, - icon = ICONPATH_E .. "solar-mat.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "solar-mat.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "solar-mat.png", icon_size = 64, } }, enabled = false, energy_required = 5, ingredients = { @@ -103,14 +82,7 @@ if BI.Settings.BI_Solar_Additions then name = "bi-bio-accumulator", localised_name = {"entity-name.bi-bio-accumulator"}, localised_description = {"entity-description.bi-bio-accumulator"}, - icon = ICONPATH_E .. "bi_LargeAccumulator.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bi_LargeAccumulator.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bi_LargeAccumulator.png", icon_size = 64, } }, energy_required = 60, enabled = false, ingredients = { @@ -120,9 +92,9 @@ if BI.Settings.BI_Solar_Additions then }, results = {{type="item", name="bi-bio-accumulator", amount=1}}, main_product = "", - subgroup = "energy", + subgroup = "energy", order = "e[accumulator]-a[bi-accumulator]", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 }, @@ -130,17 +102,10 @@ if BI.Settings.BI_Solar_Additions then -- Large Substation { type = "recipe", - name = "bi-large-substation", + name = "bi-large-substation", localised_name = {"entity-name.bi-large-substation"}, localised_description = {"entity-description.bi-large-substation"}, - icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", icon_size = 64, } }, enabled = false, ingredients = { {type="item", name="steel-plate", amount=10}, diff --git a/Bio_Industries_2/prototypes/Bio_Turret/entity.lua b/Bio_Industries_2/prototypes/Bio_Turret/entity.lua index 0255355..1a247d3 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/entity.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/entity.lua @@ -9,15 +9,8 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-basic", - icon = ICONPATH_W .. "basic_dart_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "basic_dart_icon.png", - icon_size = 64, - } - }, - ammo_category = "Bio_Turret_Ammo", + icons = { { icon = ICONPATH_W .. "basic_dart_icon.png", icon_size = 64, } }, + ammo_category = "Bio_Turret_Ammo", ammo_type = { category = "Bio_Turret_Ammo", action = { @@ -51,14 +44,7 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-standard", - icon = ICONPATH_W .. "standard_dart_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "standard_dart_icon.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_W .. "standard_dart_icon.png", icon_size = 64, } }, ammo_category = "Bio_Turret_Ammo", ammo_type = { category = "Bio_Turret_Ammo", @@ -98,14 +84,7 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-enhanced", - icon = ICONPATH_W .. "enhanced_dart_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "enhanced_dart_icon.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_W .. "enhanced_dart_icon.png", icon_size = 64, } }, ammo_category = "Bio_Turret_Ammo", ammo_type = { category = "Bio_Turret_Ammo", @@ -149,14 +128,7 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-poison", - icon = ICONPATH_W .. "poison_dart_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "poison_dart_icon.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_W .. "poison_dart_icon.png", icon_size = 64, } }, ammo_category = "Bio_Turret_Ammo", ammo_type = { category = "Bio_Turret_Ammo", @@ -231,14 +203,7 @@ data:extend({ { type = "ammo-turret", name = "bi-dart-turret", - icon = ICONPATH_W .. "bio_turret_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "bio_turret_icon.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_W .. "bio_turret_icon.png", icon_size = 64, } }, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.25, result = "bi-dart-turret"}, max_health = 300, @@ -252,13 +217,11 @@ data:extend({ inventory_size = 1, automated_ammo_count = 14, attacking_speed = 1, -- makes nothing, it's animation's parameter - folded_animation = turret_pic{direction_count = 8, line_length = 1}, preparing_animation = turret_pic{direction_count = 8, line_length = 1}, prepared_animation = turret_pic{}, attacking_animation = turret_pic{}, folding_animation = turret_pic{direction_count = 8, line_length = 1, run_mode = "backward"}, - -- darkfrei: wood impact sound for woods! impact_category = "wood", attack_parameters = { @@ -267,7 +230,6 @@ data:extend({ cooldown = 3.6, -- cooldown = 6 -- darkfrei: means cooldown 6/60 sec or 10 shoots at second; = 60 is one shoot/sec projectile_creation_distance = 1.41, projectile_center = {-0.0625, 0.55}, - range = 20, sound = { filename = "__Bio_Industries_2__/sound/dart-turret.ogg", @@ -321,14 +283,7 @@ data:extend({ { type = "gun", name = "bi-dart-rifle", - icon = ICONPATH_W .. "bi_dart_rifle_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "bi_dart_rifle_icon.png", - icon_size = 64, - } - }, + icons = { { icon = ICONPATH_W .. "bi_dart_rifle_icon.png", icon_size = 64, } }, subgroup = "gun", order = "a[basic-clips]-ab[submachine-gun]", attack_parameters = { diff --git a/Bio_Industries_2/prototypes/Bio_Turret/item.lua b/Bio_Industries_2/prototypes/Bio_Turret/item.lua index 7c6ae68..17a2c2d 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/item.lua @@ -5,18 +5,11 @@ local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" data:extend({ - --- Conversion Turret + --- Dart Turret { type = "item", name = "bi-dart-turret", - icon = ICONPATH_W .. "bio_turret_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "bio_turret_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_W .. "bio_turret_icon.png", icon_size = 64, } }, subgroup = "defensive-structure", order = "aa[turret]-a[gun-turret]", place_result = "bi-dart-turret", diff --git a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua index 8ca598f..4fa0c14 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua @@ -10,24 +10,17 @@ data:extend({ name = "bi-dart-magazine-basic", localised_name = {"item-name.bi-dart-magazine-basic"}, localised_description = {"item-description.bi-dart-magazine-basic"}, - icon = ICONPATH .. "basic_dart_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "basic_dart_icon.png", - icon_size = 64, - } - }, - enabled = true, - energy_required = 4, - ingredients = { + icons = { {icon = ICONPATH .. "basic_dart_icon.png", icon_size = 64, } }, + enabled = true, + energy_required = 4, + ingredients = { {type="item", name="wood", amount=10}, - }, - results = {{type="item", name="bi-dart-magazine-basic", amount=10}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + }, + results = {{type="item", name="bi-dart-magazine-basic", amount=10}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "[bio-ammo]-a-[darts]-1", -- This is a custom property for use by "Krastorio 2" (it will change @@ -41,25 +34,18 @@ data:extend({ name = "bi-dart-magazine-standard", localised_name = {"item-name.bi-dart-magazine-standard"}, localised_description = {"item-description.bi-dart-magazine-standard"}, - icon = ICONPATH .. "standard_dart_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "standard_dart_icon.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 5, - ingredients = { + icons = { {icon = ICONPATH .. "standard_dart_icon.png", icon_size = 64, } }, + enabled = false, + energy_required = 5, + ingredients = { {type="item", name="bi-dart-magazine-basic", amount=10}, {type="item", name="copper-plate", amount=5}, }, - results = {{type="item", name="bi-dart-magazine-standard", amount=10}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-dart-magazine-standard", amount=10}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "[bio-ammo]-a-[darts]-2", }, @@ -70,25 +56,18 @@ data:extend({ name = "bi-dart-magazine-enhanced", localised_name = {"item-name.bi-dart-magazine-enhanced"}, localised_description = {"item-description.bi-dart-magazine-enhanced"}, - icon = ICONPATH .. "enhanced_dart_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "enhanced_dart_icon.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 6, - ingredients = { + icons = { {icon = ICONPATH .. "enhanced_dart_icon.png", icon_size = 64, } }, + enabled = false, + energy_required = 6, + ingredients = { {type="item", name="bi-dart-magazine-standard", amount=10}, {type="item", name="plastic-bar", amount=5}, }, - results = {{type="item", name="bi-dart-magazine-enhanced", amount=10}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-dart-magazine-enhanced", amount=10}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "[bio-ammo]-a-[darts]-3", }, @@ -99,25 +78,18 @@ data:extend({ name = "bi-dart-magazine-poison", localised_name = {"item-name.bi-dart-magazine-poison"}, localised_description = {"item-description.bi-dart-magazine-poison"}, - icon = ICONPATH .. "poison_dart_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "poison_dart_icon.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 8, - ingredients = { + icons = { {icon = ICONPATH .. "poison_dart_icon.png", icon_size = 64, } }, + enabled = false, + energy_required = 8, + ingredients = { {type="item", name="bi-dart-magazine-enhanced", amount=10}, {type="item", name="poison-capsule", amount=5}, }, - results = {{type="item", name="bi-dart-magazine-poison", amount=10}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-dart-magazine-poison", amount=10}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "[bio-ammo]-a-[darts]-4", }, @@ -128,25 +100,18 @@ data:extend({ name = "bi-dart-turret", localised_name = {"entity-name.bi-dart-turret"}, localised_description = {"entity-description.bi-dart-turret"}, - icon = ICONPATH_W .. "bio_turret_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "bio_turret_icon.png", - icon_size = 64, - } - }, - enabled = true, - energy_required = 8, - ingredients = { + icons = { {icon = ICONPATH .. "bio_turret_icon.png", icon_size = 64, } }, + enabled = true, + energy_required = 8, + ingredients = { {type="item", name="iron-gear-wheel", amount=5}, {type="item", name="wood", amount=20}, }, - results = {{type="item", name="bi-dart-turret", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-dart-turret", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "defensive-structure", order = "b[turret]-e[bi-dart-turret]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -160,29 +125,24 @@ data:extend({ name = "bi-dart-rifle", localised_name = {"item-name.bi-dart-rifle"}, localised_description = {"item-description.bi-dart-rifle"}, - icon = ICONPATH_W .. "bi_dart_rifle_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "bi_dart_rifle_icon.png", - icon_size = 64, - } - }, - enabled = true, - energy_required = 8, - ingredients = { + icons = { {icon = ICONPATH .. "bi_dart_rifle_icon.png", icon_size = 64, } }, + enabled = true, + energy_required = 8, + ingredients = { {type="item", name="copper-plate", amount=5}, {type="item", name="wood", amount=15}, }, - results = {{type="item", name="bi-dart-rifle", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-dart-rifle", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "gun", - order = "a[basic-clips]-b[bi-dart-rifle]" - }, + order = "a[basic-clips]-b[bi-dart-rifle]", -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + mod = "Bio_Industries_2", + }, + + }) diff --git a/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua b/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua index f3b1366..bc3cef5 100644 --- a/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua @@ -21,14 +21,7 @@ log("Enabling disassemble recipes!") type = "recipe", name = "bi-burner-mining-drill-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icon = ICONPATH .. "burner-mining-drill_disassemble.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "burner-mining-drill_disassemble.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "burner-mining-drill_disassemble.png", icon_size = 64, } }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-a[bi-burner-mining-drill-disassemble]", @@ -46,19 +39,12 @@ log("Enabling disassemble recipes!") }, main_product = "", }, - +---- { type = "recipe", name = "bi-burner-inserter-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icon = ICONPATH .. "burner_inserter_disassemble.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "burner_inserter_disassemble.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "burner_inserter_disassemble.png", icon_size = 64, } }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-b[bi-burner-inserter-disassemble]", @@ -75,19 +61,12 @@ log("Enabling disassemble recipes!") }, main_product = "", }, - +---- { type = "recipe", name = "bi-long-handed-inserter-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icon = ICONPATH .. "long_handed_inserter_disassemble.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "long_handed_inserter_disassemble.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "long_handed_inserter_disassemble.png", icon_size = 64, } }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-c[bi-long-handed-inserter-disassemble]", @@ -106,19 +85,12 @@ log("Enabling disassemble recipes!") }, main_product = "", }, - +--- { type = "recipe", name = "bi-stone-furnace-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icon = ICONPATH .. "stone_furnace_disassemble.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "stone_furnace_disassemble.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "stone_furnace_disassemble.png", icon_size = 64, } }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-d[bi-stone-furnace-disassemble]", @@ -135,19 +107,12 @@ log("Enabling disassemble recipes!") }, main_product = "", }, - +--- { type = "recipe", name = "bi-steel-furnace-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icon = ICONPATH .. "steel-furnace_disassemble.png", - icon_size = 64, - icons = { - { - icon = ICONPATH .. "steel-furnace_disassemble.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH .. "steel-furnace_disassemble.png", icon_size = 64, } }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-e[bi-steel-furnace-disassemble]", @@ -165,5 +130,6 @@ log("Enabling disassemble recipes!") }, main_product = "", }, + }) end \ No newline at end of file diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua index 0074fa8..ee3d137 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua @@ -10,7 +10,6 @@ local ICONPATH = BioInd.modRoot .. "/graphics/icons/" local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local WOODPATH = BioInd.modRoot .. "/graphics/entities/wood_products/" local REMNANTSPATH = BioInd.modRoot .. "/graphics/entities/remnants/" - local SNDPATH = "__base__/sound/" local sounds = {} sounds.open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" } @@ -39,14 +38,7 @@ data:extend({ { type = "container", name = "bi-wooden-chest-large", - icon = ICONPATH_E .. "large_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "large_wooden_chest_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "large_wooden_chest_icon.png", icon_size = 64, } }, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! se_allow_in_space = true, @@ -128,14 +120,7 @@ data:extend({ { type = "container", name = "bi-wooden-chest-huge", - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "huge_wooden_chest_icon.png", icon_size = 64, } }, scale_info_icons = true, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! @@ -150,7 +135,7 @@ data:extend({ inventory_size = 432, --144 open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }, close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, - impact_category = "wood", + impact_category = "wood", picture = { layers = { { @@ -218,14 +203,7 @@ data:extend({ { type = "container", name = "bi-wooden-chest-giga", - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "giga_wooden_chest_icon.png", icon_size = 64, } }, scale_info_icons = true, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! @@ -240,7 +218,7 @@ data:extend({ inventory_size = 1728, --576 open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }, close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, - impact_category = "wood", + impact_category = "wood", picture = { layers = { { diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua index e5dac25..ae5f8df 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua @@ -16,14 +16,7 @@ data:extend({ name = "bi-wooden-chest-large", localised_name = {"entity-name.bi-wooden-chest-large"}, localised_description = {"entity-description.bi-wooden-chest-large"}, - icon = ICONPATH_E .. "large_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "large_wooden_chest_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "large_wooden_chest_icon.png", icon_size = 64, } }, fuel_category = "chemical", fuel_value = "32MJ", subgroup = "storage", @@ -38,14 +31,7 @@ data:extend({ name = "bi-wooden-chest-huge", localised_name = {"entity-name.bi-wooden-chest-huge"}, localised_description = {"entity-description.bi-wooden-chest-huge"}, - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "huge_wooden_chest_icon.png", icon_size = 64, } }, fuel_category = "chemical", fuel_value = "200MJ", subgroup = "storage", @@ -60,14 +46,7 @@ data:extend({ name = "bi-wooden-chest-giga", localised_name = {"entity-name.bi-wooden-chest-giga"}, localised_description = {"entity-description.bi-wooden-chest-giga"}, - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "giga_wooden_chest_icon.png", icon_size = 64, } }, fuel_category = "chemical", fuel_value = "400MJ", subgroup = "storage", diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua index 04e9bde..fc88fc7 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua @@ -15,27 +15,20 @@ data:extend({ name = "bi-wooden-chest-large", localised_name = {"entity-name.bi-wooden-chest-large"}, localised_description = {"entity-description.bi-wooden-chest-large"}, - icon = ICONPATH_E .. "large_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "large_wooden_chest_icon.png", - icon_size = 64, - } - }, - energy_required = 2, - enabled = false, - ingredients = { + icons = { {icon = ICONPATH_E .. "large_wooden_chest_icon.png", icon_size = 64, } }, + energy_required = 2, + enabled = false, + ingredients = { {type="item", name="copper-plate", amount=16}, {type="item", name="resin", amount=24}, {type="item", name="wooden-chest", amount=8} }, - results = {{type="item", name="bi-wooden-chest-large", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-wooden-chest-large", amount=1}}, + main_product = "", + requester_paste_multiplier = 4, + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "storage", order = "a[items]-aa[wooden-chest]", }, @@ -46,27 +39,20 @@ data:extend({ name = "bi-wooden-chest-huge", localised_name = {"entity-name.bi-wooden-chest-huge"}, localised_description = {"entity-description.bi-wooden-chest-huge"}, - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", - icon_size = 64, - } - }, - energy_required = 2, - enabled = false, - ingredients = { + icons = { {icon = ICONPATH_E .. "huge_wooden_chest_icon.png", icon_size = 64, } }, + energy_required = 2, + enabled = false, + ingredients = { {type="item", name="iron-stick", amount=32}, {type="item", name="stone-brick", amount=32}, {type="item", name="bi-wooden-chest-large", amount=16} }, - results = {{type="item", name="bi-wooden-chest-huge", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-wooden-chest-huge", amount=1}}, + main_product = "", + requester_paste_multiplier = 4, + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "storage", order = "a[items]-ab[wooden-chest]", }, @@ -77,27 +63,20 @@ data:extend({ name = "bi-wooden-chest-giga", localised_name = {"entity-name.bi-wooden-chest-giga"}, localised_description = {"entity-description.bi-wooden-chest-giga"}, - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", - icon_size = 64, - } - }, - energy_required = 4, - enabled = false, - ingredients = { + icons = { {icon = ICONPATH_E .. "giga_wooden_chest_icon.png", icon_size = 64, } }, + energy_required = 4, + enabled = false, + ingredients = { {type="item", name="steel-plate", amount=32}, {type="item", name="concrete", amount=32}, {type="item", name="bi-wooden-chest-huge", amount=16} }, - results = {{type="item", name="bi-wooden-chest-giga", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-wooden-chest-giga", amount=1}}, + main_product = "", + requester_paste_multiplier = 4, + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "storage", order = "a[items]-ac[wooden-chest]", }, diff --git a/Bio_Industries_2/prototypes/Wood_Products/entities.lua b/Bio_Industries_2/prototypes/Wood_Products/entities.lua index 10d23af..a76a204 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/entities.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/entities.lua @@ -185,15 +185,15 @@ data:extend({ type = "tile", name = "bi-wood-floor", needs_correction = false, - minable = {hardness = 0.2, mining_time = 0.25, result = "wood"}, + minable = {hardness = 0.2, mining_time = 0.25, result = "wood"}, mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, collision_mask = { layers = { ground_tile = true } }, walking_speed_modifier = 1.2, layer = 13, decorative_removal_probability = 1, variants = { - transition = tile_graphics.generic_masked_tile_transitions1, - main = { + transition = tile_graphics.generic_masked_tile_transitions1, + main = { { picture = WOODPATH .. "wood_floor/woodfloor.png", count = 4, @@ -201,26 +201,26 @@ data:extend({ scale = 0.5 }, }, - inner_corner = { + inner_corner = { picture = WOODPATH .. "wood_floor/woodfloor_inner-corner.png", count = 4 }, - outer_corner = { + outer_corner = { picture = WOODPATH .. "wood_floor/woodfloor_outer-corner.png", count = 4, scale = 0.5 }, - side = { + side = { picture = WOODPATH .. "wood_floor/woodfloor_side.png", count = 4, scale = 0.5 }, - u_transition = { + u_transition = { picture = WOODPATH .. "wood_floor/woodfloor_u.png", count = 4, scale = 0.5 }, - o_transition = { + o_transition = { picture = WOODPATH .. "wood_floor/hr_woodfloor_o.png", count = 1, scale = 0.5 @@ -237,14 +237,7 @@ data:extend({ { type = "electric-pole", name = "bi-wooden-pole-big", - icon = ICONPATH_E .. "big-wooden-pole.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "big-wooden-pole.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "big-wooden-pole.png", icon_size = 64, } }, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! se_allow_in_space = true, @@ -328,7 +321,6 @@ data:extend({ localised_name = {"entity-name.bi-wooden-pole-big-remnant"}, icon = "__base__/graphics/icons/remnants.png", icon_size = 64, - icon_mipmaps = 4, BI_add_icon = true, flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"}, subgroup = "remnants", @@ -362,14 +354,7 @@ data:extend({ { type = "electric-pole", name = "bi-wooden-pole-huge", - icon = ICONPATH_E .. "huge-wooden-pole.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "huge-wooden-pole.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "huge-wooden-pole.png", icon_size = 64, } }, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! se_allow_in_space = true, @@ -466,7 +451,6 @@ data:extend({ localised_name = {"entity-name.bi-wooden-pole-huge-remnant"}, icon = "__base__/graphics/icons/remnants.png", icon_size = 64, - icon_mipmaps = 4, BI_add_icon = true, flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"}, subgroup = "remnants", @@ -500,14 +484,7 @@ data:extend({ { type = "wall", name = "bi-wooden-fence", - icon = ICONPATH_E .. "wooden-fence.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "wooden-fence.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "wooden-fence.png", icon_size = 64, } }, flags = {"placeable-neutral", "player-creation"}, collision_box = {{-0.29, -0.09}, {0.29, 0.49}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, @@ -517,7 +494,7 @@ data:extend({ repair_speed_modifier = 2, corpse = "wall-remnants", repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" }, - impact_category = "wood", + impact_category = "wood", resistances = { { type = "physical", @@ -810,14 +787,7 @@ data:extend({ { type = "pipe", name = "bi-wood-pipe", - icon = ICONPATH_E .. "wood_pipe.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "wood_pipe.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "wood_pipe.png", icon_size = 64, } }, flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 0.075, result = "bi-wood-pipe"}, max_health = 100, @@ -836,8 +806,8 @@ data:extend({ collision_box = {{-0.29, -0.29}, {0.29, 0.29}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, fluid_box = { - volume = 100, - pipe_connections = { + volume = 100, + pipe_connections = { { direction = defines.direction.north, position = {0, 0} }, { direction = defines.direction.east, position = {0, 0} }, { direction = defines.direction.south, position = {0, 0} }, @@ -858,6 +828,7 @@ data:extend({ horizontal_window_bounding_box = {{-0.25, -0.28125}, {0.25, 0.15625}}, vertical_window_bounding_box = {{-0.28125, -0.5}, {0.03125, 0.125}} }, + ---- corpse { type = "corpse", diff --git a/Bio_Industries_2/prototypes/Wood_Products/item.lua b/Bio_Industries_2/prototypes/Wood_Products/item.lua index e7e3ffa..c858d96 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/item.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/item.lua @@ -11,19 +11,10 @@ data:extend({ name = "bi-wooden-pole-big", localised_name = {"entity-name.bi-wooden-pole-big"}, localised_description = {"entity-description.bi-wooden-pole-big"}, - icon = ICONPATH_E .. "big-wooden-pole.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "big-wooden-pole.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "big-wooden-pole.png", icon_size = 64, } }, subgroup = "energy-pipe-distribution", order = "a[energy]-b[small-electric-pole]", place_result = "bi-wooden-pole-big", - --fuel_value = "14MJ", - --fuel_category = "chemical", stack_size = 50 }, @@ -33,19 +24,10 @@ data:extend({ name = "bi-wooden-pole-huge", localised_name = {"entity-name.bi-wooden-pole-huge"}, localised_description = {"entity-description.bi-wooden-pole-huge"}, - icon = ICONPATH_E .. "huge-wooden-pole.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "huge-wooden-pole.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "huge-wooden-pole.png", icon_size = 64, } }, subgroup = "energy-pipe-distribution", order = "a[energy]-d[big-electric-pole]", place_result = "bi-wooden-pole-huge", - --fuel_value = "90MJ", - --fuel_category = "chemical", stack_size = 50 }, @@ -55,14 +37,7 @@ data:extend({ name = "bi-wooden-fence", localised_name = {"entity-name.bi-wooden-fence"}, localised_description = {"entity-description.bi-wooden-fence"}, - icon = ICONPATH_E .. "wooden-fence.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "wooden-fence.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "wooden-fence.png", icon_size = 64, } }, subgroup = "defensive-structure", order = "a-a[stone-wall]-a[wooden-fence]", place_result = "bi-wooden-fence", @@ -77,14 +52,7 @@ data:extend({ name = "bi-wood-pipe", localised_name = {"entity-name.bi-wood-pipe"}, localised_description = {"entity-description.bi-wood-pipe"}, - icon = ICONPATH_E .. "wood_pipe.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "wood_pipe.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "wood_pipe.png", icon_size = 64, } }, subgroup = "energy-pipe-distribution", order = "a[pipe]-1a[pipe]", place_result = "bi-wood-pipe", @@ -99,14 +67,7 @@ data:extend({ name = "bi-wood-pipe-to-ground", localised_name = {"entity-name.bi-wood-pipe-to-ground"}, localised_description = {"entity-description.bi-wood-pipe-to-ground"}, - icon = ICONPATH_E .. "pipe-to-ground-wood.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "pipe-to-ground-wood.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "pipe-to-ground-wood.png", icon_size = 64, } }, subgroup = "energy-pipe-distribution", order = "a[pipe]-1b[pipe-to-ground]", place_result = "bi-wood-pipe-to-ground", diff --git a/Bio_Industries_2/prototypes/Wood_Products/rail.lua b/Bio_Industries_2/prototypes/Wood_Products/rail.lua index 496749d..97c7da1 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/rail.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/rail.lua @@ -20,14 +20,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations") { type = "rail-planner", name = "bi-rail-wood", - icon = ICONPATH_E .. "rail-wood.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "rail-wood.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "rail-wood.png", icon_size = 64, } }, localised_name = {"item-name.bi-rail-wood"}, subgroup = "train-transport", order = "a[rail]-0[rail]", @@ -50,14 +43,7 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations") { type = "recipe", name = "bi-rail-wood-to-concrete", - icon = ICONPATH_E .. "rail-wood-to-concrete.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "rail-wood-to-concrete.png", - icon_size = 64, - } - }, + icons = { {icon = ICONPATH_E .. "rail-wood-to-concrete.png", icon_size = 64, } }, enabled = false, ingredients = { diff --git a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua index 4111e31..84f7cf3 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua @@ -11,24 +11,17 @@ data:extend({ name = "bi-wooden-pole-big", localised_name = {"entity-name.bi-wooden-pole-big"}, localised_description = {"entity-description.bi-wooden-pole-big"}, - icon = ICONPATH_E .. "big-wooden-pole.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "big-wooden-pole.png", - icon_size = 64, - } - }, - enabled = false, - ingredients = { + icons = { {icon = ICONPATH_E .. "big-wooden-pole.png", icon_size = 64, } }, + enabled = false, + ingredients = { {type="item", name="wood", amount=5}, {type="item", name="small-electric-pole", amount=2}, }, - results = {{type="item", name="bi-wooden-pole-big", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-wooden-pole-big", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "energy-pipe-distribution", order = "a[energy]-b[small-electric-pole]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -42,25 +35,18 @@ data:extend({ name = "bi-wooden-pole-huge", localised_name = {"entity-name.bi-wooden-pole-huge"}, localised_description = {"entity-description.bi-wooden-pole-huge"}, - icon = ICONPATH_E .. "huge-wooden-pole.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "huge-wooden-pole.png", - icon_size = 64, - } - }, - enabled = false, - ingredients = { + icons = { {icon = ICONPATH_E .. "huge-wooden-pole.png", icon_size = 64, } }, + enabled = false, + ingredients = { {type="item", name="wood", amount=5}, {type="item", name="concrete", amount=100}, {type="item", name="bi-wooden-pole-big", amount=6}, }, - results = {{type="item", name="bi-wooden-pole-huge", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-wooden-pole-huge", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "energy-pipe-distribution", order = "a[energy]-d[big-electric-pole]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -74,23 +60,16 @@ data:extend({ name = "bi-wooden-fence", localised_name = {"entity-name.bi-wooden-fence"}, localised_description = {"entity-description.bi-wooden-fence"}, - icon = ICONPATH_E .. "wooden-fence.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "wooden-fence.png", - icon_size = 64, - } - }, - enabled = true, - ingredients = { + icons = { {icon = ICONPATH_E .. "wooden-fence.png", icon_size = 64, } }, + enabled = true, + ingredients = { {type="item", name="wood", amount=2}, }, - results = {{type="item", name="bi-wooden-fence", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-wooden-fence", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "defensive-structure", -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) @@ -103,26 +82,19 @@ data:extend({ name = "bi-wood-pipe", localised_name = {"entity-name.bi-wood-pipe"}, localised_description = {"entity-description.bi-wood-pipe"}, - icon = ICONPATH_E .. "wood_pipe.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "wood_pipe.png", - icon_size = 64, - } - }, - energy_required = 1, - enabled = true, + icons = { {icon = ICONPATH_E .. "wood_pipe.png", icon_size = 64, } }, + energy_required = 1, + enabled = true, ingredients = { {type="item", name="copper-plate", amount=1}, {type="item", name="wood", amount=8} }, - results = {{type="item", name="bi-wood-pipe", amount=4}}, - main_product = "", - requester_paste_multiplier = 15, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-wood-pipe", amount=4}}, + main_product = "", + requester_paste_multiplier = 15, + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "energy-pipe-distribution", order = "a[pipe]-1a[pipe]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -136,27 +108,20 @@ data:extend({ name = "bi-wood-pipe-to-ground", localised_name = {"entity-name.bi-wood-pipe-to-ground"}, localised_description = {"entity-description.bi-wood-pipe-to-ground"}, - icon = ICONPATH_E .. "pipe-to-ground-wood.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "pipe-to-ground-wood.png", - icon_size = 64, - } - }, - energy_required = 2, - enabled = true, - ingredients = { + icons = { {icon = ICONPATH_E .. "pipe-to-ground-wood.png", icon_size = 64, } }, + energy_required = 2, + enabled = true, + ingredients = { {type="item", name="copper-plate", amount=4}, {type="item", name="bi-wood-pipe", amount=5} }, - results = {{type="item", name="bi-wood-pipe-to-ground", amount=2}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + results = {{type="item", name="bi-wood-pipe-to-ground", amount=2}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "energy-pipe-distribution", order = "a[pipe]-1b[pipe-to-ground]", }, - }) +}) diff --git a/Bio_Industries_2/remote.lua b/Bio_Industries_2/remote.lua new file mode 100644 index 0000000..6df4b5c --- /dev/null +++ b/Bio_Industries_2/remote.lua @@ -0,0 +1,73 @@ +BioInd = require("__" .. script.mod_name .. "__.common")(script.mod_name) +-- Presets for Milestones mod +local function milestones_preset_addons() +local grouped_milestones = {} + + + grouped_milestones["resorces"] = { + { type = "group", name = "Resources" }, + { type = "item", name = "bi-woodpulp", quantity = 1 }, + { type = "item", name = "bi-woodpulp", quantity = 1000, next = "x10", hidden = true }, + { type = "item", name = "bi-ash", quantity = 1, next = "x10" }, + { type = "item", name = "bi-ash", quantity = 1000, next = "x10", hidden = true }, + { type = "item", name = "stone-crushed", quantity = 1 }, + { type = "item", name = "stone-crushed", quantity = 1000, next = "x10", hidden = true }, + { type = "item", name = "fertilizer", quantity = 1 }, + { type = "item", name = "fertilizer", quantity = 1000, next = "x10", hidden = true }, + { type = "item", name = "bi-adv-fertilizer", quantity = 1 }, + { type = "item", name = "bi-adv-fertilizer", quantity = 1000, next = "x10", hidden = true }, + } + +grouped_milestones["progress"] = { + {type = "group", name = "Progress" }, + {type="item", name="bi-bio-farm", quantity=1}, + {type="item", name="bi-bio-greenhouse", quantity=1}, + {type="item", name="bi-bio-garden", quantity=1}, + {type="item", name="bi-bio-garden-large", quantity=1}, + {type="item", name="bi-bio-garden-huge", quantity=1}, + + + } + + --script.active_mods["Bio_Industries_2"] and { type = "item", name = "bob-beacon-2", quantity = 1 } or nil, + + +if BioInd.get_startup_setting("BI_Bio_Cannon") then +grouped_milestones["Bio_Cannon"] = { + {type = "group", name = "Bio Cannon" }, + {type="item", name="bi-bio-cannon", quantity=1}, + -- {type="ammo", name="bi-bio-cannon-proto-ammo", quantity=1}, +-- {type = "ammo", name = "bi-bio-cannon-proto-ammo", quantity = 1000, next = "x10", hidden = true }, + } +end + +if BioInd.get_startup_setting("BI_Bio_Fuel") then +grouped_milestones["Bio_Fuel"] = { + {type = "group", name = "Bio Fuel" }, + {type="item", name="bi-bio-reactor", quantity=1}, + {type="item", name="bi-bio-boiler", quantity=1}, + } +end + + + + local milestones = {} + for group_name, group_milestones in pairs(grouped_milestones) do + for _, milestone in pairs(group_milestones) do + table.insert(milestones, milestone) + end + end + + + return { + ["Bio Industries"] = { + required_mods = { "Bio_Industries_2" }, + forbidden_mods = {}, + milestones = milestones, + }, + } +end + +remote.add_interface("Bio_Industries_2", { + milestones_preset_addons = milestones_preset_addons, +})