Skip to content

Commit

Permalink
- new troop tree for Moria, introducing Orc Chieftains (tanks) and De…
Browse files Browse the repository at this point in the history 
…ep-Dwellers (armour-bursters) and stronger Moria orc shields,

- moved materials and textures from orc_buildings.brf to materials.brf and textures.brf, added a copy ((different flags!) of the orc_leather material to orc_shields.
- made itm_good_mace available in stores, by adjusting item range in item factionization script.
  • Loading branch information
@In-Vain
In-Vain committed Dec 11, 2017
1 parent c62e62a commit cf997c4
Show file tree
Hide file tree
Showing 29 changed files with 148 additions and 148 deletions.
2 changes: 1 addition & 1 deletion ModuleSystem/ID/ID_troops.py
View file
Expand Up @@ -378,7 +378,7 @@
trp_fell_goblin_of_moria = 377
trp_archer_snaga_of_moria = 378
trp_large_goblin_archer_of_moria = 379
trp_fell_goblin_archer_of_moria = 380
trp_deep_dweller_of_moria = 380
trp_moria_items = 381
trp_goblin_gundabad = 382
trp_orc_gundabad = 383
Expand Down
Binary file modified ModuleSystem/TROOPS.xls
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ModuleSystem/module_game_menus.py
View file
Expand Up @@ -632,7 +632,7 @@
(set_visitors, 4, "trp_fell_goblin_of_moria", 5),
(set_visitors, 5, "trp_archer_snaga_of_moria", 5),
(set_visitors, 6, "trp_large_goblin_archer_of_moria", 5),
(set_visitors, 7, "trp_fell_goblin_archer_of_moria", 5),
(set_visitors, 7, "trp_deep_dweller_of_moria", 5),
(set_visitors, 8, "trp_goblin_gundabad", 5),
(set_visitors, 9, "trp_orc_gundabad", 5),
## ENEMY
Expand Down Expand Up @@ -947,7 +947,7 @@
(eq,":bfac",4),(assign,":trp_bad_min","trp_corsair_youth" ),(assign,":trp_bad_max","trp_pike_master_of_umbar" ),(else_try),
(eq,":bfac",5),(assign,":trp_bad_min","trp_orc_snaga_of_isengard"),(assign,":trp_bad_max","trp_fighting_uruk_hai_pikeman" ),(else_try),
(eq,":bfac",6),(assign,":trp_bad_min","trp_orc_snaga_of_mordor" ),(assign,":trp_bad_max","trp_fell_orc_archer_of_mordor" ),(else_try),
(eq,":bfac",7),(assign,":trp_bad_min","trp_wolf_rider_of_moria" ),(assign,":trp_bad_max","trp_fell_goblin_archer_of_moria"),(else_try),
(eq,":bfac",7),(assign,":trp_bad_min","trp_wolf_rider_of_moria" ),(assign,":trp_bad_max","trp_deep_dweller_of_moria"),(else_try),
(eq,":bfac",8),(assign,":trp_bad_min","trp_goblin_gundabad" ),(assign,":trp_bad_max","trp_goblin_north_clan_rider" ),
(try_end),

Expand Down
24 changes: 12 additions & 12 deletions ModuleSystem/module_items.py
View file
Expand Up @@ -612,7 +612,7 @@
["orc_club_a","Orc_Club",[("orc_club_a",0)],itp_type_one_handed_wpn|itp_primary|itp_shop|itp_no_parry|itp_wooden_attack,itc_cleaver|itcf_carry_mace_left_hip,5,weight(2.5)|difficulty(0)|spd_rtng(90)|weapon_length(62)|swing_damage(15,blunt)|thrust_damage(0,pierce),imodbits_weapon_wood],
["orc_club_b","Warg_Rider_Club",[("orc_club_b",0)],itp_type_two_handed_wpn|itp_primary|itp_shop|itp_no_parry|itp_wooden_attack|itp_penalty_with_shield,itc_bastardfalchion|itcf_carry_mace_left_hip,5,weight(3)|difficulty(0)|spd_rtng(75)|weapon_length(77)|swing_damage(27,blunt)|thrust_damage(0,pierce),imodbits_weapon_wood],
["orc_club_c","Spiky_Orc_Club",[("orc_club_c",0)],itp_type_one_handed_wpn|itp_primary|itp_shop|itp_no_parry|itp_wooden_attack,itc_dagger|itcf_carry_mace_left_hip,5,weight(2.5)|difficulty(0)|spd_rtng(85)|weapon_length(70)|swing_damage(20,pierce)|thrust_damage(25,pierce),imodbits_weapon_wood],
["orc_club_d","Evil_Mace",[("evil_mace",0)],itp_type_one_handed_wpn|itp_primary|itp_shop|itp_no_parry|itp_wooden_attack,itc_cleaver|itcf_carry_mace_left_hip,5,weight(3.5)|difficulty(0)|spd_rtng(90)|weapon_length(59)|swing_damage(25,blunt)|thrust_damage(0,pierce),imodbits_weapon_wood],
["orc_club_d","Evil_Mace",[("evil_mace",0)],itp_type_one_handed_wpn|itp_primary|itp_shop|itp_no_parry|itp_wooden_attack,itc_cleaver|itcf_carry_mace_left_hip,5,weight(3.5)|difficulty(0)|spd_rtng(90)|weapon_length(59)|swing_damage(27,blunt)|thrust_damage(0,pierce),imodbits_weapon_wood],
["orc_sledgehammer","Orc_Sledgehammer",[("orc_sledgehammer",0)],itp_type_polearm|itp_shop|itp_primary|itp_two_handed|itp_no_parry|itp_wooden_attack|itp_cant_use_on_horseback,itc_cut_two_handed|itcf_carry_back,100,weight(7)|difficulty(0)|spd_rtng(80)|weapon_length(75)|swing_damage(30,blunt)|thrust_damage(0,pierce),imodbits_weapon_wood],
["orc_simple_spear","Orc_Spear",[("orc_simple_spear",0)],itp_type_polearm|itp_shop|itp_primary|itp_spear|itp_penalty_with_shield|itp_no_parry|itp_covers_head,itc_spear_upstab,100,weight(2.5)|difficulty(0)|spd_rtng(96)|weapon_length(152)|thrust_damage(22,pierce),imodbits_weapon_wood],
["orc_skull_spear","Orc_Skull_Spear",[("orc_skull_spear",0)],itp_type_polearm|itp_shop|itp_primary|itp_spear|itp_penalty_with_shield|itp_no_parry|itp_covers_head,itc_spear_upstab,200,weight(3)|difficulty(0)|spd_rtng(92)|weapon_length(162)|thrust_damage(27,pierce),imodbits_weapon_wood],
Expand All @@ -628,9 +628,9 @@
["orc_bow","Orc_Bow",[("orc_bow",0),("orc_bow_carry",ixmesh_carry)],itp_type_bow|itp_primary|itp_two_handed|itp_shop,itcf_shoot_ganstabow|itcf_carry_bowcase_left,200,weight(1.25)|difficulty(0)|shoot_speed(53)|spd_rtng(86)|thrust_damage(20,cut)|accuracy(74),imodbits_bow,[] ],
# uruk_bow is a orc_bow intended for uruks/humans (vertical shooting position)
####Orc Shields
["orc_shield_a","Orc_Shield",[("orc_shield_a",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(100)|body_armor(1)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["orc_shield_b","Orc_Shield",[("orc_shield_b",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(100)|body_armor(1)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["orc_shield_c","Orc_Shield",[("orc_shield_c",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_kite_shield,100,weight(3)|hit_points(100)|body_armor(1)|spd_rtng(76)|weapon_length(81),imodbits_shield,],
["orc_shield_a","Orc_Shield",[("orc_shield_a",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(100)|body_armor(2)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["orc_shield_b","Orc_Shield",[("orc_shield_b",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(100)|body_armor(2)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["orc_shield_c","Orc_Tower_Shield",[("orc_shield_c",0),("orc_shield_c_strong", imodbit_reinforced), ("orc_shield_c_strong", imodbit_hardened), ("orc_shield_c_strong", imodbit_thick)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_kite_shield,100,weight(5)|hit_points(250)|body_armor(3)|spd_rtng(76)|weapon_length(81),imodbits_shield,],
["mordor_orc_shield_a","Mordor_Orc_Shield",[("mordor_orc_shield_a",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(200)|body_armor(1)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["mordor_orc_shield_b","Mordor_Orc_Shield",[("mordor_orc_shield_b",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(200)|body_armor(2)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["mordor_orc_shield_c","Mordor_Orc_Shield",[("mordor_orc_shield_c",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(200)|body_armor(2)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
Expand Down Expand Up @@ -706,9 +706,9 @@
["moria_armor_d","Moria_Bolted_Leather",[("orc_moria_d",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1101,weight(22)|head_armor(0)|body_armor(18)|leg_armor(10)|difficulty(0),imodbits_orc_armor,],
["moria_armor_e","Moria_Orc_Heavy_Mail",[("orc_moria_e",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1401,weight(24)|head_armor(0)|body_armor(23)|leg_armor(11)|difficulty(0),imodbits_elf_armor,],
#######SHIELDS##########
["moria_orc_shield_a","Moria_Orc_Shield",[("moria_orc_shield_a",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(310)|body_armor(1)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["moria_orc_shield_b","Moria_Orc_Shield",[("moria_orc_shield_b",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(310)|body_armor(1)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["moria_orc_shield_c","Moria_Orc_Shield",[("moria_orc_shield_c",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(310)|body_armor(1)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["moria_orc_shield_a","Moria_Great_Shield",[("moria_orc_shield_a",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(350)|body_armor(2)|spd_rtng(88)|weapon_length(60),imodbits_shield,],
["moria_orc_shield_b","Moria_Orc_Shield",[("moria_orc_shield_b",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(310)|body_armor(2)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
["moria_orc_shield_c","Moria_Orc_Shield",[("moria_orc_shield_c",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,100,weight(3)|hit_points(310)|body_armor(2)|spd_rtng(96)|weapon_length(40),imodbits_shield,],
###TLD GUNDABAD ITEMS##########
#ARMORS##########
["gundabad_armor_a","Gundabad_Orc_Rags",[("orc_gunda_a",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,201,weight(15)|head_armor(0)|body_armor(5)|leg_armor(4)|difficulty(0),imodbits_orc_cloth,],
Expand Down Expand Up @@ -1020,14 +1020,14 @@
########WEAPONS##########
["rhun_greataxe","Rhun_Great_Axe",[("rhun_greataxe",0)],itp_type_polearm|itp_shop|itp_primary|itp_two_handed|itp_cant_use_on_horseback|itp_bonus_against_shield|itp_wooden_parry,itc_nodachi|itcf_carry_axe_back,300,weight(5)|difficulty(0)|spd_rtng(89)|weapon_length(115)|swing_damage(43,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
["rhun_battleaxe","Rhun_Battle_Axe",[("rhun_battle_axe",0)],itp_type_polearm|itp_shop|itp_primary|itp_two_handed|itp_cant_use_on_horseback|itp_bonus_against_shield|itp_wooden_parry,itc_nodachi|itcf_carry_axe_back,300,weight(4)|difficulty(0)|spd_rtng(86)|weapon_length(108)|swing_damage(43,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
["rhun_falchion","Rhun_Falchion",[("rhun_falchion",0)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,200,weight(2.5)|difficulty(0)|spd_rtng(96)|weapon_length(77)|swing_damage(30,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
["rhun_falchion","Savage_Falchion",[("rhun_falchion",0)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,200,weight(2.5)|difficulty(0)|spd_rtng(96)|weapon_length(77)|swing_damage(30,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
["rhun_glaive","Rhun_Glaive",[("rhun_glaive",0)],itp_type_polearm|itp_shop|itp_primary|itp_spear|itp_two_handed|itp_cant_use_on_horseback|itp_wooden_parry,itc_cutting_spear|itcf_carry_axe_back,400,weight(4.5)|difficulty(0)|spd_rtng(83)|weapon_length(156)|swing_damage(38,cut)|thrust_damage(21,pierce),imodbits_weapon_bad],
#["rhun_bill", "Rhun Bill",[("rhun_bill" ,0)],itp_type_polearm|itp_shop|itp_spear|itp_primary|itp_two_handed|itp_wooden_parry, itc_staff|itcf_carry_spear, 352 , weight(4.5)|difficulty(0)|spd_rtng(83) | weapon_length(166)|swing_damage(38 , cut) | thrust_damage(21 , pierce),imodbits_polearm ],
#["rhun_knife", "Rhun Knife",[("rhun_knife" ,0)],itp_type_one_handed_wpn|itp_shop|itp_primary|itp_secondary|itp_no_parry, itc_dagger|itcf_carry_dagger_front_left, 4 , weight(0.5)|difficulty(0)|spd_rtng(110) | weapon_length(40)|swing_damage(21 , cut) | thrust_damage(13 , pierce),imodbits_sword ],
["rhun_greatfalchion","Rhun_Great_Falchion",[("rhun_greatfalchion",0)],itp_type_two_handed_wpn|itp_primary|itp_two_handed|itp_shop,itc_greatsword|itcf_carry_sword_back,524,weight(3)|difficulty(0)|spd_rtng(92)|weapon_length(102)|swing_damage(42,cut)|thrust_damage(31,pierce),imodbits_weapon_bad],
["rhun_greatsword","Rhun_Great_Sword",[("rhun_greatsword",0)],itp_type_two_handed_wpn|itp_primary|itp_two_handed|itp_shop,itc_greatsword|itcf_carry_sword_back,524,weight(3)|difficulty(0)|spd_rtng(94)|weapon_length(101)|swing_damage(40,cut)|thrust_damage(31,pierce),imodbits_weapon_bad],
["rhun_shortsword","Rhun_Shortsword",[("rhun_shortsword",0)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,200,weight(2.5)|difficulty(0)|spd_rtng(98)|weapon_length(70)|swing_damage(30,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
["rhun_sword","Rhun_Sword",[("rhun_sword",0)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,200,weight(2.9)|difficulty(0)|spd_rtng(92)|weapon_length(89)|swing_damage(32,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
["rhun_greatfalchion","Savage_Great_Falchion",[("rhun_greatfalchion",0)],itp_type_two_handed_wpn|itp_primary|itp_two_handed|itp_shop,itc_greatsword|itcf_carry_sword_back,524,weight(3)|difficulty(0)|spd_rtng(92)|weapon_length(102)|swing_damage(42,cut)|thrust_damage(31,pierce),imodbits_weapon_bad],
["rhun_greatsword","Savage_Great_Sword",[("rhun_greatsword",0)],itp_type_two_handed_wpn|itp_primary|itp_two_handed|itp_shop,itc_greatsword|itcf_carry_sword_back,524,weight(3)|difficulty(0)|spd_rtng(94)|weapon_length(101)|swing_damage(40,cut)|thrust_damage(31,pierce),imodbits_weapon_bad],
["rhun_shortsword","Savage_Shortsword",[("rhun_shortsword",0)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,200,weight(2.5)|difficulty(0)|spd_rtng(98)|weapon_length(70)|swing_damage(30,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
["rhun_sword","Savage_Sword",[("rhun_sword",0)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,200,weight(2.9)|difficulty(0)|spd_rtng(92)|weapon_length(89)|swing_damage(32,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
########shields##########
["rhun_shield","Rhun_Kite_Shield",[("rhun_shield",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_kite_shield,200,weight(2.5)|hit_points(480)|body_armor(5)|spd_rtng(82)|weapon_length(80),imodbits_shield,],
#TLD DALE ITEMS##########
Expand Down
8 changes: 4 additions & 4 deletions ModuleSystem/module_party_templates.py
View file
Expand Up @@ -47,7 +47,7 @@
("wild_troll", "Wild Troll", icon_wild_troll |pf_quest_party, 0,fac_neutral, bandit_personality,[(trp_troll_of_moria,1,2),]),
("raging_trolls", "Raging Trolls", icon_wild_troll |pf_quest_party, 0,fac_neutral, bandit_personality,[(trp_troll_of_moria,1,3),]),
("looters", "Tribal Orcs", icon_orc_tribal |carries_goods(4),0,fac_outlaws, bandit_personality,[(trp_tribal_orc_warrior,0,1),(trp_tribal_orc,2,25)]),
("forest_bandits", "Orc Stragglers", icon_orc_tribal |carries_goods(4),0,fac_outlaws, bandit_personality,[(trp_tribal_orc_chief,0,1),(trp_tribal_orc_warrior,0,8),(trp_tribal_orc,3,40),(trp_mountain_goblin,1,30)]),
("forest_bandits", "Orc Stragglers", icon_orc_tribal |carries_goods(4),0,fac_outlaws, bandit_personality,[(trp_tribal_orc_warrior,0,8),(trp_tribal_orc,3,40),(trp_mountain_goblin,1,30)]),
("mountain_bandits", "Wild Goblins", icon_orc_tribal |carries_goods(4),0,fac_outlaws, bandit_personality,[(trp_mountain_goblin,2,40)]),
("steppe_bandits", "Dunland Outcasts", icon_dunlander |carries_goods(4),0,fac_outlaws, bandit_personality,[(trp_dunnish_warrior,3,10), (trp_dunnish_wildman,5,35)]),
("sea_raiders", "Corsair Renegades", icon_umbar_corsair|carries_goods(4),0,fac_outlaws, bandit_personality,[(trp_corsair_warrior,3,30),(trp_marksman_of_umbar,3,20)]),
Expand Down Expand Up @@ -122,9 +122,9 @@
("harad_raiders" ,"Haradrim Raiders" ,icon_harad_horseman|carries_goods(2)|pf_show_faction,0,fac_harad ,soldier_personality,[(trp_harad_tiger_guard,1,1),(trp_harad_skirmisher,10,20),(trp_harad_desert_warrior,11,20)]), #98-176
("khand_raiders" ,"Khand Raiders" ,icon_cataphract |carries_goods(2)|pf_show_faction,0,fac_khand ,soldier_personality,[(trp_easterling_horsemaster,1,1),(trp_easterling_rider,5,10),(trp_easterling_veteran_horseman,5,15)]), #81-191
("umbar_raiders" ,"Umbar Raiders" ,icon_umbar_corsair |carries_goods(2)|pf_show_faction,0,fac_umbar ,soldier_personality,[(trp_corsair_night_raider,1,1),(trp_corsair_veteran_raider,4,8),(trp_corsair_pikeman,4,8),(trp_corsair_warrior,6,15)]), #100-196 good at it
("moria_raiders" ,"Moria Raiders" ,icon_orc |carries_goods(2)|pf_show_faction,0,fac_moria ,soldier_personality,[(trp_fell_goblin_archer_of_moria,1,1),(trp_large_goblin_archer_of_moria,3,9),(trp_large_goblin_of_moria,5,15),(trp_archer_snaga_of_moria,8,16)]), #72-176
("moria_raiders" ,"Moria Raiders" ,icon_orc |carries_goods(2)|pf_show_faction,0,fac_moria ,soldier_personality,[(trp_tribal_orc_chief,1,3),(trp_large_goblin_archer_of_moria,3,9),(trp_large_goblin_of_moria,5,15),(trp_archer_snaga_of_moria,8,16)]), #72-176
("guldur_raiders" ,"Dol Guldur Raiders",icon_orc_tribal |carries_goods(2)|pf_show_faction,0,fac_guldur ,soldier_personality,[(trp_fell_orc_tracker_of_mordor,1,1),(trp_large_orc_of_mordor,4,10),(trp_orc_of_guldur,8,16),(trp_orc_archer_of_mordor,8,16),(trp_orc_snaga_of_guldur,15,30)]), #91-184
("gundabad_raiders","Gundabad Raiders" ,icon_orc_tribal |carries_goods(2)|pf_show_faction,0,fac_gundabad,soldier_personality,[(trp_goblin_north_clan_rider,1,3),(trp_warg_skirmisher_gundabad,6,12),(trp_orc_beserker_gundabad,12,18),(trp_orc_gundabad,18,32),(trp_troll_of_moria,0,1)]), #128-234 was 93-163
("gundabad_raiders","Gundabad Raiders" ,icon_orc_tribal |carries_goods(2)|pf_show_faction,0,fac_gundabad,soldier_personality,[(trp_goblin_north_clan_rider,1,3),(trp_warg_skirmisher_gundabad,6,12),(trp_goblin_rider_gundabad,6,12),(trp_orc_gundabad,18,32),(trp_troll_of_moria,0,1)]), #128-234 was 93-163
("rhun_raiders" ,"Rhun Raiders" ,icon_easterling_horseman|carries_goods(1)|pf_show_faction,0,fac_rhun ,soldier_personality,[(trp_rhun_heavy_noble_cavalry,1,3),(trp_rhun_horse_archer,8,16),(trp_rhun_light_cavalry,10,20)]), #124-264, was 100-184


Expand Down Expand Up @@ -316,7 +316,7 @@
("beorn_reinf_c" ,"_",0,0,fac_commoners,0,[(trp_beorning_sentinel,1,3),(trp_beorning_carrock_fighter,2,3),(trp_woodmen_axemen,1,2),]),
#Mt. Gundabad - see Moria (8-16, 7-13, 5-10)
("gundabad_reinf_a","_",0,0,fac_commoners,0,[(trp_goblin_gundabad,8,16)]),
("gundabad_reinf_b","_",0,0,fac_commoners,0,[(trp_orc_beserker_gundabad,4,7),(trp_orc_gundabad,4,7),]),
("gundabad_reinf_b","_",0,0,fac_commoners,0,[(trp_warg_skirmisher_gundabad,2,4),(trp_orc_gundabad,4,7),]),
("gundabad_reinf_c","_",0,0,fac_commoners,0,[(trp_goblin_rider_gundabad,2,5),(trp_orc_fighter_gundabad,2,3),(trp_warg_skirmisher_gundabad,1,3),(trp_troll_of_moria,1,1),]),
#Dale (7-14, 5-10, 4-8)
("dale_reinf_a" ,"_",0,0,fac_commoners,0,[(trp_dale_man_at_arms,1,2),(trp_laketown_scout,1,2),(trp_dale_militia,5,10),]),
Expand Down
2 changes: 1 addition & 1 deletion ModuleSystem/module_scenes.py
View file
Expand Up @@ -226,7 +226,7 @@
("gundabad_mirkwood_outpost" ,sf_generate,"none","none",(0,0),(100,100),-100,"0x0000000730050d0d0002d4b300000e2f000027d200005f66",[],[],"outer_terrain_forest"),#Kolba
("dol_guldur_north_outpost_center",sf_generate,"none","none",(0,0),(100,100),-100,"0x0000000730050d0d0002d4b300000e2f000027d200005f66",[],[],"outer_terrain_forest"), #Kolba
("woodelf_west_camp_center" ,sf_generate,"none","none",(0,0),(100,100),-100,"0x00000007300798b2000380e3000037960000573900003f48",[],[],"outer_terrain_forest"),
("goblin_north_outpost_center",sf_generate|sf_no_horses,"none","none",(0,0),(100,100),-100,"0x00000007300005000008160b00000f768000576c00001d2c",[],[],"0"),
("goblin_north_outpost_center",sf_generate|sf_no_horses|sf_indoors,"none","none",(0,0),(100,100),-100,"0x00000007300005000008160b00000f768000576c00001d2c",[],[],"0"),
("goblin_south_outpost_center",sf_generate,"none","none",(0,0),(100,100),-100,"0x0000000320001d9300031ccb000041be000048ba0000361c",[],[],"outer_mountains2west"),
("woodsmen_village2_center" ,sf_generate,"none","none",(0,0),(100,100),-100,"0x000000073000148000025896000074e600006c260000125a",[],[],"outer_terrain_plain"),
("beorning_village_center" ,sf_generate,"none","none",(0,0),(100,100),-100,"0x000000073000148000025896000074e600006c260000125a",[],[],"outer_terrain_plain"),
Expand Down
2 changes: 1 addition & 1 deletion ModuleSystem/module_scripts.py
View file
Expand Up @@ -54,7 +54,7 @@ def set_item_faction():
#GA assign troops to proper subfactions acc to troops[i_troop][5]
troopsub = troops[i_troop][5]
if troopsub > 0: command_list.append((troop_set_slot, i_troop, slot_troop_subfaction, troopsub))
for i_item in xrange(23,825): #regular items here
for i_item in xrange(23,826): #regular items here
faction = 0
sfaction = 0
for i_troop in xrange(29,430): # search items inside troop inventory
Expand Down

0 comments on commit cf997c4

Please sign in to comment.