This repository has been archived by the owner on Mar 29, 2020. It is now read-only.
Initial relations decay #689
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Add capability to translate from Win1252 to UTF-8 * Add capability to convert into win1252 * Convert Vic2 localisations from WIn1252 instead of ISO 8859-15.
* Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Add capability to translate from Win1252 to UTF-8 * Add capability to convert into win1252 * Convert Vic2 localisations from WIn1252 instead of ISO 8859-15. * Fixes for Linux version.
* Revert "Reverting further for correct compilation" This reverts commit 0346b3a. * Revert "Revert "Merge branch 'Idhrendur/newParser' into Idhrendur/EU4toV2"" This reverts commit bea2f63. * Country history parsing items Oh boy there's a lot. I expect this will need to have bits added to it more or less constantly. * Actually fixing merge conflicted files I thought I just sorted you? * Upload of new flag files (#536) * Update province mappings in Mongolia, Taiwan, Korea, and Japan * An initial sketch of a new parser * Use the new parser to read in map areas * Include the new parser for linux builds * Make the new parser use a regex for 'keyword' registration * Use member functions with parser to make it all more automatic * Make map areas use parseFile() instead of parseStream() * Use a lambda to remove a member function * Import color for map areas * Make the Object constructor for color use the stream constructor to do the work * Make color part of the common items * The first set of improved spanish localisations * Update province mappings in oceania * Finish converting new-style EU4 regions to use the new parser * Handle the region file format in EU4 1.15 * A more nuanced lexing of streams that are being parsed * Handle old-style (pre-1.14) EU4 regions files. * A fix to Color that should allow Linux builds to compile * Initial updates to Chinese province mappings * Make the new parser handle strings * Update CK2TitleMapper to use the new parser * Handle possible exceptions when handling areas * More EU4RegionsMapper into EU4World as EU4World::Regions * Update more Chinese province mappings * Update the colonial tags mapper * Keep track of all CK2 titles * Update yet more Chinese province mappings * Quick adjustments to the Vic2 adjacencies * Update ColonyFlagsetMapper to use the new parser * Rename the EU4World namespace to EU4 * Update parsing of EU4 continents * Yet more updates to Chinese province mappings * Add an item to the new parser that inputs a list of integers * Input EU4 colonial regions with the new parser * Fix up include guards * Parse Vic2 regions using the new parser * Make the country mapper use the new parser * Update remaining Chinese province mappings * A quick update to the country mapper * Culture mappings now use the new parser * Make the new parser properly discard the BOM * Update Russia's Pacific province mappings * Move Custom Flags out of mappers * Getting rid of rogue config file * Add helpers for getting strings to the new parser * Make the new parser handle more EU4 stuff * Update EU4 cultures to use the new parser. May cause problems with cultural unions in pre-1.14 saves * Update eastern siberian province mappings * Read EU4 common country files using the new parser * Converting bookmarks (#472) * 2 monarch ideas 2 new monarch ideas to replace generics * fix .bat files The bat files have new lines which changes directory to the solution files when needed. * No penalties in generic monarch ideas, Localization fix, Asia portrait variety * fix doctrine conversion convert bonus to doctrine works now. 100% instead of 0% * Allows Gp democracy to develop puppets Sorta wip * improvements to puppet interactions * puppet focus generation has less useless code * Puppet interaction focus code fixed again Puppet interaction focus code was full of errors so removed most additions * puppet dev focus availability fix Can develop subjects of all autonomy levels instead of only puppets. * Puppet focus unique ID, compact mode & more Puppet focuses have unique ID, take less space, top focus requires 1 puppet * localization "sort of" to converted doctrine bonuses * WIP localization for puppet dev focuses * convert bookmarks very WIP but seems to make bookmark of sorts * convert minors to bookmark * bat update * Starting equipment production to OOB * Minors need 1.5k strenght value to be added to bookmark * rebalanced how minors get to bookmark minor nations need to reach 4500 strength in 3 years * Revert "Starting equipment production to OOB" This reverts commit 1479d67. * Revert "bat update" This reverts commit 6151e75. * Revert "WIP localization for puppet dev focuses" This reverts commit ce927a4. * Revert "localization "sort of" to converted doctrine bonuses" This reverts commit 2340f6b. * Revert "Puppet focus unique ID, compact mode & more" This reverts commit beb349d. * Revert "puppet dev focus availability fix" This reverts commit 3fcd620. * Revert "Puppet interaction focus code fixed again" This reverts commit 975d857. * Revert "puppet focus generation has less useless code" This reverts commit d048742. * Revert "improvements to puppet interactions" This reverts commit 7632da7. * Revert "Allows Gp democracy to develop puppets" This reverts commit 58a33b3. * Revert "fix doctrine conversion" This reverts commit bc70229. * Revert "No penalties in generic monarch ideas, Localization fix, Asia portrait variety" This reverts commit 1d5e3ae. * Revert "fix .bat files" This reverts commit 07216e4. * Revert "2 monarch ideas" This reverts commit 618c7e2. * newfeatures branch should only have bookmark feature * Revert "newfeatures branch should only have bookmark feature" This reverts commit 44d4787. * Reverting failed revert commit * revert build file to how it was * Update remaining russian province mappings * Update EU4Leader to use the new parser * Fixing cores disappearing * Fixing colonial flag related converter crash * Fixing Colonial nations disappearing * Improve reporting of states with wasteland parts * New countries From Iohannes Iohannium * New Flags From Iohannes Iohannium * New and updated decisions From Iohannes Iohannium * New and updated mappings From Iohannes Iohannium * Misc Data files From Iohannes Iohannium * Adding governments to blank mod From Iohannes Iohannium * Updated cultures file From Iohannes Iohannium * Updated Localisation From Iohannes Iohannium * Use new parser to import country history. * Revert "Merge branch 'Idhrendur/newParser' into Idhrendur/EU4toV2" This reverts commit 9c3f901, reversing changes made to d827572. modified: EU4toV2/EU4ToV2.vcxproj modified: EU4toV2/EU4ToV2.vcxproj.filters deleted: EU4toV2/Source/EU4World/CountryHistory.cpp deleted: EU4toV2/Source/EU4World/CountryHistory.h modified: EU4toV2/Source/EU4World/EU4Country.cpp modified: EU4toV2/Source/EU4World/EU4Country.h modified: EU4toV2/Source/EU4World/EU4Leader.cpp deleted: EU4toV2/Source/EU4World/History.cpp deleted: EU4toV2/Source/EU4World/History.h * Reverting further for correct compilation * Adding experimental 1821 bookmark From Iohannes Iohannium, modified slightly so that 1836 remains the default. * Enable the old parser to take streams. * Handle initial parsing of EU4 save with new parser * Re-fix mapping files * Handle some more items from 1.24 saves * Fixes for linux version * Add EU4World items from 1.19 save * Add a parsing item from the 1.20 test save * Add a parsing item from the 1.22 save * Add parsing items from the 1.23 test save * Use the new parser to parse the countries section (but not the countries themselves) * Further fixes for the Linux version * Fix a new linux build problem introduced by my other changes. * Yet more Linux build fixes * Even more Linux build fixes (I should probably fix my incapability to build on my own machine to avoid so many commits). * A simple Linux error this time. * Just turn off the generic parser…it's all going away anyways. * Fixing the Linux builds was easier than expected. * Fix Vic2ToHoI4, too * First attempt at replacing country import * Create and use a generalized ignore item function in the new parser * Handle 1.19 style governments * Fix a bug with the singleDouble parseable type * Handle 1.20 saves * Fix a bug with reading in new-style governments * No longer spend the time fixing up the save * Move portraits file to the new location * Built the project I guess (#499) * Update portrait mappings * Add names for more cultures * Update common/ai_peace_1_fascist.txt * Update combat_tactics.txt * Add blanked ai focuses * Update the ai_strategies * Add ai_strategy_plans * Update the ai_templates * Update the autonomous states for cornflakes * Update common/country_leader_00_traits.txt for HoI4 1.5 * Update for 1.5.1 * Update output/interface/eventwindow.gui for 1.5 * Update output/interface/countrypoliticsview.gfx for 1.5 * Incorporate common/decisions * Localisation updates for 1.5 * New icon for custom ideologies * Initial update of events for 1.5 * Fix the event eindows * Update technologies for 1.5 * Update scripted triggers for 1.5 * Update on_actions for 1.5 * First update of focus trees for 1.5 * Update ideas for 1.5 * Country mapping updates * A slight update to gitignore * Add a helper that can contain a whole 'object' in a string * Git wants these commited for unknown reasons * Compiler the new parser * Updates to HoI4Focus to allow it to be created from a stream * Update generic focus tree to import from files * Add data file for the converter's generic focuses * Update democratic national focuses * Begin updating absolutist national focuses * Adjust on_actions. The on_coup event will only exist if the democratic ideology exists. on_actions now output from only one place in the code. * Compile the new parser on linux * Finish updating scripted triggers for 1.5 * Update most HoI4 events for 1.5 * Upload of new flag files * Updated Visual Studio files * Updating and Renaming EU4 World Updating fully to new parser with new style ignore * Improvement of Country History Improved more generic ignore * Taking account of EU4World rename * Prerolling version number * Further improving Country History ignoring * Ministers' localisations (#585) * Update parties2_l_english.yml * Update parties2_l_braz_por.yml * Update parties2_l_french.yml * Update parties2_l_german.yml * Update parties2_l_polish.yml * Update parties2_l_russian.yml * Update parties2_l_spanish.yml * Update V2Reforms.cpp * Add files via upload Some new flags from EU4Vic2 * Add files via upload Some new flags from EU4Vic2 * Province names (#618) * Province name parsing git cherry-pick --continu * DSA * Put back registerKeyword for name * Typo in to_string * Add files via upload * Add files via upload * Add files via upload * Add files via upload Corrected the Columbian flags (they were using the Colombian instead). Sources are: -Republic: the British Columbia flag, lower half -Monarchy: the 1906 British ensign, but using the Canadian flag in canton -Communist: https://www.reddit.com/r/vexillology/comments/3f3kly/ocflag_of_a_communist_cascadia/ -Fascist: current flag, but upper half changed to a saltire variant of fascist Canada's flag (such variant being from https://www.reddit.com/r/vexillology/comments/2ln5xt/flag_of_fascist_canada/) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Merge CK2 to EU4 fixes (#644) * Various fixes for CK2->EU4 games * Line ending nonesense * Update version number * Prepare Vic2 to HoI4 release (#657) * Fix text transformations(#608) (#653) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Add capability to translate from Win1252 to UTF-8 * Add capability to convert into win1252 * Convert Vic2 localisations from WIn1252 instead of ISO 8859-15. * Linux fixes (#656) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Add capability to translate from Win1252 to UTF-8 * Add capability to convert into win1252 * Convert Vic2 localisations from WIn1252 instead of ISO 8859-15. * Fixes for Linux version. * Roll version number * Actually copy flags into build
* Properly include header on Linux.
* Update cultureGroupToGraphics.txt Adding some more vanilla portraits, notably: Pedro II of Brazil, Béhanzin of Dahomey, Gojong of Korea * Delete portrait_JAP_Emperor_Meiji.dds No longer needed * Delete portrait_BRA_Pedro_de_Alcantara.dds No longer needed * Updated portait_Non_Human.dds Reflecting the Synthetic Dawn of EU4 * Wrong folder used - many to follow * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem * Idem
* Update _cultures.txt * Update culture_ideas.gfx * Update cultures_l_braz_por.yml * Update cultures_l_english.yml * Update cultures_l_french.yml * Update cultures_l_german.yml * Update cultures_l_polish.yml * Update cultures_l_russian.yml * Update cultures_l_spanish.yml
* Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Add capability to translate from Win1252 to UTF-8 * Add capability to convert into win1252 * Convert Vic2 localisations from WIn1252 instead of ISO 8859-15. * Fixes for Linux version. * Eliminate a crash when converting armies in capitalless nations. * Properly include header on Linux. * German province mapping updates * Update events2_l_english.yml Adding missing localizations * Update events2_l_braz_por.yml * Update events2_l_french.yml * Update events2_l_german.yml * Update events2_l_polish.yml * Update events2_l_russian.yml * Update events2_l_spanish.yml
* Update cultureGroupToGraphics.txt * Add files via upload * Add files via upload * Add files via upload All of the followings are Original Content based upon images online. * Add files via upload Other OC portraits * Update cultureGroupToGraphics.txt Other leaders added * Removed as no mod response * Update _leader_portraits_mod.gfx Updating the comment * Update cultureGroupToGraphics.txt Restoring the newer version * Delete portrait_JAP_Emperor_Meiji.dds No more necessary * Delete portrait_BRA_Pedro_de_Alcantara.dds No more necessary * Delete portrait_Non_Human.dds
* Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Add capability to translate from Win1252 to UTF-8 * Add capability to convert into win1252 * Convert Vic2 localisations from WIn1252 instead of ISO 8859-15. * Fixes for Linux version. * Eliminate a crash when converting armies in capitalless nations. * Properly include header on Linux. * German province mapping updates
* Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Add capability to translate from Win1252 to UTF-8 * Add capability to convert into win1252 * Convert Vic2 localisations from WIn1252 instead of ISO 8859-15. * Fixes for Linux version. * Eliminate a crash when converting armies in capitalless nations. * Properly include header on Linux. * German province mapping updates * Tie unit unit conversion to particular regiments. * Convert army experience.
configuration file).
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.