|
22 | 22 | private static int[] dRoomB = new int[maxDRooms];
|
23 | 23 | private static int numDDoors;
|
24 | 24 | - private static int[] DDoorX = new int[300];
|
25 |
| -- private static int[] DDoorY = new int[300]; |
26 |
| -- private static int[] DDoorPos = new int[300]; |
27 | 25 | + private static int[] DDoorX = new int[3000];
|
| 26 | +- private static int[] DDoorY = new int[300]; |
28 | 27 | + private static int[] DDoorY = new int[3000];
|
| 28 | +- private static int[] DDoorPos = new int[300]; |
29 | 29 | + private static int[] DDoorPos = new int[3000];
|
30 | 30 | private static int numDPlats;
|
31 | 31 | - private static int[] DPlatX = new int[300];
|
32 |
| -- private static int[] DPlatY = new int[300]; |
33 | 32 | + private static int[] DPlatX = new int[3000];
|
| 33 | +- private static int[] DPlatY = new int[300]; |
34 | 34 | + private static int[] DPlatY = new int[3000];
|
35 | 35 | private static int JungleItemCount = 0;
|
36 | 36 | private static int[] JChestX = new int[100];
|
|
171 | 171 | Main.treeX[1] = Main.maxTilesX;
|
172 | 172 | Main.treeX[2] = Main.maxTilesX;
|
173 | 173 | - Main.treeStyle[0] = 0;
|
174 |
| -- Main.treeStyle[1] = 0; |
175 |
| -- Main.treeStyle[2] = 0; |
176 |
| -- Main.treeStyle[3] = 0; |
177 | 174 | + //Main.treeStyle[0] = 0;
|
| 175 | +- Main.treeStyle[1] = 0; |
178 | 176 | + //Main.treeStyle[1] = 0;
|
| 177 | +- Main.treeStyle[2] = 0; |
179 | 178 | + //Main.treeStyle[2] = 0;
|
| 179 | +- Main.treeStyle[3] = 0; |
180 | 180 | + //Main.treeStyle[3] = 0;
|
181 | 181 | noLiquidCheck = false;
|
182 | 182 | Liquid.numLiquid = 0;
|
|
199 | 199 | }
|
200 | 200 |
|
201 | 201 | public static void RandomizeMoonState() {
|
202 |
| -- Main.moonType = genRand.Next(Main.maxMoons); |
203 | 202 | + Main.moonType = Main.setting.MoonStyle;
|
204 | 203 | + if (Main.setting.MoonStyle == 3)
|
205 | 204 | + {
|
| 205 | +- Main.moonType = genRand.Next(Main.maxMoons); |
206 | 206 | + Main.moonType = WorldGen.genRand.Next(Main.maxMoons);
|
207 | 207 | + }
|
208 | 208 | }
|
|
628 | 628 | + // randomness??
|
629 | 629 | + // flatish near bigger middle
|
630 | 630 | if ((double)num702 > (double)Main.maxTilesX * 0.43 && (double)num702 < (double)Main.maxTilesX * 0.57 && num700 >= 3)
|
631 |
| -- num700 = genRand.Next(3); |
632 | 631 | + if(!Main.setting.BypassSpawnAreaFlatness)
|
| 632 | +- num700 = genRand.Next(3); |
633 | 633 | + num700 = genRand.Next(3);
|
634 | 634 |
|
635 | 635 | + // flat near middle
|
636 | 636 | if ((double)num702 > (double)Main.maxTilesX * 0.47 && (double)num702 < (double)Main.maxTilesX * 0.53)
|
637 |
| -- num700 = 0; |
638 | 637 | + if(!Main.setting.BypassSpawnAreaFlatness)
|
| 638 | +- num700 = 0; |
639 | 639 | + num700 = 0;
|
640 | 640 |
|
641 | 641 | - if (num700 == 0) {
|
|
659 | 659 | while (genRand.Next(0, 4) == 0) {
|
660 | 660 | worldSurface += 1.0;
|
661 | 661 | }
|
662 |
| -@@ -3934,6 +_,7 @@ |
663 |
| - worldSurface -= 1.0; |
| 662 | +@@ -3935,6 +_,7 @@ |
664 | 663 | }
|
665 | 664 | }
|
666 | 665 | else if (num700 == 3) {
|
667 | 666 | + // 1/2 chance -1(up) 1/6 chance down
|
668 | 667 | while (genRand.Next(0, 2) == 0) {
|
669 | 668 | worldSurface -= 1.0;
|
| 669 | + } |
670 | 670 | @@ -3944,6 +_,7 @@
|
671 | 671 | }
|
672 | 672 | }
|
|
690 | 690 | num701 = 0;
|
691 | 691 | }
|
692 | 692 | - else if (worldSurface > (double)Main.maxTilesY * 0.3) {
|
693 |
| -- worldSurface = (double)Main.maxTilesY * 0.3; |
694 | 693 | + else if (worldSurface > (double)Main.maxTilesY * Main.setting.SurfaceTerrainHeightMin) { // 0.3 prevent surface from going too deep
|
| 694 | +- worldSurface = (double)Main.maxTilesY * 0.3; |
695 | 695 | + worldSurface = (double)Main.maxTilesY * Main.setting.SurfaceTerrainHeightMin;
|
696 | 696 | num701 = 0;
|
697 | 697 | }
|
|
748 | 748 |
|
749 | 749 | for (int num691 = 0; (double)num691 < Main.worldSurface; num691++) {
|
750 | 750 | if (Main.tile[num690, num691].active()) {
|
751 |
| -- if (num690 == (num687 + num688) / 2 && genRand.Next(6) == 0) { |
752 | 751 | + if (Main.setting.IsPyramid == 2 || Main.setting.IsPyramid == 0) {
|
| 752 | +- if (num690 == (num687 + num688) / 2 && genRand.Next(6) == 0) { |
753 | 753 | + if (num690 == (num687 + num688) / 2 && genRand.Next(6) == 0) {
|
754 | 754 | + PyrX[numPyr] = num690;
|
755 | 755 | + PyrY[numPyr] = num691;
|
|
796 | 796 | AddGenerationPass("Small Holes", delegate (GenerationProgress progress) {
|
797 | 797 | i2 = 0;
|
798 | 798 | progress.Message = Lang.gen[7].Value;
|
799 |
| -- for (int num660 = 0; num660 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 0.0015); num660++) { |
800 | 799 | + if (Main.setting.DeepCaveMult <= 0) return;
|
| 800 | +- for (int num660 = 0; num660 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 0.0015); num660++) { |
801 | 801 | + for (int num660 = 0; num660 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 0.0015 * Main.setting.DeepCaveMult); num660++) {
|
802 | 802 | float value19 = (float)((double)num660 / ((double)(Main.maxTilesX * Main.maxTilesY) * 0.0015));
|
803 | 803 | progress.Set(value19);
|
|
806 | 806 |
|
807 | 807 | AddGenerationPass("Dirt Layer Caves", delegate (GenerationProgress progress) {
|
808 | 808 | progress.Message = Lang.gen[8].Value;
|
809 |
| -- for (int num659 = 0; num659 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 3E-05); num659++) { |
810 | 809 | + if (Main.setting.SurfaceCaveMult <= 0) return;
|
| 810 | +- for (int num659 = 0; num659 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 3E-05); num659++) { |
811 | 811 | + for (int num659 = 0; num659 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 3E-05 * Main.setting.SurfaceCaveMult); num659++) {
|
812 | 812 | float value18 = (float)((double)num659 / ((double)(Main.maxTilesX * Main.maxTilesY) * 3E-05));
|
813 | 813 | progress.Set(value18);
|
|
816 | 816 |
|
817 | 817 | AddGenerationPass("Rock Layer Caves", delegate (GenerationProgress progress) {
|
818 | 818 | progress.Message = Lang.gen[9].Value;
|
819 |
| -- for (int num658 = 0; num658 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 0.00013); num658++) { |
820 | 819 | + if (Main.setting.DeepCaveMult <= 0) return;
|
| 820 | +- for (int num658 = 0; num658 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 0.00013); num658++) { |
821 | 821 | + for (int num658 = 0; num658 < (int)((double)(Main.maxTilesX * Main.maxTilesY) * 0.00013 * Main.setting.DeepCaveMult); num658++) {
|
822 | 822 | float value17 = (float)((double)num658 / ((double)(Main.maxTilesX * Main.maxTilesY) * 0.00013));
|
823 | 823 | progress.Set(value17);
|
|
826 | 826 |
|
827 | 827 | AddGenerationPass("Surface Caves", delegate (GenerationProgress progress) {
|
828 | 828 | progress.Message = Lang.gen[10].Value;
|
829 |
| -- for (int num648 = 0; num648 < (int)((double)Main.maxTilesX * 0.002); num648++) { |
830 | 829 | + if (Main.setting.SurfaceCaveMult <= 0) return;
|
| 830 | +- for (int num648 = 0; num648 < (int)((double)Main.maxTilesX * 0.002); num648++) { |
831 | 831 | + for (int num648 = 0; num648 < (int)((double)Main.maxTilesX * 0.002 * Main.setting.SurfaceCaveMult); num648++) {
|
832 | 832 | i2 = genRand.Next(0, Main.maxTilesX);
|
833 | 833 | while ((float)i2 > (float)Main.maxTilesX * 0.45f && (float)i2 < (float)Main.maxTilesX * 0.55f) {
|
|
840 | 840 | + float num656 = Main.maxTilesX / 4200f;
|
841 | 841 | for (int num657 = 0; (float)num657 < 5f * num656; num657++) {
|
842 | 842 | try {
|
843 |
| -- Caverer(genRand.Next(100, Main.maxTilesX - 100), genRand.Next((int)Main.rockLayer, Main.maxTilesY - 400)); |
844 | 843 | + if (Main.maxTilesY > 1000)
|
| 844 | +- Caverer(genRand.Next(100, Main.maxTilesX - 100), genRand.Next((int)Main.rockLayer, Main.maxTilesY - 400)); |
845 | 845 | + Caverer(genRand.Next(100, Main.maxTilesX - 100), genRand.Next((int)Main.rockLayer, Main.maxTilesY - 400));
|
846 | 846 | + else
|
847 | 847 | + Caverer(genRand.Next(100, Main.maxTilesX - 100), genRand.Next((int)Main.rockLayer, Main.maxTilesY - 100));
|
|
889 | 889 | + Ybase = (int)Main.worldSurface + (int)(WorldGen.lastMaxTilesY / 24);
|
890 | 890 | + }
|
891 | 891 | + for (int num645 = 0; num645 <= Ybase; num645++) {
|
892 |
| -+ num645 += (int)(genRand.Next(-4, 4) * Main.setting.IceBiomeWidth); |
| 892 | ++ num642 += (int)(genRand.Next(-4, 4) * Main.setting.IceBiomeWidth); |
893 | 893 | + num643 += (int)(genRand.Next(-3, 5) * Main.setting.IceBiomeWidth);
|
894 |
| -+ num645 = Utils.Clamp(num645, 0, Main.maxTilesX); |
| 894 | ++ num642 = Utils.Clamp(num642, 0, Main.maxTilesX); |
895 | 895 | + num643 = Utils.Clamp(num643, 0, Main.maxTilesX);
|
896 | 896 | snowMinX[num645] = num642;
|
897 | 897 | snowMaxX[num645] = num643;
|
|
903 | 903 | + if (Main.setting.NoJungle) return;
|
904 | 904 | progress.Message = Lang.gen[11].Value;
|
905 | 905 | - float num616 = Main.maxTilesX / 4200;
|
906 |
| -- num616 *= 1.5f; |
907 | 906 | + float num616 = Main.maxTilesX / 4200f;
|
| 907 | +- num616 *= 1.5f; |
908 | 908 | + num616 *= 1.5f * Main.setting.JungleScale;
|
909 | 909 | int num617 = 0;
|
910 | 910 | + float yStrength = (Main.maxTilesY / 4200f) * 3.5f * 1.5f; // num616 is xStrength
|
911 | 911 | float num618 = (float)genRand.Next(15, 30) * 0.01f;
|
912 | 912 | if (dungeonSide == -1) {
|
913 | 913 | num618 = 1f - num618;
|
914 |
| -@@ -4512,17 +_,17 @@ |
| 914 | +@@ -4512,38 +_,38 @@ |
915 | 915 |
|
916 | 916 | int num619 = (int)((double)Main.maxTilesY + Main.rockLayer) / 2;
|
917 | 917 | num617 += genRand.Next((int)(-100f * num616), (int)(101f * num616));
|
|
933 | 933 | + num619 += genRand.Next((int)(-150f * yStrength), (int)(151f * yStrength));
|
934 | 934 | int num623 = num617;
|
935 | 935 | int num624 = num619;
|
936 |
| -@@ -4530,20 +_,20 @@ |
| 936 | + int num625 = num617; |
937 | 937 | int num626 = num619;
|
938 | 938 | TileRunner(num617, num619, genRand.Next((int)(250f * num616), (int)(500f * num616)), genRand.Next(50, 150), 59);
|
939 | 939 | mudWall = false;
|
|
1230 | 1230 | progress.Message = Lang.gen[18].Value;
|
1231 | 1231 | progress.Set(0f);
|
1232 | 1232 | int num540 = Main.maxTilesY - genRand.Next(150, 190);
|
1233 |
| -@@ -5024,22 +_,23 @@ |
| 1233 | +@@ -5024,22 +_,24 @@ |
1234 | 1234 | }
|
1235 | 1235 | }
|
1236 | 1236 |
|
|
1252 | 1252 | progress.Set(value16);
|
1253 | 1253 | int num538 = genRand.Next(300, Main.maxTilesX - 300);
|
1254 | 1254 | while (num538 > Main.maxTilesX / 2 - 100 && num538 < Main.maxTilesX / 2 + 100) {
|
1255 |
| -- num538 = genRand.Next(300, Main.maxTilesX - 300); |
| 1255 | + num538 = genRand.Next(300, Main.maxTilesX - 300); |
1256 | 1256 | + if (Main.maxTilesX <= 600) num538 = genRand.Next(0, Main.maxTilesX);
|
1257 | 1257 | }
|
1258 | 1258 |
|
|
0 commit comments