Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
*use the correct output ID files in process_scene_props.py. redirect …
…correctly in ID_presentations, this was broken since yoda knows why.

*lower the faction strength requirements of fac_str_guardian by raising it to 1700 from 1000, as requested by Kham.
  • Loading branch information
Swyter committed Mar 26, 2017
1 parent 3d91e43 commit 03e2d59
Show file tree
Hide file tree
Showing 9 changed files with 151 additions and 147 deletions.
4 changes: 2 additions & 2 deletions ModuleSystem/ID/ID_presentations.py
@@ -1,6 +1,6 @@
from module_info import *

if (wb_compile_switch):
from ID_meshes_wb import *
from ID_presentations_wb import *
else:
from ID_meshes_mb import *
from ID_presentations_mb import *
140 changes: 38 additions & 102 deletions ModuleSystem/ID/ID_scene_props_mb.py
Expand Up @@ -1523,105 +1523,41 @@
spr_gothic_chair_nocol = 1522
spr_smaug_skeleton = 1523
spr_dorwinion_sack = 1524
spr_fake_house_a = 1525
spr_fake_house_b = 1526
spr_fake_house_c = 1527
spr_fake_house_d = 1528
spr_fake_house_e = 1529
spr_fake_house_f = 1530
spr_fake_house_far_a = 1531
spr_fake_house_far_b = 1532
spr_fake_house_far_c = 1533
spr_fake_house_far_d = 1534
spr_fake_house_far_e = 1535
spr_fake_house_far_f = 1536
spr_Dale_fake_house_a = 1537
spr_Dale_fake_house_b = 1538
spr_Dale_fake_house_c = 1539
spr_Dale_fake_house_d = 1540
spr_Dale_fake_house_e = 1541
spr_Dale_fake_house_f = 1542
spr_Dale_fake_house_far_a = 1543
spr_Dale_fake_house_far_b = 1544
spr_Dale_fake_house_far_c = 1545
spr_Dale_fake_house_far_d = 1546
spr_Dale_castle_small_round_tower = 1547
spr_Dale_castle_small_round_tower_roof = 1548
spr_Dale_castle_Stone_Stairs = 1549
spr_Dale_tower_top_a = 1550
spr_Dale_tower_top_c = 1551
spr_Dale_castle_Gate_House = 1552
spr_Dale_castle_High_Tower = 1553
spr_Dale_Bell_Tower = 1554
spr_Dale_Minaret = 1555
spr_Dale_Hall = 1556
spr_Dale_Palace = 1557
spr_Dale_Market = 1558
spr_Dale_castle_Gaillard = 1559
spr_Dale_castle_Battlement = 1560
spr_Dale_copula_1 = 1561
spr_Dale_town_house_b = 1562
spr_Dale_copula_2 = 1563
spr_Dale_town_house_d = 1564
spr_Dale_town_house_f = 1565
spr_Dale_copula_3 = 1566
spr_Dale_tower_top_b = 1567
spr_Dale_copula_4 = 1568
spr_Dale_copula_5 = 1569
spr_Dale_copula_6 = 1570
spr_Dale_small_wall = 1571
spr_Dale_passage_house_b = 1572
spr_Dale_Plaza = 1573
spr_Dale_street_short = 1574
spr_Dale_castle_battlement_d = 1575
spr_Dale_castle_courtyard_house_extension_a_E = 1576
spr_Dale_castle_courtyard_house_extension_b_E = 1577
spr_Dale_castle_courtyard_entry_b = 1578
spr_Dale_castle_courtyard_house_b = 1579
spr_distant_mountain_snow_1 = 1580
spr_distant_mountain_snow_2 = 1581
spr_ship = 1582
spr_ship_b = 1583
spr_ship_d = 1584
spr_ship_c = 1585
spr_ship_sail_off = 1586
spr_ship_sail_off_b = 1587
spr_ship_c_sail_off = 1588
spr_osgiliath_far_f = 1589
spr_hill = 1590
spr_water_river = 1591
spr_water_fall = 1592
spr_distant_street_a = 1593
spr_distant_street_b = 1594
spr_distant_mountain_a = 1595
spr_distant_mountain_b = 1596
spr_distant_mountain_c = 1597
spr_distant_soldiers_a = 1598
spr_distant_orcs_a = 1599
spr_distant_soldiers_uruks_a = 1600
spr_water_splash_a = 1601
spr_water_splash_b = 1602
spr_water_splash_c = 1603
spr_water_fall_2 = 1604
spr_water_foam = 1605
spr_water_run = 1606
spr_save_compartibility1 = 1607
spr_save_compartibility2 = 1608
spr_save_compartibility3 = 1609
spr_save_compartibility4 = 1610
spr_save_compartibility5 = 1611
spr_save_compartibility6 = 1612
spr_save_compartibility7 = 1613
spr_save_compartibility8 = 1614
spr_save_compartibility9 = 1615
spr_save_compartibility10 = 1616
spr_save_compartibility11 = 1617
spr_save_compartibility12 = 1618
spr_save_compartibility13 = 1619
spr_save_compartibility14 = 1620
spr_save_compartibility15 = 1621
spr_save_compartibility16 = 1622
spr_save_compartibility17 = 1623
spr_save_compartibility18 = 1624
spr_save_compartibility19 = 1625
spr_save_compartibility20 = 1626
spr_osgiliath_far_f = 1525
spr_hill = 1526
spr_water_river = 1527
spr_water_fall = 1528
spr_distant_street_a = 1529
spr_distant_street_b = 1530
spr_distant_mountain_a = 1531
spr_distant_mountain_b = 1532
spr_distant_mountain_c = 1533
spr_distant_soldiers_a = 1534
spr_distant_orcs_a = 1535
spr_distant_soldiers_uruks_a = 1536
spr_water_splash_a = 1537
spr_water_splash_b = 1538
spr_water_splash_c = 1539
spr_water_fall_2 = 1540
spr_water_foam = 1541
spr_water_run = 1542
spr_save_compartibility1 = 1543
spr_save_compartibility2 = 1544
spr_save_compartibility3 = 1545
spr_save_compartibility4 = 1546
spr_save_compartibility5 = 1547
spr_save_compartibility6 = 1548
spr_save_compartibility7 = 1549
spr_save_compartibility8 = 1550
spr_save_compartibility9 = 1551
spr_save_compartibility10 = 1552
spr_save_compartibility11 = 1553
spr_save_compartibility12 = 1554
spr_save_compartibility13 = 1555
spr_save_compartibility14 = 1556
spr_save_compartibility15 = 1557
spr_save_compartibility16 = 1558
spr_save_compartibility17 = 1559
spr_save_compartibility18 = 1560
spr_save_compartibility19 = 1561
spr_save_compartibility20 = 1562
140 changes: 102 additions & 38 deletions ModuleSystem/ID/ID_scene_props_wb.py
Expand Up @@ -1523,41 +1523,105 @@
spr_gothic_chair_nocol = 1522
spr_smaug_skeleton = 1523
spr_dorwinion_sack = 1524
spr_osgiliath_far_f = 1525
spr_hill = 1526
spr_water_river = 1527
spr_water_fall = 1528
spr_distant_street_a = 1529
spr_distant_street_b = 1530
spr_distant_mountain_a = 1531
spr_distant_mountain_b = 1532
spr_distant_mountain_c = 1533
spr_distant_soldiers_a = 1534
spr_distant_orcs_a = 1535
spr_distant_soldiers_uruks_a = 1536
spr_water_splash_a = 1537
spr_water_splash_b = 1538
spr_water_splash_c = 1539
spr_water_fall_2 = 1540
spr_water_foam = 1541
spr_water_run = 1542
spr_save_compartibility1 = 1543
spr_save_compartibility2 = 1544
spr_save_compartibility3 = 1545
spr_save_compartibility4 = 1546
spr_save_compartibility5 = 1547
spr_save_compartibility6 = 1548
spr_save_compartibility7 = 1549
spr_save_compartibility8 = 1550
spr_save_compartibility9 = 1551
spr_save_compartibility10 = 1552
spr_save_compartibility11 = 1553
spr_save_compartibility12 = 1554
spr_save_compartibility13 = 1555
spr_save_compartibility14 = 1556
spr_save_compartibility15 = 1557
spr_save_compartibility16 = 1558
spr_save_compartibility17 = 1559
spr_save_compartibility18 = 1560
spr_save_compartibility19 = 1561
spr_save_compartibility20 = 1562
spr_fake_house_a = 1525
spr_fake_house_b = 1526
spr_fake_house_c = 1527
spr_fake_house_d = 1528
spr_fake_house_e = 1529
spr_fake_house_f = 1530
spr_fake_house_far_a = 1531
spr_fake_house_far_b = 1532
spr_fake_house_far_c = 1533
spr_fake_house_far_d = 1534
spr_fake_house_far_e = 1535
spr_fake_house_far_f = 1536
spr_Dale_fake_house_a = 1537
spr_Dale_fake_house_b = 1538
spr_Dale_fake_house_c = 1539
spr_Dale_fake_house_d = 1540
spr_Dale_fake_house_e = 1541
spr_Dale_fake_house_f = 1542
spr_Dale_fake_house_far_a = 1543
spr_Dale_fake_house_far_b = 1544
spr_Dale_fake_house_far_c = 1545
spr_Dale_fake_house_far_d = 1546
spr_Dale_castle_small_round_tower = 1547
spr_Dale_castle_small_round_tower_roof = 1548
spr_Dale_castle_Stone_Stairs = 1549
spr_Dale_tower_top_a = 1550
spr_Dale_tower_top_c = 1551
spr_Dale_castle_Gate_House = 1552
spr_Dale_castle_High_Tower = 1553
spr_Dale_Bell_Tower = 1554
spr_Dale_Minaret = 1555
spr_Dale_Hall = 1556
spr_Dale_Palace = 1557
spr_Dale_Market = 1558
spr_Dale_castle_Gaillard = 1559
spr_Dale_castle_Battlement = 1560
spr_Dale_copula_1 = 1561
spr_Dale_town_house_b = 1562
spr_Dale_copula_2 = 1563
spr_Dale_town_house_d = 1564
spr_Dale_town_house_f = 1565
spr_Dale_copula_3 = 1566
spr_Dale_tower_top_b = 1567
spr_Dale_copula_4 = 1568
spr_Dale_copula_5 = 1569
spr_Dale_copula_6 = 1570
spr_Dale_small_wall = 1571
spr_Dale_passage_house_b = 1572
spr_Dale_Plaza = 1573
spr_Dale_street_short = 1574
spr_Dale_castle_battlement_d = 1575
spr_Dale_castle_courtyard_house_extension_a_E = 1576
spr_Dale_castle_courtyard_house_extension_b_E = 1577
spr_Dale_castle_courtyard_entry_b = 1578
spr_Dale_castle_courtyard_house_b = 1579
spr_distant_mountain_snow_1 = 1580
spr_distant_mountain_snow_2 = 1581
spr_ship = 1582
spr_ship_b = 1583
spr_ship_d = 1584
spr_ship_c = 1585
spr_ship_sail_off = 1586
spr_ship_sail_off_b = 1587
spr_ship_c_sail_off = 1588
spr_osgiliath_far_f = 1589
spr_hill = 1590
spr_water_river = 1591
spr_water_fall = 1592
spr_distant_street_a = 1593
spr_distant_street_b = 1594
spr_distant_mountain_a = 1595
spr_distant_mountain_b = 1596
spr_distant_mountain_c = 1597
spr_distant_soldiers_a = 1598
spr_distant_orcs_a = 1599
spr_distant_soldiers_uruks_a = 1600
spr_water_splash_a = 1601
spr_water_splash_b = 1602
spr_water_splash_c = 1603
spr_water_fall_2 = 1604
spr_water_foam = 1605
spr_water_run = 1606
spr_save_compartibility1 = 1607
spr_save_compartibility2 = 1608
spr_save_compartibility3 = 1609
spr_save_compartibility4 = 1610
spr_save_compartibility5 = 1611
spr_save_compartibility6 = 1612
spr_save_compartibility7 = 1613
spr_save_compartibility8 = 1614
spr_save_compartibility9 = 1615
spr_save_compartibility10 = 1616
spr_save_compartibility11 = 1617
spr_save_compartibility12 = 1618
spr_save_compartibility13 = 1619
spr_save_compartibility14 = 1620
spr_save_compartibility15 = 1621
spr_save_compartibility16 = 1622
spr_save_compartibility17 = 1623
spr_save_compartibility18 = 1624
spr_save_compartibility19 = 1625
spr_save_compartibility20 = 1626
3 changes: 2 additions & 1 deletion ModuleSystem/Process/process_scene_props.py
Expand Up @@ -32,7 +32,8 @@ def save_scene_props(variable_list,variable_uses,tag_uses,quick_strings):


