Tech reorg - added Lasers and Mobile Tactics, tech tree is now almost 100% G&K

This commit is contained in:
Yair Morgenstern
2019-07-17 22:21:05 +03:00
parent 1ac3cfb74e
commit 90318ef93b
5 changed files with 553 additions and 517 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1012 KiB

After

Width:  |  Height:  |  Size: 1008 KiB

View File

@ -428,15 +428,9 @@
}, },
{ {
name:"Atomic Theory", name:"Atomic Theory",
row:3, row:4,
prerequisites:["Plastics","Electronics"] prerequisites:["Plastics","Electronics"]
}, },
{
name:"Computers",
row:5,
prerequisites:["Electronics"],
uniques:["+10% science and production in all cities"]
},
{ {
name:"Radar", name:"Radar",
row:6, row:6,
@ -444,7 +438,7 @@
}, },
{ {
name:"Combined Arms", name:"Combined Arms",
row:7, row:8,
prerequisites:["Ballistics","Combustion"] prerequisites:["Ballistics","Combustion"]
}, },
] ]
@ -464,17 +458,18 @@
{ {
name:"Nuclear Fission", name:"Nuclear Fission",
row:3, row:3,
prerequisites:["Atomic Theory"] prerequisites:["Atomic Theory","Radar"]
},
{
name:"Robotics",
row:4,
prerequisites:["Computers"]
}, },
{ {
name:"Rocketry", name:"Rocketry",
row:6, row:6,
prerequisites:["Combined Arms","Radar"] prerequisites:["Radar"]
}
{
name:"Computers",
row:8,
prerequisites:["Combined Arms","Radar"],
uniques:["+10% science and production in all cities"]
} }
] ]
}, },
@ -486,22 +481,30 @@
wonderCost:1250, wonderCost:1250,
techs:[ techs:[
{ {
name:"Nanotechnology", name:"Mobile Tactics",
row:3, row:3,
prerequisites:["Robotics","Ecology"] prerequisites:["Ecology","Nuclear Fission"]
},
{
name:"Particle Physics",
row:4,
prerequisites:["Nuclear Fission"]
}, },
{ {
name:"Satellites", name:"Satellites",
row:5, row:5,
prerequisites:["Rocketry","Robotics"] prerequisites:["Nuclear Fission","Rocketry"]
} }
{
name:"Robotics",
row:7,
prerequisites:["Rocketry","Computers"]
},
{
name:"Lasers",
row:8,
prerequisites:["Computers"]
},
] ]
}, },
{ {
columnNumber: 16, columnNumber: 16,
era:"Future", era:"Future",
@ -510,8 +513,27 @@
wonderCost:1250, wonderCost:1250,
techs:[ techs:[
{ {
name:"Future Tech", name:"Particle Physics",
row:4, row:4,
prerequisites:["Mobile Tactics","Satellites"]
},
{
name:"Nanotechnology",
row:7,
prerequisites:["Robotics","Lasers"]
},
]
}
{
columnNumber: 17,
era:"Future",
techCost: 9500,
buildingCost:750,
wonderCost:1250,
techs:[
{
name:"Future Tech",
row:5,
prerequisites:["Nanotechnology","Particle Physics","Satellites"], prerequisites:["Nanotechnology","Particle Physics","Satellites"],
uniques:["Who knows what the future holds?"] uniques:["Who knows what the future holds?"]
} }

View File

@ -1129,7 +1129,7 @@
movement:3, movement:3,
strength:90, strength:90,
cost: 375, cost: 375,
requiredTech:"Nuclear Fission", requiredTech:"Mobile Tactics",
hurryCostModifier:20, hurryCostModifier:20,
}, },
{ {
@ -1138,7 +1138,7 @@
movement:5, movement:5,
strength:100, strength:100,
cost: 425, cost: 425,
requiredTech:"Robotics", requiredTech:"Lasers",
requiredResource:"Aluminum", requiredResource:"Aluminum",
uniques:["Can move after attacking","No defensive terrain bonus"] uniques:["Can move after attacking","No defensive terrain bonus"]
hurryCostModifier:20, hurryCostModifier:20,

View File

@ -44,7 +44,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
tempTechsToResearch = ArrayList(civTech.techsToResearch) tempTechsToResearch = ArrayList(civTech.techsToResearch)
val columns = 17 val columns = GameBasics.Technologies.values.map { it.column!!.columnNumber}.max()!! +1
val techMatrix = Array<Array<Technology?>>(columns) { arrayOfNulls(10) } // Divided into columns, then rows val techMatrix = Array<Array<Technology?>>(columns) { arrayOfNulls(10) } // Divided into columns, then rows
for (technology in GameBasics.Technologies.values) { for (technology in GameBasics.Technologies.values) {