Commit Graph

341 Commits

Author SHA1 Message Date
4a434b3689 Improve Road & Railroad (again) (#4721) 2021-08-02 19:18:53 +03:00
3cf9191d6a Actually load and display the road texture found in FantasyHex (#4699)
* Actually load and display the road texture found in FantasyHex

* Actually load and display the road texture found in FantasyHex - patch1
2021-08-01 15:36:45 +03:00
ff1a75bb13 Improve River for FantasyHex (#4704) 2021-08-01 11:30:18 +03:00
636b58d43c Reduce atlas - The Huns was 4x larger than the other nations, and a dirty Hexagon dupe (#4689) 2021-07-31 23:56:55 +03:00
04f688c0f3 And new unit pixel and some improvement. (#4660)
* 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
2021-07-29 15:28:12 +03:00
1f6f49efd7 Mercantile CS resources (#4641)
* Added Porcelain and Jewelry, assigned to Mercantile CS

* resized Jewelry.png

* moved citystateresource, added resource overview to diplo screen

* citystateresource saved as string

* Update template.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-27 22:28:36 +03:00
966f70d0d4 Rename Railroad tech to Railroads (#4567)
* Rename Railroad tech to Railroads

* Rename Railroad tech to Railroads - force check

* Rename Railroad tech to Railroads - patch1

* Rename Railroad tech to Railroads - atlas

* Rename Railroad tech to Railroads - patch2
2021-07-25 19:04:51 +03:00
e41ba0da91 A Civilopedia category for Religion (#4609)
* A Civilopedia category for Religion

* Civilopedia for Religion - rename cat, template and EOF linting

* Civilopedia for Religion - oversight
2021-07-23 00:10:47 +03:00
85f4840e35 Hide lesser used action buttons to free up space (#4580)
* 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
2021-07-21 10:43:55 +03:00
239a406bc4 Added Sweden Civ (#4566)
* 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
2021-07-20 17:06:15 +03:00
118c1fc888 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
2021-07-19 00:30:10 +03:00
de582cf66a Resolved #4528 - added Polder image 2021-07-16 09:30:04 +03:00
2752c713b9 Founding Religions (#4505)
* 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
2021-07-14 22:09:51 +03:00
5376e488a0 Added a simplified version of great prophets, implemented a basic city religion UI (#4356)
* 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
2021-07-09 10:48:33 +03:00
c42561c545 Spruced up Civilopedia - phase 4 - Visual candy, Units (#4350)
* Spruced up Civilopedia - phase 4 - Visual candy, Units

* Unified separators, CheckBox helper - patch2

* Unified separators, CheckBox helper - atlas merge

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - do separator to-do
2021-07-05 16:35:41 +03:00
957c8697ac Added the nation of the Netherlands (#4372)
* Added the nation of the Netherlands

* Added Sea Beggar, Dutch unique unit

* Added polder improvement, Dutch unique improvement

* Added national ability
2021-07-05 09:35:04 +03:00
0d26c69710 More bug fixes (#4370)
* 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
2021-07-04 19:18:15 +03:00
aa132c8bf8 Fixed more bugs (#4360)
* Fixed city states spawning with multiple settlers

* Renamed icon for the huns
2021-07-04 00:25:20 +03:00
6c221cd56b Fix multiple bugs resulting from updating promotions and implementing missile cruisers (#4355)
* Fixed carriers in mods no longer working

* Fixed scouting prerequisites

* Fixed surivialism not having icon or prerequisites

* Fix logistics in mods not working

* Added image for supply promotion
2021-07-03 22:26:03 +03:00
afdc2ffbd5 Adds the nation of The Huns (#4311)
* Added the nation of The Huns

* Added unique units of The Huns

* Removed MountedRanged unitType

* Implemented requested changes

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

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-01 22:53:00 +03:00
0f0abad5ea Added Stealth tech and Stealth Bombers (#4271)
* 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
2021-06-27 08:57:11 +03:00
784092c56c Added Drama and Poetry tech and replaced Temples with Amphitheaters (#4254)
* Added Drama and Poetry tech

* Moved not-in-ruleset check to building replacement function

* Updated a version number
2021-06-26 23:36:39 +03:00
af0cd0c9df Implements the Telecommunications tech (v2) (#4249)
* 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
2021-06-24 19:07:33 +03:00
111d11b9b2 Added Advanced Ballistics Tech, Atomic Bomb Unit, Updated how nukes work (#4211)
* 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.
2021-06-24 16:03:59 +03:00
5b730fbc56 Added Nuclear Fusion tech and the Giant Death Robot (#4207)
* Reordered units

Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column

* Added Nuclear Fusion technology and GDR
2021-06-23 09:44:53 +03:00
7f88844d82 Created Patronage policy branch (#4186)
* 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
2021-06-22 17:25:29 +03:00
3d1836a081 Created Order branch with G&K policies (#4158)
* Created Order branch with G&K policies

* Implemented requested changes
2021-06-20 21:39:14 +03:00
11af49e6da 3.15.1 2021-06-16 10:59:15 +03:00
434136e6cc Updated Commerce branch to G&K (#4129)
* Updated Commerce branch to G&K

* Implemented requested changes
2021-06-15 09:52:59 +03:00
5e1803c40a FIX: unintended code slipped through (#4143) 2021-06-14 22:44:09 +03:00
85158ab29d TradeType Enum marginal cleanup and Gold Font symbol (#4127) 2021-06-13 22:22:44 +03:00
5f66c57de5 Proposal for New borders (#4124)
* new-borders

* New Borders
2021-06-13 21:56:47 +03:00
7e284f998b Redraw skin Images, edit skin load method (#4080) 2021-06-10 23:10:13 +03:00
a7afc0718c Unit swapping (#4049)
* 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.
2021-06-06 22:56:25 +03:00
98d551559b Resolves #3926 - Wheat+Farm gets location-appropriate farm 2021-06-03 21:50:30 +03:00
432e937474 Added the amphibious promotion and the marine unit (#3987)
* 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
2021-05-29 23:42:04 +03:00
d7941924be Better camera square 2021-05-28 14:53:21 +03:00
3065cca5e1 More fantasyhex combinations 2021-05-09 23:49:07 +03:00
54deb60f1b FantasyHex update first iteration (#3884)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-09 23:44:39 +03:00
a25777f380 Overview screen category decoration + key hint (#3872)
* OverviewScreen: Category buttons decorated / key indicator

* OverviewScreen: Category buttons decorated / key indicator: Images
2021-05-04 12:10:34 +03:00
8c098a7fd4 New layering is in da house!
FantasyHex-New is now FantasyHex!
2021-04-30 15:23:24 +03:00
d4b63950ac The new tileset is ready for rollout! 2021-04-30 15:00:37 +03:00
4db97dcd1a Added construction production info to city screen 2021-04-29 14:02:27 +03:00
00ec000d50 Preparation for hill as terrain feature (#3784)
* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles
2021-04-13 22:05:06 +03:00
25565f189d Natural wonders are standalone tiles in new layering 2021-04-12 23:31:54 +03:00
8ff2a79e9b New fantasy hex layering works well with natural wonders 2021-04-04 19:32:16 +03:00
187eea82a4 Base FantasyHex now contains all of the NewFantasyHex, for easier handoff (first 'use new layering rules' and then 'change tileset') 2021-04-02 10:02:56 +03:00
bc1c9ad921 Tileset for new layering is now in base game
New layering now supports natural wonders
2021-04-01 23:19:07 +03:00
9cb017c8a5 Added Faith icon and display for games with Religion 2021-04-01 20:44:27 +03:00
807444d2c5 Replace padding with leftAndRightPadding & topAndBottomPadding in TileGroupMap (#3742)
* Replace padding with leftAndRightPadding & topAndBottomPadding in class TileGroupMap, edit MainMenuScreen

* Remove TableBackground.png
2021-03-29 18:21:31 +03:00