search

HairyDude / pdxparse

A parser for scripts used in Paradox Development Studios games, written in Haskell
MIT License
6 stars 7 forks source link

Further additions and bugfixes #21

Open IgnoredAmbience opened 4 years ago

HairyDude commented 4 years ago

Looks like I have to learn how to deal with merge conflicts :nerd_face:

IgnoredAmbience commented 4 years ago

I can try and rebase it to the new master branch.

I think I might have more changed locally, I'd got rather tied up in knots on Sunday looking at the advisor/ruler code and gave up editing further.

IgnoredAmbience commented 4 years ago

Rebased there were some hidden changes that the GitHub diff didn't bring up, causing the compile to fail. Fixed these. Compiles, but not re-tested functionality.

IgnoredAmbience commented 4 years ago

Another update to add pronoun support to the culture and religion define_ruler fields

grotaclas commented 3 years ago

@HairyDude I'm curious why you didn't merge this. I'd like to make some pull requests in the near future and I'm wondering if I should base them on these changes or backport them to the master branch.