diff options
| -rw-r--r-- | data.js | 4 | ||||
| -rw-r--r-- | rules.js | 17 | ||||
| -rw-r--r-- | tools/gendata.js | 10 |
3 files changed, 20 insertions, 11 deletions
@@ -176,13 +176,13 @@ lords:[ {"side":"York","name":"Northumberland Y1","full_name":"Henry Percy","title":"Northumberland","seats":[4],"marshal":0,"influence":4,"lordship":2,"command":2,"valour":1,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2,"militia":4},"assets":{"cart":2,"prov":2,"coin":2},"ships":0,"id":"lord_northumberland_y1"}, {"side":"York","name":"Northumberland Y2","full_name":"Henry Percy","title":"Northumberland","seats":[4],"marshal":0,"influence":4,"lordship":2,"command":2,"valour":1,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2,"militia":2},"assets":{"cart":2,"prov":2,"coin":2},"ships":0,"id":"lord_northumberland_y2"}, {"side":"York","name":"Gloucester 1","full_name":"Richard Plantagenet","title":"Duke of Gloucester","seats":[27],"marshal":1,"influence":2,"lordship":2,"command":3,"valour":2,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2},"assets":{"cart":1,"prov":1,"coin":1},"ships":0,"id":"lord_gloucester_1"}, -{"side":"York","name":"Gloucester 2","full_name":"Richard Plantagenet","title":"Duke of Gloucester","seats":[27],"marshal":1,"influence":2,"lordship":2,"command":3,"valour":2,"forces":{"retinue":1,"men_at_arms":3,"longbowmen":2,"militia":4},"assets":{"cart":2,"prov":2,"coin":4},"ships":0,"id":"lord_gloucester_2"}, +{"side":"York","name":"Gloucester 2","full_name":"Richard Plantagenet","title":"Duke of Gloucester","seats":[27],"marshal":1,"influence":5,"lordship":3,"command":3,"valour":2,"forces":{"retinue":1,"men_at_arms":3,"longbowmen":3,"militia":4},"assets":{"cart":2,"prov":2,"coin":4},"ships":0,"id":"lord_gloucester_2"}, {"side":"York","name":"Richard III","full_name":"Richard Plantagenet","title":"King of England","seats":[30],"marshal":2,"influence":5,"lordship":3,"command":3,"valour":2,"forces":{"retinue":1,"men_at_arms":3,"longbowmen":2,"militia":4},"assets":{"cart":2,"prov":2,"coin":4},"ships":0,"id":"lord_richard_iii"}, {"side":"York","name":"Norfolk","full_name":"John Howard","title":"Duke of Norfolk","seats":[14],"marshal":0,"influence":3,"lordship":3,"command":2,"valour":2,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2,"militia":2},"assets":{"cart":2,"prov":2,"coin":2},"ships":0,"id":"lord_norfolk"}, {"side":"York","name":"Warwick Y","full_name":"Richard Neville","title":"Earl of Warwick","seats":[51],"marshal":1,"influence":5,"lordship":3,"command":2,"valour":1,"forces":{"retinue":1,"men_at_arms":3,"longbowmen":3},"assets":{"prov":2,"coin":2},"ships":2,"id":"lord_warwick_y"}, {"side":"Lancaster","name":"Henry VI","full_name":"Henry VI","title":"King of England","seats":[30],"marshal":2,"influence":5,"lordship":2,"command":2,"valour":0,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2,"militia":4},"assets":{"cart":2,"prov":2,"coin":4},"ships":0,"id":"lord_henry_vi"}, {"side":"Lancaster","name":"Margaret","full_name":"Margaret d'Anjou","title":"Queen of England","seats":[30],"marshal":2,"influence":4,"lordship":2,"command":2,"valour":1,"forces":{"retinue":1,"men_at_arms":3,"longbowmen":3},"assets":{"cart":2,"prov":2,"coin":2},"ships":2,"id":"lord_margaret"}, -{"side":"Lancaster","name":"Somerset 1","full_name":"Henry Beaufort","title":"Duke of Somerset","seats":[25],"marshal":2,"influence":6,"lordship":2,"command":2,"valour":3,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2},"assets":{"cart":2,"prov":2,"coin":1},"ships":0,"id":"lord_somerset_1"}, +{"side":"Lancaster","name":"Somerset 1","full_name":"Henry Beaufort","title":"Duke of Somerset","seats":[25],"marshal":2,"influence":5,"lordship":2,"command":2,"valour":2,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2},"assets":{"cart":2,"prov":2,"coin":1},"ships":0,"id":"lord_somerset_1"}, {"side":"Lancaster","name":"Somerset 2","full_name":"Edmund Beaufort","title":"Duke of Somerset","seats":[25],"marshal":0,"influence":3,"lordship":2,"command":2,"valour":1,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2,"militia":2},"assets":{"cart":2,"prov":2,"coin":2},"ships":0,"id":"lord_somerset_2"}, {"side":"Lancaster","name":"Exeter 1","full_name":"Henry Holland","title":"Duke of Exeter","seats":[21],"marshal":0,"influence":2,"lordship":1,"command":2,"valour":2,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2},"assets":{"cart":1,"prov":1,"coin":1},"ships":0,"id":"lord_exeter_1"}, {"side":"Lancaster","name":"Exeter 2","full_name":"Henry Holland","title":"Duke of Exeter","seats":[21],"marshal":0,"influence":2,"lordship":1,"command":2,"valour":2,"forces":{"retinue":1,"men_at_arms":2,"longbowmen":2,"militia":2},"assets":{"cart":2,"prov":2,"coin":2},"ships":0,"id":"lord_exeter_2"}, @@ -26,6 +26,7 @@ function frac(x) { function range(x) { switch (x) { + case 0: return "0" case 1: return "1" case 2: return "1-2" case 3: return "1-3" @@ -3780,7 +3781,6 @@ states.intercept = { if (way !== null && way.type !== "path") { get_lords_in_locale(loc) .filter(is_friendly_lord) - .filter(l => data.lords[l].valour > 0) .forEach(gen_action_lord) } } @@ -3834,7 +3834,7 @@ function goto_intercept_march() { if (count_group_transport(game.intercept_group) >= count_group_assets(PROV, game.intercept_group)) { game.intercept_group .forEach(l => { - set_lord_locale(get_lord_locale(game.command)) + set_lord_locale(l, get_lord_locale(game.command)) set_lord_moved(l, 1) }) end_intercept_march() @@ -3849,6 +3849,15 @@ function end_intercept_march() { goto_intercept_exiles() } +function do_intercept_march() { + game.intercept_group + .forEach(l => { + set_lord_locale(l, get_lord_locale(game.command)) + set_lord_moved(l, 1) + }) + end_intercept_march() +} + states.intercept_march = { inactive: "Intercept", prompt() { @@ -3875,8 +3884,8 @@ states.intercept_march = { }, prov: drop_prov, - intercept: end_intercept_march, - locale: end_intercept_march, + intercept: do_intercept_march, + locale: do_intercept_march, } function is_enemy_lord(lord) { diff --git a/tools/gendata.js b/tools/gendata.js index 2799504..ec0f905 100644 --- a/tools/gendata.js +++ b/tools/gendata.js @@ -1062,14 +1062,14 @@ let lords = [ title: "Duke of Gloucester", seats: seats("Gloucester"), marshal:1, - influence:2, - lordship:2, + influence:5, + lordship:3, command:3, valour:2, forces:{ retinue:1, men_at_arms:3, - longbowmen:2, + longbowmen:3, militia:4, }, assets:{ @@ -1209,10 +1209,10 @@ let lords = [ title: "Duke of Somerset", seats: seats("Wells"), marshal:2, - influence:6, + influence:5, lordship:2, command:2, - valour:3, + valour:2, forces:{ retinue:1, men_at_arms:2, |