Ticket #3808: volcanic_lands.js.patch

File volcanic_lands.js.patch, 2.2 KB (added by Niek, 8 years ago)

Implements retry functionality, add som missing semicolons on the fly

  • binaries/data/mods/public/maps/random/volcanic_lands.js

     
    44var tGrassA = "cliff volcanic light";
    55var tGrassB = "ocean_rock_a";
    66var tGrassC = "ocean_rock_b";
    7 var tCliff = ["cliff volcanic coarse", "cave_walls"]
     7var tCliff = ["cliff volcanic coarse", "cave_walls"];
    88var tDirt = ["ocean_rock_a", "ocean_rock_b"];
    99var tRoad = "road1";
    1010var tRoadWild = "road1";
     
    1111var tShoreBlend = "temp_grass_plants";
    1212var tShore = "temp_plants_bog";
    1313var tWater = "temp_mud_a";
    14 var tLava1 = "LavaTest05"
    15 var tLava2 = "LavaTest04"
    16 var tLava3 = "LavaTest03"
     14var tLava1 = "LavaTest05";
     15var tLava2 = "LavaTest04";
     16var tLava3 = "LavaTest03";
    1717
    1818// gaia entities
    1919var oTree = "gaia/flora_tree_dead";
     
    137137        true, clBaseResource, mX, mZ
    138138    );
    139139    createObjectGroup(group, 0);
     140
     141    // create starting trees
    140142    var hillSize = PI * radius * radius;
    141     // create starting trees
    142143    var num = floor(hillSize / 60);
    143     var tAngle = randFloat(-PI/3, 4*PI/3);
    144     var tDist = randFloat(12, 13);
    145     var tX = round(fx + tDist * cos(tAngle));
    146     var tZ = round(fz + tDist * sin(tAngle));
    147     group = new SimpleGroup(
    148         [new SimpleObject(oTree, num, num, 0,3)],
    149         false, clBaseResource, tX, tZ
    150     );
    151     createObjectGroup(group, 0, avoidClasses(clBaseResource,2));
    152    
     144    var tries = 10;
     145    for (var x = 0; x < tries; ++x)
     146    {
     147        var tAngle = randFloat(-PI/3, 4*PI/3);
     148        var tDist = randFloat(12, 13);
     149        var tX = round(fx + tDist * cos(tAngle));
     150        var tZ = round(fz + tDist * sin(tAngle));
     151        group = new SimpleGroup(
     152            [new SimpleObject(oTree, num, num, 0, 3)],
     153            false, clBaseResource, tX, tZ
     154        );
     155        createObjectGroup(group, 0, avoidClasses(clBaseResource, 2));
     156    }
    153157}
    154158
    155159RMS.SetProgress(15);
     
    160164var fz = fractionToTiles(0.5);
    161165var ix = round(fx);
    162166var iz = round(fz);
    163 var div = scaleByMapSize(1,8)
     167var div = scaleByMapSize(1,8);
    164168var placer = new ClumpPlacer(mapArea * 0.067 / div, 0.7, 0.05, 100, ix, iz);
    165169var terrainPainter = new LayeredPainter(
    166170    [tCliff, tCliff],       // terrains