Commit Graph

14 Commits

Author SHA1 Message Date
Yair Morgenstern
e83e733104 Added validations for city-state uniques 2022-11-21 23:03:52 +02: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
itanasi
f360eda047
Align (reduce) Embarked Defense Strength per Era (#6231)
* Change Embarked Defending Strength per era. Update Tutorial a little

* Use JSON implementation of EmbarkDefense

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-28 19:41:13 +02:00
SpacedOutChicken
79f7319a31
Stop putting Wonders as start buildings (#5710)
This will stop the adding of Wonders as starting buildings in the Future era
2021-11-27 20:01:05 +02:00
Xander Lenstra
003f2434c1
Differentiating Vanilla & G&K (#5654)
* Fixed tests checking for mod correctness

* Update G&K jsons to current vanilla versions

* First pass over buildings & beliefs

* First pass over nations

* First pass over eras.json

* Fully updated tech tree

* First pass over units

* Second pass over buildings -- fixed techs

* Fixed last prerequisites and row numbers of tech

* Went through the entire tech tree and moved things to their correct spot

* Fixed tests
2021-11-09 06:23:30 +02:00
Xander Lenstra
ce5a82c763
Fix translation tests and wrongly translated conditionals (#5272) 2021-09-20 16:04:51 +03:00
SimonCeder
027057874d
Update and generalize Siam UP (#5237)
* refactor and generalize Siam UP, display correct values in diplo screen

* enable preferred diplomatic victory

* allow compatibility mode

* revisions, restore timesInPlace

* don't change game.png

* don't change game.png

* objectify and enum city state bonuses

* objectify and enum city state bonuses

* template.properties

* refactored city state bonuses into Unique

* further enumization, fix toStringWithDecimals

* reviews
2021-09-19 06:28:10 +03:00
Interdice
297618706c
Adding religous city states to unciv! (#5136)
* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!
2021-09-14 10:49:38 +03:00
SimonCeder
83050c2b11
Militaristic city states can give unique unit; refactor city state initialization (#5147)
* Pick unique unit for militaristic CS

* Provide unique unit when able

* refactor some code

* remove debug

* template.properties

* fix failing build

* Add variance to spawning rate, add ≈ to string, better formatting.
2021-09-09 21:30:12 +03:00
Xander Lenstra
3722fab38d
From the indstrial era onwards, things change in religion (#5095)
* Improved redability

* From the industrial era onwards, religion goes into 'second phase'

* Fixed tests

* Fixed formula for buying great prophets starting from the industrial era

* Added `getMatchingUniques`, `hasUnique` to `IHasUniques`, cleaned up some code

* Fix compilation errors
2021-09-08 21:24:26 +03:00
SimonCeder
8cb464c9f7
Correct year shown when starting in later eras (#5070)
* json, getEquivalentTurn

* WorldScreenTopBar.kt

* affects shown year only
2021-09-03 00:13:58 +03:00
SimonCeder
74a1da8e17
CS bonuses graded according to relationship level (#4664)
* city-state bonuses graded depending on friend or ally

* siam militaristic UP, cleaned up presentation

* fix strings

* move city state modifiers to json

* city-state bonuses graded depending on friend or ally

* siam militaristic UP, cleaned up presentation

* fix strings

* move city state modifiers to json

* Restructure eras.json

* reduce indentation in DiplomacyManager.kt

* Add fallback values in cas of missing json definitions

* review edits

* fix conflicts???

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-17 13:55:02 +03:00
Xander Lenstra
547f5a57e5
Added missionairy units, which can spread religion and bought with faith (#4568)
* Added missionairy units, which can spread religion and bought with faith

* Forgot an include, minor additions

* Forgot credit for the missionary image

* Large refactor, enabling buying with almost all stats, split IConstruction into IConstruction & INonPerpetualConstruction

* Does this fix the tests

* Fixed accidentally removing all trailing spaces in template.properties

* Thanks to someTroglodyte for paying more attention than I do :)

* Implemented requested changes

* Fixed large amount of question marks

* Missing space, of course

* Fixed function name change

* Fixed merge problems

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-06 14:40:48 +03:00
Xander Lenstra
b8d79dc23d
Split off properties of era's to another JSON file (#4336)
* Added Era.json and imported the data to the ruleset

* Units at start are now also determined by eras.json

* Research agreement costs now determined by json file

* Gold and Culture provided at the start are now awarded

* Can no longer build wonders that are more than two eras older than the starting era

* Default population and buildings for settlers can now be added

* Added checks for validity of eras.json file in mods

* Colors for the icons of technologies are no also saved in eras.json

* Removed constants for all era's as they have been generalized away by this PR

* Removed spurios println's

* Added compatibility for mods

* Updated the military unit you get from ruines to be the military unit you received at the start of the game
2021-07-02 15:45:18 +03:00