Skip to content
This repository was archived by the owner on Aug 20, 2024. It is now read-only.

Commit 953ff2d

Browse files
malytomasmalytomas
committed
rebalance ores
1 parent cfa36dc commit 953ff2d

20 files changed

+117
-27
lines changed

‎doodads/ores/aether.doodad ‎doodads/ores/aether_1.doodad

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ package = unnatural/base/ores/ores.pack
33
prototype = unnatural/base/ores/aether_deposit.proto
44

55
[generating]
6-
count = 5
6+
count = 0
77
priority = 15
88

99
[requirements]
10-
radius = 40
10+
radius = 60
1111
buildable = true
1212

1313
[starting]
14-
distance = 600, 600
15-
count = 0, 0
14+
distance = 500, 600
15+
count = 1, 1
1616

1717
[preview]
1818
height = 100

‎doodads/ores/crystals.doodad ‎doodads/ores/crystals_1.doodad

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package = unnatural/base/ores/ores.pack
33
prototype = unnatural/base/ores/crystals_deposit.proto
44

55
[generating]
6-
count = 5
6+
count = 0
77
priority = 14
88

99
[requirements]
10-
radius = 40
10+
radius = 60
1111
buildable = true
1212

1313
[starting]
14-
distance = 400, 500
14+
distance = 300, 400
1515
count = 1, 1
1616

1717
[preview]

‎doodads/ores/crystals_2.doodad

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[doodad]
2+
package = unnatural/base/ores/ores.pack
3+
prototype = unnatural/base/ores/crystals_deposit.proto
4+
5+
[generating]
6+
count = 3
7+
priority = 14
8+
9+
[requirements]
10+
radius = 60
11+
buildable = true
12+
13+
[starting]
14+
distance = 500, 600
15+
count = 0, 1
16+
17+
[preview]
18+
height = 100

‎doodads/ores/metal.doodad ‎doodads/ores/metal_1.doodad

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ package = unnatural/base/ores/ores.pack
33
prototype = unnatural/base/ores/metal_deposit.proto
44

55
[generating]
6-
count = 20
6+
count = 0
77
priority = 10
88

99
[requirements]
10-
radius = 40
10+
radius = 60
1111
buildable = true
1212

1313
[starting]
14-
distance = 150, 250
15-
count = 2, 2
14+
distance = 100, 200
15+
count = 1, 1
1616

1717
[preview]
1818
height = 50

‎doodads/ores/metal_2.doodad

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[doodad]
2+
package = unnatural/base/ores/ores.pack
3+
prototype = unnatural/base/ores/metal_deposit.proto
4+
5+
[generating]
6+
count = 0
7+
priority = 10
8+
9+
[requirements]
10+
radius = 60
11+
buildable = true
12+
13+
[starting]
14+
distance = 200, 300
15+
count = 1, 1
16+
17+
[preview]
18+
height = 50

‎doodads/ores/metal_3.doodad

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[doodad]
2+
package = unnatural/base/ores/ores.pack
3+
prototype = unnatural/base/ores/metal_deposit.proto
4+
5+
[generating]
6+
count = 0
7+
priority = 10
8+
9+
[requirements]
10+
radius = 60
11+
buildable = true
12+
13+
[starting]
14+
distance = 400, 500
15+
count = 0, 1
16+
17+
[preview]
18+
height = 50

‎doodads/ores/metal_4.doodad

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[doodad]
2+
package = unnatural/base/ores/ores.pack
3+
prototype = unnatural/base/ores/metal_deposit.proto
4+
5+
[generating]
6+
count = 10
7+
priority = 10
8+
9+
[requirements]
10+
radius = 60
11+
buildable = true
12+
13+
[starting]
14+
distance = 500, 600
15+
count = 0, 1
16+
17+
[preview]
18+
height = 50

‎doodads/ores/oil.doodad ‎doodads/ores/oil_1.doodad

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package = unnatural/base/ores/ores.pack
33
prototype = unnatural/base/ores/oil_deposit.proto
44

55
[generating]
6-
count = 10
6+
count = 0
77
priority = 12
88

99
[requirements]
10-
radius = 40
10+
radius = 60
1111
buildable = true
1212

1313
[starting]

‎doodads/ores/oil_2.doodad

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[doodad]
2+
package = unnatural/base/ores/ores.pack
3+
prototype = unnatural/base/ores/oil_deposit.proto
4+
5+
[generating]
6+
count = 3
7+
priority = 12
8+
9+
[requirements]
10+
radius = 60
11+
buildable = true
12+
13+
[starting]
14+
distance = 500, 600
15+
count = 0, 1
16+
17+
[preview]
18+
height = 100

