From 69b7f39bf110b2946a76667b748c891ed7b1e771 Mon Sep 17 00:00:00 2001 From: elexis Date: Sat, 25 Nov 2017 22:17:01 +0000 Subject: [PATCH] Rename RMS to Engine. This was SVN commit r20525. --- .../mods/public/maps/random/aegean_sea.js | 18 +++---- .../mods/public/maps/random/african_plains.js | 18 +++---- .../mods/public/maps/random/alpine_lakes.js | 16 +++---- .../mods/public/maps/random/alpine_valley.js | 22 ++++----- .../data/mods/public/maps/random/ambush.js | 18 +++---- .../public/maps/random/anatolian_plateau.js | 20 ++++---- .../mods/public/maps/random/archipelago.js | 18 +++---- .../mods/public/maps/random/arctic_summer.js | 18 +++---- .../public/maps/random/ardennes_forest.js | 26 +++++----- .../public/maps/random/atlas_mountains.js | 16 +++---- .../public/maps/random/belgian_uplands.js | 10 ++-- .../public/maps/random/botswanan_haven.js | 24 +++++----- .../public/maps/random/caledonian_meadows.js | 16 +++---- .../maps/random/cantabrian_highlands.js | 32 ++++++------- .../data/mods/public/maps/random/canyon.js | 14 +++--- .../data/mods/public/maps/random/continent.js | 16 +++---- .../public/maps/random/corinthian_isthmus.js | 16 +++---- .../data/mods/public/maps/random/corsica.js | 14 +++--- .../maps/random/cycladic_archipelago.js | 40 ++++++++-------- .../data/mods/public/maps/random/danubius.js | 36 +++++++------- .../mods/public/maps/random/deep_forest.js | 12 ++--- .../data/mods/public/maps/random/empire.js | 20 ++++---- .../public/maps/random/english_channel.js | 18 +++---- .../public/maps/random/extinct_volcano.js | 42 ++++++++-------- .../data/mods/public/maps/random/flood.js | 12 ++--- .../data/mods/public/maps/random/fortress.js | 30 ++++++------ .../data/mods/public/maps/random/frontier.js | 20 ++++---- binaries/data/mods/public/maps/random/gear.js | 14 +++--- .../public/maps/random/guadalquivir_river.js | 14 +++--- .../public/maps/random/gulf_of_bothnia.js | 14 +++--- .../data/mods/public/maps/random/harbor.js | 24 +++++----- .../mods/public/maps/random/hells_pass.js | 20 ++++---- .../public/maps/random/hyrcanian_shores.js | 26 +++++----- .../data/mods/public/maps/random/india.js | 12 ++--- .../public/maps/random/island_stronghold.js | 18 +++---- .../data/mods/public/maps/random/islands.js | 20 ++++---- .../data/mods/public/maps/random/kerala.js | 16 +++---- binaries/data/mods/public/maps/random/lake.js | 14 +++--- .../data/mods/public/maps/random/latium.js | 24 +++++----- .../data/mods/public/maps/random/lions_den.js | 26 +++++----- .../mods/public/maps/random/lorraine_plain.js | 12 ++--- .../data/mods/public/maps/random/mainland.js | 18 +++---- .../data/mods/public/maps/random/migration.js | 48 +++++++++---------- .../maps/random/neareastern_badlands.js | 34 ++++++------- .../mods/public/maps/random/new_rms_test.js | 2 +- .../public/maps/random/northern_lights.js | 12 ++--- .../data/mods/public/maps/random/oasis.js | 16 +++---- .../public/maps/random/persian_highlands.js | 24 +++++----- .../public/maps/random/phoenician_levant.js | 18 +++---- .../data/mods/public/maps/random/polar_sea.js | 22 ++++----- .../public/maps/random/pyrenean_sierra.js | 24 +++++----- .../public/maps/random/rhine_marshlands.js | 24 +++++----- .../public/maps/random/river_archipelago.js | 18 +++---- .../data/mods/public/maps/random/rivers.js | 18 +++---- .../public/maps/random/rmbiome/randombiome.js | 6 +-- .../mods/public/maps/random/rmgen/library.js | 2 +- .../mods/public/maps/random/rmgen/mapgen.js | 4 +- .../mods/public/maps/random/rmgen2/gaia.js | 2 +- .../mods/public/maps/random/saharan_oases.js | 10 ++-- .../data/mods/public/maps/random/sahel.js | 12 ++--- .../maps/random/sahel_watering_holes.js | 20 ++++---- .../mods/public/maps/random/schwarzwald.js | 20 ++++---- .../public/maps/random/snowflake_searocks.js | 20 ++++---- .../mods/public/maps/random/stronghold.js | 18 +++---- .../maps/random/survivalofthefittest.js | 16 +++---- .../data/mods/public/maps/random/syria.js | 18 +++---- .../data/mods/public/maps/random/the_nile.js | 18 +++---- .../maps/random/the_unknown/unknown_common.js | 18 +++---- .../data/mods/public/maps/random/unknown.js | 6 +-- .../mods/public/maps/random/unknown_land.js | 6 +-- .../mods/public/maps/random/unknown_nomad.js | 6 +-- .../mods/public/maps/random/volcanic_lands.js | 12 ++--- .../data/mods/public/maps/random/wall_demo.js | 2 +- .../data/mods/public/maps/random/wild_lake.js | 14 +++--- source/graphics/MapGenerator.cpp | 2 +- 75 files changed, 663 insertions(+), 663 deletions(-) diff --git a/binaries/data/mods/public/maps/random/aegean_sea.js b/binaries/data/mods/public/maps/random/aegean_sea.js index 0953ced1ea..0395f16661 100644 --- a/binaries/data/mods/public/maps/random/aegean_sea.js +++ b/binaries/data/mods/public/maps/random/aegean_sea.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); TILE_CENTERED_HEIGHT_MAP = true; @@ -140,7 +140,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aBush1, clBaseResource, radius); } -RMS.SetProgress(30); +Engine.SetProgress(30); paintRiver({ "parallel": false, @@ -165,7 +165,7 @@ paintRiver({ paintTerrainBasedOnHeight(-20, 1, 0, tWater); paintTerrainBasedOnHeight(1, 2, 0, tShore); -RMS.SetProgress(40); +Engine.SetProgress(40); createBumps(avoidClasses(clWater, 2, clPlayer, 20)); var [forestTrees, stragglerTrees] = getTreeCounts(500, 3000, 0.7); @@ -175,7 +175,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); if (randBool()) createHills([tGrass, tCliff, tHill], avoidClasses(clPlayer, 20, clForest, 1, clHill, 15, clWater, 3), clHill, scaleByMapSize(3, 15)); @@ -191,7 +191,7 @@ createLayeredPatches( scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating dirt patches..."); createLayeredPatches( @@ -202,7 +202,7 @@ createLayeredPatches( scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating undersea bumps..."); createAreas( @@ -267,7 +267,7 @@ createMines( clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); createDecoration ( @@ -281,7 +281,7 @@ createDecoration avoidClasses(clWater, 2, clForest, 0, clPlayer, 0, clHill, 1) ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -320,7 +320,7 @@ createFood avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10) ); -RMS.SetProgress(90); +Engine.SetProgress(90); var types = [oDatePalm, oSDatePalm, oCarob, oFanPalm, oPoplar, oCypress]; createStragglerTrees( diff --git a/binaries/data/mods/public/maps/random/african_plains.js b/binaries/data/mods/public/maps/random/african_plains.js index 6396c4b432..04a7ac00bb 100644 --- a/binaries/data/mods/public/maps/random/african_plains.js +++ b/binaries/data/mods/public/maps/random/african_plains.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); var tPrimary = ["savanna_grass_a"]; var tForestFloor = "savanna_forestfloor_a"; @@ -42,7 +42,7 @@ InitMap(); const numPlayers = getNumPlayers(); const mapSize = getMapSize(); -RMS.SetProgress(20); +Engine.SetProgress(20); var clPlayer = createTileClass(); var clHill = createTileClass(); @@ -122,10 +122,10 @@ for (var i = 0; i < numPlayers; ++i) ); createObjectGroup(group, 0, avoidClasses(clBaseResource,2)); } -RMS.SetProgress(20); +Engine.SetProgress(20); createHills([tDirt2, tCliff, tGrassShrubs], avoidClasses(clPlayer, 35, clForest, 20, clHill, 20, clWater, 2), clHill, scaleByMapSize(5, 8)); -RMS.SetProgress(30); +Engine.SetProgress(30); var lakeAreas = []; var playerConstraint = new AvoidTileClassConstraint(clPlayer, 20); @@ -147,7 +147,7 @@ createAreas( avoidClasses(clPlayer, 22, clWater, 8, clHill, 2), scaleByMapSize(2, 5) ); -RMS.SetProgress(45); +Engine.SetProgress(45); paintTerrainBasedOnHeight(3, floor(scaleByMapSize(20, 40)), 0, tCliff); paintTerrainBasedOnHeight(floor(scaleByMapSize(20, 40)), 100, 3, tGrass); @@ -185,7 +185,7 @@ createPatches( avoidClasses(clWater, 3, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating stone mines..."); createMines( @@ -204,7 +204,7 @@ createMines( avoidClasses(clWater, 4, clForest, 4, clPlayer, 20, clMetal, 18, clRock, 5, clHill, 4), clMetal ); -RMS.SetProgress(70); +Engine.SetProgress(70); createDecoration( [ @@ -217,7 +217,7 @@ createDecoration( ], avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0) ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating giraffes..."); var group = new SimpleGroup( @@ -296,7 +296,7 @@ createFood( ], [avoidClasses(clFood, 20), stayClasses(clWater, 6)], clFood); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oBaobab], diff --git a/binaries/data/mods/public/maps/random/alpine_lakes.js b/binaries/data/mods/public/maps/random/alpine_lakes.js index 1a04be595d..526298e2bf 100644 --- a/binaries/data/mods/public/maps/random/alpine_lakes.js +++ b/binaries/data/mods/public/maps/random/alpine_lakes.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); // late spring if (randBool()) @@ -178,12 +178,12 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating hills..."); createMountains(tCliff, avoidClasses(clPlayer, 20, clHill, 8), clHill, scaleByMapSize(10, 40) * numPlayers, floor(scaleByMapSize(40, 60)), floor(scaleByMapSize(4, 5)), floor(scaleByMapSize(7, 15)), floor(scaleByMapSize(5, 15))); -RMS.SetProgress(30); +Engine.SetProgress(30); var lakeAreas = []; var playerConstraint = new AvoidTileClassConstraint(clPlayer, 20); @@ -243,7 +243,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating dirt patches..."); createLayeredPatches( @@ -261,7 +261,7 @@ createPatches( avoidClasses(clWater, 3, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating stone mines..."); createMines( @@ -281,7 +281,7 @@ createMines( clMetal ); -RMS.SetProgress(70); +Engine.SetProgress(70); createDecoration ( @@ -301,7 +301,7 @@ createDecoration avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0) ); -RMS.SetProgress(75); +Engine.SetProgress(75); createFood ( @@ -338,7 +338,7 @@ createFood [avoidClasses(clFood, 20), stayClasses(clWater, 6)] ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oPine], diff --git a/binaries/data/mods/public/maps/random/alpine_valley.js b/binaries/data/mods/public/maps/random/alpine_valley.js index b11070b8f6..d61bc286aa 100644 --- a/binaries/data/mods/public/maps/random/alpine_valley.js +++ b/binaries/data/mods/public/maps/random/alpine_valley.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); TILE_CENTERED_HEIGHT_MAP = true; @@ -155,7 +155,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); //place the mountains var points = []; @@ -363,7 +363,7 @@ createAreas( new SmoothElevationPainter(ELEVATION_MODIFY, 2, 2), avoidClasses(clPlayer, 10), scaleByMapSize(100, 200)); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating hills..."); createAreas( @@ -376,7 +376,7 @@ createAreas( avoidClasses(clPlayer, 20, clHill, 14), scaleByMapSize(10, 80) * numPlayers ); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(500, 3000, 0.7); @@ -396,7 +396,7 @@ for (let type of types) ], avoidClasses(clPlayer, 12, clForest, 10, clHill, 0), num); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -417,7 +417,7 @@ for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5 avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45)); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); @@ -439,7 +439,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clForest, 1, clPlayer, 20, clMetal, 10, clRock, 5, clHill, 1), scaleByMapSize(4,16), 100 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -462,7 +462,7 @@ createObjectGroupsDeprecated( avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating deer..."); group = new SimpleGroup( @@ -493,7 +493,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), 3 * numPlayers, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oPine], @@ -511,7 +511,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clHill, 2, clPlayer, 2, clDirt, 0), planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large grass tufts..."); group = new SimpleGroup( @@ -521,7 +521,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/ambush.js b/binaries/data/mods/public/maps/random/ambush.js index c2e62f4fd7..51f61487fd 100644 --- a/binaries/data/mods/public/maps/random/ambush.js +++ b/binaries/data/mods/public/maps/random/ambush.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmgen2"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen2"); +Engine.LoadLibrary("rmbiome"); InitMap(); @@ -8,11 +8,11 @@ setSelectedBiome(); initTileClasses(); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); -RMS.SetProgress(10); +Engine.SetProgress(10); const pos = randomStartingPositionPattern(getTeamsArray()); addBases(pos.setup, pos.distance, pos.separation, randFloat(0, 2 * Math.PI)); -RMS.SetProgress(20); +Engine.SetProgress(20); addElements([ { @@ -39,7 +39,7 @@ addElements([ "amounts": ["tons"] } ]); -RMS.SetProgress(30); +Engine.SetProgress(30); addElements([ { @@ -70,7 +70,7 @@ addElements([ "amounts": ["normal"] } ]); -RMS.SetProgress(50); +Engine.SetProgress(50); addElements(shuffleArray([ { @@ -138,7 +138,7 @@ addElements(shuffleArray([ "amounts": ["normal"] } ])); -RMS.SetProgress(70); +Engine.SetProgress(70); addElements(shuffleArray([ { @@ -188,6 +188,6 @@ addElements(shuffleArray([ "amounts": ["many"] } ])); -RMS.SetProgress(90); +Engine.SetProgress(90); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/anatolian_plateau.js b/binaries/data/mods/public/maps/random/anatolian_plateau.js index 3eb8d19e47..9426fb7ddf 100644 --- a/binaries/data/mods/public/maps/random/anatolian_plateau.js +++ b/binaries/data/mods/public/maps/random/anatolian_plateau.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["steppe_grass_a", "steppe_grass_b", "steppe_grass_c", "steppe_grass_d"]; const tForestFloor = "steppe_grass_c"; @@ -120,7 +120,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating bumps..."); createAreas( @@ -143,7 +143,7 @@ for (let type of types) ], avoidClasses(clPlayer, 13, clForest, 20, clHill, 1), num); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating grass patches..."); createLayeredPatches( @@ -163,7 +163,7 @@ createLayeredPatches( scaleByMapSize(50, 90), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating big patches..."); createLayeredPatches( @@ -174,7 +174,7 @@ createLayeredPatches( scaleByMapSize(30, 90), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); @@ -197,7 +197,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(2,8), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -221,7 +221,7 @@ createObjectGroupsDeprecated( scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating rabbits..."); group = new SimpleGroup( @@ -243,7 +243,7 @@ createObjectGroupsDeprecated(group, 0, randIntInclusive(1, 4) * numPlayers + 2, 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating sheep..."); group = new SimpleGroup( @@ -255,7 +255,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oBush, oPoplar], @@ -272,7 +272,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(13, 200) ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/archipelago.js b/binaries/data/mods/public/maps/random/archipelago.js index 2b4e846982..8244ffc0be 100644 --- a/binaries/data/mods/public/maps/random/archipelago.js +++ b/binaries/data/mods/public/maps/random/archipelago.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); TILE_CENTERED_HEIGHT_MAP = true; @@ -197,7 +197,7 @@ createForests( [avoidClasses(clPlayer, 20, clForest, 17, clHill, 0), stayClasses(clLand, 4)], clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -215,7 +215,7 @@ createPatches( [avoidClasses(clForest, 0, clHill, 0, clDirt, 3, clPlayer, 12), stayClasses(clLand, 7)], scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); createMines( @@ -235,7 +235,7 @@ createMines( [avoidClasses(clForest, 1, clPlayer, 7, clMetal, 10, clRock, 5, clHill, 1), stayClasses(clLand, 6)], clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); var planetm = currentBiome() == "tropic" ? 8 : 1; createDecoration @@ -255,7 +255,7 @@ createDecoration ], [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 5)] ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -269,7 +269,7 @@ createFood ], [avoidClasses(clForest, 0, clPlayer, 1, clHill, 1, clFood, 20), stayClasses(clLand, 3)] ); -RMS.SetProgress(75); +Engine.SetProgress(75); createFood ( @@ -281,7 +281,7 @@ createFood ], [avoidClasses(clForest, 0, clPlayer, 1, clHill, 1, clFood, 10), stayClasses(clLand, 3)] ); -RMS.SetProgress(80); +Engine.SetProgress(80); createFood ( @@ -294,7 +294,7 @@ createFood avoidClasses(clLand, 3, clPlayer, 2, clFood, 20) ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], diff --git a/binaries/data/mods/public/maps/random/arctic_summer.js b/binaries/data/mods/public/maps/random/arctic_summer.js index 6ec9793f93..6efb42774a 100644 --- a/binaries/data/mods/public/maps/random/arctic_summer.js +++ b/binaries/data/mods/public/maps/random/arctic_summer.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); setFogThickness(0.46); setFogFactor(0.5); @@ -145,7 +145,7 @@ for (let i = 0; i < numPlayers; i++) } } } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating hills..."); createHills( @@ -158,7 +158,7 @@ createHills( clHill, scaleByMapSize(1, 240)); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating lakes..."); createAreas( @@ -175,7 +175,7 @@ createAreas( avoidClasses(clPlayer, 15), scaleByMapSize(1, 20)); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating bumps..."); createBumps(avoidClasses(clPlayer, 6, clWater, 2), scaleByMapSize(30, 300), 1, 8, 4, 0, 3); @@ -193,7 +193,7 @@ createForests( clWater, 2), clForest, forestTrees); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating dirt patches..."); createLayeredPatches( @@ -234,7 +234,7 @@ createPatches( clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating stone mines..."); createMines( @@ -263,7 +263,7 @@ createMines( clRock, 5, clHill, 1), clMetal); -RMS.SetProgress(70); +Engine.SetProgress(70); createDecoration( [ @@ -284,7 +284,7 @@ createDecoration( clForest, 0, clPlayer, 0, clHill, 0)); -RMS.SetProgress(75); +Engine.SetProgress(75); createFood( [ @@ -348,7 +348,7 @@ createFood( ], clFood); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oBush, oBush2], diff --git a/binaries/data/mods/public/maps/random/ardennes_forest.js b/binaries/data/mods/public/maps/random/ardennes_forest.js index bd0d8ad87d..5ae141f46a 100644 --- a/binaries/data/mods/public/maps/random/ardennes_forest.js +++ b/binaries/data/mods/public/maps/random/ardennes_forest.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); InitMap(); @@ -71,7 +71,7 @@ createArea( ], null); -RMS.SetProgress(5); +Engine.SetProgress(5); // Find all hills var noise0 = new Noise2D(20); @@ -117,7 +117,7 @@ function playerNearness(x, z) return 1; } -RMS.SetProgress(10); +Engine.SetProgress(10); for (var i=0; i < numPlayers; i++) { @@ -198,7 +198,7 @@ for (let i = 0; i < numPlayers; ++i) new ClumpPlacer(250, 0.95, 0.3, 0.1, Math.floor(playerX[i]), Math.floor(playerZ[i])), paintClass(clPlayer)); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating hills..."); for (let size of [scaleByMapSize(50, 800), scaleByMapSize(50, 400), scaleByMapSize(10, 30), scaleByMapSize(10, 30)]) @@ -284,7 +284,7 @@ for (let size of [scaleByMapSize(50, 800), scaleByMapSize(50, 400), scaleByMapSi } } -RMS.SetProgress(50); +Engine.SetProgress(50); var explorableArea = {}; explorableArea.points = []; @@ -313,7 +313,7 @@ for (var ix = 0; ix < mapSize; ix++) } } -RMS.SetProgress(55); +Engine.SetProgress(55); // Add some general noise - after placing height dependant trees for (var ix = 0; ix < mapSize; ix++) @@ -329,7 +329,7 @@ for (var ix = 0; ix < mapSize; ix++) } } -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(400, 6000, 0.8); @@ -362,7 +362,7 @@ createAreasInAreas( [explorableArea] ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating grass patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -380,7 +380,7 @@ for (let size of [scaleByMapSize(20, 120)]) avoidClasses(clForest, 1, clHill, 2, clPlayer, 5), scaleByMapSize(4, 12)); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 1,2, 0,4), new SimpleObject(oStoneLarge, 0,1, 0,4)], true, clRock); @@ -406,7 +406,7 @@ createObjectGroupsByAreasDeprecated(group, 0, [explorableArea] ); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating wildlife..."); group = new SimpleGroup( @@ -439,7 +439,7 @@ createObjectGroupsByAreasDeprecated(group, 0, [explorableArea] ); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating berry bush..."); group = new SimpleGroup( @@ -469,7 +469,7 @@ createObjectGroupsByAreasDeprecated( [explorableArea] ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating straggler trees..."); var types = [oOak, oOakLarge, oPine, oAleppoPine]; @@ -482,7 +482,7 @@ for (let type of types) num, 20, [explorableArea]); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating grass tufts..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/atlas_mountains.js b/binaries/data/mods/public/maps/random/atlas_mountains.js index c0e0764a80..2381c72dd0 100644 --- a/binaries/data/mods/public/maps/random/atlas_mountains.js +++ b/binaries/data/mods/public/maps/random/atlas_mountains.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["medit_rocks_grass_shrubs", "medit_rocks_shrubs"]; const tForestFloor = "medit_grass_field_dry"; @@ -127,13 +127,13 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(10); +Engine.SetProgress(10); createBumps(avoidClasses(clPlayer, 9)); createMountains(tCliff, avoidClasses(clPlayer, 20, clHill, 8), clHill, scaleByMapSize(20, 120)); -RMS.SetProgress(25); +Engine.SetProgress(25); var [forestTrees, stragglerTrees] = getTreeCounts(500, 3000, 0.7); createForests( @@ -142,7 +142,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating dirt patches..."); createLayeredPatches( @@ -162,7 +162,7 @@ createLayeredPatches( scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating stone mines..."); createMines( @@ -182,7 +182,7 @@ createMines( clMetal ); -RMS.SetProgress(60); +Engine.SetProgress(60); createDecoration ( @@ -202,7 +202,7 @@ createDecoration avoidClasses(clForest, 0, clPlayer, 0, clHill, 0) ); -RMS.SetProgress(75); +Engine.SetProgress(75); createFood ( @@ -247,7 +247,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(80); +Engine.SetProgress(80); createStragglerTrees( [oCarob, oAleppoPine], diff --git a/binaries/data/mods/public/maps/random/belgian_uplands.js b/binaries/data/mods/public/maps/random/belgian_uplands.js index 75756c9d72..be171cf804 100644 --- a/binaries/data/mods/public/maps/random/belgian_uplands.js +++ b/binaries/data/mods/public/maps/random/belgian_uplands.js @@ -3,8 +3,8 @@ var timeArray = []; timeArray.push(Date.now()); // Importing rmgen libraries -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("heightmap"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("heightmap"); InitMap(); @@ -94,7 +94,7 @@ var minTerrainDistToBorder = 3; // Time check 1 timeArray.push(Date.now()); -RMS.SetProgress(5); +Engine.SetProgress(5); // START THE GIANT WHILE LOOP: // - Generate Heightmap @@ -259,7 +259,7 @@ while (!goodStartPositionsFound) // Time check 2 timeArray.push(Date.now()); -RMS.SetProgress(60); +Engine.SetProgress(60); //////// // Paint terrain by height and add props @@ -387,7 +387,7 @@ for(var x = minTerrainDistToBorder; x < mapSize - minTerrainDistToBorder; x++) // Time check 3 timeArray.push(Date.now()); -RMS.SetProgress(90); +Engine.SetProgress(90); //////// // Place players and start resources diff --git a/binaries/data/mods/public/maps/random/botswanan_haven.js b/binaries/data/mods/public/maps/random/botswanan_haven.js index f4f84eafbd..2fa1c4f565 100644 --- a/binaries/data/mods/public/maps/random/botswanan_haven.js +++ b/binaries/data/mods/public/maps/random/botswanan_haven.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrassA = "savanna_shrubs_a_wetseason"; const tGrassB = "savanna_shrubs_a"; @@ -152,7 +152,7 @@ for (let i = 0; i < numPlayers; ++i) 0); } } -RMS.SetProgress(15); +Engine.SetProgress(15); log("Creating bumps..."); createAreas( @@ -197,7 +197,7 @@ createObjectGroupsDeprecated( stayClasses(clWater, 1), scaleByMapSize(400, 1000), 100); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating bumps..."); createAreas( @@ -216,7 +216,7 @@ for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, ], avoidClasses(clWater, 1, clHill, 0, clDirt, 5, clPlayer, 8), scaleByMapSize(15, 45)); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating stone mines..."); createObjectGroupsDeprecated( @@ -246,7 +246,7 @@ createObjectGroupsDeprecated( [avoidClasses(clWater, 0, clPlayer, 20, clMetal, 10, clRock, 5, clHill, 1)], scaleByMapSize(4, 16), 100); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating small decorative rocks..."); createObjectGroupsDeprecated( @@ -255,7 +255,7 @@ createObjectGroupsDeprecated( avoidClasses(clPlayer, 1), scaleByMapSize(16, 262), 50); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating large decorative rocks..."); createObjectGroupsDeprecated( @@ -269,7 +269,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(8, 131), 50); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating lions..."); createObjectGroupsDeprecated( @@ -328,7 +328,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 0, clForest, 0, clPlayer, 20, clHill, 1, clFood, 13), 3 * numPlayers, 50); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating rabbits..."); createObjectGroupsDeprecated( @@ -373,14 +373,14 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10), randIntInclusive(1, 4) * numPlayers + 2, 50); -RMS.SetProgress(80); +Engine.SetProgress(80); createStragglerTrees( [oToona, oBaobab, oBush, oBush], avoidClasses(clForest, 1, clWater, 1, clHill, 1, clPlayer, 13, clMetal, 1, clRock, 1), clForest, scaleByMapSize(60, 500)); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating small grass tufts..."); createObjectGroupsDeprecated( @@ -388,7 +388,7 @@ createObjectGroupsDeprecated( 0, avoidClasses(clWater, 2, clPlayer, 13, clDirt, 0), scaleByMapSize(13, 200)); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large grass tufts..."); createObjectGroupsDeprecated( @@ -399,7 +399,7 @@ createObjectGroupsDeprecated( 0, avoidClasses(clWater, 3, clPlayer, 13, clDirt, 1, clForest, 0), scaleByMapSize(13, 200)); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); createObjectGroupsDeprecated( diff --git a/binaries/data/mods/public/maps/random/caledonian_meadows.js b/binaries/data/mods/public/maps/random/caledonian_meadows.js index 3897ef2829..7fe6ec96b3 100644 --- a/binaries/data/mods/public/maps/random/caledonian_meadows.js +++ b/binaries/data/mods/public/maps/random/caledonian_meadows.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); -RMS.LoadLibrary("heightmap"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); +Engine.LoadLibrary("heightmap"); InitMap(); @@ -225,7 +225,7 @@ for (let i = 0; i < 5; ++i) // Final rescale rescaleHeightmap(heightRange.min, heightRange.max); -RMS.SetProgress(25); +Engine.SetProgress(25); /** * Prepare terrain texture placement @@ -307,7 +307,7 @@ log("Terrain shape generation and texture presets after " + ((Date.now() - genSt let [playerIDs, startLocations] = sortPlayersByLocation(getStartLocationsByHeightmap({ "min": heighLimits[4], "max": heighLimits[5] }, 1000, 30)); log("Start location chosen after " + ((Date.now() - genStartTime) / 1000) + "s"); -RMS.SetProgress(30); +Engine.SetProgress(30); /** * Smooth Start Locations before height region calculation @@ -329,7 +329,7 @@ for (let i = 0; i < startLocations.length; ++i) } log("Paths placed after " + ((Date.now() - genStartTime) / 1000) + "s"); -RMS.SetProgress(45); +Engine.SetProgress(45); /** * Get resource spots after players start locations calculation @@ -340,7 +340,7 @@ for (let i = 0; i < avoidPoints.length; ++i) let resourceSpots = getPointsByHeight({ "min": (heighLimits[3] + heighLimits[4]) / 2, "max": (heighLimits[5] + heighLimits[6]) / 2 }, avoidPoints, clPath); log("Resource spots chosen after " + ((Date.now() - genStartTime) / 1000) + "s"); -RMS.SetProgress(55); +Engine.SetProgress(55); /** * Divide tiles in areas by height and avoid paths @@ -426,7 +426,7 @@ for (let h = 0; h < heighLimits.length; ++h) } log("Terrain texture placement finished after " + ((Date.now() - genStartTime) / 1000) + "s"); -RMS.SetProgress(80); +Engine.SetProgress(80); /** * Add start locations and resource spots after terrain texture and path painting diff --git a/binaries/data/mods/public/maps/random/cantabrian_highlands.js b/binaries/data/mods/public/maps/random/cantabrian_highlands.js index faf4892a6b..71f9e82119 100644 --- a/binaries/data/mods/public/maps/random/cantabrian_highlands.js +++ b/binaries/data/mods/public/maps/random/cantabrian_highlands.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["temp_grass", "temp_grass", "temp_grass_d"]; const tGrassPForest = "temp_plants_bog"; @@ -168,7 +168,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(10); +Engine.SetProgress(10); log("Creating lakes..."); var numLakes = round(scaleByMapSize(1,4) * numPlayers); @@ -182,7 +182,7 @@ var waterAreas = createAreas( avoidClasses(clPlayer, 2, clWater, 20), numLakes ); -RMS.SetProgress(15); +Engine.SetProgress(15); log("Creating reeds..."); var group = new SimpleGroup( @@ -193,7 +193,7 @@ createObjectGroupsByAreasDeprecated(group, 0, numLakes, 100, waterAreas ); -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating fish..."); createObjectGroupsByAreasDeprecated( @@ -207,14 +207,14 @@ createObjectGroupsByAreasDeprecated( 50, waterAreas ); -RMS.SetProgress(25); +Engine.SetProgress(25); createBumps(avoidClasses(clWater, 2, clPlayer, 0)); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating hills..."); createHills([tCliff, tCliff, tHill], avoidClasses(clPlayer, 2, clWater, 5, clHill, 15), clHill, scaleByMapSize(1, 4) * numPlayers); -RMS.SetProgress(35); +Engine.SetProgress(35); var [forestTrees, stragglerTrees] = getTreeCounts(500, 3000, 0.7); createForests( @@ -222,7 +222,7 @@ createForests( avoidClasses(clPlayer, 1, clWater, 3, clForest, 17, clHill, 1), clForest, forestTrees); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating dirt patches..."); createLayeredPatches( @@ -232,7 +232,7 @@ createLayeredPatches( avoidClasses(clWater, 1, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 0), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating grass patches..."); createLayeredPatches( @@ -242,7 +242,7 @@ createLayeredPatches( avoidClasses(clWater, 1, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 0), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating stone mines..."); createMines( @@ -252,7 +252,7 @@ createMines( ], avoidClasses(clWater, 0, clForest, 1, clPlayer, 5, clRock, 10, clHill, 1), clRock); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating metal mines..."); createMines( @@ -262,7 +262,7 @@ createMines( avoidClasses(clWater, 0, clForest, 1, clPlayer, 5, clMetal, 10, clRock, 5, clHill, 1), clMetal ); -RMS.SetProgress(60); +Engine.SetProgress(60); createDecoration ( @@ -281,7 +281,7 @@ createDecoration ], avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0) ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -295,7 +295,7 @@ createFood ], avoidClasses(clWater, 0, clForest, 0, clPlayer, 1, clHill, 1, clFood, 20) ); -RMS.SetProgress(80); +Engine.SetProgress(80); createFood ( @@ -307,14 +307,14 @@ createFood ], avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10) ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oOak, oOakLarge, oPine, oApple], avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 6, clRock, 6), clForest, stragglerTrees); -RMS.SetProgress(90); +Engine.SetProgress(90); setSkySet("cirrus"); setWaterColor(0.447, 0.412, 0.322); // muddy brown diff --git a/binaries/data/mods/public/maps/random/canyon.js b/binaries/data/mods/public/maps/random/canyon.js index d2ed5d91af..a64275eca7 100644 --- a/binaries/data/mods/public/maps/random/canyon.js +++ b/binaries/data/mods/public/maps/random/canyon.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -285,7 +285,7 @@ createArea( new LayeredPainter([tRoad, tRoad], [1]), null); -RMS.SetProgress(20); +Engine.SetProgress(20); paintTerrainBasedOnHeight(3.1, 29, 0, tCliff); paintTileClassBasedOnHeight(3.1, 32, 0, clHill2); @@ -304,7 +304,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -341,7 +341,7 @@ createMines( clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); var planetm = 1; @@ -377,7 +377,7 @@ createObjectGroupsDeprecated( scaleByMapSize(200, 800), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -403,7 +403,7 @@ createFood [avoidClasses(clForest, 0, clPlayer, 4, clHill, 1, clFood, 10, clHill2, 1), stayClasses(clLand, 3)] ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], diff --git a/binaries/data/mods/public/maps/random/continent.js b/binaries/data/mods/public/maps/random/continent.js index 44fd94993e..9c5e78cc2f 100644 --- a/binaries/data/mods/public/maps/random/continent.js +++ b/binaries/data/mods/public/maps/random/continent.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -162,7 +162,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); paintTerrainBasedOnHeight(3, 4, 3, tMainTerrain); paintTerrainBasedOnHeight(1, 3, 0, tShore); @@ -196,7 +196,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -214,7 +214,7 @@ createPatches( [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), stayClasses(clLand, 5)], scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); createMines( @@ -234,7 +234,7 @@ createMines( clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); // create decoration var planetm = 1; @@ -260,7 +260,7 @@ createDecoration [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 5)] ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -297,7 +297,7 @@ createFood avoidClasses(clLand, 2, clFood, 20) ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], diff --git a/binaries/data/mods/public/maps/random/corinthian_isthmus.js b/binaries/data/mods/public/maps/random/corinthian_isthmus.js index 080d16b475..1c3a031f48 100644 --- a/binaries/data/mods/public/maps/random/corinthian_isthmus.js +++ b/binaries/data/mods/public/maps/random/corinthian_isthmus.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); TILE_CENTERED_HEIGHT_MAP = true; @@ -181,7 +181,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aBush1, clBaseResource, radius); } -RMS.SetProgress(40); +Engine.SetProgress(40); createBumps(avoidClasses(clWater, 2, clPlayer, 20)); @@ -192,7 +192,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); if (randBool()) createHills([tGrass, tCliff, tHill], avoidClasses(clPlayer, 20, clForest, 1, clHill, 15, clWater, 3), clHill, scaleByMapSize(3, 15)); @@ -208,7 +208,7 @@ createLayeredPatches( scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating dirt patches..."); createLayeredPatches( @@ -219,7 +219,7 @@ createLayeredPatches( scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating stone mines..."); createMines( @@ -239,7 +239,7 @@ createMines( clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); createDecoration ( @@ -253,7 +253,7 @@ createDecoration avoidClasses(clWater, 2, clForest, 0, clPlayer, 5, clBaseResource, 6, clHill, 1, clRock, 6, clMetal, 6) ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -292,7 +292,7 @@ createFood avoidClasses(clWater, 3, clForest, 0, clPlayer, 20, clHill, 1, clFood, 10, clRock, 6, clMetal, 6) ); -RMS.SetProgress(90); +Engine.SetProgress(90); createStragglerTrees( [oDatePalm, oSDatePalm, oCarob, oFanPalm, oPoplar, oCypress], diff --git a/binaries/data/mods/public/maps/random/corsica.js b/binaries/data/mods/public/maps/random/corsica.js index 1920a277ef..1ec6569f64 100644 --- a/binaries/data/mods/public/maps/random/corsica.js +++ b/binaries/data/mods/public/maps/random/corsica.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); var tGrass = ["medit_grass_field", "medit_grass_field_b", "temp_grass_c"]; var tLushGrass = ["medit_grass_field","medit_grass_field_a"]; @@ -232,7 +232,7 @@ for (let island = 0; island < 2; ++island) } } } -RMS.SetProgress(30); +Engine.SetProgress(30); log("Determining player locations..."); var playerIDs = sortAllPlayers(); @@ -312,7 +312,7 @@ for (var i = 0; i < numPlayers; i++) createObjectGroupsDeprecated(group, 0, [avoidClasses(clBaseResource,3, clSettlement,0), stayClasses(clPlayer,1)], 150, 1000); } -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating bumps"); createAreas( @@ -408,7 +408,7 @@ function getCosricaSardiniaTerrain(mapX, mapZ) return undefined; } -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating mines..."); for (let mine of [eMetalMine, eStoneMine]) @@ -471,7 +471,7 @@ createObjectGroupsDeprecated( scaleByMapSize(350, 2500), 100); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating small decorative rocks..."); createObjectGroupsDeprecated( @@ -545,7 +545,7 @@ for (let group of plantGroups) scaleByMapSize(100, 600), 50); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating animals..."); createObjectGroupsDeprecated( @@ -569,7 +569,7 @@ createObjectGroupsDeprecated( scaleByMapSize(50, 150), 100); -RMS.SetProgress(95); +Engine.SetProgress(95); setSkySet(pickRandom(["cumulus", "sunny"])); diff --git a/binaries/data/mods/public/maps/random/cycladic_archipelago.js b/binaries/data/mods/public/maps/random/cycladic_archipelago.js index 1c95f34743..915a63dc51 100644 --- a/binaries/data/mods/public/maps/random/cycladic_archipelago.js +++ b/binaries/data/mods/public/maps/random/cycladic_archipelago.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tOceanRockDeep = "medit_sea_coral_deep"; const tOceanCoral = "medit_sea_coral_plants"; @@ -216,7 +216,7 @@ for (let i = 0; i < numIslands; ++i) ++nPlayer; } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating bumps..."); createAreasInAreas( @@ -226,7 +226,7 @@ createAreasInAreas( scaleByMapSize(25, 75),15, areas); -RMS.SetProgress(34); +Engine.SetProgress(34); log("Creating hills..."); createAreasInAreas( @@ -240,7 +240,7 @@ createAreasInAreas( scaleByMapSize(5, 30), 15, areas); -RMS.SetProgress(38); +Engine.SetProgress(38); for (var ix = 0; ix < mapSize; ix++) for (var iz = 0; iz < mapSize; iz++) @@ -266,7 +266,7 @@ for (let type of forestTypes) scaleByMapSize(10, 64), 20, areas); -RMS.SetProgress(42); +Engine.SetProgress(42); log("Creating stone mines..."); group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); @@ -274,7 +274,7 @@ createObjectGroupsByAreasDeprecated(group, 0, [avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 5, clRock, 6)], scaleByMapSize(4,16), 200, areas ); -RMS.SetProgress(46); +Engine.SetProgress(46); log("Creating small stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1,3)], true, clRock); @@ -282,7 +282,7 @@ createObjectGroupsByAreasDeprecated(group, 0, [avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 5, clRock, 2)], scaleByMapSize(4,16), 200, areas ); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating metal mines..."); group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,4)], true, clMetal); @@ -290,7 +290,7 @@ createObjectGroupsByAreasDeprecated(group, 0, [avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 5, clMetal, 6, clRock, 6)], scaleByMapSize(4,16), 200, areas ); -RMS.SetProgress(54); +Engine.SetProgress(54); log("Creating shrub patches..."); for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5, 80)]) @@ -304,7 +304,7 @@ for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5 scaleByMapSize(4, 16), 20, areas); -RMS.SetProgress(58); +Engine.SetProgress(58); log("Creating grass patches..."); for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5, 80)]) @@ -318,7 +318,7 @@ for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5 scaleByMapSize(4, 16), 20, areas); -RMS.SetProgress(62); +Engine.SetProgress(62); log("Creating straggler trees..."); for (let tree of [oCarob, oBeech, oLombardyPoplar, oLombardyPoplar, oPine]) @@ -328,7 +328,7 @@ for (let tree of [oCarob, oBeech, oLombardyPoplar, oLombardyPoplar, oPine]) avoidClasses(clWater, 2, clForest, 2, clCity, 3, clBaseResource, 4, clRock, 6, clMetal, 6, clPlayer, 1, clHill, 1), scaleByMapSize(2, 38), 50, areas ); -RMS.SetProgress(66); +Engine.SetProgress(66); log("Create straggler cypresses..."); group = new SimpleGroup( @@ -339,7 +339,7 @@ createObjectGroupsByAreasDeprecated(group, 0, avoidClasses(clWater, 2, clForest, 2, clCity, 3, clBaseResource, 4, clRock, 6, clMetal, 6, clPlayer, 1, clHill, 1), scaleByMapSize(5, 75), 50, areas ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Create straggler date palms..."); group = new SimpleGroup( @@ -350,7 +350,7 @@ createObjectGroupsByAreasDeprecated(group, 0, avoidClasses(clWater, 2, clForest, 1, clCity, 0, clBaseResource, 4, clRock, 6, clMetal, 6, clPlayer, 1, clHill, 1), scaleByMapSize(5, 75), 50, areas ); -RMS.SetProgress(74); +Engine.SetProgress(74); log("Creating rocks..."); group = new SimpleGroup( @@ -361,7 +361,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 0, clCity, 0), scaleByMapSize(30, 180), 50 ); -RMS.SetProgress(78); +Engine.SetProgress(78); log("Creating deer..."); group = new SimpleGroup( @@ -372,7 +372,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 5, clForest, 1, clHill, 1, clCity, 10, clMetal, 6, clRock, 2, clFood, 8), 3 * numPlayers, 50 ); -RMS.SetProgress(82); +Engine.SetProgress(82); log("Creating berry bushes..."); group = new SimpleGroup([new SimpleObject(oBerryBush, 5,7, 0,3)], true, clFood); @@ -380,7 +380,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 2, clForest, 1, clHill, 1, clCity, 10, clMetal, 6, clRock, 2, clFood, 8), 1.5 * numPlayers, 100 ); -RMS.SetProgress(86); +Engine.SetProgress(86); log("Creating Fish..."); group = new SimpleGroup([new SimpleObject(oFish, 1,1, 0,3)], true, clFood); @@ -388,7 +388,7 @@ createObjectGroupsDeprecated(group, 0, [stayClasses(clWater,1),avoidClasses(clFood, 8)], scaleByMapSize(40,200), 100 ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating Whales..."); group = new SimpleGroup([new SimpleObject(oWhale, 1,1, 0,3)], true, clFood); @@ -396,7 +396,7 @@ createObjectGroupsDeprecated(group, 0, [stayClasses(clWater,1),avoidClasses(clFood, 8, clPlayer,4,clIsland,4)], scaleByMapSize(10,40), 100 ); -RMS.SetProgress(94); +Engine.SetProgress(94); log("Creating shipwrecks..."); group = new SimpleGroup([new SimpleObject(oShipwreck, 1,1, 0,3)], true, clFood); @@ -404,7 +404,7 @@ createObjectGroupsDeprecated(group, 0, [stayClasses(clWater,1),avoidClasses(clFood, 8)], scaleByMapSize(6,16), 100 ); -RMS.SetProgress(98); +Engine.SetProgress(98); log("Creating shipwreck debris..."); group = new SimpleGroup([new SimpleObject(oShipDebris, 1,2, 0,4)], true, clFood); @@ -412,7 +412,7 @@ createObjectGroupsDeprecated(group, 0, [stayClasses(clWater,1),avoidClasses(clFood, 8)], scaleByMapSize(10,20), 100 ); -RMS.SetProgress(99); +Engine.SetProgress(99); setSkySet("sunny"); setWaterColor(0.2,0.294,0.49); diff --git a/binaries/data/mods/public/maps/random/danubius.js b/binaries/data/mods/public/maps/random/danubius.js index 68e7a6aff8..0bd021e75b 100644 --- a/binaries/data/mods/public/maps/random/danubius.js +++ b/binaries/data/mods/public/maps/random/danubius.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); // Spawn ships away from the shoreline, but patrol close to the shoreline const triggerPointShipSpawn = "trigger/trigger_point_A"; @@ -309,7 +309,7 @@ if (gallicCC) randFloat(0, 2 * PI)); } } -RMS.SetProgress(10); +Engine.SetProgress(10); var [playerIDs, playerX, playerZ] = playerPlacementRiver(0, 0.6); @@ -392,7 +392,7 @@ for (let i = 0; i < numPlayers; ++i) placeDefaultDecoratives(fx, fz, aBush1, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); paintRiver({ "parallel": true, @@ -426,16 +426,16 @@ paintRiver({ } }); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating shores..."); paintTerrainBasedOnHeight(-20, 1, 0, tWater); paintTerrainBasedOnHeight(1, 2, 0, tShore); -RMS.SetProgress(35); +Engine.SetProgress(35); log("Creating bumps..."); createBumps(avoidClasses(clPlayer, 6, clWater, 2, clPath, 1), scaleByMapSize(30, 300), 1, 8, 4, 0, 3); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating hills..."); if (randBool()) @@ -451,7 +451,7 @@ else clHill, scaleByMapSize(3, 15)); -RMS.SetProgress(45); +Engine.SetProgress(45); var [forestTrees, stragglerTrees] = getTreeCounts(500, 3000, 0.7); createForests( @@ -459,7 +459,7 @@ createForests( avoidClasses(clPlayer, 16, clForest, 17, clWater, 5, clHill, 2, clGauls, 5, clPath, 1), clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating grass patches..."); createLayeredPatches( @@ -469,7 +469,7 @@ createLayeredPatches( avoidClasses(clForest, 0, clPlayer, 10, clWater, 2, clDirt, 2, clHill, 1, clGauls, 5, clPath, 1), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating islands..."); createAreas( @@ -482,7 +482,7 @@ createAreas( [avoidClasses(clIsland, 30), stayClasses (clWater, 10)], scaleByMapSize(1, 4) * numPlayers ); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating island bumps..."); createBumps(stayClasses(clIsland, 2), scaleByMapSize(50, 400), 1, 8, 4, 0, 3); @@ -505,7 +505,7 @@ createObjectGroupsDeprecated( [avoidClasses(clMetal, 10, clRock, 50), stayClasses(clIsland, 5)], 500, 1 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating island towers..."); createObjectGroupsDeprecated( @@ -546,7 +546,7 @@ createObjectGroupsDeprecated( [avoidClasses(clForest, 2, clPlayer, 12, clMetal, 6, clRock, 25, clWater, 4, clHill, 4, clGauls, 5, clPath, 1)], 500, 1 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating decoratives..."); for (let i = 0; i < 2; ++i) @@ -581,7 +581,7 @@ for (let i = 0; i < 2; ++i) avoidClasses(clWater, 4, clForest, 1, clPlayer, 16, clRock, 4, clMetal, 4, clHill, 4, clGauls, 5, clPath, 1) : [stayClasses(clIsland, 4) , avoidClasses(clForest, 1, clRock, 4, clMetal, 4)] ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating fish..."); createFood( @@ -594,7 +594,7 @@ createFood( [avoidClasses(clIsland, 2, clFood, 10, clPath, 1), stayClasses(clWater, 5)], clFood ); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating huntable animals..."); createFood( @@ -631,7 +631,7 @@ createFood( avoidClasses(clIsland, 2, clFood, 10, clWater, 5, clPlayer, 24, clHill, 2, clGauls, 5, clPath, 1), clFood ); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating fruits..."); createFood( @@ -646,7 +646,7 @@ createFood( avoidClasses(clWater, 5, clForest, 2, clPlayer, 16, clHill, 4, clFood, 10, clMetal, 4, clRock, 4, clGauls, 5, clPath, 1), clFood ); -RMS.SetProgress(90); +Engine.SetProgress(90); createStragglerTrees( treeTypes, @@ -659,7 +659,7 @@ createStragglerTrees( [stayClasses(clIsland, 4), avoidClasses(clMetal, 4, clRock, 4, clTower, 4, clOutpost, 4)], clForest, stragglerTrees * 7); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating animals on islands..."); createFood( @@ -676,7 +676,7 @@ createFood( [avoidClasses(clRock, 4, clMetal, 4, clFood, 3, clForest, 1, clOutpost, 2, clTower, 2), stayClasses(clIsland, 4)], clFood ); -RMS.SetProgress(98); +Engine.SetProgress(98); log("Creating treasures..."); for (let i = 0; i < randomTreasureCount; ++i) diff --git a/binaries/data/mods/public/maps/random/deep_forest.js b/binaries/data/mods/public/maps/random/deep_forest.js index f6d9b3446d..e6341fcee5 100644 --- a/binaries/data/mods/public/maps/random/deep_forest.js +++ b/binaries/data/mods/public/maps/random/deep_forest.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); InitMap(); @@ -70,7 +70,7 @@ var resourcePerPlayer = [templateStone, templateMetalMine]; var maxTreeDensity = min(256 * (192 + 8 * numPlayers) / (mapSize * mapSize), 1); // Has to be tweeked but works ok var bushChance = 1/3; // 1 means 50% chance in deepest wood, 0.5 means 25% chance in deepest wood -RMS.SetProgress(2); +Engine.SetProgress(2); // Place bases for (var i=0; i < numPlayers; i++) @@ -102,7 +102,7 @@ for (var i=0; i < numPlayers; i++) } } -RMS.SetProgress(10); +Engine.SetProgress(10); // Place paths var doublePaths = true; @@ -176,7 +176,7 @@ for (var i = 0; i < maxI; i++) } } -RMS.SetProgress(50); +Engine.SetProgress(50); // Place expansion resources for (var i=0; i < numPlayers; i++) @@ -196,7 +196,7 @@ for (var i=0; i < numPlayers; i++) } } -RMS.SetProgress(60); +Engine.SetProgress(60); // Place eyecandy placeObject(mapCenterX, mapCenterZ, templateEC, 0, randFloat(0, 2*PI)); @@ -240,6 +240,6 @@ for (var x = 0; x < mapSize; x++) setHeight(x, z, getHeight(x, z) + hVarMiddleHill + hVarHills + 1); } } -RMS.SetProgress(95); +Engine.SetProgress(95); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/empire.js b/binaries/data/mods/public/maps/random/empire.js index 7bfce1e31e..3518c5cdc3 100644 --- a/binaries/data/mods/public/maps/random/empire.js +++ b/binaries/data/mods/public/maps/random/empire.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmgen2"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen2"); +Engine.LoadLibrary("rmbiome"); InitMap(); @@ -8,12 +8,12 @@ setSelectedBiome(); initTileClasses(); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); -RMS.SetProgress(10); +Engine.SetProgress(10); const teamsArray = getTeamsArray(); const startAngle = randFloat(0, 2 * Math.PI); addBases("stronghold", 0.37, 0.04, startAngle); -RMS.SetProgress(20); +Engine.SetProgress(20); // Change the starting angle and add the players again var rotation = PI; @@ -25,7 +25,7 @@ if (teamsArray.length == 4) rotation = PI + PI / 4; addBases("stronghold", 0.15, 0.04, startAngle + rotation); -RMS.SetProgress(40); +Engine.SetProgress(40); addElements(shuffleArray([ { @@ -72,7 +72,7 @@ addElements(shuffleArray([ "amounts": ["tons"] } ])); -RMS.SetProgress(50); +Engine.SetProgress(50); addElements([ { @@ -105,7 +105,7 @@ addElements([ "amounts": ["normal"] } ]); -RMS.SetProgress(60); +Engine.SetProgress(60); addElements(shuffleArray([ { @@ -159,7 +159,7 @@ addElements(shuffleArray([ "amounts": ["few", "normal", "many", "tons"] } ])); -RMS.SetProgress(80); +Engine.SetProgress(80); addElements(shuffleArray([ { @@ -214,6 +214,6 @@ addElements(shuffleArray([ "amounts": g_AllAmounts } ])); -RMS.SetProgress(90); +Engine.SetProgress(90); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/english_channel.js b/binaries/data/mods/public/maps/random/english_channel.js index 6f89036067..d995d376b7 100644 --- a/binaries/data/mods/public/maps/random/english_channel.js +++ b/binaries/data/mods/public/maps/random/english_channel.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["temp_grass", "temp_grass", "temp_grass_d"]; const tGrassDForest = "temp_plants_bog"; @@ -133,7 +133,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(10); +Engine.SetProgress(10); paintRiver({ "parallel": false, @@ -156,7 +156,7 @@ paintRiver({ } }); -RMS.SetProgress(20); +Engine.SetProgress(20); createTributaryRivers( true, @@ -172,13 +172,13 @@ createTributaryRivers( paintTerrainBasedOnHeight(-5, 1, 1, tWater); paintTerrainBasedOnHeight(1, landHeight, 1, tShore); paintTileClassBasedOnHeight(-6, 0.5, 1, clWater); -RMS.SetProgress(25); +Engine.SetProgress(25); createBumps(avoidClasses(clWater, 5, clPlayer, 20)); -RMS.SetProgress(30); +Engine.SetProgress(30); createHills([tCliff, tCliff, tHill], avoidClasses(clPlayer, 20, clHill, 15, clWater, 5), clHill, scaleByMapSize(1, 4) * numPlayers); -RMS.SetProgress(50); +Engine.SetProgress(50); var [forestTrees, stragglerTrees] = getTreeCounts(500, 3000, 0.7); createForests( @@ -186,7 +186,7 @@ createForests( avoidClasses(clPlayer, 20, clForest, 17, clHill, 0, clWater, 6), clForest, forestTrees); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating dirt patches..."); createLayeredPatches( @@ -205,7 +205,7 @@ createPatches( avoidClasses(clWater, 1, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 6), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating stone mines..."); createMines( @@ -224,7 +224,7 @@ createMines( avoidClasses(clWater, 2, clForest, 1, clPlayer, 20, clMetal, 10, clRock, 5, clHill, 2), clMetal ); -RMS.SetProgress(85); +Engine.SetProgress(85); createDecoration ( diff --git a/binaries/data/mods/public/maps/random/extinct_volcano.js b/binaries/data/mods/public/maps/random/extinct_volcano.js index 1e99460a36..f139044e29 100644 --- a/binaries/data/mods/public/maps/random/extinct_volcano.js +++ b/binaries/data/mods/public/maps/random/extinct_volcano.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tHillDark = "cliff volcanic light"; const tHillMedium1 = "ocean_rock_a"; @@ -179,10 +179,10 @@ for (let i = 0; i < numPlayers; ++i) } } } -RMS.SetProgress(15); +Engine.SetProgress(15); createVolcano(0.5, 0.5, clHill, tHillVeryDark, undefined, false, ELEVATION_SET); -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating lakes..."); createAreas( @@ -194,11 +194,11 @@ createAreas( ], avoidClasses(clPlayer, 0, clHill, 2, clWater, 12), Math.round(scaleByMapSize(6, 12))); -RMS.SetProgress(25); +Engine.SetProgress(25); createBumps(avoidClasses(clPlayer, 0, clHill, 0), scaleByMapSize(50, 300), 1, 10, 3, 0, scaleByMapSize(4, 10)); paintTileClassBasedOnHeight(10, 100, 0, clBumps); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating hills..."); createAreas( @@ -210,7 +210,7 @@ createAreas( ], avoidClasses(clPlayer, 0, clHill, 15, clWater, 2, clBaseResource, 2), scaleByMapSize(2, 8) * numPlayers); -RMS.SetProgress(35); +Engine.SetProgress(35); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(1200, 3000, 0.7); @@ -233,7 +233,7 @@ for (let type of types) clHill, 0, clWater, 2), num); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating hill patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -251,7 +251,7 @@ for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8 clBumps, 0, clPlayer, 0), scaleByMapSize(20, 80)); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating grass patches..."); createLayeredPatches( @@ -267,7 +267,7 @@ createLayeredPatches( clPlayer, 0), scaleByMapSize(3, 8), clDirt); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating stone mines..."); createObjectGroupsDeprecated( @@ -290,7 +290,7 @@ createObjectGroupsDeprecated( ], 100, 100); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating small stone quarries..."); createObjectGroupsDeprecated( @@ -307,7 +307,7 @@ createObjectGroupsDeprecated( ], 100, 100); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating metal mines..."); createObjectGroupsDeprecated( @@ -325,7 +325,7 @@ createObjectGroupsDeprecated( ], 100, 100); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating towers..."); createObjectGroupsDeprecated( @@ -343,7 +343,7 @@ createObjectGroupsDeprecated( ], 500, 1); -RMS.SetProgress(67); +Engine.SetProgress(67); createDecoration( [ @@ -370,7 +370,7 @@ createDecoration( clPlayer, 0, clHill, 0) ]); -RMS.SetProgress(70); +Engine.SetProgress(70); createDecoration( [ @@ -392,7 +392,7 @@ createDecoration( clPlayer, 0, clHill, 0 )); -RMS.SetProgress(75); +Engine.SetProgress(75); createFood( [ @@ -412,7 +412,7 @@ createFood( clFood, 20) ], clFood); -RMS.SetProgress(78); +Engine.SetProgress(78); createFood( [ @@ -432,7 +432,7 @@ createFood( stayClasses(clForest, 2) ], clFood); -RMS.SetProgress(81); +Engine.SetProgress(81); createFood( [ @@ -443,7 +443,7 @@ createFood( ], [stayClasses(clGrass, 1), avoidClasses(clWater, 1, clForest, 0, clPlayer, 0, clHill, 1, clFood, 10)], clFood); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree, oTree2, oTree3, oTree4, oBush], @@ -460,7 +460,7 @@ createStragglerTrees( clForest, stragglerTrees); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating straggler bushes..."); createObjectGroupsDeprecated( @@ -480,7 +480,7 @@ createObjectGroupsDeprecated( clRock, 1) ], stragglerTrees); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating rain drops..."); createObjectGroupsDeprecated( @@ -491,7 +491,7 @@ createObjectGroupsDeprecated( 0, avoidClasses(clRain, 5), scaleByMapSize(80, 250)); -RMS.SetProgress(95); +Engine.SetProgress(95); setSkySet("rain"); setWaterType("lake"); diff --git a/binaries/data/mods/public/maps/random/flood.js b/binaries/data/mods/public/maps/random/flood.js index 8c0136a775..588f805021 100644 --- a/binaries/data/mods/public/maps/random/flood.js +++ b/binaries/data/mods/public/maps/random/flood.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -178,7 +178,7 @@ for (let i = 0; i < numPlayers; ++i) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating central island..."); createArea( @@ -292,7 +292,7 @@ createStragglerTrees( [avoidClasses(clBaseResource, 2, clMetal, 6, clRock, 3, clMountain, 2, clPlayer, 25), stayClasses(clHill, 6)], clForest, stragglerTrees); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating dirt patches..."); var numb = currentBiome() == "savanna" ? 3 : 1; @@ -328,7 +328,7 @@ createFood( [avoidClasses(clForest, 0, clPlayer, 20, clMountain, 1, clFood, 4, clRock, 6, clMetal, 6), stayClasses(clHill, 2)], clFood); -RMS.SetProgress(75); +Engine.SetProgress(75); createFood( [ @@ -338,7 +338,7 @@ createFood( [avoidClasses(clForest, 0, clPlayer, 15, clMountain, 1, clFood, 4, clRock, 6, clMetal, 6), stayClasses(clHill, 2)], clFood); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( types, diff --git a/binaries/data/mods/public/maps/random/fortress.js b/binaries/data/mods/public/maps/random/fortress.js index b01f1bf4bc..b0dd17b0a7 100644 --- a/binaries/data/mods/public/maps/random/fortress.js +++ b/binaries/data/mods/public/maps/random/fortress.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["temp_grass_aut", "temp_grass_aut", "temp_grass_d_aut"]; const tForestFloor = "temp_grass_aut"; @@ -163,7 +163,7 @@ var waterAreas = createAreas( avoidClasses(clPlayer, 7, clWater, 20), numLakes); -RMS.SetProgress(15); +Engine.SetProgress(15); log("Creating reeds..."); createObjectGroupsByAreasDeprecated( @@ -173,7 +173,7 @@ createObjectGroupsByAreasDeprecated( numLakes, 100, waterAreas); -RMS.SetProgress(25); +Engine.SetProgress(25); log("Creating fish..."); createObjectGroupsByAreasDeprecated( @@ -186,14 +186,14 @@ createObjectGroupsByAreasDeprecated( numLakes / 4, 50, waterAreas); -RMS.SetProgress(30); +Engine.SetProgress(30); createBumps(avoidClasses(clWater, 2, clPlayer, 5)); -RMS.SetProgress(35); +Engine.SetProgress(35); log("Creating hills..."); createHills([tCliff, tCliff, tHill], avoidClasses(clPlayer, 5, clWater, 5, clHill, 15), clHill, scaleByMapSize(1, 4) * numPlayers); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(500, 2500, 0.7); @@ -213,7 +213,7 @@ for (let type of types) ], avoidClasses(clPlayer, 5, clWater, 3, clForest, 15, clHill, 1), num); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -223,7 +223,7 @@ createLayeredPatches( avoidClasses(clWater, 1, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 1), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating grass patches..."); createPatches( @@ -232,7 +232,7 @@ createPatches( avoidClasses(clWater, 1, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 1), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating stone mines..."); createMines( @@ -242,7 +242,7 @@ createMines( ], avoidClasses(clWater, 0, clForest, 1, clPlayer, 5, clRock, 10, clHill, 1), clRock); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating metal mines..."); createMines( @@ -252,7 +252,7 @@ createMines( avoidClasses(clWater, 0, clForest, 1, clPlayer, 5, clMetal, 10, clRock, 5, clHill, 1), clMetal ); -RMS.SetProgress(70); +Engine.SetProgress(70); createDecoration ( @@ -271,7 +271,7 @@ createDecoration ], avoidClasses(clWater, 0, clForest, 0, clPlayer, 1, clHill, 0) ); -RMS.SetProgress(80); +Engine.SetProgress(80); createFood ( @@ -285,7 +285,7 @@ createFood ], avoidClasses(clWater, 0, clForest, 0, clPlayer, 6, clHill, 1, clFood, 20) ); -RMS.SetProgress(85); +Engine.SetProgress(85); createFood ( @@ -298,14 +298,14 @@ createFood avoidClasses(clWater, 2, clForest, 0, clPlayer, 6, clHill, 1, clFood, 10) ); -RMS.SetProgress(90); +Engine.SetProgress(90); createStragglerTrees( [oOak, oBeech, oPine], avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 1, clMetal, 6, clRock, 6), clForest, stragglerTrees); -RMS.SetProgress(95); +Engine.SetProgress(95); setSkySet("sunny"); setWaterColor(0.157, 0.149, 0.443); diff --git a/binaries/data/mods/public/maps/random/frontier.js b/binaries/data/mods/public/maps/random/frontier.js index 7d30854086..e8a614104d 100644 --- a/binaries/data/mods/public/maps/random/frontier.js +++ b/binaries/data/mods/public/maps/random/frontier.js @@ -1,12 +1,12 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmgen2"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen2"); +Engine.LoadLibrary("rmbiome"); InitMap(); setSelectedBiome(); initTileClasses(); -RMS.SetProgress(10); +Engine.SetProgress(10); // Pick a random elevation with a bias towards lower elevations var randElevation = randIntInclusive(0, 29); @@ -14,11 +14,11 @@ if (randElevation < 25) randElevation = randIntInclusive(1, 4); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, randElevation); -RMS.SetProgress(20); +Engine.SetProgress(20); const startPositions = randomStartingPositionPattern(getTeamsArray()); addBases(startPositions.setup, startPositions.distance, startPositions.separation, randFloat(0, 2 * Math.PI)); -RMS.SetProgress(40); +Engine.SetProgress(40); var features = [ { @@ -119,7 +119,7 @@ if (randElevation > 20) }); addElements(shuffleArray(features)); -RMS.SetProgress(50); +Engine.SetProgress(50); addElements([ { @@ -152,7 +152,7 @@ addElements([ "amounts": ["normal"] } ]); -RMS.SetProgress(60); +Engine.SetProgress(60); addElements(shuffleArray([ { @@ -207,7 +207,7 @@ addElements(shuffleArray([ "amounts": ["few", "normal", "many", "tons"] } ])); -RMS.SetProgress(70); +Engine.SetProgress(70); addElements(shuffleArray([ { @@ -262,6 +262,6 @@ addElements(shuffleArray([ "amounts": g_AllAmounts } ])); -RMS.SetProgress(90); +Engine.SetProgress(90); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/gear.js b/binaries/data/mods/public/maps/random/gear.js index 32ab2a28dc..fe3db0f41d 100644 --- a/binaries/data/mods/public/maps/random/gear.js +++ b/binaries/data/mods/public/maps/random/gear.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); TILE_CENTERED_HEIGHT_MAP = true; @@ -138,7 +138,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); var split = 1; if (mapSize == 128 && numPlayers <= 2) @@ -278,7 +278,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -296,7 +296,7 @@ createPatches( avoidClasses(clWater, 3, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); createMines( @@ -324,7 +324,7 @@ createObjectGroupsDeprecated( scaleByMapSize(400, 2000), 100); -RMS.SetProgress(65); +Engine.SetProgress(65); var planetm = 1; @@ -349,7 +349,7 @@ createDecoration avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0) ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( diff --git a/binaries/data/mods/public/maps/random/guadalquivir_river.js b/binaries/data/mods/public/maps/random/guadalquivir_river.js index 6a61ad074f..c2b760d16d 100644 --- a/binaries/data/mods/public/maps/random/guadalquivir_river.js +++ b/binaries/data/mods/public/maps/random/guadalquivir_river.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["medit_grass_field_a", "medit_grass_field_b"]; const tForestFloorC = "medit_plants_dirt"; @@ -166,7 +166,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); paintRiver({ "parallel": true, @@ -209,7 +209,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -227,7 +227,7 @@ createPatches( [avoidClasses(clForest, 0, clHill, 0, clDirt, 3, clPlayer, 8, clRiver, 1), stayClasses(clLand, 7)], scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); createMines( @@ -246,7 +246,7 @@ createMines( [avoidClasses(clForest, 1, clPlayer, 20, clMetal, 10, clRock, 5, clHill, 1, clRiver, 1), stayClasses(clLand, 5)], clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); createDecoration ( @@ -279,7 +279,7 @@ createDecoration stayClasses(clShallow, 0) ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -316,7 +316,7 @@ createFood avoidClasses(clLand, 2, clRiver, 1) ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oPoplar, oCarob, oApple], diff --git a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js b/binaries/data/mods/public/maps/random/gulf_of_bothnia.js index 8484089a3a..c35201dd1f 100644 --- a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js +++ b/binaries/data/mods/public/maps/random/gulf_of_bothnia.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); TILE_CENTERED_HEIGHT_MAP = true; var random_terrain = randIntInclusive(1, 3); @@ -218,7 +218,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating the gulf..."); var seaHeight = random_terrain == 3 ? 0 : -3; @@ -273,7 +273,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating dirt patches..."); createLayeredPatches( @@ -291,7 +291,7 @@ createPatches( avoidClasses(clWater, 6, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating stone mines..."); createMines( @@ -311,7 +311,7 @@ createMines( clMetal ); -RMS.SetProgress(70); +Engine.SetProgress(70); var multiplier = random_terrain == 3 ? 0 : 1; createDecoration( @@ -330,7 +330,7 @@ createDecoration( multiplier * scaleByMapSize(13, 200) ], avoidClasses(clWater, 0, clForest, 0, clPlayer, 5, clHill, 0, clBaseResource, 5)); -RMS.SetProgress(75); +Engine.SetProgress(75); createFood( [ @@ -357,7 +357,7 @@ if (random_terrain != 3) [avoidClasses(clFood, 20), stayClasses(clWater, 6)], clFood); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oPine], diff --git a/binaries/data/mods/public/maps/random/harbor.js b/binaries/data/mods/public/maps/random/harbor.js index beaa89dcec..81378a2cdd 100644 --- a/binaries/data/mods/public/maps/random/harbor.js +++ b/binaries/data/mods/public/maps/random/harbor.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmgen2"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen2"); +Engine.LoadLibrary("rmbiome"); InitMap(); @@ -10,24 +10,24 @@ initTileClasses(); setFogFactor(0.04); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); -RMS.SetProgress(10); +Engine.SetProgress(10); const mapSize = getMapSize(); const startAngle = randFloat(0, 2 * Math.PI); const players = addBases("radial", 0.38, 0.05, startAngle); -RMS.SetProgress(20); +Engine.SetProgress(20); addCenterLake(); -RMS.SetProgress(30); +Engine.SetProgress(30); if (mapSize >= 192) { addHarbors(players); - RMS.SetProgress(40); + Engine.SetProgress(40); } addSpines(); -RMS.SetProgress(50); +Engine.SetProgress(50); addElements(shuffleArray([ { @@ -93,7 +93,7 @@ addElements(shuffleArray([ "amounts": g_AllAmounts } ])); -RMS.SetProgress(60); +Engine.SetProgress(60); addElements(shuffleArray([ { @@ -152,7 +152,7 @@ addElements(shuffleArray([ } ])); -RMS.SetProgress(70); +Engine.SetProgress(70); addElements(shuffleArray([ { @@ -211,7 +211,7 @@ addElements(shuffleArray([ } ])); -RMS.SetProgress(80); +Engine.SetProgress(80); addElements([ { @@ -247,7 +247,7 @@ addElements([ } ]); -RMS.SetProgress(90); +Engine.SetProgress(90); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/hells_pass.js b/binaries/data/mods/public/maps/random/hells_pass.js index 6616881e66..e505d8af22 100644 --- a/binaries/data/mods/public/maps/random/hells_pass.js +++ b/binaries/data/mods/public/maps/random/hells_pass.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmgen2"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen2"); +Engine.LoadLibrary("rmbiome"); InitMap(); @@ -8,15 +8,15 @@ setSelectedBiome(); initTileClasses(); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); -RMS.SetProgress(10); +Engine.SetProgress(10); const teamsArray = getTeamsArray(); const startAngle = randFloat(0, 2 * Math.PI); addBases("line", 0.2, 0.08, startAngle); -RMS.SetProgress(20); +Engine.SetProgress(20); placeBarriers(); -RMS.SetProgress(40); +Engine.SetProgress(40); addElements(shuffleArray([ { @@ -69,7 +69,7 @@ addElements(shuffleArray([ "amounts": ["few"] } ])); -RMS.SetProgress(50); +Engine.SetProgress(50); addElements([ { @@ -104,7 +104,7 @@ addElements([ "amounts": ["normal"] } ]); -RMS.SetProgress(60); +Engine.SetProgress(60); addElements(shuffleArray([ { @@ -162,7 +162,7 @@ addElements(shuffleArray([ "amounts": ["few", "normal", "many", "tons"] } ])); -RMS.SetProgress(80); +Engine.SetProgress(80); addElements(shuffleArray([ { @@ -220,7 +220,7 @@ addElements(shuffleArray([ "amounts": g_AllAmounts } ])); -RMS.SetProgress(90); +Engine.SetProgress(90); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/hyrcanian_shores.js b/binaries/data/mods/public/maps/random/hyrcanian_shores.js index 2e6327d3b4..5ff5ed9e8f 100644 --- a/binaries/data/mods/public/maps/random/hyrcanian_shores.js +++ b/binaries/data/mods/public/maps/random/hyrcanian_shores.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["temp_grass_clovers"]; const tGrassPForest = "temp_plants_bog"; @@ -133,7 +133,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(10); +Engine.SetProgress(10); paintRiver({ "parallel": true, @@ -163,7 +163,7 @@ paintRiver({ } }); -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating fish..."); for (let i = 0; i < scaleByMapSize(10, 20); ++i) @@ -173,7 +173,7 @@ for (let i = 0; i < scaleByMapSize(10, 20); ++i) [stayClasses(clWater, 2), avoidClasses(clFood, 3)], numPlayers, 50); -RMS.SetProgress(25); +Engine.SetProgress(25); log("Creating bumps..."); createAreas( @@ -182,7 +182,7 @@ createAreas( stayClasses(clHighlands, 1), scaleByMapSize(300, 600)); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating hills..."); createAreas( @@ -195,7 +195,7 @@ createAreas( avoidClasses(clSea, 5, clPlayer, 20, clWater, 5, clHill, 15, clHighlands, 5), scaleByMapSize(1, 4) * numPlayers); -RMS.SetProgress(35); +Engine.SetProgress(35); log("Creating mainland forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(500, 2500, 0.7); @@ -213,7 +213,7 @@ for (let type of types) ], avoidClasses(clPlayer, 20, clWater, 3, clForest, 10, clHill, 0, clSea, 6, clBaseResource, 3), num); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating highland forests..."); var types = [ @@ -230,7 +230,7 @@ for (let type of types) ], avoidClasses(clPlayer, 20, clWater, 3, clForest, 2, clHill, 0, clSea, 6, clFlatlands, 3), num); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -242,7 +242,7 @@ for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8 ], avoidClasses(clWater, 1, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 4, clSea, 0), scaleByMapSize(15, 45)); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating grass patches..."); for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5, 80)]) @@ -252,7 +252,7 @@ for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5 avoidClasses(clWater, 1, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 6, clSea, 0, clBaseResource, 6), scaleByMapSize(15, 45)); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating stone mines..."); group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); @@ -275,7 +275,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(4,16), 100 ); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -287,7 +287,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0, clSea, 0), scaleByMapSize(16, 262), 50 ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large decorative rocks..."); group = new SimpleGroup( @@ -363,7 +363,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0, clSea, 1), scaleByMapSize(13, 200) ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/india.js b/binaries/data/mods/public/maps/random/india.js index 79c66ea1a8..28877025b3 100644 --- a/binaries/data/mods/public/maps/random/india.js +++ b/binaries/data/mods/public/maps/random/india.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass1 = "savanna_grass_a"; const tDirt1 = "savanna_dirt_a"; @@ -107,7 +107,7 @@ for (let i = 0; i < numPlayers; ++i) 0, avoidClasses(clBaseResource,2)); } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating bumps..."); createAreas( @@ -149,7 +149,7 @@ paintTerrainBasedOnHeight(2.4, 3.4, 3, tGrass1); paintTerrainBasedOnHeight(1, 2.4, 0, tShore); paintTerrainBasedOnHeight(-8, 1, 2, tWater); paintTileClassBasedOnHeight(-6, 0, 1, clWater); -RMS.SetProgress(55); +Engine.SetProgress(55); var playerConstraint = new AvoidTileClassConstraint(clPlayer, 30); var minesConstraint = new AvoidTileClassConstraint(clRock, 25); @@ -174,7 +174,7 @@ createObjectGroupsDeprecated( avoidClasses(clPlayer, 20, clMetal, 10, clRock, 8, clWater, 4), scaleByMapSize(2, 12), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating small decorative rocks..."); createObjectGroupsDeprecated( @@ -186,7 +186,7 @@ createObjectGroupsDeprecated( avoidClasses(clPlayer, 7, clWater, 1), scaleByMapSize(200, 1200), 1 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating boar..."); createObjectGroupsDeprecated( @@ -265,7 +265,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 3, clPlayer, 20, clFood, 12, clRock, 7, clMetal, 2), randIntInclusive(1, 4) * numPlayers + 2, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating trees..."); createObjectGroupsDeprecated( diff --git a/binaries/data/mods/public/maps/random/island_stronghold.js b/binaries/data/mods/public/maps/random/island_stronghold.js index b3b355f9b3..8b1504d380 100644 --- a/binaries/data/mods/public/maps/random/island_stronghold.js +++ b/binaries/data/mods/public/maps/random/island_stronghold.js @@ -11,10 +11,10 @@ function getPlayerTileCoordinates(playerIdx, teamIdx, fractionX, fractionZ) return [playerAngle, fx, fz, round(fx), round(fz)]; } -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmgen2"); -RMS.LoadLibrary("rmbiome"); -RMS.LoadLibrary("heightmap"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen2"); +Engine.LoadLibrary("rmbiome"); +Engine.LoadLibrary("heightmap"); const g_InitialMines = 1; const g_InitialMineDistance = 14; @@ -192,7 +192,7 @@ for (let i = 0; i < teams.length; ++i) } } -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating expansion islands..."); var landAreas = []; @@ -278,7 +278,7 @@ for (let i = 0; i < numIslands; ++i) landAreas = temp; } -RMS.SetProgress(70); +Engine.SetProgress(70); log("Smoothing heightmap..."); for (let i = 0; i < 5; ++i) @@ -288,7 +288,7 @@ for (let i = 0; i < 5; ++i) unPaintTileClassBasedOnHeight(-10, 10, 3, clLand); paintTileClassBasedOnHeight(0, 5, 3, clLand); -RMS.SetProgress(85); +Engine.SetProgress(85); createBumps(avoidClasses(clPlayer, 20)); @@ -462,7 +462,7 @@ createObjectGroupsDeprecated(group, 0, planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating large grass tufts..."); group = new SimpleGroup( @@ -481,6 +481,6 @@ setSunRotation(randFloat(0, TWO_PI)); setSunElevation(randFloat(PI/5, PI/3)); setWaterWaviness(2); -RMS.SetProgress(100); +Engine.SetProgress(100); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/islands.js b/binaries/data/mods/public/maps/random/islands.js index 828caf121e..c940063447 100644 --- a/binaries/data/mods/public/maps/random/islands.js +++ b/binaries/data/mods/public/maps/random/islands.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); TILE_CENTERED_HEIGHT_MAP = true; @@ -308,7 +308,7 @@ if (currentBiome() != "savanna") num); } -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); var numberOfPatches = scaleByMapSize(15, 45) * (currentBiome() == "savanna" ? 3 : 1); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -329,7 +329,7 @@ for (let size of [scaleByMapSize(2, 4), scaleByMapSize(3, 7), scaleByMapSize(5, [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 0), stayClasses(clLand, 6)], numberOfPatches); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0, 2, 0, 4), new SimpleObject(oStoneLarge, 1, 1, 0, 4)], true, clRock); @@ -352,7 +352,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(4,16), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -376,7 +376,7 @@ createObjectGroupsDeprecated( scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating deer..."); group = new SimpleGroup( @@ -388,7 +388,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating sheep..."); group = new SimpleGroup( @@ -420,7 +420,7 @@ createObjectGroupsDeprecated(group, 0, 25 * numPlayers, 60 ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], @@ -441,7 +441,7 @@ createObjectGroupsDeprecated(group, 0, planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large grass tufts..."); group = new SimpleGroup( @@ -452,7 +452,7 @@ createObjectGroupsDeprecated(group, 0, planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/kerala.js b/binaries/data/mods/public/maps/random/kerala.js index 36df48320b..e66c0afc2f 100644 --- a/binaries/data/mods/public/maps/random/kerala.js +++ b/binaries/data/mods/public/maps/random/kerala.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["tropic_grass_c", "tropic_grass_c", "tropic_grass_c", "tropic_grass_c", "tropic_grass_plants", "tropic_plants", "tropic_plants_b"]; const tGrassA = "tropic_plants_c"; @@ -130,7 +130,7 @@ for (var i = 0; i < numPlayers; i++) } -RMS.SetProgress(15); +Engine.SetProgress(15); const waterPos = 0.31; const mountainPos = 0.69; @@ -179,7 +179,7 @@ paintTerrainBasedOnHeight(1, 2.8, 1, tShoreBlend); paintTerrainBasedOnHeight(0, 1, 1, tShore); paintTileClassBasedOnHeight(-6, 0.5, 1, clWater); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating hills..."); createAreas( @@ -214,7 +214,7 @@ for (let type of types) avoidClasses(clPlayer, 20, clForest, 10, clHill, 0, clWater, 8), num); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating grass patches..."); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -289,7 +289,7 @@ createObjectGroupsDeprecated(group, 0, 8 * scaleByMapSize(13, 200) ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large grass tufts..."); group = new SimpleGroup( @@ -300,7 +300,7 @@ createObjectGroupsDeprecated(group, 0, 8 * scaleByMapSize(13, 200) ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); group = new SimpleGroup( @@ -311,7 +311,7 @@ createObjectGroupsDeprecated(group, 0, 8 * scaleByMapSize(13, 200), 50 ); -RMS.SetProgress(95); +Engine.SetProgress(95); createStragglerTrees( [oTree, oPalm], @@ -329,7 +329,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating berry bush..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/lake.js b/binaries/data/mods/public/maps/random/lake.js index 5b750e0ac4..331a4258ff 100644 --- a/binaries/data/mods/public/maps/random/lake.js +++ b/binaries/data/mods/public/maps/random/lake.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -196,7 +196,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -214,7 +214,7 @@ createPatches( avoidClasses(clWater, 3, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); createMines( @@ -234,7 +234,7 @@ createMines( clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); var planetm = 1; @@ -259,7 +259,7 @@ createDecoration avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0) ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -296,7 +296,7 @@ createFood [avoidClasses(clFood, 20), stayClasses(clWater, 6)] ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], diff --git a/binaries/data/mods/public/maps/random/latium.js b/binaries/data/mods/public/maps/random/latium.js index cb8fb0e4d0..4767cd11bc 100644 --- a/binaries/data/mods/public/maps/random/latium.js +++ b/binaries/data/mods/public/maps/random/latium.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const WATER_WIDTH = 0.1; @@ -170,7 +170,7 @@ for (var ix = 0; ix <= mapSize; ix++) } setHeight(ix, iz, h); } -RMS.SetProgress(15); +Engine.SetProgress(15); log("Painting terrain..."); var noise6 = new Noise2D(scaleByMapSize(10, 40)); @@ -304,7 +304,7 @@ for (var ix = 0; ix < mapSize; ix++) placeTerrain(ix, iz, t); } -RMS.SetProgress(30); +Engine.SetProgress(30); for (var i = 0; i < numPlayers; ++i) { @@ -380,7 +380,7 @@ for (var i = 0; i < numPlayers; ++i) ); createObjectGroup(group, 0, avoidClasses(clBaseResource, 2, clCliff, 0)); } -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating bushes..."); var group = new SimpleGroup( @@ -391,7 +391,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 4, clCliff, 2), scaleByMapSize(9, 146), 50 ); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating rocks..."); group = new SimpleGroup( @@ -402,7 +402,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 2, clCliff, 1), scaleByMapSize(9, 146), 50 ); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating large stone mines..."); group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); @@ -423,7 +423,7 @@ createObjectGroups(group, 0, avoidClasses(clForest, 4, clWater, 1, clPlayer, 40, clMetal, 50, clCliff, 3), scaleByMapSize(4,16), 100 ); -RMS.SetProgress(60); +Engine.SetProgress(60); createStragglerTrees( [oCarob, oBeech, oLombardyPoplar, oLombardyPoplar, oPine], @@ -431,7 +431,7 @@ createStragglerTrees( clForest, scaleByMapSize(10, 190)); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating straggler cypresses..."); group = new SimpleGroup( @@ -442,7 +442,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 5, clCliff, 4, clForest, 2, clPlayer, 15, clMetal, 6, clRock, 6), scaleByMapSize(5, 75), 50 ); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating sheep..."); group = new SimpleGroup([new SimpleObject(oSheep, 2,4, 0,2)], true, clFood); @@ -450,7 +450,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clRock, 6, clFood, 8), 3 * numPlayers, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating fish..."); var num = scaleByMapSize(4, 16); @@ -475,7 +475,7 @@ for (let i = 0; i < num; ++i) Math.round((i + 0.5) * mapSize / num)), 0); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating deer..."); group = new SimpleGroup( @@ -486,7 +486,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 5, clForest, 2, clCliff, 1, clPlayer, 20, clMetal, 6, clRock, 6, clFood, 8), 3 * numPlayers, 50 ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating berry bushes..."); group = new SimpleGroup([new SimpleObject(oBerryBush, 5,7, 0,3)], true, clFood); diff --git a/binaries/data/mods/public/maps/random/lions_den.js b/binaries/data/mods/public/maps/random/lions_den.js index 9d3cf66e1f..e51dc25692 100644 --- a/binaries/data/mods/public/maps/random/lions_den.js +++ b/binaries/data/mods/public/maps/random/lions_den.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmgen2"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen2"); +Engine.LoadLibrary("rmbiome"); InitMap(); @@ -19,13 +19,13 @@ const numPlayers = getNumPlayers(); const startAngle = randFloat(0, 2 * Math.PI); resetTerrain(topTerrain, g_TileClasses.land, hillHeight); -RMS.SetProgress(10); +Engine.SetProgress(10); addBases("radial", 0.4, randFloat(0.05, 0.1), startAngle); -RMS.SetProgress(20); +Engine.SetProgress(20); createSunkenTerrain(); -RMS.SetProgress(30); +Engine.SetProgress(30); addElements([ { @@ -121,7 +121,7 @@ addElements([ "amounts": ["scarce"] } ]); -RMS.SetProgress(40); +Engine.SetProgress(40); addElements(shuffleArray([ { @@ -221,7 +221,7 @@ addElements(shuffleArray([ "amounts": ["tons"] } ])); -RMS.SetProgress(60); +Engine.SetProgress(60); addElements(shuffleArray([ { @@ -335,7 +335,7 @@ addElements(shuffleArray([ "amounts": ["tons"] } ])); -RMS.SetProgress(75); +Engine.SetProgress(75); addElements([ { @@ -353,7 +353,7 @@ addElements([ "amounts": ["tons"] } ]); -RMS.SetProgress(80); +Engine.SetProgress(80); addElements([ { @@ -371,7 +371,7 @@ addElements([ "amounts": ["scarce"] } ]); -RMS.SetProgress(85); +Engine.SetProgress(85); addElements([ { @@ -388,7 +388,7 @@ addElements([ "amounts": ["tons"] } ]); -RMS.SetProgress(90); +Engine.SetProgress(90); addElements([ { @@ -405,7 +405,7 @@ addElements([ "amounts": ["scarce"] } ]); -RMS.SetProgress(95); +Engine.SetProgress(95); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/lorraine_plain.js b/binaries/data/mods/public/maps/random/lorraine_plain.js index 5f73a08234..30cc3f35a9 100644 --- a/binaries/data/mods/public/maps/random/lorraine_plain.js +++ b/binaries/data/mods/public/maps/random/lorraine_plain.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["temp_grass", "temp_grass", "temp_grass_d"]; const tGrassPForest = "temp_plants_bog"; @@ -182,7 +182,7 @@ paintTerrainBasedOnHeight(-5, 1, 1, tWater); paintTerrainBasedOnHeight(1, 2, 1, pForestR); paintTileClassBasedOnHeight(-6, 0.5, 1, clWater); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating bumps..."); createAreas( @@ -191,7 +191,7 @@ createAreas( avoidClasses(clWater, 2, clPlayer, 15), scaleByMapSize(100, 200) ); -RMS.SetProgress(55); +Engine.SetProgress(55); var [forestTrees, stragglerTrees] = getTreeCounts(500, 2500, 0.7); createForests( @@ -199,7 +199,7 @@ createForests( avoidClasses(clPlayer, 15, clWater, 3, clForest, 16, clHill, 1), clForest, forestTrees); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -221,7 +221,7 @@ for (let size of [scaleByMapSize(2, 4), scaleByMapSize(3, 7), scaleByMapSize(5, avoidClasses(clWater, 1, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 6), scaleByMapSize(15, 45) ); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0, 2, 0, 4), new SimpleObject(oStoneLarge, 1, 1, 0, 4)], true, clRock); @@ -244,7 +244,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(4,16), 100 ); -RMS.SetProgress(86); +Engine.SetProgress(86); log("Creating small decorative rocks..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/mainland.js b/binaries/data/mods/public/maps/random/mainland.js index b5af65b2bc..979c0f3d28 100644 --- a/binaries/data/mods/public/maps/random/mainland.js +++ b/binaries/data/mods/public/maps/random/mainland.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -130,7 +130,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); createBumps(avoidClasses(clPlayer, 20)); @@ -146,7 +146,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -164,7 +164,7 @@ createPatches( avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); createMines( @@ -184,7 +184,7 @@ createMines( clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); var planetm = 1; @@ -208,7 +208,7 @@ createDecoration ] ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -222,7 +222,7 @@ createFood ] ); -RMS.SetProgress(75); +Engine.SetProgress(75); createFood ( @@ -235,7 +235,7 @@ createFood avoidClasses(clForest, 0, clPlayer, 20, clHill, 1, clFood, 10) ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], diff --git a/binaries/data/mods/public/maps/random/migration.js b/binaries/data/mods/public/maps/random/migration.js index 23406177fd..8ba811c874 100644 --- a/binaries/data/mods/public/maps/random/migration.js +++ b/binaries/data/mods/public/maps/random/migration.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -92,7 +92,7 @@ for (let i = 0; i < numPlayers; ++i) let dockLocation = getTIPIADBON([ix, iz], [mapCenter.x, mapCenter.y], [-3 , 2.6], 0.5, 3); placeObject(dockLocation[0], dockLocation[1], oDock, playerIDs[i], playerAngle[i] + Math.PI); } -RMS.SetProgress(10); +Engine.SetProgress(10); for (var i = 0; i < numPlayers; i++) { @@ -192,7 +192,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(15); +Engine.SetProgress(15); log("Create the continent body..."); createArea( @@ -203,7 +203,7 @@ createArea( paintClass(clLand) ], avoidClasses(clPlayer, 8)); -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating shore jaggedness..."); createAreas( @@ -222,7 +222,7 @@ createAreas( paintTerrainBasedOnHeight(1, 3, 0, tShore); paintTerrainBasedOnHeight(-8, 1, 2, tWater); -RMS.SetProgress(25); +Engine.SetProgress(25); log("Creating bumps..."); createAreas( @@ -231,7 +231,7 @@ createAreas( [avoidClasses(clPlayer, 10), stayClasses(clLand, 3)], scaleByMapSize(100, 200) ); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating hills..."); createAreas( @@ -244,7 +244,7 @@ createAreas( [avoidClasses(clPlayer, 10, clHill, 15), stayClasses(clLand, 7)], scaleByMapSize(1, 4) * numPlayers ); -RMS.SetProgress(34); +Engine.SetProgress(34); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(...rBiomeTreeCount(1)); @@ -266,7 +266,7 @@ for (let type of types) ], [avoidClasses(clPlayer, 6, clForest, 10, clHill, 0), stayClasses(clLand, 7)], num); -RMS.SetProgress(38); +Engine.SetProgress(38); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -288,7 +288,7 @@ for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8 ], scaleByMapSize(15, 45)); -RMS.SetProgress(42); +Engine.SetProgress(42); log("Creating grass patches..."); for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5, 80)]) @@ -297,7 +297,7 @@ for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5 new TerrainPainter(tTier4Terrain), [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 0), stayClasses(clLand, 7)], scaleByMapSize(15, 45)); -RMS.SetProgress(46); +Engine.SetProgress(46); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); @@ -305,7 +305,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clForest, 1, clPlayer, 10, clRock, 10, clHill, 1), stayClasses(clLand, 7)], scaleByMapSize(4,16), 100 ); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating small stone quarries..."); group = new SimpleGroup([new SimpleObject(oStoneSmall, 2,5, 1,3)], true, clRock); @@ -313,7 +313,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clForest, 1, clPlayer, 10, clRock, 10, clHill, 1), stayClasses(clLand, 7)], scaleByMapSize(4,16), 100 ); -RMS.SetProgress(54); +Engine.SetProgress(54); log("Creating metal mines..."); group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,4)], true, clMetal); @@ -321,7 +321,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clForest, 1, clPlayer, 10, clMetal, 10, clRock, 5, clHill, 1), stayClasses(clLand, 7)], scaleByMapSize(4,16), 100 ); -RMS.SetProgress(58); +Engine.SetProgress(58); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -333,7 +333,7 @@ createObjectGroupsDeprecated( [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 6)], scaleByMapSize(16, 262), 50 ); -RMS.SetProgress(62); +Engine.SetProgress(62); log("Creating large decorative rocks..."); group = new SimpleGroup( @@ -345,7 +345,7 @@ createObjectGroupsDeprecated( [avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 6)], scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(66); +Engine.SetProgress(66); log("Creating deer..."); group = new SimpleGroup( @@ -356,7 +356,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 7)], 3 * numPlayers, 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating sheep..."); group = new SimpleGroup( @@ -367,7 +367,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 7)], 3 * numPlayers, 50 ); -RMS.SetProgress(74); +Engine.SetProgress(74); log("Creating fruit bush..."); group = new SimpleGroup( @@ -378,7 +378,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clForest, 0, clPlayer, 8, clHill, 1, clFood, 20), stayClasses(clLand, 7)], randIntInclusive(1, 4) * numPlayers + 2, 50 ); -RMS.SetProgress(78); +Engine.SetProgress(78); log("Creating fish..."); createObjectGroupsDeprecated( @@ -387,7 +387,7 @@ createObjectGroupsDeprecated( avoidClasses(clLand, 2, clPlayer, 2, clHill, 0, clFood, 20), 25 * numPlayers, 60 ); -RMS.SetProgress(82); +Engine.SetProgress(82); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], @@ -395,7 +395,7 @@ createStragglerTrees( clForest, stragglerTrees); -RMS.SetProgress(86); +Engine.SetProgress(86); var planetm = currentBiome() == "tropic" ? 8 : 1; @@ -407,7 +407,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 0), stayClasses(clLand, 6)], planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large grass tufts..."); group = new SimpleGroup( @@ -417,7 +417,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), stayClasses(clLand, 6)], planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(94); +Engine.SetProgress(94); log("Creating bushes..."); group = new SimpleGroup( @@ -427,7 +427,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clHill, 1, clPlayer, 1, clDirt, 1), stayClasses(clLand, 6)], planetm * scaleByMapSize(13, 200), 50 ); -RMS.SetProgress(98); +Engine.SetProgress(98); setSkySet(pickRandom(["cirrus", "cumulus", "sunny"])); setSunRotation(randFloat(0, TWO_PI)); diff --git a/binaries/data/mods/public/maps/random/neareastern_badlands.js b/binaries/data/mods/public/maps/random/neareastern_badlands.js index 9f2729097e..270d51e4fa 100644 --- a/binaries/data/mods/public/maps/random/neareastern_badlands.js +++ b/binaries/data/mods/public/maps/random/neareastern_badlands.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tCity = "desert_city_tile"; const tCityPlaza = "desert_city_tile_plaza"; @@ -136,7 +136,7 @@ for (var i = 0; i < numPlayers; i++) ); createObjectGroup(group, 0, avoidClasses(clBaseResource,2)); } -RMS.SetProgress(10); +Engine.SetProgress(10); log("Creating dune patches..."); placer = new ClumpPlacer(scaleByMapSize(40, 150), 0.2, 0.1, 0); @@ -145,7 +145,7 @@ createAreas(placer, [painter, paintClass(clPatch)], avoidClasses(clPatch, 2, clPlayer, 0), scaleByMapSize(5, 20) ); -RMS.SetProgress(15); +Engine.SetProgress(15); log("Creating sand patches..."); var placer = new ClumpPlacer(scaleByMapSize(25, 100), 0.2, 0.1, 0); @@ -154,7 +154,7 @@ createAreas(placer, [painter, paintClass(clPatch)], avoidClasses(clPatch, 2, clPlayer, 0), scaleByMapSize(15, 50) ); -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating dirt patches..."); placer = new ClumpPlacer(scaleByMapSize(25, 100), 0.2, 0.1, 0); @@ -163,7 +163,7 @@ createAreas(placer, [painter, paintClass(clPatch)], avoidClasses(clPatch, 2, clPlayer, 0), scaleByMapSize(15, 50) ); -RMS.SetProgress(25); +Engine.SetProgress(25); log("Creating oasis..."); var oRadius = scaleByMapSize(14, 40); @@ -176,7 +176,7 @@ createArea( ], null); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating oasis wildlife..."); var num = round(PI * oRadius / 8); @@ -225,7 +225,7 @@ for (var i = 0; i < num; ++i) ); createObjectGroup(group, 0); } -RMS.SetProgress(35); +Engine.SetProgress(35); log("Creating level 1 hills..."); var hillAreas = createAreas( @@ -238,7 +238,7 @@ var hillAreas = createAreas( avoidClasses(clForest, 3, clPlayer, 0, clHill1, 10), scaleByMapSize(10,20), 100 ); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating small level 1 hills..."); hillAreas = hillAreas.concat( @@ -253,7 +253,7 @@ hillAreas = hillAreas.concat( scaleByMapSize(15,25), 100)); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating decorative rocks..."); createObjectGroupsByAreasDeprecated( @@ -265,7 +265,7 @@ createObjectGroupsByAreasDeprecated( scaleByMapSize(40,200), 50, hillAreas); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating level 2 hills..."); createAreasInAreas( @@ -279,7 +279,7 @@ createAreasInAreas( 50, hillAreas); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating level 3 hills..."); createAreas( @@ -292,7 +292,7 @@ createAreas( scaleByMapSize(15,25), 50 ); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating bumps..."); createAreas( @@ -302,7 +302,7 @@ createAreas( scaleByMapSize(100, 200) ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(500, 2500, 0.5); @@ -314,7 +314,7 @@ createAreas(placer, [painter, paintClass(clForest)], num, 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0, 2, 0, 4), new SimpleObject(oStoneLarge, 1, 1, 0, 4), new RandomObject(aBushes, 2, 4, 0, 2)], true, clRock); @@ -336,7 +336,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(4,16), 100 ); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating gazelles..."); group = new SimpleGroup([new SimpleObject(oGazelle, 5,7, 0,4)], true, clFood); @@ -358,14 +358,14 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clForest, 0, clPlayer, 5, clHill1, 1, clFood, 10), scaleByMapSize(5,20), 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oDatePalm, oSDatePalm], avoidClasses(clForest, 0, clHill1, 1, clPlayer, 4, clMetal, 6, clRock, 6), clForest, stragglerTrees); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating bushes..."); group = new SimpleGroup([new RandomObject(aBushes, 2,3, 0,2)]); diff --git a/binaries/data/mods/public/maps/random/new_rms_test.js b/binaries/data/mods/public/maps/random/new_rms_test.js index c7010af0b8..c38b0df528 100644 --- a/binaries/data/mods/public/maps/random/new_rms_test.js +++ b/binaries/data/mods/public/maps/random/new_rms_test.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); InitMap(); diff --git a/binaries/data/mods/public/maps/random/northern_lights.js b/binaries/data/mods/public/maps/random/northern_lights.js index e376446e7b..a7fb1ab4ba 100644 --- a/binaries/data/mods/public/maps/random/northern_lights.js +++ b/binaries/data/mods/public/maps/random/northern_lights.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tSnowA = ["polar_snow_b"]; const tSnowB = "polar_ice_snow"; @@ -110,7 +110,7 @@ for (var i = 0; i < numPlayers; i++) } -RMS.SetProgress(15); +Engine.SetProgress(15); paintRiver({ "parallel": true, @@ -178,7 +178,7 @@ createAreas( paintTerrainBasedOnHeight(1, 2.8, 1, tShoreBlend); paintTileClassBasedOnHeight(-6, 0.5, 1, clWater); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating hills..."); createAreas( @@ -219,7 +219,7 @@ createObjectGroupsDeprecated( [avoidClasses(clRock, 6), stayClasses(clWater, 4)], scaleByMapSize(4, 16), 100); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -272,7 +272,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clForest, 1, clPlayer, 20, clMetal, 10, clRock, 5, clHill, 1), scaleByMapSize(8,32), 100 ); -RMS.SetProgress(95); +Engine.SetProgress(95); createStragglerTrees( [oPine], @@ -290,7 +290,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating sheep..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/oasis.js b/binaries/data/mods/public/maps/random/oasis.js index 640455f95f..e2c0ea657f 100644 --- a/binaries/data/mods/public/maps/random/oasis.js +++ b/binaries/data/mods/public/maps/random/oasis.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tSand = ["desert_sand_dunes_100", "desert_dirt_cracks","desert_sand_smooth", "desert_dirt_rough", "desert_dirt_rough_2", "desert_sand_smooth"]; const tDune = ["desert_sand_dunes_50"]; @@ -189,7 +189,7 @@ for (let i = 0; i < numPlayers; ++i) ], avoidClasses(clBaseResource, 0))); } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating bumps..."); createAreas( @@ -226,7 +226,7 @@ createArea( paintClass(clWater) ], null); -RMS.SetProgress(50); +Engine.SetProgress(50); if (mapSize > 150 && randBool()) { @@ -264,13 +264,13 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 10, clForest, 1, clPlayer, 30, clMetal, 10,clBaseResource, 2, clRock, 10, clHill, 1), scaleByMapSize(6,25), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating small decorative rocks..."); group = new SimpleGroup( [new SimpleObject(aRock, 2,4, 0,2)], true, undefined ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), 30, scaleByMapSize(10,50) ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating Camels..."); group = new SimpleGroup( @@ -281,7 +281,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), 1 * numPlayers, 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating Gazelles..."); group = new SimpleGroup( @@ -292,7 +292,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), 1 * numPlayers, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating Oasis Animals..."); for (var p = 0; p < scaleByMapSize(5,30); p++) @@ -305,7 +305,7 @@ for (var p = 0; p < scaleByMapSize(5,30); p++) [new SimpleObject(eLion, 1,2, 0,4),new SimpleObject(eLioness, 1,2, 2,4),new SimpleObject(eGazelle, 4,6, 1,5),new SimpleObject(eCamel, 1,2, 1,5)], true, clFood, animX,animY); createObjectGroup(group, 0); } -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating bushes..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/persian_highlands.js b/binaries/data/mods/public/maps/random/persian_highlands.js index 2e7ad48376..1e141c8520 100644 --- a/binaries/data/mods/public/maps/random/persian_highlands.js +++ b/binaries/data/mods/public/maps/random/persian_highlands.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tCity = "desert_city_tile_pers_dirt"; @@ -145,7 +145,7 @@ for (var i = 0; i < numPlayers; i++) createObjectGroup(group, 0, avoidClasses(clBaseResource,2)); } -RMS.SetProgress(10); +Engine.SetProgress(10); log("Creating rock patches..."); createAreas( @@ -156,7 +156,7 @@ createAreas( ], avoidClasses(clPatch, 2, clPlayer, 0), scaleByMapSize(5, 20)); -RMS.SetProgress(15); +Engine.SetProgress(15); log("Creating secondary rock patches..."); createAreas( @@ -167,7 +167,7 @@ createAreas( ], avoidClasses(clPatch, 2, clPlayer, 4), scaleByMapSize(15, 50)); -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating dirt patches..."); createAreas( @@ -182,7 +182,7 @@ createAreas( ], avoidClasses(clPatch, 2, clPlayer, 4), scaleByMapSize(15, 50)); -RMS.SetProgress(25); +Engine.SetProgress(25); log("Creating centeral plateau..."); createArea( @@ -201,7 +201,7 @@ createArea( paintClass(clCP) ], avoidClasses(clPlayer, 18)); -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating hills..."); for (let i = 0; i < scaleByMapSize(20, 80); ++i) @@ -216,7 +216,7 @@ for (let i = 0; i < scaleByMapSize(20, 80); ++i) tCliff, clHill, 14); -RMS.SetProgress(35); +Engine.SetProgress(35); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(500, 2500, 0.7); @@ -243,7 +243,7 @@ for (let type of types) clHill, 1, clCP, 1), num); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0, 2, 0, 4), new SimpleObject(oStoneLarge, 1, 1, 0, 4), new RandomObject(aBushes, 2, 4, 0, 2)], true, clRock); @@ -287,7 +287,7 @@ createObjectGroupsDeprecated(group, 0, 5*scaleByMapSize(5,30), 50 ); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -300,7 +300,7 @@ createObjectGroupsDeprecated( scaleByMapSize(16, 262), 50 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating bushes..."); group = new SimpleGroup( @@ -313,7 +313,7 @@ createObjectGroupsDeprecated( scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating goat..."); group = new SimpleGroup( @@ -355,7 +355,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(90); +Engine.SetProgress(90); createStragglerTrees( [oOak], diff --git a/binaries/data/mods/public/maps/random/phoenician_levant.js b/binaries/data/mods/public/maps/random/phoenician_levant.js index 22ff8292e1..efd66ff99e 100644 --- a/binaries/data/mods/public/maps/random/phoenician_levant.js +++ b/binaries/data/mods/public/maps/random/phoenician_levant.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); //TILE_CENTERED_HEIGHT_MAP = true; @@ -135,7 +135,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aBush1, clBaseResource, radius); } -RMS.SetProgress(30); +Engine.SetProgress(30); paintRiver({ "parallel": true, @@ -162,7 +162,7 @@ paintRiver({ } }); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating bumps..."); createAreas( @@ -194,7 +194,7 @@ createAreas( avoidClasses(clPlayer, 20, clForest, 10, clWater, 1, clHill, 1, clBaseResource, 3), num, 50); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating grass patches..."); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -208,7 +208,7 @@ for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, ], avoidClasses(clForest, 0, clGrass, 5, clPlayer, 10, clWater, 4, clDirt, 5, clHill, 1), scaleByMapSize(15, 45)); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -222,7 +222,7 @@ for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, ], avoidClasses(clForest, 0, clDirt, 5, clPlayer, 10, clWater, 4, clGrass, 5, clHill, 1), scaleByMapSize(15, 45)); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating cyprus..."); createAreas( @@ -273,7 +273,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(4,16), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -296,7 +296,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 3, clPlayer, 0, clHill, 1), scaleByMapSize(40, 360), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating fish..."); group = new SimpleGroup([new SimpleObject(oFish, 1,3, 2,6)], true, clFood); @@ -335,7 +335,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clForest, 0, clPlayer, 15, clHill, 1, clFood, 7), randIntInclusive(1, 4) * numPlayers + 2, 50 ); -RMS.SetProgress(90); +Engine.SetProgress(90); var stragglerTreeConfig = [ [1, avoidClasses(clForest, 0, clWater, 1, clPlayer, 8, clMetal, 6, clHill, 1)], diff --git a/binaries/data/mods/public/maps/random/polar_sea.js b/binaries/data/mods/public/maps/random/polar_sea.js index 60779cc176..db9114289a 100644 --- a/binaries/data/mods/public/maps/random/polar_sea.js +++ b/binaries/data/mods/public/maps/random/polar_sea.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); var tPrimary = ["polar_snow_a"]; var tCliff = ["polar_cliff_a", "polar_cliff_b", "polar_cliff_snow"]; @@ -108,7 +108,7 @@ for (let i = 0; i < numPlayers; ++i) id, BUILDING_ORIENTATION); } -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating central lake..."); createArea( @@ -130,7 +130,7 @@ createArea( paintTerrainBasedOnHeight(3, Math.floor(scaleByMapSize(20, 40)), 0, tCliff); paintTerrainBasedOnHeight(Math.floor(scaleByMapSize(20, 40)), 100, 3, tSnowLimited); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating small lakes..."); var lakeAreas = []; @@ -165,17 +165,17 @@ for (let i = 0; i < numLakes ; ++i) 1, 1); } -RMS.SetProgress(50); +Engine.SetProgress(50); createBumps(avoidClasses(clWater, 2, clPlayer, 20)); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating hills..."); createHills( [tPrimary, tPrimary, tSecondary], avoidClasses(clPlayer, 20, clHill, 35), clHill, scaleByMapSize(20, 240)); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating dirt patches..."); createLayeredPatches( @@ -193,7 +193,7 @@ createPatches( avoidClasses(clWater, 3, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating stone mines..."); createMines( @@ -211,7 +211,7 @@ createMines( ], avoidClasses(clWater, 3, clPlayer, 20, clMetal, 18, clRock, 5, clHill, 2), clMetal); -RMS.SetProgress(75); +Engine.SetProgress(75); createDecoration( [ @@ -235,7 +235,7 @@ createDecoration( scaleByMapSize(8, 131) ], [stayClasses(clWater, 4), avoidClasses(clHill, 2)]); -RMS.SetProgress(80); +Engine.SetProgress(80); createFood( [ @@ -274,7 +274,7 @@ createFood( ], [avoidClasses(clFood, 12, clHill, 5), stayClasses(clWater, 6)], clFood); -RMS.SetProgress(85); +Engine.SetProgress(85); // Create trigger points where wolves spawn createObjectGroupsDeprecated( @@ -283,7 +283,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 2, clMetal, 4, clRock, 4, clPlayer, 15, clHill, 2, clWolf, 20), 1000, 100); -RMS.SetProgress(95); +Engine.SetProgress(95); if (randBool(1/3)) { diff --git a/binaries/data/mods/public/maps/random/pyrenean_sierra.js b/binaries/data/mods/public/maps/random/pyrenean_sierra.js index f2d110336e..11b98a0113 100644 --- a/binaries/data/mods/public/maps/random/pyrenean_sierra.js +++ b/binaries/data/mods/public/maps/random/pyrenean_sierra.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); TILE_CENTERED_HEIGHT_MAP = true; const tGrassSpecific = ["new_alpine_grass_d","new_alpine_grass_d", "new_alpine_grass_e"]; @@ -198,7 +198,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(30); +Engine.SetProgress(30); log ("Creating the pyreneans..."); @@ -215,7 +215,7 @@ var randomNess = randFloat(-scaleByMapSize(1,12),scaleByMapSize(1,12)); for (var i = 0; i < NumOfIterations; i++) { - RMS.SetProgress(45 * i/NumOfIterations + 30 * (1-i/NumOfIterations)); + Engine.SetProgress(45 * i/NumOfIterations + 30 * (1-i/NumOfIterations)); var position = i/NumOfIterations; var width = scaleByMapSize(15,55); @@ -262,7 +262,7 @@ for (var ix = 1; ix < mapSize-1; ix++) } } } -RMS.SetProgress(48); +Engine.SetProgress(48); // Okay so the mountains are pretty much here. // Making the passes @@ -280,7 +280,7 @@ S2x = round((MountainStartX * (0.65) + MountainEndX*0.35) + cos(MoutainAngle-PI/ S2z = round((MountainStartZ * (0.65) + MountainEndZ*0.35) + sin(MoutainAngle-PI/2)*passWidth); PassMaker(S1x, S1z, S2x, S2z, 4, 7, (getHeight(S1x,S1z) + getHeight(S2x,S2z))/2.0, MountainHeight-25, 2, clPass); -RMS.SetProgress(50); +Engine.SetProgress(50); // Smoothing the mountains for (var ix = 1; ix < mapSize-1; ix++) @@ -358,7 +358,7 @@ for (var ix = 1; ix < mapSize-1; ix++) setHeight(ix,iz, getHeight(ix,iz) + randFloat(-1,1)); } } -RMS.SetProgress(55); +Engine.SetProgress(55); log ("Creating hills..."); createAreas( @@ -383,7 +383,7 @@ for (let type of types) ], avoidClasses(clPlayer, 20, clPyrenneans,0, clForest, 7, clWater, 2), num); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating lone trees..."); var num = scaleByMapSize(80,400); @@ -484,7 +484,7 @@ for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5 avoidClasses(clWater, 3, clForest, 0, clPyrenneans,5, clHill, 0, clDirt, 5, clPlayer, 6), scaleByMapSize(15, 45)); -RMS.SetProgress(70); +Engine.SetProgress(70); // making more in dirt areas so as to appear different log("Creating small grass tufts..."); @@ -496,13 +496,13 @@ log("Creating large grass tufts..."); group = new SimpleGroup( [new SimpleObject(aGrass, 2,4, 0,1.8, -PI/8,PI/8), new SimpleObject(aGrassShort, 3,6, 1.2,2.5, -PI/8,PI/8)] ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clHill, 2, clPlayer, 5, clDirt, 1, clForest, 0, clPyrenneans,2), scaleByMapSize(13, 200) ); createObjectGroupsDeprecated(group, 0, stayClasses(clDirt,1), scaleByMapSize(13, 200),10); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating bushes..."); group = new SimpleGroup( [new SimpleObject(aBushMedium, 1,2, 0,2), new SimpleObject(aBushSmall, 2,4, 0,2)] ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 2, clPlayer, 1, clPyrenneans, 1), scaleByMapSize(13, 200), 50 ); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating stone mines..."); group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); @@ -516,7 +516,7 @@ log("Creating metal mines..."); group = new SimpleGroup([new SimpleObject(oMetalLarge, 1,1, 0,4)], true, clMetal); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clForest, 1, clPlayer, 20, clMetal, 8, clRock, 5, clPyrenneans, 1), scaleByMapSize(4,16), 100 ); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating small decorative rocks..."); group = new SimpleGroup( [new SimpleObject(aRockMedium, 1,3, 0,1)], true ); @@ -526,7 +526,7 @@ log("Creating large decorative rocks..."); group = new SimpleGroup( [new SimpleObject(aRockLarge, 1,2, 0,1), new SimpleObject(aRockMedium, 1,3, 0,2)], true ); createObjectGroupsDeprecated( group, 0, avoidClasses(clWater, 0, clForest, 0, clPlayer, 0), scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating deer..."); group = new SimpleGroup( [new SimpleObject(oDeer, 5,7, 0,4)], true, clFood ); diff --git a/binaries/data/mods/public/maps/random/rhine_marshlands.js b/binaries/data/mods/public/maps/random/rhine_marshlands.js index 417ae29562..ecaa34bcdd 100644 --- a/binaries/data/mods/public/maps/random/rhine_marshlands.js +++ b/binaries/data/mods/public/maps/random/rhine_marshlands.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["temp_grass", "temp_grass", "temp_grass_d"]; const tForestFloor = "temp_plants_bog"; @@ -127,7 +127,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(15); +Engine.SetProgress(15); log("Creating bumps..."); createAreas( @@ -154,7 +154,7 @@ createObjectGroupsDeprecated( 0, stayClasses(clWater, 1), scaleByMapSize(400,2000), 100); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating bumps..."); createAreas( @@ -180,7 +180,7 @@ for (let type of types) ], avoidClasses(clPlayer, 20, clWater, 0, clForest, 10, clHill, 1), num); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating mud patches..."); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -214,7 +214,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(4,16), 100 ); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -227,7 +227,7 @@ createObjectGroupsDeprecated( scaleByMapSize(16, 262), 50 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating large decorative rocks..."); group = new SimpleGroup( @@ -240,7 +240,7 @@ createObjectGroupsDeprecated( scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating deer..."); group = new SimpleGroup( @@ -262,7 +262,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating rabbit..."); group = new SimpleGroup( @@ -294,7 +294,7 @@ createObjectGroupsDeprecated(group, 0, randIntInclusive(1, 4) * numPlayers + 2, 50 ); -RMS.SetProgress(80); +Engine.SetProgress(80); createStragglerTrees( [oOak, oBeech], @@ -302,7 +302,7 @@ createStragglerTrees( clForest, stragglerTrees); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating small grass tufts..."); createObjectGroupsDeprecated( @@ -311,7 +311,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 2, clHill, 2, clPlayer, 13, clDirt, 0), scaleByMapSize(13, 200)); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large grass tufts..."); createObjectGroupsDeprecated( @@ -324,7 +324,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 3, clHill, 2, clPlayer, 13, clDirt, 1, clForest, 0), scaleByMapSize(13, 200)); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); createObjectGroupsDeprecated( diff --git a/binaries/data/mods/public/maps/random/river_archipelago.js b/binaries/data/mods/public/maps/random/river_archipelago.js index dc0739af21..04a3c0a0aa 100644 --- a/binaries/data/mods/public/maps/random/river_archipelago.js +++ b/binaries/data/mods/public/maps/random/river_archipelago.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = ["tropic_grass_c", "tropic_grass_c", "tropic_grass_c", "tropic_grass_c", "tropic_grass_plants", "tropic_plants", "tropic_plants_b"]; const tGrassA = "tropic_plants_c"; @@ -93,7 +93,7 @@ for (let i = 0; i < stripWidths.length; ++i) ], null); } -RMS.SetProgress(20); +Engine.SetProgress(20); var [playerIDs, playerX, playerZ] = playerPlacementLine(false, 0.5, 1 - stripWidthsLeft[2][0] - stripWidthsLeft[2][1]); @@ -182,7 +182,7 @@ for (let i = 0; i < numPlayers; ++i) 0, avoidClasses(clBaseResource, 2)); } -RMS.SetProgress(35); +Engine.SetProgress(35); log("Creating gaia..."); for (let i = 0; i < 2; ++i) @@ -213,7 +213,7 @@ paintTerrainBasedOnHeight(-10, 0, 1, tWater); paintTileClassBasedOnHeight(-10, 0, 1, clWater); paintTerrainBasedOnHeight(1, 2.8, 1, tShoreBlend); paintTerrainBasedOnHeight(0, 1, 1, tShore); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating hills..."); createAreas( @@ -234,7 +234,7 @@ createAreas( log("Creating bumps..."); createBumps(avoidClasses(clPlayer, 8, clWater, 2), scaleByMapSize(20, 150), 2, 8, 4, 1, 4); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(1000, 4000, 0.7); @@ -278,7 +278,7 @@ createStragglerTrees( clForest, stragglerTrees); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating grass patches..."); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -407,7 +407,7 @@ createObjectGroupsDeprecated( clBaseResource, 4, clDirt, 0), 8 * scaleByMapSize(13, 200)); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating large grass tufts..."); createObjectGroupsDeprecated( @@ -425,7 +425,7 @@ log("Creating large grass tufts..."); clDirt, 1, clForest, 0), 8 * scaleByMapSize(13, 200)); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Creating bushes..."); createObjectGroupsDeprecated( @@ -482,7 +482,7 @@ createObjectGroupsDeprecated( clFood, 20), 3 * numPlayers, 50); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating berry bush..."); createObjectGroupsDeprecated( diff --git a/binaries/data/mods/public/maps/random/rivers.js b/binaries/data/mods/public/maps/random/rivers.js index 4546a9b85b..4e07f59a44 100644 --- a/binaries/data/mods/public/maps/random/rivers.js +++ b/binaries/data/mods/public/maps/random/rivers.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -162,7 +162,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating rivers between opponents..."); var [riverX, riverZ] = distributePointsOnCircle(numPlayers, startAngle + Math.PI / numPlayers, 0.5, ...centralLake); @@ -209,7 +209,7 @@ for (let i = 0; i < numPlayers; ++i) } }); } -RMS.SetProgress(40); +Engine.SetProgress(40); createBumps(avoidClasses(clWater, 2, clPlayer, 20)); @@ -225,7 +225,7 @@ createForests( clForest, forestTrees); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( @@ -243,7 +243,7 @@ createPatches( avoidClasses(clWater, 3, clForest, 0, clHill, 0, clDirt, 5, clPlayer, 12), scaleByMapSize(15, 45), clDirt); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); createMines( @@ -263,7 +263,7 @@ createMines( clMetal ); -RMS.SetProgress(65); +Engine.SetProgress(65); var planetm = 1; @@ -301,7 +301,7 @@ createDecoration stayClasses(clShallow, 0) ); -RMS.SetProgress(70); +Engine.SetProgress(70); createFood ( @@ -338,7 +338,7 @@ createFood [avoidClasses(clFood, 20), stayClasses(clWater, 6)] ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], diff --git a/binaries/data/mods/public/maps/random/rmbiome/randombiome.js b/binaries/data/mods/public/maps/random/rmbiome/randombiome.js index 76d0cf17e4..e243a7a7e3 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/randombiome.js +++ b/binaries/data/mods/public/maps/random/rmbiome/randombiome.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmbiome/biomes"); +Engine.LoadLibrary("rmbiome/biomes"); var g_BiomeID; @@ -38,13 +38,13 @@ function loadBiomeFile(file) { let path = "maps/random/rmbiome/" + file + ".json"; - if (!RMS.FileExists(path)) + if (!Engine.FileExists(path)) { error("Could not load biome file '" + file + "'"); return; } - let biome = RMS.ReadJSONFile(path) + let biome = Engine.ReadJSONFile(path) let copyProperties = (from, to) => { for (let prop in from) diff --git a/binaries/data/mods/public/maps/random/rmgen/library.js b/binaries/data/mods/public/maps/random/rmgen/library.js index 101241180e..d924b4e4e8 100644 --- a/binaries/data/mods/public/maps/random/rmgen/library.js +++ b/binaries/data/mods/public/maps/random/rmgen/library.js @@ -15,7 +15,7 @@ const MIN_HEIGHT = - SEA_LEVEL; * Length of one tile of the terrain grid in metres. * Useful to transform footprint sizes of templates to the coordinate system used by getMapSize. */ -const TERRAIN_TILE_SIZE = RMS.GetTerrainTileSize(); +const TERRAIN_TILE_SIZE = Engine.GetTerrainTileSize(); const MAX_HEIGHT = MAX_HEIGHT_RANGE - SEA_LEVEL; // Default angle for buildings diff --git a/binaries/data/mods/public/maps/random/rmgen/mapgen.js b/binaries/data/mods/public/maps/random/rmgen/mapgen.js index c972100b40..27fa256426 100644 --- a/binaries/data/mods/public/maps/random/rmgen/mapgen.js +++ b/binaries/data/mods/public/maps/random/rmgen/mapgen.js @@ -17,7 +17,7 @@ var g_CivData = {}; function InitMap() { // Get civ data as array of JSON strings - var data = RMS.GetCivData(); + var data = Engine.GetCivData(); if (!data || !data.length) throw new Error("InitMapGen: error reading civ data"); @@ -39,7 +39,7 @@ function ExportMap() if (!WATER_LEVEL_CHANGED) g_Environment.Water.WaterBody.Height = SEA_LEVEL - 0.1; - RMS.ExportMap({ + Engine.ExportMap({ "entities": g_Map.exportEntityList(), "height": g_Map.exportHeightData(), "seaLevel": SEA_LEVEL, diff --git a/binaries/data/mods/public/maps/random/rmgen2/gaia.js b/binaries/data/mods/public/maps/random/rmgen2/gaia.js index 91bfca5a65..3b8b009eb4 100644 --- a/binaries/data/mods/public/maps/random/rmgen2/gaia.js +++ b/binaries/data/mods/public/maps/random/rmgen2/gaia.js @@ -1217,7 +1217,7 @@ function paintHeightmap(mapName, func = undefined) * @property tilemap - The IDs of the palletmap to be painted for each heightmap tile. * @property pallet - The tile texture names used by the tilemap. */ - let mapData = RMS.ReadJSONFile("maps/random/" + mapName + ".hmap"); + let mapData = Engine.ReadJSONFile("maps/random/" + mapName + ".hmap"); let mapSize = getMapSize(); // Width of the map in terrain tiles let hmSize = Math.sqrt(mapData.heightmap.length); diff --git a/binaries/data/mods/public/maps/random/saharan_oases.js b/binaries/data/mods/public/maps/random/saharan_oases.js index 9d7251668e..f36b42f853 100644 --- a/binaries/data/mods/public/maps/random/saharan_oases.js +++ b/binaries/data/mods/public/maps/random/saharan_oases.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tCity = "desert_city_tile"; const tCityPlaza = "desert_city_tile_plaza"; @@ -129,7 +129,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aBush1, clBaseResource, radius); } -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating oases..."); for (let i = 0; i < numPlayers; ++i) @@ -148,7 +148,7 @@ for (let i = 0; i < numPlayers; ++i) paintClass(clWater) ], null); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating grass patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -163,7 +163,7 @@ for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8 ], avoidClasses(clForest, 0, clGrass, 5, clPlayer, 0, clWater, 1, clDirt, 5), scaleByMapSize(15, 45)); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -178,7 +178,7 @@ for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8 ], avoidClasses(clForest, 0, clDirt, 5, clPlayer, 0, clWater, 1, clGrass, 5), scaleByMapSize(15, 45)); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); diff --git a/binaries/data/mods/public/maps/random/sahel.js b/binaries/data/mods/public/maps/random/sahel.js index b89f3b7381..a4a3c4ee18 100644 --- a/binaries/data/mods/public/maps/random/sahel.js +++ b/binaries/data/mods/public/maps/random/sahel.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass2 = "savanna_grass_b"; const tGrass3 = "savanna_shrubs_a"; @@ -114,7 +114,7 @@ for (var i = 0; i < numPlayers; i++) } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating big patches..."); var patches = [tGrass2, tGrass3]; @@ -144,7 +144,7 @@ createAreas( ], avoidClasses(clPlayer, 24), scaleByMapSize(1, 3)); -RMS.SetProgress(55); +Engine.SetProgress(55); var playerConstraint = new AvoidTileClassConstraint(clPlayer, 30); var minesConstraint = new AvoidTileClassConstraint(clRock, 25); @@ -169,7 +169,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(2,8), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -182,7 +182,7 @@ createObjectGroupsDeprecated( scaleByMapSize(200, 1200), 1 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating gazelle..."); group = new SimpleGroup( @@ -244,7 +244,7 @@ createObjectGroupsDeprecated(group, 0, randIntInclusive(1, 4) * numPlayers + 2, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oBaobab], diff --git a/binaries/data/mods/public/maps/random/sahel_watering_holes.js b/binaries/data/mods/public/maps/random/sahel_watering_holes.js index 3777caabcb..b234024774 100644 --- a/binaries/data/mods/public/maps/random/sahel_watering_holes.js +++ b/binaries/data/mods/public/maps/random/sahel_watering_holes.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); const tGrass = "savanna_grass_a"; const tForestFloor = "savanna_forestfloor_a"; @@ -129,7 +129,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, radius); } -RMS.SetProgress(20); +Engine.SetProgress(20); log ("Creating rivers..."); for (var m = 0; m < numPlayers; m++) @@ -269,7 +269,7 @@ for (let type of types) avoidClasses(clPlayer, 20, clForest, 10, clHill, 0, clWater, 2), num ); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -291,7 +291,7 @@ for (let size of [scaleByMapSize(2, 32), scaleByMapSize(3, 48), scaleByMapSize(5 new TerrainPainter(tGrassPatch), avoidClasses(clWater, 3, clForest, 0, clHill, 0, clPlayer, 20), scaleByMapSize(15, 45)); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0, 2, 0, 4), new SimpleObject(oStoneLarge, 1, 1, 0, 4)], true, clRock); @@ -314,7 +314,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(4,16), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -338,7 +338,7 @@ createObjectGroupsDeprecated( scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating wildebeest..."); group = new SimpleGroup( @@ -350,7 +350,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating gazelle..."); group = new SimpleGroup( @@ -412,7 +412,7 @@ createObjectGroupsDeprecated(group, 0, randIntInclusive(1, 4) * numPlayers + 2, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oBaobab, oBaobab, oBaobab, oFig], @@ -430,7 +430,7 @@ createObjectGroupsDeprecated(group, 0, planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large grass tufts..."); group = new SimpleGroup( @@ -441,7 +441,7 @@ createObjectGroupsDeprecated(group, 0, planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/schwarzwald.js b/binaries/data/mods/public/maps/random/schwarzwald.js index 0d9c47d05a..22df541938 100644 --- a/binaries/data/mods/public/maps/random/schwarzwald.js +++ b/binaries/data/mods/public/maps/random/schwarzwald.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary('rmgen'); -RMS.LoadLibrary("heightmap"); +Engine.LoadLibrary('rmgen'); +Engine.LoadLibrary("heightmap"); log('Initializing map...'); @@ -136,7 +136,7 @@ for (var i = 0; i < 5; i++) globalSmoothHeightmap(); rescaleHeightmap(heightRange.min, heightRange.max); -RMS.SetProgress(50); +Engine.SetProgress(50); ////////// // Setup height limit @@ -202,7 +202,7 @@ for (var i=0; i < numPlayers; i++) distributeEntitiesByHeight({ 'min': heighLimits[3], 'max': ((heighLimits[4] + heighLimits[3]) / 2) }, startLocations, 40, [templateStoneMine, templateMetalMine]); distributeEntitiesByHeight({ 'min': ((heighLimits[5] + heighLimits[6]) / 2), 'max': heighLimits[7] }, startLocations, 40, [templateStoneMine, templateMetalMine]); -RMS.SetProgress(50); +Engine.SetProgress(50); //place water & open terrain textures and assign TileClasses log("Painting textures..."); @@ -220,7 +220,7 @@ createArea( paintTileClassBasedOnHeight(heightRange.min, heighLimits[2], 1, clWater); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Placing paths..."); @@ -302,7 +302,7 @@ for (var i = 0; i < maxI; i++) } } -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating decoration..."); createDecoration @@ -323,7 +323,7 @@ createDecoration avoidClasses(clForest, 1, clPlayer, 0, clPath, 3, clWater, 3) ); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Growing fish..."); createFood @@ -337,7 +337,7 @@ createFood [avoidClasses(clFood, 5), stayClasses(clWater, 4)] ); -RMS.SetProgress(85); +Engine.SetProgress(85); log("Planting reeds..."); var types = [aReeds]; @@ -349,7 +349,7 @@ for (let type of types) scaleByMapSize(1, 2) * 1000, 1000); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Planting trees..."); for (var x = 0; x < mapSize; x++) @@ -386,6 +386,6 @@ for (var x = 0; x < mapSize; x++) } } -RMS.SetProgress(100); +Engine.SetProgress(100); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/snowflake_searocks.js b/binaries/data/mods/public/maps/random/snowflake_searocks.js index c70f4c946b..274176e9dc 100644 --- a/binaries/data/mods/public/maps/random/snowflake_searocks.js +++ b/binaries/data/mods/public/maps/random/snowflake_searocks.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -292,7 +292,7 @@ for (var i = 0; i < numPlayers; ++i) placeDefaultDecoratives(fx, fz, aGrassShort, clBaseResource, playerIslandRadius); } -RMS.SetProgress(30); +Engine.SetProgress(30); log("Creating connectors..."); for (let ix = 0; ix < mapSize; ++ix) @@ -357,7 +357,7 @@ for (let type of types) ], [avoidClasses(clPlayer, 6, clForest, 10, clHill, 0), stayClasses(clLand, 4)], num); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0,2, 0,4), new SimpleObject(oStoneLarge, 1,1, 0,4)], true, clRock); @@ -380,7 +380,7 @@ createObjectGroupsDeprecated(group, 0, 5*scaleByMapSize(4,16), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) createAreas( @@ -422,7 +422,7 @@ createObjectGroupsDeprecated( scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating deer..."); group = new SimpleGroup( @@ -434,7 +434,7 @@ createObjectGroupsDeprecated(group, 0, 3 * numPlayers, 50 ); -RMS.SetProgress(75); +Engine.SetProgress(75); log("Creating sheep..."); group = new SimpleGroup( @@ -455,7 +455,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clForest, 0, clPlayer, 10, clHill, 1, clFood, 20), stayClasses(clLand, 4)], 3 * numPlayers, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oTree1, oTree2, oTree4, oTree3], @@ -476,7 +476,7 @@ createObjectGroupsDeprecated(group, 0, planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating large grass tufts..."); group = new SimpleGroup( @@ -486,7 +486,7 @@ createObjectGroupsDeprecated(group, 0, [avoidClasses(clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), stayClasses(clLand, 4)], planetm * scaleByMapSize(13, 200) ); -RMS.SetProgress(95); +Engine.SetProgress(95); log("Creating bushes..."); group = new SimpleGroup( diff --git a/binaries/data/mods/public/maps/random/stronghold.js b/binaries/data/mods/public/maps/random/stronghold.js index 0a82dcaad3..6548367212 100644 --- a/binaries/data/mods/public/maps/random/stronghold.js +++ b/binaries/data/mods/public/maps/random/stronghold.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmgen2"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen2"); +Engine.LoadLibrary("rmbiome"); InitMap(); @@ -8,10 +8,10 @@ setSelectedBiome(); initTileClasses(); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); -RMS.SetProgress(20); +Engine.SetProgress(20); addBases("stronghold", randFloat(0.2, 0.35), randFloat(0.05, 0.1), randFloat(0, 2 * Math.PI)); -RMS.SetProgress(30); +Engine.SetProgress(30); addElements(shuffleArray([ { @@ -90,7 +90,7 @@ addElements(shuffleArray([ "amounts": g_AllAmounts } ])); -RMS.SetProgress(60); +Engine.SetProgress(60); addElements([ { @@ -124,7 +124,7 @@ addElements([ "amounts": ["normal"] } ]); -RMS.SetProgress(70); +Engine.SetProgress(70); addElements(shuffleArray([ { @@ -179,7 +179,7 @@ addElements(shuffleArray([ "amounts": ["few", "normal", "many", "tons"] } ])); -RMS.SetProgress(80); +Engine.SetProgress(80); addElements(shuffleArray([ { @@ -237,6 +237,6 @@ addElements(shuffleArray([ "amounts": g_AllAmounts } ])); -RMS.SetProgress(90); +Engine.SetProgress(90); ExportMap(); diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest.js b/binaries/data/mods/public/maps/random/survivalofthefittest.js index d0326fd3db..774c451def 100644 --- a/binaries/data/mods/public/maps/random/survivalofthefittest.js +++ b/binaries/data/mods/public/maps/random/survivalofthefittest.js @@ -1,5 +1,5 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); setSelectedBiome(); @@ -64,7 +64,7 @@ createArea( new SmoothElevationPainter(ELEVATION_SET, 3, 3), paintClass(clLand) ]); -RMS.SetProgress(10); +Engine.SetProgress(10); var [playerIDs, playerX, playerZ, playerAngle, startAngle] = radialPlayerPlacement(0.3); var [halfwayX, halfwayZ] = distributePointsOnCircle(numPlayers, startAngle, fractionToTiles(0.375), mapCenter.x, mapCenter.y); @@ -104,7 +104,7 @@ for (let i = 0; i < numPlayers; ++i) addToClass(Math.round(attackerX[i]), Math.round(attackerZ[i]), clPlayer); addToClass(Math.round(halfwayX[i]), Math.round(halfwayZ[i]), clPlayer); } -RMS.SetProgress(20); +Engine.SetProgress(20); paintTerrainBasedOnHeight(3.12, 29, 1, tCliff); paintTileClassBasedOnHeight(3.12, 29, 1, clHill); @@ -116,7 +116,7 @@ for (let triggerPointTreasure of triggerPointTreasures) [avoidClasses(clForest, 5, clPlayer, 5, clHill, 5), stayClasses(clLand, 5)], scaleByMapSize(40, 140), 100 ); -RMS.SetProgress(25); +Engine.SetProgress(25); createBumps(stayClasses(clLand, 5)); @@ -126,7 +126,7 @@ createForests( [avoidClasses(clPlayer, 20, clForest, 5, clHill, 0, clBaseResource,2, clWomen, 5), stayClasses(clLand, 4)], clForest, forestTrees); -RMS.SetProgress(30); +Engine.SetProgress(30); if (randBool()) createHills( @@ -140,7 +140,7 @@ else [avoidClasses(clPlayer, 20, clHill, 5, clBaseResource, 3, clWomen, 5), stayClasses(clLand, 5)], clHill, scaleByMapSize(10, 60) * numPlayers); -RMS.SetProgress(40); +Engine.SetProgress(40); createHills( [tCliff, tCliff, tHill], @@ -153,7 +153,7 @@ createHills( undefined, 55); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating dirt patches..."); createLayeredPatches( diff --git a/binaries/data/mods/public/maps/random/syria.js b/binaries/data/mods/public/maps/random/syria.js index b9b3a7a141..c3e5045e3c 100644 --- a/binaries/data/mods/public/maps/random/syria.js +++ b/binaries/data/mods/public/maps/random/syria.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); //terrain textures const tMainDirt = ["desert_dirt_rocks_1", "desert_dirt_cracks"]; @@ -65,7 +65,7 @@ for (let i = 0; i < numPlayers; ++i) paintClass(clGrass) ]); } -RMS.SetProgress(10); +Engine.SetProgress(10); for (var i = 0; i < numPlayers; i++) { @@ -139,7 +139,7 @@ for (var i = 0; i < numPlayers; i++) createObjectGroup(group, 0, avoidClasses(clBaseResource,2)); } -RMS.SetProgress(20); +Engine.SetProgress(20); log("Creating bumps..."); createAreas( @@ -159,7 +159,7 @@ createAreas( avoidClasses(clPlayer, 3, clGrass, 1, clHill, 10), scaleByMapSize(1, 3) * numPlayers * 3); -RMS.SetProgress(25); +Engine.SetProgress(25); log("Creating forests..."); var [forestTrees, stragglerTrees] = getTreeCounts(400, 2000, 0.7); @@ -183,7 +183,7 @@ for (let type of types) avoidClasses(clPlayer, 1, clGrass, 1, clForest, 10, clHill, 1), num); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) @@ -192,7 +192,7 @@ for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, new LayeredPainter([tSecondaryDirt, tDirt], [1]), avoidClasses(clHill, 0, clForest, 0, clPlayer, 8, clGrass, 1), scaleByMapSize(50, 90)); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating big patches..."); for (let size of [scaleByMapSize(6, 30), scaleByMapSize(10, 50), scaleByMapSize(16, 70)]) @@ -201,7 +201,7 @@ for (let size of [scaleByMapSize(6, 30), scaleByMapSize(10, 50), scaleByMapSize( new LayeredPainter([tSecondaryDirt, tDirt], [1]), avoidClasses(clHill, 0, clForest, 0, clPlayer, 8, clGrass, 1), scaleByMapSize(30, 90)); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0, 2, 0, 4), new SimpleObject(oStoneLarge, 1, 1, 0,4), new RandomObject(aBushes, 2, 4, 0, 2)], true, clRock); @@ -245,7 +245,7 @@ createObjectGroupsDeprecated( avoidClasses(clForest, 0, clPlayer, 0, clHill, 0), scaleByMapSize(50, 500), 50 ); -RMS.SetProgress(80); +Engine.SetProgress(80); log("Creating gazelle..."); group = new SimpleGroup( @@ -276,7 +276,7 @@ createObjectGroupsDeprecated(group, 0, avoidClasses(clForest, 0, clPlayer, 1, clHill, 1, clFood, 20, clGrass, 2), 3 * numPlayers, 50 ); -RMS.SetProgress(85); +Engine.SetProgress(85); createStragglerTrees( [oPalm, oTamarix, oPine], diff --git a/binaries/data/mods/public/maps/random/the_nile.js b/binaries/data/mods/public/maps/random/the_nile.js index 3670c129e2..a186e4d5b9 100644 --- a/binaries/data/mods/public/maps/random/the_nile.js +++ b/binaries/data/mods/public/maps/random/the_nile.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); var tCity = "desert_city_tile"; var tCityPlaza = "desert_city_tile_plaza"; @@ -138,7 +138,7 @@ for (var i = 0; i < numPlayers; i++) placeDefaultDecoratives(fx, fz, aBush1, clBaseResource, radius); } -RMS.SetProgress(30); +Engine.SetProgress(30); const riverTextures = [ { @@ -206,7 +206,7 @@ paintRiver({ } }); -RMS.SetProgress(40); +Engine.SetProgress(40); log("Creating bumps..."); createAreas( @@ -261,7 +261,7 @@ createAreas( num, 50); -RMS.SetProgress(50); +Engine.SetProgress(50); log("Creating grass patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -275,7 +275,7 @@ for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8 ], avoidClasses(clForest, 0, clGrass, 5, clPlayer, 10, clWater, 1, clDirt, 5, clShore, 1, clPond, 1), scaleByMapSize(15, 45)); -RMS.SetProgress(55); +Engine.SetProgress(55); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -290,7 +290,7 @@ for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8 avoidClasses(clForest, 0, clDirt, 5, clPlayer, 10, clWater, 1, clGrass, 5, clShore, 1, clPond, 1), scaleByMapSize(15, 45)); -RMS.SetProgress(60); +Engine.SetProgress(60); log("Creating stone mines..."); var group = new SimpleGroup([new SimpleObject(oStoneSmall, 0, 2, 0, 4), new SimpleObject(oStoneLarge, 1, 1, 0, 4)], true, clRock); @@ -334,7 +334,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(6,20), 100 ); -RMS.SetProgress(65); +Engine.SetProgress(65); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -357,7 +357,7 @@ createObjectGroupsDeprecated( avoidClasses(clWater, 1, clPlayer, 0, clPond, 1), scaleByMapSize(20, 180), 50 ); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating gazelles..."); group = new SimpleGroup([new SimpleObject(oGazelle, 5,7, 0,4)], true, clFood); @@ -393,7 +393,7 @@ createObjectGroupsDeprecated(group, 0, 3*scaleByMapSize(5,20), 50 ); -RMS.SetProgress(90); +Engine.SetProgress(90); createStragglerTrees( [oDatePalm, oSDatePalm], diff --git a/binaries/data/mods/public/maps/random/the_unknown/unknown_common.js b/binaries/data/mods/public/maps/random/the_unknown/unknown_common.js index 53d6491804..97b0e3ac68 100644 --- a/binaries/data/mods/public/maps/random/the_unknown/unknown_common.js +++ b/binaries/data/mods/public/maps/random/the_unknown/unknown_common.js @@ -872,7 +872,7 @@ function createUnknownObjects() [avoidClasses(clPlayer, 15, clHill, randIntInclusive(6, 18)), stayClasses(clLand, 0)], randIntInclusive(0, scaleByMapSize(4, 8))*randIntInclusive(1, scaleByMapSize(4, 9)) ); - RMS.SetProgress(50); + Engine.SetProgress(50); log("Creating forests..."); let [numForest, numStragglers] = getTreeCounts(...rBiomeTreeCount(1)); @@ -893,7 +893,7 @@ function createUnknownObjects() ], [avoidClasses(clPlayer, 20, clForest, randIntInclusive(5, 15), clHill, 0), stayClasses(clLand, 4)], num); - RMS.SetProgress(50); + Engine.SetProgress(50); log("Creating dirt patches..."); let patchCount = (currentBiome() == "savanna" ? 3 : 1) * scaleByMapSize(15, 45); @@ -915,7 +915,7 @@ function createUnknownObjects() [avoidClasses(clForest, 0, clHill, 0, clDirt, 5, clPlayer, 7), stayClasses(clLand, 4)], patchCount); - RMS.SetProgress(55); + Engine.SetProgress(55); log("Creating stone mines..."); createObjectGroupsDeprecated( @@ -940,7 +940,7 @@ function createUnknownObjects() [avoidClasses(clForest, 1, clPlayer, 10, clMetal, 10, clRock, 5, clHill, 1), stayClasses(clLand, 3)], randIntInclusive(scaleByMapSize(2, 9), scaleByMapSize(9, 40)), 100); - RMS.SetProgress(65); + Engine.SetProgress(65); log("Creating small decorative rocks..."); createObjectGroupsDeprecated( @@ -957,7 +957,7 @@ function createUnknownObjects() [avoidClasses(clWater, 0, clForest, 0, clPlayer, 0, clHill, 0), stayClasses(clLand, 3)], scaleByMapSize(8, 131), 50); - RMS.SetProgress(70); + Engine.SetProgress(70); log("Creating deer..."); createObjectGroupsDeprecated( @@ -974,7 +974,7 @@ function createUnknownObjects() [avoidClasses(clWater, 0, clForest, 0, clPlayer, 8, clHill, 1, clFood, 20), stayClasses(clLand, 2)], randIntInclusive(1, 4) * numPlayers + 2, 50); - RMS.SetProgress(75); + Engine.SetProgress(75); log("Creating sheep..."); createObjectGroupsDeprecated( @@ -991,7 +991,7 @@ function createUnknownObjects() avoidClasses(clLand, 4, clForest, 0, clPlayer, 0, clHill, 0, clFood, 20), randIntInclusive(15, 40) * numPlayers, 60); - RMS.SetProgress(85); + Engine.SetProgress(85); log("Creating straggler trees..."); types = [g_Gaia.tree1, g_Gaia.tree2, g_Gaia.tree3, g_Gaia.tree4]; @@ -1012,7 +1012,7 @@ function createUnknownObjects() 0, [avoidClasses(clWater, 2, clHill, 2, clPlayer, 2, clDirt, 0), stayClasses(clLand, 3)], planetm * scaleByMapSize(13, 200)); - RMS.SetProgress(90); + Engine.SetProgress(90); log("Creating large grass tufts..."); createObjectGroupsDeprecated( @@ -1020,7 +1020,7 @@ function createUnknownObjects() 0, [avoidClasses(clWater, 3, clHill, 2, clPlayer, 2, clDirt, 1, clForest, 0), stayClasses(clLand, 3)], planetm * scaleByMapSize(13, 200)); - RMS.SetProgress(95); + Engine.SetProgress(95); log("Creating shallow flora..."); createObjectGroupsDeprecated( diff --git a/binaries/data/mods/public/maps/random/unknown.js b/binaries/data/mods/public/maps/random/unknown.js index 355950608d..9d17727243 100644 --- a/binaries/data/mods/public/maps/random/unknown.js +++ b/binaries/data/mods/public/maps/random/unknown.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); -RMS.LoadLibrary("the_unknown"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); +Engine.LoadLibrary("the_unknown"); g_PlayerBases = true; g_AllowNaval = true; diff --git a/binaries/data/mods/public/maps/random/unknown_land.js b/binaries/data/mods/public/maps/random/unknown_land.js index 5bf2462f4c..46042e17d9 100644 --- a/binaries/data/mods/public/maps/random/unknown_land.js +++ b/binaries/data/mods/public/maps/random/unknown_land.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); -RMS.LoadLibrary("the_unknown"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); +Engine.LoadLibrary("the_unknown"); g_PlayerBases = true; g_AllowNaval = false; diff --git a/binaries/data/mods/public/maps/random/unknown_nomad.js b/binaries/data/mods/public/maps/random/unknown_nomad.js index d4f466886e..841988883c 100644 --- a/binaries/data/mods/public/maps/random/unknown_nomad.js +++ b/binaries/data/mods/public/maps/random/unknown_nomad.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); -RMS.LoadLibrary("the_unknown"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); +Engine.LoadLibrary("the_unknown"); g_PlayerBases = false; g_AllowNaval = true; diff --git a/binaries/data/mods/public/maps/random/volcanic_lands.js b/binaries/data/mods/public/maps/random/volcanic_lands.js index 62a678861e..b19cab48ee 100644 --- a/binaries/data/mods/public/maps/random/volcanic_lands.js +++ b/binaries/data/mods/public/maps/random/volcanic_lands.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); var tGrass = ["cliff volcanic light", "ocean_rock_a", "ocean_rock_b"]; var tGrassA = "cliff volcanic light"; @@ -102,10 +102,10 @@ for (var i = 0; i < numPlayers; i++) break; } } -RMS.SetProgress(15); +Engine.SetProgress(15); createVolcano(0.5, 0.5, clHill, tCliff, [tLava1, tLava2, tLava3], true, ELEVATION_SET); -RMS.SetProgress(45); +Engine.SetProgress(45); log("Creating hills..."); createAreas( @@ -137,7 +137,7 @@ for (let type of types) avoidClasses(clPlayer, 12, clForest, 10, clHill, 0, clBaseResource, 6), num); -RMS.SetProgress(70); +Engine.SetProgress(70); log("Creating dirt patches..."); for (let size of [scaleByMapSize(3, 48), scaleByMapSize(5, 84), scaleByMapSize(8, 128)]) @@ -192,7 +192,7 @@ createObjectGroupsDeprecated(group, 0, scaleByMapSize(4,16), 100 ); -RMS.SetProgress(90); +Engine.SetProgress(90); log("Creating small decorative rocks..."); group = new SimpleGroup( @@ -216,7 +216,7 @@ createObjectGroupsDeprecated( scaleByMapSize(8, 131), 50 ); -RMS.SetProgress(95); +Engine.SetProgress(95); createStragglerTrees( [oTree], diff --git a/binaries/data/mods/public/maps/random/wall_demo.js b/binaries/data/mods/public/maps/random/wall_demo.js index 77acba54e5..ff33355e29 100644 --- a/binaries/data/mods/public/maps/random/wall_demo.js +++ b/binaries/data/mods/public/maps/random/wall_demo.js @@ -1,4 +1,4 @@ -RMS.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmgen"); InitMap(); diff --git a/binaries/data/mods/public/maps/random/wild_lake.js b/binaries/data/mods/public/maps/random/wild_lake.js index 530dd5ca68..7118b4a89f 100644 --- a/binaries/data/mods/public/maps/random/wild_lake.js +++ b/binaries/data/mods/public/maps/random/wild_lake.js @@ -1,6 +1,6 @@ -RMS.LoadLibrary("rmgen"); -RMS.LoadLibrary("rmbiome"); -RMS.LoadLibrary("heightmap"); +Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); +Engine.LoadLibrary("heightmap"); InitMap(); @@ -439,7 +439,7 @@ globalSmoothHeightmap(); // Final rescale rescaleHeightmap(heightRange.min, heightRange.max); -RMS.SetProgress(25); +Engine.SetProgress(25); /** * Prepare terrain texture placement @@ -463,7 +463,7 @@ log("Terrain shape generation and biome presets after " + ((Date.now() - genStar let [playerIDs, startLocations] = sortPlayersByLocation(getStartLocationsByHeightmap(playerHeightRange, 1000, 30)); log("Start location chosen after " + ((Date.now() - genStartTime) / 1000) + "s"); -RMS.SetProgress(30); +Engine.SetProgress(30); /** * Smooth Start Locations before height region calculation @@ -569,7 +569,7 @@ for (let h = 0; h < heighLimits.length; ++h) } log("Terrain texture placement finished after " + ((Date.now() - genStartTime) / 1000) + "s"); -RMS.SetProgress(80); +Engine.SetProgress(80); /** * Get resource spots after players start locations calculation and paths @@ -580,7 +580,7 @@ for (let i = 0; i < avoidPoints.length; ++i) let resourceSpots = getPointsByHeight(resourceSpotHeightRange, avoidPoints, clPath); log("Resource spots chosen after " + ((Date.now() - genStartTime) / 1000) + "s"); -RMS.SetProgress(55); +Engine.SetProgress(55); /** * Add start locations and resource spots after terrain texture and path painting diff --git a/source/graphics/MapGenerator.cpp b/source/graphics/MapGenerator.cpp index 1c57b179ef..ab9431f0c3 100644 --- a/source/graphics/MapGenerator.cpp +++ b/source/graphics/MapGenerator.cpp @@ -62,7 +62,7 @@ void* CMapGeneratorWorker::RunThread(void *data) CMapGeneratorWorker* self = static_cast(data); - self->m_ScriptInterface = new ScriptInterface("RMS", "MapGenerator", ScriptInterface::CreateRuntime(g_ScriptRuntime, RMS_RUNTIME_SIZE)); + self->m_ScriptInterface = new ScriptInterface("Engine", "MapGenerator", ScriptInterface::CreateRuntime(g_ScriptRuntime, RMS_RUNTIME_SIZE)); // Run map generation scripts if (!self->Run() || self->m_Progress > 0)