# HG changeset patch
# User nemo
# Date 1269196954 0
# Node ID ab6e949eb5cb26ab2bc1393a32257ef29d81e211
# Parent  c6ba6531cb4bfc137f9c823bf24870a9f77add68
Rename current things called utilities to Effects (since they impact game state / flags w/o using a gear) and add a bunch of things that don't cause damage and are just used to move to Utility crate.

diff -r c6ba6531cb4b -r ab6e949eb5cb hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Sun Mar 21 16:51:33 2010 +0000
+++ b/hedgewars/HHHandlers.inc	Sun Mar 21 18:42:34 2010 +0000
@@ -241,7 +241,7 @@
         CurrentHedgehog^ do
     begin
     State:= State and not gstAttacking;
-    if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_Utility) = 0 then
+    if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_Effect) = 0 then
         begin
         Inc(MultiShootAttacks);
         
diff -r c6ba6531cb4b -r ab6e949eb5cb hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Sun Mar 21 16:51:33 2010 +0000
+++ b/hedgewars/uConsts.pas	Sun Mar 21 18:42:34 2010 +0000
@@ -372,6 +372,7 @@
     ammoprop_AltUse       = $00000400;
     ammoprop_NotBorder    = $00000800;
     ammoprop_Utility      = $00001000;
+    ammoprop_Effect       = $00002000;
     ammoprop_NoRoundEndHint=$10000000;
     
     AMMO_INFINITE = 100;
@@ -835,7 +836,7 @@
             NameTex: nil;
             Probability: 0;
             NumberInCase: 0;
-            Ammo: (Propz: ammoprop_NoCrosshair or ammoprop_DontHold or ammoprop_Utility;
+            Ammo: (Propz: ammoprop_NoCrosshair or ammoprop_DontHold or ammoprop_Effect;
                 Count: AMMO_INFINITE;
                 InitialCount: AMMO_INFINITE;
                 NumPerTurn: 0;
@@ -997,8 +998,9 @@
             NumberInCase: 3;
             Ammo: (Propz: ammoprop_NoRoundEndHint or
                           ammoprop_ForwMsgs or
-                            ammoprop_AttackInMove or
-                            ammoprop_AltAttack;
+                          ammoprop_AttackInMove or
+                          ammoprop_Utility or
+                          ammoprop_AltAttack;
                     Count: 5;
                     InitialCount: 5;
                     NumPerTurn: 0;
@@ -1140,10 +1142,11 @@
             NumberInCase: 1;
             Ammo: (Propz: ammoprop_NoRoundEndHint or
                           ammoprop_ForwMsgs or
-                            ammoprop_AttackInMove or
-                            ammoprop_NoCrosshair or
-                            ammoprop_DontHold or
-                            ammoprop_AltAttack;
+                          ammoprop_AttackInMove or
+                          ammoprop_NoCrosshair or
+                          ammoprop_DontHold or
+                          ammoprop_Utility or
+                          ammoprop_AltAttack;
                 Count: 2;
                 InitialCount: 2;
                 NumPerTurn: 0;
@@ -1233,8 +1236,9 @@
             NumberInCase: 3;
             Ammo: (Propz: ammoprop_NoRoundEndHint or
                           ammoprop_NoCrosshair or
-                            ammoprop_NeedTarget or
-                            ammoprop_AttackingPut;
+                          ammoprop_NeedTarget or
+                          ammoprop_Utility or
+                          ammoprop_AttackingPut;
                     Count: 1;
                     InitialCount: 1;
                     NumPerTurn: 0;
@@ -1255,10 +1259,11 @@
             Probability: 200;
             NumberInCase: 1;
             Ammo: (Propz: ammoprop_ForwMsgs or
-                            ammoprop_NoCrosshair or
-                            ammoprop_NeedTarget or
-                            ammoprop_AttackingPut or
-                            ammoprop_DontHold;
+                          ammoprop_NoCrosshair or
+                          ammoprop_NeedTarget or
+                          ammoprop_AttackingPut or
+                          ammoprop_Utility or
+                          ammoprop_DontHold;
                 Count: 2;
                 InitialCount: 2;
                 NumPerTurn: 0;
@@ -1280,8 +1285,9 @@
             NumberInCase: 1;
             Ammo: (Propz: ammoprop_NoRoundEndHint or
                           ammoprop_ForwMsgs or
-                            ammoprop_NoCrosshair or
-                            ammoprop_DontHold;
+                          ammoprop_NoCrosshair or
+                          ammoprop_Utility or
+                          ammoprop_DontHold;
                     Count: 3;
                     InitialCount: 3;
                     NumPerTurn: 0;
@@ -1511,7 +1517,8 @@
                           ammoprop_NoCrosshair or
                           ammoprop_DontHold or
                           ammoprop_AltUse or
-                          ammoprop_Utility;
+                          ammoprop_Utility or
+                          ammoprop_Effect;
                     Count: 1;
                     InitialCount: 1;
                     NumPerTurn: 0;
@@ -1535,7 +1542,8 @@
                           ammoprop_NoCrosshair or
                           ammoprop_DontHold or
                           ammoprop_AltUse or
-                          ammoprop_Utility;
+                          ammoprop_Utility or
+                          ammoprop_Effect;
                     Count: 1;
                     InitialCount: 1;
                     NumPerTurn: 0;
@@ -1559,7 +1567,8 @@
                           ammoprop_NoCrosshair or
                           ammoprop_DontHold or
                           ammoprop_AltUse or
-                          ammoprop_Utility;
+                          ammoprop_Utility or
+                          ammoprop_Effect;
                     Count: 1;
                     InitialCount: 1;
                     NumPerTurn: 0;
@@ -1583,7 +1592,8 @@
                           ammoprop_NoCrosshair or
                           ammoprop_DontHold or
                           ammoprop_AltUse or
-                          ammoprop_Utility;
+                          ammoprop_Utility or
+                          ammoprop_Effect;
                     Count: 1;
                     InitialCount: 1;
                     NumPerTurn: 0;
@@ -1607,7 +1617,8 @@
                           ammoprop_NoCrosshair or
                           ammoprop_DontHold or
                           ammoprop_AltUse or
-                          ammoprop_Utility;
+                          ammoprop_Utility or
+                          ammoprop_Effect;
                     Count: 1;
                     InitialCount: 1;
                     NumPerTurn: 0;
@@ -1631,7 +1642,8 @@
                           ammoprop_NoCrosshair or
                           ammoprop_DontHold or
                           ammoprop_AltUse or
-                          ammoprop_Utility;
+                          ammoprop_Utility or
+                          ammoprop_Effect;
                     Count: 1;
                     InitialCount: 1;
                     NumPerTurn: 0;
@@ -1673,10 +1685,11 @@
             NumberInCase: 1;
             Ammo: (Propz: ammoprop_NoRoundEndHint or
                           ammoprop_ForwMsgs or
-                            ammoprop_AttackInMove or
-                            ammoprop_NoCrosshair or
-                            ammoprop_DontHold or
-                            ammoprop_AltAttack;
+                          ammoprop_AttackInMove or
+                          ammoprop_NoCrosshair or
+                          ammoprop_DontHold or
+                          ammoprop_Utility or
+                          ammoprop_AltAttack;
                 Count: 1;
                 InitialCount: 1;
                 NumPerTurn: 1;