mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-02 20:34:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,183 Commits 6 Branches 1,047 Tags 1.1 GiB
61b6e40cdc
Commit Graph

2947 Commits

Author SHA1 Message Date
Xander Lenstra
c840ff99a6
Fixed belief increasing city-state influence resting point (#5502) 2021-10-17 23:02:45 +03:00
Xander Lenstra
1a6eee0d19
Fixed unit tests failing randomly (#5503) 2021-10-17 23:02:14 +03:00
yairm210
ef2f2eccde 3.17.9 2021-10-17 21:23:58 +03:00
Yair Morgenstern
d89211c6bb
Translations update (#5497) 
* Update Greek.properties (#5488)

* Update Greek.properties

* Update Greek.properties

* Update Czech.properties (#5486)

* Update Czech.properties

- many new strings translated

* Update Czech.properties

- fixed string param names

* Update Swedish.properties (#5482)

* Update German translation (#5481)

* Update German translation

* Update German translation

* Update Indonesian.properties (#5480)

* Update Italian.properties (#5478)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: ASLST <89976348+ASLST@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-10-17 21:02:31 +03:00
SimonCeder
ac422d25cb
City State Barbarian Invasion and War with Major pseudo-quests (#5454) 
* barbarian invasion event

* war with major pseudo-quest

* include latecomers

* diplomacy screen

* more notifications

* fixes

* reviews
 2021-10-16 20:34:47 +03:00
Xander Lenstra
551e6e1d54
Implemented holy warriors follower belief (#5411) 
* Implemented holy warriors follower belief

* Minor fixes

* Likely fixed the tests

* Made someTroglodyte happy :)

* Removed stray println's

* Implemented requested changes
 2021-10-16 20:25:38 +03:00
yairm210
f1f2c1e932 3.17.8 2021-10-13 23:27:39 +03:00
Giuseppe D'Addio
dd8f7ed8ff
Update Nations.json (#5457) 
You put one space too much
 2021-10-13 23:24:25 +03:00
Yair Morgenstern
290318f3ad
Translations update (#5477) 
* Update German translation (#5462)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Swedish.properties (#5461)

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#5460)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5459)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-10-13 23:19:33 +03:00
SimonCeder
ff67e66348
Free buildings part 2 - works for Carthage too (#5471) 
* free buildings works for Carthage too
unify "provides a free [] []" and "gain a free [] []"

* re-check at start of turn

* reviews
 2021-10-13 19:21:27 +03:00
SimonCeder
36711f70ad
Variable resource quantities (#5456) 
* implement varying resource amounts

* works on old maps

* reviews
 2021-10-12 07:38:07 +03:00
SimonCeder
1a92f9c084
Free buildings are free (#5466) 
* free buildings are free

* ai shouldn't sell free buildings either
 2021-10-12 07:34:23 +03:00
MartinP
58d335f8d4
Deleted unnecessary quotation mark (#5463) 2021-10-11 13:14:09 +03:00
Giuseppe D'Addio
f208fdf05f
Update template.properties (#5458) 
Added new translation line
 2021-10-11 09:33:52 +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
Arthur van der Staaij
f0545130e9
Fixed the base cost of the Grand Temple (#5455) 
Base cost 300->125
 2021-10-11 09:23:09 +03:00
yairm210
5468821edf 3.17.7 2021-10-10 22:41:46 +03:00
CrispyXYZ
1a63a16e59
Update Simplified_Chinese.properties (#5447) 
* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties
 2021-10-10 22:35:09 +03:00
SomeTroglodyte
7bbcb8db1a
Mayas (#5408) 
* The Maya - data and calendar

* The Maya - completed

* The Maya - notifications

* The Maya - favoredReligion

* The Maya - comments in GreatPersonManager

* The Maya - clickable notifications

* The Maya - templates

* The Maya - atlas

* The Maya - patch1
 2021-10-09 20:45:59 +03:00
SimonCeder
69e1792fa9
Return Civilians captured by Barbarians to original owner; Capture stacked civilians (#5437) 
* return captured civilians

* stacked civilian capture bug

* works on old saves

* diplomacy bonus expires on war declared

* vector bug
 2021-10-09 20:44:03 +03:00
yairm210
81ebacc310 3.17.6 2021-10-08 17:02:29 +03:00
Yair Morgenstern
f175a59e5d
Translations update (#5439) 
* Update Korean translation (#5434)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Swedish.properties (#5419)

* Update German translation (#5418)

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#5417)

Co-authored-by: cjddig <67223322+cjddig@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-10-08 16:54:48 +03:00
yairm210
5e8e23fb43 Fixed broken translations 2021-10-06 19:06:53 +03:00
yairm210
2b75124081 3.17.5 2021-10-06 18:35:41 +03:00
Yair Morgenstern
8d3be2323d
Translations update (#5413) 
* Update Ukrainian.properties (#5394)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Swedish.properties (#5392)

* Update German translation (#5391)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Indonesian.properties (#5390)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5388)

* Spain city names + dialogues (#5305)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: riioze <61903425+riioze@users.noreply.github.com>
 2021-10-06 17:43:53 +03:00
SimonCeder
b41d234db6
Barbarians capture civilians and take gold from cities (#5410) 
* ransom cities

* capture civilians

* fix bug
 2021-10-06 17:12:13 +03:00
SimonCeder
c00ce49c86
AI rationing of strategic resources; Hydro Plant re-enabled (#5401) 
* AI evaluation of resources

* optimizations

* sell or disband when needed for space victory

* use for all constructions

* use in trade evaluations

* .requiresResource()
 2021-10-06 17:11:02 +03:00
Xander Lenstra
7752e1834d
Added a label displaying religion is off when it is off (#5412) 2021-10-06 17:06:49 +03:00
Xander Lenstra
fc01fde163
Nations now have a favoured religion they try choose when available (#5406) 2021-10-05 20:38:58 +03:00
Xander Lenstra
e879bb2a14
Added an advanced system for choosing beliefs (#5400) 2021-10-05 15:33:27 +03:00
Xander Lenstra
c9f23b644a
Updated amphitheater replacements to temple replacements (#5399) 2021-10-05 09:08:56 +03:00
SomeTroglodyte
726a1942db
Sharpen unit tests for UniqueTypes (and mod checker too) (#5398) 
* Sharpen unit tests for UniqueTypes (and mod checker too)

* Sharpen unit tests for UniqueTypes - fix newly found problems
 2021-10-05 09:08:41 +03:00
Xander Lenstra
82e72ddcfa
Added in [tileFilter] tiles conditional to combat uniques (#5393) 
* Some code cleaning

* Added `in [tileFilter] tiles` conditional

* Limited Visibility -> [-1] Sight

* Fix tests and rename conditional

* Actually made the conditional functional

* Renamed conditional once again
 2021-10-04 22:30:09 +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
Xander Lenstra
e1b4c53573
Added two more conditionals and updated movement, sight & combat to use these (#5389) 2021-10-04 08:32:10 +03:00
Xander Lenstra
07822de375
Simplified combat uniques further (#5361) 
* Simplified combat uniques further

* Reviews & translations

* UniqueType > placeHolderText

* I can't math
 2021-10-04 00:29:46 +03:00
SomeTroglodyte
edfc66aa2f
Sort City States, replace+deprecate Dublin and Edinburgh (#5386) 2021-10-03 19:03:54 +03:00
yairm210
8ca14eac55 3.17.4 2021-10-03 12:22:38 +03:00
Yair Morgenstern
18b5da0c30
Translations update (#5383) 
* Update Ukrainian.properties (#5369)

* Update Simplified_Chinese.properties (#5366)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Swedish.properties (#5363)

* Update Swedish.properties

* Update Swedish.properties

* Update German translation (#5362)

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#5359)

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#5358)

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
 2021-10-03 12:05:29 +03:00
Xander Lenstra
8168c5d3a8
Missed the default minus sign for pentagon (#5384) 2021-10-03 12:04:35 +03:00
Xander Lenstra
97da979a04
Fixed bugs with fallout (#5379) 
* Fixed bugs with fallout

* Reordered uniques

* Reviews

* Added missing unique targets
 2021-10-03 12:04:15 +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
Xander Lenstra
982d739ec8
Fixed pentagon not working (#5381) 2021-10-03 11:56:15 +03:00
SimonCeder
9016385f30
Barbarian spawning and camp placements (#5354) 
* barbarian camp placement, spawn countdowns

* separate file

* raging barbarians

* faster spawn when attacked

* Barbarian AI

* works on old saves

* template.properties

* fix percent

* no improvements unique

* fix test fail

* reviews

* reviews pt 2
 2021-10-03 11:45:02 +03:00
SimonCeder
344c96319b
Fix Fountain of Youth (#5355) 
* fix fountain of youth

* fix test fail

* reviews

* reviews
 2021-10-01 15:51:30 +03:00
SomeTroglodyte
03f374b058
Currently playing music track displayed under Options-Sound (#5357) 2021-09-30 06:35:20 +03:00
yairm210
9fe19d0d52 3.17.3 2021-09-30 01:04:08 +03:00
Yair Morgenstern
af4c4fd88a
Translations update (#5356) 
* Update Swedish.properties (#5351)

* Update Swedish.properties

* Update Swedish.properties

* Update Spanish.properties (#5339)

* Update German translation (#5330)

* Update German translation

* Update German translation

* Update Italian.properties (#5327)

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-09-30 00:41:13 +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
SomeTroglodyte
fb30a76e85
Civilopedia category icons and keyboard navigation (#5341) 
* Civilopedia category icons and keyboard navigation

* Civilopedia category icons - white alternative
 2021-09-29 17:39:02 +03:00