Added Sweden Civ (#4566)

* wonder splash screens

* wonder splash screens atlas

* reset to master

* Add Sweden

* add translations

* translations

* implement first part of UP

* add icons to atlas

* implement second part of swedens up

* implement first hakkapeliitta unique

* implement second hakkapeliitta unique

* gifted GPs are removed

* update sweden symbol

* translations

* review Hakkapeliitta unique

* removed unneccesary parameters

* hakka UP review

* Hakka UP part 2

* yairm's reviews

* translations for fixes

* removed [great person generation] parameter as it's hardcoded anyway

* Moved check for stacking unit bonus outside great general logic

android/assets/UnitIcons.atlas

@@ -6,749 +6,763 @@ filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
 Anti-Aircraft Gun
   rotate: false
-  xy: 4, 868
+  xy: 4, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Anti-Tank Gun
   rotate: false
-  xy: 4, 760
+  xy: 4, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Archer
   rotate: false
-  xy: 112, 868
+  xy: 112, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Artillery
   rotate: false
-  xy: 4, 652
+  xy: 4, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Atomic Bomb
   rotate: false
-  xy: 112, 760
+  xy: 112, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 B17
   rotate: false
-  xy: 220, 868
+  xy: 220, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Ballista
   rotate: false
-  xy: 4, 544
+  xy: 4, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Battering Ram
   rotate: false
-  xy: 112, 652
+  xy: 112, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Battleship
   rotate: false
-  xy: 220, 760
+  xy: 220, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Berserker
   rotate: false
-  xy: 328, 868
+  xy: 328, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Bomber
   rotate: false
-  xy: 4, 436
+  xy: 4, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Bowman
   rotate: false
-  xy: 112, 544
+  xy: 112, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Brute
   rotate: false
-  xy: 220, 652
+  xy: 220, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Camel Archer
   rotate: false
-  xy: 328, 760
+  xy: 328, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Cannon
   rotate: false
-  xy: 436, 868
+  xy: 436, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Caravel
   rotate: false
-  xy: 4, 328
+  xy: 4, 322
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+Carolean
+  rotate: false
+  xy: 112, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Carrier
   rotate: false
-  xy: 112, 436
+  xy: 220, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Catapult
   rotate: false
-  xy: 220, 544
+  xy: 328, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Cavalry
   rotate: false
-  xy: 328, 652
+  xy: 436, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Chariot Archer
   rotate: false
-  xy: 436, 760
+  xy: 544, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Chu-Ko-Nu
   rotate: false
-  xy: 544, 868
+  xy: 4, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Companion Cavalry
   rotate: false
-  xy: 4, 220
+  xy: 112, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Composite Bowman
   rotate: false
-  xy: 112, 328
+  xy: 220, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Conquistador
   rotate: false
-  xy: 220, 436
+  xy: 328, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Cossack
   rotate: false
-  xy: 328, 544
+  xy: 436, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Crossbowman
   rotate: false
-  xy: 436, 652
+  xy: 544, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Destroyer
   rotate: false
-  xy: 544, 760
+  xy: 652, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Fighter
   rotate: false
-  xy: 652, 868
+  xy: 4, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Foreign Legion
   rotate: false
-  xy: 4, 112
+  xy: 112, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Frigate
   rotate: false
-  xy: 112, 220
+  xy: 220, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Galleass
   rotate: false
-  xy: 220, 328
+  xy: 328, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Gatling Gun
   rotate: false
-  xy: 328, 436
+  xy: 436, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Giant Death Robot
   rotate: false
-  xy: 436, 544
+  xy: 544, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great Artist
   rotate: false
-  xy: 544, 652
+  xy: 652, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great Engineer
   rotate: false
-  xy: 652, 760
+  xy: 760, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great General
   rotate: false
-  xy: 760, 874
+  xy: 4, 4
   size: 100, 94
   orig: 100, 94
   offset: 0, 0
   index: -1
 Great Merchant
   rotate: false
-  xy: 4, 4
+  xy: 112, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great Prophet
   rotate: false
-  xy: 112, 112
+  xy: 220, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great Scientist
   rotate: false
-  xy: 220, 220
+  xy: 328, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great War Bomber
   rotate: false
-  xy: 328, 328
+  xy: 436, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great War Infantry
   rotate: false
-  xy: 436, 436
+  xy: 544, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Guided Missile
   rotate: false
-  xy: 544, 544
+  xy: 652, 646
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+Hakkapeliitta
+  rotate: false
+  xy: 760, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Helicopter Gunship
   rotate: false
-  xy: 652, 652
+  xy: 868, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hoplite
   rotate: false
-  xy: 760, 766
+  xy: 220, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Horse Archer
   rotate: false
-  xy: 868, 868
+  xy: 328, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Horseman
   rotate: false
-  xy: 112, 4
+  xy: 436, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hwach'a
   rotate: false
-  xy: 220, 112
+  xy: 544, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Infantry
   rotate: false
-  xy: 328, 220
+  xy: 652, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Ironclad
   rotate: false
-  xy: 436, 328
+  xy: 760, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Jaguar
   rotate: false
-  xy: 544, 436
+  xy: 868, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Janissary
   rotate: false
-  xy: 652, 544
+  xy: 976, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Jet Fighter
   rotate: false
-  xy: 760, 658
+  xy: 328, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Keshik
   rotate: false
-  xy: 868, 760
+  xy: 436, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Khan
   rotate: false
-  xy: 976, 868
+  xy: 544, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Knight
   rotate: false
-  xy: 220, 4
+  xy: 652, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Lancer
   rotate: false
-  xy: 328, 112
+  xy: 760, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Landship
   rotate: false
-  xy: 436, 220
+  xy: 868, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Landsknecht
   rotate: false
-  xy: 544, 328
+  xy: 976, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Legion
   rotate: false
-  xy: 652, 436
+  xy: 1084, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Longbowman
   rotate: false
-  xy: 760, 550
+  xy: 436, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Longswordsman
   rotate: false
-  xy: 868, 652
+  xy: 544, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Machine Gun
   rotate: false
-  xy: 976, 760
+  xy: 652, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mandekalu Cavalry
   rotate: false
-  xy: 1084, 868
+  xy: 760, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Maori Warrior
   rotate: false
-  xy: 328, 4
+  xy: 868, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Marine
   rotate: false
-  xy: 436, 112
+  xy: 976, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mechanized Infantry
   rotate: false
-  xy: 544, 220
+  xy: 1084, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Minuteman
   rotate: false
-  xy: 652, 328
+  xy: 1192, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Missile Cruiser
   rotate: false
-  xy: 760, 442
+  xy: 544, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mobile SAM
   rotate: false
-  xy: 868, 544
+  xy: 652, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Modern Armor
   rotate: false
-  xy: 976, 652
+  xy: 760, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mohawk Warrior
   rotate: false
-  xy: 1084, 760
+  xy: 868, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Musketeer
   rotate: false
-  xy: 1192, 868
+  xy: 976, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Musketman
   rotate: false
-  xy: 436, 5
+  xy: 1084, 647
   size: 100, 99
   orig: 100, 99
   offset: 0, 0
   index: -1
 Naresuan's Elephant
   rotate: false
-  xy: 544, 112
+  xy: 1192, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Norwegian Ski Infantry
   rotate: false
-  xy: 652, 220
+  xy: 1300, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Nuclear Missile
   rotate: false
-  xy: 760, 334
+  xy: 652, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Nuclear Submarine
   rotate: false
-  xy: 868, 436
+  xy: 760, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Panzer
   rotate: false
-  xy: 976, 544
+  xy: 868, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Paratrooper
   rotate: false
-  xy: 1084, 652
+  xy: 976, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Persian Immortal
   rotate: false
-  xy: 1192, 760
+  xy: 1084, 539
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Pikeman
   rotate: false
-  xy: 1300, 868
+  xy: 1192, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Privateer
   rotate: false
-  xy: 652, 112
+  xy: 1300, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Rifleman
   rotate: false
-  xy: 760, 226
+  xy: 1408, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Rocket Artillery
   rotate: false
-  xy: 868, 328
+  xy: 760, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Samurai
   rotate: false
-  xy: 976, 436
+  xy: 868, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Scout
   rotate: false
-  xy: 1084, 544
+  xy: 976, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Sea Beggar
   rotate: false
-  xy: 1192, 652
+  xy: 1084, 431
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Settler
   rotate: false
-  xy: 1300, 760
+  xy: 1192, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Ship of the Line
   rotate: false
-  xy: 1408, 868
+  xy: 1300, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Sipahi
   rotate: false
-  xy: 760, 118
+  xy: 1408, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Slinger
   rotate: false
-  xy: 868, 220
+  xy: 1516, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Spearman
   rotate: false
-  xy: 976, 328
+  xy: 868, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Stealth Bomber
   rotate: false
-  xy: 1084, 436
+  xy: 976, 214
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Submarine
   rotate: false
-  xy: 1192, 544
+  xy: 1084, 323
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Swordsman
   rotate: false
-  xy: 1300, 652
+  xy: 1192, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Tank
   rotate: false
-  xy: 1408, 760
+  xy: 1300, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Tercio
   rotate: false
-  xy: 1516, 868
+  xy: 1408, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Trebuchet
   rotate: false
-  xy: 976, 220
+  xy: 1516, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Triplane
   rotate: false
-  xy: 1084, 328
+  xy: 1624, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Trireme
   rotate: false
-  xy: 1192, 435
+  xy: 1084, 214
   size: 100, 101
   orig: 100, 101
   offset: 0, 0
   index: -1
 Turtle Ship
   rotate: false
-  xy: 1300, 544
+  xy: 976, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 War Chariot
   rotate: false
-  xy: 1408, 652
+  xy: 1192, 322
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 War Elephant
   rotate: false
-  xy: 1516, 760
+  xy: 1300, 430
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Warrior
   rotate: false
-  xy: 1624, 868
+  xy: 1408, 538
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Work Boats
   rotate: false
-  xy: 1084, 220
+  xy: 1516, 646
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Worker
   rotate: false
-  xy: 1192, 327
+  xy: 1624, 754
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Zero
   rotate: false
-  xy: 1300, 436
+  xy: 1732, 862
   size: 100, 100
   orig: 100, 100
   offset: 0, 0

android/assets/jsons/Civ V - Vanilla/Nations.json

@@ -714,13 +714,13 @@
 		"uniques": ["Retain [50]% of the happiness from a luxury after the last copy has been traded away"],
 		"cities": ["Amsterdam", "Rotterdam", "Utrecht", "Groningen", "Breda", "Nijmegen", "Den Haag", "Haarlem", "Arnhem", "Zutphen", "Maastricht", "Tilburg", "Eindhoven", "Dordrecht", "Leiden", "Hertogenbosch", "Almere", "Alkmaar", "Brielle", "Vlissingen", "Apeldoorn", "Enschede", "Amersfoort", "Zwolle", "Venlo", "Uden", "Grave", "Delft", "Gouda", "Nieuwstadt", "Weesp", "Coevorden", "Kerkrade"]
 	},
