From a4e820f90733148de4b75f5b60928e0523bf51b3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 23 Jan 2020 20:20:04 -0500
Subject: [PATCH] Added default ore flags for modded ores

---
 core/assets-raw/fontgen/config.json        |  12 +++----
 core/assets/fonts/icon.ttf                 | Bin 33220 -> 33248 bytes
 core/src/mindustry/content/Blocks.java     |  35 ++++++++++++++++++---
 core/src/mindustry/maps/Maps.java          |   8 ++---
 core/src/mindustry/world/blocks/Floor.java |   4 +++
 5 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/core/assets-raw/fontgen/config.json b/core/assets-raw/fontgen/config.json
index 2eec33fcf6..e5034e70fe 100644
--- a/core/assets-raw/fontgen/config.json
+++ b/core/assets-raw/fontgen/config.json
@@ -284,12 +284,6 @@
       "code": 59439,
       "src": "typicons"
     },
-    {
-      "uid": "e45e9f27ce40ba9837cc984076d98067",
-      "css": "zoom",
-      "code": 59441,
-      "src": "elusive"
-    },
     {
       "uid": "0e26e70b4aa537cc206f41b21dcf2fcc",
       "css": "lock",
@@ -919,6 +913,12 @@
       "search": [
         "chat"
       ]
+    },
+    {
+      "uid": "9dd9e835aebe1060ba7190ad2b2ed951",
+      "css": "zoom",
+      "code": 59415,
+      "src": "fontawesome"
     }
   ]
 }
