Commit Graph

5601 Commits

Author SHA1 Message Date
Xander Lenstra
be5345477a
Fixed bug where heal instantly would not heal (#4367) 2021-07-04 17:32:50 +03:00
Xander Lenstra
b3498e6959
Fixed two more of my own bugs (#4361)
* Fixed bug were required science for tech did not match label

* Fixed a bug
2021-07-04 06:23:02 +03:00
Xander Lenstra
aa132c8bf8
Fixed more bugs (#4360)
* Fixed city states spawning with multiple settlers

* Renamed icon for the huns
2021-07-04 00:25:20 +03:00
Yair Morgenstern
c91e94ae03 Translations update 2021-07-03 23:02:41 +03:00
Yair Morgenstern
8ca6fc0a08
Translations update (#4359)
* Update Korean.properties (#4346)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#4342)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Swedish.properties (#4339)

* Update German.properties (#4338)

* Update German.properties

* Update German.properties

* Russian Translation (#4337)

Translated new strings and made slight improvements

* Update Italian.properties (#4333)

Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@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: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-07-03 22:57:58 +03:00
Yair Morgenstern
82fd24f12c Fixed concurrent modification problem in Nuke attack 2021-07-03 22:38:48 +03:00
Xander Lenstra
6c221cd56b
Fix multiple bugs resulting from updating promotions and implementing missile cruisers (#4355)
* Fixed carriers in mods no longer working

* Fixed scouting prerequisites

* Fixed surivialism not having icon or prerequisites

* Fix logistics in mods not working

* Added image for supply promotion
2021-07-03 22:26:03 +03:00
SomeTroglodyte
d8340b9c1c
Fix mod custom maps unavailable when no local ones exist (#4358) 2021-07-03 22:24:23 +03:00
SomeTroglodyte
8fdb4f413e
Spruced up Civilopedia - phase 3 - Interface, flavour text, new Tutorial (#4334) 2021-07-02 19:22:38 +03:00
Yair Morgenstern
0776d9b36e
Discord Role mentions are different from User mentions
Which makes sense
2021-07-02 19:04:18 +03:00
Yair Morgenstern
f9d3c0403c
Added ping to @Game News role to Discord message 2021-07-02 18:50:31 +03:00
Yair Morgenstern
f88e2fa495
Multiline solution
As posted in https://trstringer.com/github-actions-multiline-strings/ by Thomas Stringer
2021-07-02 18:25:56 +03:00
Yair Morgenstern
aff396523d
Multiline test for release 2021-07-02 18:02:11 +03:00
Yair Morgenstern
25785fd949
Let's try this again 2021-07-02 17:46:04 +03:00
Yair Morgenstern
998f05af50 Test if Github actions on release are acting as expected 2021-07-02 17:29:18 +03:00
Yair Morgenstern
82cf4ad7aa
Added 'post release on Discord' to Github action 2021-07-02 17:27:13 +03:00
Xander Lenstra
433204bd6f
Added missing notification when a privateer is attacked by a unit and plunders goods as a result (#4341)
* Added missing notification when a privateer is attacked by a unit and plunders goods as a result

* Added an extra function to do it instead
2021-07-02 16:56:41 +03:00
Xander Lenstra
b8d79dc23d
Split off properties of era's to another JSON file (#4336)
* Added Era.json and imported the data to the ruleset

* Units at start are now also determined by eras.json

* Research agreement costs now determined by json file

* Gold and Culture provided at the start are now awarded

* Can no longer build wonders that are more than two eras older than the starting era

* Default population and buildings for settlers can now be added

* Added checks for validity of eras.json file in mods

* Colors for the icons of technologies are no also saved in eras.json

* Removed constants for all era's as they have been generalized away by this PR

* Removed spurios println's

* Added compatibility for mods

* Updated the military unit you get from ruines to be the military unit you received at the start of the game
2021-07-02 15:45:18 +03:00
Xander Lenstra
d94a1d1432
Updated and generalized more promotions (#4331)
* Generalized "[1] extra interceptions may be made per turn"

* Generalized and rephrased Cover promotion (requires #4311 to work)

* Generalized Logistics

* According to the civilopedia the defence value of cover has also risen, apparently

* Updated Ambush strength values

* Split up Targeting and Air Targeting (different strength bonus)

* Generalized Haka War Dance

* Added Supply promotion

* Renamed a unique so it matches other uniques

* Implemented May heal outside of friendly territory better

* Implemented requested changes
2021-07-02 14:02:20 +03:00
Yair Morgenstern
0472309472
OKAY!
Set as tag only, added body to release, removed test and check disable - we'll test this on the next version!
2021-07-02 13:59:58 +03:00
Yair Morgenstern
4b3764354a
Worketh?! 2021-07-02 13:54:21 +03:00
Yair Morgenstern
628e1f7bf5
... 2021-07-02 13:52:47 +03:00
Yair Morgenstern
f2b5407fe0
Forgot -zo obviously 2021-07-02 13:51:24 +03:00
Yair Morgenstern
c93a8978c7
grep -E instead 2021-07-02 13:45:48 +03:00
Yair Morgenstern
254c439031
Maybe something else went wrong? Back to basics 2021-07-02 13:41:04 +03:00
Yair Morgenstern
853092f525
Different regex test 2021-07-02 13:39:52 +03:00
Yair Morgenstern
4b025ec8e1
Disable other lines maybe 2021-07-02 13:38:37 +03:00
Yair Morgenstern
5eadd43eb1
Howabout now 2021-07-02 13:36:48 +03:00
Yair Morgenstern
2121f07c93
[^a] check 2021-07-02 13:33:45 +03:00
Yair Morgenstern
3193ba4a31
Too soon... 2021-07-02 13:31:35 +03:00
Yair Morgenstern
dac4b6ccae
Almost there 2021-07-02 13:29:48 +03:00
Yair Morgenstern
e8ae6a6b70
With -P, single unescape 2021-07-02 13:28:09 +03:00
Yair Morgenstern
6bb22ccfb9
Maybe it does want double \\ 2021-07-02 13:26:13 +03:00
Yair Morgenstern
aeef48c556
Okay we're getting somehwere. Grep with hashtag again. 2021-07-02 13:25:09 +03:00
Yair Morgenstern
aa300419cf
Maybe read directly from file? 2021-07-02 13:22:50 +03:00
Yair Morgenstern
a90fc4bfcd
No hashtags grep 2021-07-02 13:21:14 +03:00
Yair Morgenstern
2364e6b8d6
6 - minmal grep 2021-07-02 13:19:42 +03:00
Yair Morgenstern
e6b18f7852
Disabled check and test - gotta go fast 2021-07-02 13:17:53 +03:00
Yair Morgenstern
642a566338
5 2021-07-02 13:16:47 +03:00
Yair Morgenstern
8bbc286eeb
Round 4 - no double-unescape 2021-07-02 13:08:04 +03:00
Yair Morgenstern
3a24597a24
Round 3 2021-07-02 12:57:37 +03:00
Yair Morgenstern
9e78309e4e
Round 2, fight! 2021-07-02 12:43:16 +03:00
Yair Morgenstern
1f71d74ded
Actually activate 2021-07-02 12:28:22 +03:00
Yair Morgenstern
7322c1bbc8
Update buildAndDeploy.yml
read correct file
2021-07-02 12:26:50 +03:00
Yair Morgenstern
4d6942a6cb
Update buildAndDeploy.yml
Obviously if we want to test this it can't be only on tags...
2021-07-02 12:25:32 +03:00
Yair Morgenstern
a1da9598bd
Update buildAndDeploy.yml
'read release' test for version 3.15.7
2021-07-02 12:24:38 +03:00
Xander Lenstra
70882b4e8b
Added Privateer unit; updated Coastal Raider promotion (#4301)
* Added privateer unit

* Privateers can now capture other naval units

* Updated Coastal Raider promotion to include the gold gained from damaging cities

* Added missing translatable notification

* Implemented requested changes

* Implemented requested changes _but better_

* Forgot to update a variable name
2021-07-02 10:38:45 +03:00
SomeTroglodyte
4e36773cf3
Fix unit promotions shortcut in UnitTable (#4335) 2021-07-02 10:07:20 +03:00
Yair Morgenstern
43ff2ea5f9 Deprecation of old uniques and fields 2021-07-02 00:05:28 +03:00
Xander Lenstra
afdc2ffbd5
Adds the nation of The Huns (#4311)
* Added the nation of The Huns

* Added unique units of The Huns

* Removed MountedRanged unitType

* Implemented requested changes

* Fixed some typo's, split up a very long function for redability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-01 22:53:00 +03:00