Skip to content

Commit

Permalink
*Forgot to add the game menu changes from last commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
khamukkamu committed May 23, 2017
1 parent 79168e3 commit 5aa75c9
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 81 deletions.
174 changes: 95 additions & 79 deletions ModuleSystem/module_game_menus.py
Expand Up @@ -9053,7 +9053,7 @@
(this_or_next|eq,":raid_village_faction", "fac_woodelf"),
(neg|is_between, ":raid_village_faction", kingdoms_begin, kingdoms_end), ## For some reason, the search counts 'ruins' etc. This takes them out!
(assign,":raid_village_faction", "fac_rohan"), ## Rohan is the closest to areas where elves would mostly be.
(end_try),
(try_end),
(faction_get_slot, ":tier_1_troop", ":raid_village_faction", slot_faction_tier_1_troop),
(faction_get_slot, ":tier_2_troop", ":raid_village_faction", slot_faction_tier_2_troop),
(assign, ":guard_troop_1", ":tier_1_troop"),
Expand Down Expand Up @@ -9173,120 +9173,135 @@
("attack_scout_camp",[], "Attack the Scout Camp!",
[
(quest_get_slot, ":scout_camp_faction", "qst_destroy_scout_camp", slot_quest_target_faction),
(quest_get_slot, ":scout_camp_template","qst_destroy_scout_camp",slot_quest_target_party_template),
(store_character_level, ":level", "trp_player"),

#Set Scout Camp Defender Faction
(faction_get_slot, ":tier_ranged_troop", ":scout_camp_faction", slot_faction_ranged_troop),
(faction_get_slot, ":tier_3_troop", ":scout_camp_faction", slot_faction_tier_3_troop),
(faction_get_slot, ":tier_4_troop", ":scout_camp_faction", slot_faction_tier_4_troop),
(faction_get_slot, ":tier_5_troop", ":scout_camp_faction", slot_faction_tier_5_troop),
# Let's try to populate the camp with valid troops
(assign, ":guard_troop_1", ":tier_3_troop"),
(assign, ":guard_troop_2", ":tier_4_troop"),
(assign, ":guard_troop_3", ":tier_5_troop"),
(assign, ":guard_troop_2", ":tier_3_troop"),
(try_begin),
(neq,":tier_4_troop",0),
(assign, ":guard_troop_2", ":tier_4_troop"),
(try_end),
(try_begin), # Rafa: if player level is >= 17, try to upgrade the troops
(ge,":level",17),
(try_begin),
(neq,":tier_4_troop",0),
(assign, ":guard_troop_1", ":tier_4_troop"),
(assign, ":guard_troop_2", ":tier_4_troop"),
(try_end),
(try_begin),
(neq,":tier_5_troop",0),
(assign, ":guard_troop_2", ":tier_5_troop"),
(try_end),
(try_end),
(assign, ":watchtower_troop",":tier_ranged_troop"),

#Get Player Level
(store_character_level, ":level", "trp_player"),

## Get Side & Region of Scout Camp to check which scene to spawn
(try_begin),
(is_between, "$current_player_region", region_harrowdale, region_misty_mountains),
(try_begin),
(is_between, ":level", 11,17),
(try_begin),
(eq,":scout_camp_template","pt_scout_camp_small"), #Small camp
(try_begin),
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_rohan_evil_small"),
(assign, ":scout_camp_scene", "scn_scout_camp_rohan_evil_small"),
(else_try),
(is_between, ":level", 11,17),
(else_try),
(modify_visitors_at_site, "scn_scout_camp_rohan_good_small"),
(assign, ":scout_camp_scene", "scn_scout_camp_rohan_good_small"),
(else_try),
(gt, ":level", 17),
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_rohan_evil_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_rohan_evil_big"),
(else_try),
(gt, ":level", 17),
(modify_visitors_at_site, "scn_scout_camp_rohan_good_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_rohan_good_big"),
(try_end),
#(display_message, "@DEBUG: Rohan Region"),
(else_try),
(else_try), # Fortified Camp
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_rohan_evil_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_rohan_evil_big"),
(else_try),
(modify_visitors_at_site, "scn_scout_camp_rohan_good_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_rohan_good_big"),
(try_end),
#(display_message, "@DEBUG: Rohan Region"),
(else_try),

## Get Region of Scout Camp
(is_between, "$current_player_region", region_pelennor, region_harrowdale),

## Get Side of Player to check which scout camp to spawn
(try_begin),
(is_between, ":level", 11,17),
(try_begin),
(eq,":scout_camp_template","pt_scout_camp_small"), #Small camp
(try_begin),
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_gondor_evil_small"),
(assign, ":scout_camp_scene", "scn_scout_camp_gondor_evil_small"),
(else_try),
(is_between, ":level", 11,17),
(else_try),
(modify_visitors_at_site, "scn_scout_camp_gondor_good_small"),
(assign, ":scout_camp_scene", "scn_scout_camp_gondor_good_small"),
(else_try),
(gt, ":level", 17),
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_gondor_evil_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_gondor_evil_big"),
(else_try),
(gt, ":level", 17),
(modify_visitors_at_site, "scn_scout_camp_gondor_good_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_gondor_good_big"),
(try_end),
(else_try), # Fortified Camp
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_gondor_evil_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_gondor_evil_big"),
(else_try),
(gt, ":level", 17),
(modify_visitors_at_site, "scn_scout_camp_gondor_good_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_gondor_good_big"),
(try_end),
#(display_message, "@DEBUG: Gondor Region"),
(else_try),
(else_try),

## Get Region of Scout Camp
(is_between, "$current_player_region", region_n_mirkwood, region_above_mirkwook),


## Get Side of Player to check which scout camp to spawn
(try_begin),
(is_between, ":level", 11,17),
(try_begin),
(eq,":scout_camp_template","pt_scout_camp_small"), #Small camp
(try_begin),
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_mirk_evil_small"),
(assign, ":scout_camp_scene", "scn_scout_camp_mirk_evil_small"),
(else_try),
(is_between, ":level", 11,17),
(modify_visitors_at_site, "scn_scout_camp_mirk_good_small"),
(assign, ":scout_camp_scene", "scn_scout_camp_mirk_good_small"),
(else_try),
(gt, ":level", 17),
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_mirk_evil_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_mirk_evil_big"),
(else_try),
(gt, ":level", 17),
(modify_visitors_at_site, "scn_scout_camp_mirk_good_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_mirk_good_big"),
(try_end),
(else_try), # Fortified Camp
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_mirk_evil_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_mirk_evil_big"),
(else_try),
(modify_visitors_at_site, "scn_scout_camp_mirk_good_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_mirk_good_big"),
(try_end),
#(display_message, "@DEBUG: Mirkwood Region"),

##North is the only region left
(else_try),
(try_begin),
(is_between, ":level", 11,17),
(else_try),
(try_begin),
(eq,":scout_camp_template","pt_scout_camp_small"), #Small camp
(try_begin),
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_north_evil_small"),
(assign, ":scout_camp_scene", "scn_scout_camp_north_evil_small"),
(else_try),
(is_between, ":level", 11,17),
(modify_visitors_at_site, "scn_scout_camp_north_good_small"),
(assign, ":scout_camp_scene", "scn_scout_camp_north_good_small"),
(else_try),
(gt, ":level", 17),
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_north_evil_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_north_evil_big"),
(else_try),
(gt, ":level", 17),
(modify_visitors_at_site, "scn_scout_camp_north_good_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_north_good_big"),
(try_end),
#(display_message, "@DEBUG: North Region"),
(try_end),
(else_try), # Fortified Camp
(faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(modify_visitors_at_site, "scn_scout_camp_north_evil_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_north_evil_big"),
(else_try),
(modify_visitors_at_site, "scn_scout_camp_north_good_big"),
(assign, ":scout_camp_scene", "scn_scout_camp_north_good_big"),
(try_end),
#(display_message, "@DEBUG: North Region"),
(try_end),
#Set Entry and Number of Defenders
#0, player
#16 & 18 - where at least 10 troops will spawn per spawn point
Expand All @@ -9295,33 +9310,34 @@
(set_jump_entry, 0),
(set_visitor, 0, "trp_player"),
(try_begin),
(is_between, ":level",11,17),
(lt, ":level",17),
(val_div, ":level", 3),
(store_add, ":min_guards", ":level", 3),
(store_add, ":max_guards", ":min_guards", 3),
(store_random_in_range, ":random_no", ":min_guards", ":max_guards"),
(gt, ":guard_troop_1", 0),
(set_visitors, 18, ":guard_troop_1", ":random_no"),
(val_div,":random_no",4),
(gt, ":guard_troop_2", 0),
(set_visitors, 16, ":guard_troop_2", ":random_no"),
(else_try),
(val_div, ":level", 5),
(store_add, ":min_guards", ":level", 3),
(store_add, ":max_guards", ":min_guards", 3),
(store_random_in_range, ":random_no", ":min_guards", ":max_guards"),
(gt, ":guard_troop_2",0),
(set_visitors, 18, ":guard_troop_2", ":random_no"),
(val_div,":random_no",4),
(gt, ":guard_troop_3",0),
(set_visitors, 16, ":guard_troop_3", ":random_no"),
(try_end),
(gt, ":watchtower_troop", 0),
(set_visitor, 20, ":watchtower_troop"),
(set_visitor, 21, ":watchtower_troop"),
(set_visitor, 22, ":watchtower_troop"),
(set_visitor, 23, ":watchtower_troop"),
(set_visitor, 24, ":watchtower_troop"),
(store_random_in_range, ":random_no", ":min_guards", ":max_guards"),
(try_begin),
(gt, ":guard_troop_1", 0),
(set_visitors, 18, ":guard_troop_1", ":random_no"),
(try_end),
(store_random_in_range, ":random_no", ":min_guards", ":max_guards"), # Rafa: rolling again
(val_div,":random_no",4),
(try_begin),
(gt, ":guard_troop_2", 0),
(set_visitors, 16, ":guard_troop_2", ":random_no"),
(try_end),
(try_begin),
(gt, ":watchtower_troop", 0),
(set_visitor, 20, ":watchtower_troop"),
(set_visitor, 21, ":watchtower_troop"),
(set_visitor, 22, ":watchtower_troop"),
(set_visitor, 23, ":watchtower_troop"),
(set_visitor, 24, ":watchtower_troop"),
(try_end),
(set_party_battle_mode),
(set_battle_advantage, 0),
(assign, "$g_battle_result", 0),
Expand Down
2 changes: 1 addition & 1 deletion _wb/menus.txt
Expand Up @@ -341,7 +341,7 @@ menu_village_quest 0 {s9}. none 8 4 0 200 1 15 2031 1 48 2320 2 9 15852670688344
menu_village_quest_result 4608 {s9} none 29 4 0 200 1 15 31 2 144115188075855968 1 2320 2 9 1585267068834415540 1 2 258 15 132 1 144115188075856558 1 2 518 144115188075856558 5 0 200 1 15 2147483679 2 144115188075855968 1 1 2 259 15 2320 2 9 1585267068834415541 132 1 144115188075856558 1 2 518 144115188075856558 5 0 200 1 16 31 2 144115188075855968 1 2320 2 9 1585267068834415542 1 2 258 16 132 1 144115188075856559 1 2 518 144115188075856559 5 0 200 1 16 2147483679 2 144115188075855968 1 1 2 259 16 2320 2 9 1585267068834415543 132 1 144115188075856559 1 2 518 144115188075856559 3 0 1
mno_continue 0 Continue... 1 2052 0 .
menu_scout_camp_quest 0 You_see_the_scout_camp_nearby._You_prepare_your_men_to_attack_them none 0 2
mno_attack_scout_camp 0 Attack_the_Scout_Camp! 131 526 3 1224979098644774912 17 3 522 3 1224979098644774913 1224979098644774912 53 522 3 1224979098644774914 1224979098644774912 43 522 3 1224979098644774915 1224979098644774912 44 522 3 1224979098644774916 1224979098644774912 45 2133 2 1224979098644774917 1224979098644774914 2133 2 1224979098644774918 1224979098644774915 2133 2 1224979098644774919 1224979098644774916 2133 2 1224979098644774920 1224979098644774913 2171 2 1224979098644774921 0 4 0 33 3 144115188075855977 13 31 4 0 33 3 1224979098644774921 11 17 542 3 144115188075855993 158 0 1261 1 270 2133 2 1224979098644774922 270 5 0 33 3 1224979098644774921 11 17 1261 1 272 2133 2 1224979098644774922 272 5 0 32 2 1224979098644774921 17 542 3 144115188075855993 158 0 1261 1 271 2133 2 1224979098644774922 271 5 0 32 2 1224979098644774921 17 1261 1 273 2133 2 1224979098644774922 273 3 0 5 0 33 3 144115188075855977 0 13 4 0 33 3 1224979098644774921 11 17 542 3 144115188075855993 158 0 1261 1 280 2133 2 1224979098644774922 280 5 0 33 3 1224979098644774921 11 17 1261 1 278 2133 2 1224979098644774922 278 5 0 32 2 1224979098644774921 17 542 3 144115188075855993 158 0 1261 1 281 2133 2 1224979098644774922 281 5 0 32 2 1224979098644774921 17 1261 1 279 2133 2 1224979098644774922 279 3 0 5 0 33 3 144115188075855977 34 36 4 0 33 3 1224979098644774921 11 17 542 3 144115188075855993 158 0 1261 1 266 2133 2 1224979098644774922 266 5 0 33 3 1224979098644774921 11 17 1261 1 268 2133 2 1224979098644774922 268 5 0 32 2 1224979098644774921 17 542 3 144115188075855993 158 0 1261 1 267 2133 2 1224979098644774922 267 5 0 32 2 1224979098644774921 17 1261 1 269 2133 2 1224979098644774922 269 3 0 5 0 4 0 33 3 1224979098644774921 11 17 542 3 144115188075855993 158 0 1261 1 276 2133 2 1224979098644774922 276 5 0 33 3 1224979098644774921 11 17 1261 1 274 2133 2 1224979098644774922 274 5 0 32 2 1224979098644774921 17 542 3 144115188075855993 158 0 1261 1 277 2133 2 1224979098644774922 277 5 0 32 2 1224979098644774921 17 1261 1 275 2133 2 1224979098644774922 275 3 0 3 0 1262 0 1912 1 0 1263 2 0 0 4 0 33 3 1224979098644774921 11 17 2108 2 1224979098644774921 3 2120 3 1224979098644774923 1224979098644774921 3 2120 3 1224979098644774924 1224979098644774923 3 2136 3 1224979098644774925 1224979098644774923 1224979098644774924 32 2 1224979098644774917 0 1264 3 18 1224979098644774917 1224979098644774925 2108 2 1224979098644774925 4 32 2 1224979098644774918 0 1264 3 16 1224979098644774918 1224979098644774925 5 0 2108 2 1224979098644774921 5 2120 3 1224979098644774923 1224979098644774921 3 2120 3 1224979098644774924 1224979098644774923 3 2136 3 1224979098644774925 1224979098644774923 1224979098644774924 32 2 1224979098644774918 0 1264 3 18 1224979098644774918 1224979098644774925 2108 2 1224979098644774925 4 32 2 1224979098644774919 0 1264 3 16 1224979098644774919 1224979098644774925 3 0 32 2 1224979098644774920 0 1263 2 20 1224979098644774920 1263 2 21 1224979098644774920 1263 2 22 1224979098644774920 1263 2 23 1224979098644774920 1263 2 24 1224979098644774920 1020 0 1691 1 0 2133 2 144115188075855968 0 1911 1 17 1910 1 1224979098644774922 2048 0 . mno_go_away 0 Leave_and_regroup_for_now. 1 2052 0 .
mno_attack_scout_camp 0 Attack_the_Scout_Camp! 146 526 3 1224979098644774912 17 3 526 3 1224979098644774913 17 9 2171 2 1224979098644774914 0 522 3 1224979098644774915 1224979098644774912 53 522 3 1224979098644774916 1224979098644774912 43 522 3 1224979098644774917 1224979098644774912 44 522 3 1224979098644774918 1224979098644774912 45 2133 2 1224979098644774919 1224979098644774916 2133 2 1224979098644774920 1224979098644774916 4 0 2147483679 2 1224979098644774917 0 2133 2 1224979098644774920 1224979098644774917 3 0 4 0 30 2 1224979098644774914 17 4 0 2147483679 2 1224979098644774917 0 2133 2 1224979098644774919 1224979098644774917 2133 2 1224979098644774920 1224979098644774917 3 0 4 0 2147483679 2 1224979098644774918 0 2133 2 1224979098644774920 1224979098644774918 3 0 3 0 2133 2 1224979098644774921 1224979098644774915 2171 2 1224979098644774914 0 4 0 33 3 144115188075855977 13 31 4 0 31 2 1224979098644774913 250 4 0 542 3 144115188075855993 158 0 1261 1 270 2133 2 1224979098644774922 270 5 0 1261 1 272 2133 2 1224979098644774922 272 3 0 5 0 542 3 144115188075855993 158 0 1261 1 271 2133 2 1224979098644774922 271 5 0 1261 1 273 2133 2 1224979098644774922 273 3 0 5 0 33 3 144115188075855977 0 13 4 0 31 2 1224979098644774913 250 4 0 542 3 144115188075855993 158 0 1261 1 280 2133 2 1224979098644774922 280 5 0 1261 1 278 2133 2 1224979098644774922 278 3 0 5 0 542 3 144115188075855993 158 0 1261 1 281 2133 2 1224979098644774922 281 5 0 32 2 1224979098644774914 17 1261 1 279 2133 2 1224979098644774922 279 3 0 5 0 33 3 144115188075855977 34 36 4 0 31 2 1224979098644774913 250 4 0 542 3 144115188075855993 158 0 1261 1 266 2133 2 1224979098644774922 266 5 0 1261 1 268 2133 2 1224979098644774922 268 3 0 5 0 542 3 144115188075855993 158 0 1261 1 267 2133 2 1224979098644774922 267 5 0 1261 1 269 2133 2 1224979098644774922 269 3 0 5 0 4 0 31 2 1224979098644774913 250 4 0 542 3 144115188075855993 158 0 1261 1 276 2133 2 1224979098644774922 276 5 0 1261 1 274 2133 2 1224979098644774922 274 3 0 5 0 542 3 144115188075855993 158 0 1261 1 277 2133 2 1224979098644774922 277 5 0 1261 1 275 2133 2 1224979098644774922 275 3 0 3 0 1262 0 1912 1 0 1263 2 0 0 4 0 2147483678 2 1224979098644774914 17 2108 2 1224979098644774914 3 2120 3 1224979098644774923 1224979098644774914 3 2120 3 1224979098644774924 1224979098644774923 3 5 0 2108 2 1224979098644774914 5 2120 3 1224979098644774923 1224979098644774914 3 2120 3 1224979098644774924 1224979098644774923 3 3 0 2136 3 1224979098644774925 1224979098644774923 1224979098644774924 4 0 32 2 1224979098644774919 0 1264 3 18 1224979098644774919 1224979098644774925 3 0 2136 3 1224979098644774925 1224979098644774923 1224979098644774924 2108 2 1224979098644774925 4 4 0 32 2 1224979098644774920 0 1264 3 16 1224979098644774920 1224979098644774925 3 0 4 0 32 2 1224979098644774921 0 1263 2 20 1224979098644774921 1263 2 21 1224979098644774921 1263 2 22 1224979098644774921 1263 2 23 1224979098644774921 1263 2 24 1224979098644774921 3 0 1020 0 1691 1 0 2133 2 144115188075855968 0 1911 1 17 1910 1 1224979098644774922 2048 0 . mno_go_away 0 Leave_and_regroup_for_now. 1 2052 0 .
menu_destroy_scout_camp_quest_result 4608 {s9} none 13 4 0 31 2 144115188075855968 1 2320 2 9 1585267068834415544 1 2 258 17 132 1 144115188075856561 1 2 518 144115188075856561 5 0 2147483679 2 144115188075855968 1 1 2 259 17 2320 2 9 1585267068834415545 132 1 144115188075856561 1 2 518 144115188075856561 3 0 1
mno_continue 0 Continue... 1 2052 0 .
menu_custom_battle_choose_faction1 0 ^^^^^^^^^^Choose_your_side_and_advantage: none 1 2031 1 2 4
Expand Down

0 comments on commit 5aa75c9

Please sign in to comment.