Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor changes #178

Merged
merged 2 commits into from
Aug 30, 2018
Merged

Minor changes #178

merged 2 commits into from
Aug 30, 2018

Conversation

IhateTrains
Copy link
Collaborator

  • Fixed "piety" instead of "monthly_character_piety" modifier
  • Decision pre-trigger optimisation

Copy link
Owner

@xirsoi xirsoi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@xirsoi xirsoi merged commit 0ef7053 into develop Aug 30, 2018
xirsoi added a commit that referenced this pull request Dec 2, 2018
* fixes #159

* fixes court druid being un-assignable

fixes aten pagans being given feudal government instead of Iqta when
reforming their government

* merges changes from vanilla 2.8.1

* IhT fixes (#162)

* cleaning the Silk Road "hot-spot" trigger of duplicates

* Validator fixes

- sound fixes
- revoke_allowed blocks aren't needed, they just pollute the Validator
- minor fixes

* Feature/#146 wines and oils (#163)

* prepare changelog for next version

* get started with wine and oil artifacts

* stuff and things

* add skeleton of dionysian mysteries for #152

* more #152 work

* add localisations and start dionysia work

* merge vanilla 2.8 changes

cleanup still to be done, but i must sleep

* fixing of the things

* lol, updates generalstuff.gfx

* fixes religious icons

fixes atenic government
fixes the Convert to Swedish decision being deleted
disables some in development decisions

* update readme

* removes unnecessary on_actions entry

* increase likelihood of Philosopher appearing and fixes the lost in sandstorm event

* crusades and jihads can be called in a paganified world by a player

* aspirational dev log

immortal pagans
some fixes

* Small fixes (#164)

* cleaning the Silk Road "hot-spot" trigger of duplicates

* Validator fixes

- sound fixes
- revoke_allowed blocks aren't needed, they just pollute the Validator
- minor fixes

* parse failures fix

* added missing localisation

* minor fixes

* minor fix + disabled localisation duplicate with vanilla

* #127 updated missed eternal life mystic spawns and updated changelog

* adds standard HO events for the men of steel\nmakes the vassalize fianna decision a tetch more permissive

* adds some triggers that will be necessary to create generic holy order features

* copies HO events and begins genericizing them

* makes further advancement to generic holy order features

* genericizes remaining HO events and fixes some typos revealed by Validator

* adds 'borrow from holy order' decision and related triggers

* implements expel and vassalize holy orders, just missing some triggers

* testing

* adds missing scripted trigger

* fixes two bugs

* adds donate to holy order decision

* cannot donate to HO you expelled!

* validator fixes

* more validator fixes

* more validator fixes

* moar fixes

* Some fixes + localisation (#167)

* cleaning the Silk Road "hot-spot" trigger of duplicates

* Validator fixes

- sound fixes
- revoke_allowed blocks aren't needed, they just pollute the Validator
- minor fixes

* parse failures fix

* added missing localisation

* minor fixes

* minor fix + disabled localisation duplicate with vanilla

* some localisation

* Localised not_already_holding_tristeria

* "is_occupied = no" fixes

* incorporates necessary functionality to support character modifiers in holy order mechanics

* fixes missed merge conflicts

* Some event references' fixes (#171)

* validator fixes to holy order code

* fixes up gho decisions

* giant refactor of namespaces and some localisations

* refactors all EVTOPTA to .a

* refactors out other event options, titles, and tooltips, then runs through validator for mistakes

* more validator fixes

* #118 start adding britannic religion

* #118 adds holy order and some simple features

* #118 mechanics for the archdryad

* #118 some more britannic events

* hellenic.502 fix (#173)

* #118 progress on tumtha mechanic

* #118 moar events

*  More intuitive decision conditions in priesthood restorations (#174)

* hellenic.502 fix

* More intuitive decision conditions (players know what do to first)

* #118 more imbolg events

* Event pictures fixes (#175)

* Event pictures fixes

* More event pictures fixes

* More event pictures fixes

* #118 lots of localisation and some event updates

* traits, events, and localisation

* Pre-trigger optimisation part one (#176)

* Event pictures fixes

* More event pictures fixes

* More event pictures fixes

* A lot of minor optimisation

* Pre-trigger optimisation part two (#177)

* Event pictures fixes

* More event pictures fixes

* More event pictures fixes

* A lot of minor optimisation

* More pre-trigger optimisation

* Minor changes (#178)

* Decisions pre-trigger optimisation

* piety -> monthly_character_piety

* many new graphical assets

* many many bug fixes

* fixed various bugs and added overrides for pragmatist and zealot voting pattersn

* various fixes for dryad stuff

* compensate for enatic theocracies being impossible right now

* #118 makes several small fixes

* fixing things

* adds more archdryad interactions

* fix somes britannic bugs

* #155 makes nile flooding events less spammy

* began adding celtic artefacts for the 'ad gives treasure' event

* adds three new britannic artifacts

* adds celtic artifacts and relics to relic hunter events

* adds hellenic artifacts and all artifact events

* adds default text encoding in visual studio and updates artifact code

* Two tweaks (#179)

- parse failure fix
- removal of some loc duplicate with vanilla

* completes AD gives artifact feature

* add localisation

* GFX_organize_burning_blades (#180)

* final updates to localisation

* adds missing artifact images

* round one of 3.0 compatching

* many, many, updates for 3.0

* adds spear of lugh and begins egyptian reformed update

* omg more stuff

* update icon strips and fix a bug with governments

* fixed history, fixed religion icons, added missing artifact image

* fix localisations, add meryatenate crown, update changelog

* update changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants