changes to opentest branch only.
fixed bug in attacker & defender lists when player is in the conflict.
made willingness to accept demands to end conflict affected by willingness to obey and if the faction is doing well in surrender progress, and willingness for ally to leave conflict just by willingness to obey.
made changes and additions to ingame events, faction actions, promises, and promise hooks to allow for promises around intervening in conflicts. i should have never made all this stuff user modifiable its so much more work.
fixed bug in location not being set correctly for local conflicts in start_conflict_1v1.
fixed bug in sector control not being stored correctly in local conflict creation.
added to scripting including way to tell if the player is in the same conflict as a faction.
added ad hoc tooltip localised text for join_conflict effect.
changed behind the scenes code for promises accessing hooks.
implemented promises failure hooks behind the scenes code.