Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
*Fix Siege MT
- Change how teams are distributed
- Fix slot assignment by making sure chokepoint defenders are counted
- Add placeholder quests.
  • Loading branch information
khamukkamu committed Sep 21, 2017
1 parent 6a8f8ae commit 7ff00dc
Show file tree
Hide file tree
Showing 14 changed files with 273 additions and 63 deletions.
46 changes: 44 additions & 2 deletions ModuleSystem/ID/ID_quests.py
Expand Up @@ -41,7 +41,28 @@
qst_ring_hunters = 40
qst_ring_hunters2 = 41
qst_deliver_message_hobbit = 42
qst_quests_end = 43
qst_blank_quest_01 = 43
qst_blank_quest_02 = 44
qst_blank_quest_03 = 45
qst_blank_quest_04 = 46
qst_blank_quest_05 = 47
qst_blank_quest_06 = 48
qst_blank_quest_07 = 49
qst_blank_quest_08 = 50
qst_blank_quest_09 = 51
qst_blank_quest_10 = 52
qst_blank_quest_11 = 53
qst_blank_quest_12 = 54
qst_blank_quest_13 = 55
qst_blank_quest_14 = 56
qst_blank_quest_15 = 57
qst_blank_quest_16 = 58
qst_blank_quest_17 = 59
qst_blank_quest_18 = 60
qst_blank_quest_19 = 61
qst_blank_quest_20 = 62
qst_blank_quest_21 = 63
qst_quests_end = 64
qsttag_deliver_message = 504403158265495552
qsttag_deliver_message_to_enemy_lord = 504403158265495553
qsttag_raise_troops = 504403158265495554
Expand Down Expand Up @@ -85,6 +106,27 @@
qsttag_ring_hunters = 504403158265495592
qsttag_ring_hunters2 = 504403158265495593
qsttag_deliver_message_hobbit = 504403158265495594
qsttag_quests_end = 504403158265495595
qsttag_blank_quest_01 = 504403158265495595
qsttag_blank_quest_02 = 504403158265495596
qsttag_blank_quest_03 = 504403158265495597
qsttag_blank_quest_04 = 504403158265495598
qsttag_blank_quest_05 = 504403158265495599
qsttag_blank_quest_06 = 504403158265495600
qsttag_blank_quest_07 = 504403158265495601
qsttag_blank_quest_08 = 504403158265495602
qsttag_blank_quest_09 = 504403158265495603
qsttag_blank_quest_10 = 504403158265495604
qsttag_blank_quest_11 = 504403158265495605
qsttag_blank_quest_12 = 504403158265495606
qsttag_blank_quest_13 = 504403158265495607
qsttag_blank_quest_14 = 504403158265495608
qsttag_blank_quest_15 = 504403158265495609
qsttag_blank_quest_16 = 504403158265495610
qsttag_blank_quest_17 = 504403158265495611
qsttag_blank_quest_18 = 504403158265495612
qsttag_blank_quest_19 = 504403158265495613
qsttag_blank_quest_20 = 504403158265495614
qsttag_blank_quest_21 = 504403158265495615
qsttag_quests_end = 504403158265495616


6 changes: 6 additions & 0 deletions ModuleSystem/module_constants.py
Expand Up @@ -1084,12 +1084,18 @@
lord_quests_begin = "qst_deliver_message"
lord_quests_end = "qst_follow_army"

#lord_quests_begin_2 = "qst_blank_quest_01"
#lord_quests_end_2 = "qst_blank_quest_16"

enemy_lord_quests_begin = lord_quests_end #no enemy lord quests at present in TLD, was "qst_lend_surgeon"
enemy_lord_quests_end = lord_quests_end

mayor_quests_begin = "qst_move_cattle_herd"
mayor_quests_end = "qst_tld_introduction"

#mayor_quests_begin_2 = "qst_blank_quest_16" #Commented out for now - Kham
#mayor_quests_end_2 = "qst_blank_quest_21"

army_quests_begin = "qst_deliver_cattle_to_army"
army_quests_end = mayor_quests_begin

