Permalink
Browse files

Fixed the channeling error. Added rewards for the raid on al'Thor far…

…m event.
  • Loading branch information...
mat2rivs
mat2rivs committed Sep 17, 2012
1 parent 4f7f05f commit 9be0f00f2e41d15a75ce1fde9a9dc051165edaed
Showing with 220 additions and 192 deletions.
  1. +137 −138 ID_strings.py
  2. +11 −9 module_dialogs.py
  3. +14 −0 module_game_menus.py
  4. +53 −44 module_scripts.py
  5. +5 −1 module_triggers.py
@@ -3830,143 +3830,142 @@
str_affiliation_light = 3829
str_affiliation_dark = 3830
str_affiliation_national = 3831
str_nationality_start = 3832
str_nationality_sea_folk = 3833
str_nationality_seanchan = 3834
str_nationality_aiel = 3835
str_nationality_shara = 3836
str_nationality_blight = 3837
str_nationality_shienar = 3838
str_nationality_arafel = 3839
str_nationality_kandor = 3840
str_nationality_saldea = 3841
str_nationality_tar_valon = 3842
str_nationality_cairhien = 3843
str_nationality_tear = 3844
str_nationality_mayene = 3845
str_nationality_far_madding = 3846
str_nationality_illian = 3847
str_nationality_andor = 3848
str_nationality_arad_doman = 3849
str_nationality_two_rivers = 3850
str_nationality_toman_head = 3851
str_nationality_tarabon = 3852
str_nationality_ghealdan = 3853
str_nationality_amadicia = 3854
str_nationality_murandy = 3855
str_nationality_altara = 3856
str_mother_lady = 3857
str_mother_aes_sedai = 3858
str_mother_house_wife = 3859
str_mother_womans_circle_member = 3860
str_mother_innkeeper = 3861
str_mother_hunter_of_the_horn = 3862
str_mother_tavern_wench = 3863
str_mother_seamstress = 3864
str_father_lord = 3865
str_father_warder = 3866
str_father_soldier = 3867
str_father_adventurer = 3868
str_father_merchant = 3869
str_father_farmer = 3870
str_father_thief = 3871
str_father_skilled_tradesman = 3872
str_childhood_page = 3873
str_childhood_novice = 3874
str_childhood_wilder = 3875
str_childhood_hunter = 3876
str_childhood_farmer = 3877
str_childhood_apprentice = 3878
str_childhood_wisdom_assistant = 3879
str_adolescent_minor_noble = 3880
str_adolescent_gleeman = 3881
str_adolescent_warder = 3882
str_adolescent_wilder = 3883
str_adolescent_merchant = 3884
str_adolescent_wisdom = 3885
str_adolescent_smuggler = 3886
str_adolescent_merchant_guard = 3887
str_adolescent_hunter_of_the_horn = 3888
str_achievement_noble_title = 3889
str_achievement_captured_a_false_dragon = 3890
str_achievement_mastered_the_flame_and_void = 3891
str_achievement_survived_journey_across_aiel_waste = 3892
str_achievement_learned_to_speak_to_wolves = 3893
str_achievement_saved_lord_at_tarwins_gap = 3894
str_achievement_rediscovered_lost_weaves = 3895
str_achievement_became_wealthy_merchant = 3896
str_achievement_stole_laurel_crown = 3897
str_achievement_traveled_to_shayol_ghul = 3898
str_story_all = 3899
str_story_affiliation_neutral = 3900
str_story_affiliation_light = 3901
str_story_affiliation_dark = 3902
str_story_affiliation_national = 3903
str_story_nationality_sea_folk = 3904
str_story_nationality_seanchan = 3905
str_story_nationality_aiel = 3906
str_story_nationality_shara = 3907
str_story_nationality_blight = 3908
str_story_nationality_shienar = 3909
str_story_nationality_arafel = 3910
str_story_nationality_kandor = 3911
str_story_nationality_saldea = 3912
str_story_nationality_tar_valon = 3913
str_story_nationality_cairhien = 3914
str_story_nationality_tear = 3915
str_story_nationality_mayene = 3916
str_story_nationality_far_madding = 3917
str_story_nationality_illian = 3918
str_story_nationality_andor = 3919
str_story_nationality_arad_doman = 3920
str_story_nationality_two_rivers = 3921
str_story_nationality_toman_head = 3922
str_story_nationality_tarabon = 3923
str_story_nationality_ghealdan = 3924
str_story_nationality_amadicia = 3925
str_story_nationality_murandy = 3926
str_story_nationality_altara = 3927
str_story_mother_lady = 3928
str_story_mother_aes_sedai = 3929
str_story_mother_house_wife = 3930
str_story_mother_womans_circle_member = 3931
str_story_mother_innkeeper = 3932
str_story_mother_hunter_of_the_horn = 3933
str_story_mother_tavern_wench = 3934
str_story_mother_seamstress = 3935
str_story_father_lord = 3936
str_story_father_warder = 3937
str_story_father_soldier = 3938
str_story_father_adventurer = 3939
str_story_father_merchant = 3940
str_story_father_farmer = 3941
str_story_father_thief = 3942
str_story_father_skilled_tradesman = 3943
str_story_childhood_page = 3944
str_story_childhood_novice = 3945
str_story_childhood_wilder = 3946
str_story_childhood_hunter = 3947
str_story_childhood_farmer = 3948
str_story_childhood_apprentice = 3949
str_story_childhood_wisdom_assistant = 3950
str_story_adolescent_minor_noble = 3951
str_story_adolescent_gleeman = 3952
str_story_adolescent_warder = 3953
str_story_adolescent_wilder = 3954
str_story_adolescent_merchant = 3955
str_story_adolescent_wisdom = 3956
str_story_adolescent_smuggler = 3957
str_story_adolescent_merchant_guard = 3958
str_story_adolescent_hunter_of_the_horn = 3959
str_story_achievement_noble_title = 3960
str_story_achievement_captured_a_false_dragon = 3961
str_story_achievement_mastered_the_flame_and_void = 3962
str_story_achievement_survived_journey_across_aiel_waste = 3963
str_story_achievement_learned_to_speak_to_wolves = 3964
str_story_achievement_saved_lord_at_tarwins_gap = 3965
str_story_achievement_rediscovered_lost_weaves = 3966
str_story_achievement_became_wealthy_merchant = 3967
str_story_achievement_stole_laurel_crown = 3968
str_achievement_traveled_to_shayol_ghul = 3969
str_nationality_sea_folk = 3832
str_nationality_seanchan = 3833
str_nationality_aiel = 3834
str_nationality_shara = 3835
str_nationality_blight = 3836
str_nationality_shienar = 3837
str_nationality_arafel = 3838
str_nationality_kandor = 3839
str_nationality_saldea = 3840
str_nationality_tar_valon = 3841
str_nationality_cairhien = 3842
str_nationality_tear = 3843
str_nationality_mayene = 3844
str_nationality_far_madding = 3845
str_nationality_illian = 3846
str_nationality_andor = 3847
str_nationality_arad_doman = 3848
str_nationality_two_rivers = 3849
str_nationality_toman_head = 3850
str_nationality_tarabon = 3851
str_nationality_ghealdan = 3852
str_nationality_amadicia = 3853
str_nationality_murandy = 3854
str_nationality_altara = 3855
str_mother_lady = 3856
str_mother_aes_sedai = 3857
str_mother_house_wife = 3858
str_mother_womans_circle_member = 3859
str_mother_innkeeper = 3860
str_mother_hunter_of_the_horn = 3861
str_mother_tavern_wench = 3862
str_mother_seamstress = 3863
str_father_lord = 3864
str_father_warder = 3865
str_father_soldier = 3866
str_father_adventurer = 3867
str_father_merchant = 3868
str_father_farmer = 3869
str_father_thief = 3870
str_father_skilled_tradesman = 3871
str_childhood_page = 3872
str_childhood_novice = 3873
str_childhood_wilder = 3874
str_childhood_hunter = 3875
str_childhood_farmer = 3876
str_childhood_apprentice = 3877
str_childhood_wisdom_assistant = 3878
str_adolescent_minor_noble = 3879
str_adolescent_gleeman = 3880
str_adolescent_warder = 3881
str_adolescent_wilder = 3882
str_adolescent_merchant = 3883
str_adolescent_wisdom = 3884
str_adolescent_smuggler = 3885
str_adolescent_merchant_guard = 3886
str_adolescent_hunter_of_the_horn = 3887
str_achievement_noble_title = 3888
str_achievement_captured_a_false_dragon = 3889
str_achievement_mastered_the_flame_and_void = 3890
str_achievement_survived_journey_across_aiel_waste = 3891
str_achievement_learned_to_speak_to_wolves = 3892
str_achievement_saved_lord_at_tarwins_gap = 3893
str_achievement_rediscovered_lost_weaves = 3894
str_achievement_became_wealthy_merchant = 3895
str_achievement_stole_laurel_crown = 3896
str_achievement_traveled_to_shayol_ghul = 3897
str_story_all = 3898
str_story_affiliation_neutral = 3899
str_story_affiliation_light = 3900
str_story_affiliation_dark = 3901
str_story_affiliation_national = 3902
str_story_nationality_sea_folk = 3903
str_story_nationality_seanchan = 3904
str_story_nationality_aiel = 3905
str_story_nationality_shara = 3906
str_story_nationality_blight = 3907
str_story_nationality_shienar = 3908
str_story_nationality_arafel = 3909
str_story_nationality_kandor = 3910
str_story_nationality_saldea = 3911
str_story_nationality_tar_valon = 3912
str_story_nationality_cairhien = 3913
str_story_nationality_tear = 3914
str_story_nationality_mayene = 3915
str_story_nationality_far_madding = 3916
str_story_nationality_illian = 3917
str_story_nationality_andor = 3918
str_story_nationality_arad_doman = 3919
str_story_nationality_two_rivers = 3920
str_story_nationality_toman_head = 3921
str_story_nationality_tarabon = 3922
str_story_nationality_ghealdan = 3923
str_story_nationality_amadicia = 3924
str_story_nationality_murandy = 3925
str_story_nationality_altara = 3926
str_story_mother_lady = 3927
str_story_mother_aes_sedai = 3928
str_story_mother_house_wife = 3929
str_story_mother_womans_circle_member = 3930
str_story_mother_innkeeper = 3931
str_story_mother_hunter_of_the_horn = 3932
str_story_mother_tavern_wench = 3933
str_story_mother_seamstress = 3934
str_story_father_lord = 3935
str_story_father_warder = 3936
str_story_father_soldier = 3937
str_story_father_adventurer = 3938
str_story_father_merchant = 3939
str_story_father_farmer = 3940
str_story_father_thief = 3941
str_story_father_skilled_tradesman = 3942
str_story_childhood_page = 3943
str_story_childhood_novice = 3944
str_story_childhood_wilder = 3945
str_story_childhood_hunter = 3946
str_story_childhood_farmer = 3947
str_story_childhood_apprentice = 3948
str_story_childhood_wisdom_assistant = 3949
str_story_adolescent_minor_noble = 3950
str_story_adolescent_gleeman = 3951
str_story_adolescent_warder = 3952
str_story_adolescent_wilder = 3953
str_story_adolescent_merchant = 3954
str_story_adolescent_wisdom = 3955
str_story_adolescent_smuggler = 3956
str_story_adolescent_merchant_guard = 3957
str_story_adolescent_hunter_of_the_horn = 3958
str_story_achievement_noble_title = 3959
str_story_achievement_captured_a_false_dragon = 3960
str_story_achievement_mastered_the_flame_and_void = 3961
str_story_achievement_survived_journey_across_aiel_waste = 3962
str_story_achievement_learned_to_speak_to_wolves = 3963
str_story_achievement_saved_lord_at_tarwins_gap = 3964
str_story_achievement_rediscovered_lost_weaves = 3965
str_story_achievement_became_wealthy_merchant = 3966
str_story_achievement_stole_laurel_crown = 3967
str_achievement_traveled_to_shayol_ghul = 3968
@@ -42766,6 +42766,17 @@
#[
#]],
## TGS Timeline Event dialogs
[anyone,"start", [(eq, "$g_talk_troop", "trp_narg")], "Others go away. Narg stay. Narg smart.", "narg_speaks",[]],
[anyone|plyr,"narg_speaks", [], "Light have mercy! It speaks!", "narg_response",[]],
[anyone,"narg_response", [], "Narg no hurt. Put down weapon.", "narg_speaks_2",[]],
[anyone|plyr,"narg_speaks_2", [], "Blood and Bloody Ashes! I'm out of here!", "close_window",[]],
## TGS Timeline Event dialogs end
[anyone,"start", [], "Surrender or die. Make your choice", "battle_reason_stated",[]],
[anyone|plyr,"battle_reason_stated", [], "I am not afraid of you. I will fight.", "close_window",[[encounter_attack]]],
@@ -43487,13 +43498,4 @@
# [anyone,"free", [], "NO MATCHING SENTENCE!", "close_window",[]],
## TGS Timeline Event dialogs
[anyone,"start", [(eq, "$g_talk_troop", "trp_narg")], "Others go away. Narg stay. Narg smart.", "narg_speaks",[]],
[anyone|plyr,"narg_speaks", [], "Light have mercy! It speaks!", "narg_response",[]],
[anyone,"narg_response", [], "Narg no hurt. Put down weapon.", "narg_speaks_2",[]],
[anyone|plyr,"narg_speaks_2", [], "Blood and Bloody Ashes! I'm out of here!", "close_window",[]],
## TGS Timeline Event dialogs end
]
@@ -21154,6 +21154,10 @@
(call_script, "script_tgs_timeline_duration_countdown_checker", 1),
# Reward Protagonist Full
(troop_add_gold, "trp_player", 100),
(add_xp_to_troop, 100, "trp_player"),
(party_add_xp, "p_main_party", 200),
(troop_add_item, "trp_player", "itm_black_mail_gauntlets"),
(change_screen_map),
]
),
@@ -21169,6 +21173,9 @@
(call_script, "script_tgs_timeline_duration_countdown_checker", 1),
# Reward Protagonist Half
(troop_add_gold, "trp_player", 50),
(add_xp_to_troop, 50, "trp_player"),
(party_add_xp, "p_main_party", 100),
(change_screen_map),
]
),
@@ -21184,6 +21191,10 @@
(call_script, "script_tgs_timeline_duration_countdown_checker", 1),
# Reward Antagonist Full
(troop_add_gold, "trp_player", 100),
(add_xp_to_troop, 100, "trp_player"),
(party_add_xp, "p_main_party", 200),
(troop_add_item, "trp_player", "itm_red_arm_club"),
(change_screen_map),
]
),
@@ -21199,6 +21210,9 @@
(call_script, "script_tgs_timeline_duration_countdown_checker", 1),
# Reward Antagonist Half
(troop_add_gold, "trp_player", 50),
(add_xp_to_troop, 50, "trp_player"),
(party_add_xp, "p_main_party", 100),
(change_screen_map),
]
),
Oops, something went wrong.

0 comments on commit 9be0f00

Please sign in to comment.