1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00

- implemented scholar skill

- fixed some remaining building issues (#361)
- Portal of Summoning will now be present in fort window
- some fixes for Thieves Guild window (partial #386)
This commit is contained in:
Ivan Savenko
2010-07-25 22:47:59 +00:00
parent e507f8300b
commit a00e5cc177
7 changed files with 147 additions and 120 deletions

View File

@@ -29,23 +29,11 @@ static std::set<si32> convertBuildings(const std::set<si32> h3m, int castleID)
std::ifstream b5(DATA_DIR "/config/buildings5.txt");
while(!b5.eof())
{
int a, b;
b5 >> a >> b;
if(castleID==8 && b==17) //magic university ID 17 (h3m) => 21 (vcmi)
b=21;
if(castleID==4 && a==20) //necropolis, skeleton transformer
b=22;
if(castleID==4 && a==19) //necropolis, necromancy aplifier
b=21;
if(castleID==3 && a==18) //inferno, brimstone clouds
b=21;
if(castleID==3 && a==20) //inferno, order of fire
b=23;
if(castleID==8 && a==10) //conflux, artifact merchant
b=17;
mapa[a]=b;
int h3, VCMI, town;
b5 >> town >> h3 >> VCMI;
if ( town == castleID || town == -1 )
mapa[h3]=VCMI;
}
for(std::set<si32>::const_iterator i=h3m.begin();i!=h3m.end();i++)
{
if(mapa[*i]>=0)