todo events

1 files changed, 149 insertions, 147 deletions

diff --git a/rules.js b/rules.js
index 2d63613..5a3b3f2 100644
--- a/rules.js
+++ b/rules.js
@@ -324,152 +324,152 @@ const LOC_RAVENSPUR = find_locale("Ravenspur")
 
 
 
-const AOW_LANCASTER_CULVERINS_AND_FALCONETS = [ L1, L2 ]
-const AOW_LANCASTER_MUSTERD_MY_SOLDIERS = L3
-const AOW_LANCASTER_HERALDS = L4
-const AOW_LANCASTER_CHURCH_BLESSINGS = L5
-const AOW_LANCASTER_GREAT_SHIPS = L6
-const AOW_LANCASTER_HARBINGERS = L7
-const AOW_LANCASTER_HAY_WAINS = L8
-const AOW_LANCASTER_QUARTERMASTERS = L9
-const AOW_LANCASTER_CHAMBERLAINS = L10
-const AOW_LANCASTER_IN_THE_NAME_OF_THE_KING = L11
-const AOW_LANCASTER_COMMISION_OF_ARRAY = L12
-const AOW_LANCASTER_EXPERT_COUNSELLORS = L13
-const AOW_LANCASTER_PERCYS_POWER = L14
-const AOW_LANCASTER_KINGS_PARLEY = L15
-const AOW_LANCASTER_NORTHMEN = L16
-const AOW_LANCASTER_MARGARET = L17
-const AOW_LANCASTER_COUNCIL_MEMBER = L18
-const AOW_LANCASTER_ANDREW_TROLLOPE = L19
-const AOW_LANCASTER_VETERAN_OF_FRENCH_WARS = L20
-const AOW_LANCASTER_MY_FATHERS_BLOOD = L21
-const AOW_LANCASTER_STAFFORD_ESTATES = L22
-const AOW_LANCASTER_MONTAGU = L23
-const AOW_LANCASTER_MARRIED_TO_A_NEVILLE = L24
-const AOW_LANCASTER_WELSH_LORD = L25
-const AOW_LANCASTER_EDWARRD = L26
-const AOW_LANCASTER_BARDED_HORSE = L27
-const AOW_LANCASTER_LOYAL_SOMERSET = L28
-const AOW_LANCASTER_HIGH_ADMIRAL = L29
-const AOW_LANCASTER_MERCHANTS = L30
-const AOW_LANCASTER_YEOMEN_OF_THE_CROWN = L31
-const AOW_LANCASTER_TWO_ROSES = L32
-const AOW_LANCASTER_PHILIBERT_DE_CHANDEE = L33
-const AOW_LANCASTER_PIQUIERS = L34
-const AOW_LANCASTER_THOMAS_STANLEY = L35
-const AOW_LANCASTER_CHEVALIERS = L36
-const AOW_LANCASTER_MADAME_LA_GRANDE = L37
-
-const AOW_YORK_CULVERINS_AND_FALCONETS = [ Y1, Y2 ]
-const AOW_YORK_MUSTERD_MY_SOLDIERS = Y3
-const AOW_YORK_WE_DONE_DEEDS_OF_CHARITY = Y4
-const AOW_YORK_THOMAS_BOURCHIER = Y5
-const AOW_YORK_GREAT_SHIPS = Y6
-const AOW_YORK_HARBINGERS = Y7
-const AOW_YORK_ENGLAND_IS_MY_HOME = Y8
-const AOW_YORK_BARRICADES = Y9
-const AOW_YORK_AGITATORS = Y10
-const AOW_YORK_YORKISTS_NEVER_WAIT = Y11
-const AOW_YORK_SOLDIERS_OF_FORTUNE = Y12
-const AOW_YORK_SCOURERS = Y13
-const AOW_YORK_BURGUNDIANS = [ Y14, Y23 ]
-const AOW_YORK_NAVAL_BLOCKADE = Y15
-const AOW_YORK_BELOVED_WARWICK = Y16
-const AOW_YORK_ALICE_MONTAGU = Y17
-const AOW_YORK_IRISHMEN = Y18
-const AOW_YORK_WELSHMEN = Y19
-const AOW_YORK_YORKS_FAVOURED_SON = Y20
-const AOW_YORK_SOUTHERNERS = Y21
-const AOW_YORK_FAIR_ARBITER = Y22
-const AOW_YORK_HASTINGS = Y24
-const AOW_YORK_PEMBROKE = Y25
-const AOW_YORK_FALLEN_BROTHER = Y26
-const AOW_YORK_PERCYS_NORTH1 = Y27
-const AOW_YORK_FIRST_SON = Y28
-const AOW_YORK_STAFFORD_BRANCH = Y29
-const AOW_YORK_CAPTAIN = Y30
-const AOW_YORK_WOODWILLES = Y31
-const AOW_YORK_FINAL_CHARGE = Y32
-const AOW_YORK_BLOODY_THOU_ART = Y33
-const AOW_YORK_SO_WISE_SO_YOUNG = Y34
-const AOW_YORK_KINGDOM_UNITED = Y35
-const AOW_YORK_VANGUARD = Y36
-const AOW_YORK_PERCYS_NORTH2 = Y37
-
-const EVENT_LANCASTER_LEEWARD_BATTLE_LINE = L1
-const EVENT_LANCASTER_FLANK_ATTACK = L2
-const EVENT_LANCASTER_ESCAPE_SHIP = L3
-const EVENT_LANCASTER_BE_SENT_FOR = L4
-const EVENT_LANCASTER_SUSPICION = L5
-const EVENT_LANCASTER_SEAMANSHIP = L6
-const EVENT_LANCASTER_FOR_TRUST_NOT_HIM = L7
-const EVENT_LANCASTER_FORCED_MARCHES = L8
-const EVENT_LANCASTER_RISING_WAGES = L9
-const EVENT_LANCASTER_NEW_ACT_OF_PARLIAMENT = L10
-const EVENT_LANCASTER_BLOCKED_FORD = L11
-const EVENT_LANCASTER_RAVINE = L12
-const EVENT_LANCASTER_ASPIELLES = L13
-const EVENT_LANCASTER_SCOTS = L14
-const EVENT_LANCASTER_HENRY_PRESSURES_PARLIAMENT = L15
-const EVENT_LANCASTER_WARDEN_OF_THE_MARCHES = L16	
-const EVENT_LANCASTER_MY_CROWN_IS_IN_MY_HEART = L17
-const EVENT_LANCASTER_PARLIAMENT_VOTES = L18
-const EVENT_LANCASTER_HENRYS_PROCLAMATION = L19
-const EVENT_LANCASTER_PARLIAMEN_TRUCE = L20
-const EVENT_LANCASTER_FRENCH_FLEET = L21
-const EVENT_LANCASTER_FRENCH_TROOPS = L22
-const EVENT_LANCASTER_WARWICKS_PROPAGANDA = [ L23, L24 ]
-const EVENT_LANCASTER_WELSH_REBELLION = L25
-const EVENT_LANCASTER_HENRY_RELEASED = L26
-const EVENT_LANCASTER_LUNIVERSELLE_ARAGNE = L27
-const EVENT_LANCASTER_REBEL_SUPPLY_DEPOT = L28
-const EVENT_LANCASTER_TO_WILFUL_DISOBEDIANCE = L29
-const EVENT_LANCASTER_FRENCH_WAR_LOANS = L30
-const EVENT_LANCASTER_ROBINS_REBELLION = L31
-const EVENT_LANCASTER_TUDOR_BANNERS = L32
-const EVENT_LANCASTER_SURPRISE_LANDING = L33
-const EVENT_LANCASTER_BUCKINGHAMS_PLOT = L34
-const EVENT_LANCASTER_MARGARET_BEAUFORT = L35
-const EVENT_LANCASTER_TALBOT_TO_THE_RESCUE = L36
-const EVENT_LANCASTER_THE_EARL_OF_RICHMOND = L37
-
-const EVENT_YORK_LEEWARD_BATTLE_LINE = Y1
-const EVENT_YORK_FLANK_ATTACK = Y2
-const EVENT_YORK_ESCAPE_SHIP = [ Y3, Y9 ]
-const EVENT_YORK_JACK_CADE = Y4
-const EVENT_YORK_SUSPICION = Y5
-const EVENT_YORK_SEAMANSHIP = Y6
-const EVENT_YORK_YORKISTS_BLOCK_PARLIAMENT = Y7
-const EVENT_YORK_EXILE_PACT = Y8
-const EVENT_YORK_TAX_COLLECTORS = Y10
-const EVENT_YORK_BLOCKED_FORD = Y11
-const EVENT_YORK_PARLIAMENTS_TRUCE = Y12
-const EVENT_YORK_ASPIELLES = Y13
-const EVENT_YORK_RICHARD_OF_YORK = Y14
-const EVENT_YORK_LONDON_FOR_YORK = Y15
-const EVENT_YORK_THE_COMMONS = Y16	
-const EVENT_YORK_SHEWOLF_OF_FRANCE = Y17
-const EVENT_YORK_SUCCESSION = Y18
-const EVENT_YORK_CALTROPS = Y19
-const EVENT_YORK_YORKIST_PARADE = Y20
-const EVENT_YORK_SIR_RICHARD_LEIGH = Y21
-const EVENT_YORK_LOYALTY_AND_TRUST = Y22
-const EVENT_YORK_CHARLES_THE_BOLD = Y23
-const EVENT_YORK_SUN_IN_SPLENDOUR = Y24
-const EVENT_YORK_OWAIN_GLYNDWR = Y25
-const EVENT_YORK_DUBIOUS_CLARENCE = Y26
-const EVENT_YORK_YORKIST_NORTH = Y27
-const EVENT_YORK_GLOUCESTER_AS_HEIR = Y28
-const EVENT_YORK_DORSET = Y29
-const EVENT_YORK_REGROUP = Y30
-const EVENT_YORK_EARL_RIVERS = Y31
-const EVENT_YORK_THE_KINGS_NAME = Y32
-const EVENT_YORK_EDWARD_V = Y33
-const EVENT_YORK_AN_HONEST_TALE_SPEEDS_BEST = Y34
-const EVENT_YORK_PRIVY_COUNCIL = Y35
-const EVENT_YORK_SWIFT_MANEUVER = Y36
-const EVENT_YORK_PATRICK_DE_LA_MOTE = Y37
+const AOW_LANCASTER_CULVERINS_AND_FALCONETS = [ L1, L2 ] // TODO
+const AOW_LANCASTER_MUSTERD_MY_SOLDIERS = L3 // TODO
+const AOW_LANCASTER_HERALDS = L4 // TODO
+const AOW_LANCASTER_CHURCH_BLESSINGS = L5 // TODO
+const AOW_LANCASTER_GREAT_SHIPS = L6 // TODO
+const AOW_LANCASTER_HARBINGERS = L7 // TODO
+const AOW_LANCASTER_HAY_WAINS = L8 // TODO
+const AOW_LANCASTER_QUARTERMASTERS = L9 // TODO
+const AOW_LANCASTER_CHAMBERLAINS = L10 // TODO
+const AOW_LANCASTER_IN_THE_NAME_OF_THE_KING = L11 // TODO
+const AOW_LANCASTER_COMMISION_OF_ARRAY = L12 // TODO
+const AOW_LANCASTER_EXPERT_COUNSELLORS = L13 // TODO
+const AOW_LANCASTER_PERCYS_POWER = L14 // TODO
+const AOW_LANCASTER_KINGS_PARLEY = L15 // TODO
+const AOW_LANCASTER_NORTHMEN = L16 // TODO
+const AOW_LANCASTER_MARGARET = L17 // TODO
+const AOW_LANCASTER_COUNCIL_MEMBER = L18 // TODO
+const AOW_LANCASTER_ANDREW_TROLLOPE = L19 // TODO
+const AOW_LANCASTER_VETERAN_OF_FRENCH_WARS = L20 // TODO
+const AOW_LANCASTER_MY_FATHERS_BLOOD = L21 // TODO
+const AOW_LANCASTER_STAFFORD_ESTATES = L22 // TODO
+const AOW_LANCASTER_MONTAGU = L23 // TODO
+const AOW_LANCASTER_MARRIED_TO_A_NEVILLE = L24 // TODO
+const AOW_LANCASTER_WELSH_LORD = L25 // TODO
+const AOW_LANCASTER_EDWARRD = L26 // TODO
+const AOW_LANCASTER_BARDED_HORSE = L27 // TODO
+const AOW_LANCASTER_LOYAL_SOMERSET = L28 // TODO
+const AOW_LANCASTER_HIGH_ADMIRAL = L29 // TODO
+const AOW_LANCASTER_MERCHANTS = L30 // TODO
+const AOW_LANCASTER_YEOMEN_OF_THE_CROWN = L31 // TODO
+const AOW_LANCASTER_TWO_ROSES = L32 // TODO
+const AOW_LANCASTER_PHILIBERT_DE_CHANDEE = L33 // TODO
+const AOW_LANCASTER_PIQUIERS = L34 // TODO
+const AOW_LANCASTER_THOMAS_STANLEY = L35 // TODO
+const AOW_LANCASTER_CHEVALIERS = L36 // TODO
+const AOW_LANCASTER_MADAME_LA_GRANDE = L37 // TODO
+
+const AOW_YORK_CULVERINS_AND_FALCONETS = [ Y1, Y2 ] // TODO
+const AOW_YORK_MUSTERD_MY_SOLDIERS = Y3 // TODO
+const AOW_YORK_WE_DONE_DEEDS_OF_CHARITY = Y4 // TODO
+const AOW_YORK_THOMAS_BOURCHIER = Y5 // TODO
+const AOW_YORK_GREAT_SHIPS = Y6 // TODO
+const AOW_YORK_HARBINGERS = Y7 // TODO
+const AOW_YORK_ENGLAND_IS_MY_HOME = Y8 // TODO
+const AOW_YORK_BARRICADES = Y9 // TODO
+const AOW_YORK_AGITATORS = Y10 // TODO
+const AOW_YORK_YORKISTS_NEVER_WAIT = Y11 // TODO
+const AOW_YORK_SOLDIERS_OF_FORTUNE = Y12 // TODO
+const AOW_YORK_SCOURERS = Y13 // TODO
+const AOW_YORK_BURGUNDIANS = [ Y14, Y23 ] // TODO
+const AOW_YORK_NAVAL_BLOCKADE = Y15 // TODO
+const AOW_YORK_BELOVED_WARWICK = Y16 // TODO
+const AOW_YORK_ALICE_MONTAGU = Y17 // TODO
+const AOW_YORK_IRISHMEN = Y18 // TODO
+const AOW_YORK_WELSHMEN = Y19 // TODO
+const AOW_YORK_YORKS_FAVOURED_SON = Y20 // TODO
+const AOW_YORK_SOUTHERNERS = Y21 // TODO
+const AOW_YORK_FAIR_ARBITER = Y22 // TODO
+const AOW_YORK_HASTINGS = Y24 // TODO
+const AOW_YORK_PEMBROKE = Y25 // TODO
+const AOW_YORK_FALLEN_BROTHER = Y26 // TODO
+const AOW_YORK_PERCYS_NORTH1 = Y27 // TODO
+const AOW_YORK_FIRST_SON = Y28 // TODO
+const AOW_YORK_STAFFORD_BRANCH = Y29 // TODO
+const AOW_YORK_CAPTAIN = Y30 // TODO
+const AOW_YORK_WOODWILLES = Y31 // TODO
+const AOW_YORK_FINAL_CHARGE = Y32 // TODO
+const AOW_YORK_BLOODY_THOU_ART = Y33 // TODO
+const AOW_YORK_SO_WISE_SO_YOUNG = Y34 // TODO
+const AOW_YORK_KINGDOM_UNITED = Y35 // TODO
+const AOW_YORK_VANGUARD = Y36 // TODO
+const AOW_YORK_PERCYS_NORTH2 = Y37 // TODO
+
+const EVENT_LANCASTER_LEEWARD_BATTLE_LINE = L1 // TODO
+const EVENT_LANCASTER_FLANK_ATTACK = L2 // TODO
+const EVENT_LANCASTER_ESCAPE_SHIP = L3 // TODO
+const EVENT_LANCASTER_BE_SENT_FOR = L4 // TODO
+const EVENT_LANCASTER_SUSPICION = L5 // TODO
+const EVENT_LANCASTER_SEAMANSHIP = L6 // TODO
+const EVENT_LANCASTER_FOR_TRUST_NOT_HIM = L7 // TODO
+const EVENT_LANCASTER_FORCED_MARCHES = L8 // TODO
+const EVENT_LANCASTER_RISING_WAGES = L9 // TODO
+const EVENT_LANCASTER_NEW_ACT_OF_PARLIAMENT = L10 // TODO
+const EVENT_LANCASTER_BLOCKED_FORD = L11 // TODO
+const EVENT_LANCASTER_RAVINE = L12 // TODO
+const EVENT_LANCASTER_ASPIELLES = L13 // TODO
+const EVENT_LANCASTER_SCOTS = L14 // TODO
+const EVENT_LANCASTER_HENRY_PRESSURES_PARLIAMENT = L15 // TODO
+const EVENT_LANCASTER_WARDEN_OF_THE_MARCHES = L16	 // TODO
+const EVENT_LANCASTER_MY_CROWN_IS_IN_MY_HEART = L17 // TODO
+const EVENT_LANCASTER_PARLIAMENT_VOTES = L18 // TODO
+const EVENT_LANCASTER_HENRYS_PROCLAMATION = L19 // TODO
+const EVENT_LANCASTER_PARLIAMEN_TRUCE = L20 // TODO
+const EVENT_LANCASTER_FRENCH_FLEET = L21 // TODO
+const EVENT_LANCASTER_FRENCH_TROOPS = L22 // TODO
+const EVENT_LANCASTER_WARWICKS_PROPAGANDA = [ L23, L24 ] // TODO
+const EVENT_LANCASTER_WELSH_REBELLION = L25 // TODO
+const EVENT_LANCASTER_HENRY_RELEASED = L26 // TODO
+const EVENT_LANCASTER_LUNIVERSELLE_ARAGNE = L27 // TODO
+const EVENT_LANCASTER_REBEL_SUPPLY_DEPOT = L28 // TODO
+const EVENT_LANCASTER_TO_WILFUL_DISOBEDIANCE = L29 // TODO
+const EVENT_LANCASTER_FRENCH_WAR_LOANS = L30 // TODO
+const EVENT_LANCASTER_ROBINS_REBELLION = L31 // TODO
+const EVENT_LANCASTER_TUDOR_BANNERS = L32 // TODO
+const EVENT_LANCASTER_SURPRISE_LANDING = L33 // TODO
+const EVENT_LANCASTER_BUCKINGHAMS_PLOT = L34 // TODO
+const EVENT_LANCASTER_MARGARET_BEAUFORT = L35 // TODO 
+const EVENT_LANCASTER_TALBOT_TO_THE_RESCUE = L36 // TODO
+const EVENT_LANCASTER_THE_EARL_OF_RICHMOND = L37 // TODO
+
+const EVENT_YORK_LEEWARD_BATTLE_LINE = Y1 // TODO
+const EVENT_YORK_FLANK_ATTACK = Y2 // TODO
+const EVENT_YORK_ESCAPE_SHIP = [ Y3, Y9 ] // TODO
+const EVENT_YORK_JACK_CADE = Y4 // TODO
+const EVENT_YORK_SUSPICION = Y5 // TODO
+const EVENT_YORK_SEAMANSHIP = Y6 // TODO
+const EVENT_YORK_YORKISTS_BLOCK_PARLIAMENT = Y7 // TODO
+const EVENT_YORK_EXILE_PACT = Y8 // TODO
+const EVENT_YORK_TAX_COLLECTORS = Y10 // TODO
+const EVENT_YORK_BLOCKED_FORD = Y11 // TODO
+const EVENT_YORK_PARLIAMENTS_TRUCE = Y12 // TODO
+const EVENT_YORK_ASPIELLES = Y13 // TODO
+const EVENT_YORK_RICHARD_OF_YORK = Y14 // TODO
+const EVENT_YORK_LONDON_FOR_YORK = Y15 // TODO
+const EVENT_YORK_THE_COMMONS = Y16	 // TODO
+const EVENT_YORK_SHEWOLF_OF_FRANCE = Y17 // TODO
+const EVENT_YORK_SUCCESSION = Y18 // TODO
+const EVENT_YORK_CALTROPS = Y19 // TODO
+const EVENT_YORK_YORKIST_PARADE = Y20 // TODO
+const EVENT_YORK_SIR_RICHARD_LEIGH = Y21 // TODO
+const EVENT_YORK_LOYALTY_AND_TRUST = Y22 // TODO
+const EVENT_YORK_CHARLES_THE_BOLD = Y23 // TODO
+const EVENT_YORK_SUN_IN_SPLENDOUR = Y24 // TODO
+const EVENT_YORK_OWAIN_GLYNDWR = Y25 // TODO
+const EVENT_YORK_DUBIOUS_CLARENCE = Y26 // TODO
+const EVENT_YORK_YORKIST_NORTH = Y27 // TODO
+const EVENT_YORK_GLOUCESTER_AS_HEIR = Y28 // TODO
+const EVENT_YORK_DORSET = Y29 // TODO
+const EVENT_YORK_REGROUP = Y30 // TODO
+const EVENT_YORK_EARL_RIVERS = Y31 // TODO
+const EVENT_YORK_THE_KINGS_NAME = Y32 // TODO
+const EVENT_YORK_EDWARD_V = Y33 // TODO
+const EVENT_YORK_AN_HONEST_TALE_SPEEDS_BEST = Y34 // TODO
+const EVENT_YORK_PRIVY_COUNCIL = Y35 // TODO
+const EVENT_YORK_SWIFT_MANEUVER = Y36 // TODO
+const EVENT_YORK_PATRICK_DE_LA_MOTE = Y37 // TODO
 
 // Check all push/clear_undo
 
@@ -1978,7 +1978,7 @@ function goto_immediate_event(c) {
 			return end_immediate_event()
 			
 		// Immediate effect
-		case EVENT_RUSSIAN_DEATH_OF_THE_POPE:
+	/*	case EVENT_RUSSIAN_DEATH_OF_THE_POPE:
 			set_add(game.events, c)
 			return goto_russian_event_death_of_the_pope()
 		case EVENT_RUSSIAN_VALDEMAR:
@@ -1988,6 +1988,8 @@ function goto_immediate_event(c) {
 			set_add(game.events, c)
 			return goto_russian_event_dietrich()
 
+			*/
+
 		// Discard - Immediate Events
 		case EVENT_LANCASTER_SCOTS:
 			return goto_lancaster_event_scots()