\ No newline at end of file
diff --git a/core/assets/fonts/icon.ttf b/core/assets/fonts/icon.ttf
index 74eb958fd7834220269c4976bd5ef049a542353f..0cde9685b5c3da16c377d2699997f9bdf014ee7e 100644
GIT binary patch
delta 942
zcmX@o%=Dm{X@X(>v)CR62F4W(4D5T7%Ssg3C;l^IU?@Goz`&r8R*;_CHE}{D14HQx
z1_the^u*!<1_lNJ28PlD3=9k$={c2Y0wG%tF)(nZFfb%VWTYmhNa~0gFfe5AVPIe|
z%g9Jg<T%9Y!oZOIg@J)VB_p?_qABZtFatx51Oo%(hMfH5L=T3H7X}OrxgZN~<tA1X
zFdpM^W?;x$0&+lJVs7f$x#AKG40%Tw7?{o$<QJE`c_Jmjz)(1afq_M{peVKAsiXED
z28PCni9cR5OTRFf{EShRS@wm|WIiTW<|u}S&0$Q6%=O|73@^kP7#JiN7+ydzgCqmP
z3n*rgVqkay#SGF63@@OVL56|hg)9U!fM_`eh8J=S3=AMzo`K<oJOcv*h*n@=c%cAt
zF$2R3MF?g9(Mk*qFO(P<>KQ-`Wd?>9$_xw)AX<fi;e`q)Oc)qms6sFUh*o1@c%jC?
zzyPAv85mxuGcYiKXblF27a9x<3?N#Qf#HQF0|Nty)?#3Ip~b+!0HU=S7+z>IFff2<
z9R`LMIt&a9AX=9}o#BNp0|SFD1H%hF2xb7$`V0&&^cff!K(qk^!wZAWbJ&VR>i_@$
zpT)e8nU{fsL6O18L0_Jck%5nqnUTqzfr*)^fPsa9fsutFfq{{knK6Wck&!uqftiun
zM_gG%ScsKXQk&64kC9D8%#M*!giT4Gkxf}ikI9Zjj!9gEU0jT*dD4YRlP*kRl+&>i
z*`HD!Fe$@<$tI_7Nnef)qw9WA#wPjnNlepD&0y>KH%nGabib=z)`UfUc~&e=Y14eG
zQ}&B)=8=|{*u38Or@4$Sr*d69zs*+$Zsr#Z3=9mn{9pRO=*dU2XEHDN|9^5!PU7Z+
zIdY8kDx8P7Lb(2LKjRVM3E<`6oxrEZpT~cQ|A&B%K$5^A!8E}x!4pC;Ld%5PM1({-
zL=8kMME8iriOmwbAnqZ-BatN0Bk3f$LGqSVmedTXN775AkIAUX^vI^kUXyE+uTqdu
zIHl;OctFWUX_Io4@+}oPl@F?Asvp!|sN1Qxs9)32kkg3Mn5XeTvq<xiR)AKE))(zn
sI!rogI;(Wv>GtS;)2q_AGw?Fh+1!>_!@^RPpPxIKv3T+3mBrG0059<O?f?J)

delta 908
zcmaFR%ygugX@X(>q}VkK42&xn7})nDmz5~6PyA=bz)-q|fq_9Gtsp(OYvP1R28Plz
z3=G@_>50V!3=9kc3=E}97#J8h(sL@)+BMpaFfeeYFfb(9WTYmhNa_eZU|`5zz`(#@
zmXVQ~$Z?3(g@Gaa1_J|wN=9x;MboVRAq))Je;61TH{|3eCwedjyy#(I$OTz=D>t#C
zfbkfQGXq0j2gm_=iMgp~=ZZ@(FyyUZU|>31kY8M4eyXv7fuXR1fq_M{peVKAsiXED
z28KqPi9cR5i@lJZ{EShRS>lE4WIiTW<^YDU&0$Q6%=Hos3@;=Y7#KjbBm=_>Nd^W6
z5G}>P@Is1#fdNEIGcdf6W?*0d(XtE-FJu`Q7-Se2UdTZ(14vAsf#HQb0|Ns{Oo4&n
zg#rTu14vAff#HQB$i)l{FO(pd0VJl(!0<wufuWuOB&fo`@Ir-wfdM3_%E0hK6%-~6
z3@_9mm;ofF&cN_Ooq>S?B&NZ@@Ir%ufdM3@$-wYJlYxN&B&Nl{@Is4$fdM3@&A{+N
zn}LA=B&Nf_@Ir@yfdM3@%fRqLmw|x+B&Nrp&hSEyfq?-esL#OgLZ5+wL63pqg#iRJ
zfW!<L7+x4|p2JoovU#1ftVI1q<{$<>25|-h2VF)+CT3nnMkXeAK1N0t1_lOZCI;pN
z1|~*ErVs`uCdLQ`MkYodVNqo<7FG#uQ*&cAQxh`<F#$GqC3SXT5ivVP6Fo+@T};lu
z7*l@z+LRT2XlBomo}ME;9J?~BH~sqcZ_W=!gM&=ANj*#*CpuUrFfcGMZ9ZoF&s=5&
z&-MlJ{5D@1xS3xtFfcIO@_!CWcwl<+gY21;YjYA9FK)h-qsUla#Kpq3hI<<K5grDf
z9lQ>__xR=bi}+XY-w_ZJC=wJCv=Xck;t>iHHWNN1Vj=QCR7o^Tbe&j$SdZ8taVznE
z5+M?Gk|vUiB+p32NOehFk)9^KLq<ZTPBudJgj|Jujslm$9z_eqO-g!7OO$<-&!`Bf
zJW|b2eWZ3v-9Wue{e*^wfJT7E1dU6YDVkTboV3cco@vj~{-P71Ge_rvZk_H6y&Qc5
c0~<rR&5QDCSSBkMFJh_6&(Ga_q*#Uz0E46O)Bpeg

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 35d99f129a..994f56d19e 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -398,12 +398,37 @@ public class Blocks implements ContentList{
         //endregion
         //region ore
 
-        oreCopper = new OreBlock(Items.copper);
-        oreLead = new OreBlock(Items.lead);
+        oreCopper = new OreBlock(Items.copper){{
+            oreDefault = true;
+            oreThreshold = 0.81f;
+            oreScale = 23.47619f;
+        }};
+
+        oreLead = new OreBlock(Items.lead){{
+            oreDefault = true;
+            oreThreshold = 0.828f;
+            oreScale = 23.952381f;
+        }};
+
         oreScrap = new OreBlock(Items.scrap);
-        oreCoal = new OreBlock(Items.coal);
-        oreTitanium = new OreBlock(Items.titanium);
-        oreThorium = new OreBlock(Items.thorium);
+
+        oreCoal = new OreBlock(Items.coal){{
+            oreDefault = true;
+            oreThreshold = 0.846f;
+            oreScale = 24.428572f;
+        }};
+
+        oreTitanium = new OreBlock(Items.titanium){{
+            oreDefault = true;
+            oreThreshold = 0.864f;
+            oreScale = 24.904762f;
+        }};
+
+        oreThorium = new OreBlock(Items.thorium){{
+            oreDefault = true;
+            oreThreshold = 0.882f;
+            oreScale = 25.380953f;
+        }};
 
         //endregion
         //region crafting
diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java
index 2f4cbc3214..d94852cf0d 100644
--- a/core/src/mindustry/maps/Maps.java
+++ b/core/src/mindustry/maps/Maps.java
@@ -338,11 +338,11 @@ public class Maps{
     }
 
     public void addDefaultOres(Array<GenerateFilter> filters){
-        int index = 0;
-        for(Block block : new Block[]{Blocks.oreCopper, Blocks.oreLead, Blocks.oreCoal, Blocks.oreTitanium, Blocks.oreThorium}){
+        Array<Block> ores = content.blocks().select(b -> b.isOverlay() && b.asFloor().oreDefault);
+        for(Block block : ores){
             OreFilter filter = new OreFilter();
-            filter.threshold += index ++ * 0.018f;
-            filter.scl += index/2.1f;
+            filter.threshold = block.asFloor().oreThreshold;
+            filter.scl = block.asFloor().oreScale;
             filter.ore = block;
             filters.add(filter);
         }
diff --git a/core/src/mindustry/world/blocks/Floor.java b/core/src/mindustry/world/blocks/Floor.java
index 4faf2adbe0..c9d7759bc9 100644
--- a/core/src/mindustry/world/blocks/Floor.java
+++ b/core/src/mindustry/world/blocks/Floor.java
@@ -52,6 +52,10 @@ public class Floor extends Block{
     public Effect updateEffect = Fx.none;
     /** Array of affinities to certain things. */
     public Attributes attributes = new Attributes();
+    /** Whether this ore generates in maps by default. */
+    public boolean oreDefault = false;
+    /** Ore generation params. */
+    public float oreScale = 24f, oreThreshold = 0.828f;
 
     protected TextureRegion[][] edges;
     protected byte eq = 0;