Revert "Deprecate the NEUTRAL_SIDE macro",

...add a note about how the alternative for NEUTRAL_SIDE.

This reverts commit 2010-01-26T19:08:37Z!ai0867@gmail.com.
This commit is contained in:
Alexander van Gessel 2010-01-27 01:28:29 +01:00
parent 3ec2143728
commit cd60786ee9
2 changed files with 112 additions and 113 deletions

View file

@ -62,116 +62,3 @@
name=hero_removal_target
[/clear_variable]
#enddef
#define NEUTRAL_SIDE SIDE
# Allows a side to appear as if allied with every other side.
#
# Limitations: if we have three sides A, B and C, and C is a neutral side, then
# sides B and C will appear as enemies during A's turn, and likewise A and C on
# B's turn.
#
# IMPORTANT NOTE: the scenario needs victory_when_enemies_defeated=no to be set.
[event]
name=prestart
[deprecated_message]
message="Macro 'NEUTRAL_SIDE' is deprecated, use comma-separated teams in [side] team_name instead"
[/deprecated_message]
{VARIABLE NEUTRAL_SIDE_i 1}
[store_side]
side=$NEUTRAL_SIDE_i
variable=NEUTRAL_SIDE_side_store
[/store_side]
[while]
[variable]
name=NEUTRAL_SIDE_side_store.team_name
not_equals=$empty
[/variable]
[do]
{VARIABLE side_$NEUTRAL_SIDE_i|_original_team_name $NEUTRAL_SIDE_side_store.team_name}
{VARIABLE side_$NEUTRAL_SIDE_i|_original_user_team_name $NEUTRAL_SIDE_side_store.user_team_name}
{VARIABLE_OP NEUTRAL_SIDE_i add 1}
{CLEAR_VARIABLE NEUTRAL_SIDE_side_store}
[store_side]
side=$NEUTRAL_SIDE_i
variable=NEUTRAL_SIDE_side_store
[/store_side]
[/do]
[/while]
{CLEAR_VARIABLE NEUTRAL_SIDE_side_store}
[/event]
[event]
name=side turn
first_time_only=no
[if]
[variable]
name=side_number
not_equals={SIDE}
[/variable]
[then]
{VARIABLE NEUTRAL_SIDE_i 1}
[while]
[variable]
name=side_$NEUTRAL_SIDE_i|_original_team_name
not_equals=$empty
[/variable]
[do]
[modify_side]
side=$NEUTRAL_SIDE_i
team_name=$side_$NEUTRAL_SIDE_i|_original_team_name
user_team_name=$side_$NEUTRAL_SIDE_i|_original_user_team_name
[/modify_side]
{VARIABLE_OP NEUTRAL_SIDE_i add 1}
[/do]
[/while]
[store_side]
side=$side_number
variable=NEUTRAL_SIDE_side_store
[/store_side]
[modify_side]
side={SIDE}
team_name=$NEUTRAL_SIDE_side_store.team_name
user_team_name=$side_{SIDE}_original_user_team_name
[/modify_side]
{CLEAR_VARIABLE NEUTRAL_SIDE_side_store}
[/then]
[else]
{VARIABLE NEUTRAL_SIDE_i 1}
[while]
[variable]
name=side_$NEUTRAL_SIDE_i|_original_team_name
not_equals=$empty
[/variable]
[do]
[modify_side]
side=$NEUTRAL_SIDE_i
team_name=friends_with_all
user_team_name=$side_$NEUTRAL_SIDE_i|_original_user_team_name
[/modify_side]
{VARIABLE_OP NEUTRAL_SIDE_i add 1}
[/do]
[/while]
[/else]
[/if]
[/event]
#enddef

View file

@ -456,6 +456,118 @@
[/event]
#enddef
#define NEUTRAL_SIDE SIDE
# Allows a side to appear as if allied with every other side.
#
# Limitations: if we have three sides A, B and C, and C is a neutral side, then
# sides B and C will appear as enemies during A's turn, and likewise A and C on
# B's turn.
#
# IMPORTANT NOTE: the scenario needs victory_when_enemies_defeated=no to be set.
# Also note that this can also be achieved by assigning a side to multiple
# teams using comma-seperated names in the side's team_name.
[event]
name=prestart
{VARIABLE NEUTRAL_SIDE_i 1}
[store_side]
side=$NEUTRAL_SIDE_i
variable=NEUTRAL_SIDE_side_store
[/store_side]
[while]
[variable]
name=NEUTRAL_SIDE_side_store.team_name
not_equals=$empty
[/variable]
[do]
{VARIABLE side_$NEUTRAL_SIDE_i|_original_team_name $NEUTRAL_SIDE_side_store.team_name}
{VARIABLE side_$NEUTRAL_SIDE_i|_original_user_team_name $NEUTRAL_SIDE_side_store.user_team_name}
{VARIABLE_OP NEUTRAL_SIDE_i add 1}
{CLEAR_VARIABLE NEUTRAL_SIDE_side_store}
[store_side]
side=$NEUTRAL_SIDE_i
variable=NEUTRAL_SIDE_side_store
[/store_side]
[/do]
[/while]
{CLEAR_VARIABLE NEUTRAL_SIDE_side_store}
[/event]
[event]
name=side turn
first_time_only=no
[if]
[variable]
name=side_number
not_equals={SIDE}
[/variable]
[then]
{VARIABLE NEUTRAL_SIDE_i 1}
[while]
[variable]
name=side_$NEUTRAL_SIDE_i|_original_team_name
not_equals=$empty
[/variable]
[do]
[modify_side]
side=$NEUTRAL_SIDE_i
team_name=$side_$NEUTRAL_SIDE_i|_original_team_name
user_team_name=$side_$NEUTRAL_SIDE_i|_original_user_team_name
[/modify_side]
{VARIABLE_OP NEUTRAL_SIDE_i add 1}
[/do]
[/while]
[store_side]
side=$side_number
variable=NEUTRAL_SIDE_side_store
[/store_side]
[modify_side]
side={SIDE}
team_name=$NEUTRAL_SIDE_side_store.team_name
user_team_name=$side_{SIDE}_original_user_team_name
[/modify_side]
{CLEAR_VARIABLE NEUTRAL_SIDE_side_store}
[/then]
[else]
{VARIABLE NEUTRAL_SIDE_i 1}
[while]
[variable]
name=side_$NEUTRAL_SIDE_i|_original_team_name
not_equals=$empty
[/variable]
[do]
[modify_side]
side=$NEUTRAL_SIDE_i
team_name=friends_with_all
user_team_name=$side_$NEUTRAL_SIDE_i|_original_user_team_name
[/modify_side]
{VARIABLE_OP NEUTRAL_SIDE_i add 1}
[/do]
[/while]
[/else]
[/if]
[/event]
#enddef
#define SCATTER_UNITS NUMBER TYPES PADDING_RADIUS SLF UNIT
# Scatters the given kind of units randomly on a given area on the map.
#