def save_python_header():
if (wb_compile_switch):
from module_info import wb_compile_switch as is_wb
if (is_wb):
file = open("./ID/ID_scene_props_wb.py","w")
else:
file = open("./ID/ID_scene_props_mb.py","w")
Expand Down
2 changes: 1 addition & 1 deletion ModuleSystem/module_constants.py
Expand Up @@ -1310,7 +1310,7 @@ def concatenate_scripts(block_list):
fac_str_ok = 4000 # lesser or equal can attack around enemy centers, higher can siege
fac_str_max = 8000

fac_str_guardian = 1000 # less than this, spawn the guardian party
fac_str_guardian = 1700 # was: 1000 # less than this, spawn the guardian party


# faction ,initial strength,culture,faction lord, faction marshall, [5 tiers of troops], [reinforcement templates, prisoner trains], main banner, map party banner, [slot_faction: deserter_troop, guard_troop, messenger_troop, prison_guard_troop, castle_guard_troop] faction capital side home theater, advance camp
Expand Down
3 changes: 3 additions & 0 deletions ModuleSystem/module_scripts.py
Expand Up @@ -13804,6 +13804,9 @@ def set_item_faction():

#swy-- this is needed to show by default the note entries on Warband...
(faction_set_note_available, ":faction_no", 1),

