Commit graph

246 commits

Author SHA1 Message Date
Yair Morgenstern
62fd7d8588 Desktop Unciv now sends status to Discord!
Basically stole the Discord RPC implementation outta Mindustry
2019-11-21 16:24:27 +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
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
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
c6b550e43d Resolved #1312 - More obvious division between promotion 'pick now' and description
Civilopedia redone!
Now with simpler picking and images!
2019-11-13 22:54:10 +02:00
Yair Morgenstern
637b487a2c City-states allied to Civs no longer attempt to declare war when it does on Civs they haven't met yet 2019-11-09 20:25:30 +02:00
Yair Morgenstern
e1350cdb05 separated whiteDot for images from TableBackground for backgrounds 2019-11-08 15:42:19 +02:00
Yair Morgenstern
f6d2143ff6 Fixed weird resizing bug - #1304, thanks @ninjatao! 2019-11-06 19:25:02 +02:00
dic1911
1b1c7228a6 Replace Traditional Chinese flag icon (#1298)
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one
2019-11-05 13:01:09 +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
6a46af4f88 Can no longer create great improvements on water or unbuildable tiles (like Oasis) 2019-10-28 21:00:08 +02:00
Yair Morgenstern
c77d570381 Added Customs House tiles 2019-10-27 22:15:20 +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
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
4da70dfe88 Added polynesia icon and colors 2019-10-11 12:49:07 +03:00
Yair Morgenstern
a8dac82157 Added Moai as part of Polynesian civ - lots of changes to be made for that! 2019-10-11 12:09:22 +03:00
Yair Morgenstern
47db4dce31 Fixed Coastal Raider image
Puppet cities no longer increase policy costs
2019-10-01 22:05:38 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +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
d7cd305e1c Added image for Polish language 2019-08-08 20:57:49 +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
1ac3cfb74e Added icons for Lasers and Mobile Tactics 2019-07-17 22:03:57 +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
ab7ce12a87 Resolved #687 - can now place starting locations for specific civs in the map editor 2019-07-07 23:55:43 +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
Am-per-Sand
abb8eb8987 add Helicopter icon
please consider if it is optimal for small screens to call it _Helicopter Gunship_ with 2 words
2019-07-03 18:36:06 +03:00
Am-per-Sand
aebbb6f505 added air icons set
May be turns out handy one day.

Post your opinion below. However I promise to introduce corrections only after I will have seen them in game. Earlier it's hard to say if the images are crisp enough or not.

_Based on antique catalogue photos and public domain works by US military employees, so I release the to public domain too._

Zero chasing B-17:
![https://raw.githubusercontent.com/Am-per-Sand/saves/master/B%2017%20blue%20Zero%20red.png](https://raw.githubusercontent.com/Am-per-Sand/saves/master/B%2017%20blue%20Zero%20red.png)
2019-07-03 18:36:06 +03:00
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
a1e1b91b9a Added Civ icon to cities
Improved City Connection icon
2019-06-19 20:13:32 +03:00
Yair Morgenstern
a6d1cdc398 Unified civ display in Overview and Victory screens 2019-06-19 19:20:25 +03:00
Yair Morgenstern
227f6627be Resolved #883 - Added Civilization icons 2019-06-19 18:43:25 +03:00
Yair Morgenstern
b2afc838a6 Resolved #533 - Added nation-dependant start location biases 2019-06-17 12:51:57 +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
Am-per-Sand
8b15535eb7 War Chariot icon retouched
hope it doesn't break commit history, or...
2019-05-28 22:54:24 +03:00
Yair Morgenstern
1bb62ad681 Civs respond according to neutral/hate and respond properly after peace 2019-05-26 18:32:19 +03:00
Amper-sandd
af19d8a1b0 add Indian assets (#800)
* War Elephant icon

* Mughal Fort icon

* credits for Indian unique icons

* bonuses for Castle apply to Mughal Fort too

* getCityHappiness() complies with the Indian unique

* getCityHappiness() complies with the Indian

missing bracket 🙄
2019-05-23 21:50:46 +03:00
Yair Morgenstern
fd4123e15f City state icon in city button now visible and colored according to city-state color 2019-05-20 22:22:16 +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
Am-per-Sand
024bad9b5a added Hanse building icon
silhouette from own photo of [Artus Court](https://en.wikipedia.org/wiki/Artus_Court)
2019-05-06 20:09:23 +03:00
Am-per-Sand
148d55c4db added unit icons for German uniques 2019-05-06 20:09:23 +03:00
Yair Morgenstern
9e03893e60 Added Woodsman promotion - #698 2019-05-05 23:22:59 +03:00
Brian Gainor
d527ccf90e Fix spelling of colosseum 2019-05-04 21:29:02 +03:00
Am-per-Sand
c19be603f2 new Cossack icon 2019-04-22 12:33:23 +02:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +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
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
Yair Morgenstern
a969c8f479 Added Ship of the Line unique unit - #563 2019-04-12 09:18:01 +03:00
Am-per-Sand
b00b432bb3 War Chariot
100x100 white on grey transparent
2019-04-11 20:19:24 +02: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
86ed7c2ec3
Merge pull request #632 from Am-per-Sand/master
Machu Picchu deresoluted
2019-04-08 08:51:56 +03:00
Am-per-Sand
28a63d8170
Machu Picchu deresoluted
Enlarged building to be more distinct on large screens in small scale
2019-04-07 22:32:28 +02: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
9b7a796a03
Merge pull request #597 from Am-per-Sand/master
Frigate <-> Caravel icons swap
2019-03-22 00:59:12 +02:00
Yair Morgenstern
dddda38d57 City tiles no longer show "ground" area 2019-03-21 23:59:02 +02:00
Am-per-Sand
e3a589ffb4
Frigate <-> Caravel icons swap 2019-03-21 15:21:03 +01:00
Am-per-Sand
36ead7a569
Delete Frigate.png 2019-03-21 15:19:17 +01:00