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

401 commits

Author SHA1 Message Date
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
fe0c6e07a2 Settlers no longer try to go towards unreachable tiles in order to found cities 
Settler random walk is now like the rest of the units
 2018-06-15 13:40:27 +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
e808885e0d Applied translation to many part of the project 2018-06-14 22:19:59 +03:00
Yair Morgenstern
c815863124 Archers now require Archery (as should be!) 2018-06-14 21:00:44 +03:00
Yair Morgenstern
2df88c8517 Civilopedia page now looks normal 2018-06-14 20:49:36 +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
5af940858b Added unhappiness tutorial + tutorial text is now a normal size 2018-06-14 08:42:59 +03:00
Yair Morgenstern
0468adc130 If the selected unit was a civilian unit of ours that was captured, it is no longer selected. 2018-06-13 13:27:59 +03: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
e1df4b4840 Cached fonts for reuse - generating them takes valuable time! 2018-06-12 21:38:40 +03:00
Yair Morgenstern
9e3772a58d All text is now Roboto and much sharper! 
Added lots of "Translatable" words
Organized City Screen a little bit
 2018-06-12 21:28:17 +03:00
Yair Morgenstern
0c71c39bc2 If you raze your capital and you have another city, it becomes the new capital 2018-06-12 21:21:35 +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
4c3231a3fe City health is only visible for cities in visible tiles, not explored tiles 2018-06-11 19:33:28 +03:00
Yair Morgenstern
135a502990 Unit that was set up doesn't lose its Set Up status if it attacks 2018-06-11 18:37:19 +03:00
Yair Morgenstern
9aa41d3d13 Units that can move after attacking (horseman, knight) no longer get deducted movement points for BOTH the movement to the enemy tile AND the attack 2018-06-11 18:32:37 +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
4b2cefd5f4 Added visual health bars to cities! 2018-06-11 09:34:02 +03:00
Yair Morgenstern
825cffaf05 Increased padding around map, so that no tiles would be unreachable 2018-06-11 08:26:12 +03:00
Yair Morgenstern
7108dcae78 Fixed crashing bug where barbarians would capture civilian units - including settlers! - and try to found cities with them 2018-06-10 20:58:36 +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
d695cbd6f1 If we try to place barbs but there's no room then we just don't place. 2018-06-10 17:34:00 +03:00
Yair Morgenstern
98932473eb If we run outof places to place barbarians at the start of the game, of if we randomly select the same tile twice, the gam wil not crash 2018-06-10 17:30:49 +03:00
Yair Morgenstern
b31e7ccc3d Fixed a rare bug where unit would try to "walk" to a conquered city even though it was already in it 2018-06-09 22:59:23 +03:00
Yair Morgenstern
088583bd9d Civilian units are now captured by melee units rather than killed! 2018-06-08 18:07:00 +03:00
Yair Morgenstern
10c5c5f0ef Added back Civilopedia button (it had mysteriously vanished) 2018-06-08 18:06:29 +03:00
Yair Morgenstern
b255b8cf15 You will always generate at least 1 science per turn, so that you don't get strange numbers on the Tech button 2018-06-08 17:52:01 +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
4b7ec5303a Reorganized the class tree 2018-06-08 15:43:40 +03:00
Yair Morgenstern
95bdcf8dcb Notification scroll height is now limited 2018-06-08 15:28:02 +03:00
Yair Morgenstern
d8652ed510 Fixed bug where completing the Liberty social policy tree left you stuck in a Great Person picker screen 2018-06-08 13:29:31 +03:00
Yair Morgenstern
c3e0d6ac2c You can no longer have negative science per turn, even if you have a huge gold deficit (what does "negative science" even mean?) 2018-06-08 13:19:42 +03:00
Yair Morgenstern
83c235690a Added minimap! 
Notifications now take up less of the increasingly valuabe screenspace
 2018-06-08 13:18:45 +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
e0f97e584d Added options to save game to clipboard and load game from clipboard - this will allow sharing and modification of games for those who want it 2018-06-05 21:55:48 +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
c7e14a0242 Disabled NextTurn button from being clicked twice, and moved rendering to the main thread 2018-06-04 17:14:10 +03:00
Yair Morgenstern
335b7dc1e3 Removed all opening of screens from within game logic, put in the WorldScreen login instead, so that the rendering screen remains the same (OpenGL context problems) 2018-06-04 12:29:02 +03:00
Yair Morgenstern
6d059fb6ed When attacking a tile that has both a military and civilian unit, and defeating the militaryunit, the civilian unit is now destroyed 2018-06-04 10:15:41 +03:00
Yair Morgenstern
0fb3c2256e OKAY FOUND THE BUG! 
So, now military units can't enter tiles which have an enemy civilian unit in them.
Honestly I would not have guessed that this was the problem.
 2018-06-03 13:56:03 +03:00
