Skip to content

Commit

Permalink
Fixed a few more bugs; made Frealaf Raiders night troops; some more a…
Browse files Browse the repository at this point in the history 
…djustmens to Rohan troops
  • Loading branch information
@In-Vain
In-Vain committed Dec 18, 2018
1 parent f1345e4 commit 632993f
Show file tree
Hide file tree
Showing 19 changed files with 12,116 additions and 271 deletions.
Binary file modified ModuleSystem/Troops-PRD-TLD.ods
View file
Binary file not shown.
11,842 changes: 11,842 additions & 0 deletions ModuleSystem/module_game_menus - Kopie.py
View file

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions ModuleSystem/module_game_menus.py
View file
Expand Up @@ -334,8 +334,8 @@
(call_script,"script_start_as_one","trp_uruk_hai_of_isengard"),
(assign, "$g_player_troop", "$player_current_troop_type"),
(set_player_troop, "$g_player_troop"),
(set_visitor,1,"trp_squire_of_rohan"),
(set_visitor,2,"trp_skirmisher_of_rohan"),
(set_visitor,1,"trp_c2_squire_of_rohan"),
(set_visitor,2,"trp_ac3_skirmisher_of_rohan"),
(set_jump_mission,"mt_tutorial_2"),
(jump_to_scene,"scn_tutorial_2"),(change_screen_mission)]),
("tutorial_3",[],"Tutorial #3: Fighting without a shield. {s3}",[
Expand Down Expand Up @@ -674,18 +674,18 @@
(troop_add_item, "$g_player_troop","itm_khergit_arrows",0),
(troop_equip_items, "$g_player_troop"),
## US
(set_visitors, 1, "trp_dismounted_skirmisher_of_rohan", 6),
(set_visitors, 1, "trp_i6_2h_guard_of_rohan", 6),
(set_visitors, 2, "trp_dismounted_elite_skirmisher_of_rohan", 6),
(set_visitors, 3, "trp_dismounted_thengel_guard_of_rohan", 6),
(set_visitors, 4, "trp_heavy_swordsman_of_rohan", 6),
(set_visitors, 5, "trp_folcwine_guard_of_rohan", 6),
(set_visitors, 6, "trp_veteran_footman_of_rohan", 6),
(set_visitors, 7, "trp_warden_of_methuseld", 6),
(set_visitors, 3, "trp_dismounted_elite_skirmisher_of_rohan", 6),
(set_visitors, 4, "trp_i5_raider_of_rohan", 6),
(set_visitors, 5, "trp_i6_footman_guard_of_rohan", 6),
(set_visitors, 6, "trp_i4_veteran_footman_of_rohan", 6),
(set_visitors, 7, "trp_i6_warden_of_methuseld", 6),
(set_visitors, 8, "trp_dismounted_veteran_skirmisher_of_rohan", 6),
(set_visitors, 9, "trp_rohan_youth", 6),
(set_visitors, 10, "trp_guardsman_of_rohan", 6),
(set_visitors, 11, "trp_footman_of_rohan", 6),
(set_visitors, 12, "trp_elite_footman_of_rohan", 6),
(set_visitors, 9, "trp_i1_rohan_youth", 6),
(set_visitors, 10, "trp_i2_guardsman_of_rohan", 6),
(set_visitors, 11, "trp_i3_footman_of_rohan", 6),
(set_visitors, 12, "trp_i5_elite_footman_of_rohan", 6),
(set_visitors, 13, "trp_lothlorien_veteran_archer", 8),
(set_visitors, 14, "trp_dismounted_veteran_skirmisher_of_rohan", 6),
(set_visitors, 15, "trp_dismounted_veteran_skirmisher_of_rohan", 6),
Expand Down Expand Up @@ -1000,24 +1000,24 @@
(assign, "$g_custom_battle_scene", "scn_minas_tirith_center"),
(troop_set_slot, "trp_troll_of_moria", slot_troop_hp_shield, 200),
(troop_set_slot, "trp_olog_hai", slot_troop_hp_shield, 200),
(assign, "$g_player_troop", "trp_eorl_guard_of_rohan"),
(assign, "$g_player_troop", "trp_c6_rider_guard_of_rohan"),
(set_player_troop, "$g_player_troop"),
(modify_visitors_at_site, "$g_custom_battle_scene"),
(set_visitor, 0, "$g_player_troop"),
(set_visitors, 1, "trp_elite_rider_of_rohan", 6),
(set_visitors, 1, "trp_c5_elite_rider_of_rohan", 6),
(set_visitors, 16, "trp_olog_hai", 1),
(str_store_string, s16, "@TEST: troll VS chavalry"),
(else_try),
# TROLL TEST
(eq, "$g_custom_battle_scenario", 13),
(assign, "$g_custom_battle_scene", "scn_minas_tirith_center"),
(troop_set_slot, "trp_troll_of_moria", slot_troop_hp_shield, 200),
(troop_set_slot, "trp_olog_hai", slot_troop_hp_shield, 200),
(assign, "$g_player_troop", "trp_elite_lancer_of_rohan"),
(assign, "$g_player_troop", "trp_c5_elite_lancer_of_rohan"),
(set_player_troop, "$g_player_troop"),
(modify_visitors_at_site, "$g_custom_battle_scene"),
(set_visitor, 0, "$g_player_troop"),
(set_visitors, 1, "trp_lancer_of_rohan", 6),
(set_visitors, 1, "trp_c4_lancer_of_rohan", 6),
(set_visitors, 16, "trp_olog_hai", 1),
(str_store_string, s16, "@TEST: troll VS lancers"),
(else_try),
Expand Down Expand Up @@ -1158,7 +1158,7 @@
(eq,":gfac",5),(assign,":trp_good_min","trp_lothlorien_scout" ),(assign,":trp_good_max","trp_galadhrim_royal_warden" ),(else_try),
(eq,":gfac",6),(assign,":trp_good_min","trp_greenwood_scout" ),(assign,":trp_good_max","trp_knight_of_rivendell" ),(else_try),
(eq,":gfac",7),(assign,":trp_good_min","trp_dunedain_scout" ),(assign,":trp_good_max","trp_dunedain_master_ranger" ),(else_try),
(eq,":gfac",8),(assign,":trp_good_min","trp_rohan_youth" ),(assign,":trp_good_max","trp_eorl_guard_of_rohan" ),
(eq,":gfac",8),(assign,":trp_good_min","trp_i1_rohan_youth" ),(assign,":trp_good_max","trp_c6_rider_guard_of_rohan" ),
(try_end),

(store_random_in_range,":bfac",0,9), ## bad faction chosen randomly
Expand Down Expand Up @@ -1438,7 +1438,7 @@
( "start_good_man",menu_text_color(0xFF000000)|mnf_disable_all_keys,
"^^^^^^^^^^Select your people:", "none",[(assign, "$last_menu", "mnu_start_good_man")],[
("start_go",[],"GONDOR, the Kingdom of the White Tower",[(jump_to_menu,"mnu_start_gondor"),]),
("start_ro",[],"ROHAN, the Horse people" ,[(call_script,"script_start_as_one","trp_rohan_youth"), (jump_to_menu,"mnu_choose_gender"),]),
("start_ro",[],"ROHAN, the Horse people" ,[(call_script,"script_start_as_one","trp_i1_rohan_youth"), (jump_to_menu,"mnu_choose_gender"),]),
("start_du",[],"DUNEDAIN, the ancient dynasty of Men" ,[(call_script,"script_start_as_one","trp_dunedain_scout"), (jump_to_menu,"mnu_choose_gender"),]),
("start_be",[],"BEORNINGS, the Bear people" ,[(call_script,"script_start_as_one","trp_beorning_vale_man"), (jump_to_menu,"mnu_choose_gender"),]),
("start_da",[],"the northern Kingdom of DALE" ,[(call_script,"script_start_as_one","trp_dale_militia"), (jump_to_menu,"mnu_choose_gender"),]),
Expand Down Expand Up @@ -8763,10 +8763,10 @@
(assign,reg(2),":tier_2_troop"),
(assign,reg(3),":tier_2_troop"),
(else_try),
(assign,reg(0),"trp_skirmisher_of_rohan"),
(assign,reg(1),"trp_veteran_skirmisher_of_rohan"),
(assign,reg(0),"trp_ac3_skirmisher_of_rohan"),
(assign,reg(1),"trp_ac4_veteran_skirmisher_of_rohan"),
(assign,reg(2),"trp_gondor_veteran_swordsmen"),
(assign,reg(3),"trp_veteran_skirmisher_of_rohan"),
(assign,reg(3),"trp_ac4_veteran_skirmisher_of_rohan"),
(try_end),
(assign,reg(4),-1),
(shuffle_range,0,5),
Expand Down Expand Up @@ -9763,8 +9763,8 @@
(try_begin),
(this_or_next|eq, "$players_kingdom", "fac_isengard"),
( eq, "$players_kingdom", "fac_dunland"),
(set_visitors,2,"trp_footman_of_rohan", 3),
(set_visitors,4,"trp_footman_of_rohan", 3),
(set_visitors,2,"trp_i3_footman_of_rohan", 3),
(set_visitors,4,"trp_i3_footman_of_rohan", 3),
(else_try),
(this_or_next|eq,"$players_kingdom", "fac_mordor"),
( eq,"$players_kingdom", "fac_umbar"),
Expand Down
6 changes: 3 additions & 3 deletions ModuleSystem/module_items.py
View file
Expand Up @@ -958,9 +958,9 @@ def heraldic(item_tableau):
["rohan_leather","Rohan_Leather_Vest",[("rohan_lamellar_poor",imodbits_armor_bad),("rohan_lamellar",0),("rohan_lamellar_reinforced",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,300,weight(8)|head_armor(0)|body_armor(13)|leg_armor(9)|difficulty(0),imodbits_armor,],
["rohan_mail","Rohan_Hauberk",[("rohan_mail_poor",imodbits_armor_bad),("rohan_mail",0),("rohan_mail_reinforced",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,800,weight(12)|head_armor(0)|body_armor(20)|leg_armor(12)|difficulty(0),imodbits_armor,],
["rohan_rider","Rohan_Rider_Armor",[("rohan_rider_poor",imodbits_armor_bad),("rohan_rider",0),("rohan_rider_reinforced",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1000,weight(14)|head_armor(0)|body_armor(25)|leg_armor(12)|difficulty(0),imodbits_armor,],
["rohan_scale","Rohan_Scale_Armor",[("rohan_scale_poor",imodbits_armor_bad),("rohan_scale",0),("rohan_scale_reinforced",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1200,weight(20)|head_armor(0)|body_armor(38)|leg_armor(15)|difficulty(16),imodbits_armor,],
["rohan_surcoat","Rohan_Surcoat",[("rohan_tabard_poor",imodbits_armor_bad),("rohan_tabard",0),("rohan_tabard_reinforced",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,2000,weight(20)|head_armor(0)|body_armor(34)|leg_armor(15)|difficulty(18),imodbits_armor,],
["rohan_guard","Rohan_Guard_Armor",[("rohan_royal_guard_armor2",imodbits_armor_bad),("rohan_royal_guard_armor1",0),("rohan_royal_guard_armor1_lordly",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,3000,weight(22)|head_armor(0)|body_armor(37)|leg_armor(17)|difficulty(20),imodbits_armor,],
["rohan_scale","Rohan_Scale_Armor",[("rohan_scale_poor",imodbits_armor_bad),("rohan_scale",0),("rohan_scale_reinforced",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1200,weight(20)|head_armor(0)|body_armor(32)|leg_armor(15)|difficulty(16),imodbits_armor,],
["rohan_surcoat","Rohan_Surcoat",[("rohan_tabard_poor",imodbits_armor_bad),("rohan_tabard",0),("rohan_tabard_reinforced",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,2000,weight(20)|head_armor(0)|body_armor(36)|leg_armor(15)|difficulty(18),imodbits_armor,],
["rohan_guard","Rohan_Guard_Armor",[("rohan_royal_guard_armor2",imodbits_armor_bad),("rohan_royal_guard_armor1",0),("rohan_royal_guard_armor1_lordly",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,3000,weight(22)|head_armor(0)|body_armor(38)|leg_armor(17)|difficulty(20),imodbits_armor,],
#["rohan_armor_s","Rohan_Guard_Armor",[("rohan_royal_guard_armor1",imodbits_armor_ok),("rohan_royal_guard_armor2",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,3000,weight(22)|head_armor(0)|body_armor(40)|leg_armor(17)|difficulty(0),imodbits_elf_armor,[(ti_on_init_item,[(store_trigger_param_1, ":agent_no"),(store_trigger_param_2, ":troop_no"),(call_script, "script_shield_item_set_banner", "tableau_heraldic_armor_b", ":agent_no", ":troop_no")])]],
##HELMS##########
["rohan_light_helmet_a","Rohan_Light_Helm", [("rohan_recruit_helm_a",imodbits_armor_bad),("rohan_recruit_helm_b",0),("rohan_recruit_helm_c",imodbits_armor_good)],itp_type_head_armor|itp_shop,0,500,weight(1)|head_armor(26)|difficulty(0),imodbits_armor| imodbit_cracked],
Expand Down
4 changes: 2 additions & 2 deletions ModuleSystem/module_mission_templates.py
View file
Expand Up @@ -7090,7 +7090,7 @@
(tutorial_message, "str_tutorial_2_msg_3"),
(play_sound, "snd_tutorial_1"),
(try_end),
(call_script, "script_cf_get_first_agent_with_troop_id", "trp_squire_of_rohan"),
(call_script, "script_cf_get_first_agent_with_troop_id", "trp_c2_squire_of_rohan"),
(assign, ":cur_agent", reg0),
(entry_point_get_position, pos1, 3),
(agent_get_position, pos2, ":cur_agent"),
Expand All @@ -7101,7 +7101,7 @@
(val_add, "$tutorial_2_melee_agent_state", 1),
(else_try),
(eq, "$tutorial_2_melee_agent_state", 4),
(call_script, "script_cf_get_first_agent_with_troop_id", "trp_squire_of_rohan"),
(call_script, "script_cf_get_first_agent_with_troop_id", "trp_c2_squire_of_rohan"),
(assign, ":cur_agent", reg0),
(entry_point_get_position, pos1, 2),
(agent_get_position, pos2, ":cur_agent"),
Expand Down
1 change: 1 addition & 0 deletions ModuleSystem/module_mission_templates_TLD.py
View file
Expand Up @@ -1699,6 +1699,7 @@
(this_or_next|eq, ":troop_id", "trp_fell_huntsmen_of_mirkwood"),
(this_or_next|eq, ":troop_id", "trp_corsair_night_raider"),
(this_or_next|eq, ":troop_id", "trp_far_harad_panther_guard"),
(this_or_next|eq, ":troop_id", "trp_i6_frealaf_raider"),
( eq, ":troop_id", "trp_blackroot_leader"),
(assign, ":yes",1),
(display_message, "@Some of your human troops are not daunted by the darkness.(Night Troops are not affected by night time penalties)", color_neutral_news),
Expand Down
3 changes: 2 additions & 1 deletion ModuleSystem/module_scripts.py
View file
Expand Up @@ -21168,7 +21168,7 @@ def set_item_score():
(gt,":tier_2_troop", 0),
(assign,reg0,":tier_3_troop"),(assign,reg1,":tier_3_troop"),(assign,reg2,":tier_2_troop"),(assign,reg3,":tier_2_troop"),
(else_try),
(assign,reg0,"trp_gondor_swordsmen"),(assign,reg1,"trp_gondor_swordsmen"),(assign,reg2,"trp_archer_of_gondor"),(assign,reg3,"trp_footman_of_rohan"),
(assign,reg0,"trp_gondor_swordsmen"),(assign,reg1,"trp_gondor_swordsmen"),(assign,reg2,"trp_archer_of_gondor"),(assign,reg3,"trp_i3_footman_of_rohan"),
(try_end),
(shuffle_range,0,4),
(set_visitor,25,reg0),(set_visitor,26,reg1),(set_visitor,27,reg2),(set_visitor,28,reg3),
Expand Down Expand Up @@ -22024,6 +22024,7 @@ def set_item_score():
(this_or_next|eq, ":troop_id", "trp_fell_huntsmen_of_mirkwood"),
(this_or_next|eq, ":troop_id", "trp_corsair_night_raider"),
(this_or_next|eq, ":troop_id", "trp_far_harad_panther_guard"),
(this_or_next|eq, ":troop_id", "trp_i6_frealaf_raider"),
( eq, ":troop_id", "trp_blackroot_leader"),
(assign, ":continue", 0),
(try_end),
Expand Down

0 comments on commit 632993f

Please sign in to comment.