wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4134 commits 7 branches 304 tags 288 MiB
Commit graph

2109 commits

Author SHA1 Message Date
Yair Morgenstern
81e9cd317d Started normalizing tech tree to be like G&K - Added Guilds between Currreny and Chivalry 2018-06-22 13:07:52 +03:00
Yair Morgenstern
b8d9e432ef Fixed bug where if an enemy city expanded over your territory but you had a population working that tile, that population would be stuck there, and would remain unusable! 2018-06-22 12:21:57 +03:00
Yair Morgenstern
e0961e1b0b Unit table updates texts even if the unit hasn't changed 2018-06-22 10:41:53 +03:00
Yair Morgenstern
bed7a37a6b Cities connected to capital have a connected symbol next to them 
Unit information displays XP to next promotion
 2018-06-21 22:52:24 +03:00
Yair Morgenstern
415add2417 Loads of translation changes, especially for German! 
Changed font from Roboto to Arial because it contains some characters (e.g. for Romanian) that Roboto doesn't
 2018-06-20 23:11:02 +03:00
Filius-Patris
f92a64c8e3 Added German translation (#166) 2018-06-20 18:24:52 +03:00
Yair Morgenstern
3f87cfa3db Fixed silly regex bug which works differently on desktop and android 2018-06-19 20:01:49 +03:00
Yair Morgenstern
1aee88c5cd Added Companion Cavalry 2018-06-18 23:48:10 +03:00
Yair Morgenstern
0af880877f Added longbowman (Engand unique unit) 
Techs now don't display units that are unique to other civs, or the base unit if you have a unique that replaces it
 2018-06-18 23:33:49 +03:00
Yair Morgenstern
fa14b6eebe Cities can now idle by producing Nothing 2018-06-18 22:00:07 +03:00
Yair Morgenstern
aa11c49eec Many more things are now translated! 
Added more things to translate to translations.json
 2018-06-18 21:41:07 +03:00
Fantaziu Ion
df82a526d4
Major interface translations 
Added translation for main interface and gameplay strings (ru/it/fr/ro)
 2018-06-18 03:40:43 +02:00
Yair Morgenstern
5df93757f2 Added Bowman as first unique unit! 2018-06-17 23:39:25 +03:00
Yair Morgenstern
ed8e664358 Added Cover, March and Charge promotions 2018-06-17 23:08:16 +03:00
Yair Morgenstern
5fa9ad0640 Normalized city strength according to original civ game 
Added Walls and Castle buildings
 2018-06-17 19:47:01 +03:00
Yair Morgenstern
80963e7eac Added damage modification from basic promotions 2018-06-16 23:35:54 +03:00
Yair Morgenstern
c6caf0cecd Added promotions mechanism! 2018-06-16 22:50:11 +03:00
Yair Morgenstern
92abe0cf73 More translations! 2018-06-15 16:48:38 +03:00
Yair Morgenstern
bcd5f02bec Razed cities now have a fire icon next to them 2018-06-15 16:48:04 +03:00
Yair Morgenstern
d429c6585b Aded terrains, resources improvements and techs to the translation file 2018-06-15 15:04:25 +03:00
Yair Morgenstern
79971b05b8 Added more translations in the code 2018-06-14 23:20:25 +03:00
Yair Morgenstern
03f5f32f36 Golden age now also provides +20% to culture; added Golden Age tutorial 2018-06-14 22:47:04 +03:00
Yair Morgenstern
c815863124 Archers now require Archery (as should be!) 2018-06-14 21:00:44 +03:00
Yair Morgenstern
d2cb7173c1 AI now moved ranged units before melee, so that it will attack wil the ranged units first =) 2018-06-14 20:47:23 +03:00
Yair Morgenstern
b3a15d9d6e Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-06-14 20:44:41 +03:00
yairm210
2e804dbd5e
Added notification text to translation json 2018-06-14 13:16:04 +03:00
Yair Morgenstern
5af940858b Added unhappiness tutorial + tutorial text is now a normal size 2018-06-14 08:42:59 +03:00
Fantaziu Ion
14ce37c932
Main translations added 
Main translations for italian/russian/french and romanian.
 2018-06-13 16:43:24 +02:00
