Skip to content

Commit

Permalink
*wire Merlkir's Dale and Lórien's victory drawings into the game menu…
Browse files Browse the repository at this point in the history 
…s. I don't know why Dale was still missing.
  • Loading branch information
@Swyter
Swyter committed Mar 19, 2017
1 parent 28b6f10 commit a34d860
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 119 deletions.
1 change: 1 addition & 0 deletions ModuleSystem/ID/ID_meshes_mb.py
View file
Expand Up @@ -370,5 +370,6 @@
mesh_draw_ring_hunters_army = 369
mesh_draw_ring_hunters_lair = 370
mesh_draw_victory_dale = 371
mesh_draw_victory_lorien = 372


1 change: 1 addition & 0 deletions ModuleSystem/ID/ID_meshes_wb.py
View file
Expand Up @@ -377,5 +377,6 @@
mesh_draw_ring_hunters_army = 376
mesh_draw_ring_hunters_lair = 377
mesh_draw_victory_dale = 378
mesh_draw_victory_lorien = 379


140 changes: 38 additions & 102 deletions ModuleSystem/ID/ID_scene_props.py
View file
Expand Up @@ -1523,105 +1523,41 @@
spr_gothic_chair_nocol = 1522
spr_smaug_skeleton = 1523
spr_dorwinion_sack = 1524
spr_fake_house_a = 1525

This comment has been minimized.

Sign in to view

Copy link
@Swyter

Swyter Mar 19, 2017

Author Member

@khamukkamu What's with these ID remaps? They don't match the compiled version.

This comment has been minimized.

Sign in to view

Copy link
@khamukkamu

khamukkamu Mar 20, 2017 •
edited

Contributor

Yes, I don't understand it either. It happens when compiling WB first, then MB, before committing.

Could it be all those (is_a_wb_scene_prop) I added?

This comment has been minimized.

Sign in to view

Copy link
@Swyter

Swyter Mar 20, 2017 •
edited

Author Member

@khamukkamu Yeah, until now we shared props in both versions. We might have to do a _mb.py/_wb.py split like with animations and meshes (as seen above).

But these changes should be harmless, the only drawback is that we are polluting the repo history with bogus crap.
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
32 changes: 19 additions & 13 deletions ModuleSystem/module_game_menus.py
View file
Expand Up @@ -4625,10 +4625,16 @@
(else_try),
(eq, ":winning_side_faction", "fac_umbar" ),
(set_background_mesh, "mesh_draw_victory_corsairs"), # specific victory-loss image: umbar VS anything
(else_try),
(eq, ":winning_side_faction", "fac_dale" ),

This comment has been minimized.

Sign in to view

Copy link
@Swyter

Swyter Mar 19, 2017 •
edited

Author Member

@khamukkamu I forgot to put 'dale' in the comment, please fix that if you have time.

This comment has been minimized.

Sign in to view

Copy link
@khamukkamu

khamukkamu Mar 20, 2017

Contributor

Done.
(set_background_mesh, "mesh_draw_victory_dale"), # specific victory-loss image: lórien VS anything
(else_try),
(eq, ":winning_side_race", tf_elf_begin),
(eq, ":losing_side_race_group", tf_orc ),
(set_background_mesh, "mesh_draw_lorien_arrows"), # specific victory-loss image: elves VS orcs
(else_try),
(eq, ":winning_side_faction", "fac_lorien" ),
(set_background_mesh, "mesh_draw_victory_lorien"), # specific victory-loss image: lórien VS anything
(else_try),
# generic defeat image: orcs....
(eq, "$g_battle_result", -1), (eq, "$player_looks_like_an_orc", 1),
Expand Down Expand Up @@ -8277,9 +8283,9 @@
(try_end),
(try_begin),
(this_or_next|eq, "$players_kingdom", "fac_gondor"),
(this_or_next|eq, "$players_kingdom", "fac_dale"),
(this_or_next|eq, "$players_kingdom", "fac_dwarf"),
( eq, "$players_kingdom", "fac_rohan"),
(this_or_next|eq, "$players_kingdom", "fac_dale"),
(this_or_next|eq, "$players_kingdom", "fac_dwarf"),
( eq, "$players_kingdom", "fac_rohan"),

This comment has been minimized.

Sign in to view

Copy link
@Swyter

Swyter Mar 19, 2017

Author Member

@khamukkamu Beware of the tabs-vs-spaces problem. Always use standard spaces for internal aligment. TLD is pretty inconsistent, but we should do our part to improve it.

