AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,590 Commits 6 Branches 1,117 Tags
Commit Graph

4590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
4e50ea9618 Merge remote-tracking branch 'origin/revert-3240-TechUniques' 2020-10-08 12:23:53 +03:00
Yair Morgenstern
18c837a7ed More informative alert for tech modders 2020-10-08 12:21:43 +03:00
Yair Morgenstern
236c7a1c15 Revert "When checking for nation uniques, it also checks the tech uniques (#3240)" 
This reverts commit 31226c97e86d9a2bc956461a5fdb29d90c9bd47d.
 2020-10-07 23:05:46 +03:00
givehub99
31226c97e8
When checking for nation uniques, it also checks the tech uniques (#3240) 
* When checking for nation uniques, it also checks the tech uniques

* asSequence() before map
 2020-10-07 23:05:06 +03:00
Yair Morgenstern
223e52fe32 "matches" is a more intuitive name than "fits" for filtering 2020-10-07 14:17:50 +03:00
Yair Morgenstern
a485ad5fa5 Merge branch '3.11.1-patch1' 2020-10-07 14:13:30 +03:00
Yair Morgenstern
effc7485a9 3.11.1-patch1 3.11.1-patch1 2020-10-07 14:04:19 +03:00
Yair Morgenstern
8c1913c2c4 Total conversion mods should handle missing specialists (altough they really should deal with it) 2020-10-07 14:03:27 +03:00
Yair Morgenstern
e690e3bcea Copied files in Android should now overwrite existing files 2020-10-07 14:02:38 +03:00
Yair Morgenstern
1a4cc125c3 And for units as well of course 2020-10-07 13:44:42 +03:00
Yair Morgenstern
e9835eab12 Resolved #3229 - added "Not displayed as an available construction unless [] is built" unique 2020-10-07 13:41:56 +03:00
givehub99
b96cdae232
Polynesia's unique was fixed to match the syntax of the unique, which is "+[]% Strength if within [] tiles of a []". The 2 was put in brackets. (#3241) 2020-10-07 13:25:44 +03:00
Yair Morgenstern
0c038fa4af New & better Github preview image 2020-10-06 14:48:08 +03:00
Federico Luongo
1dd82f6f58
Find Natural Wonder Quest implemented (#3211) 
* Find Natural Wonder Quest implemented

* List to sequence to list
 2020-10-06 13:59:54 +03:00
Yair Morgenstern
fa59d4888a Era-specific city tiles for Ancient, Classical and Medieval 2020-10-06 12:22:55 +03:00
Yair Morgenstern
bb5eff5250 Battle damage calculations changed to ints, for simplicity 2020-10-06 11:16:33 +03:00
givehub99
9ffa0bee54
Consolidated Generic Tile Bonus Uniques (including Friendly Land, Foreign Land) (#3232) 
* Redid things with help from HadeanLake:

-"+[]% combat bonus in []" Unit Unique
-"+[]% combat bonus for units fighting in []" Nation Unique
-Both of these can check for terrain or Friendly Land or Foreign Land
-Function to add stacking modifiers
-Himeji Castle and Foreign Legion had uniques changed to fit this syntax
-Old way still works for now, but deprecated

* fixed comments about deprecation and the new syntax
 2020-10-06 10:52:30 +03:00
Federico Luongo
f9ebc8aa0f
Acquire Great Person Quest implemented (#3210) 
* Acquire Great Person Quest implemented

* List to sequence to list
 2020-10-06 10:48:59 +03:00
Yair Morgenstern
e951ed8324 3.11.1 3.11.1 2020-10-06 10:43:10 +03:00
uncivbot[bot]
7ecb059e05
Translations update (#3233) 
* Update Italian.properties (#3221)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Simplified_Chinese.properties (#3225)

* Update German.properties (#3228)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
 2020-10-06 10:35:41 +03:00
Mojtaba Rahimy
8e53be616d
Ui fixes (#3218) 
* moving close button to end of the list and setting color to red

* aligning text/icon in main screen top bar
 2020-10-06 10:28:13 +03:00
Yair Morgenstern
93bf69f3d5 Fixes for minor bugs from the previous version 2020-10-05 23:20:49 +03:00
Yair Morgenstern
0e327012a7 Fixed Windmill unique 2020-10-05 22:51:55 +03:00
Yair Morgenstern
010497e095 Don't delete existing mods when copying mods from the external diretory on Android app startup 2020-10-05 14:40:23 +03:00
Yair Morgenstern
27c8243a78 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-10-05 12:12:34 +03:00
Yair Morgenstern
256eedc7c0 Lines go behind the techs in the tech screen, and are colored so you can trace the path of the current research queue 2020-10-05 12:12:15 +03:00
Giuseppe D'Addio
5e9ffcd22a
Update Quests.json (#3224) 
* Update Quests.json

* Update Quests.json
 2020-10-05 12:01:50 +03:00
Yair Morgenstern
5553be0d67 Minimap no longer adds city indicator on every update, leading to lower framerate over time 2020-10-05 11:45:55 +03:00
Yair Morgenstern
523ed10e68 Specialist names are taken from the json files 2020-10-04 16:25:07 +03:00
Yair Morgenstern
c70c860437 All specialist slots in jsons converted to proper name 2020-10-04 16:23:35 +03:00
Yair Morgenstern
58d651bfe2 MODDABLE SPECIALISTS ARE GO! 2020-10-04 16:16:42 +03:00
Yair Morgenstern
a24dc7cc69 Completely removed usages of the old getMaxSpecialists 2020-10-04 15:47:57 +03:00
Yair Morgenstern
fd6956507d Merge tag '3.11.0-patch1' 2020-10-04 15:20:48 +03:00
Yair Morgenstern
be2dd5c068 3.11.0-patch1 
Solved some errors that occured as a result of the recent changes assuming the specialists exist, which is not true in revamp mods
3.11.0-patch1 		2020-10-04 15:18:26 +03:00
Federico Luongo
2d6c322856
Connect Resource Quest implemented (#3209) 
* Removed superfluous filters in getResourceForQuest
 2020-10-04 15:01:57 +03:00
givehub99
67efd6c957
Problem: Some promotions in CIV 5 have multiple effects, but Unciv promotions only allow for one effect (#3219) 
Solution: This PR adds "uniques" field to allow for multiple effects, while keeping "effect" field so that rulesets prior to this PR can still work.
 2020-10-04 10:55:42 +03:00
Jack Rainy
296da5b205
Unit tests for the TileMap.getViewableTiles() (#3222) 2020-10-04 10:54:48 +03:00
Yair Morgenstern
3e98e0c00f 3.11.0 3.11.0 2020-10-03 20:48:34 +03:00
uncivbot[bot]
047fba0f1d
Translations update (#3220) 
* Update Italian.properties (#3199)

* Added more translation and fix some (#3207)

* Translations update (#3212)

* Update Japanese.properties (#3213)

* Update Persian_(Pinglish-DIN).properties (#3215)

adding more translations

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: fab144 <58261459+fab144@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Mojtaba Rahimy <mojtaba.rahimy@chmail.ir>
 2020-10-03 20:25:20 +03:00
Jack Rainy
bddded04f5
Patch of the promotion exploit (#3214) 2020-10-03 20:24:19 +03:00
CrispyXYZ
ae182fb7b5
fix 'OpenGL is not supported' Exception (#3202) 2020-10-03 20:20:27 +03:00
Federico Luongo
300c7179e7
Various Quest relted (#3206) 
* Renamed some quests to better ones (Kill Camp -> Clear Barbarian Camp and Kill City State -> Conquer City State)
* Quests names are hardcoded in a enum class
* Quests.json translations automated
 2020-10-01 21:08:26 +03:00
Yair Morgenstern
a4d1232403 Final conversion of existing specialists to the new format 2020-10-01 17:06:34 +03:00
givehub99
fab8242c6a
"[] units gain the [] promotion" (#3204) 2020-10-01 09:51:24 +03:00
Yair Morgenstern
bfa9c65700 Modding - Buildings can be rendered obsolete (unbuildable) by techs 2020-09-30 23:17:09 +03:00
Yair Morgenstern
0cb29d64f4 New unit images by The bucketeer! 2020-09-30 20:32:02 +03:00
Yair Morgenstern
aa2486c896 Great person points come from the json! The only things that still happen directly to the specialists stats is the assign/unassign, this is as close as we'll get without changing the rest of it! 2020-09-30 20:18:52 +03:00
Yair Morgenstern
e39d3e89da All specialist colors come from the json now :) 2020-09-30 19:42:47 +03:00
Yair Morgenstern
5677fb494a Added helper function colorFromRGB(List<Int>) 2020-09-30 19:26:20 +03:00
Yair Morgenstern
43f5799578 Specialist information is now hybrid 2020-09-30 18:03:26 +03:00