author | Xeli |
Sat, 04 Feb 2012 16:22:46 +0100 | |
changeset 6622 | 01889d5bc79b |
parent 6580 | 6155187bf599 |
child 6624 | e049b5bb0ad1 |
permissions | -rw-r--r-- |
393 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
4976 | 3 |
* Copyright (c) 2004-2011 Andrey Korotaev <unC0Rr@gmail.com> |
393 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
16 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
|
17 |
*) |
|
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
288 | 21 |
unit uAmmos; |
22 |
interface |
|
4368 | 23 |
uses uConsts, uTypes; |
288 | 24 |
|
3038 | 25 |
procedure initModule; |
26 |
procedure freeModule; |
|
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2715
diff
changeset
|
27 |
|
3346 | 28 |
procedure AddAmmoStore; |
29 |
procedure SetAmmoLoadout(s: shortstring); |
|
30 |
procedure SetAmmoProbability(s: shortstring); |
|
31 |
procedure SetAmmoDelay(s: shortstring); |
|
32 |
procedure SetAmmoReinforcement(s: shortstring); |
|
288 | 33 |
procedure AssignStores; |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
34 |
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType); |
5272 | 35 |
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType; cnt: LongWord); |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
36 |
function HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean; |
371 | 37 |
procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt); |
534 | 38 |
procedure OnUsedAmmo(var Hedgehog: THedgehog); |
1964 | 39 |
procedure ApplyAngleBounds(var Hedgehog: THedgehog; AmmoType: TAmmoType); |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
40 |
procedure ApplyAmmoChanges(var Hedgehog: THedgehog); |
1922 | 41 |
procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog); |
783 | 42 |
procedure SetWeapon(weap: TAmmoType); |
1784 | 43 |
procedure DisableSomeWeapons; |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2732
diff
changeset
|
44 |
procedure ResetWeapons; |
3405 | 45 |
function GetAmmoByNum(num: Longword): PHHAmmo; |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
46 |
function GetAmmoEntry(var Hedgehog: THedgehog): PAmmo; |
5272 | 47 |
function GetAmmoEntry(var Hedgehog: THedgehog; am: TAmmoType): PAmmo; |
288 | 48 |
|
4143
eb7981f34800
Remove the last vestiges of the shoppa hack by adding 2 spinners for percentage health and amount of health in crate, also update translations and increase SD spinner (some users have requested it)
henek
parents:
4141
diff
changeset
|
49 |
var StoreCnt: Longword; |
1966 | 50 |
|
288 | 51 |
implementation |
4403 | 52 |
uses uLocale, uMobile, uVariables, uCommands, uUtils, uCaptions, uDebug; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2715
diff
changeset
|
53 |
|
295 | 54 |
type TAmmoCounts = array[TAmmoType] of Longword; |
288 | 55 |
var StoresList: array[0..Pred(cMaxHHs)] of PHHAmmo; |
3346 | 56 |
ammoLoadout, ammoProbability, ammoDelay, ammoReinforcement: shortstring; |
3951
c9a63db3e603
Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents:
3943
diff
changeset
|
57 |
InitialCounts: array[0..Pred(cMaxHHs)] of TAmmoCounts; |
288 | 58 |
|
295 | 59 |
procedure FillAmmoStore(Ammo: PHHAmmo; var cnts: TAmmoCounts); |
288 | 60 |
var mi: array[0..cMaxSlotIndex] of byte; |
61 |
a: TAmmoType; |
|
295 | 62 |
begin |
3407 | 63 |
{$HINTS OFF} |
295 | 64 |
FillChar(mi, sizeof(mi), 0); |
3407 | 65 |
{$HINTS ON} |
295 | 66 |
FillChar(Ammo^, sizeof(Ammo^), 0); |
67 |
for a:= Low(TAmmoType) to High(TAmmoType) do |
|
2764 | 68 |
begin |
295 | 69 |
if cnts[a] > 0 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
70 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
71 |
TryDo(mi[Ammoz[a].Slot] <= cMaxSlotAmmoIndex, 'Ammo slot overflow', true); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
72 |
Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]]:= Ammoz[a].Ammo; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
73 |
with Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]] do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
74 |
Count:= cnts[a]; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
75 |
inc(mi[Ammoz[a].Slot]) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
76 |
end |
2764 | 77 |
end |
295 | 78 |
end; |
79 |
||
3346 | 80 |
procedure AddAmmoStore; |
3255
6d6f4241debe
Alter distribution of probabilities from frontend, allow utility crates in shoppa if probabilities permit (still ban health crates)
nemo
parents:
3114
diff
changeset
|
81 |
const probability: array [0..8] of LongWord = (0,20,30,60,100,200,400,600,800); |
295 | 82 |
var cnt: Longword; |
83 |
a: TAmmoType; |
|
84 |
ammos: TAmmoCounts; |
|
288 | 85 |
begin |
3346 | 86 |
TryDo((byte(ammoLoadout[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoProbability[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoDelay[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoReinforcement[0]) = byte(ord(High(TAmmoType)))), 'Incomplete or missing ammo scheme set (incompatible frontend or demo/save?)', true); |
288 | 87 |
|
88 |
inc(StoreCnt); |
|
89 |
TryDo(StoreCnt <= cMaxHHs, 'Ammo stores overflow', true); |
|
90 |
||
91 |
new(StoresList[Pred(StoreCnt)]); |
|
92 |
||
93 |
for a:= Low(TAmmoType) to High(TAmmoType) do |
|
94 |
begin |
|
2357
babe1a55e284
Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents:
2246
diff
changeset
|
95 |
if a <> amNothing then |
1895 | 96 |
begin |
3346 | 97 |
Ammoz[a].Probability:= probability[byte(ammoProbability[ord(a)]) - byte('0')]; |
98 |
Ammoz[a].SkipTurns:= (byte(ammoDelay[ord(a)]) - byte('0')); |
|
99 |
Ammoz[a].NumberInCase:= (byte(ammoReinforcement[ord(a)]) - byte('0')); |
|
100 |
cnt:= byte(ammoLoadout[ord(a)]) - byte('0'); |
|
2370 | 101 |
// avoid things we already have infinite number |
2357
babe1a55e284
Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents:
2246
diff
changeset
|
102 |
if cnt = 9 then |
babe1a55e284
Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents:
2246
diff
changeset
|
103 |
begin |
babe1a55e284
Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents:
2246
diff
changeset
|
104 |
cnt:= AMMO_INFINITE; |
2370 | 105 |
Ammoz[a].Probability:= 0 |
2357
babe1a55e284
Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents:
2246
diff
changeset
|
106 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
107 |
if Ammoz[a].NumberInCase = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
108 |
Ammoz[a].Probability:= 0; |
2860
13a53315ae18
Awesome patch from TheException - adds editing of weapon delay and crate count. Tiy might want to tweak the crate graphic, could make be smaller or less overlappy.
nemo
parents:
2855
diff
changeset
|
109 |
|
2370 | 110 |
// avoid things we already have by scheme |
2461 | 111 |
// merge this into DisableSomeWeapons ? |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
112 |
if ((a = amLowGravity) and ((GameFlags and gfLowGravity) <> 0)) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
113 |
or ((a = amInvulnerable) and ((GameFlags and gfInvulnerable) <> 0)) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
114 |
or ((a = amLaserSight) and ((GameFlags and gfLaserSight) <> 0)) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
115 |
or ((a = amVampiric) and ((GameFlags and gfVampiric) <> 0)) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
116 |
or ((a = amExtraTime) and (cHedgehogTurnTime >= 1000000)) then |
2128 | 117 |
begin |
2357
babe1a55e284
Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents:
2246
diff
changeset
|
118 |
cnt:= 0; |
2370 | 119 |
Ammoz[a].Probability:= 0 |
120 |
end; |
|
2457
ecf0c7e7995b
Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets
nemo
parents:
2453
diff
changeset
|
121 |
ammos[a]:= cnt; |
2730
f56592281526
Remove king invulnerability, disable everything but teleport instead.
nemo
parents:
2716
diff
changeset
|
122 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
123 |
if ((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
124 |
and (Ammoz[a].SkipTurns = 0) and (a <> amTeleport) and (a <> amSkip) then |
2732
d893901eff4a
Only add turn timeout for weapons that don't already have a timeout
nemo
parents:
2731
diff
changeset
|
125 |
Ammoz[a].SkipTurns:= 1; |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2732
diff
changeset
|
126 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
127 |
if ((GameFlags and gfPlaceHog) <> 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
128 |
and (a <> amTeleport) and (a <> amSkip) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
129 |
and (Ammoz[a].SkipTurns < 10000) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
130 |
inc(Ammoz[a].SkipTurns,10000); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
131 |
if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
132 |
ammos[a]:= AMMO_INFINITE |
3951
c9a63db3e603
Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents:
3943
diff
changeset
|
133 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
134 |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
135 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
136 |
ammos[a]:= AMMO_INFINITE; |
4344
23ab3bdbf218
This should fix Chip's bug with unlimited teleports. Also remove more hog placement special behaviour and just use ResetWeapons with a check against PlacingHogs mode
nemo
parents:
4339
diff
changeset
|
137 |
if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then |
5345
3c5480e91951
Simplify code using 'with', convert some tabs to spaces
unc0rr
parents:
5316
diff
changeset
|
138 |
InitialCounts[Pred(StoreCnt)][a]:= cnt |
4344
23ab3bdbf218
This should fix Chip's bug with unlimited teleports. Also remove more hog placement special behaviour and just use ResetWeapons with a check against PlacingHogs mode
nemo
parents:
4339
diff
changeset
|
139 |
else |
5345
3c5480e91951
Simplify code using 'with', convert some tabs to spaces
unc0rr
parents:
5316
diff
changeset
|
140 |
InitialCounts[Pred(StoreCnt)][a]:= ammos[a]; |
288 | 141 |
end; |
295 | 142 |
FillAmmoStore(StoresList[Pred(StoreCnt)], ammos) |
288 | 143 |
end; |
144 |
||
145 |
function GetAmmoByNum(num: Longword): PHHAmmo; |
|
146 |
begin |
|
147 |
TryDo(num < StoreCnt, 'Invalid store number', true); |
|
351 | 148 |
exit(StoresList[num]) |
288 | 149 |
end; |
150 |
||
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
151 |
function GetAmmoEntry(var Hedgehog: THedgehog): PAmmo; |
5272 | 152 |
begin |
153 |
GetAmmoEntry:= GetAmmoEntry(Hedgehog, Hedgehog.CurAmmoType) |
|
154 |
end; |
|
155 |
||
156 |
function GetAmmoEntry(var Hedgehog: THedgehog; am: TAmmoType): PAmmo; |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
157 |
var ammoidx, slot: LongWord; |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
158 |
begin |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
159 |
with Hedgehog do |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
160 |
begin |
5272 | 161 |
slot:= Ammoz[am].Slot; |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
162 |
ammoidx:= 0; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
163 |
while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> am) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
164 |
inc(ammoidx); |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
165 |
GetAmmoEntry:= @Ammo^[slot, ammoidx]; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
166 |
if (Ammo^[slot, ammoidx].AmmoType <> am) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
167 |
GetAmmoEntry:= GetAmmoEntry(Hedgehog, amNothing) |
5676
a655dfab27d7
Scripting changes. Add override of mapgen, templatefilter. Expose waterline, add "GetAmmoCount". Default to amNothing in uAmmos if entry is not found.
nemo
parents:
5640
diff
changeset
|
168 |
end; |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
169 |
end; |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
170 |
|
288 | 171 |
procedure AssignStores; |
547 | 172 |
var t: LongInt; |
288 | 173 |
i: Longword; |
174 |
begin |
|
547 | 175 |
for t:= 0 to Pred(TeamsCount) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
176 |
with TeamsArray[t]^ do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
177 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
178 |
for i:= 0 to cMaxHHIndex do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
179 |
if Hedgehogs[i].Gear <> nil then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
180 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
181 |
Hedgehogs[i].Ammo:= GetAmmoByNum(Hedgehogs[i].AmmoStore); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
182 |
if (GameFlags and gfPlaceHog) <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
183 |
Hedgehogs[i].CurAmmoType:= amTeleport |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
184 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
185 |
Hedgehogs[i].CurAmmoType:= amNothing |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
186 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
187 |
end |
288 | 188 |
end; |
189 |
||
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
190 |
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType); |
5273 | 191 |
var cnt: LongWord; |
5676
a655dfab27d7
Scripting changes. Add override of mapgen, templatefilter. Expose waterline, add "GetAmmoCount". Default to amNothing in uAmmos if entry is not found.
nemo
parents:
5640
diff
changeset
|
192 |
a: PAmmo; |
5272 | 193 |
begin |
5676
a655dfab27d7
Scripting changes. Add override of mapgen, templatefilter. Expose waterline, add "GetAmmoCount". Default to amNothing in uAmmos if entry is not found.
nemo
parents:
5640
diff
changeset
|
194 |
a:= GetAmmoEntry(Hedgehog, ammo); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
195 |
if (a^.AmmoType <> amNothing) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
196 |
cnt:= a^.Count |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
197 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
198 |
cnt:= 0; |
5688
fba59d6b5b6c
Correctly check for failure to look up ammo, check for damaged mines
nemo
parents:
5680
diff
changeset
|
199 |
if (cnt <> AMMO_INFINITE) then |
5273 | 200 |
begin |
201 |
inc(cnt, Ammoz[ammo].NumberInCase); |
|
202 |
AddAmmo(Hedgehog, ammo, cnt) |
|
203 |
end |
|
5272 | 204 |
end; |
205 |
||
206 |
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType; cnt: LongWord); |
|
295 | 207 |
var ammos: TAmmoCounts; |
371 | 208 |
slot, ami: LongInt; |
295 | 209 |
hhammo: PHHAmmo; |
5316
191cd6c06203
Allow control of grenade bounce. Not sure if this is a good idea, but has been requested a lot, so...
nemo
parents:
5273
diff
changeset
|
210 |
CurWeapon: PAmmo; |
295 | 211 |
begin |
3407 | 212 |
{$HINTS OFF} |
295 | 213 |
FillChar(ammos, sizeof(ammos), 0); |
3407 | 214 |
{$HINTS ON} |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
215 |
hhammo:= Hedgehog.Ammo; |
295 | 216 |
|
217 |
for slot:= 0 to cMaxSlotIndex do |
|
218 |
for ami:= 0 to cMaxSlotAmmoIndex do |
|
351 | 219 |
if hhammo^[slot, ami].Count > 0 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
220 |
ammos[hhammo^[slot, ami].AmmoType]:= hhammo^[slot, ami].Count; |
295 | 221 |
|
5272 | 222 |
ammos[ammo]:= cnt; |
223 |
if ammos[ammo] > AMMO_INFINITE then ammos[ammo]:= AMMO_INFINITE; |
|
941
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
927
diff
changeset
|
224 |
|
5316
191cd6c06203
Allow control of grenade bounce. Not sure if this is a good idea, but has been requested a lot, so...
nemo
parents:
5273
diff
changeset
|
225 |
FillAmmoStore(hhammo, ammos); |
191cd6c06203
Allow control of grenade bounce. Not sure if this is a good idea, but has been requested a lot, so...
nemo
parents:
5273
diff
changeset
|
226 |
CurWeapon:= GetAmmoEntry(Hedgehog); |
5345
3c5480e91951
Simplify code using 'with', convert some tabs to spaces
unc0rr
parents:
5316
diff
changeset
|
227 |
with Hedgehog, CurWeapon^ do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
228 |
if (Count = 0) or (AmmoType = amNothing) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
229 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
230 |
PackAmmo(Ammo, Ammoz[AmmoType].Slot); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
231 |
CurAmmoType:= amNothing |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
232 |
end |
295 | 233 |
end; |
234 |
||
371 | 235 |
procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt); |
236 |
var ami: LongInt; |
|
295 | 237 |
b: boolean; |
238 |
begin |
|
239 |
repeat |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
240 |
b:= false; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
241 |
ami:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
242 |
while (not b) and (ami < cMaxSlotAmmoIndex) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
243 |
if (Ammo^[Slot, ami].Count = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
244 |
and (Ammo^[Slot, ami + 1].Count > 0) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
245 |
b:= true |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
246 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
247 |
inc(ami); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
248 |
if b then // there is a free item in ammo stack |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
249 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
250 |
Ammo^[Slot, ami]:= Ammo^[Slot, ami + 1]; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
251 |
Ammo^[Slot, ami + 1].Count:= 0 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
252 |
end; |
295 | 253 |
until not b; |
254 |
end; |
|
255 |
||
534 | 256 |
procedure OnUsedAmmo(var Hedgehog: THedgehog); |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
257 |
var CurWeapon: PAmmo; |
295 | 258 |
begin |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
259 |
CurWeapon:= GetAmmoEntry(Hedgehog); |
534 | 260 |
with Hedgehog do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
261 |
begin |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
262 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
263 |
MultiShootAttacks:= 0; |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
264 |
with CurWeapon^ do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
265 |
if Count <> AMMO_INFINITE then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
266 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
267 |
dec(Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
268 |
if Count = 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
269 |
begin |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
270 |
PackAmmo(Ammo, Ammoz[AmmoType].Slot); |
3931
fd04228971b3
Set ammo to amNothing after using up the current ammo. This should reduce noob fail where they blow themselves up w/ bazooka.
nemo
parents:
3836
diff
changeset
|
271 |
//SwitchNotHeldAmmo(Hedgehog); |
fd04228971b3
Set ammo to amNothing after using up the current ammo. This should reduce noob fail where they blow themselves up w/ bazooka.
nemo
parents:
3836
diff
changeset
|
272 |
CurAmmoType:= amNothing |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
273 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
274 |
end |
3935 | 275 |
end; |
5167
7b515d0945b1
Clean Augean stables 2 (pascal has classnames available)
koda
parents:
5136
diff
changeset
|
276 |
uMobile.AmmoUpdate; |
295 | 277 |
end; |
278 |
||
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
279 |
function HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean; |
371 | 280 |
var slot, ami: LongInt; |
295 | 281 |
begin |
282 |
Slot:= Ammoz[Ammo].Slot; |
|
283 |
ami:= 0; |
|
351 | 284 |
while (ami <= cMaxSlotAmmoIndex) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
285 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
286 |
with Hedgehog.Ammo^[Slot, ami] do |
941
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
927
diff
changeset
|
287 |
if (AmmoType = Ammo) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
288 |
exit((Count > 0) and (Hedgehog.Team^.Clan^.TurnNumber > Ammoz[AmmoType].SkipTurns)); |
295 | 289 |
inc(ami) |
351 | 290 |
end; |
291 |
HHHasAmmo:= false |
|
295 | 292 |
end; |
293 |
||
1964 | 294 |
procedure ApplyAngleBounds(var Hedgehog: THedgehog; AmmoType: TAmmoType); |
1922 | 295 |
begin |
296 |
with Hedgehog do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
297 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
298 |
CurMinAngle:= Ammoz[AmmoType].minAngle; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
299 |
if Ammoz[AmmoType].maxAngle <> 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
300 |
CurMaxAngle:= Ammoz[AmmoType].maxAngle |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
301 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
302 |
CurMaxAngle:= cMaxAngle; |
1964 | 303 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
304 |
with Hedgehog.Gear^ do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
305 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
306 |
if Angle < CurMinAngle then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
307 |
Angle:= CurMinAngle; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
308 |
if Angle > CurMaxAngle then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
309 |
Angle:= CurMaxAngle; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
310 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
311 |
end |
1922 | 312 |
end; |
313 |
||
2432
1a0bb82d55f0
Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents:
2431
diff
changeset
|
314 |
procedure SwitchToFirstLegalAmmo(var Hedgehog: THedgehog); |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
315 |
var slot, ammoidx: LongWord; |
2432
1a0bb82d55f0
Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents:
2431
diff
changeset
|
316 |
begin |
1a0bb82d55f0
Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents:
2431
diff
changeset
|
317 |
with Hedgehog do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
318 |
begin |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
319 |
CurAmmoType:= amNothing; |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
320 |
slot:= 0; |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
321 |
ammoidx:= 0; |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
322 |
while (slot <= cMaxSlotIndex) and |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
323 |
((Ammo^[slot, ammoidx].Count = 0) or |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
324 |
(Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0)) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
325 |
do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
326 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
327 |
while (ammoidx <= cMaxSlotAmmoIndex) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
328 |
and ((Ammo^[slot, ammoidx].Count = 0) or (Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0)) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
329 |
do inc(ammoidx); |
2432
1a0bb82d55f0
Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents:
2431
diff
changeset
|
330 |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
331 |
if (ammoidx > cMaxSlotAmmoIndex) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
332 |
begin |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
333 |
ammoidx:= 0; |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
334 |
inc(slot) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
335 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
336 |
end; |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
337 |
TryDo(slot <= cMaxSlotIndex, 'Ammo slot index overflow', true); |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
338 |
CurAmmoType:= Ammo^[slot, ammoidx].AmmoType; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
339 |
end |
2432
1a0bb82d55f0
Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents:
2431
diff
changeset
|
340 |
end; |
1a0bb82d55f0
Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents:
2431
diff
changeset
|
341 |
|
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
342 |
procedure ApplyAmmoChanges(var Hedgehog: THedgehog); |
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
343 |
var s: shortstring; |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
344 |
CurWeapon: PAmmo; |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
345 |
begin |
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
346 |
TargetPoint.X:= NoPointX; |
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
347 |
|
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
348 |
with Hedgehog do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
349 |
begin |
3030 | 350 |
Timer:= 10; |
2409
dbf195c3e09c
fix a very rare bug in which CurSlot becomes greater than cMaxCurSlot
koda
parents:
2370
diff
changeset
|
351 |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
352 |
CurWeapon:= GetAmmoEntry(Hedgehog); |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
353 |
|
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
354 |
if (CurWeapon^.Count = 0) then |
6131 | 355 |
SwitchToFirstLegalAmmo(Hedgehog) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
356 |
else if CurWeapon^.AmmoType = amNothing then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
357 |
Hedgehog.CurAmmoType:= amNothing; |
2431
23242609c44b
Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents:
2409
diff
changeset
|
358 |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
359 |
CurWeapon:= GetAmmoEntry(Hedgehog); |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
360 |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
361 |
ApplyAngleBounds(Hedgehog, CurWeapon^.AmmoType); |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
362 |
|
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3697
diff
changeset
|
363 |
with CurWeapon^ do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
364 |
begin |
4807
180dbfb13903
display caption for ammotype amNothing when switched to so that players know what just happened
sheepluva
parents:
4403
diff
changeset
|
365 |
s:= trammo[Ammoz[AmmoType].NameId]; |
180dbfb13903
display caption for ammotype amNothing when switched to so that players know what just happened
sheepluva
parents:
4403
diff
changeset
|
366 |
if (Count <> AMMO_INFINITE) and not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0)) then |
180dbfb13903
display caption for ammotype amNothing when switched to so that players know what just happened
sheepluva
parents:
4403
diff
changeset
|
367 |
s:= s + ' (' + IntToStr(Count) + ')'; |
180dbfb13903
display caption for ammotype amNothing when switched to so that players know what just happened
sheepluva
parents:
4403
diff
changeset
|
368 |
if (Propz and ammoprop_Timerable) <> 0 then |
180dbfb13903
display caption for ammotype amNothing when switched to so that players know what just happened
sheepluva
parents:
4403
diff
changeset
|
369 |
s:= s + ', ' + IntToStr(Timer div 1000) + ' ' + trammo[sidSeconds]; |
180dbfb13903
display caption for ammotype amNothing when switched to so that players know what just happened
sheepluva
parents:
4403
diff
changeset
|
370 |
AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
371 |
if (Propz and ammoprop_NeedTarget) <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
372 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
373 |
Gear^.State:= Gear^.State or gstHHChooseTarget; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
374 |
isCursorVisible:= true |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
375 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
376 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
377 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
378 |
Gear^.State:= Gear^.State and not gstHHChooseTarget; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
379 |
isCursorVisible:= false |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
380 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
381 |
end |
3935 | 382 |
end; |
6622 | 383 |
AmmoMenuInvalidated:= true; |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
384 |
end; |
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
385 |
|
1922 | 386 |
procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog); |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
387 |
begin |
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
388 |
with Hedgehog do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
389 |
if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_DontHold) <> 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
390 |
or (Ammoz[CurAmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
391 |
SwitchToFirstLegalAmmo(Hedgehog); |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
392 |
end; |
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
547
diff
changeset
|
393 |
|
783 | 394 |
procedure SetWeapon(weap: TAmmoType); |
395 |
begin |
|
1850 | 396 |
ParseCommand('/setweap ' + char(weap), true) |
783 | 397 |
end; |
398 |
||
1784 | 399 |
procedure DisableSomeWeapons; |
400 |
var i, slot, a: Longword; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
401 |
t: TAmmoType; |
1784 | 402 |
begin |
403 |
for i:= 0 to Pred(StoreCnt) do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
404 |
for slot:= 0 to cMaxSlotIndex do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
405 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
406 |
for a:= 0 to cMaxSlotAmmoIndex do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
407 |
with StoresList[i]^[slot, a] do |
3697 | 408 |
if (Propz and ammoprop_NotBorder) <> 0 then |
3319 | 409 |
begin |
410 |
Count:= 0; |
|
3951
c9a63db3e603
Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents:
3943
diff
changeset
|
411 |
InitialCounts[i][AmmoType]:= 0 |
3319 | 412 |
end; |
1784 | 413 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
414 |
PackAmmo(StoresList[i], slot) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
415 |
end; |
1784 | 416 |
|
417 |
for t:= Low(TAmmoType) to High(TAmmoType) do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
418 |
if (Ammoz[t].Ammo.Propz and ammoprop_NotBorder) <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
419 |
Ammoz[t].Probability:= 0 |
1784 | 420 |
end; |
421 |
||
3346 | 422 |
procedure SetAmmoLoadout(s: shortstring); |
423 |
begin |
|
424 |
ammoLoadout:= s; |
|
425 |
end; |
|
426 |
||
427 |
procedure SetAmmoProbability(s: shortstring); |
|
428 |
begin |
|
429 |
ammoProbability:= s; |
|
430 |
end; |
|
431 |
||
432 |
procedure SetAmmoDelay(s: shortstring); |
|
433 |
begin |
|
434 |
ammoDelay:= s; |
|
435 |
end; |
|
436 |
||
437 |
procedure SetAmmoReinforcement(s: shortstring); |
|
438 |
begin |
|
439 |
ammoReinforcement:= s; |
|
440 |
end; |
|
441 |
||
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2732
diff
changeset
|
442 |
// Restore indefinitely disabled weapons and initial weapon counts. Only used for hog placement right now |
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2732
diff
changeset
|
443 |
procedure ResetWeapons; |
3955 | 444 |
var i, t: Longword; |
445 |
a: TAmmoType; |
|
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2732
diff
changeset
|
446 |
begin |
3955 | 447 |
for t:= 0 to Pred(TeamsCount) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
448 |
with TeamsArray[t]^ do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
449 |
for i:= 0 to cMaxHHIndex do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
450 |
Hedgehogs[i].CurAmmoType:= amNothing; |
6519 | 451 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
452 |
for i:= 0 to Pred(StoreCnt) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
453 |
FillAmmoStore(StoresList[i], InitialCounts[i]); |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2732
diff
changeset
|
454 |
|
3955 | 455 |
for a:= Low(TAmmoType) to High(TAmmoType) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
456 |
if Ammoz[a].SkipTurns >= 10000 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
457 |
dec(Ammoz[a].SkipTurns,10000) |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2732
diff
changeset
|
458 |
end; |
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2732
diff
changeset
|
459 |
|
4401 | 460 |
|
461 |
||
462 |
procedure chAddAmmoStore(var descr: shortstring); |
|
463 |
begin |
|
464 |
descr:= ''; // avoid compiler hint |
|
465 |
AddAmmoStore |
|
466 |
end; |
|
467 |
||
3038 | 468 |
procedure initModule; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2715
diff
changeset
|
469 |
begin |
4401 | 470 |
RegisterVariable('ammloadt', vtCommand, @SetAmmoLoadout, false); |
471 |
RegisterVariable('ammdelay', vtCommand, @SetAmmoDelay, false); |
|
472 |
RegisterVariable('ammprob', vtCommand, @SetAmmoProbability, false); |
|
473 |
RegisterVariable('ammreinf', vtCommand, @SetAmmoReinforcement, false); |
|
474 |
RegisterVariable('ammstore', vtCommand, @chAddAmmoStore , false); |
|
475 |
||
3346 | 476 |
StoreCnt:= 0; |
477 |
ammoLoadout:= ''; |
|
478 |
ammoProbability:= ''; |
|
479 |
ammoDelay:= ''; |
|
3951
c9a63db3e603
Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents:
3943
diff
changeset
|
480 |
ammoReinforcement:= ''; |
c9a63db3e603
Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents:
3943
diff
changeset
|
481 |
FillChar(InitialCounts, sizeof(InitialCounts), 0) |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2715
diff
changeset
|
482 |
end; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2715
diff
changeset
|
483 |
|
3038 | 484 |
procedure freeModule; |
2715
0e4e0db79e2a
Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents:
2630
diff
changeset
|
485 |
var i: LongWord; |
0e4e0db79e2a
Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents:
2630
diff
changeset
|
486 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2860
diff
changeset
|
487 |
if StoreCnt > 0 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
488 |
for i:= 0 to Pred(StoreCnt) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6519
diff
changeset
|
489 |
Dispose(StoresList[i]) |
2715
0e4e0db79e2a
Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents:
2630
diff
changeset
|
490 |
end; |
0e4e0db79e2a
Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents:
2630
diff
changeset
|
491 |
|
288 | 492 |
end. |