mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-15 04:14:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,203 Commits 6 Branches 1,058 Tags 1.2 GiB
b59b890ced
Commit Graph

7203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SomeTroglodyte
4d6058a9d4
Fix TileInfo.neighbors being incomplete in rare circumstances (#6644) 
* Fix incomplete neighbors first seen as continents up to expectations

* Fix incomplete neighbors - more comments
 2022-05-01 06:49:28 +03:00
Yair Morgenstern
3eb3324848 4.0.11 2022-05-01 00:23:18 +03:00
Yair Morgenstern
058a3e8211
Version rollout (#6658) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#6655)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update French.properties (#6642)

* Update Italian.properties (#6629)

* Update Simplified_Chinese.properties (#6628)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#6626)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#6625)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2022-05-01 00:17:32 +03:00
SomeTroglodyte
f668f65bb3
Update From-code-to-deployment.md (#6638) 
Better link for the F-Droid Monitor and a hint what to expect
 2022-05-01 00:12:42 +03:00
Jack Rainy
ac2f31f553
Protect the cities from the fallout spawning (#6640) 2022-05-01 00:09:00 +03:00
SomeTroglodyte
9b5f70e868
Show number of global followers in Religion Overview (#6654) 2022-05-01 00:07:48 +03:00
Xander Lenstra
1ac2ecb9e8
Fixed improvements with unfulfilled 'Only Available' still buildable (#6646) 2022-04-30 23:58:52 +03:00
SomeTroglodyte
52586a2101
Map editor2.2 (#6641) 
* Readability overloads for `getComplexRuleset`

* Enable loading maps containing missing ruleset objects with fix and message

* Fix bungled `noMapsAvailable` and follow minor criticism
 2022-04-30 23:58:03 +03:00
Yair Morgenstern
940306432f Added new page with map rendering documentation 2022-04-30 23:50:15 +03:00
Xander Lenstra
1a050bdaa6
Fixed a crash when a plane tried to enter a full city (#6652) 
This would only occur if the plane was damaged and looking for a spot to 
heal, and had no tile to go to with >0 healing. It would then try to 
head towards the nearest city, regardless of whether it could enter 
that. As it's an air unit, 'head towards' means 'fly there directly this 
turn', which obviously caused crashes if the unit couldn't enter that 
tile.
 2022-04-30 23:08:48 +03:00
Yair Morgenstern
8133f40f74 Don't allow trade routes through enemy cities - #6633 2022-04-29 09:47:51 +03:00
Yair Morgenstern
0179d8f95f 4.0.10-patch1 2022-04-28 20:11:21 +03:00
Yair Morgenstern
702f477e49
Added placeholder parameter location in a way that enables nested translations (#6632) 
* Added placeholder parameter location in a way that enables nested translations - see #6474

* Simplified
 2022-04-28 13:32:55 +02:00
Jack Rainy
487ad69d28
Correct swap of the full-loaded carriers (#6634) 
* Correct swap of the full-loaded carriers

* Code comments
 2022-04-28 13:31:46 +02:00
Xander Lenstra
2b9b68488d
Very likely fixed a new 4.0.9 crash. (#6627) 
Not sure what exactly happened, but this should fix it. Also updated it 
to use the new victory milestones instead of the apollo project
 2022-04-27 19:00:58 +03:00
Yair Morgenstern
3d9a53329e 4.0.10 2022-04-27 09:23:45 +03:00
Yair Morgenstern
0a6bdaa54d
Version rollout (#6624) 
* Bump version and create initial changelog entry

* Update translation for Simplified_Chinese (#6616)

* Update Simplified_Chinese.properties

* Fix errors in Simplified_Chinsese translation

Including several accidentally deleted space & add 2 translation

* Update French.properties (#6607)

* Update French.properties

* Fix placeholder

* Update Spanish.properties (#6605)

* Update Italian.properties (#6603)

* Update German translation (#6598)

* Update German translation

* Update German translation

* Update German translation

* Update Filipino.properties (#6595)

* Update Filipino.properties

* Update Filipino.properties

* Translations for the Ukrainian language (#6593)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2022-04-27 09:19:11 +03:00
Jack Rainy
6e88828240
Correct calculation of the production for the Settlers (#6590) 
* Correct contribution to the Settler production

* Correct indicator of the food usage during Settler production

* More precise calculation of the food to production conversion

* Revert of starvation avoidance during Settler production

* Minor tweaks
 2022-04-27 09:16:11 +03:00
SomeTroglodyte
8891883998
Resources UI (#6596) 
* More info for Resources in Civilopedia

* Remove duplicates for Resource requirements in Civilopedia

* Resource overview link resource label to Civilopedia

* Resource overview stay if clicking can't notify (resources not existing on map)

* Resource overview display of resources produced by buildings
 2022-04-27 09:15:49 +03:00
Xander Lenstra
933e769d8e
Changed milestone build globally text to make it more understandable (#6613) 
* Changed milestone build globally text to make it more understandable

* Actually this is probably just as clear, gramatically more correct and
more imperative like the other milestones

* Fixed tests

* Reworded again
 2022-04-27 09:15:33 +03:00
ultradian
d2f0e32229
Making SpecialistAllocationTable an ExpanderTab (#6614) 
* Make SpecialistAllocationTable an ExpanderTab

* Make Specialist ExpanderTab translatable
 2022-04-27 09:14:19 +03:00
itanasi
cf761f4a2c
Update to note you need Android 11.0 SDK Platform (#6611) 
* Update to note you need Android 11.0 SDK Platform

* Also mention which version of Gradle we're on
 2022-04-27 08:19:31 +03:00
SomeTroglodyte
996c58e1fb
Some improvements to Map Editor - step 1 (#6622) 2022-04-27 08:19:04 +03:00
Jack Rainy
4ad9d69424
Fix of misprint (#6620) 2022-04-26 22:37:40 +03:00
Md. Touhidur Rahman
c23387981a
Fix typo in vanilla (#6621) 
https://yairm210.github.io/Unciv/Modders/uniques/
 2022-04-26 22:37:14 +03:00
SomeTroglodyte
1bb0643088
Implement fastlane step 1 - minimal framework (#6608) 
* Implement fastlane step 1 - minimal framework

* Implement fastlane step 1 - fix en/de swap, encoding and a typo

* Implement fastlane step 1 - fix en-US description empty
 2022-04-26 18:37:23 +02:00
letstalkaboutdune
26c87bcc36
Healing parity (#6612) 
Adjusted healing values for parity with CV
 2022-04-26 12:31:30 +03:00
Xander Lenstra
c985782113
Updated documentation to contain information on victory types (#6615) 2022-04-26 12:31:11 +03:00
Jack Rainy
27718bd605
Correct swapping of the carriers with payloads (#6594) 
* Comments are added

* Correct swap of carriers with payloads
 2022-04-26 09:06:32 +02:00
Xander Lenstra
be9ae1d8d8
Typed all belief automation uniques (#6601) 
* Typed all belief automation uniques

* Might as well change this

* Fixed tests
 2022-04-26 10:02:33 +03:00
Jack Rainy
7d15e3dc53
Display wonders built in other civs correctly (#6604) 2022-04-25 23:26:31 +02:00
MartinP
00b1feb2c2
Added missing "s" (#6599) 2022-04-25 23:13:01 +03:00
Yair Morgenstern
0792d58434 4.0.9 2022-04-24 23:00:59 +03:00
Yair Morgenstern
6b2629c5b9
Version rollout (#6592) 
* Bump version and create initial changelog entry

* Update Turkish.properties (#6591)

* Update French.properties (#6581)

* Translations for Ukrainian language (#6580)

* Translations for Ukrainian language

* Revert of accidental renaming of the placeholder

* Additional translations

* More additional translations

* Simplified_Chinese translation update  (#6578)

* translation update 4.0.8 part1

* Simplified_Chinsese translation 4.0.8 part2

* Update Simplified_Chinese.properties

Fix errors

* Update Spanish.properties (#6574)

* Update German translation (#6573)

* Update Filipino.properties (#6572)

* Update Italian.properties (#6571)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: BerAfk <98158661+BerAfk@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-04-24 22:54:47 +03:00
SomeTroglodyte
23c23e5566
Unique docs writer makeover (#6516) 
* Comments to 'link' implementation (matchFilter) to UniqueParameterType

* Comments to 'link' UniqueParameterType to implementation (matchFilter)

* Fix two mistakes in UniqueParameterType

* Make "and" filter logic for MapUnit and BaseUnit modular, fix mistake

* Make UnitMovementMemory immutable and without lateinit

* Keep UniqueType comment promise that instances can override parameter types

* Reorg UniqueDocsWriter so UniqueParameterType-specific text is moved to the enum

Also some minor improvements - e.g. abbreviations sorted & consistent punctuation, less memory allocations, a/b/c type params get an example,...

* New abilities for UniqueDocsWriter concerning UniqueTarget and inheritsFrom (initially deactivated)

* Actually implement the wish for distinction between absolute and relative amounts

* Change UniqueParameterType.UnitName.docExample to Xander's choice
 2022-04-24 22:47:19 +03:00
Xander Lenstra
34105efdda
Moddable victories (#6161) 
* Added a moddable (but not yet functional) file for victories

* Spaceship parts are units now

* Fixed tests

* Added milestone objects

* Made 'our status' table in VictoryScreen dependend on file

* Updated VictoryManager to use the new Milestone system

* Fixed bug where in vanilla too many spaceship parts could beb uild

* Whoops

* Updated global victory table to use the jsons

* Updated the new game screen to show the new victory types
Also started with the deprecation of VictorType

* Did some translation stuff, also finally fixed the tests

* Removed VictoryType and reworked AI to use Milestones instead

* Add some checks for the victory file; tested that custom victories work
Also moves some code to a better spot and fixes compilation errors

* Fixed some things I thought about while falling asleep
Most notably: built -> build; fixed spaceship part construction 
priority; removed more code for the old system

* Fixed translation issues on the victory screen
 2022-04-24 22:45:38 +03:00
Xander Lenstra
382707a6a5
Fixed a problem with the ordering of the vanilla policies (#6582) 2022-04-24 22:44:41 +03:00
Xander Lenstra
0a5fc3cf33
Fixed the internal name & parameter of a unique (#6577) 2022-04-20 17:02:31 +03:00
Yair Morgenstern
34664e6071 Fixed bug with aircraft rejection reasons 2022-04-20 12:50:30 +03:00
Yair Morgenstern
18be173ab8 Mod land units with missile and nuke uniques no longer crash the game 2022-04-20 12:32:40 +03:00
Yair Morgenstern
c5c06a2456 improvementFilter accepts uniques as well 2022-04-20 09:37:00 +03:00
Yair Morgenstern
bd41630f84 terrainFilter accepts tile resource uniques 2022-04-20 09:31:33 +03:00
itanasi
f1cfe3e907
Add checks against 0 Strength combat (#6564) 
* Add checks against 0 Strength combat

* Minimize to 1f to prevent divby0 issues

Co-authored-by: itanasi <spellman23@gmail.com>
 2022-04-20 09:29:14 +03:00
Yair Morgenstern
e1363d92f9 4.0.8 2022-04-19 15:32:45 +03:00
Yair Morgenstern
88e9d9c618
Version rollout (#6570) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6568)

* Update French.properties (#6567)

* Update Italian.properties (#6566)

* Update Filipino.properties (#6562)

* Update German translation (#6561)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2022-04-19 15:27:17 +03:00
Yair Morgenstern
1069b0933e
Added "Vegetation" unique so that vegetation spawn is not limited to just jungle and forest (#6569) 2022-04-19 15:25:33 +03:00
Yair Morgenstern
aa6bd364de Unified unit type filters and removed unwanted ones 2022-04-19 15:21:05 +03:00
Yair Morgenstern
9ae84a94e1 TerrainFilter parameters accept any unique that exists in terrains. Unrecognized texts now throw errors. - see #6430 2022-04-19 14:53:58 +03:00
Yair Morgenstern
de1a1ee48a Resolved DamageUnitsPlunder's warnings for City parameter and warnings for "Aircraft" - see #6430 2022-04-19 14:24:01 +03:00
Yair Morgenstern
bc16a69bd2 baseUnitFilter accepts all uniques that exist on units - see #6430 2022-04-19 14:17:19 +03:00