mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-25 22:18:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added Nuclear Fusion tech and the Giant Death Robot (#4207)

Browse Source 
* Reordered units

Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column

* Added Nuclear Fusion technology and GDR
This commit is contained in:
Arthur van der Staaij 2021-06-23 08:44:53 +02:00 committed by GitHub
parent e10c52efc1
commit 5b730fbc56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 994 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TechIcons/Nuclear Fusion.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
android/ImagesToPackSeparately/UnitIcons/Giant Death Robot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

131
android/assets/UnitIcons.atlas
View File

@ -214,373 +214,380 @@ Gatling Gun
orig: 100, 100
offset: 0, 0
index: -1
Great Artist
Giant Death Robot
rotate: false
xy: 220, 328
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Great Engineer
Great Artist
rotate: false
xy: 328, 436
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Great Engineer
rotate: false
xy: 436, 544
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Great General
rotate: false
xy: 436, 550
xy: 544, 658
size: 100, 94
orig: 100, 94
offset: 0, 0
index: -1
Great Merchant
rotate: false
xy: 544, 652
xy: 652, 760
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Great Scientist
rotate: false
xy: 652, 760
xy: 760, 868
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Great War Bomber
rotate: false
xy: 760, 868
xy: 4, 4
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Great War Infantry
rotate: false
xy: 4, 4
xy: 112, 112
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Guided Missile
rotate: false
xy: 112, 112
xy: 220, 220
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Helicopter Gunship
rotate: false
xy: 220, 220
xy: 328, 328
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Hoplite
rotate: false
xy: 328, 328
xy: 436, 436
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Horseman
rotate: false
xy: 436, 442
xy: 544, 550
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Hwach'a
rotate: false
xy: 544, 544
xy: 652, 652
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Infantry
rotate: false
xy: 652, 652
xy: 760, 760
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Ironclad
rotate: false
xy: 760, 760
xy: 868, 868
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Jaguar
rotate: false
xy: 868, 868
xy: 112, 4
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Janissary
rotate: false
xy: 112, 4
xy: 220, 112
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Jet Fighter
rotate: false
xy: 220, 112
xy: 328, 220
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Keshik
rotate: false
xy: 328, 220
xy: 436, 328
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Khan
rotate: false
xy: 436, 334
xy: 544, 442
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Knight
rotate: false
xy: 544, 436
xy: 652, 544
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Lancer
rotate: false
xy: 652, 544
xy: 760, 652
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Landship
rotate: false
xy: 760, 652
xy: 868, 760
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Landsknecht
rotate: false
xy: 868, 760
xy: 976, 868
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Legion
rotate: false
xy: 976, 868
xy: 220, 4
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Longbowman
rotate: false
xy: 220, 4
xy: 328, 112
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Longswordsman
rotate: false
xy: 328, 112
xy: 436, 220
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Machine Gun
rotate: false
xy: 436, 226
xy: 544, 334
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Mandekalu Cavalry
rotate: false
xy: 544, 328
xy: 652, 436
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Maori Warrior
rotate: false
xy: 652, 436
xy: 760, 544
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Marine
rotate: false
xy: 760, 544
xy: 868, 652
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Mechanized Infantry
rotate: false
xy: 868, 652
xy: 976, 760
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Minuteman
rotate: false
xy: 976, 760
xy: 1084, 868
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Mobile SAM
rotate: false
xy: 1084, 868
xy: 328, 4
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Modern Armor
rotate: false
xy: 328, 4
xy: 436, 112
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Mohawk Warrior
rotate: false
xy: 436, 118
xy: 544, 226
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Musketeer
rotate: false
xy: 544, 220
xy: 652, 328
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Musketman
rotate: false
xy: 652, 329
xy: 760, 437
size: 100, 99
orig: 100, 99
offset: 0, 0
index: -1
Naresuan's Elephant
rotate: false
xy: 760, 436
xy: 868, 544
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Norwegian Ski Infantry
rotate: false
xy: 868, 544
xy: 976, 652
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Nuclear Missile
rotate: false
xy: 976, 652
xy: 1084, 760
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Panzer
rotate: false
xy: 1084, 760
xy: 1192, 868
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Paratrooper
rotate: false
xy: 1192, 868
xy: 436, 4
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Persian Immortal
rotate: false
xy: 436, 10
xy: 544, 118
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Pikeman
rotate: false
xy: 544, 112
xy: 652, 220
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Rifleman
rotate: false
xy: 652, 221
xy: 760, 329
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Rocket Artillery
rotate: false
xy: 760, 328
xy: 868, 436
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Samurai
rotate: false
xy: 868, 436
xy: 976, 544
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Scout
rotate: false
xy: 976, 544
xy: 1084, 652
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Settler
rotate: false
xy: 1084, 652
xy: 1192, 760
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Ship of the Line
rotate: false
xy: 1192, 760
xy: 1300, 868
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Sipahi
rotate: false
xy: 1300, 868
xy: 544, 10
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Slinger
rotate: false
xy: 652, 113
xy: 652, 112
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Spearman
rotate: false
xy: 760, 220
xy: 760, 221
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -629,63 +636,63 @@ Trebuchet
index: -1
Triplane
rotate: false
xy: 868, 220
xy: 760, 113
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Trireme
rotate: false
xy: 976, 327
xy: 868, 219
size: 100, 101
orig: 100, 101
offset: 0, 0
index: -1
Turtle Ship
rotate: false
xy: 1084, 436
xy: 976, 328
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
War Chariot
rotate: false
xy: 1192, 544
xy: 1084, 436
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
War Elephant
rotate: false
xy: 1300, 652
xy: 1192, 544
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Warrior
rotate: false
xy: 1408, 760
xy: 1300, 652
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Work Boats
rotate: false
xy: 1516, 868
xy: 1408, 760
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Worker
rotate: false
xy: 1084, 328
xy: 1516, 868
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
Zero
rotate: false
xy: 1192, 436
xy: 976, 220
size: 100, 100
orig: 100, 100
offset: 0, 0

BIN
android/assets/UnitIcons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 KiB

After

Width:  |  Height:  |  Size: 314 KiB

889
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 998 KiB

After

Width:  |  Height:  |  Size: 1000 KiB

8
android/assets/jsons/Civ V - Vanilla/Techs.json
View File

@ -594,6 +594,12 @@
"prerequisites": ["Mobile Tactics","Satellites"],
"quote": "'Every particle of matter is attracted by or gravitates to every other particle of matter with a force inversely proportional to the squares of their distances.' - Isaac Newton"
},
{
"name": "Nuclear Fusion",
"row": 6,
"prerequisites": [/*"Advanced Ballistics" ,*/ "Satellites", "Robotics"],
"quote": "'The release of atomic energy has not created a new problem. It has readily made more urgent the necessity of solving an existing one.' - Albert Einstein"
},
{
"name": "Nanotechnology",
"row": 7,
@ -612,7 +618,7 @@
{
"name": "Future Tech",
"row": 5,
"prerequisites": ["Nanotechnology","Particle Physics"],
"prerequisites": ["Particle Physics", "Nuclear Fusion", "Nanotechnology"],
"uniques": ["Who knows what the future holds?", "Can be continually researched"],
"quote": "'I think we agree, the past is over.' - George W. Bush"
}

938
android/assets/jsons/Civ V - Vanilla/Units.json
View File

File diff suppressed because it is too large Load Diff

4
docs/Credits.md
View File

@ -107,7 +107,8 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Nuclear Missile](https://thenounproject.com/marialuisa.iborra/collection/missiles-bombs/?i=1022574) By Lluisa Iborra, ES
* Icon for Carrier made by [JackRainy](https://github.com/JackRainy), based on [Aircraft Carrier](https://thenounproject.com/icolabs/collection/flat-icons-transport/?i=2332914) By IcoLabs, BR
* [Water Gun](https://thenounproject.com/term/water-gun/2121571) by ProSymbols for Marine
* [Parachute](https://thenounproject.com/term/parachute/2025018) by Nociconist for Paratrooper*
* [Parachute](https://thenounproject.com/term/parachute/2025018) by Nociconist for Paratrooper
* [Robot](https://thenounproject.com/term/robot/1182459/) by Lluisa Iborra, ES for Giant Death Robot
### Great People
@ -455,6 +456,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Satellite](https://thenounproject.com/term/satellite/1466641/) By Ben Davis for Satellites
* [Electronics](https://thenounproject.com/search/?q=Electronics&i=1565843) By Cuby Design
* [Atom](https://thenounproject.com/term/atom/1586852/) By Kelsey Armstrong for Particle Physics
* [Thermonuclear fusion](https://thenounproject.com/search/?q=fusion&i=3292735) by Olena Panasovska, UA for Nuclear Fusion
* [Information Technology](https://thenounproject.com/term/information-technology/1927668/) By Vectors Markeet for Future Tech
## Terrain