Move resurrection to utilities, reduce its probablit a bit to match other utilities, rename the "hint" prop since it really isn't being used as a hint anymore. That can be put back if it changes.
--- a/QTfrontend/hwconsts.cpp.in Thu Nov 11 10:51:38 2010 -0500
+++ b/QTfrontend/hwconsts.cpp.in Thu Nov 11 11:04:24 2010 -0500
@@ -37,7 +37,7 @@
QString * cDefaultAmmoStore = new QString(
"9391929422199121032235111001201000000211110101011"
- "0405040541600655546554464776576666666155510101117"
+ "0405040541600655546554464776576666666155510101115"
"0000000000000205500000040007004000000000200000000"
"1311110312111111123114111111111111111211111101111"
);
@@ -67,7 +67,7 @@
))
<< qMakePair(QString("Clean Slate"),QString(
"1010009000010000011000000000000000000000000000001"
- "0405040541600655546554464776576666666155510101117"
+ "0405040541600655546554464776576666666155510101115"
"0000000000000000000000000000000000000000000000000"
"1311110312111111123114111111111111111211111101111"
))
@@ -79,7 +79,7 @@
))
<< qMakePair(QString("Thinking with Portals"), QString(
"9000009002000000002100000000000000110000090000000"
- "0405040541600655546554464776576666666155510101117"
+ "0405040541600655546554464776576666666155510101115"
"0000000000000205500000040007004000000000200000000"
"1311110312111111123114111111111111111211111101111"
));
--- a/hedgewars/CCHandlers.inc Thu Nov 11 10:51:38 2010 -0500
+++ b/hedgewars/CCHandlers.inc Thu Nov 11 11:04:24 2010 -0500
@@ -686,7 +686,7 @@
if bShowAmmoMenu then bShowAmmoMenu:= false
else if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or
- ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0)) or
+ ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or
((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true
end;
if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1
--- a/hedgewars/HHHandlers.inc Thu Nov 11 10:51:38 2010 -0500
+++ b/hedgewars/HHHandlers.inc Thu Nov 11 11:04:24 2010 -0500
@@ -54,13 +54,13 @@
ammoidx:= 0;
if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or
(TargetPoint.X <> NoPointX) or
- ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0)) or
+ ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or
((Gear^.State and gstHHDriven) = 0) then exit;
ChangeAmmo:= true;
while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx);
- if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0) and (MultiShootAttacks > 0) then OnUsedAmmo(PHedgehog(Gear^.Hedgehog)^);
+ if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) and (MultiShootAttacks > 0) then OnUsedAmmo(PHedgehog(Gear^.Hedgehog)^);
MultiShootAttacks:= 0;
Gear^.Message:= Gear^.Message and not (gmLJump or gmHJump);
@@ -364,10 +364,10 @@
else
begin
OnUsedAmmo(CurrentHedgehog^);
- if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEndHint) = 0) and ((GameFlags and gfInfAttack) = 0) then
+ if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and ((GameFlags and gfInfAttack) = 0) then
TurnTimeLeft:= Ammoz[a].TimeAfterTurn;
- if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEndHint) = 0) then State:= State or gstAttacked;
- if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0 then ApplyAmmoChanges(CurrentHedgehog^)
+ if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) then State:= State or gstAttacked;
+ if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then ApplyAmmoChanges(CurrentHedgehog^)
end;
end
else
@@ -823,7 +823,7 @@
if (CurAmmoGear = nil)
or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0)
- or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0) then
+ or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) then
begin
if ((Gear^.Message and gmSlot) <> 0) then
if ChangeAmmo(Gear) then ApplyAmmoChanges(Hedgehog^);
--- a/hedgewars/uConsts.pas Thu Nov 11 10:51:38 2010 -0500
+++ b/hedgewars/uConsts.pas Thu Nov 11 11:04:24 2010 -0500
@@ -411,7 +411,7 @@
ammoprop_NotBorder = $00000800;
ammoprop_Utility = $00001000;
ammoprop_Effect = $00002000;
- ammoprop_NoRoundEndHint=$10000000;
+ ammoprop_NoRoundEnd=$10000000;
AMMO_INFINITE = 100;
@@ -1163,7 +1163,7 @@
NameTex: nil;
Probability: 100;
NumberInCase: 3;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_ForwMsgs or
ammoprop_AttackInMove or
ammoprop_Utility or
@@ -1328,7 +1328,7 @@
NameTex: nil;
Probability: 100;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_ForwMsgs or
ammoprop_AttackInMove or
ammoprop_NoCrosshair or
@@ -1434,7 +1434,7 @@
NameTex: nil;
Probability: 150;
NumberInCase: 3;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_NoCrosshair or
ammoprop_NeedTarget or
ammoprop_Utility or
@@ -1489,7 +1489,7 @@
NameTex: nil;
Probability: 100;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_ForwMsgs or
ammoprop_NoCrosshair or
ammoprop_Utility or
@@ -1752,7 +1752,7 @@
NameTex: nil;
Probability: 20;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_NoCrosshair or
ammoprop_DontHold or
ammoprop_AltUse or
@@ -1780,7 +1780,7 @@
NameTex: nil;
Probability: 15;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_NoCrosshair or
ammoprop_DontHold or
ammoprop_AltUse or
@@ -1808,7 +1808,7 @@
NameTex: nil;
Probability: 20;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_NoCrosshair or
ammoprop_DontHold or
ammoprop_AltUse or
@@ -1836,7 +1836,7 @@
NameTex: nil;
Probability: 30;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_NoCrosshair or
ammoprop_DontHold or
ammoprop_AltUse or
@@ -1864,7 +1864,7 @@
NameTex: nil;
Probability: 15;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_NoCrosshair or
ammoprop_DontHold or
ammoprop_AltUse or
@@ -1892,7 +1892,7 @@
NameTex: nil;
Probability: 15;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_NoCrosshair or
ammoprop_DontHold or
ammoprop_AltUse or
@@ -1943,7 +1943,7 @@
NameTex: nil;
Probability: 20;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_ForwMsgs or
ammoprop_AttackInMove or
ammoprop_NoCrosshair or
@@ -2020,7 +2020,7 @@
NameTex: nil;
Probability: 20;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoRoundEndHint or
+ Ammo: (Propz: ammoprop_NoRoundEnd or
ammoprop_AttackInMove or
ammoprop_DontHold or
ammoprop_Utility;
@@ -2187,7 +2187,9 @@
NameTex: nil;
Probability: 0;
NumberInCase: 1;
- Ammo: (Propz: ammoprop_NoCrosshair or ammoprop_NoRoundEndHint;
+ Ammo: (Propz: ammoprop_NoCrosshair or
+ ammoprop_Utility or
+ ammoprop_NoRoundEnd;
Count: 1;
NumPerTurn: 0;
Timer: 0;
--- a/hedgewars/uStore.pas Thu Nov 11 10:51:38 2010 -0500
+++ b/hedgewars/uStore.pas Thu Nov 11 11:04:24 2010 -0500
@@ -1545,7 +1545,7 @@
extra:= trmsg[sidNotYetAvailable];
extracolor:= LongInt($ffc77070);
end
-else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0 then // weapon or utility won't end your turn
+else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then // weapon or utility won't end your turn
begin
extra:= trmsg[sidNoEndTurn];
extracolor:= LongInt($ff70c770);