Yair Morgenstern
0eb28ab679 Select box, text field and picker screens now look much nicer 2018-06-12 22:46:23 +03:00
Yair Morgenstern
66f2ad1f3e Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-06-12 22:44:07 +03:00
Yair Morgenstern
e1df4b4840 Cached fonts for reuse - generating them takes valuable time! 2018-06-12 21:38:40 +03:00
yairm210
7261fed191
Added lots of phrases in Translations.json 2018-06-12 13:00:25 +03:00
Yair Morgenstern
a380f7aa95 Battle table now displays "Captured" when attacking a city with no resistance 2018-06-12 09:10:02 +03:00
Yair Morgenstern
c27bcb00c4 Fixed notification when capturing a civilian unit 2018-06-12 09:09:11 +03:00
Yair Morgenstern
02c74ad8ba Added Set Up action for siege units that require it 
Unit cannot attack twice a turn even if it can "move after attacking"
 2018-06-11 18:27:23 +03:00
Yair Morgenstern
8d5fd730a0 Added promotion jsons, icons and organized unit types (scout is now its own!) 2018-06-10 17:44:05 +03:00
Yair Morgenstern
adeaa5907a Added city health in text description of tile 2018-06-10 17:42:16 +03:00
Yair Morgenstern
0edbaac53d Changed "Archery" units to "Ranged" because it will also include machine gun in the future 2018-06-08 17:44:49 +03:00
Yair Morgenstern
95bdcf8dcb Notification scroll height is now limited 2018-06-08 15:28:02 +03:00
Yair Morgenstern
7002b8d55e Fixed save/load game Clipboard problems 2018-06-06 14:47:37 +03:00
Yair Morgenstern
d81768047f Added base for translations - we should now be able to add fan translations for different languages! 2018-06-05 21:58:02 +03:00
Yair Morgenstern
c088c02b1e Added Roboto font and finally figured out how to make TrueType fonts look good! 2018-06-05 21:53:51 +03:00
Yair Morgenstern
aa0ddd4128 Added colors to notifications, depending on the context (attack, culture growth, tech, city growth, etc.) 2018-05-29 23:43:54 +03:00
Yair Morgenstern
e1bd1c271e Load screen displays civ, turns and save time; Save screen now displays random noun-adjective combination as default save name 2018-05-29 22:37:31 +03:00
Yair Morgenstern
ba320552e2 Added Englandd and France civs 2018-05-29 22:01:48 +03:00
Yair Morgenstern
14a1bc5626 Fixed crash caused by trebuchet listing "cannon" as upgrade, but the cannon doesn't exist yet 0_0 2018-05-28 22:03:56 +03:00
Yair Morgenstern
75627928b3 Slightly modified tech tree, added raw info for cannon and musketman, but the tech tree needs to be changed in order for musketman to be viable 2018-05-27 18:34:13 +03:00
Yair Morgenstern
4d520c8466 Added "unit upgrade" action for old units 2018-05-25 18:27:54 +03:00
Yair Morgenstern
c984704af1 The "Construct improvement" action is now disabled when the unit has no movement or there are no improvements to pick 2018-05-25 13:04:31 +03:00
Yair Morgenstern
389c489faf Added icons to improvement picker screen 2018-05-25 12:01:06 +03:00
Yair Morgenstern
7ee62b7d1c Moved star,circle,shield icons to OtherIcons folder 2018-05-24 22:31:06 +03:00
Yair Morgenstern
c8ddf6dc63 Added icons for unit actions 2018-05-23 22:59:05 +03:00
Yair Morgenstern
2a2cc9a873 Removed final sum of combat values from BattleTable 2018-05-23 00:55:55 +03:00
Yair Morgenstern
db4ad20264 Added Fortification action 2018-05-23 00:37:53 +03:00
Yair Morgenstern
1bebeab0c4 Added Knight 2018-05-23 00:21:08 +03:00
Yair Morgenstern
03d452fd42 Added fog on non-viewable tiles 2018-05-22 23:07:12 +03:00
Yair Morgenstern
1b2fa7317e Added unit obsolesence 2018-05-21 23:00:09 +03:00
Yair Morgenstern
1de4c2c9f2 Techs display short info on buildings and units 2018-05-21 22:07:30 +03:00
Yair Morgenstern
398b612d8c Added Medieval era units 
Techs now display imformation baed on what's dependant on them
Buildings uniques now in humanspeak
 2018-05-18 17:18:47 +03:00
