diff --git a/data/campaigns/Northern_Rebirth/utils/utils.cfg b/data/campaigns/Northern_Rebirth/utils/utils.cfg index a17b3da14e0..f66aa6cf330 100644 --- a/data/campaigns/Northern_Rebirth/utils/utils.cfg +++ b/data/campaigns/Northern_Rebirth/utils/utils.cfg @@ -129,33 +129,6 @@ [/unit] #enddef -#define MALIFORS_ARCHER X Y - [unit] - type=Bone Shooter - x={X} - y={Y} - side=2 - [/unit] -#enddef - -#define MALIFORS_DRAUG X Y - [unit] - type=Draug - x={X} - y={Y} - side=2 - [/unit] -#enddef - -#define MALIFORS_DEATHKNIGHT X Y - [unit] - type=Death Knight - x={X} - y={Y} - side=2 - [/unit] -#enddef - #define DRAUG_GUARD X Y [unit] type=Draug @@ -314,18 +287,6 @@ [/unit] #enddef -#define ABILITY_AMULET_OF_STRENGTH - [regenerate] - value=8 - id=regenerates - name= _ "Amulet of Strength" - description= _ "Amulet of Strength: -Showing signs of ancient elvish manufacture, whomever wears this amulet on their person will gain increased strength and stamina and quickly be cured of any poison or wounds." - affect_self=yes - poison=cured - [/regenerate] -#enddef - #define WARDEN X Y [unit] type=Drake Warden diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg index 38543aad20d..94eb13b9122 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg @@ -400,17 +400,6 @@ [/filter_location] #enddef -#define NOT_IN_CAVES - [filter_location] - [not] - x,y=19,17 - radius=6 - # x=16-22,15-23,13-25,15-22,17-21 - # y= 11, 12,13-19, 20, 21 - [/not] - [/filter_location] -#enddef - [event] name=die [filter] diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg index c652dbd2ff7..ad3d640d915 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg @@ -11,17 +11,6 @@ [/unit] #enddef -#define ELVISH_CAPTAIN X Y - [unit] - type=Elvish Captain - side=2 - generate_description=yes - random_traits=yes - x={X} - y={Y} - [/unit] -#enddef - #define ELVISH_FIGHTER_G X Y [unit] type=Elvish Fighter @@ -58,28 +47,6 @@ [/unit] #enddef -#define ELVISH_HERO X Y - [unit] - type=Elvish Hero - side=2 - generate_description=yes - random_traits=yes - x={X} - y={Y} - [/unit] -#enddef - -#define ELVISH_MARKSMAN X Y - [unit] - type=Elvish Marksman - side=2 - generate_description=yes - random_traits=yes - x={X} - y={Y} - [/unit] -#enddef - #define ELVISH_ARCHER X Y [unit] type=Elvish Archer @@ -354,26 +321,6 @@ #enddef -#define CHANGESIDE4 - [store_unit] - [filter] - side=4 - [/filter] - variable=changeside - kill=yes - [/store_unit] - [set_variable] - name=changeside.side - value=1 - [/set_variable] - [unstore_unit] - [/unstore_unit] - [clear_variable] - name=changeside - [/clear_variable] - -#enddef - #define HUMAN_GUARD X Y [unit] type=Pikeman diff --git a/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg b/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg index 4a5ed96ad77..ed377764261 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg @@ -56,10 +56,6 @@ {CLEAR_VARIABLE mage_test} #enddef - # - # Following macros implement the Staff of Righteous Flame - # - #define OBJ_STAFF_OF_RIGHTEOUS_FLAME X Y {PLACE_IMAGE "scenery/temple1.png" {X} {Y}} [event] @@ -215,103 +211,6 @@ [/event] #enddef - # - # Following macros are about generating defenders on village captures - # - -#define INDIGENE_SIDE SIDE - [side] - side={SIDE} - no_leader=yes - [ai] - grouping=offensive - [/ai] - [/side] -#enddef - -#define VILLAGE_TRAP UNITLIST SIDE - # Creates random defenders when {INVADER} takes a village, from {UNITLIST}, - # assigning them to {SIDE} - [event] - name=capture - first_time_only=no - - {RANDOM 0..10} - [if] - [variable] - name=random - less_than=$trapdiff - [/variable] - [then] - [set_variable] - name=numban -#ifdef EASY - random=2..5 -#endif -#ifdef NORMAL - random=1..4 -#endif -#ifdef HARD - random=0..3 -#endif - [/set_variable] - [set_variable] - name=numban - add=$trapdiff - [/set_variable] - [while] - [variable] - name=numban - greater_than=0 - [/variable] - [do] - {RANDOM {UNITLIST}} - [unit] - type=$random - side={SIDE} - x=$x1 - y=$y1 - generate_description=yes - random_traits=yes - [/unit] - [set_variable] - name=numban - add=-2 - [/set_variable] - [/do] - [/while] - {CLEAR_VARIABLE numban} - [message] - speaker=unit - message= _ "The villagers are attacking us!" - [/message] - [set_variable] - name=indigs_sighted - add=1 - [/set_variable] - [/then] - [else] - [if] - [variable] - name=indigs_sighted - greater_than=0 - [/variable] - [then] - [message] - speaker=unit - message= _ "No defenders in this village." - [/message] - [/then] - [/if] - [/else] - [/if] - [set_variable] - name=trapdiff - add=1 - [/set_variable] - [/event] -#enddef - #define RECALL_VETERAN TYPE X Y [role] type={TYPE} diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg index cf879f6b72d..b20c71be9ac 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg @@ -1920,7 +1920,7 @@ {@campaigns/Under_the_Burning_Suns/utils/deaths.cfg} {LATE_KALEH_DEATH} {LATE_ALLY_DEATH} - {FRIEND_DEATH} + {FRIEND_DEATH} #undef FINAL_FIGHT {@campaigns/Under_the_Burning_Suns/utils/global-events.cfg} diff --git a/data/core/macros/interface-utils.cfg b/data/core/macros/interface-utils.cfg index ec194f9461a..13320e9454b 100644 --- a/data/core/macros/interface-utils.cfg +++ b/data/core/macros/interface-utils.cfg @@ -19,10 +19,10 @@ #enddef #define FLOATING_TEXT FILTER COLOUR TEXT - # Floats the given text above the given unit in the same manner as damage - # numbers are displayed in combat. - # For example when a unit steps on a hidden trap and is dealt 8 damage, let's - # show this to the player like all other damage is: + # Floats the given text above the given unit in the same manner as + # damage numbers are displayed in combat. For example when a unit + # steps on a hidden trap and is dealt 8 damage, let's show this to + # the player like all other damage is: #! {FLOATING_TEXT x,y=$x1,$y1 255,0,0 "8"} [store_unit] [filter] diff --git a/data/core/macros/utils.cfg b/data/core/macros/utils.cfg index a0ad105ed4c..a7a98956724 100644 --- a/data/core/macros/utils.cfg +++ b/data/core/macros/utils.cfg @@ -563,10 +563,9 @@ "&"+{IMG}+"="+{TXT1}+"="+{TXT2}#enddef #define TIME_ACTIONS CONTENT_WML - # Measure (in milliseconds) the time arbitrary event WML takes to execute. - - # Afterwards, the time the enclosed WML took to execute is found in the variable - # $timed_actions_ms. + # Measure (in milliseconds) the time arbitrary event WML takes to + # execute. Afterwards, the time the enclosed WML took to execute + # is found in the variable $timed_actions_ms. # # Example: #! [event] diff --git a/data/core/terrain-graphics/util.cfg b/data/core/terrain-graphics/util.cfg index 8a32efdce57..b6cd0e373e9 100644 --- a/data/core/terrain-graphics/util.cfg +++ b/data/core/terrain-graphics/util.cfg @@ -165,7 +165,7 @@ # {FLAG_IF_ADJACENT Kud Cud keep-of-castle} flags all Kud tiles # adjacent to Cud tiles with the keep-of-castle flag # -# Use This to make other rule depend on adjacent terrain +# Use this to make other rule depend on adjacent terrain #define FLAG_IF_ADJACENT TERRAIN ADJACENT FLAG CLASS [terrain_graphics]