‎doodads/vegetation/plant_1.doodad

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package = unnatural/doodads/vegetation/vegetation.pack
33
prototype = unnatural/doodads/vegetation/plant_1.proto
44

55
[generating]
6-
chance = 0.005
6+
chance = 0.01
77

88
[requirements]
99
radius = 10

‎doodads/vegetation/plant_2.doodad

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package = unnatural/doodads/vegetation/vegetation.pack
33
prototype = unnatural/doodads/vegetation/plant_2.proto
44

55
[generating]
6-
chance = 0.003
6+
chance = 0.002
77

88
[requirements]
99
radius = 10

‎doodads/vegetation/plant_3.doodad

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package = unnatural/doodads/vegetation/vegetation.pack
33
prototype = unnatural/doodads/vegetation/plant_3.proto
44

55
[generating]
6-
chance = 0.002
6+
chance = 0.001
77

88
[requirements]
99
radius = 10

‎doodads/vegetation/plant_4.doodad

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package = unnatural/doodads/vegetation/vegetation.pack
33
prototype = unnatural/doodads/vegetation/plant_4.proto
44

55
[generating]
6-
chance = 0.003
6+
chance = 0.001
77

88
[requirements]
99
radius = 10

‎doodads/vegetation/plant_5.doodad

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package = unnatural/doodads/vegetation/vegetation.pack
33
prototype = unnatural/doodads/vegetation/plant_5.proto
44

55
[generating]
6-
chance = 0.003
6+
chance = 0.002
77

88
[requirements]
99
radius = 10

‎doodads/vegetation/tree_1.doodad

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package = unnatural/doodads/vegetation/vegetation.pack
33
prototype = unnatural/doodads/vegetation/tree_1.proto
44

55
[generating]
6-
chance = 0.005
6+
chance = 0.003
77

88
[requirements]
99
radius = 30

‎doodads/vegetation/tree_2.doodad

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package = unnatural/doodads/vegetation/vegetation.pack
33
prototype = unnatural/doodads/vegetation/tree_2.proto
44

55
[generating]
6-
chance = 0.002
6+
chance = 0.001
77

88
[requirements]
99
radius = 30

‎doodads/vegetation/tree_3.doodad

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package = unnatural/doodads/vegetation/vegetation.pack
33
prototype = unnatural/doodads/vegetation/tree_3.proto
44

55
[generating]
6-
chance = 0.002
6+
chance = 0.001
77

88
[requirements]
99
radius = 30
10-
temperature = 13, 30
10+
temperature = 13, 40
1111
precipitation = 20, 300
1212
elevation = 20, 150
1313
slope = 0, 20

‎externals/cage

‎sources/doodads.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ namespace unnatural
295295
std::sort(doodadsDefinitions.begin(), doodadsDefinitions.end(),
296296
[](const DoodadDefinition &a, const DoodadDefinition &b)
297297
{
298-
const auto aa = std::tuple(-a.priority, a.maxCount, a.chance);
299-
const auto bb = std::tuple(-b.priority, b.maxCount, a.chance);
298+
const auto aa = std::tuple(-a.priority, a.maxCount, a.chance, a.startsDistance[0]);
299+
const auto bb = std::tuple(-b.priority, b.maxCount, b.chance, b.startsDistance[0]);
300300
return aa < bb;
301301
});
302302
for (DoodadDefinition &doodad : doodadsDefinitions)

‎sources/meshGeneration.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ namespace unnatural
114114
cfg.iterations = iterations;
115115
cfg.minEdgeLength = 0.15 * tileSize;
116116
cfg.maxEdgeLength = 3 * tileSize;
117-
cfg.approximateError = 0.015 * tileSize;
117+
cfg.approximateError = 0.01 * tileSize;
118118
Holder<Mesh> m = mesh->copy();
119119
meshSimplify(+m, cfg);
120120

@@ -160,7 +160,7 @@ namespace unnatural
160160
cfg.iterations = iterations;
161161
cfg.minEdgeLength = 0.15 * tileSize;
162162
cfg.maxEdgeLength = 5 * tileSize;
163-
cfg.approximateError = 0.015 * tileSize;
163+
cfg.approximateError = 0.01 * tileSize;
164164
Holder<Mesh> m = mesh->copy();
165165
meshSimplify(+m, cfg);
166166

0 commit comments

Comments
 (0)