-/*
+
 	{        
 	    "name": "Sweden",
 		"leaderName": "Gustavus Adolphus",
 		"adjective": ["Swedish"],
 		"startBias": ["Tundra"],
-		"preferredVictoryType": "Diplomatic",
+		"preferredVictoryType": "Domination",
 		
 		"startIntroPart1": "All hail the transcendent King Gustavus Adolphus, founder of the Swedish Empire and her most distinguished military tactician. It was during your reign that Sweden emerged as one of the greatest powers in Europe, due in no small part to your wisdom, both on and off the battlefield. As king, you initiated a number of domestic reforms that ensured the economic stability and prosperity of your people. As the general who came to be known as the \"Lion of the North,\" your visionary designs in warfare gained the admiration of military commanders the world over. Thanks to your triumphs in the Thirty Years' War, you were assured a legacy as one of history's greatest generals.",
 		"startIntroPart2": "Oh noble King, the people long for your prudent leadership, hopeful that once again they will see your kingdom rise to glory. Will you devise daring new strategies, leading your armies to victory on the theater of war? Will you build a civilization that stands the test of time?",
@@ -733,15 +733,17 @@
 		"neutralHello": "Oh, welcome!",
 		"hateHello": "Oh, it is you.",
 		"tradeRequest": "My friend, it is my belief that this settlement can benefit both our peoples.",
-        "outerColor": [227,225,44],     // #e3e12c (warm yellow)
+        "outerColor": [37,56,123],
-		"innerColor": [37,56,123],     // #25387b (dark greyish blue) (was 194,97,255 #c261ff purple)
+		"innerColor": [227,225,44],
 		"uniqueName": "Nobel Prize",
-		"uniques": ["Gain [90] [Influence] with a [Great Person] gift to a City-State", "When declaring [friendship], both parties gain a +[10]% boost to [great person generation]"],
+		"uniques": ["Gain [90] Influence with a [Great Person] gift to a City-State", "When declaring friendship, both parties gain a [10]% boost to great person generation"],
-        "cities": ["Stockholm","Malmö","Gothenburg","Visby","Uppsala","Umeå","Lund","Kiruna","Helsingborg",
+		"cities": ["Stockholm","Uppsala","Gothenburg","Malmö","Linköping","Kalmar","Skara","Västerås","Jönköping",
-		"Örebro","Västerås","Linköping","Norrköping","Gävle","Karlskrona","Halmstad","Karlstad","Växjö",
+		"Visby","Falun","Norrköping","Gävle","Halmstad","Karlskrona","Hudiksvall","Örebro","Umeå","Karlstad",
-		"Sundsvall","Jönköping","Borås","Sigtuna","Birka","Strängnäs","Skara","Lödöse","Ystad","Paviken"]
+		"Helsingborg","Härnösand","Vadstena","Lund","Västervik","Enköping","Skövde","Eskilstuna","Luleå","Lidköping",
+		"Södertälje","Mariestad","Östersund","Borås","Sundsvall","Vimmerby","Köping","Mora","Arboga","Växjö","Gränna",
+		"Kiruna","Borgholm","Strängnäs","Sveg"]
 	},
-*/
+
 
 	
 	    

