* Add slider
Align spawnIce latitude and offset code to applyHumidityAndTemperature
* A bunch of debug code
Make default Water Level -0.05 for Default
* Remove debug println
Fix Desert at 0.9-1.0 temp and <0.2 humidity
* Disable reseed for debug comparison
Reset Plains/Grassland for high temp. Adjust max humidity for safety of Grasslands
Humidity debugger
Better slider
* Remove all debug code
* Undo Desert temp setting
* Changes
* Slight adjustment to MainMenuScreen
* Make default waterThreshold for Default to be -0.05
* blip
* blip
* Rename cellular automata to Smoothed Random
* fix untranslated string about politics
* update shortcut about textbutton
* check all usage of template "[numberOfTurns] Truns Left"
* revert textbotton and add click event by chain.
* Generalize Great Wall unique
* Update JSON entries
* And movement calculation too
* Rename other functions
* Cache movement penalty uniques
* Check destination tile instead of unit type
* Made UI skins selectable
This allows mods to provide alternative skin pngs without overriding the default skin purely by being downloaded
* Added UI Skin loading from NinePatches
This allows mod creators to define the stretch region and padding directly in the png
* Update baseScreen skin on skin reload
* Merged displayTab onChange functions
As all of them are equal anyway
* Removed legacy tileset code
which was only used for the "Default" tileset
* Updated "Default" tileset to support new rendering
* Updated docs
* Fixed fogOfWar coloring bug
* Removed cityImage variable completely
* Renamed variable out to baseHexagon
* Moved color lerp out of for loop
* Renamed "Default" tileset to "Minimal"
* Made "HexaRealm" the games fallback tileset
* Implemented requested changes
* Readded accidentally removed variable
* Reverted updateTileImage back to foreach loop
Since indices are not needed anymore
* Regenerated game.atlas and game.png
* Handfull of comment questions, small refactorings
* Code changes
* Reworded a unique, removed a file
* Added spy names for all nations, minor consistency change
* Removed debug output
* Added an empty constructor so gdx can reconstruct it
* Free belief unique
* Fix edge case
* Another edge case
* Bug fixes
* Fix some conditions
* Refactor another function
* Handle edge case where the civ has enough faith for a pantheon but also gets a free pantheon pick on the same turn (allow civ to have both picks)
* Fix the edge case handling
* Cleanup
* Reviews + more refactoring and cleanup
* Update comments
* Unnecessary comment
* Improvements
* Typo
* Bump version and create initial changelog entry
* Update German translation (#7634)
* Update Korean.properties (#7630)
* fix a few style issues in the German translation (#7621)
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Kristian Rother <krother@academis.eu>
* Minor Compile change
* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification
* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification
* Revert "Update to -[amount] HP for battle notifications"
This reverts commit 63961029da.
* Rename variables
* Even if you can't see the Interceptor Tile, still get full info if not killed
* fix#7565: Delete one "Consumes ..." lines of city screen
* fix#7565: Delete one "Consumes ..." lines of city screen
* fix#7565: Delete one "Consumes ..." lines of city screen
* Add files via upload
* Upload the World_Screen.png
This will match the latest presentation
* Upload the World_Screen.png
because it is so old
* Update Tutorials.json
The Tutorials.json add the ：
㉑: The Multiplayer Button - Here will help you easily check your current multiplayer game",
This will match the latest presentation
and
ⓗ: Here you will see what you currently have ☮Faith quantity, of course, if you don't open it ☮Faith Before starts the game, this will be ‘Off’
* Add Air Sweep Unique
Enable Dogfighting Promotion
Add Air Sweep mode button and crosshair overlay
* Adding Air Sweep Battle Table
* Add airSweep to Battle
Remove double XP
While in AirSweep can't select other units on tile
* initial airsweep code
* Implement airSweep
* BattleTable indicates tile you're AirSweeping
* some notifications
* Clean up notifications.
Add icons
* Revert game.atlas and game.png
* Fix selection properly
* Update Vanilla UnitPromotions.json
* Better handling of movement use
comment cleanup
* missing credit
* Proper code so that Seas units also deal no damage
Adding Tutorials!
* Remove Intercept Bonus Damage/Protection
* Remove chance of Interceptor missing
* Battle Table a bit more consistent
* Defender also gets Air Sweep Modifiers
* Defender doesn't get bonus
* Remove unused getInterceptBonus
Combine logic
* Show damage in notifications for Air Sweep
* Randomize intercepting Civ and prioritize Air Units
* Remove debug code
* Updated atlas
* Clean up Uniques
* Object-ify DamageDealt for ease of reference
* code clean up
Co-authored-by: itanasi <spellman23@gmail.com>
* feature
* more categories
* added categories
* filter installed part1
* display vanilla rulesets in rulesets category + fix download from URL not showing
* filter installed mods
* removed isVanilla variable
* only look at second topic
* same but for online mdos as well
* replaced tilesets with graphics
* translations
* code duplication
* removed vanilla content from rulesets
* combined the function into one
* revert amountPerPage even tough its already on master
* Filter class
* 1
* mutableListOf<>()
* mutableListOf<>() again
* getFilterText removed
* !categoryFilter(filter)
* matchesCategory
* if (modTopic.size < 2) return false
* Better era specific tile images
* Use ImageAttempter to reuse code
* Redundant code
* Unify era-specific image loading
* Revert change
* I guess I'll commit these
* Update Tutorials.json
Remove mention in the "After conquering" tutorial of 1.5x unhappiness for puppeted cities (according 87aa5bc)
* Update template.properties
Remove mention when conquering a city of 1.5x unhappiness for puppeted cities (according 87aa5bc)
* Remove mention of unhappiness for puppeted cities
* Modify "After Conquering" tutorial
Remove mention of unhappiness for puppeted cities
* Unit icon alpha/size control
Implemented sliders in Options -> Display to give user control over unit icon opacity and size.
* Simplified sliders and re-added idle 50% transparency
* Minor fixes from PR review
* Removed unit icon size adjustment
* Add serialization version to GameInfo
* Add handling of incompatible saves due to a dfiferent save version
* Fix compilation?
* Fix ios compilation
* Refactor: Make it clearer that GameInfo serialization version is only supposed to be incremented when it's guaranteed to cause issues & rename to compatibility version
* Update initial version
* Update initial version
* Fix merge mistake
* disable start bias
* better indentation
* improved
* improvedx2
* now for generated maps too
* made it choose a random location instead of the last one
* -||-
* checks
* forgot I can write directly on github :)
* Make popups and text fields nicer to interact with on Android
* Refactor: Rename createTextField to UncivTextField.create
* Fix multiplayer save delete text
* added sounds to cityScreen
* changes? ..don't know how to name this commit
* removed try block
* improved era1 sound and added slider for city enter sounds
* added Information Era sound
* added Future Era sound
* better option name + translation
* added Atomic Era sound
* normalized sounds
* prevent spam + better era 0 and 1 sounds
* cleanup
* sound improvements to medieval and atomic
* volume now tied to sound effects
* improved information sound
* improved future sound
* sounds now stop if you exit the city screen
* improved Renaissance sound
* now in separate function
* now using the music controller
* better file names
* WLTK day sound + sounds are now configurable in Eras.json
* removed redundant setting and fixed comment
* added PlaySingle
* musicController no longer used
* Gdx.audio.newMusic is now used
* function name
* function are now in their own class
* CitySoundPlayer now has 1 instance in UncivGame and is hooked
* credits
* sounds loop
* loopable sounds
* updated credits
* fixed sound not stopping when changing city without leaving cityScreen
* changed WLTKNew sound
* added toggle for the sounds
* changed WLTK sound, removed music and made all tracks have the same volume
* addressed some of the issues
* addressed more issues
* increased sounds volume + volume slider
* made WLTK sound slightly quieter
* removed entry from Vanilla eras
* revert back to CitySoundPlayer.kt
* no more hooks
* removed unused stuff
* changees
* completly reverted MusicController
* and the MusicTrackChooserFlags
* fixed ESC not stopping sounds
* updated credits to mention the sounds are modified
* dispose()
* removed try block
* Civilopedia Files Split
* Central showReligionInCivilopedia function
* ConstructImprovementConsumingUnit with Conditional for Prophet
* Show Units capable of building an Improvement
* "Needs removal of terrain features to be built"
* Refactor: Format JSON
* Change button hover color to be darker
* Refactor: Change disabled buttons to always look disabled, even if they don't have the default style
* Make disabled style a little grayer
* Refactor: Make addCloseButton not start a new row
* Refactor: Remove "...inRow" popup button methods & add button style parameter
* Reorder "ok/cancel" popups to have "ok" on the right side
* Fix pointer enter/exit events being disabled by default
* Fix equalizeLastTwoButtonWidths not setting the cells to be equal size
* Change YesNoPopup to ConfirmPopup
* Add ConfirmPopup to deletion of save files
* added support
* now toggleable in settings
* translation
* added note that it requires restart
* made it enabled by default
* padded buttons to the right if there is a cutout
* checking for cutout instead of android
* reverted button changes
* moved option to advancedTab
* Refactor: Consistent usage of coroutines
* Add usage comments to the different threads
* Refactor: Properly separate crash handling into its platform-specific parts
* Fix autoSave never finishing
* Correctly handle coroutines when the GL thread is not accepting runnables anymore
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Refactor: Make Popups work on Stages instead of BaseScreens
* Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type
* Fix "Resume" game loading not fully handling exceptions
* Fix one missed refactoring
* Refactor: remove useless postRunnable
* Refactor: Extract methods & reduce code duplication
* Refactor: Rename Sounds to SoundPlayer
* Refactor: Make UncivSound a data class
As far as I can see, UncivSoundConstants served no purpose
* Refactor: Reorder sounds
* Refactor: Split up ExtensionFunctions and move into own package
* Add multiplayer turn sound notification
* Refactor: Remove unnecessary double translation
* Refactor: Reduce code duplication
* Refactor: No if for boolean logic
* Bump version and create initial changelog entry
* Update French.properties (#7093)
* Update Italian.properties (#7092)
* Update German translation (#7087)
* Update Japanese.properties (#7086)
* Update Japanese.properties
Added about 20 lines of Japanese translation.
Didn't know where the 'fastlane_full_description' so good so put one there commented out for now.
* Update Japanese.properties
Replaced the commented out fastlane_full_description with appropriate \n for line breaks
* Update Japanese.properties
Various easy one line translations
* Update Spanish.properties (#7082)
* Update Catalan.properties (#7081)
* Update Indonesian.properties (#7079)
Co-authored-by: yairm210 <yairm210@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: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: itmaru <34495311+itmaru@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
* Delete Oil WellC.png
Since now offshore platform is back again, the "coastal" oil rig is obsolete now.
* Adding spaceship parts sprites for FantasyHex tileset
* Add files via upload
* Add files via upload
* created files for friends list screen
* redone #3
* fixed some crashes and more additions
* changelog in the comment below
* Update .gitignore
included the FriendsList.json file
* changelog in the comment below, again
* optimized imports to hopefully fix the error in github build check
* replaced imports with the ones from master since OnlineMultiplayer.kt no longer exists
* imported ViewFriendsList
* used the right package for all friendsList related files and a little bit of cleanup
* check if friends list is empty before adding the select friend button
* check if the ID is correct when adding a new friend
* don't set null as playerID if no friend is selected
* added messageTexts for the input TextFields
* don't show already selected friends
* fixed checkmark not updating after selecting a friend
* you can't be your own friend! and other checks for edit button
* fix error
* replaced error type with enum, replaced nested ifs with when loop, added additional checks when editing friends
* fixed error, can't really tell how I managed to do this
* reorganized checks for adding and created settings variable to hopefully fix the github build error
* actually fixed github error
* it now removes selected friends from the list of selectable friends
* fixed not being able to change only the id of a friend
* made it look half decent
* cleanup + improved help button
* updated template.properties
* renamed variable
* some tweaks
* moved friends list to GameSettings
* tested every feature and fixed what didn't work
* removed redundant variables and final cleanup
* little improvements
* string improvements
* removed rightSideButton from ViewFriendsListScreen
* removed unnecesary uniformX and decreased padding to allow seeing more friends in ViewFriendsListScreen
* Add usesCleartextTrafic permission to Android manifest
* Add warning for starting a multiplayer game with the default Dropbox server
* Improve multiplayer server documentation
* Only update the current game if we're using a custom server or it's not our turn
* Refactor: Nicer variable name
* Fix compilation
* Fix type
Don't know what happened there
* Pillaging loots gold on certain improvements
* Add warning if improvement pillageGold > 0 and has UniqueType.Unpillagable
* Pillage yields as a UniqueType
* Forgot to undo demonstration
* Remove unused line
* Eliminate some redundancy
* Reword unique text
* Slight cleanup and add notification for pillage victim
* Reviews
* Made pillaging notifications more consistent with other hostile action notifications
* Missed a line
* Load and Save Game Screens rework - Linting
* Load and Save Game Screens rework - Modularize and Keyboard
* Load and Save Game Screens rework - error handling
* Load and Save Game Screens rework - Move other save/load code
* Load and Save Game Screens rework - More Keyboard
* Load and Save Game Screens rework - Increase clipboard limit
* Load and Save Game Screens rework - Post-merge patch
* Load and Save Game Screens rework - Home, End, harden
* Load and Save Game Screens rework - Post-merge patch again
* Load and Save Game Screens rework - reviews
* Improve suggestions when constructing an improvement is not possible
* Reimplement getImprovementBuildingProblems() as a generator function
* Update documentation of getImprovementBuildingProblems(); forgotten in the last commit
* ImprovementPickerScreen - tr
* Rename a variable for clarity
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
The fix in #6901 caused `arrayIndex` to go out of sync, because the `continue` happened before `arrayIndex` was incremented. This caused a later game preview to be saved to the previous game name, overwriting and duplicating it.
* Handle subclassing of Events properly
Previously, you could only listen to the exact class
* Add relevant parent classes for the multiplayer events
* Refactor: use the old name as the main name in MultiplayerGameNameChanged event
* Add being able to stop listening to events in the EventBus
* Add tests for EventBus
* Refactor: Extract GameList into standalone file
* Refactor: safeUpdateIf to more generic throttle function
* Refactor: Extract multiplayer UI helper functions into separate file
* Refactor: Extract load/download multiplayer game into logic class from UI
* Make loading a multiplayer game automatically update the in-memory game in OnlineMultiplayer
* Refactor: Extract multiplayer settings into separate object
* Add multiplayer status display
* Fix error with multiplayer games not correctly being cleaned up after successful update
* Prevent loadLatestMultiplayerState() while next turn update is running
* Show "Working..." while waiting for next turn calculations instead of "Waiting for [civ]..."
* Fix race condition while updating online game state
* Refactor: change GameSaver from singleton to single instance pattern & move autosave logic info GameSaver
Singleton just doesn't make sense anymore when we have to `init(..)` with different arguments, then we should just make a normal class out of it
* Fix not correctly checking for missing external files dir
* Refactor: use more appropriate library method
* Add logging for external files dir
* Bump version and create initial changelog entry
* Update Polish.properties a little (#6853)
* Add some random translations
* Translate the abbreviaation WLTK as DUK (Dzień Uwielbiania Króla)
* Add antoher random translation
* Update Simplified_Chinese.properties (#6852)
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Anton <antek@sniec.pl>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
* Delete Oil WellC.png
Since now offshore platform is back again, the "coastal" oil rig is obsolete now.
* Add files via upload
* Add files via upload
* Add files via upload
* Update HexaRealm.json
* Great General UniqueTyped and improved moddability - draft
* Great General UniqueTyped and improved moddability - reviews
* Great General UniqueTyped and improved moddability - no reason not to cache another
* Integration with JackRainy's solution
* Integration with JackRainy's solution - part 2
* Revert of maxGreatGeneralBonusRadius logic
* Minor refactoring
* Code review: minor refactoring
* Keep the warning for the modders about the obsolete unique
* Code review: Better wording for the unique
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
* Great improvements can again be constructed on forest
This PR fixes a bug where great improvements couldn't be build on
forests/marshes/jungles/etc. It does so by creating a unique which
specifically allows for removing features, and checking for that.
Additionally, we only remove these features when we have the tech to
remove them. For example, you can no longer plonk an Academy down over a
forest without having researched mining.
* Missed the file for vanilla
* Reviews
* Fixed logic
* Refactor: Move classes into their own files
* Handle 404 FileNotFound in UncivServer
* Refactor: Rename method
* Make GameSaver.saveGame throw the exception by default if it is not handled
* Add possibility to work with FileHandles in GameSaver
* Make OnlineMultiplayerGameSaver load the multiplayerServer setting each time it does something
This theoretically makes it unnecessary for the OnlineMultiplayerGameSaver to be re-instantiated each time it is used
* Refactor: Remove duplicated code
* Refactor: Extract NextTurnButton from WorldScreen
* Refactor: Remove WorldScreen-specific code from OptionsPopup
* Use kotlin coroutines everywhere instead of plain threads
This probably also cuts down on our raw thread usage, improving performance, since we now use a cached thread pool (in addition to coroutines being able to reuse threads anyway)
* Improve deep load from notification
* Refactor: Give music download coroutine the proper name
* Make Civilopedia independent of worldScreen or gameInfo
* Make Civilopedia callable from Main Menu
* Era category for Civilopedia
* Era category for Civilopedia - atlas
* Added rate limit handling to dropbox
+ some refactor to make the whole file one object
* Added error messages on rate limit reached
+ refactored some popup code to reduce repetition
* Fixed merge error
* Made variables private
* Fixed file upload not working
because of missing override flag for dropbox
* Stop multiplayer refresher if rate limit reached
* Fixed typo
* Various code changes/fixes
- ErrorResponse var name has to be `error` because that's how DropBox's json property is named
- Change FileStorageRateLimitReached exception to store the seconds remaining as its own property instead of in the message
- Use toIntOrNull to avoid setting defaults in two places
* Fixed missed exception message
Co-authored-by: Azzurite <azzurite@gmail.com>
* Create posh
* HexaRealm tile sprites upload (part 1)
* HexaRealm tile sprites upload (part2)
* HexaRealm tile sprites upload (part 3)
* Upload HexaRealm.json
Should have no problem in terms of most of the layering!
* Delete posh
* Delete bana.png
* vpn/proxy issues when creating new mp game
replaced redundant ping with opening a connection to dropbox to fix the proxy issue
* updated error message to include dropbox
* check multiplayerServer url if the user is playing on it
* use `https://content.dropboxapi.com` instead of `https://www.dropbox.com`
* fixed proxy issues on android
if connected to proxy but no internet access it will freeze for a couple seconds (until it finishes the for loop) but it works
* forgot to add the imports
* removed android sdk network check to fix proxy issues
* check for internet now separate from check for multiplayerServer
removed frunctions from PlatformSpecificHelpers__
* added improvements made by touhidurrr
* removed unused imports and replaced setter with property access syntax
Co-authored-by: Md. Touhidur Rahman <46617994+touhidurrr@users.noreply.github.com>
* Renamed tile.hasUnique, deprecated `Indestructable`, unique for citadels
Also refactored the consumption of (great) people out of UnitActions.
* Reworked when improvements can be build somewhere for more clarity
* Made resources improvable by multiple improvements; Offshore Platform
* Fix compatability
* WIP
* Fixed the tests, but better
* I suppose I might as well update this now that we're a version later
* Bump version and create initial changelog entry
* Update Filipino.properties (#6714)
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Romanian.properties (#6713)
* Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected
Many thanks to @SomeTroglodyte for most of the code and for explanations
* Revert "Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected"
This reverts commit bae7d7c07f.
* some translations
* merging with 4.0.13
* fixed a little error
* fixed github check error
* Update German translation (#6710)
* Update German translation
* Update German translation
* Update German translation
* Update Italian.properties (#6708)
* Update French.properties (#6697)
* Update French.properties
* Update French.properties to 4.0.13
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: alexban011 <alexban011@gmail.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: Ouaz <Ouaz@users.noreply.github.com>
* Fix Barbarian Camp Spawned notification not revealing the camp on the map in multiplayer
* Fix lastSeenImprovement not being cloned
* Use HashMapVector2 in BarbarianManager
* Fix value not having its class written out for proper deserializing
* Refactor: various code improvements
* Healing parity
Adjusted healing values for parity with CV
* New Demographics system for victory screen rankings
Added a new game setup checkbox option to use a ranking system on the victory screen which is more in line with the Civ V Demographics window. Created the UI element and game parameter but the demographics screen still needs to be implemented.
Also removed unnecessary comments from adjustments to healing values in a previous update.
* Demographics table init
Beginning to build structure of Demographics rankings table.
* Update VictoryScreen.kt
Attempt at getting more of the Demographics table implemented
* Update VictoryScreen.kt
Continued building the structure of the Demographics table
* Demographics first implementation
Finished first pass of Demographics screen.
* Minor text formatting
Improved some text formatting in code and comments.
* Update MapUnit.kt
Minor comment cleanup.
* SomeTroglodyte's Feedback, pt. 1
Implemented feedback given by SomeTroglodyte in PR #6645.
* Organized into functions
Split up Rankings table creation and Demographics table creation into new functions
* Update template.properties
Fixed missing space.
* Implementing more PR #6645 feedback
Added needed translation templates, used enum class instead of array for headers, moved checkbox to Options -> Display instead of new game
* Implemented rest of PR #6645 feedback
Simplified logic for finding player's rank, value, best/worst civ value, and filtered out defeated civs from the display and calculations
* Dead Civs get 0 in all categories
Added simple check if a civ is dead when computing score. If they are dead then they get 0 and go to the bottom of the scoreboard.
* Update VictoryScreen.kt
Further cleaned up code for better reuse and simpler logic with fewer loops.
* Update CivilizationInfo.kt
Simplified implementation of return 0 for stats when civ is defeated.
* Update CivilizationInfo.kt
Removed commented-out line of code.
* Fixed duplicate rank bug
Adjusted method of determining best and worst civs so that duplicates don't occur.
* Update VictoryScreen.kt
One-lined the handling of logic in buildDemographicsTable()
* Update VictoryScreen.kt
Moved static header row to new function.
* Implemented most easy things from comments on moddable victory PR
Also added religious victory condition
* Fixed tests
* Fixed compile problems & missing string
* Fixed typo
* Use both icon and roundIcon properties
* Studio-generated Android Icon
* Studio-generated Android Icon to fastlane
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
* Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected
Many thanks to SomeTroglodyte for most of the code and for explanations
* check for internet before starting a mp game to avoid freeze
Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected.
Many thanks to SomeTroglodyte for most of the code and for explanations. A slight modification has been done to the code to catch an error caused by InetAddress
* Revert "Merge remote-tracking branch 'origin/master-noInternet' into master-noInternet"
This reverts commit bd6474b50d, reversing
changes made to f52ad60b51.
* Readability overloads for `getComplexRuleset`
* Enable loading maps containing missing ruleset objects with fix and message
* Fix bungled `noMapsAvailable` and follow minor criticism
* 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
* 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
* 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
* New Map editor - attempts 1
* New Map editor - attempts 2
* New Map editor - attempts 3
* New Map editor - attempts 4
* New Map editor - attempts 5
* New Map editor - attempts 6
* New Map editor - attempts 7
* New Map editor - attempts 8
* New Map editor - attempts 9
* New Map editor - attempts 10
* New Map editor - merge
* Revert included Stat icons in favour of #f90b22a
* Adapt to renamed TileGroup methods
* Manual merge of some baseruleset code for the map loader only
* Kludge for disappeared `getBaseRuleset`
* Fix after-merge conflicts, run convertTerrains in stepwise map generation
* Fix merge error
* Adapt to latest merge
* Baseruleset control - unpolished draft + max zoom out
* MapEditorV2 - merge fixes, base ruleset and mod control, texture loader fix, pedia links, translation, load mod maps, continent visualization, minor improvements and fixes
* MapEditorV2 - removed old editor
* Fixed G&K policy eras
Patronage should be Medieval and Freedom should be Industrial in G&K
* Added 'priorities' object to policy branch entries
* Fixed Vanilla policy eras
Also set testing priorities in advance
* Partial code formatting
* Reworked how the AI chooses a policy to newly adopt
* Removed debugging codes
* Update Civilization-related-JSON-files.md
Added Branch priorities
* Assigned actual priorities to each branch
Also fixed a debugging value in Ruleset.kt (-1 -> 0)
* Allow TranslationFileWriter to follow several superclass levels (fixes PolicyBranch names)
* Bring German and template up to par as baseline
* Framework to feed TranslationFileWriter from UniqueParameterType, also fixes Fountain of Youth
* TranslationFileWriter legacy guessing now _much_ simpler
* Fix "chance to be destroyed by nukes" case
* Fix tests (allTranslationsHaveCorrectPlaceholders goes cross-language)
* Generalized trade route percent bonuses
* Unified two uniques using populationFilter; deprecated a deprecated uniq
* Made some renamings to improve clarity & fixed tests
* Fixed tests again
* Fixed typo
* Background implementation for Unciv server with ktor.
Server ip in settings, able to copy your own ip and copy ip from clipboard for easy sharing, created stub for the client-server data transfer. No actual data storage or server implementation.
* Unciv server round 2 - implementing crud for files and it works!
metadata seems to only be in use for mutex, which is currently unused
That's all for today
* When starting a new multiplayer game the files are correctly saved in the server, and the server can return the files, but the function in the game to retrieve the game info is non-blocking so it doesn't work. Still, progress!
* Changed the Gdx http to basic Java http, as used for Dropbox, and now everything works!!!!
* Documentation for running and using the server
* Better texts, translations, etc
* Trog is right this should be a PUT not POST
* Resolved#6335 - now shows conditionals precluding construction of units
Built simply so that if we decide to expand the conditionals that should be shown it will simply be building a hashset of conditionalsToShow
* Added an instance wrapper, so the enum has the default values and the class has the actual values
* minor lint
* Fixed reviewed comments of PR 6273
* Cleanup of Dropbox.kt
- moved Dropbox.kt from ui\worldscreen\mainmenu to logic\multiplayer
- moved ServerMutex and OnlineMultiplayer to own files
- changed DropBoxFileConflictException to FileStorageConflictException to match FileStorage scheme
- merged FolderListEntry with DropboxMetaData as they were basicly the same
- introduced IFileMetaData to match FileStorage scheme and modified DropboxMetaData to use it
- removed some unused imports
* Unique units abilities that should be inherited by upgrades
* Unique units abilities that should be inherited by upgrades - xlt
* Unique units abilities that should be inherited by upgrades - wiki
* Destroy Arsenal when city is captured
* Update vanilla Songhai
* Add Amphibious promotion to all Songhai units
In Gods and Kings, all Songhai Land units have the Amphibious promotion. This brings our Gods and Kings up to speed with the original.
* Destroy Arsenal when city is captured
* Fix Petra culture wiht city filter
Change Petra's culture bonus to city-specific bonus instead of empire-wide bonus
* WLTK decoration png's and atlas
* UncivTooltip anchor to stage so tips won't get clipped by some ScrollPane
* Empire Overview Cities add WLTK column
* Make WLTK line on CityScreen stats box link to Civilopedia
* Make Civilopedia return to previous screen for _both_ ESC/Back and the Close Button
* Revive Civilopedia links in WorldScreen.TileInfoTable
* Festive decoration for WLTK day on CityScreen
* Some Ruleset linting
* Mod-check display remove unnecessary FormattedLine
* Mod-check can run on selectable base ruleset instead of Vanilla only
* Mod-check show final severity on Expander
* Mod-check base selectbox translatable
* Translation: Update Spanish.Properties (#6243)
* Translation: Update Spanish.Properties
Mosaicos? Pero si yá está el estandar de "Casilla"?...
* Update Spanish.properties
* Update Spanish.properties
* Create Spanish.properties
* Update Spanish.properties
* Update German translation (#6242)
* Update Indonesian.properties (#6241)
* Update French.properties (#6236)
* Update Simplified_Chinese.properties (#6233)
* Update Simplified_Chinese.properties
I have translated all I can, but there're still some of them out of my ability. Note: How to translate ID?
* Update Simplified_Chinese.properties
* Update Italian.properties (#6228)
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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
* Change Embarked Defending Strength per era. Update Tutorial a little
* Use JSON implementation of EmbarkDefense
Co-authored-by: itanasi <spellman23@gmail.com>
* 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
* Fox naval unit Landind penalty is for attacking on to land
* Only Land unit should have Boarding penalty
* Unbreak logic
* Adding more information to the Embarking Tutorial
* More info
Co-authored-by: itanasi <spellman23@gmail.com>
* Triggered uniques currently come from researching techs, adopting policies, and building buildings.
This adds a third way of triggering uniques, by attaching them to units with a "by consuming this unit" conditional, which will be added as a possible unit action.
So for example, "[amount] Free Technologies <by consuming this unit>", "Reveals the entire map <by consuming this unit>" etc.
* Added a new uniquetype for triggerable uniques, to make them separate from regular global uniques, so that triggerable uniques can become unit uniques when necessary
* And added translations so the tests will pass
Instead of expanding the existing 'requires building' unique to units and adding limiters, it's both easier and more generalizable to add conditionals for cities with and without certain buildings to replace the uniques entirely
* 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>
- "Resources" in city-state diplomacy screen
- "When Friends"/"When Allies" in same
- "Enhance religion"
- "Choose a Religion" in religion screen
- Religion name in religion screen
- Translated drilldown items in city screen
- "null for wheat" in improvement Civilopedia entry
- "Type" and others in city-state civilopedia entry
- Requires more population
- Religious
- "Requires" in Policy civilopedia text
- "for" in improvement civilopedia text
- Untranslated conditionals in battle table (listed as "when fighting in [tileFilter] tiles")
* Unified "X is only available under Y conditions" into a single unique
There were a few problems with existing uniques - they weren't really composable, the offered things they didn't keep, etc
For example, "Incompatible with [policy/tech/promotion]", UniqueTarget.Policy, UniqueTarget.Tech, UniqueTarget.Promotion. In fact, promotions only checked promotion incompatibility, promotions - promotion incompat, etc
Additionally, with a few more changes, this could cover several other uniques - "Hidden until [amount] social policy branches have been completed", "Requires at least [amount] population", perhaps others
I have to say I think conditionals are the best thing ever and they make amazing composability possible :)
* Autoupdate correctly recognizes parameters
Updated ruleset jsons
* Deprecation texts should be allowed to forward to other deprecated uniques so we only need to change the leaves when introducing new uniques, not go through the whole tree
* Arbitrary conditionals can become timed conditionals!
triggerCivwideUniques is activated in 3 situations:
- Tech complete
- Policy adopted
- Building complete
So for each of the unique containers for these I added a catch saying 'if this unique is a temporary unique then don't save it yourself
This has been lying around in todos for a while and generalizes one of the nasty hardcoded messes that I hate about Civ V. Why would you introduce ONE timed effect in the whole game?! You can use them all the time like Humankind or never use them like Civ IV, but why have just one whyyy
One more thing in this PR, that needed to be solved by the by, is allowing parameters to have a '2' on the end so we can autoreplace multiple parameters of the same type.
Using a regex is slightly more inefficient, but since this is A. only used once per UniqueType.kt, and B. allows us to have as many 'amount's as we want which is important if we have a lot of conditionals, I feel this is justified.
* Fixed comments from PR
* Big update for French.properties (#6112)
* Big update for French.properties
- Try as much as possible to match Civ 5 french translation
- Modify some translations to better fit the UI
- Modify some translations to improve some original Civ 5 french entries which were poorly translated
- Make translations consistent through all the file
- Fix all broken translations due to bad word/key ordering
- Some quotes are now real quotes from french books (when available) rather than translated from english quotes
- Fix many typos
* Fix translation error
* Translatión: Actualización del Español (#6109)
Also deleted the extra resource icons I originally put 'xD
* Update Korean.properties (#6108)
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Japanese.properties (#6107)
* Update Indonesian.properties (#6103)
* Update Indonesian.properties
* Update Indonesian.properties
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
* Find all replaceable uniques, generate replacement text, check for compatibility, and replace!
All of the work up until now has lead up to this point - since we already know what's out and what to replace it with, we can do 90%+ of the work ourselves and spare the sanity of our modders
For an example run:
- Download your favorite mod
- Check its deprecated uniques in the options menu
- Run the autoupdater from the same menu
- See how they disappear
- Bask in the glory
* A few unreplaced uniques raised problems in some of the replacement texts
* Old unusable deprecated uniques are suddenly important again, because they can help autoupdate mods!
I'm wondering if to remove outdated mods entirely from the uniques.md, since they're going to keep accumulating
* Padding for the 'autoupdate' button
* Only display autoupdate button if there are unique to update
Also, fixed some of the revived deprecated unique's replacement text thanks to fancy new tests :)
Tech uniques autoupdate!
* Toast now pops correctly, added translation entries
* Added unique to convert terrain to other terrain if adjacent to something
Terrain converting to other terrain when adjacent to rivers was using hardcoded stuff, so I un-hardcoded it
I thought I could use this to replace the 'coast' hardcoding, and if it wasn't for the maxCoastExtension then I could.
Modders CAN therefore add their own coast (Lava tiles and Ash tiles I dunno) but it will only be for directly close terrains.
This enables Deciv Redux to spawn huge maps.
* Also for Vanilla, which apparently had a different number of tabs than G&K for no apparent reason.
* Apparently terrain name wasn't a uniquetype yet
(cherry picked from commit 593fc257b5)
* Update Spanish.properties (#6082)
* Update Spanish.properties
the only thing i didn't translate were the names of the cities if you have any problem contact me on discord like: lostxxxxx
* Update Spanish.properties
problem solved
* Update Japanese translation (#6075)
* Update Japanese.properties
* Update Japanese.properties
* Update Italian.properties (#6074)
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
* Gradle build tools upgrade
Apparently the magic is rewriting a specific line in the Android build file and downloading Android SDK 30.0.3
* Added wiki change, isn't that nice :)
* Added a json file for unhappiness effects
* Change existing code to handle these effects
* Made a weird and unexpendable way to add unhappiness effects to the civilopedia
* Add the default unhappinesseffects to mods without the json
* Added revolts when at very low happiness
* Renamed a few often-used functions
* Added a file for uniques that are always active
* Fixed tests
* Nullifies [Food] -> Nullifies Growth
* Update Italian.properties (#6029)
* more word change (#6010)
* more word change
* Added that space
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: fab144 <58261459+fab144@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
* Typed some uniques, etc.
* Missed a few square braces
* Missed a parameter
* Missed another parameter
* Made a conditional, spelling, added check to `isStatRelated`
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Typified some building uniques
I noticed that the code allows "[stats] from every [buildingFilter]" but the UniqueType was limited to "[stats] from every [buildingName]", so now that that's available we don't actually need the "[stats] from every Wonder" unique :)
* buildings-only unique moved to buildings section
* Make unknown nation placeholder translatable.
* Make MultiplayerScreen help button clearer and translatable.
* Use `Constants.spectator` more.
* Make random/unknown nation icon translatable.
* Update English.properties. (Remove no-op translations.) (#5977)
* Update Spanish.properties (#5970)
* Update Italian.properties (#5966)
* I made some changes to the simplified Chinese translation file. (#5987)
* Minor polishing up for accuracy and some translation
* Additional translation
* Update Simplified_Chinese.properties
Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: unciv-translation <97832928+unciv-translation@users.noreply.github.com>
The NewGameScreen was written by a past version of myself that had no idea how to handle threading, and thus was extremely strange. Checking an object _on render_ and if it's set then activate? Totally clueless.
* Add crashHandlingThread.
* Replace all uses of `thread` with `crashHandlingThread`.
* Add `postCrashHandlingRunnable`.
* Replace all uses of `Gdx.app.postRunnable` with `postCrashHandlingRunnable`.
* Remove CrashController and CrashReport; Strip down CrashReportSender to CrashReportSysInfo; Fold their functionality into CrashScreen.
* Typo in comments, rename `SafeCrashStage` to `CrashHandlingStage`.
* Tweak docs.
* Tweak docs, comments, text. Undo an accidentally recursive Replace All change.
* Remove replaced translations.
* More readable indentation handling in report template.
* 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>
* 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
* Update German.properties (#5863)
* Update Italian.properties (#5851)
* Update Romanian.properties (#5806)
* Update Romanian.properties
I made a contribution to Romanian translation. Up to rougly line 800 should be translated until now. I'd be happy you introduced these translation to the game!
* Update Romanian.properties
Mostly typos, that hopefully have been fixed.
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: jacer2010 <96766494+jacer2010@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Cosmin Burada <77898829+cosylynx@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
* Fixed a bug where bonusses applying 'in friendly tiles' would not apply
* Reworded something so it actually makes sense
* Fixed capitalization error leading to autocracy complete bonus no longer working
* Fixed save serialization errors and finally correctly implemented the time limit for autocracy bonus
* Made value const and static
* Show arrows on map for unit actions.
* Don't wrap arrows unless world wrap is actually enabled.
* Fix transported air units always being treated like teleports.
* Simple reviews.
* Separate movement arrow visibility checks from WorldScreen.
* Assets for map arrows overlay.
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Show arrows on map for unit actions.
* Don't wrap arrows unless world wrap is actually enabled.
* Fix transported air units always being treated like teleports.
* Simple reviews.
* Separate movement arrow visibility checks from WorldScreen.
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Added a score calculation
* Added the score in multiple places of the UI
* Added time victory and a max turns
* Made time victory functional
* Added translation files
* Add new crash handler and error reporting screen.
* Minor cleanup.
* Word choice.
* Rename `SafeCrashStage` to `CrashHandlingStage`.
* Reviews.
* Reference stack traces in comments for thread and postRunnable exceptions.
* Remove excessive line breaks, superfluous .apply{}.
This lead to failed tests for new languages, as the second space would be seen as the translated string, which obviously doesn't contain the placeholder tags.
* Fixed an infinite loop where foreign legion upgraded to the unit it replaced
* Changed the wrong variable
* Maybe it is useful to also change its unlock tech
* Whoops, should only be for non-null values
* Added necessary utils
Added the FileNotFoundException which is also part of #5593
* Added preview download to MultiplayerScreen
* Added preview download to TurnChecker
* Fixed uncomplete commit
* Removed debug print in MultiplayerScreen
According to a Malay speaker in discord, this resolves several curse words and similar being removed from the translation. As #4820 also changed some 3700 other lines and the file hasn't been touched since, this should also improve the translation in other ways.
I am, however, not a Malay speaker, so I personally cannot vouch for the correctness of these translations.
Additionally, all lines that have been added since 3.16.3 to be translated, have been removed from this file, making the change seem larger than it really is.
* Update German translation (#5724)
* Update Swedish.properties (#5719)
* Update translation: Simplified Chinese (#5717)
* Update Italian.properties (#5712)
* Update Simplified_Chinese.properties (#5714)
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Russian.properties (#5735)
* Fixed niche bug that let you try and capture civilians in territory you can't enter
* Resolved#5713 - AI doesn't try attacking with non-attack units
* Update Russian.properties
* Update Russian.properties
Co-authored-by: yairm210 <yairm210@hotmail.com>
* Update Brazilian_Portuguese.properties (#5734)
* Fixed niche bug that let you try and capture civilians in territory you can't enter
* Resolved#5713 - AI doesn't try attacking with non-attack units
* Fixed a bug where statue off Zeus would not work (#5732)
* Update Brazilian_Portuguese.properties
Co-authored-by: yairm210 <yairm210@hotmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
* Update pt-br (#5733)
* Fixed niche bug that let you try and capture civilians in territory you can't enter
* Resolved#5713 - AI doesn't try attacking with non-attack units
* Fixed a bug where statue off Zeus would not work (#5732)
* Update pt-br
From a brazilian developer that loves wath u doing
Co-authored-by: yairm210 <yairm210@hotmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Zoron <fralonra@aliyun.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: wwwxxxzzz666 <2273204577@qq.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Samuel Barbosa <79980951+SamuelBarbosa0042@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
* Add support to UniqueType.MaxNumberBuilding (including rejectionReasons)
Add Recycling Center entry to JSON
Need Graphical Icon
* Fix typo
Add TODO
* adding Recycling Center icon
* Credit update for icon
Rephrase Rejection text
Updated .atlas and .png
Add code to block showing Recycling Center
* Fix using placeholderText
Set shouldShow to True so iot still appears while under construction but not completed
* Rejection Text now working
Remove debug prints
* Remove odd extra lines
* extra lines
* Remove excessive if statement in shouldBeDisplayed
Reword text. Unique can apply to Buildings and Units
Refactor Signature since not just Buildings
* Adding code to remove building in transferred city
Co-authored-by: temurakami <spellman23@gmail.com>
* Add new UniqueType.NoMaintenance to support Guided Missile
* revert gradle
Add UnitMaintenanceDiscount
Rename UnitMaintenanceDiscount->UnitMaintenanceDiscountGlobal
Rework maintenance equation to account for overlapping reductions
Add maintenance variable to MapUnit
* Add square brackets in string (apparently didn't check in?)
More robust uniques check code so not assuming only one matching unique
Use toPercent()
* Proper toPercent() math
Co-authored-by: temurakami <spellman23@gmail.com>
* start position normalization
* assignLuxuries
* City states placement
* city state normalization
* don't consider tiny islands
* also modify the other json since they are duplicated now
* Fixed tests checking for mod correctness
* Update G&K jsons to current vanilla versions
* First pass over buildings & beliefs
* First pass over nations
* First pass over eras.json
* Fully updated tech tree
* First pass over units
* Second pass over buildings -- fixed techs
* Fixed last prerequisites and row numbers of tech
* Went through the entire tech tree and moved things to their correct spot
* Fixed tests
* Copied files for Gods & Kings folder
* Added G&K and unified with mods in dropdown
* Split the baseruleset from the mods list in game parameters
* Mod links are checked again when selecting a mod
* The new map editor screen now also uses the base ruleset
* Updated the ruleset change dialog in the map editor; Fixed a crash
* Refactored some code and fixed some bugs
* update for no reason
* bruuhhhhhhhhh
* bruuhhhhhhhhh
* rebase... this probably wont work
* bruuhhhhhhhhh
* fix comments..?
* bruuhhhhhhhhh
* equalize with upstream/master
* made the game not change the text shown in rich presence with the current language, added a language override functionality to String.tr() which is probably inefficient as hell, also the reason why i had to keep the .tr in leader name is because it showed the parantheses
* i have no idea why github or git keeps bugging me on this but this line randomly appears then disappears
* i have no idea why github or git keeps bugging me on this but this line randomly appears then disappears
* revert changes to .tr(), use what @yairm210 suggested
* Should resolve#5534 and the long-standing request of "move after automate" by separating the automated movement from the actual end of turn
* Added translation
* Automated units move in a separate thread to avoid UI freezing
* Update Brazilian_Portuguese.properties (#5564)
* Update Italian.properties (#5551)
* Update French Translation (#5538)
* Update French Translation
* Update French.properties
* Filipino.properties (#5331)
* Filipino.properties
Sorry if I was not able to continue this. I will try to continue it now.
* Updated Version
I'll continue editing this whenever I have spare time.
* Update 2
Co-authored-by: PredoTop <93168287+PredoTop@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Gloadonix <56483221+Gloadonix@users.noreply.github.com>
Co-authored-by: SunnySunset <88270612+SunnySunset@users.noreply.github.com>
* Made some improvements to the religion UI
* Added translatable strings
* Added some pretty colors - code based on code provided by SomeTroglodyte way back
* I hate spaces
* Moar colourz
* Add some very small Quality-of-Life improvements for multiplayer games
- GameInfo.kt
- Add timestamp for the start of the last turn to save info, hopefully
this will enable a multiplayer turn timer in the near future
- MultiplayerScreen.kt
- Current turn indicator for multiplayer games now shows for how long it
has been the current player's turn.
- WorldScreen.kt
- Next Turn Action will display which player we are waiting for rather
than the generic "Waiting for other players..."
* Update text for translations and add better elapsed times
template.properties
- Add translation templates for waiting turn information
German.properties
- Provide German translation for waiting turn info
Japanese.properties
- Provide Japanese translation for waiting turn info
MultiplayerScreen.kt
- Add translation brackets for waiting turn info
- Add a function which determines whether to represent
elapsed time in Minutes, Hours, or Days (and does so)
WorldScreen.kt
- Add translation brackets for waiting turn info
* Fix line translated endings as per request
MultiplayerScreen.kt
- Translation for the "Last refresh:/Current Turn:" display no longer
includes line endings
- "Last refresh:/Current Turn:" display now uses LF line endings only
* Show generic "Waiting for" message in single player
WorldScreen.kt
- Place an additional condition for getNextTurnAction which selects the
generic "Waiting for" message in single player and the civ-specific
one in multiplayer
Co-authored-by: Colin S. Vanden Heuvel <colin.vandenheuvel@wisc.edu>
* Added conditionals & enumified improvement stat uniques
* Enumified all the other uniques
* Fixed bug where improvemen stat icons didn't show up in tech tree & reviews
* 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.
* 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
* AI evaluation of resources
* optimizations
* sell or disband when needed for space victory
* use for all constructions
* use in trade evaluations
* .requiresResource()
* 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>
* Do not show RulesetErrorSeverity.WarningOptionsOnly on new game screen
* Do not show RulesetErrorSeverity.WarningOptionsOnly on new game screen - fresh atlas
* 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
* Music controller with fade-over and mod capabilities.
- Preparation for music following game situations
- Minimal in-game hooks for now
- Already allows mods providing music, will play randomly
* Music controller - template
* Added support for conditionals to some more uniques
* Implemented a new conditional
* Added the new conditional to the translations file
* Fixed tests
* Implemented requested changes
* Moved uniques to their own folder
* Added support for conditionals to most of the uniques in the current enum
* Deprecation > removal, of course
* Fixed tests & added `.removeConditionals` before checking for placeholders
* Implementation of conditionals, but better than before
* Updated the unique while I was at it
* Fixed bug where conditionals would never apply
* Capitalization
* Minor code cleaning
* Better documentation & variable names
* Changed translation strategy
* Added missing import?
* Add Carthage
* Implement uniques
* performance improvement, better elephant
* AI avoids taking too much damage from mountains
* more performance
* better AI
* can't settle cities on mountains
* AI improvement
* AI improvement
* revisions, damagePerTurn in Terrains.json
* terrain damage stored as unique in json, damage also works for terrain features
* don't change game.png
* 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>
* 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
* Update Spanish.properties (#5208)
I'll check for grammar errors later. Hopefully there aren't anny nor a new release comes out today.
* Update Italian.properties (#5196)
* New polish translations (#5194)
* Update Polish.properties
Translated some unit names, and some other translations
* Update Polish.properties
Some random translations of short lines
* Update Polish.properties
Few random translations again
* Update Romanian.properties (#5191)
* Update German translation (#5189)
* Update German translation
* Update German translation
* Update German translation
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: PLynx <pawelrys2011@gmail.com>
Co-authored-by: Vortexon <88623583+V0rtexon@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
* Rates for natural influence change
* Minor civ wariness, proximity calculation
* CS can declare permanent war
* CS can in fact not declare permanent war
* adjustments, template.properties
* neater code
* fix failing test? .
* move proximity code, for reals fix failing check
* now?
* revisions
* BFS only once, better check for water map
* assign continents on pre-made maps as well
* now works on all pre-made maps
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Adding religous city states to unciv!
* Refactored free buildings from civ.policies to civ.constructions
* Made CN tower function like in the base game
* Fixed random buildings being marked culture buildings
* Handle maps with invalid mapSize more gracefully
* Handle maps with invalid mapSize more gracefully - new game exception handling
* Handle maps with invalid mapSize more gracefully - moved version save init
* penalties for attacking
* proper timers on penalties
* template.properties
* space
* Player can pick sides when protected civs attacked/bullied
Protect gives resting point 10 for influence
* correct string
* Pick unique unit for militaristic CS
* Provide unique unit when able
* refactor some code
* remove debug
* template.properties
* fix failing build
* Add variance to spawning rate, add ≈ to string, better formatting.
* 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 portrait - template
* Wrote an extensive tutorial documenting most of religion
* Fixed spelling and improved clarity
* Fixed typo (Thanks for noticing!)
* Reworded and split up tutorials, fixed grammer/spelling mistakes
* Added missing quote mark
* Improved redability
* From the industrial era onwards, religion goes into 'second phase'
* Fixed tests
* Fixed formula for buying great prophets starting from the industrial era
* Added `getMatchingUniques`, `hasUnique` to `IHasUniques`, cleaned up some code
* Fix compilation errors
* Proper demand tribute thresholds
* Proper calculation for Force rankings
* debug strings
* use new force ranking for AI threatAssessment
* use new force ranking for AI threatAssessment, pt 2
* Enforce the existence of an eras.json file for mods
* Merged `getEra()` and `getEraObject()`
* Hide mods we have deemed outdated
* Fixed compile errors that I didn't notice before
* Fixed unit tests
If the last game you created used a mod that you later removed from the the device it could never be removed from the new game parameters
Caught exceptions from quickstart failing
* Implemented renaming of religions
* Made AskForText display error on invalid input, implemented recommended changes
* Almost forgot the translatable strings in the new popup
* Fixed great person gift formula, confusing boolean, "great person" filter
* Refactored getRejectionReason to return a hashSet of reasons instead of a random one
* Added Grand Temple and Great Mosque of Djenne buildings
* Added uniques for Grand Temple
* Added uniques for Mosque of Djenne, refactored ability uses system to count down isntead of up
* Json definition for nation, images
* Jsons, Hussar and Coffee House
* Diplomatic Marriage Button
* Implement Marriage
* AI Marriage
* template.properties
* Popups etc
* Strings
* reviews
* reviews pt 2
* Generalize the concept of founding religions in preparation of enhancing
* Implemented enhancing religions
* Added all enhancer beliefs (mostly correctly, mostly tested)
* You can now found a religion without a pantheon, requiring you to choose a pantheon as well
* Parameterized 'enhance religion' action, fixed tests
* Implemented requested changes & simplified beliefContainer a lot
* Fixed rename
* Updated code to include features added in the meantime
* Merge branch 'master' into enhanceReligions
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Civilopedia Phase X - Show Policies
* Civilopedia Phase X - Show City States
* Civilopedia - Loop-driven init and Cleanup
* Civilopedia - City States
* Civilopedia Phase X - Remove spurious comments
* Ancient Ruins, Civilopedia and Translations
- TranslationFileWriter can process Ruins.json
- Hide Religion / Civilopedia uniques hardcoded String moved to Constants
- Civilopedia display of Ruins pulls actual json rewards in code
- Manually curated rewards description removed
* Ancient Ruins, Civilopedia and Translations
- Old rewards descriptions moved to names, color
- Code now recreates old output closely
- civilopediaText allowed additionally
- TranslationFileWriter tweaked accordingly
* Ancient Ruins, Civilopedia and Translations - fix stargazers
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.
* Made water oil wells require the Refrigeration tech
Oil wells can now only be created on water with the refrigeration
technology.
This is not the ideal solution: it would be preferable to support
multiple improvements for a single resource, to add offshore platforms
as a separate improvement for coastal oil that requires refrigeration
and to disable building oil wells on coast. Allowing multiple
improvements for a resource would however be a much more significant
refactor.
* Added back "terrainsCanBeBuiltOn": ["Coast"]
* CityScreen Buy button rework
- e.g. "Buy" for Missionary
- Info pane staying even when building no longer offered
- Purchase Prompt a little prettier
* Urgent Fix - noMods switch default
* CityScreen Buy button rework - patch1
* city-state bonuses graded depending on friend or ally
* siam militaristic UP, cleaned up presentation
* fix strings
* move city state modifiers to json
* city-state bonuses graded depending on friend or ally
* siam militaristic UP, cleaned up presentation
* fix strings
* move city state modifiers to json
* Restructure eras.json
* reduce indentation in DiplomacyManager.kt
* Add fallback values in cas of missing json definitions
* review edits
* fix conflicts???
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Improve horse and construction sound
* Update Credits.md
* Convert to mp3
* Delete construction.ogg
* Improve horse sound
By https://freesound.org/people/Kubuzz/sounds/347036/
* Update Credits.md
* Bring back to old "construction" sound
* Update Credits.md
Helicopters are implemented as land units, so the anti-air units (land
anti-air and fighters) did not yet have this bonus.
Also corrected the damage bonus of triplanes and removed a redundant
"6 tiles in every direction always visible" unique.
* Implemented Zone of Control
* Implemented "move after attacking" ZoC exception
Units that can move after attacking are not affected by zone of control
if they move because of defeating a unit.
* Implemented all missing special ZoC cases
As described in:
https://forums.civfanatics.com/resources/understanding-the-zone-of-control-vanilla.25582/
* Slightly optimized ZoC logic
* Modified the "possible optimization" comment
Added the knowledge gained from SomeTroglodyte's tests.
* Added "Ignores Zone of Control" unique
Implemented the unique and gave it to the Helicopter Gunship.
* 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)
Checking the Github actions shows that this doesn't seem to work with the current Github actions due to version confllicts, we'll need to resolve those
* Ruins now have their own file
* Added religious rewards
* Added an option for only enabling rewards after a certain amount of turns
* You can now weigh rewards making some more likely than others
* Cleaned up some code
* Make new changes compatible with old mods
* Implemented proposed changes
* Implemented requested changes
* Implemented requested changes
will this break a hypothetical save where someone is now researching a tech and has all required techs for now but not the new to be added requirement?
* Ai now cares about distance from it's cities
* Ai now cares about distance from it's cities
* Ai now cares about distance from it's cities
* Ai will pay extra pay extra for bordering cities or surrounding cities
* Ai will pay extra pay extra for bordering cities or surrounding cities
* Ai will pay extra for cities that are closer to their territory
* The code is cleaner
* The code is cleaner
* The code is cleaner
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* Ai now cares about distance from it's cities
* Ai now cares about distance from it's cities
* Ai will pay extra pay extra for bordering cities or surrounding cities
* Ai will pay extra pay extra for bordering cities or surrounding cities
* Ai will pay extra for cities that are closer to their territory
* The code is cleaner
* The code is cleaner
* The code is cleaner
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* Ai now cares about distance from it's cities
* Ai now cares about distance from it's cities
* Ai now cares about distance from it's cities
* Ai will pay extra pay extra for bordering cities or surrounding cities
* Ai will pay extra pay extra for bordering cities or surrounding cities
* Ai will pay extra for cities that are closer to their territory
* The code is cleaner
* The code is cleaner
* The code is cleaner
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* Ai now values distance
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* You can now gift improvements to the ai
* Update template.properties
* Added missionairy units, which can spread religion and bought with faith
* Forgot an include, minor additions
* Forgot credit for the missionary image
* Large refactor, enabling buying with almost all stats, split IConstruction into IConstruction & INonPerpetualConstruction
* Does this fix the tests
* Fixed accidentally removing all trailing spaces in template.properties
* Thanks to someTroglodyte for paying more attention than I do :)
* Implemented requested changes
* Fixed large amount of question marks
* Missing space, of course
* Fixed function name change
* Fixed merge problems
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
- Deserts are a little bit more common (but now have higher chance of being stripes)
- Slightly reduced range of Tundra.
- Slightly reduced amount of Snow.
- Grasslands can now appear next to desert tiles and huge plains areas are much less likely.
* 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
* Split off unitTypes to its own json, only containing the domain it can travel in for now
* Updated translationFileWriter to handle this file correctly
* Updated promotions file
* Implemented requested changes
* Units without a sprite use the sprite of a first unit with the same type
* Implemented proposed changes
* Fix Hagia Sophia and CN Tower not giving civ 5 bonuses
i got the information about Hagia Sophia from @ravignir and CN Tower from civ wiki. i will also add faith to buildings that give faith in G&K but will do it as a commit, that so that it would be easily revertable if faith doesnt just get ignored when religion is disabled
* Create Buildings.json
* Delete Fix Hagia Sophia and CN Tower not giving the bonuses it gave in civ 5
* And new unit pixel and some improvement.
* Improve Road & Railroad more realistic
* Unit pixel improvement
* Delete Airship.png
* Delete Stealth Bomber.png
* Re-art Missionary
* Add Rome color for ballista
* Delete Future Soldier.png
This should make the map look more like a civ5 map:
here is a spreadsheet i've created and used to make these changes: https://drive.google.com/file/d/18uacHvZlh4FoM8xEVH4J9jaAmtHomutr/view?usp=sharing
What it does:
- makes center of a map mostly Grassland with some bits of Plains
- next biome is Desert and Plains with a rare patches of Grasslands.
- next biome is again Grasslands and Plains (in about equal proportions)
- final biome is Tundra that turns into Snow towards poles.
- makes the whole map look less stripy.
It looks kind of messy, but i tried to make it as compact as i could.
* Add files via upload (#4632)
* Update Finnish.properties (#4627)
* Update Finnish.properties
* Update Finnish.properties
* Update Finnish.properties
* Update Hungarian.properties (#4625)
* Update Swedish.properties (#4621)
* Update Korean.properties (#4614)
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
스웨덴 문명 추가됨. 아래 주목. (#4566)
> I took the liberty of redoing the city name list. The new list includes only cities in modern Sweden (so no Finland), and no Viking Age settlements that are not currently inhabited.
도시 목록을 모던 스웨덴 기준으로 했다는데, 말이 좋아 그렇지 걍 좃대로 한걸로밖엔 생각되지 않음. Unciv가 문5 따라가는 겜인데, 문5 도시목록에 중대한 오류가 있지 않은 이상 그대로 가주는게 맞는거지. 근데 내가 역사덕후도 아니고 이사람은 스웨덴어 번역(swedish.properties)도 한거보면 현지인인거 같아서 일단 번역은 해놈. 내가 하는 한국어번역부터가 문5를 그렇게 완벽히 리스펙하진 않으니 또이또이기도 하고 걍 내가 귀찮은거 뿐이니까.
도시 목록 번역에는 국립국어원 외래어 표기법을 참고함.
국립국어원 https://www.korean.go.kr/front/main.do
국립국어원 어문규범 https://kornorms.korean.go.kr//main/main.do
국립국어원의 존재의의가 어문규범인데 홈페이지 분리하는 클라스... 그렇지.. 정부기관 홈페이지는 이렇게 지저분해야 제맛이지
스웨덴어 표기법은 알아서 찾아드가시고
실제로 본 페이지는 여기임. 구글링해서 나온거고 내용물은 같은데 레이아웃이 달라버림 ㅋㅋ
스웨덴어 표기 일람표 https://www.korean.go.kr/front/page/pageView.do?page_id=P000115&mn_id=97
스웨덴어 표기 세칙 https://www.korean.go.kr/front/page/pageView.do?page_id=P000136&mn_id=97
도시 목록을 한글로 옮긴 결과물은 다음과 같음
ㅇ : 예시에 있어서 복붙한거
v : 규정에 맞춰서 짜맞추는데 성공한거
?? : 도시이름이 현지표기랑 다르거나(예테보리는 원래 Göteborg), 규정대로 적었는데 구글링 결과가 시원찮은거(그렌나는 영문검색결과도 Granna Granaa 가 더 많음)
Stockholm = 스톡홀름 ㅇ
Uppsala = 웁살라 ㅇ
Gothenburg = 예테보리 ??
Malmö = 말뫼 ㅇ
Linköping = 린셰핑 ㅇ
Kalmar = 칼마르 v
Skara = 스카라 v
Västerås = 베스테로스 ㅇ
Jönköping = 옌셰핑 ㅇ
Visby = 비스뷔 ㅇ
Falun = 팔룬 ㅇ
Norrköping = 노르셰핑 ㅇ
Gävle = 예블레 v
Halmstad = 할름스타드 ㅇ
Karlskrona = 칼스크로나 v
Hudiksvall = 후딕스발 v
Örebro = 외레브로 ㅇ
Umeå = 우메오 ㅇ
Karlstad = 칼스타드 v
Helsingborg = 헬싱보리 v
Härnösand = 헤르뇌산드 v
Vadstena = 바드스테나 v
Lund = 룬드 ㅇ
Västervik = 베스테르비크 v
Enköping = 엔셰핑 ㅇ
Skövde = 셰브데 ㅇ
Eskilstuna = 에실스투나 v
Luleå = 룰레오 ㅇ
Lidköping = 리드셰핑 v
Södertälje = 쇠데르텔리에 ㅇ
Mariestad = 마리에스타드 v
Östersund = 외스테르순드 ㅇ
Borås = 보로스 v
Sundsvall = 순스발 ㅇ
Vimmerby = 빔머뷔 v
Köping = 셰핑 v
Mora = 모라 v
Arboga = 아르보가 v
Växjö = 벡셰 v
Gränna = 그렌나 ??
Kiruna = 키루나 ㅇ
Borgholm = 보르그홀름 v
Strängnäs = 스트렝네스 v
Sveg = 스베그 v
맨날 꺼무위키 보고 작업하다가 해보니까 번역다운 번역 한거같아서 나름 재미있었고, 한국어 정발명이 외래어 표기법에 맞지 않는 경우도 있다는걸 알게됨
( i.e. Jönköping = 옌셰핑 은 문5에도 있는 도시명인데 꺼무에는 이엔최핑이라 되있음 🤦♂️ )
그래도 돌발적인 행동은 안해줬으면 좋겠다... 머리터지는줄
* Update Indonesian.properties (#4613)
* Update Indonesian.properties
* Update Indonesian.properties
* Update Indonesian.properties
* Update Italian.properties (#4610)
* Update Russian.properties (#4608)
* Update Russian.properties
* Update Russian.properties
* Translating more (#4604)
* Translating keys and more
* Translating more
* Update Portuguese.properties
* Translating
* Update Portuguese.properties
* Update Portuguese.properties
* Translating civilizations: China, France and Rome
Translating phrases and cities from China, France and Rome.
* Translating the United States and Japan
* Translating Indian and German civilizations
Translating what is missing from the Indian and German civilizations
* Update Portuguese.properties
* Update Portuguese.properties
* Update Portuguese.properties
* Update Portuguese.properties
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.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: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
* Deprecate "Can only be built on Coastal tiles"
* Deprecate "Cannot be built on bonus resource"
* Deprecate "Can only be built on Coastal tiles" - bump 'as of'
* cellular automata for mountains and hills
* cellular automata for mountains and hills
* tweaks
* spawn location algorithm
* consolation prizes
* improve city state spawns
* AI settle in place if possible
* make heightmap generation mod agnostic
* 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
* Update translationFileWriter to include strings from new json files
* Fix promotions with multiple uniques not getting translated
* Add missing translatable strings (thanks to DuffLagerleff for finding these)
* 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
* Update Ukrainian.properties (#4550)
* Update Korean.properties (#4544)
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Simplified_Chinese.properties (#4543)
* Update Czech.properties (#4540)
* Update Czech.properties
new strings, some old tweaked for better gramar
* Update Czech.properties
tweaked word form to beter fit to usage
* Updated Swedish Translation (#4539)
* Updated Swedish Translation
Translated the last lines that needed to be translated for the Swedish translation to be complete.
* Updated 2 lines with advice from SimonCeder
* Refactor New game screen (#4538)
* Update Russian.properties (#4537)
* Update Russian.properties
* Update Russian.properties
* Update German translation (#4536)
* Refactor Diplomacy,Trade,Nations (#4535)
* Refactor Nation Picker (#4534)
* Update Indonesian.properties (#4562)
* 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
* Update Indonesian.properties
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
* Minor things
* Added a few follower beliefs
* Implemented follower beliefs when founding a religion
* Added missing follower beliefs as much as possible
* Religion screen now scrolls correctly
* Buttons for chosen religions are now disabled instead of removed, idea couresty to someTroglodyte
* Implemented requested changes
* 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
* Fixed crashes on loading save games with religion
* Added missing credit
* Religious cities now show religion icons in the city button
* Add icons for religions
* You can now found beliefs, with snazzy icons!
* Fixed bug which made prophets impossible to generate
* Added missing translatable strings
* Fixed translation tests properly
* Implemented requested changes
* Implemented part of the requested changes
* Removed SplitPane in favor of Table
* Removed unused code
* Capped the amount of foundable religions to the amount of religions
* Update Simplified_Chinese.properties (#4486)
* Update Czech.properties (#4482)
* Translating new Civilopedia entries
* More Civilopedia
* Civilopedia again
* Almost done...
* Finally done :)
* Update German translation (#4481)
* Update German translation
* Update German translation
* Update German translation
* Consistency of Great Person
* Update Swedish.properties (#4477)
* Translating more (#4474)
* Adjusting the accent
I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.
* Translating more stuff
* Translating more
Translating Babylonian and Greek names.
* Translating 2 more civilizations
Translating Egypt and England
* Update Russian.properties (#4472)
* Update Russian.properties
* Update Russian.properties
* Update Russian.properties
* Update Indonesian.properties (#4468)
* Update Italian.properties (#4466)
* Update Italian.properties
* Update Italian.properties
* Update Korean.properties (#4489)
* Resolved#4484 - civs with no cities can no longer pick policies
* Update Korean.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@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: Samsaek the Calico <saud2410@naver.com>
* Update Simplified_Chinese.properties (#4456)
* Update Indonesian.properties (#4455)
* Update Indonesian.properties
* Update Indonesian.properties
* Update Italian.properties (#4445)
* Laid some groundwork for implementing further religions (#4444)
* Laid some groundwork for implementing further religions
* Fixed duplication of Religion object
* Update Korean.properties (#4443)
* Update Korean.properties
* Update Korean.properties
* Update Spanish translations fase 1 (#4440)
* Update Spanish translations fase 1
DO NOT merge this until I have finnished it. I run out of time today.
* Update Spanish.properties
* Update Czech.properties (#4437)
* Update Czech.properties
many new (and old) strings translated
* Update Czech.properties
tweaked some newly translated strings
* huns and netherlands strings
* Update Swedish.properties (#4436)
Back up to 100%
Also some tweaks:
Ändrade ett par enheter för att få realegenus (en/den) på så många som möjligt
t ex Pansarskepp -> Pansarbåt (historiskt korrekt benämning, även Monitor är tänkbart)
Man kan överväga även t ex Infanteri -> Infanterist, finns åsikter?
* Update German translation (#4434)
* Adjusting the accent (#4426)
I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@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: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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: batatasmor <75855494+batatasmor@users.noreply.github.com>
* Added all remaining pantheons
* AI now choose pantheons, AI no longer tries to get mutually exclusive policies
* I don't know why this was changed
* Implemented requested changes
* City States now give gold when met
* City States can now receive different amounts of gold, and the amount of influence gained from gifts follows the base game
* Implemented requested changes
* Fixed tests
* Add a very simple display for the religion in a city
* Added missing credits for shrine
* Added Great Prophet unit
* Great prophets can now be generated using faith
* Great Prophets can now construct holy sites
* Great Prophets can now spread their religion to friendly cities
* Holy site can only be constructed if the great prophet hasn't spread religion yet
* Added missing translation string
* Fixed more translation problems
* Implemented requested changes
In the tutorials part, I am not sure if all those emojis are different or not, I can not tell. So please, check that and if you can correct it if you can.
* Added the nation of the Netherlands
* Added Sea Beggar, Dutch unique unit
* Added polder improvement, Dutch unique improvement
* Added national ability
* Fixed Air Targetting not having icon
* Fixed the huns not having battering ram unique unit
* Plundering with multiple levels of coastal raider no longer creates multiple notifications
* Implemented requested changes
* 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
* 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
* 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
* 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
* 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>
* Added a few simple beliefs for testing
* Moved CityReligion to its own file
* Created a picker screen for choosing pantheons
* Pantheon uniques are now calculated only for cities with the specific pantheon
* Added all the pantheon beliefs that can easily be added and commments for the ones still missing
* Games only have religion if either the user specifically asked for it, or uses a mod with religion
* Implemented requested changes
* Fixed bugs where nukes don't work due to capitilzation issues
* Renamed existing translations
* Fixed crash happening when nuking tiles without an owner
* Added notifications to attacker for civs that have declared war as a result of the nuke dropping
* Changed some interception-related uniques
- "Can not be intercepted" -> "Cannot be intercepted"
This really irked me, and the new version is also how it is written
in the wiki.
- "Reduces damage taken from interception by 50%" ->
"Damage taken from interception reduced by [50]%"
* Added "Cannot be carried by [unitFilter] units" unique
* Added an icon for Stealth
* Added Stealth technology and the Stealth Bomber
* Possibly fixed incorrect rounding for interception damage bonus
* Various code style changes
* Made Stealth Bomber interceptable, but with 100% damage reduction
* Implemented Nuclear Submarine and Missile Cruiser units
* Information Era -> Atomic Era; Future Era -> Information Era, conform G&K
* Fixed deprecated uniques still working
* Implemented requested changes
* Fix some problems (wouldnt merge lol) (#4256)
* many new strings translated (#4255)
* Update Italian.properties (#4251)
typo
* Update Korean.properties (#4250)
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Spanish.properties (#4248)
* Russian Translation (#4244)
Translated new lines and fixed typo
* Update Italian.properties (#4240)
* Update German.properties (#4263)
* Update German.properties
* Update German.properties
* add edits (#4261)
This was just some additions. There are random apostrophes that end up quoting large chunks of text until a new apostrophe is found. I don't know if this can be a problem for the technical part but for now, is just a minor pain when translating because of lack of auto-complete.
* Revert "add edits (#4261)" (#4264)
This reverts commit 980ca313fa.
Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: end <72604018+laok233@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Rafael 'Fig' Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
* Generalized building of improvements
* Readded support for the deprecated unique "Can build improvements on tiles"
* Small code quality changes
* Implemented requested chagnes
* Added the addPopulation() and setPopulation() functions to add population to cities and automatically reassign them
* Added the Telecommunications tech
* Added the CN tower
* Implemented Bomb Shelter
* Added icons for new buildings
* Implemented requsted changes
* Improved nukes
* Fixed build error (probably)
* Implemented reocmmended changes, fixed some other stuff, the usual
* Implemented requested changes
* Fixed Tech connections
* Fixed nuclear missiles and guided missiles being interceptable
* Missiles are no longer air units. This is, as they cannot be stationed on carriers and cannot be intercepted.
* Reordered units
Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column
* Added Nuclear Fusion technology and GDR
* Fixed open terrain bonus working in rough terrain
Fixed#4139 - The open terrain combat bonus no longer works in rough
terrain.
Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.
* Minor simplification
* Replaced "rough" with "Rough terrain" unique
* Empty commit to re-run the build checks
* Created Patronage policy branch -- draft
* Patronage branch is now functional
* Added images for the policies
* Temporarily bandaged backwards compatability, added incompatabilities
* Implemented recommended changes
* Fixed acquirement of 'patronage complete' not being saved
* Reverted change I was unhappy with
* Implemented requested changes
* Fixed build errors
* Implemented recommended changes
* City States can now give any great person, including unique ones, conform Ravignirs tests
* Corrected building construction costs
Full changelog:
(Changes marked with a "!" deviate from the surrounding pattern)
Lighthouse 100 -> 75 (!)
Great Lighthouse 250 -> 185 (!)
Temple 120 -> 100
Burial Tomb 120 -> 100
Mud Pyramid Mosque 120 -> 100
Market 120 -> 100
Bazaar 120 -> 100
Mint 120 -> 100
Aqueduct 120 -> 100
The Oracle 300 -> 250
Petra 300 -> 250
Great Wall 300 -> 250
Monastery 160 -> 120
Workshop 160 -> 120
Forge 160 -> 120
Hagia Sophia 400 -> 300
Chichen Itza 400 -> 300
Machu Picchu 400 -> 300
Harbor 200 -> 120 (!)
University 200 -> 160
Wat 200 -> 160
Castle 200 -> 160
Mughal Fort 200 -> 150 (!)
Armory 200 -> 160
Angkor Wat 500 -> 400
Alhambra 500 -> 400
Notre Dame 500 -> 400
Observatory 250 -> 200
Opera House 250 -> 200
Bank 250 -> 200
Satrap's Court 250 -> 200
Hanse 250 -> 200
Theatre 250 -> 200
Sistine Chapel 625 -> 500
Forbidden Palace 625 -> 500
L. Tower of Pisa 625 -> 500
Himeji Castle 625 -> 500
Seaport 300 -> 250
Windmill 300 -> 250
Taj Mahal 750 -> 625
Porcelain Tower 750 -> 625
Museum 360 -> 300
Public School 360 -> 300
Arsenal 360 -> 300
Military Academy 360 -> 300
Louvre 920 -> 750
Big Ben 920 -> 750
Brandenburg Gate 920 -> 750
Hospital 500 -> 360
Stock Exchange 500 -> 360
Eiffel Tower 1250 -> 1060
Statue of Liberty 1250 -> 1060
Kremlin 1250 -> 625 (!)
Neuschwanstein 1250 -> 1060
Nuclear Plant 750 -> 500
Solar Plant 750 -> 500
Sydney Opera House 2000 -> 1250
Manhattan Project 2000 -> 750 (!)
Apollo Program 1500 -> 750 (!)
* Corrected Hanging Gardens
10 food -> 6 food.
Now provides a free Garden.
* Corrected Statue of Liberty
Now provides a free social policy.
* Corrected Angkor Wat
Now unlocked with Education instead of Chivalry.
* Corrected Cristo Redentor
Now unlocked with Plastics instead of Flight.
* Corrected Kremlin
No longer gives 12 city strength (this was removed in G&K).
* Corrected Manhattan Project
Now unlocked with Atomic Theory instead of Nuclear Fission".
This does buff nuclear missiles quite a bit, since you no longer need
Nuclear Fission, but that's only because the last part of the tech tree
is very incomplete, and provides nuclear missiles too early. We need to
start correcting it somewhere.
* Corrected Leaning Tower of Pisa
Now provides +25% great person generation in all cities.
* Corrected Kremlin some more
Now unlocked with Metallurgy instead of Railroad.
* Fixed Arsenal production cost correction
It is now actually 300, as was stated in the previous changelog.
* Reordered many buildings
Reordered many buildings to conform to the tech tree order.
In order of priority:
left to right, top to bottom, buildings to national wonders to wonders.
* Corrected production cost for Colossus
Colossus was wrongly ordered in the json file, so its production cost
was unknowingly changed from 300 to 250 (this was not noted in the
previous changelog), however, it should be even lower: 185. This commit
corrects this.
tl;dr 250 -> 185
* Corrected Hermitage
Now unlocked with Architecture instead of Archaeology.
* Corrected National Treasury
Now unlocked with Guilds instead of Currency.
* Reverted incorrect corrections
Kremlin:
Provides 12 city strength again.
Statue of Liberty:
No longer provides a free social policy.
* did some Turkish translations (#4175)
i mostly did some polidhing in translations and added translations to much of simpler stuff that needed translations, but the civilopedia and civilizations are mostly not done, also i couldnt figure out how to fix typos and other stuff in mining
* French translation: fix typos and translate some (#4167)
* French translation: fix typos and translate some
* French translation: Fix typo and correct mistake
* Update Russian.properties (#4166)
* Update Russian.properties
* Update Russian.properties
* Update Italian.properties (#4164)
* Update Italian.properties
* Update Italian.properties
* Update Czech.properties (#4183)
* Update Russian.properties (#4182)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
A previous commit changed the atlas textures to use nearest filtering,
making the game look significantly jaggier. This commit makes them use
mipmap filtering again.
Using mipmaps with atlas textures can cause the edges of the images to
bleed into each other, an effect that was indeed present before the
filtering was changed to nearest. This commit adds some additional
padding and sets the padding to duplicate the edges of images to
mitigate this effect. Note that altough this makes some of the atlas
images look very strange, the in-game result is improved.
* Added the Utopia Project for the culture victory; AI will now build it
* Forgot to credit the icon
* Fixed a few minor issues
* Improved code quality; added translatable notifications
* Fixed mistakes; improved quality
* Changed a label
* Revert a small change which is no longer necessary
* Reverted the revert of a small change which is no longer necessary
* Made requsted changes
* Updated Tradition branch to G&K
* Small performance boost for calcualting maintenance; fix crash on next turn
* Fixed a bug where maintenance-free buildings would still cost maintenance
* Simplified some code
* I am unable to read
* Fixed a few broken uniques, including #4109
* Implemented requested changes
* Updated Liberty branch to G&K, improved modularity of uniques
* Updated meritocracy to only affect non-occupied cities
* Implemented requsted changes
* Updated some unit obsoletions
* Added a missing unit upgrade
* Added some missing commas in units.json
* Replaced Military Base icon with a simpler one
The original had a bit too much detail for the size at which it is
shown.
* Enabled Arsenal and added a new Armory icon
The old icon for Armory was much more appropriate for Arsenal, so I
added a new icon for Armory instead.
* Enabled Military Base and added an icon for it
* Enabled Petra and added an icon for it
* Enabled Composite Bowman and added an icon for it
* Enabled Mobile SAM and added an icon for it
* Enabled Jet Fighter
* Made Machine Gun upgrade to Mechanized Infantry
* Removed "Will be added in G&K" comments
Since we are now targeting G&K, these comments are no longer required.
* Fixed Aluminum/Aluminium inconsistencies
* Map Generation Seedable
* Added Seed editable field in MapParametersTable
Previously, using the same set of parameters, one could not get the same map twice (i.e. negligible probability for it to happen). With this commit players can specify, alongside the usual map parameters, a long integer used to seed the RNG and get replicable results.
* Fixed Natural Wonder Spawn was not using MapGenerationRandomness hence giving not reproducible maps
* Translation strings
* * Renamed Continents to Two Continents
* Created Four Continents map size
It spawns a vertical and a horizontal ocean to split the map in 4 major continents. Works properly on all sizes and with world wrap
* Fixed Pangea extending to boundaries in rectangular maps
* Unified Pangea for rectangular and hexagonal maps
* Fixed Default map type bias on Rectangular maps. Also removed "pangea effect" on Default: land can spawn with the same probability in the whole map.
* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
* Refund wasted production as gold
Any wasted production, from for instance a partially completed wonder or
obsolete units, will now be refunded as gold (in a 1:1 ratio).
We update both at the start and end of the user turn. Updating at the
start to account for wonders completed after our previous turn and
updating at the end to account for obsolete buildings/units as a
consequence of our own turn.
When obsolete units get replaced by their upgraded version (as in civ 5)
this code should probably be updated.
* Implement wonder refund and obsolete unit upgrade
If a wonder is built somewhere else but the user has production in this
wonder, the production will be refunded as gold in a 1:1 ratio. A
notification will be shown to indicate this. This reflects the behaviour
in Civ 5.
If a unit becomes obsolete and an upgrade is available, the production
put into this unit will now be transferred to the upgraded version. If
the unit is queued, the queued unit will also be changed to the new
version and the user will be notified via notification.
* Shorten notification messages
* Update alerts: been obsolete -> become obsolete
* Added an icon for unit swapping
* Implemented unit swapping
In the original Civ V, unit swapping is a supported mechanic.
If you try to move a unit to a tile with another of your units, and both
units have enough movement points left to reach the other's tile, they
will swap places. They will consume only the movement points needed to
reach the other's tile in this way.
This change implements unit swapping for Unciv.
To prevent all kinds of problems from arising with automatic unit
movement, unit swapping can only be done explicitly. This also means
that it can only be done if the unit-swap movement is possible in a
single turn. It is however not limited to adjacent units.
Because Unciv supports mobile devices, there is in general no separation
between a unit-selection click and a movement click. Clicking on another
unit while a unit is selected simply selects that other unit. Because we
do not want to make it more difficult to select other units in this way,
unit swapping is implemented as a separate "movement mode": to toggle
this mode on or off, the new unit action "Swap units" must be used.
Newly selected units still always start in the normal movement mode.
In the unit-swap movement mode, the possible swap tiles are highlighted
instead of the possible movement and attack tiles. Clicking on a
highlighted tile will display a swap button, similar to the movement
button, or instantly perform the swap if single-click-movement is
enabled. This new behavior overrides the selection of the unit on the
target tile: if the user wants to select the unit instead, they have to
exit the unit-swapping mode first.
The swapping code is robust, it can even handle swaps that involve a
paradrop!
An option to always swap-move when an eligible tile is clicked instead
of requiring the unit-swapping mode, similar to the existing
single-click-movement option, could perhaps be added in later.
* Added some comments to existing movement functions
* Fixed a silly mistake
Fixed a silly mistake which caused the unit-swapping eligibility
detection to sometimes remove units from the world.
* Removed some unneeded code
* Fixed movement buttons not showing with world wrap
Fixed a bug where the "move here" and "swap with" buttons would only
show on the leftmost copy of the world when world wrap was enabled.
* Made the swap action only display if usable
Made the unit swapping button only display if there is at least one
possible swap movement.
* Added the paratrooper unit
* Reverted accidental reordering of action table
* Fixed Github build errors
* Hopefully actually fixed the build errors
* Added a Dutch translation, finally fixing the error
* Paratroopers can no longer actually paradrop on a tile they shouldn't be able to paradrop onto
* Removed double update action
* Add global alerts for certain constructions
In the original game, certain constructions alert all players upon
their completion. This commit introduces a new unique for this behavior
and adds this unique to the relevant constructions.
The code that implements the new unique is placed in
Building.postBuildEvent, so it can only be activated by buildings. If
other kinds of constructions require a global alert as well, the code
could be moved to CityConstructions.constructionComplete.
* Removed redundant line in template.properties
* Moved global alert logic to CityConstructions
Moved the implementation of "Triggers a global alert upon completion"
from Building.postBuildEvent to CityConstructions.constructionComplete,
close to the similar Wonder notification logic.
* Technology and construction bars no longer extend past their maximum
* Fixed compile errors
* actually fixed the issue
* Added the marine unit
* Moved amphibious promotion effect to unique
* Added icons for Amphibious promotion and Marine unit
* aaah
* Update Turkish.properties (#3964)
* Update Spanish.properties (#3963)
* Update Indonesian.properties (#3960)
* Update Indonesian.properties
* Update Indonesian.properties
* Update Italian.properties (#3956)
* Update Spanish.properties (#3970)
* Fix spaceship part production boosts (#3953)
Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.
The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.
The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.
* Update Spanish.properties
I had to reopen a new pull request due to conflicts the other had.
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
Co-authored-by: Nazım Gediz Aydındoğmuş <nga@hotmail.com.tr>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.
The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.
The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.
