Commit Graph

592 Commits

Author SHA1 Message Date
Yair Morgenstern
cd8b68253b All units can be automated
Modders can choose which units get it as a primary action
2023-03-13 16:55:50 +02:00
Yair Morgenstern
22da4b29c8 4.5.6 2023-03-11 20:37:35 +02:00
SomeTroglodyte
793d3387bf
Custom key bindings (#8802)
* Configurable key bindings - linting

* Configurable key bindings - move keyboardAvailable

* Configurable key bindings - separate KeyShortcutDispatcher

* Configurable key bindings - framework

* Configurable key bindings - save and load

* Configurable key bindings - activation

* Configurable key bindings - UI

* Configurable key bindings - more linting

* Configurable key bindings - Separate SettingsSelect

* Configurable key bindings - translation tested

* Configurable key bindings - disclaimer

* Configurable key bindings - disclaimer
2023-03-11 20:12:00 +02:00
Yair Morgenstern
d3c084f89f Added 'additional times' to limited actions 2023-03-05 20:03:54 +02:00
Yair Morgenstern
8c24926476 Modding: global alert available as triggerable for all objects 2023-03-05 12:53:02 +02:00
SomeTroglodyte
c40b6159df
Better Religion info and some moddability (#8807)
* Make maximum number of religions moddable

* Explain remaining religion count in Empire Overview
2023-03-04 19:20:23 +02:00
Yair Morgenstern
253c669ba9 Added 'after which this unit is consumed' for units whose only purpose is limited actions 2023-03-03 16:37:11 +02:00
Yair Morgenstern
608e0dfb71 Added limited usage for actions! 2023-03-03 14:47:50 +02:00
Yair Morgenstern
c3a4a18bba Replace unit action for timed golden ages with a generic triggered unique
Triggered uniques display side effects
2023-03-03 14:13:00 +02:00
Yair Morgenstern
06fa2c2378 Added 'for [amount] movement' unit action modifier 2023-03-02 21:02:34 +02:00
Yair Morgenstern
5e85c3ca72 "by consuming this unit" is better 2023-03-01 16:35:06 +02:00
Yair Morgenstern
ae501c3750 'create improvement' action, <consuming this unit> and <as an action> modifiers 2023-03-01 16:09:44 +02:00
Yair Morgenstern
66faeb0d15 Preparation for unit action modifiers 2023-03-01 15:26:54 +02:00
SomeTroglodyte
3d84297da1
Better control over debug messages (#8748)
* Better control over debug messages

* Better control over debug messages
2023-02-27 11:13:34 +02:00
Yair Morgenstern
44399e770c Added triggered uniques to grant specific tech / policy 2023-02-27 10:58:08 +02:00
Yair Morgenstern
8361d68452 Added 'upon ending turn in tile' unit trigger 2023-02-26 23:41:09 +02:00
Yair Morgenstern
86a63ac578 'upon conquering' is a condition not a triggered unique 2023-02-26 22:33:00 +02:00
Yair Morgenstern
c1df32b4e7 Add new uniques to wiki 2023-02-26 22:15:15 +02:00
Yair Morgenstern
090c421f9b Introduced "upon defeating [unitFilter] unit" trigger 2023-02-26 20:31:13 +02:00
Yair Morgenstern
ad9942c532 4.5.0 2023-02-25 21:03:52 +02:00
Leonard Günther
a3f511efd2
Added password authentication as server feature (#8716)
* Added authenticate and setPassword

* Added AuthPopup

* Added auth endpoint to UncivServer

* Fixed merge confict

* Added close button to AuthPopup

+ Fixed crash if no server is available

* Added entries to template properties

* Fixed setting password does not work

if authentication is required

+ Added server check on game startup in case the server has changed its feature set

* Added support for different passwords

on different servers

+ Cleanup for MultiplayerTab

* Added current password as hint

+ removed character hiding in auth popup
+ added popup to indicate auth success on connection check
2023-02-25 20:42:36 +02:00
SomeTroglodyte
5d80f50d93
Show UnitTypes in Civilopedia (#8729)
* Show UnitTypes in Civilopedia

* Show UnitTypes in Civilopedia - polish
2023-02-25 20:40:59 +02:00
Yair Morgenstern
3278cbc904 4.4.19 2023-02-23 23:11:30 +02:00
SomeTroglodyte
5d07fd981b
Allow filters in the ModOptions "ToRemove" lists (#8730)
* Allow "*" wildcard in the ModOptions "ToRemove" lists

* Allow filters in the ModOptions "ToRemove" lists
2023-02-23 22:40:47 +02:00
vegeta1k95
a31e74dee2 Add "Custom Fonts" section to mod docs 2023-02-23 00:26:37 +01:00
Yair Morgenstern
06292bec64 Fix unique parameter type 2023-02-22 09:54:10 +02:00
Yair Morgenstern
7b1a5e296c modding: Added "upon gaining a [unitFilter] unit" trigger condition 2023-02-22 09:32:50 +02:00
Yair Morgenstern
a29e22f39b Added documentation for installing on mac with macport 2023-02-19 16:55:58 +02:00
Yair Morgenstern
c6b888e6ed Fix android build 2023-02-19 16:35:20 +02:00
vegeta1k95
a8a458ab48
Blockade mechanics (#8654)
* Fix centering of unit HP bar

* Blockade mechanics: land tiles

* Blockade mechanics: water tiles

* Don't blockade water tile if it has friendly military unit

* Blockade mechanics: cities

* Added tile/city blockade tutorials. Added city blockade status icon.

---------

Co-authored-by: vegeta1k95 <vfylfhby>
2023-02-14 22:13:25 +02:00
Yair Morgenstern
e156a08663 Removed docs section for translated images - see #8479 2023-01-31 23:16:21 +02:00
Yair Morgenstern
2e5d1bf591 Resolved #8435 - rivers remain visible after founding city 2023-01-22 19:33:27 +02:00
Yair Morgenstern
39e88d3a1a Added "upon discovering a Natural Wonder" trigger - @letstalkaboutdune 2023-01-22 19:05:17 +02:00
Yair Morgenstern
4beaaadfc8 Added conditionals for above and below resource amounts 2023-01-21 23:36:53 +02:00
Yair Morgenstern
be161d8839 Better docs for Trigger Conditions 2023-01-16 23:13:08 +02:00
Yair Morgenstern
509d179d19 War -> war with major civ 2023-01-16 23:11:17 +02:00
Yair Morgenstern
a045114dc6 Added trigger conditional for entering era 2023-01-16 22:28:42 +02:00
Yair Morgenstern
f89c2330aa Conditional triggers now work with timed uniques 2023-01-16 22:03:17 +02:00
Yair Morgenstern
358f01079c Added 'upon adopting policy' trigger 2023-01-16 21:20:14 +02:00
Yair Morgenstern
2593c35e30 Added 'upon declaring war' trigger 2023-01-16 21:13:40 +02:00
Yair Morgenstern
cbd7f7ac5c Added trigger conditions framework! 2023-01-16 21:05:59 +02:00
Yair Morgenstern
f6ddd71504 RTL language support in very first paragraph of translation docs, so as not to waste people's time 2023-01-16 15:32:40 +02:00
Yair Morgenstern
879a5b230f Resolved #8387 - Fixed Reliquary belief
Got rid of multiple uniques with the same text
2023-01-16 13:05:11 +02:00
Yair Morgenstern
fe1d258c05 4.4.1 2023-01-15 23:43:28 +02:00
Yair Morgenstern
b5281e20c9 4.4.0 2023-01-14 21:27:11 +02:00
itanasi
22f9936a34
Add Transform Action for mods (#8120)
* Initial version of code

* Enable cost=0 for buttons

* Add Conditional to Transform

* Fix translation file

* Add icon
Allow other Conditionals

* Updated icon

* Add credit

* switch hotkey

* Fix icon

* Remove Conditional Costs

* Remove vestigal Stats costs for Transform

* Minor cleanup
2023-01-14 20:43:48 +02:00
vegeta1k95
0006aaef55
Modding: allow custom ResourcePortraits (#8330)
* Modding: allow custom ResourcePortraits

* Modding: big generification of the icons/portraits mechanism

* Resolve conflict

* Fix background fallback, remove dimming of improvement icons

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-09 21:03:00 +02:00
Yair Morgenstern
37cfc12a64 4.3.18 2023-01-08 15:11:45 +02:00
vegeta1k95
4d8f056df7
Rework of PromotionPicker UI (#8325)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-08 11:45:51 +02:00
Yair Morgenstern
fe6c19532a UI: Better unit table 2023-01-07 22:12:31 +02:00
vegeta1k95
0301cc89d4
Modding: allow for custom TechPortraits (#8300)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-03 19:48:08 +02:00
Yair Morgenstern
d20f8a53f8 Validate unique parameters for mods 2023-01-01 15:55:41 +02:00
letstalkaboutdune
5b2997df46
Added credits for trailer (#8278)
* Added credits for trailer

* Corrected typo
2022-12-31 20:05:41 +02:00
letstalkaboutdune
b5a021cc16
SFX Update - Arrow, Crossbow (New), Metal Hit (#8262)
* Arrow, Crossbow, Metal Hit sound updates

Sourced from pixabay.com
https://pixabay.com/service/license/

* Update Credits.md
2022-12-29 23:20:33 +02:00
vegeta1k95
a751c8e3dc
Fixed TechButton progress-bar padding, less rounded corners for buttons. (#8260)
* Fixed TechButton progress-bar padding, less rounded corners for buttons.

* Removed extra padding on the right

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-29 13:52:52 +02:00
vegeta1k95
8fd561de50
Added WLTKD status icon (#8257)
* Added WTLKD status icon

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-29 13:52:35 +02:00
vegeta1k95
be573f2b76
Big rework of City plates (#8239)
* Big rework of City plates

* New city plates design, new status icons

* A little bit of padding for construction icon

* Better border for defence counter

* Better border for defence counter

* Solid colored icons

* Solid colored icons

* Credits

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-28 17:32:26 +02:00
Yair Morgenstern
0c58488e42 4.3.12 2022-12-24 20:02:11 +02:00
vegeta1k95
2bc91f1216
Rework of City Screen: new Great People list + misc changes (#8180)
* Rework of City Screen: new Great People list + misc changes

* Added a bit of padding

* Buildings are united under one tabs, GP font icons replaced by tinted UnitIcons

* Fix color of separators

* Big update to "Detailed stats" UI

* Rebuild pngs

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-12-21 11:46:35 +02:00
vegeta1k95
1346eea4ca
Huge update of Technology Picker screen UI (Civ 5), new original icons + misc changes (#8188)
* Huge update of Technology Picker screen UI, new original icons + misc changes

* Fix possible memory leak

* Fix lines Z-Depth, shifted era boundary lines, thicker queue-path lines

* Fix lines Z-Depth more correctly

* Size checks replaced by truncation

* Icons credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-21 11:25:10 +02:00
Yair Morgenstern
6b4da20d85 Fallback image for modded buildings - see #8158 2022-12-18 22:11:56 +02:00
Yair Morgenstern
81f3ecd998 Fallback image for modded techs - see #8158 2022-12-18 22:05:17 +02:00
Yair Morgenstern
cf8e6b39e2 4.3.10 2022-12-18 19:42:45 +02:00
alexban011
09260f4d4d
added mod topics to wiki (#8159) 2022-12-17 18:35:43 +02:00
Yair Morgenstern
0d19bf9cef Better icons for 'next turn' button
@vegeta1k95 sorry about this, but the way this works without resizing is simply not up to the standards of the current UI :/
2022-12-16 11:15:36 +02:00
alexban011
d7c11cc990
added icon for Conduct Trade Mission button (#8125)
* added icon

* rescaled image to 100px
2022-12-15 21:02:45 +02:00
vegeta1k95
a134242487
Units/Buildings can now be given optional Portraits to be displayed instead of flags. (#8107)
* Units can now be given optional Portraits to be displayed everywhere (except world map) instead of unit Flags.

* Add section to wiki for adding Unit Portraits

* Generify portrait functions

* Small nitpicks fixed

* Reverted one change

* Fix docs

* Fix docs

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-11 22:58:11 +02:00
Yair Morgenstern
ff25014a54 Automated screenshots! :D 2022-12-07 21:01:39 +02:00
Philip Keiter
cfedaeb0e3
Update Building-Locally.md (#8081)
Add missing step to restart.
2022-12-03 23:37:53 +02:00
Yair Morgenstern
c9ed9d5d74 modding: Double Happiness from Natural Wonders -> [stats] from every known Natural Wonder 2022-12-02 11:50:11 +02:00
Yair Morgenstern
1eb1976c4e Made yields smaller so heavy yields looks better on tiles 2022-11-28 21:45:56 +02:00
Yair Morgenstern
1b8c98eed3 Resolved #8050 - "Occurs at temperature between [amount] and [amount] and humidity between [amount] and [amount]" now applicable to resources 2022-11-27 20:02:05 +02:00
Leonard Günther
99b6a2254d
Changes to moddable UI (#8055)
* Replaced all occurrences of deprecated NinePatch

function calls

This makes a lot of UI elements already moddable but documentation is still missing

* Added "How to create a UI skin for Unciv" to wiki

* Added image

* Fixed two typos and updated directory image

Old image was missing a folder

* Added clear color to skin config

to support picker screen backgrounds

* Removed deprecated functions in ImageGetter

* Fixed lowercase ui element names

they should always be UpperCamelCase to be consistent

* Added UiElementDocsWriter

to modify the docs for UI elements automatically

* Added default shape to UiElementsDocsWriter.kt

* Revert unintended merge errors

* Rerun file auto generation
2022-11-27 19:14:56 +02:00
Yair Morgenstern
545b4afc5a Generalized "Stats per policies" unique 2022-11-26 21:39:26 +02:00
Yair Morgenstern
c98a36c10f Added before/after X turns conditionals - see #3242 2022-11-07 22:56:58 +02:00
Yair Morgenstern
3e05b875bd Added before/after Pantheon conditionals - see #3242 2022-11-07 22:39:55 +02:00
Yair Morgenstern
b0c84f5eea 4.2.17 2022-11-07 18:20:19 +02:00
Leonard Günther
4522ab4c6b
Added "How to create a UI skin for Unciv" to wiki (#7976)
* Replaced all occurrences of deprecated NinePatch

function calls

This makes a lot of UI elements already moddable but documentation is still missing

* Added "How to create a UI skin for Unciv" to wiki

* Added image

* Fixed two typos and updated directory image

Old image was missing a folder
2022-11-06 22:53:55 +02:00
Yair Morgenstern
f0ad7581bc Resolved crash when mods make 2 techs require each other 2022-10-13 22:55:12 +03:00
Yair Morgenstern
f3b4db9d64 Hopefully resolved ANRs from WorldScreen updates 2022-10-13 21:18:34 +03:00
Yair Morgenstern
34c22009e6
Update Credits.md 2022-10-10 19:54:54 +03:00
Yair Morgenstern
067bd1979a
Resolved #5853 - added aztec icon credits 2022-10-09 12:38:47 +03:00
Yair Morgenstern
2ef0284235 4.2.12 2022-10-05 23:13:32 +03:00
Yair Morgenstern
6ba98c82ac 4.2.11 2022-09-25 16:44:34 +03:00
Matthieu Rigal
496f3fe86e
Update Installing-on-macOS.md (#7833) 2022-09-20 18:21:27 +03:00
nacro711072
4b7238bdef
update doc for mac user launch game. (#7828) 2022-09-20 10:11:49 +03:00
alexban011
d980b0d9ff
Global politics overview screen (#7469)
* getting the data

* finished getting the data

* optimization + separator

* vrtical separators

* more functions

* made it look good

* reverted debug variables

* cleanup

* added icon

* credits

* translations

* removed redundant equalizeColumns

* removed redundant separator

* column headers

* reviews

* removed redundant function

* latest translations

* latest review

* checks 1

* removed space

* removed vars and used DiplomacyManager instead

* combined overview screens

* 2 more translations

* little cleanup and fix
2022-09-19 16:12:24 +03:00
Yair Morgenstern
d5134f84cd 4.2.9 2022-09-15 16:21:23 +03:00
Yair Morgenstern
8606a662c7 Added steam build, let's check it out! 2022-09-15 13:25:47 +03:00
Yair Morgenstern
8fec196db1 Got rid of uppercase C in Unciv in ALL places! 2022-09-12 23:26:28 +03:00
Yair Morgenstern
74d8d79a74 Added Macedonian flag 2022-09-12 21:22:54 +03:00
Yair Morgenstern
04ee2b716e Updated preview images and added guide to doing so 2022-09-12 20:58:27 +03:00
itanasi
00c4d8215c
Update Android SDK settings (#7768)
Able to build with only the Android API 32 and the 32.0.0 SDK tools in Android Studio
2022-09-09 10:07:53 +03:00
Md. Touhidur Rahman
7c1b298a24
Improved ports and updated documentation of UncivServer (#7747)
* Improved ports on UncivServer

See 6315a16d98 (r83109934) for details

* Update UncivServer.kt

* Update Multiplayer.md

* Update Multiplayer.md
2022-09-07 09:48:47 +02:00
Xander Lenstra
313290c994
Added information on chinese translation video to Translation.md (#7743)
* Added information on chines translation video

* Changed requested string
2022-09-05 09:15:26 +03:00
Xander Lenstra
a19fed5d28
Added a screen to move spies between cities (#7665)
* Added a screen to move spies between cities

* Fixed tests

* Reviews

* Avoid labels blinking

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2022-08-28 23:25:14 +03:00
Yair Morgenstern
121bda2833 4.2.5 2022-08-22 21:09:04 +03:00
Leonard Günther
18ef8fc20e
Removed legacy tileset code (#7658)
* 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
2022-08-22 13:02:52 +02:00
Ouaz
90e582a0c3
Add an icon for "Wait" unit action (#7668) 2022-08-16 12:30:37 +02:00
Yair Morgenstern
2b168573e8
Resolved #7666 - updated build documentation to build-tools version 2022-08-15 18:31:03 +03:00
Xander Lenstra
b1727f9360
Fix spies being gained in non espionage games (#7661)
* 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

* No spies gained when espionage is disabled

* Added missing function
2022-08-14 18:37:39 +03:00
Xander Lenstra
202e0bcf47
Basic version of EspionageManger, added a unique to gain spies (#7641)
* 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
2022-08-13 22:45:16 +03:00
Yair Morgenstern
9898789772 4.2.4 2022-08-12 14:36:01 +03:00
Xander Lenstra
44fdf53b05
Added a hidden option for enabling espionage (#7615) 2022-08-06 22:05:44 +03:00
Yair Morgenstern
c738da892c 4.2.0 2022-07-28 09:12:57 +03:00
itanasi
af6ab8e4e5
Add Air Sweep (#7484)
* 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>
2022-07-27 22:16:53 +03:00
SimonCeder
a61c958d03 Merge branch 'automated-ruins' 2022-07-25 22:06:18 +02:00
rhtnejr
bdb13b77ea
Update Mods.md (#7528)
Fixed a typo on line 22: 'I addition' --> 'In addition'
2022-07-25 14:28:18 +03:00
SimonCeder
0e00ec22c6 workers will replace city ruins 2022-07-22 20:53:01 +02:00
Xander Lenstra
986346a127
Added a unique limiting what units can be intercepted (#7488)
* Added a unique limiting what units can be intercepted

* Cleaned up implementation and added stateForConditionals
2022-07-21 09:16:33 +03:00
Yair Morgenstern
d9389b3c4e 4.1.19 2022-07-15 12:04:41 +03:00
OptimizedForDensity
7d7a36acc9
Add more music triggers (#7407)
* Add noted unimplemented music triggers

* Prototype try-civ-specific-then-try-general music function

* Undo previous commit and rename Built to Wonder

* Move music triggers to alert popup
2022-07-15 11:56:26 +03:00
Timo T
83d5d1ab36
Add a simple GDX application to help with developing UI components (#7411)
* Add a simple GDX application to help with developing UI components

* Add UI development docs
2022-07-13 21:58:43 +03:00
Yair Morgenstern
fe2d3243fc 4.1.16 2022-07-05 22:12:27 +03:00
OptimizedForDensity
f0a4922711
Update unit image docs (#7358)
* Update unit image docs

* Capitalization
2022-07-03 10:11:39 +03:00
alexban011
8f53262fc4
CityScreen plays a sound when opened (#7163)
* 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
2022-06-22 09:11:03 +03:00
Yair Morgenstern
8d742eef38 4.1.12 2022-06-19 21:55:28 +03:00
Azzurite
35c68b47d5 Regenerate atlas & update uniques.md 2022-06-18 23:39:08 +02:00
OptimizedForDensity
c922f134e6
Moddable game speeds (#6856)
* Move GameSpeed definition to JSON files

* Add game speeds civilopedia page
2022-06-18 23:27:46 +02:00
Timo T
378d8da4dd
Add Uncivserver.xyz community server in the wiki (#7200) 2022-06-18 21:44:54 +03:00
heipizhu4
4d9f99fff3
Fix broken links in wiki (#7182) 2022-06-17 21:04:43 +02:00
Yair Morgenstern
e4ab1eabc7
Create Privacy-Policy.md 2022-06-16 21:51:14 +03:00
SomeTroglodyte
e2b7891248
Two new Unit Tests (#7001)
* MapGenerator fixes

* MainMenu Background Map scaled to Screen

* Easter Eggs - Code only

* Easter Eggs - Graphics
2022-06-16 21:07:30 +03:00
Azzurite
ec6b4dc017 Docs: Create actual links 2022-06-13 02:33:10 +02:00
Azzurite
388a4424f5 Add URL example 2022-06-12 21:32:10 +02:00
Azzurite
5506ad2cd4 Fix anchor link 2022-06-12 21:28:09 +02:00
Azzurite
cb479ba4e3 Change heading to match page name 2022-06-12 18:17:47 +02:00
Azzurite
dc16bba983 Add more extensive multiplayer documentation 2022-06-12 12:55:39 +02:00
Timo T
3e6fc0e22a
Add multiplayer turn sound notification (#6995)
* 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
2022-06-10 16:44:29 +03:00
Yair Morgenstern
d795c56d58 4.1.8 2022-06-08 10:30:04 +03:00
Azzurite
23f55a959c Fix wrong default folder name 2022-06-07 20:19:18 +02:00
Yair Morgenstern
8fbcad47a4 4.1.6 2022-06-01 22:54:14 +03:00
Timo T
5a4f1b0903
Allow non-SSL-encrypted HTTP traffic & warn Dropbox users (#7013)
* 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
2022-06-01 22:40:20 +03:00
Joan Josep
a17797a709
Add Catalan translation and provide some strings. (#6992) 2022-05-29 16:50:47 +02:00
OptimizedForDensity
09195d6b62
More UniqueType unit tests and correct some broken uniques in JSON files (#6965)
* Add ruin reward unique check plus fix broken unique
2022-05-29 16:08:15 +02:00
SomeTroglodyte
0f63000ac8
Show required resource for upgrades, rework upgrade logic (#6849)
* Show required resource for upgrades, rework upgrade logic

* Show required resource for upgrades - reviews
2022-05-25 19:35:27 +03:00
Xander Lenstra
3754108391
Added more unit tests for uniques; added missing unique implementations (#6886)
* Added more unit tests for uniques; added missing implementations

* This of course shouldn't go here as there is another function for it

* Stylistic changes

* This generates better unique examples

* Reviews

* Reordered for efficiency

* Reverted improvement percentage bonuses applying to tiles
2022-05-22 13:12:10 +03:00
itanasi
8bcb989d0f
Add more comments on Editor Settings (#6869) 2022-05-19 18:03:15 +03:00
Yair Morgenstern
f464ac2544 4.1.1 2022-05-18 23:03:29 +03:00
Jack Rainy
4986505363
Great General typed uniques and improved moddability (#6818)
* 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>
2022-05-18 00:02:53 +03:00
Xander Lenstra
7079619fe2
Great improvements can again be constructed on forest (#6823)
* 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
2022-05-17 20:04:49 +03:00
Md. Touhidur Rahman
47728afafa
Suggest Temurin Instead of Zulu (#6799) 2022-05-14 23:40:23 +03:00
Yair Morgenstern
e94d109166 4.0.16 2022-05-13 13:00:20 +03:00
SomeTroglodyte
345ca0ec25
Pedia from mainmenu (#6788)
* Make Civilopedia independent of worldScreen or gameInfo

* Make Civilopedia callable from Main Menu

* Era category for Civilopedia

* Era category for Civilopedia - atlas
2022-05-13 12:36:06 +03:00
Jack Rainy
ab82328211
Missing typed uniques for the units - part 2 (#6749)
* Replacements for existing UniqueTypes

* More typed uniques are added

* Migration to the typed uniques

* Minor optimization

* More general approach on UniqueType usage

* Better wording for the UniqueType
2022-05-13 12:34:10 +03:00
Yair Morgenstern
e348a20d2e Extracted policies, religions, nations and promotions to separate png files in order to fit HexaRealm tileset into the main file - see #6756 2022-05-11 16:57:39 +03:00
SomeTroglodyte
addfddb2ec
Update wiki Building-locally.md for AS Chipmunk (#6761) 2022-05-11 16:19:56 +03:00
Xander Lenstra
8fcfbf752b
Improved clarity and moddability of building improvements (#6712)
* 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
2022-05-11 00:35:21 +02:00
Yair Morgenstern
ba96bea556 4.0.14 2022-05-08 21:42:19 +03:00
SomeTroglodyte
4290373cf1
Move UncivServer to own module (and jar) (#6468)
* Move UncivServer to own module (and jar)

* UncivServer isalive logged

* Separate UncivServer - some wiki hints

* Separate UncivServer - how to build UncivServer.jar

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-05-08 21:22:43 +03:00
Jack Rainy
569b51cb27
Missing uniques are added (#6721) 2022-05-08 11:23:55 +02:00
SomeTroglodyte
cec9975b4d
Implement fastlane step 2: Translating (#6643)
* Implement fastlane step 2: Translating

* Placing the Font family Label before the Thread is nicer
2022-05-03 09:16:22 +02:00
MartinP
e279e14fe8
Update Hosting-a-Multiplayer-server.md (#6676)
* Update Hosting-a-Multiplayer-server.md

Added a section for explaining that Android does not like unencrypted traffic to a self-hosted server and that you need to setup a reverse proxy to do that.

* Added hint for MultiplayerFiles folder
2022-05-03 07:52:59 +03:00
Jack Rainy
a938fffb99
Fix of the broken link in the uniques.md (once again) (#6665)
* Fix of misprint (once again)

* Usage of CRLF endings
2022-05-03 07:52:20 +03:00
SomeTroglodyte
f668f65bb3
Update From-code-to-deployment.md (#6638)
Better link for the F-Droid Monitor and a hint what to expect
2022-05-01 00:12:42 +03:00
Yair Morgenstern
940306432f Added new page with map rendering documentation 2022-04-30 23:50:15 +03:00
Yair Morgenstern
3d9a53329e 4.0.10 2022-04-27 09:23:45 +03:00
itanasi
cf761f4a2c
Update to note you need Android 11.0 SDK Platform (#6611)
* Update to note you need Android 11.0 SDK Platform

* Also mention which version of Gradle we're on
2022-04-27 08:19:31 +03:00
Jack Rainy
4ad9d69424
Fix of misprint (#6620) 2022-04-26 22:37:40 +03:00
Xander Lenstra
c985782113
Updated documentation to contain information on victory types (#6615) 2022-04-26 12:31:11 +03:00
Yair Morgenstern
0792d58434 4.0.9 2022-04-24 23:00:59 +03:00
SomeTroglodyte
23c23e5566
Unique docs writer makeover (#6516)
* Comments to 'link' implementation (matchFilter) to UniqueParameterType

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

* Fix two mistakes in UniqueParameterType

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

* Make UnitMovementMemory immutable and without lateinit

* Keep UniqueType comment promise that instances can override parameter types

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

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

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

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

* Change UniqueParameterType.UnitName.docExample to Xander's choice
2022-04-24 22:47:19 +03:00
Xander Lenstra
0a5fc3cf33
Fixed the internal name & parameter of a unique (#6577) 2022-04-20 17:02:31 +03:00
Yair Morgenstern
e1363d92f9 4.0.8 2022-04-19 15:32:45 +03:00
heipizhu4
0dda359f38
Add modding translation instruction to the wiki (#6544)
Add modding translation instruction to translation.md inpired by #6483.
Mostly is copied from @SomeTroglodyte 's comment and add some of my own translation expeirence.
There might be some grammatical mistakes in this doc.
2022-04-15 16:24:51 +03:00
Xander Lenstra
d417556720
Added a unique for attacking when embarked (#6464)
* Added a unique for attacking when embarked

* Implemented requested changes

* Fixed withdrawel probability
2022-03-31 23:06:42 +03:00
Xander Lenstra
72b4d2069e
Typed denmarks unique and generalized it (#6463)
* Typed denmarks unique and generalized it

* Added support for deprecated unique
2022-03-31 23:05:37 +03:00
Yair Morgenstern
6315a16d98 Changed server connection to URL-based to allow connection to uncivserver.xyz 2022-03-31 23:03:14 +03:00
청하늘
279178f103
Fixed the official wiki (#6453)
* Fixed the links in the docs

* Fixed broken tables

Tables without a line break above are not treated as valid tables

* Removed redundant table of contents and formatted some bulleted lists

* The image in Regions.md is now properly displayed

* Standardized list indentation, line spacing, table header rows, and JSON code blocks

* Standardized headers

* Fixed remaining broken links, edited pseudo-footnotes
2022-03-31 09:47:58 +02:00
heipizhu4
c8a88bfc49
Update Hosting_a_Multiplayer_server.md (#6424)
* Update Hosting_a_Multiplayer_server.md

* Update Hosting_a_Multiplayer_server.md
2022-03-28 17:34:08 +03:00
Xander Lenstra
8820ae6dad
Generalized a few nation uniques (#6443)
* Generalized a few nation uniques

* Fixed a bug and made random less random

* Implemented requested changes
2022-03-28 17:33:31 +03:00
SomeTroglodyte
7526114281
Empire overview resources (#6442)
* Empire Overview Resources: Vertical option

* Empire Overview Resources: Extra Info

* Empire Overview Resources: Tweaks

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-28 17:31:19 +03:00
SomeTroglodyte
870659d142
Translation writer conditionals (#6433)
* TranslationFileWriter processes Conditionals

* TranslationFileWriter processes Conditionals - wiki and reprocessed language files
2022-03-28 17:30:16 +03:00
청하늘
84561e7ad4
Add Moddable Policy Priorities (#6390)
* 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)
2022-03-25 17:33:42 +03:00
SomeTroglodyte
0b50715fb3
Improve TranslationFileWriter (less hardcoding, fixes PolicyBranch) (#6421)
* 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)
2022-03-25 17:27:25 +03:00
Yair Morgenstern
9721b38f6b
Update Installing-on-macOS.md 2022-03-23 09:16:44 +02:00
SomeTroglodyte
cf21ade76e
Moddable Ice generation (any impassable feature on Water possible) (#6329)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:08:25 +02:00
Xander Lenstra
367a427436
Unified two uniques into one more descriptive unique (#6380)
* Unified two uniques into one more descriptive unique

* Fixed fallout generation & typo
2022-03-21 21:05:54 +02:00
Xander Lenstra
984c4d9b2d
Unified & generalized a few uniques (#6379)
* 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
2022-03-21 21:05:20 +02:00
Yair Morgenstern
2b1251258c
Unciv server (#6384)
* 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
2022-03-21 21:05:02 +02:00
Xander Lenstra
1df49749f2
Split 6 tiles visible unique into its parts, making it more moddable (#6389)
* Split sight unique into its parts, making it more moddable

* Standardized unique ordering
2022-03-21 21:03:33 +02:00
Yair Morgenstern
f66930ed68 3.19.17 2022-03-13 22:57:55 +02:00
SomeTroglodyte
e4b0afb7e3
Update ModConstants and start its documentation (#6309)
* Update ModConstants

* Update ModConstants - revert Ice, tweak formula

* Update ModConstants - comment on predefined MapSizes
2022-03-13 22:43:23 +02:00
SomeTroglodyte
e5b36f5b9f
Unique units abilities that should be inherited by upgrades (#6304)
* 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
2022-03-10 19:45:32 +02:00
Yair Morgenstern
cb757da900 Wiki improvements 2022-03-09 18:55:46 +02:00
Yair Morgenstern
7f9c6e01f7 Maybe this will add table of contents correctly? 2022-03-09 18:41:26 +02:00
Yair Morgenstern
9b7d5049b3 Readable deployment documentation 2022-03-09 18:37:15 +02:00
Yair Morgenstern
09ee742833 Documentation for the rollout changes, and replacing the old translation method with the new one 2022-03-09 15:03:40 +02:00
Yair Morgenstern
eaf5e453ba 3.19.15 2022-03-08 14:32:01 +02:00
SomeTroglodyte
fb7cb707e0
WLTK decorations (#6253)
* 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
2022-03-05 20:10:03 +02:00
Yair Morgenstern
c9dfd4062d 3.19.13 2022-02-28 19:49:50 +02:00
SomeTroglodyte
651dcff581
Fix Polynesia's Wayfinding (#6238)
* Fix Polynesia's Wayfinding

* Fix mod option to use other unit filters with UnitsMayEnterOcean
2022-02-28 19:41:22 +02:00
Yair Morgenstern
db1304ee35 3.19.12 2022-02-25 13:48:47 +02:00
Yair Morgenstern
6babefd3ae Removed documentation of deprecated uniques, with the autoreplace it's no longer important information 2022-02-24 10:55:16 +02:00
Yair Morgenstern
4b921b6006 Mouseover descriptions for simple unique parameters 2022-02-24 10:52:23 +02:00
Yair Morgenstern
40918db1b0 Unique documentation is collapsable 2022-02-24 10:22:47 +02:00
Yair Morgenstern
6170322a9f Fixed tables in new wiki 2022-02-23 21:14:29 +02:00
Yair Morgenstern
e99ba8cee7 Reorganized wiki 2022-02-23 21:06:32 +02:00
Yair Morgenstern
4d710bcda7 mkdocs test 2022-02-23 19:28:06 +02:00
Yair Morgenstern
1fcc59adb3 More readable unique docs - this is the easiest way I've found to have the uniques themselves stand out 2022-02-23 16:26:07 +02:00
Yair Morgenstern
09089cb60d Added uniques and deprecations for "Requires" and "Unlocked by" uniques - #6165 2022-02-22 16:55:37 +02:00
Yair Morgenstern
1f9c6f39b5
Uniques list is now officially the autogenerated doc 2022-02-22 12:25:07 +02:00
Yair Morgenstern
162ed35255 3.19.11 2022-02-22 11:41:06 +02:00
Yair Morgenstern
13af71e427
Autoupdates to uniques will multiple solutions now replace to the correct one (#6208)
* Autoupdates to uniques will multiple solutions now replace to the correct one

Problem - some deprecated uniques can lead to multiple possibilities of replacements, depending on the parameter type
This lead to replacements in the jsons that were either unparseable entirely or were causing errors, both of which needed to be corrected by hand
We now separate such deprecations into their constituent potential replacement uniques, and try and take only the unique that doesn't cause any errors
Works like a charmander :)

* Conditional name change

* Resolved #6179 - when changing units production due to deprecation, notification no longer counts the same city multiple times if it appears multiple times in its queue
2022-02-22 11:33:07 +02:00
Xander Lenstra
90386bd4e7
Made spaceship parts units instead of buildings (#6203)
* Spaceship parts are units now

* Fixed tests

* Removed commented out lines

* `Spaceship Part` unique can also go on buildings in ods
2022-02-22 11:30:20 +02:00
SomeTroglodyte
5bac71709b
Wiki chapters for context-sensitive music (#6197)
* Wiki chapters for context-sensitive music

* Wiki chapters for context-sensitive music - matched to code
2022-02-21 10:18:46 +02:00
Yair Morgenstern
cd92f66c3a Resolved ANR when copying game data to clipboard 2022-02-20 19:53:19 +02:00
Yair Morgenstern
970e535e62 3.19.10 2022-02-19 19:57:23 +02:00
Yair Morgenstern
82236fe2c8 More uniquetyping 2022-02-18 13:42:23 +02:00
Yair Morgenstern
9d0db40bbf 3.19.9 2022-02-15 11:52:56 +02:00
Yair Morgenstern
86cbe895be
In Civ VI there are certain units available only if a specific building is built, and this was raised as a request by modders as well. (#6160)
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
2022-02-15 11:40:47 +02:00
Yair Morgenstern
97d74a3aef Enabled type check checking for uniques whose deprecation leads to multiple uniques!
This also enables auto-deprecating the Embark+Ocean unique
2022-02-15 11:29:32 +02:00
itanasi
9d1f463310
Add Amphibious penalty to Land attacking into Water and vice versa (#6127)
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

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

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-14 19:21:53 +01:00
Yair Morgenstern
bce65a96f6 More unique typing 2022-02-14 19:05:54 +02:00
Yair Morgenstern
c498426715 3.19.8 2022-02-12 19:25:12 +02:00
Xander Lenstra
f5e9952caf
Add uniques and constants for unit supply (#6146)
* Code readability

* Uniques & constants for unit supply

* Fixed tests

* Added a cityFilter to the 'supply per pop' unique
2022-02-12 19:22:17 +02:00
Yair Morgenstern
e72dcc8b0d
Unified "X is only available under Y conditions" into a single unique (#6133)
* 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
2022-02-12 19:03:30 +02:00
Yair Morgenstern
4fb4722e3a
Arbitrary conditionals can become timed conditionals! (#6134)
* 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
2022-02-12 19:03:11 +02:00
Yair Morgenstern
09ea1a869d 3.19.7 2022-02-09 12:31:08 +02:00
Yair Morgenstern
90d459a9f4
Added conditional for 'first civilization to research a tech' (#6120)
* Techs with these kinds of conditional bonuses exist in Civ IV and VI

* Phrasing can now include long-term benefits :)

* Capitalization

* Triggered uniques now subject to conditionals

* Removed extraneous parameter

* Conditional placement

* Updated uniques.md to better phrasing
2022-02-09 12:21:20 +02:00
Yair Morgenstern
03f7af4360
Typified Obsolete unique, made luxury resources obsoletable (#6129)
* Typified Obsolete unique, made luxury resources obsoletable
Things that were luxuries in the past become uninteresting as time goes on

* Unified obsolescence handling for buildings, improvements and resources

* Obsolete icons have their x's in the right place

* All images &c are done - we have the skeleton of the mod in place!

* Revert "All images &c are done - we have the skeleton of the mod in place!"

This reverts commit 61553c17
2022-02-09 12:18:14 +02:00
Yair Morgenstern
92f0be995d More -/+ unique deprecation fixes 2022-02-07 18:26:20 +02:00
lishaoxia1985
aa11602c9a
Delete unused var in the method getDescription/getShortDescription of the Class Building (#6117) 2022-02-07 10:11:53 +02:00
Yair Morgenstern
4817f49ce9 Flood plains no longer generate on desert hills 2022-02-03 22:59:38 +02:00
Yair Morgenstern
27e383631d A couple more that were in Son of War 2022-02-03 20:16:10 +02:00
Yair Morgenstern
6654acd92e Added more deprecated uniques that I found still existing in LOTR Unciv 2022-02-03 19:46:10 +02:00
Yair Morgenstern
3661ad8d5b
Find all replaceable uniques, generate replacement text, check for compatibility, and replace! (#6105)
* 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
2022-02-03 14:58:17 +02:00
Yair Morgenstern
57ada6aa27 Separated single unique check to a different function, so we can use it individually 2022-02-02 11:11:14 +02:00
Yair Morgenstern
9696fa59f5
Added unique to convert terrain to other terrain if adjacent to something (#6094)
* 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)
2022-02-02 00:59:37 -08:00
Yair Morgenstern
6d3eabde22 Code cleanup 2022-02-01 15:18:23 +02:00
Yair Morgenstern
c3d185cce8 Deprecated old uniques 2022-02-01 10:03:47 +02:00
Xander Lenstra
6bc41a627c
Typed all healing uniques (#6087)
* Typed all healing uniques

* Fixed tests by replacing placeholder texts by types in BeliefAutomation
2022-02-01 09:43:37 +02:00
Xander Lenstra
0951e5d6fd
Fixed a bug where unit discounts would not work (#6081) 2022-02-01 09:43:25 +02:00
Yair Morgenstern
f6e22f60bf
Replace old uniques with *parameter-filled* new uniques! (#6077)
* Since we have the old unique typed, and the new replacement unique typed, we can show modders EXACTLY the new unique they'll need to have!
The final step of this process is having a 'replace old uniques' button which will automagically replace old uniques in a mod with the new versions. This will of course require some manual intervention since it's possible we added some parameters that didn't exist in the old one, but should work well for 95%+ of uniques.

* Also allow "[-amount]" replacements
Better replacements - "[+amount]" etc - where relevant

* Fixed misadded + in unique
2022-02-01 09:42:52 +02:00
Yair Morgenstern
16855f66f6
Gradle build tools upgrade (#6085)
* 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 :)
2022-01-31 15:05:42 +02:00
Yair Morgenstern
0f4449f2e9 3.19.3 2022-01-29 23:40:43 +02:00
Xander Lenstra
a237e7bf82
Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function (#6071)
* Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function

* Fixed two NullPtrExceptions

* Fixed syntax
2022-01-29 23:27:48 +02:00
Md. Touhidur Rahman
1b01ee3802
updated Caravel.png, resolves #5317 (#6069)
* updated Caravel.png, resolves #5317

* Update Credits.md
2022-01-29 18:36:05 +02:00
Yair Morgenstern
fbec7c836e Performance boost for GameInfo.setTransients - speeds up loadGame and nextTurn 2022-01-27 00:28:41 +02:00
will-ca
40d88eb486
Wiki: Details on keeping the wiki files in the repo. (#6050)
* Wiki: Details on keeping the wiki files in the repo.

* Wiki: Missed a word.
2022-01-25 21:53:00 +02:00
will-ca
607d3f521b
Wiki: Mention nation colour layers. (#6049)
* Fix some inter-wiki links.

* Wiki: Mention nation colour layers.

* Wiki: Slight wording change to a page.
2022-01-25 21:52:03 +02:00
Xander Lenstra
6a5d44c3e9
Adressed comments on the happiness PR after it was merged (#6047) 2022-01-24 22:23:26 +00:00
will-ca
1ee1214b35
Wiki: Remove outdated translation info? (#6046) 2022-01-25 00:08:41 +02:00
will-ca
2234b86d3c
Post-Wiki-Migration cleanup. (#6045)
* Fix GH wiki repository link translation.

* Harmonize wiki links to local paths, as used by AS+GHTree and translated on Wiki by UncivBot.
2022-01-25 00:06:19 +02:00
Xander Lenstra
b69507255f
Fixed the problems with the food carry-over unique (#6040) 2022-01-24 19:52:35 +02:00
Xander Lenstra
f6cb2bd0d7
Made unhappiness effects moddable by adding a global uniques json; added revolts when < -20 happiness (#5932)
* 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
2022-01-24 17:19:51 +00:00
Yair Morgenstern
336e190ff0 3.19.1 2022-01-24 11:56:00 +02:00
Xander Lenstra
86edb90e0a
Added a .md file documenting the different parameters used in uniques (#6023)
* Added a .md file documenting the different parameters used in uniques

* I am very good at typing
2022-01-24 11:06:17 +02:00
Xander Lenstra
39ed8bd269
Typed some uniques, added more examples for parameters in unique documentation (#6020)
* 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>
2022-01-24 11:03:40 +02:00
will-ca
a78fa5dc12
Repo wiki resync. — Requires #5854. (#6024)
* Initial Home page

Updated Home (markdown)

Updated Getting Started (markdown)

Created Project structure overview (markdown)

Initial Home page

Updated Project structure overview (markdown)

Updated Project structure overview (markdown)

Created Making a new Civilization (markdown)

Updated Getting Started (markdown)

Updated Home (markdown)

Updated Project structure overview (markdown)

Created From code to deployment (markdown)

Updated Project structure overview (markdown)

Updated Major classes (markdown)

Updated Project structure and major classes (markdown)

Updated Getting Started (markdown)

Updated Project structure and major classes (markdown)

Updated From code to deployment (markdown)

Created Translating (markdown)

Updated Translating (markdown)

Updated Translating (markdown)

Updated Translating (markdown)

Updated Translating (markdown)

Created Coding standards (markdown)

Updated Home (markdown)

Added "why do we clone on NextTurn" explanation

Created Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Translating (markdown)

New translation files location

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Translating (markdown)

Added mod file location on chromebook

Created Scenarios (markdown)

Updated Scenarios (markdown)

Updated Scenarios (markdown)

Updated Scenarios (markdown)

Updated Scenarios (markdown)

Updated Scenarios (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Scenarios (markdown)

Updated Mods (markdown)

Added itch.io release

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Project structure and major classes (markdown)

Updated Mods (markdown)

Created Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Added link to Uniques

Updated Uniques (markdown)

Added 'triggers victory' unique

Updated Making a new Civilization (markdown)

Created Building locally without Android Studio (markdown)

Updated Translating (markdown)

Updated Uniques (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Uniques (markdown)

Added improvement uniques

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

I thought a tutorial on how to create a custom tileset in the first place could not hurt

Moved the sentence to the "Creating a custom tileset" page

Updated Making a new Civilization (markdown)

Updated Mods Making a new Civilization (markdown)

Updated Mods Making a new Civilization (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Destroyed Scenarios (markdown)

Updated Uniques (markdown)

Changed Travis documentation to Github actions documentation

Updated Translating (markdown)

Updated Translating (markdown)

Updated From code to deployment (markdown)

Removed "working on templated rule variants" because we currently don't

Updated Uniques (markdown)

Updated uniques based on everything done during the policy update

Misplaced a unique

Updated Making a new Civilization (markdown)

Updated Making a new Civilization (markdown)

Updated Translating (markdown)

Updated Uniques (markdown)

Removed [pending] messages for PR's that were no longer pending

Added uniques from telecommuncations/advanced balistics

Added all the uniques from my PR's (telecommunicatoins -- shrines); added uniques I deprecated at some point

Updated Uniques (markdown)

Added missing deprecated unique

Added uniques changed in #4292

Updated Uniques (markdown)

Added uniques from #4311 and #4301

Added uniques from #4331

Added Discord webhook message

Created page with basic information

Typo

Made information not incorrect

Added units.json

Manual new lines was a terrible idea

Updated JSON files for mods (markdown)

Added link to JSON files for mods explanation

Added eras.json

capitalization

Added a header

Improved example

Added Buildings.json

hmmm

Doesn't work, sad

Added information on Specialists.json

Updated JSON files for mods (markdown)

Added uniques from #4372

Updated Uniques (markdown)

Updated uniques after #4393

Updated uniques after #4423

Add new and deprecated uniques of #4487, #4459

add wonder images

Fixed mod directory

Updated Uniques (markdown)

Updated uniques after #4530, #4505, #4419

Reworked the passages on tileFilter, terrainFilter and improvementFilter from code inspection

Added a more indept guide on how to install UnCiv on macOS

Updated Uniques (markdown)

Created Credits.md (markdown)

Destroyed Credits.md (markdown)

Added installing from source method

Improve Sound chapter, added Civilopedia text chapter

Added after #4619

Added unitTypes.json

Added beliefs.json

Updated Translating (markdown)

Added eras:unitBaseBuyCost

Added after #4568

Added ruins.json

Added after #4771

Added rudimentary Difficulties.json doc

Added ruin-specfic uniques explanation

Added TOC and Nations

Detailed Techs chapter

Fix 1 line - tech uniques

Added Quests.json

Added ModOptions

Added ModOptions

Added UnitPromotions, structured TOC

Added Policies

Added crosslinks

Fixed broken links

Added TileResources

Added more crosslinks

Small fix resource tile graphix aren't toggle-able

Added TileImprovements

Added Terrains

Updated JSON files for mods (markdown)

Updated Getting Started (markdown)

Updated Getting Started (markdown)

Updated Getting Started (markdown)

Updated JSON files for mods (markdown)

Updated Translating (markdown)

Created Civilization-related JSON files (markdown)

Created Map-related JSON files (markdown)

Double title

Double title

Created Unit-related JSON files (markdown)

Moved sounds

Updated Unit related JSON files (markdown)

Moved Stats

Created Miscellaneous JSON files (markdown)

Removed content that has been moved to separate pages, update TOC

Created _Sidebar (markdown)

Updated Uniques (markdown)

test

Fixed broken links. Apparently the way 'preview' links to pages differs from how it links when you view them on a saved page for some reason

Updated Uniques (markdown)

Fix relative `..` link suddenly leaving the wiki

Updated Miscellaneous JSON files (markdown)

Fix relative links

Fix era links to Units.json

Updated Uniques (markdown)

Updated From code to deployment (markdown)

Added uniques & cityFilters up to #4995

Mass deprecation as per 422607

Fixed broken link to redirect to Unit Uniques in Wiki

Fixed broken link to redirect to Unit Uniques in Wiki table

Updated Uniques (markdown)

Updated Getting Started (markdown)

Updated Uniques (markdown)

Added uniques & filters up to #5094

Removed a deprecated unique

Moved some uniques to better sections, removed an outdated unique

fixed a typo

Updated Uniques (markdown)

eras.json is now required

Removed outdated religion section

Added missing terrain uniques

Added resource uniques

Fixed resource unique link

Added missing unique for tile improvements

Fixed broken link

"Disappearing" translations explained

Updated Home (markdown)

Some atlas info, leader portraits

Created Force rating calculation (markdown)

"Not yet" for Image atlas distribution in mods

Updated uniques after #5259

Added information on conditionals

Updated growth unique

Added conditional support up to #5270

Typo

Escape html tags

Add conditionals to table of contents

Updated _Sidebar (markdown)

Created Audiovisual Mods (markdown)

Audiovisual Mods, move Graphics-only info

Updated Audiovisual Mods (markdown)

Audiovisual Mods - Draft done.

Documented translation method

Updated Translations, mods, and modding freedom in Open Source (markdown)

Fix Typos and Links

New Terrain uniques / 2 sections

Atlas control via multiple Images.x folders is now live

Link to atlas paragraph

startBias clarification

Missing bracket

Added uniques & conditionals up to #5345 (my PR's only)

Updated Force rating calculation (markdown)

Updated Getting Started (markdown => asciidoc)

Undid renaming

Updated Getting Started (asciidoc => markdown)

Added fix for Gradle sync fail

Updated Project structure and major classes (markdown)

Bump Java version from JDK 8 to JDK 11 due to gradle upgrade

Updated uniques & conditionals up to #5618 from my PR's

Created Regions (markdown)

Updated Uniques (markdown)

Updated Uniques (markdown)

Mention docs/uniques.md, emphasized Stat capitalization

* Base wiki state.

* Move wiki files into `/docs/wiki`.

Migrate inter-Markdown links.

Fix pre-existing broken links and anchors.

Standardize repository links for AS linting.

Add wiki footer.

Updated Uniques (markdown)

Updated Mods Making a new Civilization (markdown)

Updated Making a new Civilization (markdown)

Add GH Action for updating wiki.

Play it safer, and don't `push -f`. (Should be the same either way though.)

* Base wiki migration state.

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-02 11:04:38
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-02 11:04:38
Parent: 8fe9385ee644a74b1c3ae3c6d1fa8200cc952a3f (Mention docs/uniques.md, emphasized Stat capitalization)
Child:  7463af24381cc6b94b949b4419841d303af6bb93 (Expanded documentation on constructionFilters)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Added construction filter in the header

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-02 11:06:59
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-02 11:06:59
Parent: 49654ec91dcf565685fd6e4ca966456484c578bd (Added construction filter in the header)
Child:  d48da00f4fa03f61891ec7396a5d0ba9109f44df (Added actual steps I take when releasing a version)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Expanded documentation on constructionFilters

* Author: Yair Morgenstern <yairm210@>  2022-01-02 18:15:10
Committer: Yair Morgenstern <yairm210@>  2022-01-02 18:15:10
Parent: 7463af24381cc6b94b949b4419841d303af6bb93 (Expanded documentation on constructionFilters)
Child:  e7873b135204510742017be455c8b73862bb1d75 (Updated From code to deployment (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Added actual steps I take when releasing a version

* Author: Yair Morgenstern <yairm210@>  2022-01-02 19:54:18
Committer: Yair Morgenstern <yairm210@>  2022-01-02 19:54:18
Parent: d48da00f4fa03f61891ec7396a5d0ba9109f44df (Added actual steps I take when releasing a version)
Child:  84a6eb3a44ed2504f157d55e90cfe2363bb70659 (Added buildingFilter and reworded a bit of generated documentation)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated From code to deployment (markdown)

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-07 11:48:11
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-07 11:48:11
Parent: e7873b135204510742017be455c8b73862bb1d75 (Updated From code to deployment (markdown))
Child:  2a4a0add3728a676012ce51bc3f825c8a5c04c84 (Slightly improved wording)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Added buildingFilter and reworded a bit of generated documentation

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-07 11:51:18
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-07 11:51:18
Parent: 84a6eb3a44ed2504f157d55e90cfe2363bb70659 (Added buildingFilter and reworded a bit of generated documentation)
Child:  d4b91ed84a0989ea5205a77390543d268f7a8b22 (Removed a deprecated field)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Slightly improved wording

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-17 16:59:32
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-17 16:59:32
Parent: 2a4a0add3728a676012ce51bc3f825c8a5c04c84 (Slightly improved wording)
Child:  3cd48433f279bcceaaab4f63c2c48606781c059f (Updated belief type valed values)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Removed a deprecated field

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-17 17:00:14
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-17 17:00:14
Parent: d4b91ed84a0989ea5205a77390543d268f7a8b22 (Removed a deprecated field)
Child:  2f076df75fc5d112146902c88f240a3ebdac8849 (Updated Getting Started (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated belief type valed values

* Author: Yair Morgenstern <yairm210@>  2022-01-22 19:40:43
Committer: Yair Morgenstern <yairm210>  2022-01-22 19:40:43
Parent: 3cd48433f279bcceaaab4f63c2c48606781c059f (Updated belief type valed values)
Child:  5d60469df68e0416ffa815e1366aef191583c451 (Updated Getting Started (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated Getting Started (markdown)

* Author: Yair Morgenstern <yairm210@>  2022-01-22 19:46:03
Committer: Yair Morgenstern <yairm210@>  2022-01-22 19:46:03
Parent: 2f076df75fc5d112146902c88f240a3ebdac8849 (Updated Getting Started (markdown))
Child:  73475b37b28934478dc05830d3aeb61cf8ee6b69 (Updated Getting Started (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated Getting Started (markdown)

* Normalize some links.

* Author: Yair Morgenstern <yairm210@>  2022-01-22 19:54:23
Committer: Yair Morgenstern <yairm210@>  2022-01-22 19:54:23
Parent: 5d60469df68e0416ffa815e1366aef191583c451 (Updated Getting Started (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated Getting Started (markdown)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-01-24 10:58:00 +02:00