aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of https://github.com/OpenVicProject/OpenVic-Simulationtax_sliders Julius23 hours-99/+12
|\
| * Merge pull request #229 from OpenVicProject/artisan_modifiers_no_effectHEADmaster wvpm5 days-5/+6
| |\ | | | | | | artisan_goods_ modifiers have no effect
| | * artisan_goods_ modifiers have no effectartisan_modifiers_no_effect wvpm10 days-5/+6
| | |
| * | Merge pull request #227 from OpenVicProject/cleanup_fixedpoint wvpm5 days-94/+6
| |\ \ | | |/ | |/| Remove unused (and inaccurate) fixed point members
| | * Remove unused (and inaccurate) fixed point memberscleanup_fixedpoint wvpm5 days-94/+6
| |/
* / Created Slider header file Julius23 hours-3/+68
|/ | | | Need to work on updating tax rate
* Merge pull request #223 from OpenVicProject/add-indexed-map-mapping-type Hop31113 days-0/+1
|\ | | | | Add IndexedMap::mapping_type alias for easier interchangeability with ordered_maps
| * Add IndexedMap::mapping_type alias for easier interchangeability with ↵ hop31113 days-0/+1
|/ | | | ordered_maps
* Merge pull request #222 from OpenVicProject/defines-variables Hop3112024-10-31-375/+2559
|\ | | | | Load defines directly into named and typed variables rather than using an IdentifierRegistry
| * Load defines directly into named and typed variables rather than using an ↵defines-variables hop3112024-10-31-375/+2559
| | | | | | | | IdentifierRegistry
* | Merge pull request #218 from OpenVicProject/condition-scripts-prep-work Hop3112024-10-31-127/+251
|\ \ | | | | | | Condition scripts prep work
| * | Finish ConditionalWeight base key parsing (including days/months/years) hop3112024-10-31-19/+98
| | |
| * | Rename `scope_t` enum to `scope_type_t` hop3112024-10-29-108/+153
| | |
* | | Merge pull request #221 from OpenVicProject/correct_rgo_size wvpm2024-10-31-4/+24
|\ \ \ | |_|/ |/| | Correct rgo size calcuation
| * | Correct rgo size calcuation wvpm2024-10-31-4/+24
|/ /
* | Merge pull request #220 from OpenVicProject/cleanup_const& wvpm2024-10-30-6/+6
|\ \ | | | | | | Use normal const for fixed_point_t
| * | Use normal const for fixed_point_tcleanup_const& wvpm2024-10-30-6/+6
|/ /
* | Merge pull request #206 from OpenVicProject/prepare_for_rgo wvpm2024-10-30-143/+712
|\ \ | | | | | | Prepare for rgo
| * | Implement rgo for new gameprepare_for_rgo wvpm2024-10-30-143/+712
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map province history rgo to production type for province instance output_goods back to ZERO_OR_ONE Link trade_goods in history to RGO instance for province. Other producer types as structs instead of classes Convert pops to equivalents & calculate rgo size Also convert pops when changing rgo Clean up Refactored RGO into part of ProvinceInstance ProductionType const& output_good Remove unused imports Clean up unused imports Restore constructor for ResourceGatheringOperation to initialise from savegame Move rgo size calculation to rgo Use terrain modifiers to calculate rgo size (placeholder code) Clean up Basic production & sales for rgo when initialising new game Use mutable pops Paychecks for owners, workers and slaves Clean up Simplify rgo instantiation Co-authored-by: Hop311 <Hop3114@gmail.com> Simplify good_to_rgo_production_type assignment Co-authored-by: Hop311 <Hop3114@gmail.com> Fix import Co-authored-by: Hop311 <Hop3114@gmail.com> min(3, great_powers.size()) Co-authored-by: Hop311 <Hop3114@gmail.com> Fix import Co-authored-by: Hop311 <Hop3114@gmail.com> Apply comments Log errors and return result when applying history Cleanup
* | Merge pull request #219 from OpenVicProject/always_apply_pop_history wvpm2024-10-30-6/+9
|\ \ | |/ |/| Always apply pop history
| * Always apply pop historyalways_apply_pop_history wvpm2024-10-30-6/+9
|/
* Merge pull request #215 from OpenVicProject/movement_cost wvpm2024-10-29-17/+3
|\ | | | | movement_cost is a province modifier
| * movement_cost is a province modifiermovement_cost wvpm2024-10-29-17/+3
| |
* | Merge pull request #216 from OpenVicProject/attrition_local_modifier wvpm2024-10-29-3/+6
|\ \ | | | | | | Support attrition modifier from terrain
| * | Support attrition modifier from terrainattrition_local_modifier wvpm2024-10-29-3/+6
| |/
* | Merge pull request #217 from OpenVicProject/allow_unit_icon_0 wvpm2024-10-29-2/+2
|\ \ | |/ |/| Allow unit icon to be 0
| * Allow unit icon to be 0allow_unit_icon_0 wvpm2024-10-29-2/+2
|/
* Merge pull request #214 from ↵ wvpm2024-10-28-3/+3
|\ | | | | | | | | OpenVicProject/provinces_contribute_to_controller_not_owner Provinces contribute modifiers to controller, not owner
| * Provinces contribute modifiers to controller, not ownerprovinces_contribute_to_controller_not_owner wvpm2024-10-28-3/+3
|/
* Merge pull request #210 from OpenVicProject/contextual_modifier_parsing wvpm2024-10-26-930/+988
|\ | | | | Contextual modifier parsing
| * contextual modifier parsingcontextual_modifier_parsing wvpm2024-10-26-930/+988
|/
* Merge pull request #209 from OpenVicProject/modifier-excluded-targets-fix Hop3112024-10-20-2/+2
|\ | | | | Change default `excluded_targets` argument for `ModifierSum::add_modifier[_nullcheck]` from `ALL_TARGETS` to `NO_TARGETS`
| * Change default `excluded_targets` argument for ↵modifier-excluded-targets-fix hop3112024-10-20-2/+2
|/ | | | `ModifierSum::add_modifier[_nullcheck]` from `ALL_TARGETS` to `NO_TARGETS`
* Merge pull request #198 from OpenVicProject/resultant-modifier Hop3112024-10-20-1008/+2912
|\ | | | | Calculate country and province modifier sums
| * Add modifier effect variants based on the type of modifier being parsedresultant-modifier hop3112024-10-19-25/+171
| |
| * Require modifier type when parsing ModifierValues hop3112024-10-19-68/+222
| |
| * Switch to excluding given modifier effect targets rather than using a ↵ hop3112024-10-19-38/+133
| | | | | | | | positive filter
| * Move ModifierManager to its own files hop3112024-10-19-835/+864
| |
| * Add alternative modifier calculation (keeping country modifiers out of their ↵ hop3112024-10-06-24/+142
| | | | | | | | owned provinces' modifier sums)
| * Add supply_consumption and mobilization_impact modifier effect check examples hop3112024-10-05-12/+29
| |
| * Cache modifier effects in dedicated variables hop3112024-10-05-228/+1015
| |
| * Move ModifierEffect and ModifierValue into their own files hop3112024-10-05-265/+308
| |
| * Calculate country and province resultant modifier sums hop3112024-10-05-60/+264
| |
| * Add nullcheck fuction variants accepting pointer arguments to ModifierValue ↵ hop3112024-10-05-0/+30
| | | | | | | | and ModifierSum
| * Add ModifierEffect targets hop3112024-10-05-182/+273
| |
| * Make ModifierEffect format argument mandatory hop3112024-10-05-56/+56
| |
| * Cache static modifiers in dedicated variables hop3112024-10-05-1/+187
| |
| * Store sources in ModifierSum hop3112024-10-05-29/+33
|/
* Merge pull request #207 from OpenVicProject/remove-culture zaaarf2024-09-27-6/+38
|\ | | | | Added support for remove_culture custom instruction
| * Added support for remove_culture custom instructionremove-culture zaaarf2024-09-27-6/+38
|/
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100