Yair Morgenstern
431c5449f3 Added display options, to show/hide worked tiles and resources/tile improvements 2018-05-31 19:46:11 +03:00
Yair Morgenstern
145c908af2 "Raze City" button now placed correctly when there are multiple cities 2018-05-31 18:02:07 +03:00
Yair Morgenstern
f6ca98b1d7 Massive change - Unit in TileInfo now spit to CivilianUnit and MilitaryUnit! 2018-05-31 17:23:46 +03:00
Yair Morgenstern
c50a919e2a Added Happiness display to city screen (both total and detailed) 2018-05-30 13:21:50 +03:00
Yair Morgenstern
0959cc3b69 Added ability to raze cities 2018-05-30 12:40:17 +03:00
Yair Morgenstern
0dab2d6dca Clicking on the unit description label now zooms to map to the unit 2018-05-30 09:04:45 +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
1be235d380 New game screen 2018-05-29 22:03:28 +03:00
Yair Morgenstern
3b80cd8450 Creating a city removes the tile improvement that was there (D'oh) 2018-05-29 22:03:08 +03:00
Yair Morgenstern
7ca7be5d70 AI cities ressign population when there are better tiles that the population can work on 2018-05-29 22:02:28 +03:00
Yair Morgenstern
39b9a65596 Added New Game screen 2018-05-29 22:01:22 +03:00
Yair Morgenstern
9316510a07 GameSaver and HexMath are now in "logic" and are not static classes 2018-05-29 13:05:16 +03:00
Yair Morgenstern
36f9ba6f8c Moved autosave to a concurrent thread so you won't have to wait for it to finish saving to continue your game 
UpdateTiles is now cleaner - doesn't update viewed tiles twice, only once
 2018-05-29 12:26:43 +03:00
Yair Morgenstern
cd5a3b4741 National wonders can now be built for each civ separately 2018-05-25 18:50:57 +03:00
Yair Morgenstern
9389e936fc When the currently selected unit dissapears, the executing action also disappears 2018-05-25 18:38:57 +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
1a2d3d4421 Fixed bug where unit would try to randomwalk but there wasn't anywhere to go 2018-05-25 12:08:06 +03:00
Yair Morgenstern
389c489faf Added icons to improvement picker screen 2018-05-25 12:01:06 +03:00
Yair Morgenstern
53ff1290e8 Culture no longer displays 214... turns to next policy when no cities are built 2018-05-25 11:52:07 +03:00
Yair Morgenstern
7503c67f18 Added SetFontColor function to Label, because thed default way is a bit annoying 2018-05-25 11:34:55 +03:00
Yair Morgenstern
c40ebb3942 Added GetImprovementIcon funciton to ImageGetter 2018-05-25 11:24:59 +03:00
Yair Morgenstern
2570c4fd3d Added "GetUnitIcon" function, added icons in GreatPersonPickerScreen 2018-05-24 22:55:11 +03:00
Yair Morgenstern
2f6139e38d Current construction always appears in picker screen and is colored green for indication 2018-05-24 22:35:57 +03:00
Yair Morgenstern
7ee62b7d1c Moved star,circle,shield icons to OtherIcons folder 2018-05-24 22:31:06 +03:00
Yair Morgenstern
2f48586f3e Center icon no longer grayed out in city screen 2018-05-24 22:29:34 +03:00
Yair Morgenstern
c8ddf6dc63 Added icons for unit actions 2018-05-23 22:59:05 +03:00
Yair Morgenstern
9cbdee4b12 White halo around selected unit is now shield-shaped iff the unit is fortified 2018-05-23 21:45:43 +03:00
Yair Morgenstern
5a564f29c3 Separated Unit Actions to its own table, put above the bottom bar 2018-05-23 21:45:01 +03:00
Yair Morgenstern
0bbb7d6254 Tutorial background is now square 2018-05-23 01:00:09 +03:00
Yair Morgenstern
2a2cc9a873 Removed final sum of combat values from BattleTable 2018-05-23 00:55:55 +03:00
Yair Morgenstern
f01b6b665f Can no longer walk through enemy units =) 2018-05-23 00:42:33 +03:00
Yair Morgenstern
db4ad20264 Added Fortification action 2018-05-23 00:37:53 +03:00
Yair Morgenstern
2bcd4a86e7 Defeated cities don't really hit back 2018-05-23 00:20:15 +03:00
Yair Morgenstern
21bb743caf Tiles now closer together - no gaps between them! 2018-05-22 23:16:41 +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
f546a49c49 Added icons for Medieval and Renaissance era units 2018-05-17 21:28:41 +03:00
Yair Morgenstern
7155bfb927 Merged all tables at the bottom of the screen to a single bar 2018-05-17 18:09:00 +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
e99bf8004f Appropriate notifications when wonders are built in a city you haven't yet seen 2018-05-17 15:14:50 +03:00
Yair Morgenstern
e1018371b3 Major update - enemies can now take over cities (and do!) 2018-05-17 12:24:33 +03:00
Yair Morgenstern
64f8b3fef8 Cities beyond the 15th get "New" names properly 2018-05-17 10:44:27 +03:00
Yair Morgenstern
e267a7a6be Civs no longer spam settlers beyond what they can afford 2018-05-17 10:43:45 +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
75b6a59ef4 Cities will be called "New $name" if all city names are exhausted 2018-05-16 23:37:56 +03:00
Yair Morgenstern
a1995a3e37 Fixed bugs that prevented picking Gold and Science as city constructions 2018-05-16 23:31:17 +03:00
Yair Morgenstern
9c576d6bdc Added CenterX and CenterY functions for actors 2018-05-16 21:38:09 +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
41f37f5ee7 Units in the middle of a preordered action (automate, move) don't do it if there's an enemy withing walking distance 2018-05-11 16:26:09 +03:00
Yair Morgenstern
18ec3eba9c Workers now don't move if there's an enemy unit in the vicinity 2018-05-11 16:22:25 +03:00
Yair Morgenstern
a3730a348e Turn start/end now work in the correct order - no longer will your units move and immediately be attacked before you can see the attacker! 2018-05-11 16:21:27 +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
3cd21c4b8e Settler search optimization 2018-05-11 10:50:08 +03:00
Yair Morgenstern
a0f5e190fc Fixed a bug where if enemy civ constructed the Oracle, you would get a popup screen to choose a free policy which wouldn't go away 2018-05-11 10:41:13 +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
4cfbf18178 Organized unit algorithms 
Combat units now head towards the closest city with no garrison if exists
 2018-05-09 21:31:34 +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
