games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge branch 'develop' into feature/nullkiller2

Browse Source
This commit is contained in:
Mircea TheHonestCTO
2025-11-15 17:15:46 +01:00
parent 00c93c7b6a 81db5c7cf4
commit 0ee10c9213
151 changed files with 17411 additions and 9818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/bonuses.json
View File

@@ -20,7 +20,11 @@
"ATTACKS_ALL_ADJACENT":
{
},
"ALWAYS_MAXIMUM_DAMAGE":
{
},
"BASE_TILE_MOVEMENT_COST":
{
"blockDescriptionPropagation": true
@@ -334,7 +338,11 @@
{
"blockDescriptionPropagation": true
},
"MORE_DAMAGE_FROM_SPELL":
{
},
"MOVEMENT":
{
"blockDescriptionPropagation": true

2
config/factions/conflux.json
View File

@@ -196,7 +196,7 @@
"earthMagic"
]
},
"grail": { },
"grail": { "type" : "auroraBorealis" },
"extraTownHall": { },
"extraCityHall": { },
"extraCapitol": { },

2
config/factions/inferno.json
View File

@@ -205,7 +205,7 @@
},
"horde2": { "upgrades" : "dwellingLvl3" },
"horde2Upgr": { "upgrades" : "dwellingUpLvl3", "requires" : [ "horde2" ] },
"grail": { },
"grail": { "type" : "deityOfFire" },
"dwellingLvl1": { "requires" : [ "fort" ] },
"dwellingLvl2": { "requires" : [ "dwellingLvl1" ] },

2
config/schemas/townBuilding.json
View File

@@ -36,7 +36,7 @@
},
"type" : {
"type" : "string",
"enum" : [ "mysticPond", "castleGate", "portalOfSummoning", "library", "escapeTunnel", "treasury", "bank" ],
"enum" : [ "mysticPond", "castleGate", "portalOfSummoning", "library", "escapeTunnel", "treasury", "bank", "auroraBorealis", "deityOfFire" ],
"description" : "Subtype for some special buildings"
},
"mode" : {

26
config/terrainViewPatterns.json
View File

@@ -124,7 +124,7 @@
"data" :
[
"N", "N", "S",
"N", "N", "D",
"N", "N", "D,N",
"D,N", "D", "D,N"
],
"mapping" : { "normal" : "44", "hota" : "72" }
@@ -197,8 +197,8 @@
"data" :
[
"N", "N", "N",
"N", "N", "s3-1,m7-1,m8-1",
"N", "s2-1,m7-1,m8-1", "T"
"N", "N", "s3-1,m7-1,m8-1,s1-1",
"N", "s2-1,m7-1,m8-1,s1-1", "T"
],
"minPoints" : 2,
"mapping" : { "normal" : "12-15, 32-35", "dirt" : "12-15", "water" : "12-15", "rock": "4D:24-31", "hota" : "22-27,56-61" }
@@ -229,11 +229,23 @@
"id" : "s1",
"data" :
[
"?", "?", "?",
"?", "N", "N",
"T", "N", "N"
"?", "S-1,?", "?",
"S-1,?", "N", "N",
"?", "N", "N"
],
"mapping" : { "normal" : "0-3, 20-23", "dirt" : "0-3", "water" : "0-3", "rock": "4D:8-15", "hota" : "0-5,34-39" }
"minPoints" : 1,
"mapping" : { "normal" : "20-23", "dirt" : "0-3", "water" : "0-3", "rock": "4D:8-15", "hota" : "34-39" }
},
{
"id" : "s7",
"data" :
[
"?", "D-1,?", "?",
"D-1,?", "N", "N",
"?", "N", "N"
],
"minPoints" : 1,
"mapping" : { "normal" : "0-3", "rock": "4D:8-15", "hota" : "0-5" }
}
],
"terrainType" :