#swy-- don't show this, it's useless...
(faction_set_note_available, "fac_player_faction", 0),

] or [])
),
Expand Down
2 changes: 1 addition & 1 deletion _wb/scripts.txt
Expand Up @@ -525,7 +525,7 @@ end_quest -1
cancel_quest -1
16 23 2 1224979098644774912 1 2319 1 1 1113 4 1224979098644774912 0 1 0 1113 4 1224979098644774912 1 1 0 1113 4 1224979098644774912 2 1 0 1113 4 1224979098644774912 3 1 0 1113 4 1224979098644774912 4 1 0 1113 4 1224979098644774912 5 1 0 1113 4 1224979098644774912 6 1 0 1113 4 1224979098644774912 7 1 0 1284 1 1224979098644774912 4 0 33 3 1224979098644774912 28 36 2133 2 144115188075855944 -1 2133 2 144115188075855946 -1 3 0
update_faction_notes -1
88 23 2 1224979098644774912 1 4 0 33 3 1224979098644774912 3 21 542 3 1224979098644774912 21 0 522 3 1224979098644774913 1224979098644774912 10 2335 2 5 1224979098644774912 2341 2 6 1224979098644774913 2133 2 1224979098644774914 0 2320 2 8 216172782113783809 7 3 1224979098644774915 18 96 132 1 1224979098644774915 541 3 1224979098644774915 260 0 2204 2 1224979098644774916 1224979098644774915 31 2 1224979098644774916 1224979098644774912 4 0 31 2 1224979098644774914 0 2342 2 8 1224979098644774915 5 0 31 2 1224979098644774914 1 2342 2 7 1224979098644774915 2320 2 8 1585267068834414947 5 0 2342 2 7 1224979098644774915 2320 2 8 1585267068834414948 3 0 2105 2 1224979098644774914 1 3 0 2133 2 1224979098644774917 0 2320 2 10 1585267068834414949 7 3 1224979098644774918 528 614 2133 2 1224979098644774919 1224979098644774918 4 0 31 2 1224979098644774918 528 2133 2 1224979098644774919 0 2133 2 1224979098644774920 144115188075855993 5 0 2173 2 1224979098644774920 1224979098644774919 3 0 31 2 1224979098644774920 1224979098644774912 2147483679 2 1224979098644774919 1224979098644774913 540 3 1224979098644774919 2 2 4 0 31 2 1224979098644774917 0 2341 2 10 1224979098644774919 5 0 31 2 1224979098644774917 1 2341 2 9 1224979098644774919 2320 2 10 1585267068834414950 5 0 2341 2 9 1224979098644774919 2320 2 10 1585267068834414951 3 0 2105 2 1224979098644774917 1 3 0 2320 2 12 1585267068834414952 2133 2 1224979098644774921 0 7 3 1224979098644774922 3 21 542 3 1224979098644774922 21 0 2190 3 1224979098644774923 1224979098644774922 1224979098644774912 2147483678 2 1224979098644774923 0 4 0 31 2 1224979098644774921 0 2343 2 12 1224979098644774922 5 0 31 2 1224979098644774921 1 2343 2 11 1224979098644774922 2320 2 12 1585267068834414953 5 0 2343 2 11 1224979098644774922 2320 2 12 1585267068834414954 3 0 2105 2 1224979098644774921 1 3 0 1118 4 1224979098644774912 0 1585267068834414955 0 5 0 33 3 1224979098644774912 3 21 542 3 1224979098644774912 21 1 2335 2 5 1224979098644774912 1118 4 1224979098644774912 0 1585267068834414956 0 2319 1 1 1118 4 1224979098644774912 1 1 0 5 0 2319 1 1 1118 4 1224979098644774912 0 1 0 1118 4 1224979098644774912 1 1 0 3 0 1109 2 1224979098644774912 27 1096 2 1224979098644774912 1
89 23 2 1224979098644774912 1 4 0 33 3 1224979098644774912 3 21 542 3 1224979098644774912 21 0 522 3 1224979098644774913 1224979098644774912 10 2335 2 5 1224979098644774912 2341 2 6 1224979098644774913 2133 2 1224979098644774914 0 2320 2 8 216172782113783809 7 3 1224979098644774915 18 96 132 1 1224979098644774915 541 3 1224979098644774915 260 0 2204 2 1224979098644774916 1224979098644774915 31 2 1224979098644774916 1224979098644774912 4 0 31 2 1224979098644774914 0 2342 2 8 1224979098644774915 5 0 31 2 1224979098644774914 1 2342 2 7 1224979098644774915 2320 2 8 1585267068834414947 5 0 2342 2 7 1224979098644774915 2320 2 8 1585267068834414948 3 0 2105 2 1224979098644774914 1 3 0 2133 2 1224979098644774917 0 2320 2 10 1585267068834414949 7 3 1224979098644774918 528 614 2133 2 1224979098644774919 1224979098644774918 4 0 31 2 1224979098644774918 528 2133 2 1224979098644774919 0 2133 2 1224979098644774920 144115188075855993 5 0 2173 2 1224979098644774920 1224979098644774919 3 0 31 2 1224979098644774920 1224979098644774912 2147483679 2 1224979098644774919 1224979098644774913 540 3 1224979098644774919 2 2 4 0 31 2 1224979098644774917 0 2341 2 10 1224979098644774919 5 0 31 2 1224979098644774917 1 2341 2 9 1224979098644774919 2320 2 10 1585267068834414950 5 0 2341 2 9 1224979098644774919 2320 2 10 1585267068834414951 3 0 2105 2 1224979098644774917 1 3 0 2320 2 12 1585267068834414952 2133 2 1224979098644774921 0 7 3 1224979098644774922 3 21 542 3 1224979098644774922 21 0 2190 3 1224979098644774923 1224979098644774922 1224979098644774912 2147483678 2 1224979098644774923 0 4 0 31 2 1224979098644774921 0 2343 2 12 1224979098644774922 5 0 31 2 1224979098644774921 1 2343 2 11 1224979098644774922 2320 2 12 1585267068834414953 5 0 2343 2 11 1224979098644774922 2320 2 12 1585267068834414954 3 0 2105 2 1224979098644774921 1 3 0 1118 4 1224979098644774912 0 1585267068834414955 0 5 0 33 3 1224979098644774912 3 21 542 3 1224979098644774912 21 1 2335 2 5 1224979098644774912 1118 4 1224979098644774912 0 1585267068834414956 0 2319 1 1 1118 4 1224979098644774912 1 1 0 5 0 2319 1 1 1118 4 1224979098644774912 0 1 0 1118 4 1224979098644774912 1 1 0 3 0 1109 2 1224979098644774912 27 1096 2 1224979098644774912 1 1096 2 23 0
update_faction_traveler_notes -1
12 23 2 1224979098644774912 1 2133 2 1224979098644774913 0 11 1 1224979098644774914 2204 2 1224979098644774915 1224979098644774914 31 2 1224979098644774915 1224979098644774912 1601 2 1224979098644774916 1224979098644774914 2105 2 1224979098644774913 1224979098644774916 3 0 2335 2 5 1224979098644774912 2133 2 72057594037927937 1224979098644774913 1118 4 1224979098644774912 1 1585267068834414957 1 1096 2 1224979098644774912 1
update_troop_notes -1
Expand Down
2 changes: 1 addition & 1 deletion _wb/simple_triggers.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion simple_triggers.txt

Large diffs are not rendered by default.

0 comments on commit 03e2d59

Please sign in to comment.