Commit Graph

317 Commits

Author SHA1 Message Date
SomeTroglodyte
7526114281
Empire overview resources (#6442)
* Empire Overview Resources: Vertical option

* Empire Overview Resources: Extra Info

* Empire Overview Resources: Tweaks

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-28 17:31:19 +03:00
itanasi
9d1f463310
Add Amphibious penalty to Land attacking into Water and vice versa (#6127)
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

* Type-ify Unique and add Depreciated
Add Promotion to Melee Naval
Add exception that Landing penalty is NOT against cities

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-14 19:21:53 +01:00
yairm210
21fbaf4814 3.18.18 2022-01-16 19:51:33 +02:00
Xander Lenstra
483dd2e871
Fixed border image alpha (#5912) 2022-01-04 18:57:02 +02:00
Xander Lenstra
0f258d5638
Translations update (#5881)
* Update Portuguese.properties

# Language settings

# Equivalent of a space in your language
# If your language doesn't use spaces, just add "" as a translation, otherwise " "
 # Requires translation!
" " = 

# If the first word in a sentence starts with a capital in your language, 
# put the english word 'true' behind the '=', otherwise 'false'.
# Don't translate these words to your language, only put 'true' or 'false'.
 # Requires translation!
StartWithCapitalLetter = 


# Starting from here normal translations start, as written on
# https://github.com/yairm210/Unciv/wiki/Translating

# Tutorial tasks

* Update Simplified_Chinese.properties (#5890)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Simplified_Chinese.properties

* Fixed translation tests failing

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Simplified_Chinese.properties (#5889)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Simplified_Chinese.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Brazillian_portuguese.properties (#5887)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Brazillian_portuguese.properties

I translated some sentences.

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Czech.properties (#5875)

- translated lot of new strings

* Some French translations (#5871)

* Some French translations

* Update French.properties

* Update Italian.properties (#5869)

* Update Dutch.properties (#5858)

* Update Dutch.properties

* Voorgestelde verbeteringen toegevoegd

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Actually fixed the atlas generation

* Update Turkish.properties (#5903)

* Delete Ship Of The Line.png

* GH Actions: Check user privileges before running bots. (#5895)

* Revamped nukes again to closer match the original (#5892)

* Update Turkish.properties

I translated again.This time i translated somra error scripts

Co-authored-by: hundun <wwj.hddjj@gmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

Co-authored-by: sidneybr <95696905+sidneybr@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: Ustklm <58632848+Ustklm@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Peter Bos <55184696+Peter1306@users.noreply.github.com>
Co-authored-by: HariboSever <96971269+HariboSever@users.noreply.github.com>
Co-authored-by: hundun <wwj.hddjj@gmail.com>
2022-01-02 19:07:09 +01:00
will-ca
1f153cc86e
Regenerate atlas. #5884. (#5885) 2021-12-31 13:55:41 +00:00
yairm210
b8b5f79ee0 3.18.12 2021-12-25 22:51:41 +02:00
Xander Lenstra
17b382a614
Replaced illegal / questionably legal assets (#5819)
* Replaced illegal / questionably legal assets

* Resized policy icon to correct size
2021-12-18 17:53:21 +02:00
SimonCeder
010931ca42
Bombard notification (#5637)
* add notification when able to bombard

* harmonize with enemy unit notification

* use city.range
2021-11-04 18:36:50 +02:00
SimonCeder
bfe0b68ab8
Barbarian units (#5589)
* barbarian unique units; barbarian blacklisted units

* credits

* barbarian units do not take resources

* ai fix
2021-10-29 13:33:11 +03:00
Arthur van der Staaij
df39dfd2a8
Fixed the visual gaps in territory borders (#5446)
* Implemented left/right-concave border segments

* Fixed ConvexConcave border image

It was flipped horizontally.

* Implemented border left/right-concave detection

* Moved border images into their own directory

They're not really icons, after all.

* Cleaned up code a bit and added some more comments

* Applied requested change and consistified some function names

* Removed the old border images

I was sure I already did this, but apparently not.
2021-10-11 09:23:28 +03:00
yairm210
5468821edf 3.17.7 2021-10-10 22:41:46 +03:00
SomeTroglodyte
088e35ff13
Ethiopia - Nation (#5387)
* Ethiopia - Nation

* Ethiopia - Unit and Stele

* Ethiopia - Graphics

* Ethiopia - color
2021-10-04 20:56:34 +03:00
SomeTroglodyte
71405b93aa
The Celtic People Reboot (#5367)
* The Celtic People Reboot

* Redid the Shamrock sword of the Pictish Warrior

* The Celtic People Reboot - one comment

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-10-03 12:02:58 +03:00
SomeTroglodyte
6cfc0a82d8
Deprecation message options only (#5352)
* Do not show RulesetErrorSeverity.WarningOptionsOnly on new game screen

* Do not show RulesetErrorSeverity.WarningOptionsOnly on new game screen - fresh atlas
2021-09-29 21:25:44 +03:00
Xander Lenstra
bb5825a325
First step into unifying strength bonuses using conditionals (#5345) 2021-09-29 08:35:37 +03:00
Xander Lenstra
d07eed31b8
Added the Byzantine empire (#5299)
* Added Byzantine Empire as a nation

* Added unique units

* Implemented unique ability

* Refactored out the beliefContainer

* Implemented reviews

* Credits

* Enumified the uniques & added missing translatable strings
2021-09-26 16:58:24 +03:00
SomeTroglodyte
e9e0f2c55f
World and Natural Wonders Overview (#5297)
* World and Natural Wonders Overview

* World and Natural Wonders Overview - icon

* World and Natural Wonders Overview - groups and tuning

* World and Natural Wonders Overview - atlas

* World and Natural Wonders Overview - lint
2021-09-24 10:04:30 +03:00
SomeTroglodyte
4a83bed4ba
Nation Picker visual help where to click (#5287)
* Nation Picker visual help where to click

* Nation Picker visual help where to click - circles
2021-09-23 11:23:40 +03:00
SimonCeder
318a8d99ff
regenerated game.atlas and game.png (#5295) 2021-09-22 21:41:48 +03:00
SomeTroglodyte
0e88ca978b
Oversized speaker (#5243)
* More modestly sized Sound Tab icon on the Options Screen

* More modestly sized Sound Tab icon on the Options Screen - atlas
2021-09-17 01:05:58 +03:00
SomeTroglodyte
340bedc7ea
Implemented Unit Supply by r3versi, not by me (#5234)
* Implemented Unit Supply

Unit Supply is a soft cap to number of units. If the number of units of a civilization exceeds the total supply, a production malus (capped at 70%) is applied.

* Warning icon & message for supply deficit

* Implemented Unit Supply - atlas merge

* Unit Supply: Malus->Penalty, lint, sumOf

* Unit Supply: Fresh atlas

Co-authored-by: r3versi <fluo392@gmail.com>
2021-09-16 22:50:49 +03:00
SomeTroglodyte
5fd04f6e32
Modmanager sort and filter (#5186)
* Mod manager portrait mode

* Mod manager portrait and auto scroll

- MM switches to stacked expanders in portrait.
- Use AutoScrollPanes.
- Disable the enter/leave listener of AutoScrollPane in Pickers which disable the default ScrollPane to roll their own - helps all such pickers.
- No expander open/close persistence on purpose.
- PickerScreen a bit cleaned 'cuz I needed to understand something.
- Marked mods from the kill-list that are already installed.
- Button sync now OK when counterpart missing (deselects other column).

* Mod Manager sorts and filters - WIP 1

* Mod Manager sorts and filters - WIP 2

* Mod Manager sorts and filters - WIP 2a

* Mod Manager sorts and filters - WIP 3

* Mod Manager sorts and filters - atlas

* Mod Manager sorts and filters - tip
2021-09-16 20:54:47 +03:00
yairm210
70c3b4bd65 3.16.14 2021-09-11 23:18:35 +03:00
SomeTroglodyte
38a545e9a6
An icon for BeliefType.Enhancer (#5159) 2021-09-09 20:06:20 +03:00
SomeTroglodyte
6bc58ab5a3
Tabbed options (#5081)
* Tabbed Options Screen

* Tabbed Options Screen - atlas
2021-09-04 21:30:39 +03:00
yairm210
7c3f8ce661 3.16.11 2021-09-02 21:03:18 +03:00
Xander Lenstra
9575b5bf66
Implemented renaming of religions (#5057)
* Implemented renaming of religions

* Made AskForText display error on invalid input, implemented recommended changes

* Almost forgot the translatable strings in the new popup
2021-09-02 17:40:10 +03:00
yairm210
a77e8015e1 3.16.10 2021-08-30 23:30:09 +03:00
SomeTroglodyte
448b04fab8
Civilopedia - Tweaks (#4990)
- Icon for BeliefType.Founder
- Religion icons inverted in Civilopedia
- Terrain icons in links and entry header centered
2021-08-26 17:29:55 +03:00
SomeTroglodyte
cdc63f71e8
Multi-Atlas / Image packer redo (#4959)
* Atlas reorg

* Atlas reorg - resulting atlases 1

* Atlas reorg - resulting atlases 2

* Atlas reorg - merge
2021-08-24 07:31:21 +03:00
SomeTroglodyte
b93f93ea9b
Stat Icons Redone (#4961)
* Stat Icons Redone

* Stat Icons Redone - Sources

* Stat Icons Redone - Rebuild atlas
2021-08-23 23:15:17 +03:00
Xander Lenstra
89ea30af95
Implemented Inquisitors (#4909)
* Added inquisitor unit including image

* Inquisitor now blocks spreading of religions

* Added 'remove heresy' action

* Fixed tests

* Reworded remove heresy unique, updated sprites

* Fix Crash

* Implemented requested changes & fixed a few minor bugs

* Implemented requested changes
2021-08-23 20:26:37 +03:00
Xander Lenstra
0868e31adb
Scouts still ignore terrain costs after upgrades (#4954)
* Scouts still ignore terrain costs after upgrades

* Added an icon for the new promotion
2021-08-22 23:27:33 +03:00
yairm210
58a45a5a4d Added caching to the gradle properties
Also added android:exported tags so that android:processDebugMainManifest doesn't fail the gradle check.
I think this is only failing locally because I bumped the compileSdkVersion to 31, but that means it'll need to go in soon anyway.
2021-08-20 14:30:45 +03:00
Xander Lenstra
5d249ee673
Implemented religious pressure (#4863)
* Implemented religious pressure: cities now can have more than one religion in them and religions spread between nearby cities over time.

* Implemented proposed changes

* Implemented requested changes & minor changes I forgot to include last time

* All pantheons not founded by you are now removed when you gain a new city (found this somewhere in the source code of the original, don't know if it's documented anywhere online)
2021-08-15 18:53:01 +03:00
yairm210
fb266b07b2 Fixed compile error from branch merging 2021-08-11 21:15:04 +03:00
Xander Lenstra
a35f55db6f
Added missing religion icons (#4795) 2021-08-07 23:46:55 +03:00
Yair Morgenstern
a3c9214500 3.16.0 2021-08-03 22:41:10 +03:00
Xander Lenstra
4d3195ec5a
Added Diplomatic victory, United Nations, Globalization (#4619)
* Added globalization tech

* Added united nations and backbone for diplomatic victory

* You can now vote with the united nations every 20 * gameSpeed turns, and the results will be displayed the turn after

* You can now win with diplomacy

* AI will now vote in the united nations

* Added the amount of turns till the next diplomatic vote in the diplomacy overview

* Added translatable strings

* Implemented most of the requested changes (rest coming soon)

* Implemented further requested changes
2021-08-03 21:48:51 +03:00
Yair Morgenstern
f773a547b3 Solved another teleportation concurrent modification exception 2021-08-02 23:17:28 +03:00
SomeTroglodyte
636b58d43c
Reduce atlas - The Huns was 4x larger than the other nations, and a dirty Hexagon dupe (#4689) 2021-07-31 23:56:55 +03:00
Yair Morgenstern
8ae4ae1cb1 AI accepts research agreement offers 2021-07-29 19:00:55 +03:00
SimonCeder
1f6f49efd7
Mercantile CS resources (#4641)
* Added Porcelain and Jewelry, assigned to Mercantile CS

* resized Jewelry.png

* moved citystateresource, added resource overview to diplo screen

* citystateresource saved as string

* Update template.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-27 22:28:36 +03:00
SomeTroglodyte
966f70d0d4
Rename Railroad tech to Railroads (#4567)
* Rename Railroad tech to Railroads

* Rename Railroad tech to Railroads - force check

* Rename Railroad tech to Railroads - patch1

* Rename Railroad tech to Railroads - atlas

* Rename Railroad tech to Railroads - patch2
2021-07-25 19:04:51 +03:00
SomeTroglodyte
2b3afb5acf
Civilopedia for Religion - atlas (#4616) 2021-07-23 09:30:05 +03:00
Xander Lenstra
85f4840e35
Hide lesser used action buttons to free up space (#4580)
* You can now use 'h' to fortify/sleep until healed

* Hide lesser used unit actions by default

* Refactored worker actions into automate & build improvements

* Added missing translation lines

* Fixed translations
2021-07-21 10:43:55 +03:00
SimonCeder
239a406bc4
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
2021-07-20 17:06:15 +03:00
SimonCeder
118c1fc888
Unit gifting (#4557)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object
2021-07-19 00:30:10 +03:00
Yair Morgenstern
de582cf66a Resolved #4528 - added Polder image 2021-07-16 09:30:04 +03:00