Skip to content

Commit

Permalink
Merge pull request #838 from GregoryLundberg/GL_option_message
Browse files Browse the repository at this point in the history 
Completed deprecation of [option]message=
  • Loading branch information
@Vultraz
Vultraz committed Oct 23, 2016
2 parents fa48c9c + bc67f01 commit cc91cdf
Showing 1 changed file with 34 additions and 22 deletions.
56 changes: 34 additions & 22 deletions data/core/macros/ai_controller.cfg
View file
Expand Up @@ -233,11 +233,15 @@
variable=side_i_leader
[/store_unit]

{VARIABLE this_enemy_txt_img_description "&$side_i_leader.image~TC($temp_i|,$side_i_leader.flag_rgb|)="+_"Side $temp_i"+"=($side_i_leader.name|)"}
{VARIABLE this_enemy_image "$side_i_leader.image~TC($temp_i|,$side_i_leader.flag_rgb|)"}
{VARIABLE this_enemy_label _"Side $temp_i"}
{VARIABLE this_enemy_description "$side_i_leader.name"}
[/then]

[else]
{VARIABLE this_enemy_txt_img_description "&misc/blank-hex.png="+_"Side $temp_i"+"= "}
{VARIABLE this_enemy_image "misc/blank-hex.png"}
{VARIABLE this_enemy_label _"Side $temp_i"}
{VARIABLE this_enemy_description ""}
{VARIABLE ai_controller.side_$ally_side|_current_settings.focus_on_enemy.side_description _"side $temp_i"}
[/else]
[/if]
Expand All @@ -247,7 +251,9 @@
mode=append

[value]
message=$this_enemy_txt_img_description
image=$this_enemy_image
label=$this_enemy_label
description=$this_enemy_description

[command]
{VARIABLE ai_controller.side_$ally_side|_current_settings.focus_on_enemy.side $temp_i}
Expand Down Expand Up @@ -277,7 +283,7 @@
mode=append

[value]
message= _ "Back"
label= _ "Back"

[command]
[/command]
Expand All @@ -289,7 +295,7 @@
variable=focus_on_enemy_options_message
[/insert_tag]

{CLEAR_VARIABLE stored_ally_side,stored_other_side,focus_on_enemy_options_message,side_i_leader,this_enemy_description,this_enemy_txt_img_description,temp_i}
{CLEAR_VARIABLE stored_ally_side,stored_other_side,focus_on_enemy_options_message,side_i_leader,temp_i,this_enemy_image,this_enemy_label,this_enemy_description}
[/actions_when_applied]
[/focus_on_enemy]

Expand Down Expand Up @@ -368,11 +374,15 @@
variable=side_i_leader
[/store_unit]

{VARIABLE this_ally_txt_img_description "&$side_i_leader.image~TC($temp_i|,$side_i_leader.flag_rgb|)="+_"Side $temp_i"+"=($side_i_leader.name|)"}
{VARIABLE this_ally_image "$side_i_leader.image~TC($temp_i|,$side_i_leader.flag_rgb|)"}
{VARIABLE this_ally_label _"Side $temp_i"}
{VARIABLE this_ally_description "$side_i_leader.name"}
[/then]

[else]
{VARIABLE this_ally_txt_img_description "&misc/blank-hex.png="+_"Side $temp_i"+"= "}
{VARIABLE this_ally_image "misc/blank-hex.png"}
{VARIABLE this_ally_label _"Side $temp_i"}
{VARIABLE this_ally_description ""}
{VARIABLE ai_controller.side_$ally_side|_current_settings.protect.side_description _"side $temp_i"}
[/else]
[/if]
Expand All @@ -382,7 +392,9 @@
mode=append

[value]
message=$this_ally_txt_img_description
image=$this_ally_image
label=$this_ally_label
description=$this_ally_description

[command]
{VARIABLE ai_controller.side_$ally_side|_current_settings.protect.side $temp_i}
Expand Down Expand Up @@ -413,7 +425,7 @@
mode=append

[value]
message= _ "Back"
label= _ "Back"

[command]
[/command]
Expand All @@ -425,7 +437,7 @@
variable=protect_options_message
[/insert_tag]

{CLEAR_VARIABLE stored_other_side,side_i_leader,this_ally_description,protect_options_message,temp_i}
{CLEAR_VARIABLE stored_ally_side,stored_other_side,side_i_leader,protect_options_message,temp_i,this_ally_image,this_ally_label,this_ally_description}
[/actions_when_applied]
[/protect]

Expand Down Expand Up @@ -750,7 +762,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
name=ai_controller_{AFFIX}.main_menu_message.option

[literal]
message= _ "Set objective..."
label= _ "Set objective..."

[command]
[set_variables]
Expand All @@ -768,7 +780,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
name=set_objective_message.option

[value]
message=$ai_controller_{AFFIX}.focus_on_enemy.option_description
label=$ai_controller_{AFFIX}.focus_on_enemy.option_description

[insert_tag]
name=show_if
Expand All @@ -781,7 +793,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/value]

[value]
message=$ai_controller_{AFFIX}.protect.option_description
label=$ai_controller_{AFFIX}.protect.option_description

[insert_tag]
name=show_if
Expand All @@ -794,7 +806,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/value]

[value]
message=$ai_controller_{AFFIX}.revoke_objective_orders.option_description
label=$ai_controller_{AFFIX}.revoke_objective_orders.option_description

[insert_tag]
name=show_if
Expand All @@ -807,7 +819,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/value]

[value]
message=_"Back"
label=_"Back"

[command]
[/command]
Expand Down Expand Up @@ -841,7 +853,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/literal]

[literal]
message= _ "Set behavior..."
label= _ "Set behavior..."

[command]
[set_variables]
Expand All @@ -859,7 +871,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
name=set_behavior_message.option

[value]
message=$ai_controller_{AFFIX}.aggression.option_description
label=$ai_controller_{AFFIX}.aggression.option_description

[insert_tag]
name=show_if
Expand All @@ -872,7 +884,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/value]

[value]
message=$ai_controller_{AFFIX}.caution.option_description
label=$ai_controller_{AFFIX}.caution.option_description

[insert_tag]
name=show_if
Expand All @@ -885,7 +897,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/value]

[value]
message=$ai_controller_{AFFIX}.revoke_behavior_orders.option_description
label=$ai_controller_{AFFIX}.revoke_behavior_orders.option_description

[insert_tag]
name=show_if
Expand All @@ -898,7 +910,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/value]

[value]
message=_"Back"
label=_"Back"

[command]
[/command]
Expand Down Expand Up @@ -932,7 +944,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/literal]

[literal]
message=$ai_controller_{AFFIX}.revoke_all_orders.option_description
label=$ai_controller_{AFFIX}.revoke_all_orders.option_description

[insert_tag]
name=show_if
Expand All @@ -946,7 +958,7 @@ Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behav
[/literal]

[literal]
message=_"Exit"
label=_"Exit"

[command]
{VARIABLE ai_controller_finished yes}
Expand Down

0 comments on commit cc91cdf

Please sign in to comment.