mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-11 07:47:41 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,513 Commits 7 Branches 1,036 Tags 1.1 GiB
a9d36c073a
Commit Graph

4513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
a9d36c073a Mods can handle removing existing buildings 2020-12-03 23:58:48 +02:00
Yair Morgenstern
c12afb4131 "have signed the peace treaty" -> "have signed a peace treaty" 2020-12-03 23:29:36 +02:00
Yair Morgenstern
af113db8d7 Don't allow AI to offer peace to cty states allied with their enemies 2020-12-03 22:17:52 +02:00
Yair Morgenstern
91e58f45bb 3.11.17 2020-12-02 23:54:14 +02:00
Yair Morgenstern
2a3a0b107f Fixed rare errors 2020-12-02 23:17:20 +02:00
9kgsofrice
1f5fa74cea
adds val to modoptions and check to battle.kt to adjust max xp from barbarians (#3389) 2020-12-02 23:04:00 +02:00
9kgsofrice
525cea1cc9
"Uncapturable" unique (#3388) 
* WIP

* "Uncapturable" unique; civilians will be destroyed instead of captured
 2020-12-02 22:45:44 +02:00
9kgsofrice
b2e40a892b
unique "[] units gain the [] promotion" affects exisiting units (#3387) 
* "[] units gain the [] promotion" unique affects existing units

* removed toString() and flipped &&

* probably this is closer to what you had in mind :)
 2020-12-02 19:49:13 +02:00
9kgsofrice
80688eb4a5
Hide build menu constructions requiring resources with unique (#3370) 
* "Not displayed as an available construction without []"
Hides constructions that are missing resources

* combined unique check

* removed duplicate code

* clarified if clause

* simplified check and obsoleted existing unique

* previous iteration did not work due to OR instead of AND

* if we don't check to see if this is actually a resource, we get a crash
 2020-12-02 19:13:15 +02:00
9kgsofrice
2aac9ea314
Nation "style" can define unit appearance (#3368) 
* added "style" in Nation.kt and checks in Tilegroups
allows pixel units to be displayed as a specific style if appropriate file exists

* Preserves "specificUnitIconLocation" in tilegroups.kt
 2020-12-02 19:12:05 +02:00
9kgsofrice
0e39d47dab
Changes check to remove national wonders on city ownership changes to rely on building.isNationalWonder (#3386) 2020-12-02 18:49:37 +02:00
Yair Morgenstern
0feb9bdefc First attempt at making Unciv Android-TV-compatible 2020-12-01 23:26:01 +02:00
Yair Morgenstern
07cee7e679 3.11.16-patch1 
Fixed x100 combat modifier for units in rough/open terrain
 2020-12-01 22:07:10 +02:00
Kensvin
b30e6e6fdd
Update Indonesian.properties (#3367) 2020-12-01 21:25:40 +02:00
Yair Morgenstern
b9f6e0deec 3.11.16 2020-11-30 23:29:29 +02:00
Giuseppe D'Addio
5830996b3b
Update Italian.properties (#3365) 2020-11-30 22:56:31 +02:00
Yair Morgenstern
d6c95ade5e Display mod incompatabilities 2020-11-30 22:13:23 +02:00
Yair Morgenstern
98d01f50b1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-11-30 22:07:51 +02:00
Yair Morgenstern
61a0ccba5f Fixed minor mod bugs 2020-11-30 22:07:44 +02:00
9kgsofrice
ea11c3fdf3
getResourceModifier for resources modified by uniques (#3372) 
* added function getResourceModifier to civinfo and tied into cityInfo resource checks
pared down getTileResourceAmount function

* simplified function usage
 2020-11-30 21:54:54 +02:00
Yair Morgenstern
f59c9a8593 Resolved #3364 - Fixed certain battle modifiers not activating 2020-11-26 14:51:29 +02:00
Yair Morgenstern
c86d6e7b69 Fixed broken tests 2020-11-26 14:27:14 +02:00
Yair Morgenstern
b54fec05f1 3.11.15 2020-11-25 21:37:02 +02:00
Giuseppe D'Addio
77c8df6516
Update Italian.properties (#3362) 2020-11-24 22:55:31 +02:00
Anonymous
fc4c8c48ee
Update Polish translation (#3356) 2020-11-24 22:12:30 +02:00
Yair Morgenstern
fd646f6b06 Resolved #3347 - units spawned by buildings are spawned in the city the building was built in 2020-11-24 22:12:03 +02:00
Yair Morgenstern
eb0776005f Added mod checks that combat units have strength and ranged units have rangedStrength 2020-11-24 21:43:00 +02:00
Yair Morgenstern
f6f95a7c53 More framerate savers! Now only cityButtonGroups that actually contain a cityButton will be rendered, giving us another massive performance boost! 
We're up to 28-29 fps on Android while zoomed!
 2020-11-24 21:38:04 +02:00
ravignir
323c593d6e
Fixed Free Thought trading post bonus. (#3361) 
It should provide Science instead of Gold.
 2020-11-24 10:52:02 +02:00
Yair Morgenstern
01ee6cc768 A large part of the rendering time was dedicated to trying to run actions on TileGroup groups, most of which can never have actions to begin with! 
So now their act() does nothing, greatly improving framerate!
 2020-11-24 00:08:39 +02:00
Yair Morgenstern
9dd7b2abf3 More texture switch savings in the CityButton 2020-11-23 23:21:51 +02:00
Yair Morgenstern
7b0bb55045 Can now handle units upgrading to units with no required tech 2020-11-23 22:25:17 +02:00
Yair Morgenstern
114effe1ae Resolved #3360 - notify peace treaty to all commmon known civs 2020-11-23 20:01:58 +02:00
Yair Morgenstern
02bc52ca92 3.11.14-patch1 2020-11-23 19:35:58 +02:00
Yair Morgenstern
101fa9903e Fixed unit icons not getting deleted when unit exits tile 2020-11-23 19:20:23 +02:00
Yair Morgenstern
0952a6a5a6 Test-breaking text error, good thing we have tests :) 2020-11-23 19:08:01 +02:00
Yair Morgenstern
eb7a064019 Resolved #3335 - Removed all unecessary spaces and colons 2020-11-22 22:48:38 +02:00
Yair Morgenstern
3d1e1d7936 Removed some confusing and pointless ": " at the end of translations - #3335 2020-11-22 22:41:12 +02:00
Yair Morgenstern
6d7d698dad Prepacked flag, unit and building images in altas files, so they'll be readable from the jar files 2020-11-22 21:47:46 +02:00
9kgsofrice
038ac1e48b
Units/buildings with "Will not be displayed in Civilopedia" now will not show in tech tree (#3359) 
* adds unique "Will not be displayed in Tech Tree"

* Changed "Will not be displayed in Tech Tree" to "Will not be displayed in Civilopedia", avoiding bloat
 2020-11-22 20:52:50 +02:00
givehub99
072226ff9a
Added "All [] Cities get a free []" unique. (#3352) 
* Added "All [] Cities get a free []" unique.

The first parameter is for city type. Currently "new" and "coastal" are supported.
"new" matches every city and "coastal" matches cities on a coastal tile.
"new" and "coastal" were added to template.properties for translation.

Upon city founding, the second parameter building is added to the city.

In civ 5 G&K, Carthage gets a free harbor for every coastal city.

* -Syntax changed to "Get a free [] []"
First paramater is the building and second is the city filter.
Supports "in every city" and "in every coastal city"

-new and coastal was removed from template.properties
-in every coastal city was added to template.properties

* Changed syntax to "Gain a free [] []"
 2020-11-22 11:55:34 +02:00
Yair Morgenstern
2d2117936e Whoops wrong field 2020-11-20 13:45:45 +02:00
Yair Morgenstern
f40c0ad8b3 AI settlers can no longer settle after movement with no movement points 2020-11-20 11:52:14 +02:00
Yair Morgenstern
6158802bb3 3.11.4 2020-11-19 23:53:34 +02:00
jnecus
c338afc7f3
Hide hotkeys on devices without keyboard (#3350) 
* Hide hotkeys on devices without keyboard

* Test for peripheral keyboard
 2020-11-19 23:43:29 +02:00
Ivan Romanov
c33793cf81
Update Russian translation (#3351) 2020-11-19 23:42:47 +02:00
Yair Morgenstern
378c8ab511 Separated the unit image rendering from the background rendering to avoid texture swapping when rendering unit + background 2020-11-19 23:34:03 +02:00
Yair Morgenstern
223da7f531 More framerate improvement tricks - this was more than enough to offset the harm of the building and unit images, and went the other way! 
The framerate started out before the image games as ~17-18 on the tested game, dropped to ~14-15 with the image changes, and is now at ~20-21~
 2020-11-19 23:04:09 +02:00
Yair Morgenstern
2e668ddeb5 Made sure that labels are rendered after each other in the city button, so save on texture switches between the font and the image textures 2020-11-19 22:29:50 +02:00
Yair Morgenstern
35554f3ec6 Resolved #3330 - Texture is back to 2048*2048, by taking flags buldings and units out of the main image. 
The cost is that there are texture swaps, and so framerate is hurt.
 2020-11-19 21:44:09 +02:00