This comment has been minimized.

Sign in to view

Copy link
@khamukkamu

khamukkamu Mar 20, 2017

Contributor

Thanks. I'll find what I can and fix them. Do you have a recommendation on amount of spaces for tabs so I can set my sublime text editor?
(str_store_string, s10, "@On your way to your faction's capital, you set upon some orcs raiding a caravan."),
(else_try),
(this_or_next|eq, "$players_kingdom", "fac_isengard"),
Expand All @@ -8289,26 +8295,26 @@
(this_or_next|eq, "$players_kingdom", "fac_dunland"),
(this_or_next|eq, "$players_kingdom", "fac_rhun"),
(this_or_next|eq, "$players_kingdom", "fac_umbar"),
( eq, "$players_kingdom", "fac_guldur"),
( eq, "$players_kingdom", "fac_guldur"),
(str_store_string, s10, "@On your way to your faction's capital, you set upon some orcs raiding a caravan."),
(else_try),
(this_or_next|eq, "$players_kingdom", "fac_imladris"),
(this_or_next|eq, "$players_kingdom", "fac_lorien"),
(this_or_next|eq, "$players_kingdom", "fac_woodelf"),
( eq, "$players_kingdom", "fac_beorn"),
(this_or_next|eq, "$players_kingdom", "fac_lorien"),
(this_or_next|eq, "$players_kingdom", "fac_woodelf"),
( eq, "$players_kingdom", "fac_beorn"),
(str_store_string,s10,"@On your way to your faction's capital, you set upon some troops waiting to ambush orcs in the forest."),
(else_try),
(this_or_next|eq, "$players_kingdom", "fac_harad"),
( eq, "$players_kingdom", "fac_khand"),
( eq, "$players_kingdom", "fac_khand"),
(str_store_string,s10,"@On your way to Mordor, you hear rustling nearby. You see some Gondor Scouts and ready yourself to warn your party."),
(else_try),
(str_store_string,s10,"@BUG"),
(try_end)],
[("start_defend_caravan",
[(this_or_next|eq, "$players_kingdom", "fac_gondor"),
(this_or_next|eq, "$players_kingdom", "fac_dale"),
(this_or_next|eq, "$players_kingdom", "fac_dwarf"),
( eq, "$players_kingdom", "fac_rohan")],
(this_or_next|eq, "$players_kingdom", "fac_dale"),
(this_or_next|eq, "$players_kingdom", "fac_dwarf"),
( eq, "$players_kingdom", "fac_rohan")],
"Defend the Caravan!", [
(set_jump_mission,"mt_tld_caravan_help"),
(modify_visitors_at_site,"scn_starting_quest"),
Expand All @@ -8327,7 +8333,7 @@
(try_end),
(faction_get_slot, ":tier_1_troop", "$assist", slot_faction_tier_1_troop),
(faction_get_slot, ":tier_2_troop", "$assist", slot_faction_tier_2_troop),
(set_visitor,0,"trp_player"),
(set_visitor, 0,"trp_player"),
(set_visitors,2,":tier_1_troop", 7),
(set_visitors,4,":tier_2_troop", 4),
(set_visitors,6,"trp_start_quest_caravaneer", 1),
Expand All @@ -8352,7 +8358,7 @@
(this_or_next|eq, "$players_kingdom", "fac_dunland"),
(this_or_next|eq, "$players_kingdom", "fac_rhun"),
(this_or_next|eq, "$players_kingdom", "fac_umbar"),
( eq, "$players_kingdom", "fac_guldur"),],
( eq, "$players_kingdom", "fac_guldur"),],
"Raid the Caravan!", [
(set_jump_mission,"mt_tld_caravan_help"),
(modify_visitors_at_site,"scn_starting_quest"),
Expand Down
1 change: 1 addition & 0 deletions ModuleSystem/module_meshes.py
View file
Expand Up @@ -502,4 +502,5 @@
("draw_ring_hunters_lair", 0, "draw_ring_hunters_lair", 0, 0, 0, 0, 0, 0, 1, 1, 1),

("draw_victory_dale", 0, "draw_victory_dale", 0, 0, 0, 0, 0, 0, 1, 1, 1),
("draw_victory_lorien", 0, "draw_victory_lorien", 0, 0, 0, 0, 0, 0, 1, 1, 1),
]

0 comments on commit a34d860

Please sign in to comment.