Yair Morgenstern
017d1f3f89 Added star icon to capital city 2018-05-18 15:53:12 +03:00
Yair Morgenstern
cb537b0f84 Icons shrunk (slightly) with pngCrush 
Organized Unit table
Added bonus vs barbarians
 2018-05-18 15:30:29 +03:00
Yair Morgenstern
318931b902 Added extra stat icons 2018-05-17 22:02:11 +03:00
Yair Morgenstern
f546a49c49 Added icons for Medieval and Renaissance era units 2018-05-17 21:28:41 +03:00
Yair Morgenstern
4267d5b1be Added Crossbowman 2018-05-17 15:56:25 +03:00
Yair Morgenstern
3e0e1b2a43 In-game year is displayed by the number of turns 2018-05-17 15:15:28 +03:00
Yair Morgenstern
d3799a0c64 When settlers have no viable spots within 5 tiles, they random walk to edges of walking ability 2018-05-16 23:45:25 +03:00
Yair Morgenstern
2c2a4e5da3 The tiles the unit can move to are now displayed when selecting a unit, 
The hex borders have been changed to points
Thanks to Mihail Pastuhov for the ideas!
 2018-05-15 23:39:04 +03:00
Yair Morgenstern
030ddafce6 Bugfixes 2018-05-14 22:45:41 +03:00
Yair Morgenstern
a4fcc3a694 Happiness label in menu bar now displays unhappy face and red text if hapiness is negative 2018-05-11 16:19:40 +03:00
Yair Morgenstern
ec760e660f Fixed crash when settler didn't find a good city spot within 5 tiles 2018-05-11 10:39:54 +03:00
Yair Morgenstern
96a0961130 UI revamp to the top bar 2018-05-11 02:45:50 +03:00
Yair Morgenstern
4c4abb452c Fixed idiotic bug that caused the game to crash =( 2018-05-10 11:01:55 +03:00
Yair Morgenstern
d12b665e83 Added extra cities for civilizations (because I actually reached 10+ cities for an AI) 
City naming is now dependant on the names of existing cities and not on the umber of cities the civ currently has
 2018-05-09 22:59:32 +03:00
Yair Morgenstern
afa6478745 Horsemen can now move after attacking 2018-05-09 18:57:03 +03:00
Yair Morgenstern
9625a12ba2 Damage calculations are now according to extrapolated Civ V rules 2018-05-09 18:24:30 +03:00
Yair Morgenstern
c3a51460b7 More unit information and combat mechanics fixes 2018-05-08 11:56:51 +03:00
Yair Morgenstern
2d302ea2da Added Horseman, Catapult and Spearman, with all that entails 2018-05-08 10:58:26 +03:00
Yair Morgenstern
8b748384af Added chariot archer - includes adding requiredTech, requiredResource, and uniques to units 2018-05-07 23:42:58 +03:00
Yair Morgenstern
8350d000b1 Added units to civilopedia 
Added more info to civilopedia
 2018-05-07 12:33:49 +03:00
Yair Morgenstern
be5cd0c334 Can now properly pick great person (when relevant. e.g after finishing Liberty 
Victory conditions screen now includes cultural victory
 2018-05-06 18:03:49 +03:00
Yair Morgenstern
4e699f917e Organized automation classes 2018-05-06 11:48:01 +03:00
Yair Morgenstern
1a6e4d30f8 Can now see the units from within the city screen 2018-05-06 09:30:20 +03:00
Yair Morgenstern
fb1f381f06 Added FreeType, which lets us use whatever fonts we want 2018-05-01 21:41:02 +03:00
Yair Morgenstern
8d2edfefc7 Civilopedia help now shows correct text 
Sped up pollicy-related actions
 2018-04-27 15:24:31 +03:00
Yair Morgenstern
ace5a6efbf Worker automation fixed - ready for big update! 2018-04-26 21:29:20 +03:00
Yair Morgenstern
4d10e11482 Added Egypt, other civs can now build wonders! 2018-04-25 23:47:03 +03:00
Yair Morgenstern
9816cd57da Added "explored tiles" to civinfo, moved worker automation to separate class 2018-04-25 22:09:24 +03:00
Yair Morgenstern
453e25ffe7 City's tiles and worked tiles are now saved in the CityInfo and not in the TileInfo 2018-04-21 22:56:52 +03:00
Yair Morgenstern
d0f3a10728 Moved notifications to CivInfo, notifications on enemy actions removed 2018-04-18 00:00:31 +03:00
Yair Morgenstern
c6ebb733a1 Added Greece to civilizations, city names no come from the Civilizations json 2018-04-17 23:57:06 +03:00
Yair Morgenstern
221a8668fa Selected unit now has a white circle around it 2018-04-17 21:56:58 +03:00
Yair Morgenstern
34c1047b65 Fixed bug where enemy units were viewable despite the tile being unexplored 2018-04-12 21:52:00 +03:00
Yair Morgenstern
ca7fb9c3be Multiple IDE-suggested fixes 2018-04-11 23:46:00 +03:00
Yair Morgenstern
dd3d4b605f Added archer 2018-04-11 22:34:20 +03:00
Yair Morgenstern
872872cdf0 Desert color more distinct 2018-04-11 22:22:19 +03:00
Yair Morgenstern
32efae340b Unit table now displays ranged strength for ranged units 2018-04-09 19:09:08 +03:00
Yair Morgenstern
4de9ee106f City button padding expanded, warrior now has 2 strength as it should 2018-04-08 16:13:54 +03:00
Yair Morgenstern
f662cd910d Added a table in city screen, to show a breakdown of the ciy stats 2018-04-05 13:59:22 +03:00
Yair Morgenstern
39cc236fae City labels are colored according to civ, and scale down when zooming in 2018-04-05 12:47:10 +03:00
Yair Morgenstern
e5e0c5daa5 Now displays defender name properly, and not attacker name 2018-04-05 11:19:31 +03:00
Yair Morgenstern
461bea0cbc Healing units now attempt to go to better tiles to heal there 
Fixed bug where units moving from A to B would move multiple times between turns, effectively "jumping" distances
 2018-04-05 11:04:40 +03:00
Yair Morgenstern
7ff9f17943 Added battle modifiers, specifically - terrain defence bonuses 2018-04-04 23:10:16 +03:00
Yair Morgenstern
4e36aa0d5a No longer attempts to attack city that contains a unit 
Battle visualization bug fixed
 2018-04-04 17:37:59 +03:00
Yair Morgenstern
5d00adb7fe Added GetTile function to MapUnit, which simplifies and normalizes a lot of the unit logic 
Battle simulation and actual battle work as expected!
 2018-04-02 15:16:28 +03:00
Yair Morgenstern
bd1a191b15 Battle tabl now shows results of battle, added Barbarian civ 2018-04-01 15:01:48 +03:00
Yair Morgenstern
0a9317f8ca Removed old unit icons 2018-03-23 11:03:34 +03:00
Yair Morgenstern
96c217fec8 Added unit icons with the background according to owner 2018-03-22 23:45:28 +02:00
Yair Morgenstern
a8051bc930 Moved CityButton from TileGroup to WorldTileGroup 2018-03-21 22:03:37 +02:00
Yair Morgenstern
e496148e21 Tiles are now larger, population and units placed in a more visually pleasing way 2018-03-19 23:30:54 +02:00
Yair Morgenstern
9debc85501 Removed old terrain icons to decrease the size of the apk 2018-03-19 23:09:31 +02:00
Yair Morgenstern
66f900e4ec Changed terrain visualization - is now plain color awith overlays for terrain feature, looks really good! 2018-03-16 13:09:43 +02:00
Yair Morgenstern
53e332e9e8 Tutorials moved to a separate json file 2018-03-12 23:33:03 +02:00
Yair Morgenstern
c4736f0467 Map generation now generates areas coontaining the same terrain, rather than have each tile be a random terrain - much closerr to what you get in the real Civ game, even though we're pretty far from there 2018-03-10 22:01:10 +02:00
Yair Morgenstern
1a4a9d416c Unit control transferred to UnitTable 2018-03-07 18:37:16 +02:00
Yair Morgenstern
9b29944c2b All coe converted to Kotlin! 2018-03-02 15:34:24 +02:00
Yair Morgenstern
18be9e37b2 Converted all GameBasics to Kotlin 2018-02-24 22:43:41 +02:00
Yair Morgenstern
9253c40085 Added Kotlin! 2018-02-23 15:36:13 +02:00
Yair Morgenstern
397556f81f Deleted unneccesary files, minor changes that were pointed out by code inspection 2018-02-23 13:31:45 +02:00
Yair Morgenstern
6a2f4a07f1 Major overhaul - all tree items now have transient pointers to their parents, eliiminating the need for static calls for Civilization.Current and the like - neccesary if we want to have multiple civilizations 2018-02-23 12:57:52 +02:00
Yair Morgenstern
4d6b5c997d Split generating the map to a separate class 
Fixed bug loading game when multiple cities
 2018-02-05 23:19:58 +02:00
Yair Morgenstern
ce7a7916c1 - Fixed bug when picking legalism with less than 4 cities 
- Added City Center indication, made population image in city screen more prominent and clickable
 2018-02-03 21:49:46 +02:00
Yair Morgenstern
7cbddd883b Split WorldScreen functionality into components - civ stats table, tile info table, tile map holder, notificaations scroll, idle unit button 
Added yield on tiles
 2018-01-31 22:45:21 +02:00
Yair Morgenstern
b6d235a4d0 Automated actions should now choose best and closest tile to work on, differentiated pre- and post- turn actions 2018-01-22 22:57:17 +02:00
Yair Morgenstern
85ffcc58ee Added CivilizationPolicies, added great person pick when completing Liberty 2018-01-11 22:50:59 +02:00
Yair Morgenstern
546472b528 Organized classes into folders 2018-01-11 22:22:51 +02:00
Yair Morgenstern
63f24db67b Implemented line-of-sight according to terrain 2018-01-11 20:51:19 +02:00
Yair Morgenstern
5b28840940 Notifications now contain location, and are clickable when appropriate 2018-01-08 22:42:09 +02:00
Yair Morgenstern
6c035c79b6 Improved visuals of science victory screen 
Added Scout to game start
Added tutorials
 2018-01-08 18:52:30 +02:00
Yair Morgenstern
439efd7a40 Legalism now works! 2018-01-03 22:52:40 +02:00
Yair Morgenstern
9dad8908d6 Added basic tutorials 2018-01-03 22:36:56 +02:00
Yair Morgenstern
08735d8e99 Improvement building no longer generates notification 
Roads that turn to railroads now change color, and railroads are gray to help them stand out against the background
Map now contains a 50px padding from the edge
 2018-01-02 21:06:50 +02:00
Yair Morgenstern
c0927cf49f Added free social policies and expanded automation choices 2018-01-01 22:37:42 +02:00
Yair Morgenstern
befb0561b5 Added unit movement to further tiles 2017-12-30 22:58:36 +02:00
Yair Morgenstern
ab2b33318b Buildings are now divided by type in city screen 2017-12-28 21:50:17 +02:00
Yair Morgenstern
7b0b0b2f3b Great Person Points added to wonder description 
Fixed bug where university science percent would keep rising
Specialists are now per-building
 2017-12-28 21:11:58 +02:00
Yair Morgenstern
367f294774 Changed policy text to reflect repurposing 2017-12-25 23:22:28 +02:00
Yair Morgenstern
f7e7506b7c ADDED POLICIES 2017-12-25 23:18:25 +02:00
Yair Morgenstern
3f20e9b82e Added worker automation 
Solved multiple small bugs
 2017-12-21 20:32:33 +02:00
Yair Morgenstern
5088b6a83f Moar techtree overhaul 2017-12-21 15:31:01 +02:00
Yair Morgenstern
14c75d7cc4 Tech tree total overhaul - Based it on G&K but removed all war-only techs, normalized bonuses across techs 2017-12-21 14:45:49 +02:00
Yair Morgenstern
d81cb8cda7 Added specialists and great person generation! 2017-12-21 12:25:55 +02:00
Yair Morgenstern
98dbe3b844 Split buildings and units to 2 separate files and types - both are now IConstruction, and cityBuildings has been changed to cityConstructions will all that entails 2017-12-18 19:43:34 +02:00
Yair Morgenstern
f30ade602d Split buildings and units to 2 separate files and types - both are now IConstruction, and cityBuildings has been changed to cityConstructions will all that entails 2017-12-17 19:45:09 +02:00
Yair Morgenstern
561b1b5fdc added "required nearby improved resource" limitation to some buildings 
added circus, stone works and notre dame buildings
 2017-12-13 21:54:34 +02:00
Yair Morgenstern
761b62038f Observatory now available with astronomy 
Wealth and science production fixed to 4:1
Wonder bug fixed
 2017-12-12 22:31:48 +02:00
Yair Morgenstern
ede3a92c43 Finished techs and buildings! 
Added Science victory conditions and screen!
 2017-12-11 18:21:15 +02:00
Yair Morgenstern
45869c5a0b Railroads now provide 25% production bonus to connected cities 
Added techs and builings up to middle of modern era
 2017-12-09 22:11:16 +02:00
Yair Morgenstern
48f56e2e85 Added factories and civ resource management 2017-12-08 09:39:18 +02:00
Yair Morgenstern
ea5552f3a7 Added techs and buildings up to industral era 
Added option to remove jungles, forests and marshes
 2017-12-06 23:13:49 +02:00
Yair Morgenstern
635e8ce08a Game now fits to the screen, without 'extra bits' 
Roads now make movement cost 1/2 before machinery and 1/3 after
 2017-12-05 13:47:33 +02:00
Yair Morgenstern
65bff07905 Added option to produce science and gold 
Divided buildings into regular buildings and wonders in picker screen
Added notifications table at the bttom left
 2017-12-05 10:53:53 +02:00
Yair Morgenstern
4bb4187ab1 Organized unique wonder abilities by adding "unique" string to building 
Added Machu Pichu, Angkor Wat and Aqueduct unique abilities
Expanded civilopidia entry for buildings
Merged CityPopulation into CityInfo because the division was arbitrary
 2017-12-04 19:10:25 +02:00
Yair Morgenstern
d47d59146f Added movement costs to tiles and computed tiles that unit can travel to, and the distance (including roads) 2017-12-04 16:02:27 +02:00
Yair Morgenstern
f51923b1f6 Camelcased json model field names 2017-12-01 15:14:18 +02:00
Yair Morgenstern
996204e7f5 Added roads 
Removed libGdx images
 2017-11-30 22:31:00 +02:00
Yair Morgenstern
2f9d6af693 Improvements on tiles can advance 
Cannot create adjacent cities
Standardized function and parameter names
 2017-11-30 22:25:20 +02:00
Yair Morgenstern
c8dd598438 Added education buildings 2017-11-25 23:51:58 +02:00
Yair Morgenstern
d125c6ba3e Google play-able 
Units with no turns left are now grayed out
Added culture pool to cities and tiles being added to cities when pool fills
Changed tile icon order and placing of resource icon
 2017-11-25 21:56:04 +02:00
Yair Morgenstern
0319602092 Initial commit 2017-11-22 00:09:35 +02:00