Commit Graph

405 Commits

Author SHA1 Message Date
Yair Morgenstern
0cb29d64f4 New unit images by The bucketeer! 2020-09-30 20:32:02 +03:00
Federico Luongo
adaee7e7ab
City State quests (#3183)
* City State quests

* Flag to log two civ ever been friends
* Utility functions in GameInfo
* Created Diplomacy Action for notifications
* Utility functions for map
* Can be specified a custom color for surroundWithCircle
* Translation placeholder utility
* Added Quest model
* Utility function: number of researched technologies

* Image atlas rebuilt

* Localization

* Updated DiplomaticFlags and added EverBeenFriends

Slightly reworked nextTurnFlags() for code clarity and introduced the new flag EverBeenFriends that is set as soon as two civilizations are at least friends. It never expires.

* Removed quests not implemented yet from json
2020-09-29 23:26:50 +03:00
HadeanLake
f721f59734
Added national wonders, fixed some minor issues (#3163)
* fixed translation of "Owned: [amountOwned] = " line

* Tweaked culture from killing
Aztecs get melee strength of the unit killed in culture and honor opener does the same thing.
They stack. So you get culture equal to 200% of the dead unit's strength (not ranged strength).

* removed hurryCostModifier from units that should not have it

Default value of HurryCostModifier is 0
List of units with non-default HurryCostModifier:

Settler (20)
SS parts (-1) (cannot be hurried)

Frigate (20)
Ship of the Line (20)
Caravel (30)
Turtle Ship (30)

Catapult (20)
Ballista (20)

Horseman (20)
Companion Cavalry (20)

Swordsman (20)
Mohawk Warrior (20)
Legion (20)
Berserker (20)

* added missing definitions from vanilla (commented out)
added missing obsolete tech tags, etc

* tweaked hurryCostModifier, added missing vanilla buildings (commented out)

* added promotions and parametrized uniques
Morale (+[15]% Combat Strength)
Great Generals I ([Great General] is earned [50]% faster)
Great Generals II ([Great General] is earned [100]% faster)
Quick Study ([50]% Bonus XP gain)
Unretired Mass Media icon

Added Heroic Epic, National Epic and National Treasury national wonders
Heroic Epic has unique "All newly-trained [non-air] units in this city receive the [Morale] promotion" - "non-air" is valid param now

[Raising The Flag on Iwo Jima silhouette, Marine Corps War Memorial Raising the Flag on Iwo Jima Battle of Iwo Jima Washington, D.C., memorial free png](https://www.pngfuel.com/free-png/opgid) for Heroic Epic and Morale promotion
[Arc de Triomphe](https://thenounproject.com/search/?q=Arc%20de%20Triomphe&i=2936011) by iconfield for National Epic
[Bank](https://thenounproject.com/term/bank/213472/) by By P Thanga Vignesh for National Treasury
reused general icon for Great Generals and Quick Study promotions

* implemented "Cost increases by [30] per owned city of cities" unique
All vanilla national wonders that require something in all cities have it

* added uniques
"Nuclear weapon" - Game option "nuclearWeaponsEnabled" enables units with this unique
"Requires [building]" - Apollo Program, Manhattan Project etc
"Requires adopted [policy]" - in expansions Statue of Zeus will require "Honor", Prora - "Autocracy", Landsknecht - "Mercenary Army".

* merged "Requires adopted [policy]" with "Requires [Wonder]"

* Separated unique.params[0] to val filter

* Changed National Epic image
2020-09-21 21:44:52 +03:00
lishaoxia1985
9d951835d1
UI Update (#3102)
* Add "Load game" in WorldscreenMenuPopup

* UI Update

* Fix the Ottomans uniques, edit Tech description
2020-09-10 19:25:56 +03:00
Yair Morgenstern
3eb9b36550 Restored techButton visualization 2020-09-03 12:37:04 +03:00
lishaoxia1985
def96071e7
Use NinePatch in getRoundedEdgeTableBackground (#3080) 2020-09-02 20:51:21 +03:00
HadeanLake
8f75368b99
Farms near freshwater (#3063)
* Farms near freshwater
* Farm now has unique "Can also be built on tiles adjacent to fresh water"
https://civilization.fandom.com/wiki/Farm_(Civ5)
Even snow: https://www.reddit.com/r/civ/comments/11qtko/farms_on_snow/
Hill+Farm, Snow+Farm, Tundra+Farm sprites by THE BUCKETEER and Ravignir from discord
* fields improvingTech and improvingTechStats converted into uniques
e.g.:
"[+1 Production] once [Scientific Theory] is discovered"
"[+1 Food] on [fresh water] tiles once [Civil Service] is discovered"
"[+1 Food] on [non-fresh water] tiles once [Fertilizer] is discovered"

* ai will build trading posts and farms in snow and tundra if it has no better tiles to work on

* "Provides a one-time Production bonus to the closest city when cut down" unique for forest

* update template.properties
2020-09-02 19:49:29 +03:00
Yair Morgenstern
145db68248 3.10.6 2020-09-01 22:58:52 +03:00
Yair Morgenstern
ce8e410969 Resolved #2886 - new Plains+Forest tiles by The Bucketeer that don't hide the rivers behind them :) 2020-08-31 21:02:50 +03:00
HadeanLake
e6e31b4e1a
Aztecs and some other things (#3033)
* Added icons
* [temple](https://thenounproject.com/search/?q=temple&i=28256) By Fabio Meroni for Temple of Artemis
* [Canoe](https://thenounproject.com/term/canoe/402285/) By Viktor Fedyuk (Tim P) for Floating Gardens
* [Garden](https://thenounproject.com/search/?q=garden&i=1478380) By Bharat
Aztecs by Séan https://discord.com/channels/586194543280390151/633733497277775884/727255962754351104
Jaguar by Red11

Reused slinger icon for Slinger Withdraw

* Added buildings and uniques for them
garden - bonus building of the Medieval Era. City "Must border a source of fresh water"
Temple of Artemis - World wonder of the Ancient era
Floating Gardens - Aztec unique building, replaces Water Mill

"[+1 Science] Per [2] Population in this city" - for Library and Public School
"+[]% great person generation in this city" - for garden
"Must border a source of fresh water" - "fresh water" provided by river or tiles with "Fresh water" unique. Added "Fresh water" unique to Lakes and Oasis
"+[10]% growth in all cities" - now has parameter - for Tradition Complete policy and Temple of Artemis
"+[10]% growth in capital" - now has parameter
"+[15]% Production when constructing [ranged units]"   - "ranged units" now valid param
"[stats] once [tech] is discovered" - Petra and Mughal Fort have it
"[+1 Production] from [River] tiles in this city"]  - now can use "River" - for Hydro plant

* Added Jaguar - Aztec unique unit
New unique - "+[]% combat bonus in [param]" unique - Norwegian Ski Infantry, Jaguars and Mohawks have it. param can be terrainFeature or baseTerrain, in case of baseTerrain it implies there are no features like vegetation her
Implemented "Culture for the empire from each enemy unit killed"
tweaked honor policy - it should bring half as much culture, and same as Sacrificial Captives
Fixed penalty for terrain if unit do not have "No defensive terrain bonus" unique

* Added Aztecs

* Update template.properties

* update template.properties

* update template.properties

* update template.properties
2020-08-30 21:02:59 +03:00
Yair Morgenstern
353b6e71f8 Added initial mod management screen
Changed turn icon to hourglass, per the change in the Discord poll
2020-08-25 18:43:05 +03:00
Yair Morgenstern
a253a97940 Added Unzip functionality - we should soon be ready for mod management from within the game! 2020-08-25 16:38:55 +03:00
Yair Morgenstern
a6b89b9885 More minor emoji changes
They do make the whole setup seem much more professional
2020-08-24 23:17:34 +03:00
Yair Morgenstern
bed7fe4c64 Added unit symbols for Strength, Ranged Strength, Range and Movement as 'emojis' 2020-08-24 22:48:00 +03:00
Yair Morgenstern
1f3b77d038 All 'Turn' and 'Turns' texts changed to a turns icon, much cleaner! 2020-08-24 19:45:53 +03:00
Yair Morgenstern
24d5e08783 Translation updates for Finnish 2020-08-14 00:38:17 +03:00
Yair Morgenstern
451234c3bb 3.9.20 2020-08-12 19:39:45 +03:00
Yair Morgenstern
d9e1b58bd2 Added Pinglish translations 2020-07-24 09:55:29 +03:00
Yair Morgenstern
e179f1a472 Added Water Mill building 2020-07-13 22:42:30 +03:00
Alexander Korolyov
c51879cc5f
OptionsPopup with two experimental switches: Spectator mode, Extended Map editor. (#2834) 2020-07-12 12:59:32 +03:00
Alexander Korolyov
aa677042dd
New icon for "Load Scenario" (#2768)
* New icon for "Load Scenario"

* Javadoc comments
2020-06-25 22:30:39 +03:00
Yair Morgenstern
1961aa7245 Code for era-based city images is go, the current era city images hide the rivers behind them so it's temporarily disabled 2020-06-10 22:00:32 +03:00
Yair Morgenstern
86d54bd3fe Resolved #2708 - added rivers to plain tileset 2020-06-08 19:34:25 +03:00
Yair Morgenstern
f03c0c6de2 Translation updates 2020-06-07 21:52:29 +03:00
Yair Morgenstern
d511899ed8 Resolved #2613 - added a close button to the Civ-picking popup in the New Game screen 2020-06-03 19:09:48 +03:00
Yair Morgenstern
8ba8c6b596 More new tiles by The Bucketeer! 2020-05-19 00:06:01 +03:00
Yair Morgenstern
2444b2e1d2 New river edges and flattened tiles by The Bucketeer!
Opened River changes in Tile Editor - only visual for now, but should help people see how their tiles would look with rivers surrounding them
2020-05-16 23:54:16 +03:00
Yair Morgenstern
f7e3017826 Better trading posts by The Bucketeer! 2020-05-13 22:19:16 +03:00
Yair Morgenstern
6a7773730b New FantasyHex jungle and lake tiles 2020-05-08 17:48:09 +03:00
Yair Morgenstern
c24b028c99 Differentiated between Portuguese and Brazilian Portuguese translations 2020-05-05 20:56:24 +03:00
Yair Morgenstern
688b780b14 Added a repeating baclground to the menu screen 2020-04-21 23:53:33 +03:00
Yair Morgenstern
5aae57d848 Added icons to the main menu, looks much better! 2020-04-21 14:18:38 +03:00
Yair Morgenstern
c5582257c9 Denmark's icon better centered
Generated translations for Denmark
2020-04-13 12:07:59 +03:00
Yair Morgenstern
c8c2bbb00a Policy screen does not auto-open when you have a free policy, instead coming from clicking the 'next turn' button - should help us solve the "screen unresponsive when I have a free policy" problem, if not eliminate it entirely 2020-04-05 10:54:16 +03:00
Yair Morgenstern
2a23d1db6c Uncivbot moved to its own repo, for future hosting reasons 2020-04-02 14:50:56 +03:00
Yair Morgenstern
235143751c Railroad is now just a black line - much clearer than the old, "nicer" image 2020-03-31 20:50:21 +03:00
Yair Morgenstern
806a0e2269 Resources in Civilopedia state unit and buildings that consume the resource - #1964 2020-03-29 14:29:19 +03:00
Yair Morgenstern
378f56207c Resolved #1779 - Can now lock worked tiles to prevent them from being unassigned 2020-03-29 12:42:58 +03:00
Yair Morgenstern
cf79ac0db1 Inca fixes - added icon, fixed colors 2020-03-28 22:41:55 +03:00
Yair Morgenstern
c64b359fb5 3.6.7 2020-03-11 17:26:26 +02:00
Federico Luongo
2a67294554
Snow, Ice, Atoll & Map Generation (#1909)
* Snow, Atoll & Ice

* Fix White Hexagon + Small NW refactor

* More Land in Continents #1886

* Atoll can spawn only on Coast

* Added new constants and turned Constant into an object

* Latitude and Longitude utility methods

* New MapGenerator steps

* New MapParameters & MapGenerator cleanup

* Added New Map option to MapEditor menu

* New parameters default values and limits

* archipelagos map type

* Translations & Atlas

* removing unneeded octave displacement

* Fix Archipelago

* Perlin noise parameters & no-elvis in TileMap

* Rebuilt Atlas

Co-authored-by: Eddh <remi.dufour@protonmail.com>
2020-03-11 11:39:37 +02:00
Federico Luongo
0cf27789e9
Borders made of oriented triangles rather than circles (#2104) 2020-03-08 20:36:50 +02:00
Yair Morgenstern
26affe7943
Translation (#1878)
* Update Nations_Italian.json (#1864)

* Update Japanese.properties (#1867)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Thai.properties (#1871)

I'm back!!

* Update German.properties (#1873)

Revised promotions

* Update German.properties (#1874)

added missing unit translations

* Update Italian.properties (#1875)

Typo fix

* Update Nations_Russian.json (#1877)

* rfe

* Update Nations_Russian.json

* Update Nations_Russian.json

* Update Russian.properties (#1876)

* Translation roundup + added Mongolian civ translations

* Update Russian.properties (#1879)

Mongolia update

* Additional translation strings related to the custom map settings (#1881)

* Diplomacy screen: Secondary relationships line is added (#1880)

* Additional translation strings

* Update Japanese.properties (#1883)

* Update Japanese.properties

* Update Japanese.properties

* Update to Ukrainian translations + fix of the translation call (#1888)

* Final touches before version

Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2020-02-09 20:29:34 +02:00
Federico Luongo
edf0294dfd
Mongolia (#1855)
* Mongolia

* Translation & Atlas

* Remove debug option

* Remove erroneous import

* Promotions.addXP

* Khan heals 15 HP

* XP bonus fix

* Added 'Mongol Terror' which is the term used for the mongolian combat bonus

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-02-08 20:51:21 +02:00
Yair Morgenstern
a73fe3d9de Tile update by The Bucketeer 2020-02-02 18:31:45 +02:00
Yair Morgenstern
ef19775545 More translation related stuff that I forgot =/ 2020-02-02 18:00:08 +02:00
Yair Morgenstern
f0372ea9ec 3.5.6 2020-01-25 20:28:30 +02:00
Yair Morgenstern
7ea6fc2551 Added 4-way tile images (base,feature,improvement,resource) by The Bucketeer
Fixed some issues with existing tile images
2020-01-21 21:02:11 +02:00
Yair Morgenstern
5c42e7f1fb New translations 2020-01-20 23:28:52 +02:00
Yair Morgenstern
f154ac1d6d 3.5.4 2020-01-19 21:58:38 +02:00
Yair Morgenstern
32ba55b2fe Added many more resource+improvement images 2020-01-18 22:35:18 +02:00
Yair Morgenstern
02def2ffa9 Resource+Improvement is go!
Added resource-specific plantations by The Bucketeer
2020-01-17 15:07:47 +02:00
Yair Morgenstern
5af6dd1ad5 More resource images by The Bucketeer 2020-01-15 23:56:02 +02:00
Yair Morgenstern
9a426318ba Proper destruction notification for city states
Added Fur resource image
2020-01-13 00:09:09 +02:00
r3versi
a1b03849ec Fix city screen (#1657)
* Last CityScreen fix

* Atlas & Translations
2020-01-11 22:46:17 +02:00
r3versi
2daf27278d WIP Construction Queue (#1648)
* Construction Queue

* Added constructionQueue in addition to currentConstruction: if currentConstruction is done, next construction from Queue is started; if Queue is empty invoke ConstructionAutomation
* Queue utility methods: add, remove, higher prio, lower prio
* Icons to move constructions in queue
* Top left city stats moved to top right panel
* Added current construction and queue construction to top left
* Extended selected construction (containing description) moved to bottom right, it is now displayed alternatively to selected tile
* Max queue size, cannot change queue in puppet city or in other player turn
* Queue and current construction reset on puppeting city

* Cleanup again

* CityStatsTable is a separate class so we can play around with where it's located with minimal code changes

* Rejection reason wrap & removing nothing on enqueue a construction

* Crude UI proposal

* Tutorial updates for queues

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-10 11:41:43 +02:00
Yair Morgenstern
977fcfb97e Code cleanup - when{} instead of if-else chains, toLabel() instead of Label(...) 2020-01-09 20:54:33 +02:00
r3versi
065e944896 Songhai (#1636)
* Songhai, Burial Tomb, Gold for capturing city

* Burial Tomb unique: double gold gained when city is captured

* Rebuilt Atlas and Translations

* Italian translation + fix missing translations

* Barbarian Camp Reward

Is now modified by Speed and Difficulty
2020-01-09 19:23:00 +02:00
Yair Morgenstern
f554d8c2c4 Multiple mods work OK! 2020-01-07 19:50:36 +02:00
Yair Morgenstern
1008e9c4f6 More resource images by The Bucketeer 2020-01-06 23:01:18 +02:00
Yair Morgenstern
ca8de2e379 Latest images 2019-12-29 18:02:10 +02:00
Yair Morgenstern
4dd3a69a72 Can now display pixel resources on the map! 2019-12-29 17:51:39 +02:00
Yair Morgenstern
050db70fff All nat wonders are go, courtesy of The Bucketeer! 2019-12-29 15:55:53 +02:00
Yair Morgenstern
eac9647829 Bahasa_Indonesia -> Indonesian, for uniformity among languages names 2019-12-26 14:52:16 +02:00
Yair Morgenstern
94f1b074c9 Indonesian is in and has a flag 2019-12-26 12:15:26 +02:00
Yair Morgenstern
3dfc6503a1 Mount Fuji artwork by The Bucketeer means it's now in the game! 2019-12-25 13:01:29 +02:00
Yair Morgenstern
97f3260047 Grand Mesa artwork by The Bucketeer means it's now in the game! 2019-12-24 15:28:59 +02:00
Yair Morgenstern
33ad922343 Solved bug which was caused by obsoleting scouts when they have no upgrade 2019-12-22 19:39:54 +02:00
r3versi
c2dc0217b6 Rejuvenation icon + Unique promotions are listed in PromotionPickerScreen (#1506) 2019-12-22 15:29:40 +02:00
Yair Morgenstern
77d00f35bb Translation files now take a huge amount of time to load, moved their loading into a thread and put up a "loading screen" beforehand 2019-12-18 22:24:18 +02:00
Yair Morgenstern
fd7160b785 Added line spacings in the translation files, for organization 2019-12-17 22:57:39 +02:00
Kevin Fisher
52111430ef Add close icon for the UnitTable (#1472) 2019-12-17 21:44:20 +02:00
Yair Morgenstern
486dba97df Added first images for resources - not implemented yet! 2019-12-17 14:25:28 +02:00
Yair Morgenstern
0de84e60a9 Not all Natural Wonders look good enough to enter the game as-of-now. 2019-12-17 14:23:17 +02:00
r3versi
aa02a2d321 Natural Wonders (#1456)
* NaturalWonders initial commit
* Created models/ruleset/tile/NaturalWonder and assets/json/NaturalWonders
* MapGenerator now spawns NaturalWonders in random compatible random locations
* MapParameters has a noNaturalWonders option
* TileInfo has naturalWonder property (set to null if none)
* TileInfo and  UnitMovementAlgorithms correctly manages stats and consider the tile unpassable and unimprovable

* Notification and happiness on NaturalWonder discovery

* El Dorado discovery bonus, Spain unique

* Doubled tile yields for Spain

* NaturalWonders implemented as TerrainType + Fountain of Youth promotion

* Images issue #124

* NaturalWonder TileImages (Fantasy) and Overlay (Default)

* NaturalWonderOverlay.png : https://www.flaticon.com/free-icon/mount-fuji_2166259

* Bugfix

* Added translations

* Italian translations

* Fix translation issue
* missing space after = in template.properties breaks translations

* Improved NaturalWonder spawn logic

* Great Barrier Reef spawns on 2 contiguous tiles
* Each wonder has specific spawn requirements
* Number of wonders spawned scales with map radius

* Fix unused import
2019-12-16 20:37:49 +02:00
Sam Rogers
cdcd7cf116 correct spelling of "Fascism" policy (#1432) 2019-12-08 18:40:48 +02:00
Yair Morgenstern
df964a5ec6 TechPickerScreen organization 2019-11-28 20:28:04 +02:00
Yair Morgenstern
405536beba I think the Windows64 executables haven't been compiling well from the get-go... 2019-11-26 22:18:07 +02:00
Yair Morgenstern
a8c98f60d7 Railroads are now much more visible! 2019-11-23 22:43:35 +02:00
Yair Morgenstern
b1868accc5 Nuclear Weapon setting moved to Options, s it can be more easily explored by players 2019-11-19 22:00:16 +02:00
Yair Morgenstern
15e59b161b Technology description no longer includes Manhatten Prokect or Nuclear Missile in description when nuclear weapons are disabled 2019-11-19 19:34:48 +02:00
Duan Tao
111030e457 Nuke your enemy! (#1318)
* Nuke your enemy!

* Fantasy tiles. Worker automaticly clears fallout.

* Some AI improvement for choosing wonder and military unit.

* Add nuclear weapon option.
2019-11-19 08:43:04 +02:00
Yair Morgenstern
9533a35d15 3.2.4 2019-11-18 22:00:44 +02:00
Yair Morgenstern
aa4c70f090 Fixed trades always beng denied because "our proposed trade is no longer relevant" 2019-11-17 21:16:51 +02:00
Yair Morgenstern
19fd2bd205 Yet even more images by The Bucketeer! 2019-11-17 20:00:43 +02:00
Yair Morgenstern
1ecc6bbb2a Performance improvement - tile taps and long-clicks are now done at the TileMapHolder level, meaning we can only create one instead of one per tile, massive memory saving!
Map now zooms with mouse scroll in Desktop!
2019-11-16 23:02:09 +02:00
Yair Morgenstern
a48c356920 Base image tiles on tiles with improvement images are now grayed out when not visible 2019-11-16 21:15:33 +02:00
Yair Morgenstern
8fad2fd680 Removed my dumb plantation art so that The Bucketeer's masterpieces can shine through =D 2019-11-16 19:52:30 +02:00
Yair Morgenstern
dd8f812465 Units &c updated! 2019-11-16 19:42:34 +02:00
Yair Morgenstern
827bf3d4b2 Images update! By The Buketeer again! 2019-11-15 14:28:46 +02:00
Yair Morgenstern
8729100993 altas commit 2019-11-14 22:30:14 +02:00
Yair Morgenstern
24e62e7cc1 Added all of The Bucketeer's improvements, and units until Landskecht 2019-11-14 22:14:23 +02:00
Yair Morgenstern
e21d7eb54a We can now have "layered" images for the base tile, such as grassland + manufactory! 2019-11-14 21:01:24 +02:00
Yair Morgenstern
91eed3fc02 3.2.1-patch1 2019-11-10 18:34:44 +02:00
Yair Morgenstern
e1350cdb05 separated whiteDot for images from TableBackground for backgrounds 2019-11-08 15:42:19 +02:00
Yair Morgenstern
1bd6f5fc73 Atlas updated now (: 2019-11-06 19:34:02 +02:00
Yair Morgenstern
777802ab04 Can no longer click 'next turn' if popups are open - #1289 2019-11-05 15:21:28 +02:00
Yair Morgenstern
57b0040df7 Added Siam civ - #703 2019-11-03 23:22:49 +02:00
Yair Morgenstern
791439397e Added Brandenburg Gate wonder - #643
Fixed translation bugs
2019-11-02 23:08:55 +02:00
Yair Morgenstern
f80b0ee777 Added link to Patreon
Units upgrading to units with built-in promotions now get those promotions
2019-10-28 21:24:04 +02:00
Yair Morgenstern
6a46af4f88 Can no longer create great improvements on water or unbuildable tiles (like Oasis) 2019-10-28 21:00:08 +02:00
Yair Morgenstern
ef0c39ac93 More tile changes 2019-10-23 23:39:12 +03:00
Yair Morgenstern
318dbb2a6d Added tiles with visiable improvements, since not all improvements and combinations are ready this is behind a menu option 2019-10-23 21:56:23 +03:00
Yair Morgenstern
062d1d34ce Czeck -> Czech icon, obviously 2019-10-22 19:31:28 +03:00
Yair Morgenstern
f400a03358 Renamed "Immortal" to "Persian Immortal" because of the conflict in naming between the unit and the difficulty
Also, changed existing units of Immortal or with Range promotion
2019-10-22 19:25:58 +03:00
Yair Morgenstern
965217d95c Undid "Immortal" name change
Fixed json errors
Added Korean and Czech flags
2019-10-21 23:23:38 +03:00
lishaoxia1985
362c67e348 1. rename the unit "Immortal" and the Promotion "Range" 2. fix the korean translation, it lost a ("). (#1216)
* update

* update

* update

* update

* update

* update

* update

* range extension
2019-10-21 23:00:36 +03:00
Yair Morgenstern
33805ca6f8 Organized TileGroup icons (for improvements, resources and units) into a separate class 2019-10-17 00:05:10 +03:00
Yair Morgenstern
36ffc5520a Added annex/puppet/liberate/raze explanations on the popup where you choose between them 2019-10-15 20:30:11 +03:00
Yair Morgenstern
14cbe9e21d Even more pixel images!
Added Pillaging tutorial
2019-10-15 16:00:07 +03:00
Yair Morgenstern
e2459c06fc More unit icons 2019-10-15 10:52:21 +03:00
Yair Morgenstern
35a96dbed4 Bonus and Luxury resources are spread out evenly over the map 2019-10-14 23:00:55 +03:00
Yair Morgenstern
5473afbecf Added icons for the major unit types 2019-10-13 14:06:18 +03:00
Yair Morgenstern
fb768682fe Added more unit icons =)
Organized tileset image locations
2019-10-13 11:49:34 +03:00
Yair Morgenstern
538e53883c Added pixel sprites for land and water units! 2019-10-13 11:18:14 +03:00
Yair Morgenstern
e77fdd2993 Polynesia works! 2019-10-11 14:54:08 +03:00
Yair Morgenstern
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
Yair Morgenstern
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
Yair Morgenstern
a1f5690e41 Added Puppet icon - some reorgnizing still needs to be done in regards to puppet vs annex 2019-09-23 10:46:51 +03:00
Duan Tao
65b8fe531e Duantao/liberate city (#1097)
* Allow to liberate city to its founder.

* Workaround : Avoid exception on conquering city with infantry unit.

* Liberate button actually works.

* Fix trade resources check.

* Postpone the 2nd part of postBattleActions until choice is made.

* Add puppet option.

* Puppet city cannot be controlled directly.

* Add annex and puppet happiness/culture/science bonus.

* Add courthouse. Icon is missing.

* Icon for courthouse.

* Update png.
2019-09-23 08:37:53 +03:00
Yair Morgenstern
f4d828d5e4 Finished changing all unit promotion icons! 2019-09-18 22:15:37 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Yair Morgenstern
48ad8f3f88 Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =) 2019-09-15 23:26:20 +03:00
Yair Morgenstern
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
Yair Morgenstern
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Yair Morgenstern
f6323edbc8 Victory screen no longer shows every turn on "one more turn" mode
Moved Nation jsons
2019-09-14 23:06:34 +03:00
Yair Morgenstern
eeb1c26ef5 Added Korean civ 2019-09-02 23:44:29 +03:00
Yair Morgenstern
a032269cd9 Resolved #563 - Added American unique B17 and Japanese unique Zero units 2019-09-01 16:35:20 +03:00
Yair Morgenstern
93634dae31 Added base for player picking per-player - necessary for multiplayer and solves other probems along the way 2019-08-09 09:03:51 +03:00
Yair Morgenstern
e73ad76227 Resolved #931 - added Barbarian Brute as a replacement to the Warrior 2019-07-21 22:49:04 +03:00
Yair Morgenstern
558bba44cc Added Anti-Aircraft gun unit, and intercept range on non-ranged units 2019-07-19 14:40:29 +03:00
Yair Morgenstern
90318ef93b Tech reorg - added Lasers and Mobile Tactics, tech tree is now almost 100% G&K 2019-07-17 22:21:05 +03:00
Yair Morgenstern
8f30db74ab Added Radar tech and Fighter unit 2019-07-16 22:52:15 +03:00
Yair Morgenstern
d9942aec7c Added all promotions for air units, and a couple for other units that were previously missed 2019-07-11 22:35:22 +03:00
Yair Morgenstern
070d780e18 Unit table now displays range for ranged units
Air units are ranged units
Moving air units around now works completely!
2019-07-05 14:27:39 +03:00
Yair Morgenstern
185ec10f10 Can now see when city contains air units 2019-07-03 23:32:17 +03:00
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
227f6627be Resolved #883 - Added Civilization icons 2019-06-19 18:43:25 +03:00
Yair Morgenstern
89020c8916 Removed ThorfMaps tiles - were much uglier than the other 2 tilessets and unneccesary 2019-06-12 22:00:35 +03:00
Yair Morgenstern
4b4f5e77b8 Resolved #646 - Barbarians now spawn from Encampments! 2019-05-31 17:36:19 +03:00
Yair Morgenstern
1bb62ad681 Civs respond according to neutral/hate and respond properly after peace 2019-05-26 18:32:19 +03:00
Yair Morgenstern
7e6b102f27 Merge branch 'roadOnLongClick' 2019-05-23 22:21:46 +03:00
Yair Morgenstern
8ce1613559 Resolved #698 - Added Heal Instantly 'promotion' 2019-05-08 16:03:01 +03:00
Duan Tao
1434ca3f30 Update city-state related icons and popups. 2019-05-08 13:32:23 +03:00
Yair Morgenstern
89902bef95 Added Medic, Medic II promotions - #698 2019-05-06 23:01:28 +03:00
Yair Morgenstern
cf2580b8ed Solved #670 - civ starting locations are given as much space as possible 2019-05-06 20:46:48 +03:00
Yair Morgenstern
9e03893e60 Added Woodsman promotion - #698 2019-05-05 23:22:59 +03:00
Duan Tao
fc4f62f555 City state icon. 2019-05-05 16:20:23 +03:00
Brian Gainor
d527ccf90e Fix spelling of colosseum 2019-05-04 21:29:02 +03:00
Yair Morgenstern
cefd50ea57 Trade table logic greatly simplified, now all trade displays are dependent only on the current trade in the TradeLogic - this paves the way for "inserting" trades into the trade table, which is required for AI-offered trades! 2019-04-20 22:44:18 +03:00
Duan Tao
18c612dc14 Update assets. 2019-04-15 20:02:44 +08:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Duan Tao
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
Yair Morgenstern
c3bfed1bd1 Added Legion unique unit - #563 2019-04-12 14:30:53 +03:00
Yair Morgenstern
e3dcd4cb43 Added Cossack unique unit - #563 2019-04-12 14:02:15 +03:00
Yair Morgenstern
a969c8f479 Added Ship of the Line unique unit - #563 2019-04-12 09:18:01 +03:00
Yair Morgenstern
646f430636 Added War Chariot unique unit - #563 2019-04-11 23:16:14 +03:00
Yair Morgenstern
6af749b77b Added Walls of Babylon unique building
Added Chu-Ko-Nu unique unit
2019-04-09 23:31:16 +03:00
Yair Morgenstern
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
Yair Morgenstern
472c370c8f Added Terracotta Army wonder - part of #245 2019-04-08 22:36:50 +03:00
Yair Morgenstern
3c3c81fd88 Added Himji Castle wonder - #245 2019-04-07 20:23:57 +03:00
Yair Morgenstern
9a0baf028e Added Colossus wonder - #245 2019-04-04 16:07:16 +03:00
Yair Morgenstern
12719c1e0e Added Great Wall wonder 2019-03-29 15:17:58 +03:00
Yair Morgenstern
dddda38d57 City tiles no longer show "ground" area 2019-03-21 23:59:02 +02:00
Yair Morgenstern
775055902f Continuation of #590 - "Machu Picchu" instead of "Machu Pichu"
Changed info in saved games to fit the change
2019-03-21 12:53:41 +02:00
Yair Morgenstern
973cfd50a2 Added different city tiles for different locations 2019-03-20 15:15:55 +02:00
Yair Morgenstern
a52bc2776c Added Jungle tiles to FantasyHex tileset! 2019-03-20 13:06:18 +02:00
Yair Morgenstern
1d88e76452 Split map into layers for base image, features, overlays, and fog
Added Marsh and Lakes images
IT LOOKS SO GOOD NOW DAMN
2019-03-20 12:09:54 +02:00
Yair Morgenstern
fe9fc110d8 Added tile feature tiles to tilesets! 2019-03-20 11:06:08 +02:00
Yair Morgenstern
9d5c6911fd Added a tileset for Thorm maps - beutiful stuff but doesn't zoom in well, hope I'll be able to find a more HQ version of this type 2019-03-19 23:13:46 +02:00
Yair Morgenstern
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00
Yair Morgenstern
21377f63e7 Added Tilesets, for alternative tile images - this could be big!
Options table is now a table, not a list - more room for future options
2019-03-19 17:09:51 +02:00
Lliam Leosh
32fbabdd19 "Replacable Parts" is now "Replaceable Parts" 2019-03-14 02:55:22 -05:00
Yair Morgenstern
9e5d6d3c75 Resolved #469 - AI Great General tries to maximize effect on troops 2019-03-02 22:53:30 +02:00
Yair Morgenstern
58e38ea634 Added Japan civ!
Some units now recieve promotions when created/upgraded to, as per Civ V
2019-03-02 21:27:35 +02:00
Yair Morgenstern
f3cbeb5ca4 Resolved #123 - Added final units - Modern Armor, Rocket Artillery and Mechanized Infantry! 2019-02-28 23:45:21 +02:00
Yair Morgenstern
3ae5662c32 Added everything needed for Modern Armor 2019-02-22 10:54:07 +02:00
Yair Morgenstern
53664ec043 Added Kremlin wonder 2019-02-22 10:27:47 +02:00
Yair Morgenstern
e200e9026f Text for strength, movement and ranged strength in unit tablee replaced with icons - table is now consistently much smaller, and much less bothersome! 2019-02-14 22:49:46 +02:00
Yair Morgenstern
7497ffd3b6 Added Combined Arms tech with Tank, Anti-Tank Gun units and Pentagon wonder
Tech tree rearrangement - now much closer to original G&K tree
2019-01-26 23:08:20 +02:00
Yair Morgenstern
a371aedf23 Changes to city screen - city summary in top-left corner like original 2019-01-19 21:01:47 +02:00
Yair Morgenstern
49ed7570f8 Added Hubble Space Telescope wonder, Stable unique ability
Added missing translations
2019-01-16 21:26:14 +02:00
Yair Morgenstern
2df64861d1 Added Infantry, Machine Gun units
Added Railroad, Ballistics techs
Added Statue of Liberty wonder
2019-01-15 22:17:34 +02:00
Yair Morgenstern
2fdd3e2628 Fixed #402 - couldn't build wonder if it was being built by a rival civ 2019-01-08 18:43:06 +02:00
Yair Morgenstern
eeb494364b Resolved #407 - Add pillaging terrain improvements 2019-01-07 21:56:02 +02:00
Yair Morgenstern
b776bd777c Google suspended the app because of "Impersonation" violation =(
Changed library name from com.unciv.game to com.unciv.app for app change
2019-01-02 22:07:47 +02:00
Duan Tao
19ce158ccb Update wolfpack bonus, icons. 2018-12-31 19:58:24 +08:00
Yair Morgenstern
8ad37530b2 Solved another 2 rare concurrency problems - CityInfo.workedTiles and CityInfo.tiles are not edited directly but switched out 2018-12-30 20:40:48 +02:00
Duan Tao
7478215353 Add great general generation, overview screen and free pickup. 2018-12-26 18:42:22 +08:00
Yair Morgenstern
6bdd0da3ea Notifications are now per-civ instead of game-wide, in preparation for multiplayer
Added player type to civinfo, in preparation for multiplayer
2018-12-18 18:57:13 +02:00
Yair Morgenstern
94fd43f422 Added icon for lakes
Added more sound effects
Added Leaning Tower of Pisa
2018-12-17 19:00:45 +02:00
Yair Morgenstern
f5c8b28d82 Organized Modern Era techs
Free techs are added like regular techs - with all the abilities and notifications thereof
2018-12-17 10:49:13 +02:00
Yair Morgenstern
d1c7117c54 Mountains no longer appear in ranges - caused untenable starting positions
Lakes now appear randomly!
2018-12-14 13:46:52 +02:00
yairm210
ac241d2744
Merge pull request #334 from ninjatao/add_battleship
Add Battleship. Enabled Electronics for battleship.
2018-12-13 12:21:45 +02:00
Yair Morgenstern
9e8930c263 Multiple promotions with the same effect (e.g. Barrage I and II) will now both activate - kudos Philn3v! 2018-12-12 23:05:14 +02:00
Duan Tao
209eb4c73b Add submarine and refrigeration. Submarine is not invisible yet. 2018-12-12 13:23:29 +08:00
Duan Tao
2edb566078 Add Battleship. Enabled Electronics for battleship. 2018-12-11 16:26:29 +08:00
Yair Morgenstern
63f1f501cd Added Hoplite (Greek unique unit) and Rome's unique ability 2018-12-10 22:31:03 +02:00
Yair Morgenstern
41df61c92e GAH chinese turned out to be a NIGHTMARE but it looks like it's finally done! 2018-12-10 11:19:35 +02:00