Expand Down
57 changes: 38 additions & 19 deletions ModuleSystem/module_mission_templates.py
Expand Up @@ -2971,33 +2971,46 @@

( "castle_attack_walls_ladder",mtf_battle_mode,-1,
"You attack the walls of the castle...",
[# Attacker initial spawn point (was 0)
(47,mtef_attackers|mtef_team_1,af_override_horse,aif_start_alarmed,8,[]),
# Initial defender spawn point (was 11)
(40,mtef_defenders|mtef_team_0|mtef_infantry_first,af_override_horse,aif_start_alarmed,8,[]),
[

## Kham - Distributed Teams using the mtef_team_X flag. 0, 2, 4 are defenders; 1, 3, 5 are attackers. 6 is for the gate. This allows for the attacker_team / defender_team globals to work.

# Attacker initial spawn point (was 0) - Split this into 3 and distribute teams
(47,mtef_attackers|mtef_team_1,af_override_horse,aif_start_alarmed,4,[]),
(47,mtef_attackers|mtef_team_3,af_override_horse,aif_start_alarmed,2,[]),
(47,mtef_attackers|mtef_team_5,af_override_horse,aif_start_alarmed,2,[]),

# Initial defender spawn point (was 11) - Split this into 3 and distribute teams
(40,mtef_defenders|mtef_team_0|mtef_infantry_first,af_override_horse,aif_start_alarmed,4,[]),
(40,mtef_defenders|mtef_team_2|mtef_infantry_first,af_override_horse,aif_start_alarmed,2,[]),
(40,mtef_defenders|mtef_team_4|mtef_infantry_first,af_override_horse,aif_start_alarmed,2,[]),

# Defender choke points (was 10)
(41,mtef_defenders|mtef_team_0|mtef_infantry_first,af_override_horse,aif_start_alarmed,0,[]), # team left flank
(42,mtef_defenders|mtef_team_0|mtef_infantry_first,af_override_horse,aif_start_alarmed,0,[]), # team center
(43,mtef_defenders|mtef_team_0|mtef_infantry_first,af_override_horse,aif_start_alarmed,0,[]), # team right flank
(42,mtef_defenders|mtef_team_2|mtef_infantry_first,af_override_horse,aif_start_alarmed,0,[]), # team center
(43,mtef_defenders|mtef_team_4|mtef_infantry_first,af_override_horse,aif_start_alarmed,0,[]), # team right flank

# Defender reinforcements (was 15)
(44,mtef_defenders|mtef_team_0|mtef_infantry_first,af_override_horse,aif_start_alarmed,4,[]), #entry 5 for add_reinforcements_to_entry
(45,mtef_defenders|mtef_team_0|mtef_infantry_first,af_override_horse,aif_start_alarmed,4,[]),
(46,mtef_defenders|mtef_team_0|mtef_infantry_first,af_override_horse,aif_start_alarmed,4,[]),
(45,mtef_defenders|mtef_team_2|mtef_infantry_first,af_override_horse,aif_start_alarmed,4,[]),
(46,mtef_defenders|mtef_team_4|mtef_infantry_first,af_override_horse,aif_start_alarmed,4,[]),

# Attacker reinforcements (was 0)
(47,mtef_attackers|mtef_team_1,af_override_horse,aif_start_alarmed,4,[]), #entry 8 for add_reinforcements_to_entry
(48,mtef_attackers|mtef_team_1,af_override_horse,aif_start_alarmed,4,[]),
(49,mtef_attackers|mtef_team_1,af_override_horse,aif_start_alarmed,4,[]),
(48,mtef_attackers|mtef_team_3,af_override_horse,aif_start_alarmed,4,[]),
(49,mtef_attackers|mtef_team_5,af_override_horse,aif_start_alarmed,4,[]),

# defender archer target positions (was 40-43)
(50,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]), # team left flank
(51,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
(52,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
(53,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
(54,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,3,[]), # team center
(55,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,3,[]),
(56,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]), # team right flank
(57,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
(58,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
(59,mtef_defenders|mtef_team_0|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
(54,mtef_defenders|mtef_team_2|mtef_archers_first,af_override_horse,aif_start_alarmed,3,[]), # team center
(55,mtef_defenders|mtef_team_2|mtef_archers_first,af_override_horse,aif_start_alarmed,3,[]),
(56,mtef_defenders|mtef_team_4|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]), # team right flank
(57,mtef_defenders|mtef_team_4|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
(58,mtef_defenders|mtef_team_4|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
(59,mtef_defenders|mtef_team_4|mtef_archers_first,af_override_horse,aif_start_alarmed,2,[]),
],
tld_common_wb_muddy_water+
common_deathcam_triggers+
Expand Down Expand Up @@ -3196,26 +3209,32 @@
(try_for_range, ":slot",0,3),
(neg|troop_slot_eq,"trp_no_troop",":slot",-1), # -1 in slot means this flank defeated its choke and proceeds with charge
(troop_set_slot,"trp_no_troop",":slot",0),
#(display_message, "@DEBUG: Slot Set to 0"),
(try_end),
(try_for_agents, ":agent"),
(agent_is_alive,":agent"),
(agent_is_defender,":agent"),
(agent_get_position, pos0, ":agent"),
(try_for_range, ":entry",41,44),
(store_sub,":slot",":entry",41),
(try_for_range, ":entry",41,44),
(store_sub,":slot",":entry",41), #0, 1, 2
(neg|troop_slot_eq,"trp_no_troop",":slot",-1), # proceed with counting defenders if choke not captured yet
#(display_message, "@found valid defender"),
(entry_point_get_position, pos10, ":entry"), # count defenders in proximity of choke points
(get_distance_between_positions, ":dist", pos0, pos10),
(lt,":dist", 400),
(troop_get_slot,":x","trp_no_troop",":slot"), #+1 defender found
(val_add, ":x", 1), #Kham - Add this here, to count number of defenders.
#(display_message, "@DEBUG: +1 defender found", color_good_news),
(troop_set_slot,"trp_no_troop",":slot",":x"),
(try_end),
(try_end),
(set_show_messages, 0),
(try_for_range, ":slot",0,3),
(neg|troop_slot_ge,"trp_no_troop",":slot",2), #if 0-1 defenders standing -> make attacking team and defender reinfs charge at will
(neg|troop_slot_ge,"trp_no_troop",":slot",2), #if 0-1 defenders standing -> make attacking team and defender reinfs charge at will (if not > = 2, charge)
(troop_set_slot,"trp_no_troop",":slot",-1),
(store_mul,":defteam",":slot",2),(store_add,":atkteam",":defteam",1),
(assign, reg11, ":defteam"), (assign, reg12, ":atkteam"),
#(display_message, "@DEBUG: Defender Team - {reg11}; Attacker Team - {reg12}", color_bad_news),
(team_give_order, ":defteam", grc_everyone, mordr_charge),
(team_give_order, ":atkteam", grc_everyone, mordr_charge),
(store_add,":entry",":slot",41),(entry_point_get_position, pos10, ":entry"),
Expand Down
93 changes: 93 additions & 0 deletions ModuleSystem/module_quests.py
Expand Up @@ -263,6 +263,99 @@
"{!}None"
),


##Placeholder Quests Start

("blank_quest_01", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_02", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_03", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_04", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_05", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_06", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_07", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_08", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_09", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_10", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_11", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_12", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_13", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_14", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_15", "Placeholder", 0,
"{!}Placeholder"
),

# Lets put mayor quests here


("blank_quest_16", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_17", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_18", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_19", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_20", "Placeholder", 0,
"{!}Placeholder"
),

("blank_quest_21", "Placeholder", 0,
"{!}Placeholder"
),

##Placeholder Quests END


# ### TLD traits
# ( "trait_elf_friend", "*TRAIT*_-Elf_Friend", 0,
# "You_have_become_highly_esteemed_by_the_Elves_and_they_now_regard_you_as_a_trusted_ally._The_influence_cost_to_recruit_elves_has_been_reduced_and_you_may_now_attempt_to_give_orders_to_elven_armies."
Expand Down

0 comments on commit 7ff00dc

Please sign in to comment.