This repository has been archived by the owner on Mar 29, 2020. It is now read-only.
Parse prestige #642
Merged
Parse prestige #642
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
Idhrendur
added a commit
that referenced
this pull request
Oct 7, 2018
* Origin/new parser (#531) * Fixes for EU4ToVic2 after new parser changes * New parser fixes to Vic2ToHoI4 * 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 * Remove last references to the old parser in V2World * War support conversion improvement (#573) * new Stability & War support conversion * Stability based on militancy, war support on war related matters * dont convert stability * Make configuration use the new parser * changes to communist focus branches (#576) * changes to communist focus branches * Added communist focus localisations * Clean up HoI4 Army code * Code changes to addAbsolutistEmpireNationalFocuses (#577) * Make faction formation optional * Fix for linux build * Add localisations for Absolutist focuses (#578) * Refactor Vic2 state definitions * Give secondary powers focus trees so they appear on the bookmark * Clean up state categories * Cultural ideas for HoI4 (#538) * Create _cultures.txt * Add files via upload Adding icons to cultures * Add files via upload * Cultural localisations uploaded Translations' review would be fine * Add files via upload * Add files via upload * (German) Fixed "British" being called "Columbia" * Updated some gfxs Cultural ideas have been updated with better art for: -North Andean -Platinean -Swedish -Dixie -Mexican * Output culture ideas * Adding back absolutist icons (#571) * Update countrypoliticsview.gfx Adding back absolutist icons * Update countrypoliticsview.gfx Adding also communist and radical puppets icons * Create army_portraits.txt (#575) Explaining in pull request * New tech mappings & converted units have equipment factor 0.7 (#580) * new Stability & War support conversion * Stability based on militancy, war support on war related matters * dont convert stability * New tech mappings * convert units with 70% equipment * Remove the unused Vic2 reforms * Correct the army portraits file * Override country localisation with the proper one. #378 * Clean up the province mapper * improved alliance event (#581) * Improve the paser helpers for strings: - Remove outer quotes - Handle UTF-8 * Update how names are handled * Update names import to work on Linux * Fixing flickering flags (#584) * Create _cultures.txt * Add files via upload Adding icons to cultures * Add files via upload * Cultural localisations uploaded Translations' review would be fine * Add files via upload * Add files via upload * (German) Fixed "British" being called "Columbia" * Updated some gfxs Cultural ideas have been updated with better art for: -North Andean -Platinean -Swedish -Dixie -Mexican * Add files via upload * 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 * Remove references to some old unused functions * Update inventions to use the new parser * Support for removing the old dead leader functions * Make impassable provinces use new parser * Update graphics mapper * Refactor government mapper * Fix include for linux build * Make Vic2 culture groups use new parser * Make country mapper use new parser * Fixes to country mapper change * Update import of ideological ideas * Only read the default HoI4 states once (and use the new parser) * Remove some unused references to the old parser * change supply zones to use new parser * Make strategic regions use the new parser * Remove some dead code * Move tech mappings (and research bonuses) into their own file * Move resources into their own class * changes to addAbsolutistEmpire focuses and localisation (#596) * Add a parser helper for making a group of items a group of strings * A slight fix to string lists * Import leader traits using the new parser. * Add a helper for when you only care about the names of some items * Use new parser to read ideology files * Add some std:: * Remove references to the conversions between new and old parsers * Remove final references to old parser stuff * Strip references to Boost * Add a debug configuration now that it can work in a decent amount of time * Update province mappings with corrected city locations * Fix surname output * A fix to the String of Items parser helper * Correction to traits file formatting * Fix the broken EU4 build * Make the influence_ focus in the communist coup tree have all ideologies (#402) * Update to debug output of VPs (#404) * Slight localisation fix * Place coastal bunkers. * Output bunkers that match known positions. * Fix typos in province mappings * Prepare for more extensive HoI4 map data * Clean up from static analysis * Fix linux build * Handle missing bunkers * Update HoI4FocusTree.cpp (#603) * changes to Fascist focuses & War Creator (#604) * changes to addGPWarBranch and Fascist fixes (#605) * Place airports, using existing airport locations where possible. * Place dockyards * Refactor building placement a little * Place synthetic refineries and nuclear reactors. * Fix a building placement bug. * Place anti-air buildings * Fix some building positioning errors * Place arms factories and industrial complexes * Handle missing localisations from Vic2 by using the English ones * Protect nations that become landless from crashing during army conversion. * Fix correction of bad characters to actually do it. * Update HoI4Country.cpp (#611) * Better artwork for some cultures (#613) * Create dummy.txt * Delete dummy.txt * Add files via upload Better art found * Update culture_ideas.gfx Updating alien culture * New decisions and related files for HoI4 (#539) * Creating new decisions There are here a Turkish<->Ottomans name switch and all the formable countries (blanked out until tag support achieved) * Update 00_formable_categories.txt Fixed * Decisions-related localisations added * Create 000_countries.txt * Add files via upload The three that are not vanilla tags. * Adding Ottoman decisions category * Update zz_converter.txt * Update ideas2_l_english.yml Adding Chinese decision localization (will be followed by the other languages) * Update ideas2_l_french.yml * Update 000_countries.txt * Update ideas2_l_german.yml * Update ideas2_l_spanish.yml * Update ideas2_l_braz_por.yml * Update ideas2_l_polish.yml * Update ideas2_l_russian.yml * Update OnActions.cpp (#615) * Link 'hold the <ideology> referendum' decision to the necessary events (#589) * Change default HoI4 version to 1.5.4 * Convert individual armies * Handle province mappings for mods * Convert armies as a whole, not just individual brigades * Make the force multiplier work again * Convert individual navies * Update culture_ideas.gfx (#616) Better icons (from vanilla) for German (removed Nazism), Undead, Horse, and Noculture (for this latter, used the "error dog") * Quick-n-dirty conversion of generals * Quick-n-dirty conversion of admirals * Add files via upload (#617) * 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 * Update country_mappings.txt (#619) Kazakhstan changed location * Adding some more slave cultures (#622) * 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 files via upload * Add files via upload * Add files via upload * Fix a major problem with the AI peaces that prevents fascists from taking land * Line endings in localisation files? IDK. * Provide transport technology * 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 * Some on_actions fixes * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Aromanian culture (#627) * Update culture_ideas.gfx * Update _cultures.txt * Update cultures_l_english.yml * Update cultures_l_braz_por.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 files via upload * Improvements to naval positions * Mobilised regiment detection (#628) * 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 * Province names (#618) * Province name parsing git cherry-pick --continu * DSA * Put back registerKeyword for name * Typo in to_string * Whitespace issues * Country identifier string * Add simpleObject parser * Parse ID for POPs * Fix whitespace issue in simpleObject * Expose whether regiments are mobilised or regular * Artillery substitutes (#629) * Whitespace * Allow artillery substitutes * Fix compile issues * Add unit tests for Vic2::Agreement (#634) * Fix Filename error (#635) * Add unit tests for Vic2::Agreement * Add a failing test for the filename error * Change a namespace to make the tests more clear * Add tests to verify the rest of getOutputName() * Slight refactoring: * getOutputName() -> setOutputName() * extract function to clear output folder from setOutputName() * Fix the filename error * Properly handle saves with bad extensions. * Airplane types (#636) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Airplane type backups * Support for HoI forts (#637) * Support for coastal forts (#640) * Military mapping from files (#641) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Add capability to have different military mappings * Make allMilitaryMappings parse from file. * First pass at militaryMappings actually parsing a file * Get the Vic2 unit names in mappings * Copy the correct unit mappings file * const correctness fixes * Import the HoI4 part of unit mappings from file * Remove the hard-coded unit mappings * Don't ignore every other set of military mappings * Fix the unit mappings file * Simplify the tests. * Allow HoI4::RegimentType to parse its own data. * Allow division templates to come from parsed input * Add header to tests files. * Fully import division templates * Ignore the 'priority' item in the data file * Make unit mappings data file match the former hard-coded stuff * Fix some merge errors (#643) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Parse prestige (#642) * Add files via upload * Add files via upload * Add files via upload * Update version number * More HoI4 portraits (#610) * 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 country_mappings.txt (#649) * Restoring some News events (#626) * Restoring some News events Events restored (and edited to remove tag-references and ideology-references): -XI Olympiad (Berlin) -XII Olympiad (Tokyo) -Komet Sighted -The Fourth International * Update country_mappings.txt Minor edits * Deletion of hashed out code * New Roman Empire tag * Update NewsEvents.txt Removed Olympics and Komet sighted and the Fourth International * As requested * Substitute brigades (#651) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Various minor bugfixes to military mappings and related tests * Allow substitutes to be imported from file. * Add tests for division types * Split army items into their own files. * Split the military mapping items into separate files. * Move HoI4 armies into their own file for easier testing * Add a missing header change * Remove a test file that's not currently used * Pass all military mappings to functions that use all the sub-items * Clean up some existing tests for better clarity and speed * An initial set of tests for HoI4 Army stuff. * Get brigade substitutes from military mapping file. * Improve a parser error case. * Fix copying of debug data files. * Fix state capitals (#652) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Record Vic2 state capitals * When statea capital can't be determined, use the most populous province. * Eliminate some false-positive warnings * 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
Idhrendur
added a commit
that referenced
this pull request
Nov 9, 2018
* Make Vic2::State use the new parser * Refactor the merge rules out from V2World * Remove an extraneous commit * Ignore the unneeded items in Vic2::State * Update countrypoliticsview.gui (#537) * Significantly speed up conversion speeds * Enable better localisations for customized focuses. * 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 * Switch Vic2::World to use the new parser * Switch Vic2::Party to use the new parser * First pass at temporary fix for national focuses (untested) * Add a catchall to V2party * More focus tree fixes * Don't output names, unit names, advisors, or idea sprites for invalid nations * Use the new parser to read the ideological advisor file * A fix to the converter focuses * Update old ideologies in economic ideas * Switch the advisors to use the new parser * Resolve assorted errors * Update the frontend default configuration a little * Allow leader traits to better handle absent ideologies * Fixes to decisions when not all ideologies exist * Fix a focus if some ideologies are dropped. * Update test saves with up-to-date configuration * Modified addCommunitCoupBranch focuses in accordance with post 1083 in dev thread (#542) * Convert war justification events (localisations not complete) * A fix for broken Linux builds (hopefully) * An actual fix for Linux builds. * Change hoe HoI4 ideas are handled * Update manpower ideas with correct ideologies * War justification events fixes (#550) * Changed "Neutral" to "Neutrality" * 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 events2_l_braz_por.yml * Localisation fixes due to my bad instructions * Import and export economic ideas * Some quick localisation fixes * Fix the economic ideas to only refer to ideologies that exist * War justification events further localisation (#552) * New localisations * 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 events2_l_braz_por.yml Fixed brackets * Update events2_l_french.yml Fixed brackets * Update events2_l_german.yml Fixed brackets * Update events2_l_polish.yml Fixed brackets * Update events2_l_russian.yml Fixed brackets * Update events2_l_spanish.yml Fixed brackets * Adding missing "fascism_ideological_sympathies.a.tt" Will be doing this to all languages * Update events2_l_english.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 * Codification code fixing (#553) * Fixing #430 and adding languages It should work. * Minor edit I forgot a line of code * Import and then export ideas/zzz_generic.txt * Fix some warnings * Fixes for Linux version * Add missing section for idea * Update more ideas for existing ideologies * Import and re-export some ai peace files * Fixes for missing ideology in ai peace files * A bunch of updates to set up ideologies correctly * Fix a typo * Fix the war justification on_actions * Eliminate the last has_government errors for this test save * Fix errors from Bhutan test save * Further further updated war localisations (#554) * Update events2_l_english.yml Fixed From and Root going weird * Update events2_l_braz_por.yml Idem * Update events2_l_braz_por.yml Again, but better fixed * Update events2_l_english.yml Just a sec * Update events2_l_english.yml * Update events2_l_english.yml Fixed * Update events2_l_french.yml Fixed Roots and Froms * Update events2_l_german.yml Idem * Update events2_l_polish.yml Idem * Update events2_l_russian.yml Idem * Update events2_l_spanish.yml Idem * Update events2_l_braz_por.yml New localisations * Update events2_l_english.yml Idem * Update events2_l_french.yml Idem * Update events2_l_german.yml Idem * Update events2_l_polish.yml Idem * Update events2_l_russian.yml Idem * Update events2_l_spanish.yml Idem * Fix a potential crash bug, and also simplify some code. * Bugfix to GP democracy focus tension requirements & doctrine conversion (#555) * Fix doctrine bonuses & war propaganda requirements * Doctrine bonuses are now 90% * improved the starting production (#556) * set starting production * fixed line that prevented units from converting & tweaked starting production * Added a forgotten newline \n * Fix a focus tree problem when democratic is absent * Update V2Localisations.cpp (#557) Editing "Portugese" and the apostrophe * Update 00_portraits.txt (#559) Adding default absolutist and radical portraits (in case of countries flipping ideologies) * Update bookmark generation (#565) Adding the "Other countries" slot (hopefully) * GFX and name conversion update (#558) * Update cultureGroupToGraphics.txt Adding HPM culture and historical figures * Update names.txt Female surnames added * Create zz_cultureGroupToGraphics.txt Default-portraits based file * Fix some localisation files * Make a necessary idea always present * Add a test save with no democratic nations * Clear a couple of default events * Make a fascist idea a general idea * Make sure a democratic-specific election event only appears if democratic exists * Fix some errors caused by democracy being missing * Handle the HPM 'serfs' pop type * More focus fixes after testing * Furthest further updated localisations (#567) * Update events2_l_english.yml Adding more missing text * Update events2_l_braz_por.yml Idem * Update events2_l_french.yml Idem * Update events2_l_german.yml Idem * Update events2_l_polish.yml Idem * Update events2_l_russian.yml Idem * Update events2_l_spanish.yml Idem * Roll version number * Some support file for steam workshop * Fix typo in converter list (#570) * Update README.md * Remove last references to the old parser in V2World * War support conversion improvement (#573) * new Stability & War support conversion * Stability based on militancy, war support on war related matters * dont convert stability * Make configuration use the new parser * changes to communist focus branches (#576) * changes to communist focus branches * Added communist focus localisations * Clean up HoI4 Army code * Code changes to addAbsolutistEmpireNationalFocuses (#577) * Make faction formation optional * Fix for linux build * Add localisations for Absolutist focuses (#578) * Refactor Vic2 state definitions * Updated Visual Studio files * Give secondary powers focus trees so they appear on the bookmark * Clean up state categories * Cultural ideas for HoI4 (#538) * Create _cultures.txt * Add files via upload Adding icons to cultures * Add files via upload * Cultural localisations uploaded Translations' review would be fine * Add files via upload * Add files via upload * (German) Fixed "British" being called "Columbia" * Updated some gfxs Cultural ideas have been updated with better art for: -North Andean -Platinean -Swedish -Dixie -Mexican * Output culture ideas * Adding back absolutist icons (#571) * Update countrypoliticsview.gfx Adding back absolutist icons * Update countrypoliticsview.gfx Adding also communist and radical puppets icons * Create army_portraits.txt (#575) Explaining in pull request * New tech mappings & converted units have equipment factor 0.7 (#580) * new Stability & War support conversion * Stability based on militancy, war support on war related matters * dont convert stability * New tech mappings * convert units with 70% equipment * Remove the unused Vic2 reforms * Correct the army portraits file * Override country localisation with the proper one. #378 * Clean up the province mapper * 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 * improved alliance event (#581) * Improve the paser helpers for strings: - Remove outer quotes - Handle UTF-8 * Update how names are handled * Update names import to work on Linux * Fixing flickering flags (#584) * Create _cultures.txt * Add files via upload Adding icons to cultures * Add files via upload * Cultural localisations uploaded Translations' review would be fine * Add files via upload * Add files via upload * (German) Fixed "British" being called "Columbia" * Updated some gfxs Cultural ideas have been updated with better art for: -North Andean -Platinean -Swedish -Dixie -Mexican * Add files via upload * 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 * Remove references to some old unused functions * Update inventions to use the new parser * Support for removing the old dead leader functions * Make impassable provinces use new parser * Update graphics mapper * Refactor government mapper * Fix include for linux build * Make Vic2 culture groups use new parser * Make country mapper use new parser * Fixes to country mapper change * Update import of ideological ideas * Only read the default HoI4 states once (and use the new parser) * Remove some unused references to the old parser * change supply zones to use new parser * Make strategic regions use the new parser * Remove some dead code * Move tech mappings (and research bonuses) into their own file * Move resources into their own class * changes to addAbsolutistEmpire focuses and localisation (#596) * Add a parser helper for making a group of items a group of strings * A slight fix to string lists * Import leader traits using the new parser. * Add a helper for when you only care about the names of some items * Use new parser to read ideology files * Add some std:: * Remove references to the conversions between new and old parsers * Remove final references to old parser stuff * Strip references to Boost * Add a debug configuration now that it can work in a decent amount of time * Update province mappings with corrected city locations * Fix surname output * A fix to the String of Items parser helper * Correction to traits file formatting * Fix the broken EU4 build * Make the influence_ focus in the communist coup tree have all ideologies (#402) * Update to debug output of VPs (#404) * Slight localisation fix * Place coastal bunkers. * Output bunkers that match known positions. * Fix typos in province mappings * Prepare for more extensive HoI4 map data * Clean up from static analysis * Fix linux build * Handle missing bunkers * Update HoI4FocusTree.cpp (#603) * changes to Fascist focuses & War Creator (#604) * changes to addGPWarBranch and Fascist fixes (#605) * Place airports, using existing airport locations where possible. * Place dockyards * Refactor building placement a little * Place synthetic refineries and nuclear reactors. * Fix a building placement bug. * Place anti-air buildings * Fix some building positioning errors * Place arms factories and industrial complexes * Handle missing localisations from Vic2 by using the English ones * Protect nations that become landless from crashing during army conversion. * Fix correction of bad characters to actually do it. * Update V2Reforms.cpp * Update HoI4Country.cpp (#611) * Better artwork for some cultures (#613) * Create dummy.txt * Delete dummy.txt * Add files via upload Better art found * Update culture_ideas.gfx Updating alien culture * New decisions and related files for HoI4 (#539) * Creating new decisions There are here a Turkish<->Ottomans name switch and all the formable countries (blanked out until tag support achieved) * Update 00_formable_categories.txt Fixed * Decisions-related localisations added * Create 000_countries.txt * Add files via upload The three that are not vanilla tags. * Adding Ottoman decisions category * Update zz_converter.txt * Update ideas2_l_english.yml Adding Chinese decision localization (will be followed by the other languages) * Update ideas2_l_french.yml * Update 000_countries.txt * Update ideas2_l_german.yml * Update ideas2_l_spanish.yml * Update ideas2_l_braz_por.yml * Update ideas2_l_polish.yml * Update ideas2_l_russian.yml * Update OnActions.cpp (#615) * Link 'hold the <ideology> referendum' decision to the necessary events (#589) * Change default HoI4 version to 1.5.4 * Convert individual armies * Handle province mappings for mods * Convert armies as a whole, not just individual brigades * Make the force multiplier work again * Convert individual navies * Update culture_ideas.gfx (#616) Better icons (from vanilla) for German (removed Nazism), Undead, Horse, and Noculture (for this latter, used the "error dog") * Quick-n-dirty conversion of generals * Quick-n-dirty conversion of admirals * Add files via upload (#617) * 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 * Update country_mappings.txt (#619) Kazakhstan changed location * Adding some more slave cultures (#622) * 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 files via upload * Add files via upload * Add files via upload * Fix a major problem with the AI peaces that prevents fascists from taking land * Line endings in localisation files? IDK. * Provide transport technology * 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 * Some on_actions fixes * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Aromanian culture (#627) * Update culture_ideas.gfx * Update _cultures.txt * Update cultures_l_english.yml * Update cultures_l_braz_por.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 files via upload * Improvements to naval positions * Mobilised regiment detection (#628) * 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 * Province names (#618) * Province name parsing git cherry-pick --continu * DSA * Put back registerKeyword for name * Typo in to_string * Whitespace issues * Country identifier string * Add simpleObject parser * Parse ID for POPs * Fix whitespace issue in simpleObject * Expose whether regiments are mobilised or regular * Artillery substitutes (#629) * Whitespace * Allow artillery substitutes * Fix compile issues * Add unit tests for Vic2::Agreement (#634) * Fix Filename error (#635) * Add unit tests for Vic2::Agreement * Add a failing test for the filename error * Change a namespace to make the tests more clear * Add tests to verify the rest of getOutputName() * Slight refactoring: * getOutputName() -> setOutputName() * extract function to clear output folder from setOutputName() * Fix the filename error * Properly handle saves with bad extensions. * Airplane types (#636) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Airplane type backups * Support for HoI forts (#637) * Support for coastal forts (#640) * Military mapping from files (#641) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Add capability to have different military mappings * Make allMilitaryMappings parse from file. * First pass at militaryMappings actually parsing a file * Get the Vic2 unit names in mappings * Copy the correct unit mappings file * const correctness fixes * Import the HoI4 part of unit mappings from file * Remove the hard-coded unit mappings * Don't ignore every other set of military mappings * Fix the unit mappings file * Simplify the tests. * Allow HoI4::RegimentType to parse its own data. * Allow division templates to come from parsed input * Add header to tests files. * Fully import division templates * Ignore the 'priority' item in the data file * Make unit mappings data file match the former hard-coded stuff * Fix some merge errors (#643) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Parse prestige (#642) * 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 * More HoI4 portraits (#610) * 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 country_mappings.txt (#649) * Restoring some News events (#626) * Restoring some News events Events restored (and edited to remove tag-references and ideology-references): -XI Olympiad (Berlin) -XII Olympiad (Tokyo) -Komet Sighted -The Fourth International * Update country_mappings.txt Minor edits * Deletion of hashed out code * New Roman Empire tag * Update NewsEvents.txt Removed Olympics and Komet sighted and the Fourth International * As requested * Substitute brigades (#651) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Various minor bugfixes to military mappings and related tests * Allow substitutes to be imported from file. * Add tests for division types * Split army items into their own files. * Split the military mapping items into separate files. * Move HoI4 armies into their own file for easier testing * Add a missing header change * Remove a test file that's not currently used * Pass all military mappings to functions that use all the sub-items * Clean up some existing tests for better clarity and speed * An initial set of tests for HoI4 Army stuff. * Get brigade substitutes from military mapping file. * Improve a parser error case. * Fix copying of debug data files. * Fix state capitals (#652) * Add unit tests for Vic2::Agreement * Move military templates into their own class * Add tests for the military mappings * Fix merge error * Record Vic2 state capitals * When statea capital can't be determined, use the most populous province. * Eliminate some false-positive warnings * 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 * Merge in Multiple Selection preferences (#681) * Add multiple selection preference option Adds "allowMultipleSelections" option to preferences, which allows checkbox selection of multiple entries for a preference and will output one line per entry to configuration.txt * Clean up some leftover cruft from the Frontend Remove some unnecessary/leftover comments from the Frontend and return the base.ToString() if our StringList's Value is null to be consistent with the other types. * Remove accidental addition of Visual Studio 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.
Adds a member variable and parsing support for prestige of Victoria countries.