android/assets/jsons/Civ V - Vanilla/Units.json

@@ -882,6 +882,23 @@
 		"obsoleteTech": "Combined Arms",
 		"attackSound": "horse"
 	},
+	{
+		"name": "Hakkapeliitta",
+		"unitType": "Mounted",
+		"replaces": "Lancer",
+		"uniqueTo": "Sweden",
+		"movement": 4,
+		"strength": 25,
+		"cost": 185,
+		"requiredTech": "Metallurgy",
+		"requiredResource": "Horses",
+		"uniques": ["Can move after attacking","No defensive terrain bonus","-[33]% Strength vs [City]",
+			"Transfer Movement to [Great General]", "[+15]% Strength when stacked with [Great General]"],
+		"promotions": ["Formation I"],
+		"upgradesTo": "Anti-Tank Gun",
+		"obsoleteTech": "Combined Arms",
+		"attackSound": "horse"
+	},
 	{
 		"name": "Cannon",
 		"unitType": "Siege",
@@ -936,6 +953,20 @@
 		"uniques": ["+[25]% Strength in [Snow]", "+[25]% Strength in [Tundra]", "+[25]% Strength in [Hill]", "Double movement in Snow, Tundra and Hills"],
 		"attackSound": "shot"
 	},
+	{
+		"name": "Carolean",
+		"unitType": "Melee",
+		"replaces": "Rifleman",
+		"uniqueTo": "Sweden",
+		"movement": 2,
+		"strength": 34,
+		"cost": 225,
+		"requiredTech": "Rifling",
+		"obsoleteTech": "Replaceable Parts",
+		"upgradesTo": "Great War Infantry",
+		"promotions": ["March"],
+		"attackSound": "shot"
+	},
 	{
 		"name": "Cavalry",
 		"unitType": "Mounted",

android/assets/jsons/translations/English.properties

@@ -5311,6 +5311,123 @@ Coevorden =
  # Requires translation!
 Kerkrade = 
 
+ # Requires translation!
+Sweden = 
+ # Requires translation!
+Gustavus Adolphus = 
+ # Requires translation!
+The Hakkapeliittas will ride again and your men will fall just at the sight of my cavalry! God with us! = 
+ # Requires translation!
+Ha ha ha, captain Gars will be very glad to head out to war again. = 
+ # Requires translation!
+I am Sweden's king. You can take my lands, my people, my kingdom, but you will never reach the House of Vasa. = 
+ # Requires translation!
+Stranger, welcome to the Snow King's kingdom! I am Gustavus Adolphus, member of the esteemed House of Vasa = 
+ # Requires translation!
+My friend, it is my belief that this settlement can benefit both our peoples. = 
+ # Requires translation!
+Oh, welcome! = 
+ # Requires translation!
+Oh, it is you. = 
+ # Requires translation!
+Nobel Prize = 
+ # Requires translation!
+Gain [amount] Influence with a [param] gift to a City-State = 
+ # Requires translation!
+When declaring friendship, both parties gain a [amount]% boost to great person generation = 
+ # Requires translation!
+All hail the transcendent King Gustavus Adolphus, founder of the Swedish Empire and her most distinguished military tactician. It was during your reign that Sweden emerged as one of the greatest powers in Europe, due in no small part to your wisdom, both on and off the battlefield. As king, you initiated a number of domestic reforms that ensured the economic stability and prosperity of your people. As the general who came to be known as the "Lion of the North," your visionary designs in warfare gained the admiration of military commanders the world over. Thanks to your triumphs in the Thirty Years' War, you were assured a legacy as one of history's greatest generals. = 
+ # Requires translation!
+Oh noble King, the people long for your prudent leadership, hopeful that once again they will see your kingdom rise to glory. Will you devise daring new strategies, leading your armies to victory on the theater of war? Will you build a civilization that stands the test of time? = 
+ # Requires translation!
+Stockholm = 
+ # Requires translation!
+Uppsala = 
+ # Requires translation!
+Gothenburg = 
+ # Requires translation!
+Malmö = 
+ # Requires translation!
+Linköping = 
+ # Requires translation!
+Kalmar = 
+ # Requires translation!
+Skara = 
+ # Requires translation!
+Västerås = 
+ # Requires translation!
+Jönköping = 
+ # Requires translation!
+Visby = 
+ # Requires translation!
+Falun = 
+ # Requires translation!
+Norrköping = 
+ # Requires translation!
+Gävle = 
+ # Requires translation!
+Halmstad = 
+ # Requires translation!
+Karlskrona = 
+ # Requires translation!
+Hudiksvall = 
+ # Requires translation!
+Örebro = 
+ # Requires translation!
+Umeå = 
+ # Requires translation!
+Karlstad = 
+ # Requires translation!
+Helsingborg = 
+ # Requires translation!
+Härnösand = 
+ # Requires translation!
+Vadstena = 
+ # Requires translation!
+Lund = 
+ # Requires translation!
+Västervik = 
+ # Requires translation!
+Enköping = 
+ # Requires translation!
+Skövde = 
+ # Requires translation!
+Eskilstuna = 
+ # Requires translation!
+Luleå = 
+ # Requires translation!
+Lidköping = 
+ # Requires translation!
+Södertälje = 
+ # Requires translation!
+Mariestad = 
+ # Requires translation!
+Östersund = 
+ # Requires translation!
+Borås = 
+ # Requires translation!
+Sundsvall = 
+ # Requires translation!
+Vimmerby = 
+ # Requires translation!
+Köping = 
+ # Requires translation!
+Mora = 
+ # Requires translation!
+Arboga = 
+ # Requires translation!
+Växjö = 
+ # Requires translation!
+Gränna = 
+ # Requires translation!
+Kiruna = 
+ # Requires translation!
+Borgholm = 
+ # Requires translation!
+Strängnäs = 
+ # Requires translation!
+Sveg = 
+
  # Requires translation!
 Milan = 
  # Requires translation!
@@ -6973,6 +7090,13 @@ Sipahi =
  # Requires translation!
 No movement cost to pillage = 
 
+ # Requires translation!
+Hakkapeliitta = 
+ # Requires translation!
+Transfer Movement to [param] = 
+ # Requires translation!
+[amount]% Strength when stacked with [param] = 
+
  # Requires translation!
 Cannon = 
 
@@ -6987,6 +7111,9 @@ Norwegian Ski Infantry =
  # Requires translation!
 Double movement in Snow, Tundra and Hills = 
 
+ # Requires translation!
+Carolean = 
+
  # Requires translation!
 Cavalry = 
 

android/assets/jsons/translations/Swedish.properties

@@ -2814,6 +2814,123 @@ Weesp = Weesp
 Coevorden = Coevorden
 Kerkrade = Kerkrade
 
+ # Requires translation!
+Sweden = Sverige
+ # Requires translation!
+Gustavus Adolphus = Gustav II Adolf
+ # Requires translation!
+The Hakkapeliittas will ride again and your men will fall just at the sight of my cavalry! God with us! = Hakkapeliterna kommer rida igen och era män kommer att stupa vid bara åsynen av mitt kavalleri. Gott mit uns!
+ # Requires translation!
+Ha ha ha, captain Gars will be very glad to head out to war again. = Ha ha ha, kapten Gars kommer att bli mycket glad över att ge sig ut i krig igen.
+ # Requires translation!
+I am Sweden's king. You can take my lands, my people, my kingdom, but you will never reach the House of Vasa. = Jag är Sveriges konung. Ni kan ta min mark, mitt folk, mitt rike, men ni kommer aldrig åt Vasaätten.
+ # Requires translation!
+Stranger, welcome to the Snow King's kingdom! I am Gustavus Adolphus, member of the esteemed House of Vasa = Främling, välkommen till Snökonungens rike! Jag är Gustav Adolf, medlem av den aktade Vasaätten.
+ # Requires translation!
+My friend, it is my belief that this settlement can benefit both our peoples. = Min vän, det är min övertygelse att denna uppgörelse kan gagna både mitt och ert folk.
+ # Requires translation!
+Oh, welcome! = Ah, välkommen!
+ # Requires translation!
+Oh, it is you. = Jaså, det är ni.
+ # Requires translation!
+Nobel Prize = Nobelpriset
+ # Requires translation!
+Gain [amount] Influence with a [param] gift to a City-State = Få [amount] Inflytande då du ger en [param] till en Stadsstat
+ # Requires translation!
+When declaring friendship, both parties gain a [amount]% boost to great person generation = Vid en vänskapsförklaring får båda parter en [amount]% bonus för generation av stora personer
+ # Requires translation!
+All hail the transcendent King Gustavus Adolphus, founder of the Swedish Empire and her most distinguished military tactician. It was during your reign that Sweden emerged as one of the greatest powers in Europe, due in no small part to your wisdom, both on and off the battlefield. As king, you initiated a number of domestic reforms that ensured the economic stability and prosperity of your people. As the general who came to be known as the "Lion of the North," your visionary designs in warfare gained the admiration of military commanders the world over. Thanks to your triumphs in the Thirty Years' War, you were assured a legacy as one of history's greatest generals. = 
+ # Requires translation!
+Oh noble King, the people long for your prudent leadership, hopeful that once again they will see your kingdom rise to glory. Will you devise daring new strategies, leading your armies to victory on the theater of war? Will you build a civilization that stands the test of time? = 
+ # Requires translation!
+Stockholm = Stockholm
+ # Requires translation!
+Uppsala = Uppsala
+ # Requires translation!
+Gothenburg = Göteborg
+ # Requires translation!
+Malmö = Malmö
+ # Requires translation!
+Linköping = Linköping
+ # Requires translation!
+Kalmar = Kalmar
+ # Requires translation!
+Skara = Skara
+ # Requires translation!
+Västerås = Västerås
+ # Requires translation!
+Jönköping = Jönköping
+ # Requires translation!
+Visby = Visby
+ # Requires translation!
+Falun = Falun
+ # Requires translation!
+Norrköping = Norrköping
+ # Requires translation!
+Gävle = Gävle
+ # Requires translation!
+Halmstad = Halmstad
+ # Requires translation!
+Karlskrona = Karlskrona
+ # Requires translation!
+Hudiksvall = Hudiksvall
+ # Requires translation!
+Örebro = Örebro
+ # Requires translation!
+Umeå = Umeå
+ # Requires translation!
+Karlstad = Karlstad
+ # Requires translation!
+Helsingborg = Helsingborg
+ # Requires translation!
+Härnösand = Härnösand
+ # Requires translation!
+Vadstena = Vadstena
+ # Requires translation!
+Lund = Lund
+ # Requires translation!
+Västervik = Västervik
+ # Requires translation!
+Enköping = Enköping
+ # Requires translation!
+Skövde = Skövde
+ # Requires translation!
+Eskilstuna = Eskilstuna
+ # Requires translation!
+Luleå = Luleå
+ # Requires translation!
+Lidköping = Lidköping
+ # Requires translation!
+Södertälje = Södertälje
+ # Requires translation!
+Mariestad = Mariestad
+ # Requires translation!
+Östersund = Östersund
+ # Requires translation!
+Borås = Borås
+ # Requires translation!
+Sundsvall = Sundsvall
+ # Requires translation!
+Vimmerby = Vimmerby
+ # Requires translation!
+Köping = Köping
+ # Requires translation!
+Mora = Mora
+ # Requires translation!
+Arboga = Arboga
+ # Requires translation!
+Växjö = Växjö
+ # Requires translation!
+Gränna = Gränna
+ # Requires translation!
+Kiruna = Kiruna
+ # Requires translation!
+Borgholm = Borgholm
+ # Requires translation!
+Strängnäs = Strängnäs
+ # Requires translation!
+Sveg = Sveg
+
 Milan = Milano
 You leave us no choice. War it must be. = Du ger oss inget val. Krig är enda alternativet.
 Very well, this shall not be forgotten. = Nåväl, det ska sent glömmas.
@@ -3810,6 +3927,13 @@ Lancer = Lansiär
 Sipahi = Spahi
 No movement cost to pillage = Ingen förflyttningskostnad för att plundra
 
+ # Requires translation!
+Hakkapeliitta = Hakkapelit
+# Requires translation!
+Transfer Movement to [param] = Överför Förflyttning till [param]
+# Requires translation!
+[amount]% Strength when stacked with [param] = [amount]% Styrka medan i samma ruta som [param]
+
 Cannon = Kanon
 
 Gatling Gun = Gatlingkulspruta
@@ -3819,6 +3943,9 @@ Rifleman = Gevärsskytt
 Norwegian Ski Infantry = Norskt Skidinfanteri
 Double movement in Snow, Tundra and Hills = Dubbel förflyttning i Snö, Tundra, och Kullar
 
+ # Requires translation!
+Carolean = Karolin
+
 Cavalry = Kavalleri
 
 Cossack = Kosack

android/assets/jsons/translations/template.properties

@@ -695,6 +695,7 @@ Attacking Bonus =
 defence vs [unitType] = 
 [tileFilter] defence = 
 Defensive Bonus = 
+Stacked with [unitType] = 
 
 The following improvements [stats]: = 
 The following improvements on [tileType] tiles [stats]: = 

core/src/com/unciv/logic/battle/BattleDamage.kt

@@ -76,9 +76,19 @@ object BattleDamage {
             if (nearbyCivUnits.any { it.hasUnique("Bonus for units in 2 tile radius 15%") }) {
                 val greatGeneralModifier =
                     if (combatant.unit.civInfo.hasUnique("Great General provides double combat bonus")) 30 else 15
+
                 modifiers["Great General"] = greatGeneralModifier
             }
 
+            for (unique in combatant.unit.getMatchingUniques("[]% Strength when stacked with []")) {
+                var stackedUnitsBonus = 0
+                if (combatant.unit.getTile().getUnits().any { it.matchesFilter(unique.params[1]) } )
+                    stackedUnitsBonus += unique.params[0].toInt()
+
+                if (stackedUnitsBonus > 0)
+                    modifiers["Stacked with [${unique.params[1]}]"] = stackedUnitsBonus
+            }
+
             if (civInfo.goldenAges.isGoldenAge() && civInfo.hasUnique("+10% Strength for all units during Golden Age"))
                 modifiers["Golden Age"] = 10
 

core/src/com/unciv/logic/city/CityInfo.kt

@@ -344,7 +344,20 @@ class CityInfo {
                 if (!matchesFilter(unique.params[1])) continue
                 stats[entry.key]!!.timesInPlace(1 + unique.params[0].toFloat() / 100f)
             }
-            
+
+            // Sweden UP
+            var friendshipMultiplier = 0f
+            for (otherciv in civInfo.getKnownCivs()) {
+                if (civInfo.getDiplomacyManager(otherciv).hasFlag(DiplomacyFlags.DeclarationOfFriendship)) {
+                    for(ourunique in civInfo.getMatchingUniques("When declaring friendship, both parties gain a []% boost to great person generation"))
+                        friendshipMultiplier += ourunique.params[0].toFloat()
+                    for(theirunique in otherciv.getMatchingUniques("When declaring friendship, both parties gain a []% boost to great person generation"))
+                        friendshipMultiplier += theirunique.params[0].toFloat()
+                }
+            }
+            if (friendshipMultiplier > 0f)
+                stats[entry.key]!!.timesInPlace(1 + friendshipMultiplier / 100f)
+
             // Deprecated since 3.15.9
                 for (unique in getMatchingUniques("+[]% great person generation in this city") 
                         + getMatchingUniques("+[]% great person generation in all cities")

core/src/com/unciv/logic/map/MapUnit.kt

@@ -605,6 +605,20 @@ class MapUnit {
         attacksThisTurn = 0
         due = true
 
+        // Hakkapeliitta movement boost
+        if (getTile().getUnits().count() > 1)
+        {
+            // For every double-stacked tile, check if our cohabitant can boost our speed
+            for (unit in getTile().getUnits())
+            {
+                if (unit == this)
+                    continue
+
+                if (unit.getMatchingUniques("Transfer Movement to []").any { matchesFilter(it.params[0]) } )
+                    currentMovement = maxOf(getMaxMovement().toFloat(), unit.getMaxMovement().toFloat())
+            }
+        }
+
         // Wake sleeping units if there's an enemy in vision range:
         // Military units always but civilians only if not protected.
         if (isSleeping() && (!type.isCivilian() || currentTile.militaryUnit == null) &&

core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt

@@ -607,7 +607,11 @@ object UnitActions {
 
         // City States only take miliary units (and GPs for certain civs)
         if (recipient.isCityState()) {
-            if (unit.isGreatPerson()) return null    // Unless Sweden
+            if (unit.isGreatPerson()) {
+                // Do we have a unique ability to gift GPs?
+                if (unit.civInfo.getMatchingUniques("Gain [] Influence with a [] gift to a City-State").none {
+                    it.params[1] == "Great Person" } )  return null
+            }
             else if (!unit.baseUnit().matchesFilter("Military")) return null
         }
         // If gifting to major civ they need to be friendly
@@ -618,16 +622,24 @@ object UnitActions {
 
         val giftAction = {
             if (recipient.isCityState()) {
-                if (unit.isGreatPerson())
+                for (unique in unit.civInfo.getMatchingUniques("Gain [] Influence with a [] gift to a City-State")) {
-                    recipient.getDiplomacyManager(unit.civInfo).influence += 90
+                    if((unit.isGreatPerson() && unique.params[1] == "Great Person")
-                else
+                        || unit.matchesFilter(unique.params[1])) {
-                    recipient.getDiplomacyManager(unit.civInfo).influence += 5
+                        recipient.getDiplomacyManager(unit.civInfo).influence += unique.params[0].toInt() - 5
+                    }
+                }
+
+                recipient.getDiplomacyManager(unit.civInfo).influence += 5
+
                 recipient.updateAllyCivForCityState()
             }
             else recipient.getDiplomacyManager(unit.civInfo).addModifier(DiplomaticModifiers.GaveUsUnits, 5f)
 
-            unit.gift(recipient)
+            if(recipient.isCityState() && unit.isGreatPerson())
-            // UncivGame.Current.worldScreen.shouldUpdate = true
+                unit.destroy()  // City states dont get GPs
+            else
+                unit.gift(recipient)
+            UncivGame.Current.worldScreen.shouldUpdate = true
         }
 
         return UnitAction(UnitActionType.GiftUnit, uncivSound = UncivSound.Silent, action = giftAction)

docs/Credits.md

@@ -79,10 +79,12 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Ship](https://thenounproject.com/search/?q=ship&i=800131) By Mungang Kim for Ship of the Line
 * [Lance](https://thenounproject.com/search/?q=Lance&i=440122) By parkjisun for Lancer
 * [Sword](https://thenounproject.com/search/?q=saber&i=1174742) By Daniela Baptista for Sipahi
+* [Helmet](https://thenounproject.com/term/helmet/1514355/) by Robert Bjurshagen for Hakkapeliitta
 
 ### Industrial Era
 
 * [Rifle](https://thenounproject.com/search/?q=Rifle&i=604291) By Chameleon Design for Rifleman
+* [Bayonet](https://thenounproject.com/term/bayonet/3101681/) By food lover for Carolean
 * [Horse](https://thenounproject.com/search/?q=Horse&i=1023745) By Bakunetso Kaito for Cavalry
 * [horse racing](https://thenounproject.com/antimso/uploads/?i=2427932) By Sergio Morozov for Cossack
 * [Artillery](https://thenounproject.com/search/?q=Artillery&i=1165261) By Creative Mania
@@ -518,6 +520,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Sun](https://thenounproject.com/search/?q=inca&i=910770) by Made x Made for Inca
 * [Sun symbol black](https://en.wikiquote.org/wiki/File:Sun_symbol_black.svg) by Eddo for The Huns
 * [Lion](https://thenounproject.com/search/?q=lion&i=76154) by Nikki Rodriguez for The Netherlands
+* [Three Crowns](https://thenounproject.com/search/?q=three+crowns&i=1155972) by Daniel Falk for Sweden
 
 
 ## Promotions