From db13d7a708b9b862f16269ff4d2995b3a564d8fe Mon Sep 17 00:00:00 2001 From: DjWarmonger Date: Tue, 1 Nov 2016 18:25:09 +0100 Subject: [PATCH] Version 0.99 updates. --- ChangeLog | 2 +- .../config/defaultTemplates/analogy.json | 63 ----- .../defaultTemplates/Mods/Analogy/mod.json | 12 - .../defaultTemplates/clashOfDragons.json | 227 ------------------ .../Mods/Clash of Dragons/mod.json | 12 - .../config/defaultTemplates/goldenRing.json | 76 ------ .../Mods/Golden Ring/mod.json | 12 - .../config/defaultTemplates/jebusCross.json | 75 ------ .../Mods/Jebus Cross/mod.json | 12 - .../config/defaultTemplates/upgrade.json | 65 ----- .../defaultTemplates/Mods/Upgrade/mod.json | 12 - Mods/vcmi/Mods/defaultTemplates/mod.json | 9 - lib/GameConstants.cpp | 4 +- 13 files changed, 3 insertions(+), 578 deletions(-) delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Analogy/Content/config/defaultTemplates/analogy.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Analogy/mod.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Clash of Dragons/Content/config/defaultTemplates/clashOfDragons.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Clash of Dragons/mod.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Golden Ring/Content/config/defaultTemplates/goldenRing.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Golden Ring/mod.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Jebus Cross/Content/config/defaultTemplates/jebusCross.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Jebus Cross/mod.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Upgrade/Content/config/defaultTemplates/upgrade.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/Mods/Upgrade/mod.json delete mode 100644 Mods/vcmi/Mods/defaultTemplates/mod.json diff --git a/ChangeLog b/ChangeLog index 4d2cc484b..53890c598 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -0.98 -> 0.next +0.98 -> 0.99 GENERAL: * New Bonus NO_TERRAIN_PENALTY diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Analogy/Content/config/defaultTemplates/analogy.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Analogy/Content/config/defaultTemplates/analogy.json deleted file mode 100644 index 74ee60e96..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Analogy/Content/config/defaultTemplates/analogy.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "Analogy" : - { - "minSize" : "m", "maxSize" : "m+u", - "players" : "4", - "zones" : - { - "1" : - { - "type" : "playerStart", "size" : 2, "owner" : 1, - "playerTowns" : { "castles" : 1 }, "neutralTowns" : { "towns" : 1 }, "townsAreSameType" : true, - "monsters" : "normal", - "mines" : {"wood" : 1, "ore" : 1, "gems" : 1, "crystal" : 1, "sulfur" : 1, "mercury" : 1}, - "treasure" : [ - {"min" : 2100, "max": 3000, "density" : 5}, - {"min" : 300, "max": 1500, "density" : 10} - ] - }, - "2" : - { - "type" : "playerStart", "size" : 2, "owner" : 2, - "playerTowns" : { "castles" : 1 }, "neutralTowns" : { "towns" : 1 }, "townsAreSameType" : true, - "monsters" : "normal", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "3" : - { - "type" : "playerStart", "size" : 2, "owner" : 3, - "playerTowns" : { "castles" : 1 }, "neutralTowns" : { "towns" : 1 }, "townsAreSameType" : true, - "monsters" : "normal", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "4" : - { - "type" : "playerStart", "size" : 2, "owner" : 4, - "playerTowns" : { "castles" : 1 }, "neutralTowns" : { "towns" : 1 }, "townsAreSameType" : true, - "monsters" : "normal", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "5" : - { - "type" : "treasure", "size" : 3, "terrainTypes" : [ "sand" ], "matchTerrainToTown" : false, - "neutralTowns" : { "castles" : 1 }, - "monsters" : "strong", - "mines" : {"gold" : 2}, - "treasure" : [ - {"min" : 9000, "max": 10000, "density" : 3}, - {"min" : 6000, "max": 10000, "density" : 15} - ] - } - }, - "connections" : - [ - { "a" : "1", "b" : "5", "guard" : 5000 }, - { "a" : "2", "b" : "5", "guard" : 5000 }, - { "a" : "3", "b" : "5", "guard" : 5000 }, - { "a" : "4", "b" : "5", "guard" : 5000 } - ] - } -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Analogy/mod.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Analogy/mod.json deleted file mode 100644 index 98d66a2ad..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Analogy/mod.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Analogy", - "description" : "Random map template, 4p M/M+U", - - "version" : "0.99", - "author" : "VCMI Team", - "contact" : "http://forum.vcmi.eu/index.php", - "modType" : "Templates", - "templates" : [ - "config/defaultTemplates/analogy" - ], -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Clash of Dragons/Content/config/defaultTemplates/clashOfDragons.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Clash of Dragons/Content/config/defaultTemplates/clashOfDragons.json deleted file mode 100644 index 521d00ea2..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Clash of Dragons/Content/config/defaultTemplates/clashOfDragons.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "Clash of Dragons 1.2": - { - "minSize" : "l+u", "maxSize" : "xl+u", - "players" : "2", - "zones": - { - "1": - { - "type" : "playerStart", "size" : 100, "owner" : 1, - "playerTowns" : { "castles" : 1 }, - "neutralTowns" : { "towns" : 2 }, - "monsters" : "weak", - "mines" : {"wood" : 1, "ore" : 1, "gold" : 1}, - "treasure" : [ - {"min" : 2000, "max": 5000, "density": 4}, - {"min" : 5000, "max": 9000, "density": 6}, - {"min" : 300, "max": 1900, "density": 15} - ] - }, - "2": - { - "type" : "treasure", "size" : 100, - "neutralTowns" : { "towns" : 1 }, - "terrainTypes" : ["grass"], "matchTerrainToTown" : false, - "monsters" : "normal", - "mines" : {"gems" : 1, "crystal" : 1, "sulfur" : 1, "mercury" : 1, "gold" : 1}, - "treasure" : [ - {"min" : 5000, "max": 12000, "density": 2}, - {"min" : 10000, "max": 20000, "density": 4}, - {"min" : 300, "max": 1900, "density": 15} - ] - }, - "3": - { - "type" : "treasure", "size" : 100, - "neutralTowns" : { "towns" : 1 }, - "terrainTypes" : ["lava"], "matchTerrainToTown" : false, - "monsters" : "strong", - "mines" : {"wood" : 1, "ore" : 1, "gems" : 1, "crystal" : 1, "sulfur" : 1, "mercury" : 1, "gold" : 1}, - "treasure" : [ - {"min" : 20000, "max": 25000, "density": 10}, - {"min" : 10000, "max": 15000, "density": 8}, - {"min" : 300, "max": 1900, "density": 10} - ] - }, - "4": - { - "type" : "treasure", "size" : 100, - "neutralTowns" : { "towns" : 1 }, - "terrainTypes" : ["dirt"], "matchTerrainToTown" : false, - "monsters" : "strong", - "mines" : {"gold" : 2}, - "treasure" : [ - {"min" : 20000, "max": 25000, "density": 15}, - {"min" : 10000, "max": 15000, "density": 10}, - {"min" : 300, "max": 1900, "density": 6} - ] - }, - "5": - { - "type" : "treasure", "size" : 100, - "neutralTowns" : { "castles" : 1 }, - "terrainTypes" : ["snow"], "matchTerrainToTown" : false, - "allowedTowns" : ["tower"], - "monsters" : "strong", - "mines" : {"gold" : 2}, - "treasure" : [ - {"min" : 20000, "max": 30000, "density": 15} - ] - }, - "6": - { - "type" : "treasure", "size" : 40, - "terrainTypes" : ["grass"], "matchTerrainToTown" : false, - "allowedTowns" : ["tower", "castle", "neutral"], - "allowedMonsters" : ["neutral", "rampart", "dungeon"], - "monsters" : "strong", - "mines" : {"mercury" : 1, "gold" : 1}, - "treasure" : [ - {"min" : 80000, "max": 120000, "density": 10} - ] - }, - "7": - { - "type" : "treasure", "size" : 40, - "terrainTypeLikeZone" : 6, - "allowedTowns" : ["tower", "castle", "neutral"], - "allowedMonsters" : ["neutral", "rampart", "dungeon"], - "monsters" : "strong", - "mines" : {"sulfur" : 1, "gold" : 1}, - "treasureLikeZone" : 6 - }, - "8": - { - "type" : "treasure", "size" : 40, - "terrainTypeLikeZone" : 6, - "allowedTowns" : ["tower", "castle", "neutral"], - "allowedMonsters" : ["neutral", "rampart", "dungeon"], - "monsters" : "strong", - "mines" : {"crystal" : 1, "gold" : 1}, - "treasureLikeZone" : 6 - }, - "9": - { - "type" : "treasure", "size" : 40, - "terrainTypeLikeZone" : 6, - "allowedTowns" : ["tower", "castle", "neutral"], - "allowedMonsters" : ["neutral", "rampart", "dungeon"], - "monsters" : "strong", - "mines" : {"gems" : 1, "gold" : 1}, - "treasureLikeZone" : 6 - }, - "10": - { - "type" : "treasure", "size" : 40, - "terrainTypes" : ["snow"], "matchTerrainToTown" : false, - "allowedTowns" : ["tower", "castle", "neutral"], - "allowedMonsters" : ["neutral", "rampart", "dungeon"], - "monsters" : "strong", - "mines" : {"mercury" : 1, "gold" : 1}, - "treasure" : [ - {"min" : 80000, "max": 80000, "density": 10} - ] - }, - "11": - { - "type" : "treasure", "size" : 40, - "terrainTypeLikeZone" : 10, - "allowedTowns" : ["tower", "castle", "neutral"], - "allowedMonsters" : ["neutral", "rampart", "dungeon"], - "monsters" : "strong", - "minesLikeZone" : 10, - "treasureLikeZone" : 10 - }, - "12": - { - "type" : "treasure", "size" : 40, - "terrainTypeLikeZone" : 10, - "allowedTowns" : ["tower", "castle", "neutral"], - "allowedMonsters" : ["neutral", "rampart", "dungeon"], - "monsters" : "strong", - "minesLikeZone" : 10, - "treasureLikeZone" : 10 - }, - "13": - { - "type" : "treasure", "size" : 40, - "terrainTypeLikeZone" : 10, - "allowedTowns" : ["tower", "castle", "neutral"], - "allowedMonsters" : ["neutral", "rampart", "dungeon"], - "monsters" : "strong", - "minesLikeZone" : 10, - "treasureLikeZone" : 10 - }, - "14": - { - "type" : "playerStart", "size" : 100, "owner" : 2, - "playerTowns" : { "castles" : 1 }, - "neutralTowns" : { "towns" : 2 }, - "monsters" : "weak", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "15": - { - "type" : "treasure", "size" : 100, - "neutralTowns" : { "towns" : 1 }, - "terrainTypeLikeZone" : 2, - "monsters" : "normal", - "minesLikeZone" : 2, - "treasureLikeZone" : 2 - }, - "16": - { - "type" : "treasure", "size" : 100, - "neutralTowns" : { "towns" : 1 }, - "terrainTypeLikeZone" : 3, - "monsters" : "strong", - "minesLikeZone" : 3, - "treasureLikeZone" : 3 - }, - "17": - { - "type" : "treasure", "size" : 100, - "neutralTowns" : { "towns" : 1 }, - "terrainTypeLikeZone" : 4, - "monsters" : "strong", - "minesLikeZone" : 4, - "treasureLikeZone" : 4 - }, - "18": - { - "type" : "treasure", "size" : 100, - "neutralTowns" : { "castles" : 1 }, - "terrainTypeLikeZone" : 5, - "townTypeLikeZone" : 5, - "monsters" : "strong", - "minesLikeZone" : 5, - "treasureLikeZone" : 5 - } - }, - "connections" : - [ - { "a" : "1", "b" : "2", "guard" : 4000 }, - { "a" : "2", "b" : "3", "guard" : 12000 }, - { "a" : "2", "b" : "4", "guard" : 20000 }, - { "a" : "4", "b" : "5", "guard" : 30000 }, - { "a" : "5", "b" : "6", "guard" : 50000 }, - { "a" : "6", "b" : "7", "guard" : 50000 }, - { "a" : "7", "b" : "8", "guard" : 50000 }, - { "a" : "7", "b" : "9", "guard" : 50000 }, - { "a" : "18", "b" : "9", "guard" : 50000 }, - { "a" : "5", "b" : "10", "guard" : 50000 }, - { "a" : "10", "b" : "11", "guard" : 50000 }, - { "a" : "11", "b" : "12", "guard" : 50000 }, - { "a" : "11", "b" : "13", "guard" : 50000 }, - { "a" : "14", "b" : "15", "guard" : 4000 }, - { "a" : "15", "b" : "16", "guard" : 12000 }, - { "a" : "15", "b" : "17", "guard" : 20000 }, - { "a" : "17", "b" : "18", "guard" : 30000 }, - { "a" : "18", "b" : "13", "guard" : 50000 }, - { "a" : "18", "b" : "5", "guard" : 150000 }, - { "a" : "3", "b" : "16", "guard" : 180000 } - ] - } -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Clash of Dragons/mod.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Clash of Dragons/mod.json deleted file mode 100644 index 70f0edc44..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Clash of Dragons/mod.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Clash of Dragons", - "description" : "Random map template, 1v1 L+U/XL+U", - - "version" : "0.99", - "author" : "Malekith, ported by VCMI Team", - "contact" : "http://forum.vcmi.eu/index.php", - "modType" : "Templates", - "templates" : [ - "config/defaultTemplates/clashOfDragons" - ], -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Golden Ring/Content/config/defaultTemplates/goldenRing.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Golden Ring/Content/config/defaultTemplates/goldenRing.json deleted file mode 100644 index d34d4773d..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Golden Ring/Content/config/defaultTemplates/goldenRing.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "Golden Ring" : - { - "minSize" : "m+u", "maxSize" : "l", - "players" : "3", - "zones" : - { - "1" : - { - "type" : "playerStart", "size" : 2, "owner" : 1, - "playerTowns" : { "castles" : 1 }, - "monsters" : "normal", - "mines" : {"wood" : 1, "ore" : 1}, - "treasure" : [ - {"min" : 300, "max": 2000, "density": 15}, - {"min" : 2100, "max": 2500, "density": 5} - ] - }, - "2" : - { - "type" : "playerStart", "size" : 2, "owner" : 2, - "playerTowns" : { "castles" : 1 }, - "monsters" : "normal", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "3" : - { - "type" : "playerStart", "size" : 2, "owner" : 3, - "playerTowns" : { "castles" : 1 }, - "monsters" : "normal", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "4" : { "type" : "treasure", "size" : 1, "terrainTypeLikeZone" : 1, - "monsters" : "normal", - "mines" : {"gems" : 1, "crystal" : 1}, - "treasure" : [ - {"min" : 3000, "max": 10000, "density" : 12}, - {"min" : 6000, "max": 10000, "density" : 6} - ]}, - "5" : { "type" : "treasure", "size" : 1, "terrainTypeLikeZone" : 1, - "monsters" : "normal", - "mines" : {"sulfur" : 1, "mercury" : 1}, - "treasureLikeZone" : 4}, - "6" : { "type" : "treasure", "size" : 1, "terrainTypeLikeZone" : 2, "monsters" : "normal", "minesLikeZone" : 5, "treasureLikeZone" : 4 }, - "7" : { "type" : "treasure", "size" : 1, "terrainTypeLikeZone" : 2, "monsters" : "normal", "minesLikeZone" : 4, "treasureLikeZone" : 4 }, - "8" : { "type" : "treasure", "size" : 1, "terrainTypeLikeZone" : 3, "monsters" : "normal", "minesLikeZone" : 4, "treasureLikeZone" : 4 }, - "9" : { "type" : "treasure", "size" : 1, "terrainTypeLikeZone" : 3, "monsters" : "normal", "minesLikeZone" : 5, "treasureLikeZone" : 4 }, - "10" : { "type" : "treasure", "size" : 1, "neutralTowns" : { "towns" : 1 }, - "monsters" : "strong", - "mines" : {"gold" : 1}, - "treasure" : [ - {"min" : 21000, "max": 25000, "density" : 3}, - {"min" : 10000, "max": 21000, "density" : 10} - ]}, - "11" : { "type" : "treasure", "size" : 1, "neutralTowns" : { "towns" : 1 }, "monsters" : "strong", "minesLikeZone" : 10, "treasureLikeZone" : 10 }, - "12" : { "type" : "treasure", "size" : 1, "neutralTowns" : { "towns" : 1 }, "monsters" : "strong", "minesLikeZone" : 10, "treasureLikeZone" : 10 } - }, - "connections" : - [ - { "a" : "1", "b" : "4", "guard" : 2500 }, - { "a" : "1", "b" : "5", "guard" : 2500 }, - { "a" : "2", "b" : "6", "guard" : 2500 }, - { "a" : "2", "b" : "7", "guard" : 2500 }, - { "a" : "3", "b" : "8", "guard" : 2500 }, - { "a" : "3", "b" : "9", "guard" : 2500 }, - { "a" : "4", "b" : "10", "guard" : 20000 }, - { "a" : "5", "b" : "12", "guard" : 20000 }, - { "a" : "6", "b" : "10", "guard" : 20000 }, - { "a" : "7", "b" : "11", "guard" : 20000 }, - { "a" : "8", "b" : "12", "guard" : 20000 }, - { "a" : "9", "b" : "11", "guard" : 20000 } - ] - } -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Golden Ring/mod.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Golden Ring/mod.json deleted file mode 100644 index 914b4dfa2..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Golden Ring/mod.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Golden Ring", - "description" : "Random map template, 3p M+U/L", - - "version" : "0.99", - "author" : "VCMI Team", - "contact" : "http://forum.vcmi.eu/index.php", - "modType" : "Templates", - "templates" : [ - "config/defaultTemplates/goldenRing" - ], -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Jebus Cross/Content/config/defaultTemplates/jebusCross.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Jebus Cross/Content/config/defaultTemplates/jebusCross.json deleted file mode 100644 index 2280aac83..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Jebus Cross/Content/config/defaultTemplates/jebusCross.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "Jebus Cross": - { - "minSize" : "l+u", "maxSize" : "xl+u", - "players" : "2-4", - "zones": - { - "1": - { - "type" : "playerStart", "size" : 30, "owner" : 1, - "playerTowns" : { "castles" : 1 }, - "neutralTowns" : { "towns" : 2 }, - "bannedTowns" : ["necropolis", "conflux"], - "monsters" : "weak", - "mines" : {"wood" : 4, "ore" : 4, "gems" : 1, "crystal" : 1, "sulfur" : 1, "mercury" : 1, "gold" : 2}, - "treasure" : [ - {"min" : 12000, "max": 22000, "density": 1}, - {"min" : 5000, "max": 16000, "density": 6}, - {"min" : 300, "max": 3000, "density": 14} - ] - }, - "2": - { - "type" : "playerStart", "size" : 30, "owner" : 2, - "playerTowns" : { "castles" : 1 }, - "neutralTowns" : { "towns" : 2 }, - "bannedTowns" : ["necropolis", "conflux"], - "monsters" : "weak", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "3": - { - "type" : "playerStart", "size" : 30, "owner" : 3, - "playerTowns" : { "castles" : 1 }, - "neutralTowns" : { "towns" : 2 }, - "bannedTowns" : ["necropolis", "conflux"], - "monsters" : "weak", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "4": - { - "type" : "playerStart", "size" : 30, "owner" : 4, - "playerTowns" : { "castles" : 1 }, - "neutralTowns" : { "towns" : 2 }, - "bannedTowns" : ["necropolis", "conflux"], - "monsters" : "weak", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "5" : - { - "type" : "treasure", "size" : 40, - "neutralTowns" : { "castles" : 2 }, - "terrainTypes" : [ "sand" ], "matchTerrainToTown" : false, - "bannedTowns" : ["necropolis", "conflux"], - "monsters" : "strong", - "mines" : {"gold" : 4}, - "treasure" : [ - {"min" : 35000, "max": 55000, "density" : 3}, - {"min" : 25000, "max": 35000, "density" : 10}, - {"min" : 10000, "max": 25000, "density" : 10} - ] - } - }, - "connections" : - [ - { "a" : "1", "b" : "5", "guard" : 45000 }, - { "a" : "2", "b" : "5", "guard" : 45000 }, - { "a" : "3", "b" : "5", "guard" : 45000 }, - { "a" : "4", "b" : "5", "guard" : 45000 } - ] - } -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Jebus Cross/mod.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Jebus Cross/mod.json deleted file mode 100644 index 0124ca317..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Jebus Cross/mod.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Jebus Cross", - "description" : "Random map template, 4p L+U/XL+U", - - "version" : "0.99", - "author" : "Bjorn190, ported by VCMI Team", - "contact" : "http://forum.vcmi.eu/index.php", - "modType" : "Templates", - "templates" : [ - "config/defaultTemplates/jebusCross" - ], -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Upgrade/Content/config/defaultTemplates/upgrade.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Upgrade/Content/config/defaultTemplates/upgrade.json deleted file mode 100644 index 531a52aea..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Upgrade/Content/config/defaultTemplates/upgrade.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "Upgrade" : - { - "minSize" : "s+u", "maxSize" : "m", - "players" : "2", - "zones" : - { - "1" : - { - "type" : "playerStart", "size" : 3, "owner" : 1, - "playerTowns" : { "castles" : 1 }, - "monsters" : "normal", - "mines" : {"wood" : 1, "ore" : 1}, - "treasure" : [ - {"min" : 400, "max": 1500, "density" : 16}, - {"min" : 1500, "max": 2500, "density" : 4} - ] - }, - "2" : - { - "type" : "playerStart", "size" : 3, "owner" : 2, - "playerTowns" : { "castles" : 1 }, - "monsters" : "normal", - "minesLikeZone" : 1, - "treasureLikeZone" : 1 - }, - "3" : - { - "type" : "treasure", "size" : 4, "neutralTowns" : { "towns" : 1 }, "townTypeLikeZone" : 1, - "monsters" : "weak", - "mines" : {"gems" : 1, "crystal" : 1, "sulfur" : 1, "mercury" : 1, "gold" : 1}, - "treasure" : [ - {"min" : 2000, "max": 4000, "density" : 15}, - {"min" : 4000, "max": 5000, "density" : 5} - ] - }, - "4" : - { - "type" : "treasure", "size" : 4, "neutralTowns" : { "towns" : 1 }, "townTypeLikeZone" : 2, - "monsters" : "weak", - "minesLikeZone" : 3, - "treasureLikeZone" : 3 - }, - "5" : - { - "type" : "treasure", "size" : 5, "neutralTowns" : { "castles" : 1 }, "terrainTypes" : [ "sand" ], - "monsters" : "strong", - "mines" : {"gold" : 2}, - "treasure" : [ - {"min" : 11000, "max": 12000, "density" : 5}, - {"min" : 6000, "max": 11000, "density" : 10} - ] - } - }, - "connections" : - [ - { "a" : "1", "b" : "3", "guard" : 3000 }, - { "a" : "1", "b" : "5", "guard" : 9000 }, - { "a" : "2", "b" : "4", "guard" : 3000 }, - { "a" : "2", "b" : "5", "guard" : 9000 }, - { "a" : "3", "b" : "5", "guard" : 6000 }, - { "a" : "4", "b" : "5", "guard" : 6000 } - ] - } -} diff --git a/Mods/vcmi/Mods/defaultTemplates/Mods/Upgrade/mod.json b/Mods/vcmi/Mods/defaultTemplates/Mods/Upgrade/mod.json deleted file mode 100644 index 75dba71b7..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/Mods/Upgrade/mod.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Upgrade", - "description" : "Random map template, 1v1 S+U/M", - - "version" : "0.99", - "author" : "BVCMI Team", - "contact" : "http://forum.vcmi.eu/index.php", - "modType" : "Templates", - "templates" : [ - "config/defaultTemplates/upgrade" - ], -} diff --git a/Mods/vcmi/Mods/defaultTemplates/mod.json b/Mods/vcmi/Mods/defaultTemplates/mod.json deleted file mode 100644 index 31e8035db..000000000 --- a/Mods/vcmi/Mods/defaultTemplates/mod.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "Default templates", - "description" : "A set of random map templates for VCMI", - - "version" : "0.99", - "author" : "VCMI Team", - "contact" : "http://forum.vcmi.eu/index.php", - "modType" : "Templates" -} diff --git a/lib/GameConstants.cpp b/lib/GameConstants.cpp index 6649624bb..6cbe2c43f 100644 --- a/lib/GameConstants.cpp +++ b/lib/GameConstants.cpp @@ -38,9 +38,9 @@ const TeamID TeamID::NO_TEAM = TeamID(255); namespace GameConstants { #ifdef VCMI_NO_EXTRA_VERSION - const std::string VCMI_VERSION = std::string("VCMI 0.98h"); + const std::string VCMI_VERSION = std::string("VCMI 0.99"); #else - const std::string VCMI_VERSION = std::string("VCMI 0.98h ") + GIT_SHA1; + const std::string VCMI_VERSION = std::string("VCMI 0.99 ") + GIT_SHA1; #endif }