Commit Graph

145 Commits

Author SHA1 Message Date
SeventhM
cdc0a4e854
Change the icons from some units/buildings (#10867) 2024-01-04 09:05:48 +02:00
SomeTroglodyte
d3ac2c5ede
(UI) Politics overview diagram: Add legend popup (#10451)
* Refactor Battle damage shadowed Label into reusable WidgetGroup

* Make Politics Overview "Grid header" fixed and some linting

* Add a Legend popup explaining line colors in the Politics Overview Diagram: Click inside

* Missing translation template

* Final decision on background didn't make it in properly

* Remove unused png - those are now in the Construction atlas

* Smaller background image

* Color and shadow choices

* Redo atlas to include both 10505 and this
2023-12-22 09:37:47 +02:00
Oskar Niesen
4282cdb626
Better Frigate and Ship of the Line sound (#10693)
* Added a frigate cannon fire volley sound with crashing

* Changed the frigate and ship of the line to use shipCannonVolley.mp3

* Added proper credits

* Renamed "Volly" to "Volley"
2023-12-10 22:59:12 +02:00
Will Allen
8363078371
Connect roads automation (#10631)
* Start on road connect feature.

* Rough UI and tile highlighting

- Highlight visible tiles for selected unit red
-- Maybe change this to all explored tiles
- Move action firing inside WorldMapHolder
- Set begin and end tiles

* Serialize Vector2 instead of Tile

* Add road icon

* Much better UI handling

- Tile highlights go away after choosing a tile
- Added restrictions to allowed tile destination choices.
    - Explored
    - Land
    - Passable
- Added two-tap button

* Refactor part of `onTileClicked` for readability

* Band-aid fix null pointer error

* Add RoadConnection icon

* Tentatively working connect road feature

* AStar search implementation

* AStar connect road automation

* Fix worker getting stuck in city tiles

* Heuristic should be between tiles

* Add heuristic to road connect, remove maxSize limit

* Fix predicates

* Cancel automation when worker is force moved off path

* Change valid/highlighted tiles to be friendly or neutral

* Put log back the way it was

* Fix behavior when kicked off path

* Worker no longer wastes movement points

* Workers will progress multiple tiles at a time towards the next build destination.

* Respect civs with certain tiles as roads

* Refractor ForceAutomateRoadConnection -> AutomateRoadConnection

* Connect road UI button only shows for units with UniqueType.BuildImprovements

* Connect road UI button only show when road tech is unlocked

* Add wagon sound

* Fix destination icon, add KeyboardBinding to 'c'

* UI highlight connect road path tiles orange

* Downsample wagon.mp3

* Apply migration patch, idiomatic sequence processing

* Add notifications on success and failure

* Extract movement cost function to be reusable

* Refactor road pathfinding into MapPathing.kt

* Make pathing calls more general for future extendability

* Add UI road connection tile path preview

* Keep road path highlighting when routing to a city tile

* Adjust road pathing cost function

* Path includes pillaged roads

* Repair pillaged roads along path

* Valid road path tiles now include all passable tiles (open borders)
2023-12-07 09:15:12 +02:00
SomeTroglodyte
8c0693c998
Latin reboot (#10573)
* Reboot Latin

* Reboot Latin - 002

* Reboot Latin - 003

* Reboot Latin - atlas
2023-11-25 18:22:23 +02:00
SomeTroglodyte
b7823e0b39
"Fixed" Rusyn language (#10561)
* Rusyn.properties

Translation on Rusyn language (ISO-code "rue")

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Add a flag for Rusyn

* LocaleCode for Rusyn to use Ukrainian Collator but still write separate fastlane files

* Update Rusyn language files

* Redo atlas

---------

Co-authored-by: KotDivuar <148721627+KotDivuar@users.noreply.github.com>
2023-11-24 14:22:24 +02:00
Brian
a6142ec482
"Jump To Destination" Unit Action Button for units that are moving (#9955)
* Added "Jump To Destination" UnitActionButton for moving unit

This commit also fixes the situation where the player is unable to open the Show More unit actions list while the unit is moving and out of moves for the turn. Previously, clicking Show More in this scenario would jump to the next active unit.

* Added Jump To Destination to translation file

* Changed Jump to Destination to Show Unit Destination, updated icon, credits
2023-08-30 23:39:16 +03:00
SomeTroglodyte
4851865bce
Victory illustrations (#9934)
* Victory Screen Illustrations page

* Fix WorldReligion victory disclosing random player count

* Victory screen icons and Victory types get their separately moddable path

* Merge fix and nicer wiki text

* VictoryScreenIllustrations debug run

* Fix Image sizing and some polishing

* Fix white squares on some Victory Screen Cultural milestone buttons
2023-08-21 18:17:13 +03:00
SomeTroglodyte
6b084f0e6b
Victory screen score charts (#9121)
* VictoryScreen with Charts by WhoIsJohannes

* VictoryScreen with Charts by WhoIsJohannes - atlas

* VictoryScreen with Charts by WhoIsJohannes - lost icon attribution
2023-04-08 21:38:27 +03:00
SomeTroglodyte
a4c4c5f93e
Music player controls (#9087)
* Music controls cleanup

* Music controls cleanup - assets

* Music controls cleanup - fix incorrect attribution
2023-04-01 22:06:46 +03:00
letstalkaboutdune
60a0a856ab
Add AbsoluteUnits license info (#9034) 2023-03-25 21:32:02 +03: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
SomeTroglodyte
5d80f50d93
Show UnitTypes in Civilopedia (#8729)
* Show UnitTypes in Civilopedia

* Show UnitTypes in Civilopedia - polish
2023-02-25 20:40:59 +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
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
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
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
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
alexban011
d7c11cc990
added icon for Conduct Trade Mission button (#8125)
* added icon

* rescaled image to 100px
2022-12-15 21:02:45 +02:00
Yair Morgenstern
b0c84f5eea 4.2.17 2022-11-07 18:20:19 +02: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
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
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
Ouaz
90e582a0c3
Add an icon for "Wait" unit action (#7668) 2022-08-16 12:30:37 +02: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
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
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
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
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
Joan Josep
a17797a709
Add Catalan translation and provide some strings. (#6992) 2022-05-29 16:50:47 +02:00
Yair Morgenstern
f464ac2544 4.1.1 2022-05-18 23:03:29 +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
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
청하늘
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
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
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
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
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
will-ca
af941754cd
Show arrows on map for unit actions: Asset files. (#5825)
* 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>
2021-12-25 22:29:19 +02:00
Xander Lenstra
75ef6f6c8d
Changed remove heresy sound effect (#5821) 2021-12-18 20:05:11 +02:00
Xander Lenstra
17b382a614
Replaced illegal / questionably legal assets (#5819)
* Replaced illegal / questionably legal assets

* Resized policy icon to correct size
2021-12-18 17:53:21 +02:00
Xander Lenstra
10be481524
Added an icon for the telegraph tech (#5765) 2021-12-06 11:53:29 +02:00
itanasi
7f07bcb9e5
Recycling center (#5738)
* 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>
2021-12-03 10:15:51 +02:00
SimonCeder
bfe0b68ab8
Barbarian units (#5589)
* barbarian unique units; barbarian blacklisted units

* credits

* barbarian units do not take resources

* ai fix
2021-10-29 13:33:11 +03:00