a230676325 Added Civ strategic resources to top of screen 2018-05-09 18:17:18 +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
16ae62a29b Can't choose to build unbuildable units =) 2018-05-07 23:56:10 +03:00
Yair Morgenstern
602532b721 Fixed bug where game would crash if you ordered a unit to go womewhere that it can't reach (now it just ignores you entirely) 2018-05-07 23:48:25 +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
3eaf1afef4 Victory screen now contains Conquest victory 2018-05-06 18:15:44 +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
5d4003ecbf Fixed bug where cities would not "recognize" tiles on the first turn - for realz this time 2018-05-06 11:24:39 +03:00
Yair Morgenstern
c6e344b16e Remove worked tiles when population starves (dead men work no tiles) 2018-05-06 11:20:02 +03:00
Yair Morgenstern
fd5aaaeee1 Now shows which tile the city will next expand to 2018-05-06 11:08:00 +03:00
Yair Morgenstern
75f4301004 Fixed bug where cities would not "recognize" tiles on the first turn 2018-05-06 10:52:29 +03:00
Yair Morgenstern
f0cf29e6b9 Worker findTileToWork is now more readable 2018-05-06 10:41:31 +03:00
Yair Morgenstern
c932fffc32 Enemy civs now adopt policies when they can 2018-05-06 10:38:45 +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
fc7b6529f0 Added game saves - you can now save and load the game! 2018-05-06 08:55:20 +03:00
Yair Morgenstern
8450d2cf60 Tile feature imag no longer (paritially) covers population image in cities 2018-05-02 08:44:33 +03:00
Yair Morgenstern
af8b307782 When capturing a city, the expansion of that city is reset. 
This leaves a situation where previously worked tiles are outside of the new borders, and so the population that was working there needs to be reassigned.
 2018-05-02 08:39:27 +03:00
Yair Morgenstern
cb381ec82e Better performace by changing ExploredTiles to a hashset and ading a temporary TilesToCities hashmap 2018-05-02 08:33:54 +03:00
Yair Morgenstern
6cd78ca926 Minor performance enhancements for unit movement 2018-05-01 21:42:13 +03:00
Yair Morgenstern
fb1f381f06 Added FreeType, which lets us use whatever fonts we want 2018-05-01 21:41:02 +03:00
yairm210
eac8afef75
Sped up FindShortestPath alg 
When finding shortest path, we no longer check intermediary tiles for the next step, since they will always have a longer path than the edge tiles (since from there, we need to pass through an edge tile anyway)
 2018-04-29 13:31:10 +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
8268c0c561 Fixed settler automation performance problem - now actually viable for phone use 
All kinds of other small performance-boosting bits and bobs
 2018-04-26 23:43:36 +03:00
Yair Morgenstern
f4af9f7d80 Fixed (slow) performance issues in TechPickerScreen 2018-04-26 23:06:45 +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
23bd52fc66 Changed all usages of GetTilesInDisttance to center around TileInfo, not TileMap 2018-04-25 22:59:44 +03:00
Yair Morgenstern
6fcf9ec93e Fixed bug where if 2 tiles were of same "ranking", the worker would try and switch back and forth between them. 2018-04-25 22:19:35 +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
9d7399dd48 Enemy civs now pick technologies and advance! 
Fixed bug where workers would try to move and improve unreachable tiles, crashing the game
 2018-04-24 23:00:58 +03:00
Yair Morgenstern
c6136acbec Moved tile ranking and construction picking to Automation 2018-04-24 21:44:47 +03:00
Yair Morgenstern
5eec4deb84 Fixed bug where melee attacker would always move to attack, even if attackee was right next to it 2018-04-24 21:42:53 +03:00
Yair Morgenstern
fe09351db7 Ranged enemy units don't move towards their targets 
Cities under attack now switch to training combat units
 2018-04-23 18:58:19 +03:00