| author | Wuzzy <Wuzzy2@mail.ru> |
| Thu, 11 Jul 2019 02:25:07 +0200 | |
| changeset 15246 | ebbc2f04b863 |
| parent 15245 | f16376e9374f |
| child 15247 | eb61cf77b365 |
| permissions | -rw-r--r-- |
| 4 | 1 |
(* |
| 1066 | 2 |
* Hedgewars, a free turn based strategy game |
| 11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
| 4 | 4 |
* |
| 183 | 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 |
|
| 4 | 8 |
* |
| 183 | 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. |
|
| 4 | 13 |
* |
| 183 | 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 |
|
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10040
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 4 | 17 |
*) |
18 |
||
|
5121
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
19 |
(* |
|
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
20 |
* This file contains the step handlers for gears. |
|
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
21 |
* |
|
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
22 |
* Important: Since gears change the course of the game, calculations that |
|
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
23 |
* lead to different results for different clients/players/machines |
|
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
24 |
* should NOT occur! |
|
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
25 |
* Use safe functions and data types! (e.g. GetRandom() and hwFloat) |
|
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
26 |
*) |
| 10015 | 27 |
|
| 9285 | 28 |
{$INCLUDE "options.inc"}
|
29 |
||
30 |
unit uGearsHandlersMess; |
|
31 |
interface |
|
32 |
uses uTypes, uFloat; |
|
33 |
||
34 |
procedure doStepPerPixel(Gear: PGear; step: TGearStepProcedure; onlyCheckIfChanged: boolean); |
|
|
14032
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
35 |
procedure makeHogsWorry(x, y: hwFloat; r: LongInt; gearType: TGearType); |
| 9285 | 36 |
procedure HideHog(HH: PHedgehog); |
37 |
procedure doStepDrowningGear(Gear: PGear); |
|
38 |
procedure doStepFallingGear(Gear: PGear); |
|
39 |
procedure doStepBomb(Gear: PGear); |
|
40 |
procedure doStepMolotov(Gear: PGear); |
|
41 |
procedure doStepCluster(Gear: PGear); |
|
42 |
procedure doStepShell(Gear: PGear); |
|
43 |
procedure doStepSnowball(Gear: PGear); |
|
44 |
procedure doStepSnowflake(Gear: PGear); |
|
45 |
procedure doStepGrave(Gear: PGear); |
|
46 |
procedure doStepBeeWork(Gear: PGear); |
|
47 |
procedure doStepBee(Gear: PGear); |
|
48 |
procedure doStepShotIdle(Gear: PGear); |
|
49 |
procedure doStepShotgunShot(Gear: PGear); |
|
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
50 |
procedure spawnBulletTrail(Bullet: PGear; bulletX, bulletY: hwFloat; fadeIn: Boolean); |
| 9285 | 51 |
procedure doStepBulletWork(Gear: PGear); |
52 |
procedure doStepDEagleShot(Gear: PGear); |
|
53 |
procedure doStepSniperRifleShot(Gear: PGear); |
|
54 |
procedure doStepActionTimer(Gear: PGear); |
|
55 |
procedure doStepPickHammerWork(Gear: PGear); |
|
56 |
procedure doStepPickHammer(Gear: PGear); |
|
57 |
procedure doStepBlowTorchWork(Gear: PGear); |
|
58 |
procedure doStepBlowTorch(Gear: PGear); |
|
59 |
procedure doStepMine(Gear: PGear); |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
60 |
procedure doStepAirMine(Gear: PGear); |
| 9285 | 61 |
procedure doStepSMine(Gear: PGear); |
62 |
procedure doStepDynamite(Gear: PGear); |
|
63 |
procedure doStepRollingBarrel(Gear: PGear); |
|
64 |
procedure doStepCase(Gear: PGear); |
|
65 |
procedure doStepTarget(Gear: PGear); |
|
66 |
procedure doStepIdle(Gear: PGear); |
|
67 |
procedure doStepShover(Gear: PGear); |
|
68 |
procedure doStepWhip(Gear: PGear); |
|
69 |
procedure doStepFlame(Gear: PGear); |
|
70 |
procedure doStepFirePunchWork(Gear: PGear); |
|
71 |
procedure doStepFirePunch(Gear: PGear); |
|
72 |
procedure doStepParachuteWork(Gear: PGear); |
|
73 |
procedure doStepParachute(Gear: PGear); |
|
74 |
procedure doStepAirAttackWork(Gear: PGear); |
|
75 |
procedure doStepAirAttack(Gear: PGear); |
|
76 |
procedure doStepAirBomb(Gear: PGear); |
|
77 |
procedure doStepGirder(Gear: PGear); |
|
78 |
procedure doStepTeleportAfter(Gear: PGear); |
|
79 |
procedure doStepTeleportAnim(Gear: PGear); |
|
80 |
procedure doStepTeleport(Gear: PGear); |
|
81 |
procedure doStepSwitcherWork(Gear: PGear); |
|
82 |
procedure doStepSwitcher(Gear: PGear); |
|
83 |
procedure doStepMortar(Gear: PGear); |
|
84 |
procedure doStepKamikazeWork(Gear: PGear); |
|
85 |
procedure doStepKamikazeIdle(Gear: PGear); |
|
86 |
procedure doStepKamikaze(Gear: PGear); |
|
87 |
procedure doStepCakeExpl(Gear: PGear); |
|
88 |
procedure doStepCakeDown(Gear: PGear); |
|
| 11531 | 89 |
procedure doStepCakeWalk(Gear: PGear); |
| 9285 | 90 |
procedure doStepCakeUp(Gear: PGear); |
91 |
procedure doStepCakeFall(Gear: PGear); |
|
92 |
procedure doStepCake(Gear: PGear); |
|
93 |
procedure doStepSeductionWork(Gear: PGear); |
|
94 |
procedure doStepSeductionWear(Gear: PGear); |
|
95 |
procedure doStepSeduction(Gear: PGear); |
|
96 |
procedure doStepWaterUp(Gear: PGear); |
|
97 |
procedure doStepDrillDrilling(Gear: PGear); |
|
98 |
procedure doStepDrill(Gear: PGear); |
|
99 |
procedure doStepBallgunWork(Gear: PGear); |
|
100 |
procedure doStepBallgun(Gear: PGear); |
|
101 |
procedure doStepRCPlaneWork(Gear: PGear); |
|
102 |
procedure doStepRCPlane(Gear: PGear); |
|
103 |
procedure doStepJetpackWork(Gear: PGear); |
|
104 |
procedure doStepJetpack(Gear: PGear); |
|
105 |
procedure doStepBirdyDisappear(Gear: PGear); |
|
106 |
procedure doStepBirdyFly(Gear: PGear); |
|
107 |
procedure doStepBirdyDescend(Gear: PGear); |
|
108 |
procedure doStepBirdyAppear(Gear: PGear); |
|
109 |
procedure doStepBirdy(Gear: PGear); |
|
110 |
procedure doStepEggWork(Gear: PGear); |
|
111 |
procedure doPortalColorSwitch(); |
|
112 |
procedure doStepPortal(Gear: PGear); |
|
113 |
procedure loadNewPortalBall(oldPortal: PGear; destroyGear: Boolean); |
|
114 |
procedure doStepMovingPortal_real(Gear: PGear); |
|
115 |
procedure doStepMovingPortal(Gear: PGear); |
|
116 |
procedure doStepPortalShot(newPortal: PGear); |
|
117 |
procedure doStepPiano(Gear: PGear); |
|
|
14587
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
118 |
procedure doStepPianoWork(Gear: PGear); |
| 9285 | 119 |
procedure doStepSineGunShotWork(Gear: PGear); |
120 |
procedure doStepSineGunShot(Gear: PGear); |
|
121 |
procedure doStepFlamethrowerWork(Gear: PGear); |
|
122 |
procedure doStepFlamethrower(Gear: PGear); |
|
123 |
procedure doStepLandGunWork(Gear: PGear); |
|
124 |
procedure doStepLandGun(Gear: PGear); |
|
125 |
procedure doStepPoisonCloud(Gear: PGear); |
|
126 |
procedure doStepHammer(Gear: PGear); |
|
127 |
procedure doStepHammerHitWork(Gear: PGear); |
|
128 |
procedure doStepHammerHit(Gear: PGear); |
|
129 |
procedure doStepResurrectorWork(Gear: PGear); |
|
130 |
procedure doStepResurrector(Gear: PGear); |
|
131 |
procedure doStepNapalmBomb(Gear: PGear); |
|
132 |
procedure doStepTardisWarp(Gear: PGear); |
|
133 |
procedure doStepTardis(Gear: PGear); |
|
134 |
procedure updateFuel(Gear: PGear); |
|
135 |
procedure updateTarget(Gear:PGear; newX, newY:HWFloat); |
|
136 |
procedure doStepIceGun(Gear: PGear); |
|
137 |
procedure doStepAddAmmo(Gear: PGear); |
|
138 |
procedure doStepGenericFaller(Gear: PGear); |
|
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
139 |
procedure doStepCreeper(Gear: PGear); |
| 9285 | 140 |
procedure doStepKnife(Gear: PGear); |
| 12898 | 141 |
procedure doStepMinigunWork(Gear: PGear); |
142 |
procedure doStepMinigun(Gear: PGear); |
|
143 |
procedure doStepMinigunBullet(Gear: PGear); |
|
| 9285 | 144 |
|
145 |
var |
|
146 |
upd: Longword; |
|
147 |
snowLeft,snowRight: LongInt; |
|
148 |
||
149 |
implementation |
|
150 |
uses uConsts, uVariables, uVisualGearsList, uRandom, uCollisions, uGearsList, uUtils, uSound |
|
151 |
, SDLh, uScript, uGearsHedgehog, uGearsUtils, uIO, uCaptions, uLandGraphics |
|
|
15242
bf11546c1920
Remove excessive console output of gtAirAttack
Wuzzy <Wuzzy2@mail.ru>
parents:
15225
diff
changeset
|
152 |
, uGearsHandlers, uTextures, uRenderUtils, uAmmos, uTeams, uLandTexture |
|
12169
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
153 |
, uStore, uAI, uStats, uLocale; |
|
5121
2d34ec60992c
added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva
parents:
5076
diff
changeset
|
154 |
|
| 3569 | 155 |
procedure doStepPerPixel(Gear: PGear; step: TGearStepProcedure; onlyCheckIfChanged: boolean); |
156 |
var |
|
157 |
dX, dY, sX, sY: hwFloat; |
|
158 |
i, steps: LongWord; |
|
159 |
caller: TGearStepProcedure; |
|
160 |
begin |
|
161 |
dX:= Gear^.dX; |
|
162 |
dY:= Gear^.dY; |
|
163 |
steps:= max(abs(hwRound(Gear^.X+dX)-hwRound(Gear^.X)), abs(hwRound(Gear^.Y+dY)-hwRound(Gear^.Y))); |
|
164 |
||
165 |
// Gear is still on the same Pixel it was before |
|
166 |
if steps < 1 then |
|
| 4578 | 167 |
begin |
| 3569 | 168 |
if onlyCheckIfChanged then |
| 4578 | 169 |
begin |
| 3569 | 170 |
Gear^.X := Gear^.X + dX; |
171 |
Gear^.Y := Gear^.Y + dY; |
|
172 |
EXIT; |
|
| 4578 | 173 |
end |
| 3569 | 174 |
else |
175 |
steps := 1; |
|
| 4578 | 176 |
end; |
| 3569 | 177 |
|
178 |
if steps > 1 then |
|
| 4578 | 179 |
begin |
| 3569 | 180 |
sX:= dX / steps; |
181 |
sY:= dY / steps; |
|
| 4578 | 182 |
end |
| 8795 | 183 |
|
| 3569 | 184 |
else |
| 4578 | 185 |
begin |
| 3569 | 186 |
sX:= dX; |
187 |
sY:= dY; |
|
| 4578 | 188 |
end; |
| 3569 | 189 |
|
190 |
caller:= Gear^.doStep; |
|
191 |
||
192 |
for i:= 1 to steps do |
|
| 4578 | 193 |
begin |
| 3569 | 194 |
Gear^.X := Gear^.X + sX; |
195 |
Gear^.Y := Gear^.Y + sY; |
|
196 |
step(Gear); |
|
197 |
if (Gear^.doStep <> caller) |
|
198 |
or ((Gear^.State and gstCollision) <> 0) |
|
199 |
or ((Gear^.State and gstMoving) = 0) then |
|
200 |
break; |
|
| 4578 | 201 |
end; |
| 3569 | 202 |
end; |
203 |
||
|
14032
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
204 |
procedure makeHogsWorry(x, y: hwFloat; r: LongInt; gearType: TGearType); |
| 8795 | 205 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
206 |
gi: PGear; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
207 |
d: LongInt; |
|
14032
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
208 |
grenadeTaunt: boolean; |
| 2647 | 209 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
210 |
gi := GearsList; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
211 |
while gi <> nil do |
| 4578 | 212 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
213 |
if (gi^.Kind = gtHedgehog) then |
| 4578 | 214 |
begin |
| 12805 | 215 |
d := r - hwRound(Distance(gi^.X - x, gi^.Y - y)); |
|
10011
ead5e4b21671
Add check for gear kind of hedgehog on invulnerability effect. This probably fixes bug #766, is similar to change in previous r2a1483d91977 and was introduced by r7d925e82e572
nemo
parents:
9998
diff
changeset
|
216 |
if (d > 1) and (gi^.Hedgehog^.Effects[heInvulnerable] = 0) and (GetRandom(2) = 0) then |
| 4578 | 217 |
begin |
| 3143 | 218 |
if (CurrentHedgehog^.Gear = gi) then |
|
14040
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
219 |
if (CurrentHedgehog^.Gear^.FlightTime = 0) then |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
220 |
case random(4) of |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
221 |
0: PlaySoundV(sndWhatThe, gi^.Hedgehog^.Team^.voicepack); |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
222 |
1: PlaySoundV(sndOops, gi^.Hedgehog^.Team^.voicepack); |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
223 |
2: PlaySoundV(sndRunAway, gi^.Hedgehog^.Team^.voicepack); |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
224 |
3: PlaySoundV(sndRunAway, gi^.Hedgehog^.Team^.voicepack); |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
225 |
end |
| 14035 | 226 |
else |
|
14040
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
227 |
if random(4) = 0 then |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
228 |
PlaySoundV(sndWhatThe, gi^.Hedgehog^.Team^.voicepack) |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
229 |
else |
|
1effb8b72b11
New taunt: Runaway, when something is about to blow up near current hog
Wuzzy <Wuzzy2@mail.ru>
parents:
14035
diff
changeset
|
230 |
PlaySoundV(sndOops, gi^.Hedgehog^.Team^.voicepack) |
| 8795 | 231 |
|
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
232 |
else |
| 4578 | 233 |
begin |
|
8632
b5ed76d2a1f9
Make hogs thaw only on enemy turns, make timebox counter decrement only on your turn, adjust knock for frozen hogs, increase damage on frozen hogs, make freezer fuel only reduce when not adjusting angle.
nemo
parents:
8628
diff
changeset
|
234 |
if ((gi^.State and gstMoving) = 0) and (gi^.Hedgehog^.Effects[heFrozen] = 0) then |
|
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7784
diff
changeset
|
235 |
begin |
|
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7784
diff
changeset
|
236 |
gi^.dX.isNegative:= X<gi^.X; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
237 |
gi^.State := gi^.State or gstLoser; |
|
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7784
diff
changeset
|
238 |
end; |
| 8795 | 239 |
|
|
14032
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
240 |
grenadeTaunt:= false; |
|
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
241 |
if (gearType = gtGrenade) then |
|
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
242 |
grenadeTaunt:= random(2) = 0; |
|
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
243 |
|
|
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
244 |
if grenadeTaunt then |
|
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
245 |
PlaySoundV(sndGrenade, gi^.Hedgehog^.Team^.voicepack) |
| 3143 | 246 |
else |
|
14032
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
247 |
if d > r div 2 then |
| 14035 | 248 |
if random(3) = 0 then |
249 |
PlaySoundV(sndWhatThe, gi^.Hedgehog^.Team^.voicepack) |
|
250 |
else |
|
251 |
PlaySoundV(sndNooo, gi^.Hedgehog^.Team^.voicepack) |
|
|
14032
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
252 |
else |
|
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
253 |
PlaySoundV(sndUhOh, gi^.Hedgehog^.Team^.voicepack); |
|
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
254 |
|
| 4578 | 255 |
end; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
256 |
end; |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
257 |
end; |
| 8795 | 258 |
|
| 4578 | 259 |
gi := gi^.NextGear |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
260 |
end; |
| 2647 | 261 |
end; |
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
262 |
|
|
5807
5c8fe58dead5
Define 2 script callbacks to notify of hog vanishment
nemo
parents:
5806
diff
changeset
|
263 |
procedure HideHog(HH: PHedgehog); |
|
5c8fe58dead5
Define 2 script callbacks to notify of hog vanishment
nemo
parents:
5806
diff
changeset
|
264 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
265 |
ScriptCall('onHogHide', HH^.Gear^.Uid);
|
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
266 |
DeleteCI(HH^.Gear); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
267 |
if FollowGear = HH^.Gear then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
268 |
FollowGear:= nil; |
| 8795 | 269 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
270 |
if lastGearByUID = HH^.Gear then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
271 |
lastGearByUID := nil; |
| 8795 | 272 |
|
|
7400
09427dbec1d8
Fix TARDIS, make switcher work w/ the new more stringent check.
nemo
parents:
7399
diff
changeset
|
273 |
HH^.Gear^.Message:= HH^.Gear^.Message or gmRemoveFromList; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
274 |
with HH^.Gear^ do |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
275 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
276 |
Z := cHHZ; |
|
7400
09427dbec1d8
Fix TARDIS, make switcher work w/ the new more stringent check.
nemo
parents:
7399
diff
changeset
|
277 |
HH^.Gear^.Active:= false; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
278 |
State:= State and (not (gstHHDriven or gstAttacking or gstAttacked)); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
279 |
Message := Message and (not gmAttack); |
|
5807
5c8fe58dead5
Define 2 script callbacks to notify of hog vanishment
nemo
parents:
5806
diff
changeset
|
280 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
281 |
HH^.GearHidden:= HH^.Gear; |
|
13140
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13096
diff
changeset
|
282 |
HH^.Gear:= nil; |
|
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13096
diff
changeset
|
283 |
AddVisualGear(0, 0, vgtTeamHealthSorter); |
|
5807
5c8fe58dead5
Define 2 script callbacks to notify of hog vanishment
nemo
parents:
5806
diff
changeset
|
284 |
end; |
|
5c8fe58dead5
Define 2 script callbacks to notify of hog vanishment
nemo
parents:
5806
diff
changeset
|
285 |
|
| 4 | 286 |
|
287 |
//////////////////////////////////////////////////////////////////////////////// |
|
288 |
procedure doStepDrowningGear(Gear: PGear); |
|
|
12714
5a57acce9cae
Fix bubbles drawn on the wrong side when hog drowns and faces right
Wuzzy <almikes@aol.com>
parents:
12712
diff
changeset
|
289 |
var i, d, bubbleX, bubbleY: LongInt; |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
290 |
bubble: PVisualGear; |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
291 |
begin |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
292 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
293 |
begin |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
294 |
d:= 2 * Gear^.Radius; |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
295 |
for i:= (Gear^.Radius * Gear^.Radius) div 4 downto 0 do |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
296 |
begin |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
297 |
bubble := AddVisualGear(hwRound(Gear^.X) - Gear^.Radius + random(d), hwRound(Gear^.Y) - Gear^.Radius + random(d), vgtBubble); |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
298 |
if bubble <> nil then |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
299 |
bubble^.dY:= 0.1 + random(20)/10; |
| 10354 | 300 |
end; |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
301 |
DeleteGear(Gear); |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
302 |
exit; |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
303 |
end; |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
304 |
|
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
305 |
AllInactive := false; |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
306 |
dec(Gear^.Timer); |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
307 |
|
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
308 |
Gear^.Y := Gear^.Y + cDrownSpeed; |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
309 |
|
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
310 |
if cWaterLine > hwRound(Gear^.Y) + Gear^.Radius then |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
311 |
begin |
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
312 |
if leftX + Gear^.Radius > hwRound(Gear^.X) then |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
313 |
Gear^.X := Gear^.X - cDrownSpeed |
| 10354 | 314 |
else |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
315 |
Gear^.X := Gear^.X + cDrownSpeed; |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
316 |
end |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
317 |
else |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
318 |
Gear^.X := Gear^.X + Gear^.dX * cDrownSpeed; |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
319 |
|
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
320 |
// Create some bubbles (0.5% might be better but causes too few bubbles sometimes) |
|
12714
5a57acce9cae
Fix bubbles drawn on the wrong side when hog drowns and faces right
Wuzzy <almikes@aol.com>
parents:
12712
diff
changeset
|
321 |
if (Gear^.Kind = gtHedgehog) and (Gear^.dX.isNegative) then |
|
5a57acce9cae
Fix bubbles drawn on the wrong side when hog drowns and faces right
Wuzzy <almikes@aol.com>
parents:
12712
diff
changeset
|
322 |
bubbleX:= hwRound(Gear^.X) - Gear^.Radius |
|
5a57acce9cae
Fix bubbles drawn on the wrong side when hog drowns and faces right
Wuzzy <almikes@aol.com>
parents:
12712
diff
changeset
|
323 |
else |
|
5a57acce9cae
Fix bubbles drawn on the wrong side when hog drowns and faces right
Wuzzy <almikes@aol.com>
parents:
12712
diff
changeset
|
324 |
bubbleX:= hwRound(Gear^.X) + Gear^.Radius; |
|
5a57acce9cae
Fix bubbles drawn on the wrong side when hog drowns and faces right
Wuzzy <almikes@aol.com>
parents:
12712
diff
changeset
|
325 |
bubbleY:= hwRound(Gear^.Y) - Gear^.Radius; |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
326 |
if ((not SuddenDeathDmg and (WaterOpacity < $FF)) |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
327 |
or (SuddenDeathDmg and (SDWaterOpacity < $FF))) and ((GameTicks and $1F) = 0) then |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
328 |
if (Gear^.Kind = gtHedgehog) and (Random(4) = 0) then |
|
12714
5a57acce9cae
Fix bubbles drawn on the wrong side when hog drowns and faces right
Wuzzy <almikes@aol.com>
parents:
12712
diff
changeset
|
329 |
AddVisualGear(bubbleX, bubbleY, vgtBubble) |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
330 |
else if Random(12) = 0 then |
|
12714
5a57acce9cae
Fix bubbles drawn on the wrong side when hog drowns and faces right
Wuzzy <almikes@aol.com>
parents:
12712
diff
changeset
|
331 |
AddVisualGear(bubbleX, bubbleY, vgtBubble); |
|
13739
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
332 |
// Insta-delete gear and skip drowning animation if water is 100% opaque |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
333 |
if (not SuddenDeathDmg and (WaterOpacity > $FE)) |
|
13739
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
334 |
or (SuddenDeathDmg and (SDWaterOpacity > $FE)) then |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
335 |
begin |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
336 |
// Teleport gear to a suitable position for the damage tag in the water |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
337 |
if (WorldEdge = weSea) and (hwRound(Gear^.X) - Gear^.Radius < leftX) then |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
338 |
begin |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
339 |
if (hwRound(Gear^.X) - Gear^.Radius > leftX - 90) then |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
340 |
Gear^.X := Gear^.X - _90 |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
341 |
end |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
342 |
else if (WorldEdge = weSea) and (hwRound(Gear^.X) + Gear^.Radius > rightX) then |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
343 |
begin |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
344 |
if (hwRound(Gear^.X) - Gear^.Radius < rightX + 90) then |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
345 |
Gear^.X := Gear^.X + _90 |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
346 |
end |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
347 |
else |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
348 |
Gear^.Y := int2hwFloat(Gear^.Radius + cWaterLine + cVisibleWater); |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
349 |
DeleteGear(Gear); |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
350 |
exit; |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
351 |
end; |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
352 |
// Delete normally if gear is outside of visible range |
|
bbea77a8dff9
Fix damage not being displayed if hog drowns in water with 100% opacity (like in Compost theme)
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
353 |
if (hwRound(Gear^.Y) > Gear^.Radius + cWaterLine + cVisibleWater) then |
|
10364
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
354 |
DeleteGear(Gear); |
|
9f7be3da1245
burst drowning gears into bubbles after timeout
sheepluva
parents:
10363
diff
changeset
|
355 |
end; |
| 4 | 356 |
|
357 |
//////////////////////////////////////////////////////////////////////////////// |
|
358 |
procedure doStepFallingGear(Gear: PGear); |
|
| 8795 | 359 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
360 |
isFalling: boolean; |
| 9526 | 361 |
tX, tdX, tdY: hwFloat; |
|
9769
5814e0c47c99
Experiment in adding a "boing" graphic for bouncing. It has no text right now (was thinking l10n) and colour is fixed.
nemo
parents:
9768
diff
changeset
|
362 |
collV, collH, gX, gY: LongInt; |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
363 |
land, xland: word; |
| 4 | 364 |
begin |
| 9526 | 365 |
tX:= Gear^.X; |
|
9769
5814e0c47c99
Experiment in adding a "boing" graphic for bouncing. It has no text right now (was thinking l10n) and colour is fixed.
nemo
parents:
9768
diff
changeset
|
366 |
gX:= hwRound(Gear^.X); |
|
5814e0c47c99
Experiment in adding a "boing" graphic for bouncing. It has no text right now (was thinking l10n) and colour is fixed.
nemo
parents:
9768
diff
changeset
|
367 |
gY:= hwRound(Gear^.Y); |
|
13610
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
368 |
Gear^.State := Gear^.State and (not gstCollision); |
|
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
369 |
|
|
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
370 |
// World wrap |
|
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
371 |
if (Gear^.Kind <> gtGenericFaller) and WorldWrap(Gear) and (WorldEdge = weWrap) and |
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
372 |
((TestCollisionXwithGear(Gear, 1) <> 0) or (TestCollisionXwithGear(Gear, -1) <> 0)) then |
| 9526 | 373 |
begin |
|
13610
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
374 |
// Collision with land that *just* behind the other side of the world wrap edge |
|
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
375 |
if (not Gear^.Sticky) then |
|
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
376 |
begin |
|
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
377 |
Gear^.X:= tX; |
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
378 |
Gear^.dX.isNegative:= (gX > leftX + Gear^.Radius*2); |
|
13610
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
379 |
Gear^.dX := Gear^.dX * Gear^.Friction; |
|
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
380 |
end; |
|
f1b6070a6e14
Fix projectiles reacing incorrectly with land just behind the wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13609
diff
changeset
|
381 |
Gear^.State := Gear^.State or gstCollision; |
| 9526 | 382 |
end; |
|
9473
a51a69094c24
partial implementation of non-infinite world (edge wrap/warp/bounce)
nemo
parents:
9470
diff
changeset
|
383 |
|
| 7627 | 384 |
// clip velocity at 2 - over 1 per pixel, but really shouldn't cause many actual problems. |
|
9967
40750e72514b
keep velocity from fluttering between 2 and 3px / ms when falling...
nemo
parents:
9885
diff
changeset
|
385 |
if Gear^.dX.Round > 1 then |
| 7627 | 386 |
Gear^.dX.QWordValue:= 8589934592; |
|
9967
40750e72514b
keep velocity from fluttering between 2 and 3px / ms when falling...
nemo
parents:
9885
diff
changeset
|
387 |
if Gear^.dY.Round > 1 then |
| 7627 | 388 |
Gear^.dY.QWordValue:= 8589934592; |
|
8838
aa2ffd427f6a
strip PAS2C, old WEB symbols and outdated pas2c sources from default branch, all c-related development is done on the webgl branch
koda
parents:
8822
diff
changeset
|
389 |
|
| 10354 | 390 |
if (Gear^.State and gstSubmersible <> 0) and CheckCoordInWater(gX, gY) then |
|
8992
5b0be812dcdb
Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance
nemo
parents:
8990
diff
changeset
|
391 |
begin |
|
5b0be812dcdb
Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance
nemo
parents:
8990
diff
changeset
|
392 |
Gear^.dX:= Gear^.dX * _0_999; |
|
5b0be812dcdb
Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance
nemo
parents:
8990
diff
changeset
|
393 |
Gear^.dY:= Gear^.dY * _0_999 |
| 7627 | 394 |
end; |
|
8992
5b0be812dcdb
Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance
nemo
parents:
8990
diff
changeset
|
395 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
396 |
collV := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
397 |
collH := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
398 |
tdX := Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
399 |
tdY := Gear^.dY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
400 |
|
| 3359 | 401 |
// might need some testing/adjustments - just to avoid projectiles to fly forever (accelerated by wind/skips) |
|
9769
5814e0c47c99
Experiment in adding a "boing" graphic for bouncing. It has no text right now (was thinking l10n) and colour is fixed.
nemo
parents:
9768
diff
changeset
|
402 |
if (gX < min(LAND_WIDTH div -2, -2048)) |
|
5814e0c47c99
Experiment in adding a "boing" graphic for bouncing. It has no text right now (was thinking l10n) and colour is fixed.
nemo
parents:
9768
diff
changeset
|
403 |
or (gX > max(LAND_WIDTH * 3 div 2, 6144)) then |
|
11389
c93f204a5a00
Set gears that go off map to gmDestroy instead of collision, disable morewind for no-gravity gears, restrict application of wind to gears that are already moving and not colliding.
nemo
parents:
11342
diff
changeset
|
404 |
Gear^.Message := Gear^.Message or gmDestroy; |
| 3359 | 405 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
406 |
if Gear^.dY.isNegative then |
| 4578 | 407 |
begin |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
408 |
land:= TestCollisionYwithGear(Gear, -1); |
| 9820 | 409 |
isFalling := land = 0; |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
410 |
if land <> 0 then |
| 4578 | 411 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
412 |
collV := -1; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
413 |
if land and lfIce <> 0 then |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
414 |
Gear^.dX := Gear^.dX * (_0_9 + Gear^.Friction * _0_1) |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
415 |
else Gear^.dX := Gear^.dX * Gear^.Friction; |
|
9731
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
416 |
if (Gear^.AdvBounce = 0) or (land and lfBouncy = 0) then |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
417 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
418 |
Gear^.dY := - Gear^.dY * Gear^.Elasticity; |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
419 |
Gear^.State := Gear^.State or gstCollision |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
420 |
end |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
421 |
else Gear^.dY := - Gear^.dY * cElastic |
| 4578 | 422 |
end |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
423 |
else if Gear^.AdvBounce = 1 then |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
424 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
425 |
land:= TestCollisionYwithGear(Gear, 1); |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
426 |
if land <> 0 then collV := 1 |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
427 |
end |
| 4578 | 428 |
end |
| 8795 | 429 |
else |
| 6498 | 430 |
begin // Gear^.dY.isNegative is false |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
431 |
land:= TestCollisionYwithGear(Gear, 1); |
|
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
432 |
if land <> 0 then |
|
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
433 |
begin |
|
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
434 |
collV := 1; |
|
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
435 |
isFalling := false; |
| 8795 | 436 |
if land and lfIce <> 0 then |
| 6498 | 437 |
Gear^.dX := Gear^.dX * (_0_9 + Gear^.Friction * _0_1) |
| 8795 | 438 |
else |
| 6498 | 439 |
Gear^.dX := Gear^.dX * Gear^.Friction; |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
440 |
|
|
9731
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
441 |
if (Gear^.AdvBounce = 0) or (land and lfBouncy = 0) then |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
442 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
443 |
Gear^.dY := - Gear^.dY * Gear^.Elasticity; |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
444 |
Gear^.State := Gear^.State or gstCollision |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
445 |
end |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
446 |
else Gear^.dY := - Gear^.dY * cElastic |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
447 |
end |
|
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
448 |
else |
|
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
449 |
begin |
|
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
450 |
isFalling := true; |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
451 |
if Gear^.AdvBounce = 1 then |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
452 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
453 |
land:= TestCollisionYwithGear(Gear, -1); |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
454 |
if land <> 0 then collV := -1 |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
455 |
end |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
456 |
end |
| 4578 | 457 |
end; |
| 503 | 458 |
|
|
2989
b49d87499398
Add back sheepluva's 45° patch for some weapons. Rescale Tiy's latest icons to his specifications.
nemo
parents:
2983
diff
changeset
|
459 |
|
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
460 |
xland:= TestCollisionXwithGear(Gear, hwSign(Gear^.dX)); |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
461 |
if xland <> 0 then |
| 4578 | 462 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
463 |
collH := hwSign(Gear^.dX); |
|
9731
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
464 |
if (Gear^.AdvBounce = 0) or (xland and lfBouncy = 0) then |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
465 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
466 |
Gear^.dX := - Gear^.dX * Gear^.Elasticity; |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
467 |
Gear^.dY := Gear^.dY * Gear^.Elasticity; |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
468 |
Gear^.State := Gear^.State or gstCollision |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
469 |
end |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
470 |
else |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
471 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
472 |
Gear^.dX := - Gear^.dX * cElastic; |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
473 |
Gear^.dY := Gear^.dY * cElastic |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
474 |
end |
| 4578 | 475 |
end |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
476 |
else if Gear^.AdvBounce = 1 then |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
477 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
478 |
xland:= TestCollisionXwithGear(Gear, -hwSign(Gear^.dX)); |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
479 |
if xland <> 0 then collH := -hwSign(Gear^.dX) |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
480 |
end; |
| 10015 | 481 |
if (collV <> 0) and (collH <> 0) and |
|
9731
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
482 |
(((Gear^.AdvBounce=1) and ((collV=-1) or ((tdX.QWordValue + tdY.QWordValue) > _0_2.QWordValue)))) then |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
483 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
484 |
if (xland or land) and lfBouncy = 0 then |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
485 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
486 |
Gear^.dX := tdY*Gear^.Elasticity*Gear^.Friction; |
| 9767 | 487 |
Gear^.dY := tdX*Gear^.Elasticity; |
488 |
Gear^.State := Gear^.State or gstCollision |
|
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
489 |
end |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
490 |
else |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
491 |
begin |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
492 |
Gear^.dX := tdY*cElastic*Gear^.Friction; |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
493 |
Gear^.dY := tdX*cElastic |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
494 |
end; |
|
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
495 |
|
|
10895
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
496 |
Gear^.dX.isNegative:= tdX.isNegative; |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
497 |
Gear^.dY.isNegative:= tdY.isNegative; |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
498 |
if (collV > 0) and (collH > 0) and (not tdX.isNegative) and (not tdY.isNegative) then |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
499 |
begin |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
500 |
Gear^.dX.isNegative := true; |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
501 |
Gear^.dY.isNegative := true |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
502 |
end |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
503 |
else if (collV > 0) and (collH < 0) and (tdX.isNegative or tdY.isNegative) then |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
504 |
begin |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
505 |
Gear^.dY.isNegative := not tdY.isNegative; |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
506 |
if not tdY.isNegative then Gear^.dX.isNegative := false |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
507 |
end |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
508 |
else if (collV < 0) and (collH > 0) and (not tdX.isNegative) then |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
509 |
begin |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
510 |
Gear^.dX.isNegative := true; |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
511 |
Gear^.dY.isNegative := false |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
512 |
end |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
513 |
else if (collV < 0) and (collH < 0) and tdX.isNegative and tdY.isNegative then |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
514 |
Gear^.dX.isNegative := false; |
|
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
515 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
516 |
isFalling := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
517 |
Gear^.AdvBounce := 10; |
| 4578 | 518 |
end; |
| 503 | 519 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
520 |
if Gear^.AdvBounce > 1 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
521 |
dec(Gear^.AdvBounce); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
522 |
|
|
11389
c93f204a5a00
Set gears that go off map to gmDestroy instead of collision, disable morewind for no-gravity gears, restrict application of wind to gears that are already moving and not colliding.
nemo
parents:
11342
diff
changeset
|
523 |
if isFalling and (Gear^.State and gstNoGravity = 0) then |
|
c93f204a5a00
Set gears that go off map to gmDestroy instead of collision, disable morewind for no-gravity gears, restrict application of wind to gears that are already moving and not colliding.
nemo
parents:
11342
diff
changeset
|
524 |
begin |
|
c93f204a5a00
Set gears that go off map to gmDestroy instead of collision, disable morewind for no-gravity gears, restrict application of wind to gears that are already moving and not colliding.
nemo
parents:
11342
diff
changeset
|
525 |
Gear^.dY := Gear^.dY + cGravity; |
|
12693
2592c6ea6008
wind blowing around mines off-turn was too annoying.
nemo
parents:
12692
diff
changeset
|
526 |
if (GameFlags and gfMoreWind <> 0) and (TurnTimeLeft > 0) and |
|
11389
c93f204a5a00
Set gears that go off map to gmDestroy instead of collision, disable morewind for no-gravity gears, restrict application of wind to gears that are already moving and not colliding.
nemo
parents:
11342
diff
changeset
|
527 |
((xland or land) = 0) and |
|
c93f204a5a00
Set gears that go off map to gmDestroy instead of collision, disable morewind for no-gravity gears, restrict application of wind to gears that are already moving and not colliding.
nemo
parents:
11342
diff
changeset
|
528 |
((Gear^.dX.QWordValue + Gear^.dY.QWordValue) > _0_02.QWordValue) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
529 |
Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density |
| 9820 | 530 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
531 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
532 |
Gear^.X := Gear^.X + Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
533 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
9479
167dea42d7d7
move border back a bit from left/right bounds, bee tweak
nemo
parents:
9477
diff
changeset
|
534 |
CheckGearDrowning(Gear); |
| 6498 | 535 |
if (not isFalling) and ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_02.QWordValue) then |
| 6450 | 536 |
Gear^.State := Gear^.State and (not gstMoving) |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
537 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
538 |
Gear^.State := Gear^.State or gstMoving; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
539 |
|
|
9731
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
540 |
if ((xland or land) and lfBouncy <> 0) and (Gear^.dX.QWordValue < _0_15.QWordValue) and (Gear^.dY.QWordValue < _0_15.QWordValue) then |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
541 |
Gear^.State := Gear^.State or gstCollision; |
| 10015 | 542 |
|
|
14595
6e5cda26f676
Tweak bounce effects of some gears
Wuzzy <Wuzzy2@mail.ru>
parents:
14593
diff
changeset
|
543 |
if ((xland or land) and lfBouncy <> 0) and |
|
9769
5814e0c47c99
Experiment in adding a "boing" graphic for bouncing. It has no text right now (was thinking l10n) and colour is fixed.
nemo
parents:
9768
diff
changeset
|
544 |
((Gear^.dX.QWordValue > _0_15.QWordValue) or (Gear^.dY.QWordValue > _0_15.QWordValue)) then |
|
5814e0c47c99
Experiment in adding a "boing" graphic for bouncing. It has no text right now (was thinking l10n) and colour is fixed.
nemo
parents:
9768
diff
changeset
|
545 |
begin |
| 10508 | 546 |
AddBounceEffectForGear(Gear); |
|
9769
5814e0c47c99
Experiment in adding a "boing" graphic for bouncing. It has no text right now (was thinking l10n) and colour is fixed.
nemo
parents:
9768
diff
changeset
|
547 |
end |
|
9721
1833dadcebf0
Initial pass at bounciness. To try it out, or lfBouncy on girder in uLandGraphics (search for the word graphically)
nemo
parents:
9706
diff
changeset
|
548 |
else if (Gear^.nImpactSounds > 0) and |
| 7777 | 549 |
(Gear^.State and gstCollision <> 0) and |
550 |
(((Gear^.Kind <> gtMine) and (Gear^.Damage <> 0)) or (Gear^.State and gstMoving <> 0)) and |
|
551 |
(((Gear^.Radius < 3) and (Gear^.dY < -_0_1)) or |
|
| 8795 | 552 |
((Gear^.Radius >= 3) and |
| 7777 | 553 |
((Gear^.dX.QWordValue > _0_1.QWordValue) or (Gear^.dY.QWordValue > _0_1.QWordValue)))) then |
| 5461 | 554 |
PlaySound(TSound(ord(Gear^.ImpactSound) + LongInt(GetRandom(Gear^.nImpactSounds))), true); |
| 4 | 555 |
end; |
556 |
||
557 |
//////////////////////////////////////////////////////////////////////////////// |
|
558 |
procedure doStepBomb(Gear: PGear); |
|
| 8795 | 559 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
560 |
i, x, y: LongInt; |
|
8413
454191defee6
restore former cluster behaviour (makes the most diff for the bomb)
nemo
parents:
8370
diff
changeset
|
561 |
dX, dY, gdX: hwFloat; |
| 3475 | 562 |
vg: PVisualGear; |
| 4 | 563 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
564 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
565 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
566 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
567 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
568 |
dec(Gear^.Timer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
569 |
if Gear^.Timer = 1000 then // might need adjustments |
| 8795 | 570 |
case Gear^.Kind of |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
571 |
gtGrenade, |
|
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
572 |
gtClusterBomb, |
|
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
573 |
gtWatermelon, |
|
14032
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
574 |
gtHellishBomb: makeHogsWorry(Gear^.X, Gear^.Y, Gear^.Boom, Gear^.Kind); |
|
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
575 |
gtGasBomb: makeHogsWorry(Gear^.X, Gear^.Y, 50, Gear^.Kind); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
576 |
end; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
577 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
578 |
if (Gear^.Kind = gtBall) and ((Gear^.State and gstTmpFlag) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
579 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
580 |
CheckCollision(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
581 |
if (Gear^.State and gstCollision) <> 0 then |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
582 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLDontDraw or EXPLNoGfx); |
|
7726
1137406bce12
Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420
nemo
parents:
7721
diff
changeset
|
583 |
end; |
| 3004 | 584 |
|
| 3475 | 585 |
if (Gear^.Kind = gtGasBomb) and ((GameTicks mod 200) = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
586 |
begin |
| 3475 | 587 |
vg:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeWhite); |
588 |
if vg <> nil then |
|
589 |
vg^.Tint:= $FFC0C000; |
|
|
7726
1137406bce12
Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420
nemo
parents:
7721
diff
changeset
|
590 |
end; |
| 3475 | 591 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
592 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
593 |
begin |
| 8795 | 594 |
case Gear^.Kind of |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
595 |
gtGrenade: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
596 |
gtBall: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
| 8795 | 597 |
gtClusterBomb: |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
598 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
599 |
x := hwRound(Gear^.X); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
600 |
y := hwRound(Gear^.Y); |
|
8413
454191defee6
restore former cluster behaviour (makes the most diff for the bomb)
nemo
parents:
8370
diff
changeset
|
601 |
gdX:= Gear^.dX; |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
602 |
doMakeExplosion(x, y, Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
603 |
for i:= 0 to 4 do |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
604 |
begin |
|
8413
454191defee6
restore former cluster behaviour (makes the most diff for the bomb)
nemo
parents:
8370
diff
changeset
|
605 |
dX := rndSign(GetRandomf * _0_1) + gdX / 5; |
| 7001 | 606 |
dY := (GetRandomf - _3) * _0_08; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
607 |
FollowGear := AddGear(x, y, gtCluster, 0, dX, dY, 25) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
608 |
end |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
609 |
end; |
| 8795 | 610 |
gtWatermelon: |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
611 |
begin |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
612 |
x := hwRound(Gear^.X); |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
613 |
y := hwRound(Gear^.Y); |
|
8413
454191defee6
restore former cluster behaviour (makes the most diff for the bomb)
nemo
parents:
8370
diff
changeset
|
614 |
gdX:= Gear^.dX; |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
615 |
doMakeExplosion(x, y, Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
616 |
for i:= 0 to 5 do |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
617 |
begin |
|
8413
454191defee6
restore former cluster behaviour (makes the most diff for the bomb)
nemo
parents:
8370
diff
changeset
|
618 |
dX := rndSign(GetRandomf * _0_1) + gdX / 5; |
| 7001 | 619 |
dY := (GetRandomf - _1_5) * _0_3; |
| 6120 | 620 |
FollowGear:= AddGear(x, y, gtMelonPiece, 0, dX, dY, 75); |
621 |
FollowGear^.DirAngle := i * 60 |
|
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
622 |
end |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
623 |
end; |
| 8795 | 624 |
gtHellishBomb: |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
625 |
begin |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
626 |
x := hwRound(Gear^.X); |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
627 |
y := hwRound(Gear^.Y); |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
628 |
doMakeExplosion(x, y, Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
629 |
|
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
630 |
for i:= 0 to 127 do |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
631 |
begin |
| 7001 | 632 |
dX := AngleCos(i * 16) * _0_5 * (GetRandomf + _1); |
633 |
dY := AngleSin(i * 16) * _0_5 * (GetRandomf + _1); |
|
| 6131 | 634 |
if i mod 2 = 0 then |
|
6126
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
635 |
begin |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
636 |
AddGear(x, y, gtFlame, gstTmpFlag, dX, dY, 0); |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
637 |
AddGear(x, y, gtFlame, 0, dX, -dY, 0) |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
638 |
end |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
639 |
else |
| 8795 | 640 |
begin |
|
6126
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
641 |
AddGear(x, y, gtFlame, 0, dX, dY, 0); |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
642 |
AddGear(x, y, gtFlame, gstTmpFlag, dX, -dY, 0) |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
643 |
end; |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
644 |
end |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
645 |
end; |
| 3712 | 646 |
gtGasBomb: |
647 |
begin |
|
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
648 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
| 3712 | 649 |
for i:= 0 to 2 do |
|
4160
043c17a8b3ca
Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable.
unc0rr
parents:
4155
diff
changeset
|
650 |
begin |
|
043c17a8b3ca
Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable.
unc0rr
parents:
4155
diff
changeset
|
651 |
x:= GetRandom(60); |
|
043c17a8b3ca
Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable.
unc0rr
parents:
4155
diff
changeset
|
652 |
y:= GetRandom(40); |
| 6120 | 653 |
FollowGear:= AddGear(hwRound(Gear^.X) - 30 + x, hwRound(Gear^.Y) - 20 + y, gtPoisonCloud, 0, _0, _0, 0); |
|
4160
043c17a8b3ca
Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable.
unc0rr
parents:
4155
diff
changeset
|
654 |
end |
| 3712 | 655 |
end; |
|
7726
1137406bce12
Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420
nemo
parents:
7721
diff
changeset
|
656 |
end; |
|
1137406bce12
Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420
nemo
parents:
7721
diff
changeset
|
657 |
DeleteGear(Gear); |
|
1137406bce12
Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420
nemo
parents:
7721
diff
changeset
|
658 |
exit |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
659 |
end; |
| 6498 | 660 |
|
661 |
CalcRotationDirAngle(Gear); |
|
662 |
||
663 |
if Gear^.Kind = gtHellishBomb then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
664 |
begin |
| 6498 | 665 |
|
666 |
if Gear^.Timer = 3000 then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
667 |
begin |
| 6498 | 668 |
Gear^.nImpactSounds := 0; |
669 |
PlaySound(sndHellish); |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
670 |
end; |
| 6498 | 671 |
|
672 |
if (GameTicks and $3F) = 0 then |
|
673 |
if (Gear^.State and gstCollision) = 0 then |
|
674 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEvilTrace); |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
675 |
end; |
| 4 | 676 |
end; |
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
677 |
|
|
2457
ecf0c7e7995b
Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets
nemo
parents:
2455
diff
changeset
|
678 |
//////////////////////////////////////////////////////////////////////////////// |
|
ecf0c7e7995b
Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets
nemo
parents:
2455
diff
changeset
|
679 |
procedure doStepMolotov(Gear: PGear); |
| 8795 | 680 |
var |
| 6472 | 681 |
s: Longword; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
682 |
i, gX, gY: LongInt; |
|
2457
ecf0c7e7995b
Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets
nemo
parents:
2455
diff
changeset
|
683 |
dX, dY: hwFloat; |
|
5874
5cd329cf2460
nemo's molotov burst effect; with a slight color modification added
sheepluva
parents:
5873
diff
changeset
|
684 |
smoke, glass: PVisualGear; |
|
2457
ecf0c7e7995b
Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets
nemo
parents:
2455
diff
changeset
|
685 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
686 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
687 |
|
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
688 |
doStepFallingGear(Gear); |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
689 |
CalcRotationDirAngle(Gear); |
|
2457
ecf0c7e7995b
Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets
nemo
parents:
2455
diff
changeset
|
690 |
|
| 5870 | 691 |
// let's add some smoke depending on speed |
|
8906
82756a90a343
I see no reason why a visual effect needs Distance. IMO square should look just fine. Untested. Oh. Also reduced flake count at Randi's request.
nemo
parents:
8838
diff
changeset
|
692 |
s:= max(32,152 - round((abs(hwFloat2FLoat(Gear^.dX))+abs(hwFloat2Float(Gear^.dY)))*120))+random(10); |
|
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
6002
diff
changeset
|
693 |
if (GameTicks mod s) = 0 then |
|
5871
09daa06191d7
Since we are tweaking molotov. make the flame flickery and add a drowning frame
nemo
parents:
5870
diff
changeset
|
694 |
begin |
| 5873 | 695 |
// adjust angle to match the texture |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
696 |
if Gear^.dX.isNegative then |
|
8906
82756a90a343
I see no reason why a visual effect needs Distance. IMO square should look just fine. Untested. Oh. Also reduced flake count at Randi's request.
nemo
parents:
8838
diff
changeset
|
697 |
i:= 130 |
|
82756a90a343
I see no reason why a visual effect needs Distance. IMO square should look just fine. Untested. Oh. Also reduced flake count at Randi's request.
nemo
parents:
8838
diff
changeset
|
698 |
else i:= 50; |
| 8795 | 699 |
|
| 5873 | 700 |
smoke:= AddVisualGear(hwRound(Gear^.X)-round(cos((Gear^.DirAngle+i) * pi / 180)*20), hwRound(Gear^.Y)-round(sin((Gear^.DirAngle+i) * pi / 180)*20), vgtSmoke); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
701 |
if smoke <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
702 |
smoke^.Scale:= 0.75; |
|
5871
09daa06191d7
Since we are tweaking molotov. make the flame flickery and add a drowning frame
nemo
parents:
5870
diff
changeset
|
703 |
end; |
| 5870 | 704 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
705 |
if (Gear^.State and gstCollision) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
706 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
707 |
PlaySound(sndMolotov); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
708 |
gX := hwRound(Gear^.X); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
709 |
gY := hwRound(Gear^.Y); |
|
5924
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
710 |
for i:= 0 to 4 do |
|
5874
5cd329cf2460
nemo's molotov burst effect; with a slight color modification added
sheepluva
parents:
5873
diff
changeset
|
711 |
begin |
| 15072 | 712 |
glass:= AddVisualGear(gx+random(7)-3, gy+random(7)-3, vgtEgg); |
| 6131 | 713 |
if glass <> nil then |
|
5924
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
714 |
with glass^ do |
|
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
715 |
begin |
|
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
716 |
Frame:= 2; |
|
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
717 |
Tint:= $41B83ED0 - i * $10081000; |
| 15072 | 718 |
dX:= dX + hwFloat2Float(Gear^.dX) / 2; |
|
7066
12cc2bd84b0b
Make pas2c even more happier with uGears.c, allow assigning arrays in some cases
unc0rr
parents:
7062
diff
changeset
|
719 |
Angle:= random(360); |
|
5924
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
720 |
FrameTicks:= 750; |
|
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
721 |
State:= ord(sprEgg) |
|
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
722 |
end; |
|
5874
5cd329cf2460
nemo's molotov burst effect; with a slight color modification added
sheepluva
parents:
5873
diff
changeset
|
723 |
end; |
|
5415
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
724 |
for i:= 0 to 24 do |
|
6126
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
725 |
begin |
| 7001 | 726 |
dX := AngleCos(i * 2) * ((_0_15*(i div 5))) * (GetRandomf + _1); |
727 |
dY := AngleSin(i * 8) * _0_5 * (GetRandomf + _1); |
|
|
6126
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
728 |
AddGear(gX, gY, gtFlame, gstTmpFlag, dX, dY, 0); |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
729 |
AddGear(gX, gY, gtFlame, gstTmpFlag, dX,-dY, 0); |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
730 |
AddGear(gX, gY, gtFlame, gstTmpFlag,-dX, dY, 0); |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
731 |
AddGear(gX, gY, gtFlame, gstTmpFlag,-dX,-dY, 0); |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
732 |
end; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
733 |
DeleteGear(Gear); |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
734 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
735 |
end; |
|
2457
ecf0c7e7995b
Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets
nemo
parents:
2455
diff
changeset
|
736 |
end; |
| 4 | 737 |
|
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
738 |
//////////////////////////////////////////////////////////////////////////////// |
| 1279 | 739 |
|
| 78 | 740 |
procedure doStepCluster(Gear: PGear); |
741 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
742 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
743 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
744 |
if (Gear^.State and gstCollision) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
745 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
746 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
747 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
748 |
exit |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
749 |
end; |
| 1262 | 750 |
|
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
751 |
if (Gear^.Kind = gtMelonPiece) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
752 |
CalcRotationDirAngle(Gear) |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
753 |
else if (GameTicks and $1F) = 0 then |
| 10352 | 754 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace); |
| 78 | 755 |
end; |
756 |
||
| 4 | 757 |
//////////////////////////////////////////////////////////////////////////////// |
| 4168 | 758 |
procedure doStepShell(Gear: PGear); |
| 4 | 759 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
760 |
AllInactive := false; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
761 |
if (GameFlags and gfMoreWind) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
762 |
Gear^.dX := Gear^.dX + cWindSpeed; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
763 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
764 |
if (Gear^.State and gstCollision) <> 0 then |
| 4578 | 765 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
766 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
767 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
768 |
exit |
| 4578 | 769 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
770 |
if (GameTicks and $3F) = 0 then |
| 10352 | 771 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace); |
| 95 | 772 |
end; |
773 |
||
| 4 | 774 |
//////////////////////////////////////////////////////////////////////////////// |
| 4578 | 775 |
procedure doStepSnowball(Gear: PGear); |
776 |
var kick, i: LongInt; |
|
777 |
particle: PVisualGear; |
|
|
8945
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
778 |
gdX, gdY: hwFloat; |
| 4578 | 779 |
begin |
780 |
AllInactive := false; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
781 |
if (GameFlags and gfMoreWind) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
782 |
Gear^.dX := Gear^.dX + cWindSpeed; |
|
8945
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
783 |
gdX := Gear^.dX; |
|
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
784 |
gdY := Gear^.dY; |
| 4578 | 785 |
doStepFallingGear(Gear); |
786 |
CalcRotationDirAngle(Gear); |
|
787 |
if (Gear^.State and gstCollision) <> 0 then |
|
788 |
begin |
|
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
789 |
kick:= hwRound((hwAbs(gdX)+hwAbs(gdY)) * Gear^.Boom / 10000); |
|
8945
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
790 |
Gear^.dX:= gdX; |
|
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
791 |
Gear^.dY:= gdY; |
| 7621 | 792 |
AmmoShove(Gear, 0, kick); |
| 4578 | 793 |
for i:= 15 + kick div 10 downto 0 do |
794 |
begin |
|
795 |
particle := AddVisualGear(hwRound(Gear^.X) + Random(25), hwRound(Gear^.Y) + Random(25), vgtDust); |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
796 |
if particle <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
797 |
particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480) |
| 4578 | 798 |
end; |
799 |
DeleteGear(Gear); |
|
800 |
exit |
|
801 |
end; |
|
802 |
if ((GameTicks and $1F) = 0) and (Random(3) = 0) then |
|
803 |
begin |
|
| 4582 | 804 |
particle:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
805 |
if particle <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
806 |
particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480) |
| 4578 | 807 |
end |
808 |
end; |
|
809 |
||
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
810 |
//////////////////////////////////////////////////////////////////////////////// |
| 4611 | 811 |
procedure doStepSnowflake(Gear: PGear); |
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
812 |
var xx, yy, px, py, rx, ry, lx, ly: LongInt; |
|
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
813 |
move, draw, allpx, gun: Boolean; |
| 4611 | 814 |
s: PSDL_Surface; |
815 |
p: PLongwordArray; |
|
| 5693 | 816 |
lf: LongWord; |
| 4611 | 817 |
begin |
| 5695 | 818 |
inc(Gear^.Pos); |
|
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
819 |
gun:= (Gear^.State and gstTmpFlag) <> 0; |
| 5024 | 820 |
move:= false; |
821 |
draw:= false; |
|
|
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
822 |
if gun then |
| 5024 | 823 |
begin |
| 6450 | 824 |
Gear^.State:= Gear^.State and (not gstInvisible); |
| 5024 | 825 |
doStepFallingGear(Gear); |
826 |
CheckCollision(Gear); |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
827 |
if ((Gear^.State and gstCollision) <> 0) or ((Gear^.State and gstMoving) = 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
828 |
draw:= true; |
| 5024 | 829 |
xx:= hwRound(Gear^.X); |
830 |
yy:= hwRound(Gear^.Y); |
|
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
831 |
if draw and (WorldEdge = weWrap) and ((xx < leftX + 3) or (xx > rightX - 3)) then |
|
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
832 |
begin |
|
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
833 |
if xx < leftX + 3 then |
| 9563 | 834 |
xx:= rightX-3 |
835 |
else xx:= leftX+3; |
|
836 |
Gear^.X:= int2hwFloat(xx) |
|
837 |
end |
|
| 5024 | 838 |
end |
839 |
else if GameTicks and $7 = 0 then |
|
| 4611 | 840 |
begin |
841 |
with Gear^ do |
|
842 |
begin |
|
| 6450 | 843 |
State:= State and (not gstInvisible); |
| 5355 | 844 |
X:= X + cWindSpeed * 3200 + dX; |
| 4611 | 845 |
Y:= Y + dY + cGravity * vobFallSpeed * 8; // using same value as flakes to try and get similar results |
846 |
xx:= hwRound(X); |
|
847 |
yy:= hwRound(Y); |
|
848 |
if vobVelocity <> 0 then |
|
849 |
begin |
|
| 7649 | 850 |
DirAngle := DirAngle + (Damage / 1000); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
851 |
if DirAngle < 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
852 |
DirAngle := DirAngle + 360 |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
853 |
else if 360 < DirAngle then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
854 |
DirAngle := DirAngle - 360; |
| 4611 | 855 |
end; |
856 |
// move back to cloud layer |
|
| 10354 | 857 |
if CheckCoordInWater(xx, yy) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
858 |
move:= true |
|
7477
26706bf32ecf
First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents:
7468
diff
changeset
|
859 |
else if (xx > snowRight) or (xx < snowLeft) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
860 |
move:=true |
|
10736
5b7cf9fcb47e
Try to handle negative gravity w/ snow. Still needs to look nicer. Currently causes banding.
nemo
parents:
10679
diff
changeset
|
861 |
else if (cGravity < _0) and (yy < LAND_HEIGHT-1200) then |
|
5b7cf9fcb47e
Try to handle negative gravity w/ snow. Still needs to look nicer. Currently causes banding.
nemo
parents:
10679
diff
changeset
|
862 |
move:=true |
| 4791 | 863 |
// Solid pixel encountered |
|
7477
26706bf32ecf
First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents:
7468
diff
changeset
|
864 |
else if ((yy and LAND_HEIGHT_MASK) = 0) and ((xx and LAND_WIDTH_MASK) = 0) and (Land[yy, xx] <> 0) then |
| 4611 | 865 |
begin |
|
7128
574b385ce7df
Minor freezer changes, allow snow to accumulate on indestructible terrain too.
nemo
parents:
7101
diff
changeset
|
866 |
lf:= Land[yy, xx] and (lfObject or lfBasic or lfIndestructible); |
| 8602 | 867 |
if lf = 0 then lf:= lfObject; |
| 4791 | 868 |
// If there's room below keep falling |
869 |
if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (Land[yy-1, xx] = 0) then |
|
870 |
begin |
|
871 |
X:= X - cWindSpeed * 1600 - dX; |
|
872 |
end |
|
873 |
// If there's room below, on the sides, fill the gaps |
|
874 |
else if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (((xx-(1*hwSign(cWindSpeed))) and LAND_WIDTH_MASK) = 0) and (Land[yy-1, (xx-(1*hwSign(cWindSpeed)))] = 0) then |
|
875 |
begin |
|
876 |
X:= X - _0_8 * hwSign(cWindSpeed); |
|
877 |
Y:= Y - dY - cGravity * vobFallSpeed * 8; |
|
878 |
end |
|
879 |
else if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (((xx-(2*hwSign(cWindSpeed))) and LAND_WIDTH_MASK) = 0) and (Land[yy-1, (xx-(2*hwSign(cWindSpeed)))] = 0) then |
|
880 |
begin |
|
881 |
X:= X - _0_8 * 2 * hwSign(cWindSpeed); |
|
882 |
Y:= Y - dY - cGravity * vobFallSpeed * 8; |
|
883 |
end |
|
884 |
else if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (((xx+(1*hwSign(cWindSpeed))) and LAND_WIDTH_MASK) = 0) and (Land[yy-1, (xx+(1*hwSign(cWindSpeed)))] = 0) then |
|
885 |
begin |
|
886 |
X:= X + _0_8 * hwSign(cWindSpeed); |
|
887 |
Y:= Y - dY - cGravity * vobFallSpeed * 8; |
|
888 |
end |
|
889 |
else if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (((xx+(2*hwSign(cWindSpeed))) and LAND_WIDTH_MASK) = 0) and (Land[yy-1, (xx+(2*hwSign(cWindSpeed)))] = 0) then |
|
890 |
begin |
|
891 |
X:= X + _0_8 * 2 * hwSign(cWindSpeed); |
|
892 |
Y:= Y - dY - cGravity * vobFallSpeed * 8; |
|
893 |
end |
|
|
4805
01332828b568
Fancier detection of hogs/objects. Hogs wont get buried even by the worst of storms.
Palewolf
parents:
4803
diff
changeset
|
894 |
// if there's an hog/object below do nothing |
|
01332828b568
Fancier detection of hogs/objects. Hogs wont get buried even by the worst of storms.
Palewolf
parents:
4803
diff
changeset
|
895 |
else if ((((yy+1) and LAND_HEIGHT_MASK) = 0) and ((Land[yy+1, xx] and $FF) <> 0)) |
|
01332828b568
Fancier detection of hogs/objects. Hogs wont get buried even by the worst of storms.
Palewolf
parents:
4803
diff
changeset
|
896 |
then move:=true |
| 5024 | 897 |
else draw:= true |
898 |
end |
|
899 |
end |
|
900 |
end; |
|
| 6131 | 901 |
if draw then |
| 5024 | 902 |
with Gear^ do |
903 |
begin |
|
904 |
// we've collided with land. draw some stuff and get back into the clouds |
|
905 |
move:= true; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
906 |
if (Pos > 20) and ((CurAmmoGear = nil) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
907 |
or (CurAmmoGear^.Kind <> gtRope)) then |
| 5024 | 908 |
begin |
909 |
////////////////////////////////// TODO - ASK UNC0RR FOR A GOOD HOME FOR THIS //////////////////////////////////// |
|
|
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
910 |
if not gun then |
| 5024 | 911 |
begin |
912 |
dec(yy,3); |
|
913 |
dec(xx,1) |
|
914 |
end; |
|
915 |
s:= SpritesData[sprSnow].Surface; |
|
916 |
p:= s^.pixels; |
|
917 |
allpx:= true; |
|
918 |
for py:= 0 to Pred(s^.h) do |
|
919 |
begin |
|
920 |
for px:= 0 to Pred(s^.w) do |
|
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
921 |
begin |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
922 |
lx:=xx + px; ly:=yy + py; |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
923 |
if (ly and LAND_HEIGHT_MASK = 0) and (lx and LAND_WIDTH_MASK = 0) and (Land[ly, lx] and $FF = 0) then |
| 5024 | 924 |
begin |
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
925 |
rx:= lx; |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
926 |
ry:= ly; |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
927 |
if cReducedQuality and rqBlurryLand <> 0 then |
|
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
928 |
begin |
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
929 |
rx:= rx div 2;ry:= ry div 2; |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
930 |
end; |
|
8751
4609823efc94
More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places.
nemo
parents:
8744
diff
changeset
|
931 |
if Land[yy + py, xx + px] <= lfAllObjMask then |
|
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
932 |
if gun then |
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
933 |
begin |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
934 |
LandDirty[yy div 32, xx div 32]:= 1; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
935 |
if LandPixels[ry, rx] = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
936 |
Land[ly, lx]:= lfDamaged or lfObject |
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
937 |
else Land[ly, lx]:= lfDamaged or lfBasic |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
938 |
end |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
939 |
else Land[ly, lx]:= lf; |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
940 |
if gun then |
|
10645
b8c73bacb31e
Fix in-flight colouring of land spray, make it use tint when added to land too (lua might find that handy), tweak climbhome cake delay slightly
nemo
parents:
10642
diff
changeset
|
941 |
LandPixels[ry, rx]:= (Gear^.Tint shr 24 shl RShift) or |
|
b8c73bacb31e
Fix in-flight colouring of land spray, make it use tint when added to land too (lua might find that handy), tweak climbhome cake delay slightly
nemo
parents:
10642
diff
changeset
|
942 |
(Gear^.Tint shr 16 and $FF shl GShift) or |
|
b8c73bacb31e
Fix in-flight colouring of land spray, make it use tint when added to land too (lua might find that handy), tweak climbhome cake delay slightly
nemo
parents:
10642
diff
changeset
|
943 |
(Gear^.Tint shr 8 and $FF shl BShift) or |
|
b8c73bacb31e
Fix in-flight colouring of land spray, make it use tint when added to land too (lua might find that handy), tweak climbhome cake delay slightly
nemo
parents:
10642
diff
changeset
|
944 |
(p^[px] and AMask) |
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
945 |
else LandPixels[ry, rx]:= addBgColor(LandPixels[ry, rx], p^[px]); |
| 5024 | 946 |
end |
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
947 |
else allpx:= false |
|
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
948 |
end; |
|
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10125
diff
changeset
|
949 |
p:= PLongWordArray(@(p^[s^.pitch shr 2])) |
| 5024 | 950 |
end; |
| 8795 | 951 |
|
952 |
// Why is this here. For one thing, there's no test on +1 being safe. |
|
|
6419
6a464d0a5c13
Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually.
nemo
parents:
6389
diff
changeset
|
953 |
//Land[py, px+1]:= lfBasic; |
| 8795 | 954 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
955 |
if allpx then |
|
7170
84ac6c6d2d8e
Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents:
7168
diff
changeset
|
956 |
UpdateLandTexture(xx, Pred(s^.h), yy, Pred(s^.w), true) |
| 4791 | 957 |
else |
| 4611 | 958 |
begin |
| 5024 | 959 |
UpdateLandTexture( |
960 |
max(0, min(LAND_WIDTH, xx)), |
|
961 |
min(LAND_WIDTH - xx, Pred(s^.w)), |
|
962 |
max(0, min(LAND_WIDTH, yy)), |
|
|
7170
84ac6c6d2d8e
Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents:
7168
diff
changeset
|
963 |
min(LAND_HEIGHT - yy, Pred(s^.h)), false // could this be true without unnecessarily creating blanks? |
| 5024 | 964 |
); |
| 4791 | 965 |
end; |
| 5024 | 966 |
////////////////////////////////// TODO - ASK UNC0RR FOR A GOOD HOME FOR THIS //////////////////////////////////// |
| 4611 | 967 |
end |
| 5024 | 968 |
end; |
969 |
||
970 |
if move then |
|
971 |
begin |
|
|
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
972 |
if gun then |
| 5024 | 973 |
begin |
974 |
DeleteGear(Gear); |
|
975 |
exit |
|
976 |
end; |
|
| 5695 | 977 |
Gear^.Pos:= 0; |
| 7721 | 978 |
Gear^.X:= int2hwFloat(LongInt(GetRandom(snowRight - snowLeft)) + snowLeft); |
|
10736
5b7cf9fcb47e
Try to handle negative gravity w/ snow. Still needs to look nicer. Currently causes banding.
nemo
parents:
10679
diff
changeset
|
979 |
if (cGravity < _0) and (yy < LAND_HEIGHT-1200) then |
|
5b7cf9fcb47e
Try to handle negative gravity w/ snow. Still needs to look nicer. Currently causes banding.
nemo
parents:
10679
diff
changeset
|
980 |
Gear^.Y:= int2hwFloat(LAND_HEIGHT - 50 - LongInt(GetRandom(50))) |
|
5b7cf9fcb47e
Try to handle negative gravity w/ snow. Still needs to look nicer. Currently causes banding.
nemo
parents:
10679
diff
changeset
|
981 |
else Gear^.Y:= int2hwFloat(LAND_HEIGHT + LongInt(GetRandom(50)) - 1250); |
| 5413 | 982 |
Gear^.State:= Gear^.State or gstInvisible; |
| 4611 | 983 |
end |
984 |
end; |
|
985 |
||
| 4578 | 986 |
//////////////////////////////////////////////////////////////////////////////// |
| 4 | 987 |
procedure doStepGrave(Gear: PGear); |
988 |
begin |
|
| 7394 | 989 |
if (Gear^.Message and gmDestroy) <> 0 then |
|
7393
3f203c62353b
Fix bug in resurrector deleting graves (exists in stable too), remove some unnecessary assignments due to the fillchar 0
nemo
parents:
7391
diff
changeset
|
990 |
begin |
|
3f203c62353b
Fix bug in resurrector deleting graves (exists in stable too), remove some unnecessary assignments due to the fillchar 0
nemo
parents:
7391
diff
changeset
|
991 |
DeleteGear(Gear); |
|
3f203c62353b
Fix bug in resurrector deleting graves (exists in stable too), remove some unnecessary assignments due to the fillchar 0
nemo
parents:
7391
diff
changeset
|
992 |
exit |
|
3f203c62353b
Fix bug in resurrector deleting graves (exists in stable too), remove some unnecessary assignments due to the fillchar 0
nemo
parents:
7391
diff
changeset
|
993 |
end; |
| 7394 | 994 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
995 |
AllInactive := false; |
| 7394 | 996 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
997 |
if Gear^.dY.isNegative then |
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
998 |
if TestCollisionY(Gear, -1) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
999 |
Gear^.dY := _0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1000 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1001 |
if not Gear^.dY.isNegative then |
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
1002 |
if TestCollisionY(Gear, 1) <> 0 then |
| 9820 | 1003 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1004 |
Gear^.dY := - Gear^.dY * Gear^.Elasticity; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1005 |
if Gear^.dY > - _1div1024 then |
| 9820 | 1006 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1007 |
Gear^.Active := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1008 |
exit |
| 9820 | 1009 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1010 |
else if Gear^.dY < - _0_03 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1011 |
PlaySound(Gear^.ImpactSound) |
| 9820 | 1012 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1013 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1014 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1015 |
CheckGearDrowning(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1016 |
Gear^.dY := Gear^.dY + cGravity |
| 4 | 1017 |
end; |
1018 |
||
1019 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 3080 | 1020 |
procedure doStepBeeWork(Gear: PGear); |
| 8795 | 1021 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1022 |
t: hwFloat; |
|
5748
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1023 |
gX,gY,i: LongInt; |
|
14535
5ac181cb2396
Fix bee targeting fail across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14419
diff
changeset
|
1024 |
uw, nuw, wrapped: boolean; |
|
5748
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1025 |
flower: PVisualGear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1026 |
|
| 4 | 1027 |
begin |
|
14535
5ac181cb2396
Fix bee targeting fail across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14419
diff
changeset
|
1028 |
wrapped:= WorldWrap(Gear); |
|
5ac181cb2396
Fix bee targeting fail across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14419
diff
changeset
|
1029 |
if wrapped then |
|
5ac181cb2396
Fix bee targeting fail across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14419
diff
changeset
|
1030 |
HomingWrap(Gear); |
|
5ac181cb2396
Fix bee targeting fail across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14419
diff
changeset
|
1031 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1032 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1033 |
gX := hwRound(Gear^.X); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1034 |
gY := hwRound(Gear^.Y); |
| 6251 | 1035 |
uw := (Gear^.Tag <> 0); // was bee underwater last tick? |
| 10354 | 1036 |
nuw := CheckCoordInWater(gx, gy + Gear^.Radius); // is bee underwater now? |
| 6251 | 1037 |
|
1038 |
// if water entered or left |
|
1039 |
if nuw <> uw then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1040 |
begin |
| 10363 | 1041 |
if Gear^.Timer <> 5000 then |
1042 |
AddSplashForGear(Gear, false); |
|
| 7053 | 1043 |
StopSoundChan(Gear^.SoundChannel); |
| 6251 | 1044 |
if nuw then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1045 |
begin |
| 6251 | 1046 |
Gear^.SoundChannel := LoopSound(sndBeeWater); |
1047 |
Gear^.Tag := 1; |
|
1048 |
end |
|
1049 |
else |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1050 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1051 |
Gear^.SoundChannel := LoopSound(sndBee); |
| 6251 | 1052 |
Gear^.Tag := 0; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1053 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1054 |
end; |
| 6251 | 1055 |
|
1056 |
||
1057 |
if Gear^.Timer = 0 then |
|
|
9766
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1058 |
begin |
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
1059 |
// no energy? just fall |
|
9766
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1060 |
doStepFallingGear(Gear); |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1061 |
// if drowning, stop bee sound |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1062 |
if (Gear^.State and gstDrowning) <> 0 then |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1063 |
StopSoundChan(Gear^.SoundChannel); |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1064 |
end |
| 6251 | 1065 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1066 |
begin |
| 11475 | 1067 |
if (Gear^.Timer and $F) = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1068 |
begin |
| 11475 | 1069 |
if (Gear^.Timer and $3F) = 0 then |
| 10352 | 1070 |
AddVisualGear(gX, gY, vgtBeeTrace); |
1071 |
||
| 11475 | 1072 |
Gear^.dX := Gear^.dX + _0_000064 * (Gear^.Target.X - gX); |
1073 |
Gear^.dY := Gear^.dY + _0_000064 * (Gear^.Target.Y - gY); |
|
| 6251 | 1074 |
// make sure new speed isn't higher than original one (which we stored in Friction variable) |
1075 |
t := Gear^.Friction / Distance(Gear^.dX, Gear^.dY); |
|
1076 |
Gear^.dX := Gear^.dX * t; |
|
1077 |
Gear^.dY := Gear^.dY * t; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1078 |
end; |
| 6251 | 1079 |
|
1080 |
Gear^.X := Gear^.X + Gear^.dX; |
|
1081 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
1082 |
||
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1083 |
end; |
| 3591 | 1084 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1085 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1086 |
CheckCollision(Gear); |
| 6251 | 1087 |
if ((Gear^.State and gstCollision) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1088 |
begin |
| 7053 | 1089 |
StopSoundChan(Gear^.SoundChannel); |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
1090 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
5748
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1091 |
for i:= 0 to 31 do |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1092 |
begin |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1093 |
flower:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot); |
| 6131 | 1094 |
if flower <> nil then |
|
5748
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1095 |
with flower^ do |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1096 |
begin |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1097 |
Scale:= 0.75; |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1098 |
dx:= 0.001 * (random(200)); |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1099 |
dy:= 0.001 * (random(200)); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1100 |
if random(2) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1101 |
dx := -dx; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1102 |
if random(2) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1103 |
dy := -dy; |
|
5748
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1104 |
FrameTicks:= random(250) + 250; |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1105 |
State:= ord(sprTargetBee); |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1106 |
end; |
|
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
1107 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1108 |
DeleteGear(Gear); |
| 10135 | 1109 |
exit; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1110 |
end; |
| 6251 | 1111 |
|
1112 |
if (Gear^.Timer > 0) then |
|
|
9766
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1113 |
begin |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1114 |
dec(Gear^.Timer); |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1115 |
if Gear^.Timer = 0 then |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1116 |
begin |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1117 |
// no need to display remaining time anymore |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1118 |
Gear^.RenderTimer:= false; |
|
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1119 |
// bee can drown when timer reached 0 |
| 9954 | 1120 |
Gear^.State:= Gear^.State and (not gstSubmersible); |
|
9766
62c49992b049
fix Issue #724: Bee sound never stops (underwater when timer is 0)
sheepluva
parents:
9742
diff
changeset
|
1121 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1122 |
end; |
| 4 | 1123 |
end; |
1124 |
||
| 3080 | 1125 |
procedure doStepBee(Gear: PGear); |
|
15225
f55c1c895797
Bee: Call HomingWrap in pre-homing phase, too
Wuzzy <Wuzzy2@mail.ru>
parents:
15217
diff
changeset
|
1126 |
var wrapped: boolean; |
| 4 | 1127 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1128 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1129 |
Gear^.X := Gear^.X + Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1130 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
15225
f55c1c895797
Bee: Call HomingWrap in pre-homing phase, too
Wuzzy <Wuzzy2@mail.ru>
parents:
15217
diff
changeset
|
1131 |
wrapped:= WorldWrap(Gear); |
|
f55c1c895797
Bee: Call HomingWrap in pre-homing phase, too
Wuzzy <Wuzzy2@mail.ru>
parents:
15217
diff
changeset
|
1132 |
if wrapped then |
|
f55c1c895797
Bee: Call HomingWrap in pre-homing phase, too
Wuzzy <Wuzzy2@mail.ru>
parents:
15217
diff
changeset
|
1133 |
HomingWrap(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1134 |
Gear^.dY := Gear^.dY + cGravity; |
| 10363 | 1135 |
CheckGearDrowning(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1136 |
CheckCollision(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1137 |
if (Gear^.State and gstCollision) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1138 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
1139 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1140 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1141 |
exit |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1142 |
end; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1143 |
dec(Gear^.Timer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1144 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1145 |
begin |
| 6450 | 1146 |
Gear^.Hedgehog^.Gear^.Message:= Gear^.Hedgehog^.Gear^.Message and (not gmAttack); |
1147 |
Gear^.Hedgehog^.Gear^.State:= Gear^.Hedgehog^.Gear^.State and (not gstAttacking); |
|
|
4135
5be798ecafdc
This should make bee and other targetted things behave more reliably in infinite attack mode. Blocks switching of weps if a target point is active.
nemo
parents:
4104
diff
changeset
|
1148 |
AttackBar:= 0; |
| 8795 | 1149 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1150 |
Gear^.SoundChannel := LoopSound(sndBee); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1151 |
Gear^.Timer := 5000; |
| 3591 | 1152 |
// save initial speed in otherwise unused Friction variable |
1153 |
Gear^.Friction := Distance(Gear^.dX, Gear^.dY); |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1154 |
Gear^.doStep := @doStepBeeWork |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1155 |
end; |
| 4 | 1156 |
end; |
1157 |
||
1158 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 876 | 1159 |
procedure doStepShotIdle(Gear: PGear); |
1160 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1161 |
AllInactive := false; |
| 13152 | 1162 |
if (Gear^.Kind <> gtMinigunBullet) then |
1163 |
begin |
|
1164 |
inc(Gear^.Timer); |
|
1165 |
if Gear^.Timer > 75 then |
|
1166 |
begin |
|
1167 |
DeleteGear(Gear); |
|
1168 |
AfterAttack |
|
1169 |
end |
|
1170 |
end |
|
1171 |
else |
|
| 14577 | 1172 |
DeleteGear(Gear); |
| 876 | 1173 |
end; |
1174 |
||
|
13147
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1175 |
procedure CreateShellForGear(Gear: PGear; startFrame: Longword); |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1176 |
var |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1177 |
shell: PVisualGear; |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1178 |
begin |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1179 |
shell := AddVisualGear(hwRound(Gear^.x), hwRound(Gear^.y), vgtShell); |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1180 |
if shell <> nil then |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1181 |
begin |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1182 |
shell^.dX := gear^.dX.QWordValue / -17179869184; |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1183 |
if (gear^.dX.isNegative) then |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1184 |
shell^.dX := -shell^.dX; |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1185 |
shell^.dY := gear^.dY.QWordValue / -17179869184; |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1186 |
shell^.Frame := startFrame; |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1187 |
end; |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1188 |
end; |
|
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1189 |
|
|
13407
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1190 |
function ShotgunLineHitHelp(Gear: PGear; oX, oY, tX, tY: hwFloat): Boolean; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1191 |
var i: LongInt; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1192 |
Collisions: PGearArray; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1193 |
begin |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1194 |
ShotgunLineHitHelp := false; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1195 |
Collisions := CheckAllGearsLineCollision(Gear, oX, oY, tX, tY); |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1196 |
i := Collisions^.Count; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1197 |
while i > 0 do |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1198 |
begin |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1199 |
dec(i); |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1200 |
if Collisions^.ar[i]^.Kind in |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1201 |
[gtMine, gtSMine, gtAirMine, gtKnife, gtCase, gtTarget, gtExplosives] then |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1202 |
begin |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1203 |
Gear^.X := Collisions^.ar[i]^.X; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1204 |
Gear^.Y := Collisions^.ar[i]^.Y; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1205 |
ShotgunShot(Gear); |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1206 |
Gear^.doStep := @doStepShotIdle; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1207 |
ShotgunLineHitHelp := true; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1208 |
exit; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1209 |
end; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1210 |
end; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1211 |
end; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1212 |
|
| 4 | 1213 |
procedure doStepShotgunShot(Gear: PGear); |
| 8795 | 1214 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1215 |
i: LongWord; |
|
13407
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1216 |
oX, oY, tmpX, tmpY: hwFloat; |
| 4 | 1217 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1218 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1219 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1220 |
if ((Gear^.State and gstAnimation) = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1221 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1222 |
dec(Gear^.Timer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1223 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1224 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1225 |
PlaySound(sndShotgunFire); |
|
13147
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1226 |
CreateShellForGear(Gear, 0); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1227 |
Gear^.State := Gear^.State or gstAnimation |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1228 |
end; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1229 |
exit |
|
7564
651d56a6e568
Cancel shotgun shot if hedgehog is moved moved (by explosion)
unc0rr
parents:
7539
diff
changeset
|
1230 |
end else |
|
651d56a6e568
Cancel shotgun shot if hedgehog is moved moved (by explosion)
unc0rr
parents:
7539
diff
changeset
|
1231 |
if(Gear^.Hedgehog^.Gear = nil) or ((Gear^.Hedgehog^.Gear^.State and gstMoving) <> 0) then |
|
651d56a6e568
Cancel shotgun shot if hedgehog is moved moved (by explosion)
unc0rr
parents:
7539
diff
changeset
|
1232 |
begin |
|
651d56a6e568
Cancel shotgun shot if hedgehog is moved moved (by explosion)
unc0rr
parents:
7539
diff
changeset
|
1233 |
DeleteGear(Gear); |
|
651d56a6e568
Cancel shotgun shot if hedgehog is moved moved (by explosion)
unc0rr
parents:
7539
diff
changeset
|
1234 |
AfterAttack; |
|
651d56a6e568
Cancel shotgun shot if hedgehog is moved moved (by explosion)
unc0rr
parents:
7539
diff
changeset
|
1235 |
exit |
|
651d56a6e568
Cancel shotgun shot if hedgehog is moved moved (by explosion)
unc0rr
parents:
7539
diff
changeset
|
1236 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1237 |
else |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1238 |
inc(Gear^.Timer); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1239 |
|
|
13407
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1240 |
i := 100; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1241 |
oX := Gear^.X; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1242 |
oY := Gear^.Y; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1243 |
repeat |
|
13407
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1244 |
if Gear^.Tag = 0 then |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1245 |
begin |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1246 |
Gear^.X := Gear^.X + Gear^.dX; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1247 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1248 |
end; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1249 |
|
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1250 |
tmpX := Gear^.X; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1251 |
tmpY := Gear^.Y; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1252 |
if (Gear^.PortalCounter < 30) and WorldWrap(Gear) then |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1253 |
begin |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1254 |
inc(Gear^.PortalCounter); |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1255 |
if ShotgunLineHitHelp(Gear, oX, oY, tmpX, tmpY) then |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1256 |
exit; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1257 |
oX := Gear^.X; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1258 |
oY := Gear^.Y; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1259 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1260 |
CheckCollision(Gear); |
|
13407
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1261 |
|
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1262 |
if ((Gear^.State and gstCollision) <> 0) then |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1263 |
begin |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1264 |
if Gear^.Tag = 0 then |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1265 |
begin |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1266 |
//Try to align the shot with the land to give portals a chance to catch it |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1267 |
Gear^.X := Gear^.X + Gear^.dX * 2; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1268 |
Gear^.Y := Gear^.Y + Gear^.dY * 2; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1269 |
Gear^.Tag := 1 |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1270 |
end |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1271 |
else |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1272 |
begin |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1273 |
Gear^.X := Gear^.X + Gear^.dX * 6; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1274 |
Gear^.Y := Gear^.Y + Gear^.dY * 6; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1275 |
ShotgunShot(Gear); |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1276 |
Gear^.doStep := @doStepShotIdle; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1277 |
end; |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1278 |
exit |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1279 |
end |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1280 |
else |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1281 |
Gear^.Tag := 0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1282 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1283 |
CheckGearDrowning(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1284 |
if (Gear^.State and gstDrowning) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1285 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1286 |
Gear^.doStep := @doStepShotIdle; |
|
13407
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1287 |
break; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1288 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1289 |
dec(i) |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1290 |
until i = 0; |
|
13407
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1291 |
|
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1292 |
ShotgunLineHitHelp(Gear, oX, oY, Gear^.X, Gear^.Y); |
|
06792533ef91
ensure shotgun works with portals and make it hit airmines
alfadur
parents:
13406
diff
changeset
|
1293 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1294 |
if (hwRound(Gear^.X) and LAND_WIDTH_MASK <> 0) or (hwRound(Gear^.Y) and LAND_HEIGHT_MASK <> 0) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1295 |
Gear^.doStep := @doStepShotIdle |
| 4 | 1296 |
end; |
1297 |
||
1298 |
//////////////////////////////////////////////////////////////////////////////// |
|
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1299 |
procedure spawnBulletTrail(Bullet: PGear; bulletX, bulletY: hwFloat; fadeIn: Boolean); |
| 5841 | 1300 |
var oX, oY: hwFloat; |
|
13341
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1301 |
fromX, fromY, toX, toY, dX, dY, bLength, stepLength: real; |
| 5841 | 1302 |
VGear: PVisualGear; |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1303 |
i, steps: LongWord; |
| 5841 | 1304 |
begin |
1305 |
if Bullet^.PortalCounter = 0 then |
|
1306 |
begin |
|
1307 |
ox:= CurrentHedgehog^.Gear^.X + Int2hwFloat(GetLaunchX(CurrentHedgehog^.CurAmmoType, hwSign(CurrentHedgehog^.Gear^.dX), CurrentHedgehog^.Gear^.Angle)); |
|
1308 |
oy:= CurrentHedgehog^.Gear^.Y + Int2hwFloat(GetLaunchY(CurrentHedgehog^.CurAmmoType, CurrentHedgehog^.Gear^.Angle)); |
|
1309 |
end |
|
1310 |
else |
|
1311 |
begin |
|
1312 |
ox:= Bullet^.Elasticity; |
|
1313 |
oy:= Bullet^.Friction; |
|
1314 |
end; |
|
1315 |
||
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1316 |
fromX:= hwFloat2Float(ox); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1317 |
fromY:= hwFloat2Float(oy); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1318 |
toX:= hwFloat2Float(bulletX); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1319 |
toY:= hwFloat2Float(bulletY); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1320 |
|
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1321 |
dX:= toX - fromX; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1322 |
dY:= toY - fromY; |
|
13341
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1323 |
bLength:= sqrt(dX * dX + dY * dY); |
|
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1324 |
dX:= dX / bLength; |
|
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1325 |
dY:= dY / bLength; |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1326 |
|
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1327 |
if fadeIn then |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1328 |
begin |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1329 |
steps:= 10; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1330 |
stepLength:= 12; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1331 |
fromX:= fromX + dX * 45; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1332 |
fromY:= fromY + dY * 45; |
|
13341
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1333 |
bLength:= bLength - 45; |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1334 |
end |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1335 |
else steps:= 1; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1336 |
|
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1337 |
for i:= 0 to steps - 1 do |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1338 |
begin |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1339 |
if i < steps - 1 then |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1340 |
begin |
|
13341
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1341 |
toX:= fromX + dX * minD(stepLength, bLength); |
|
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1342 |
toY:= fromY + dY * minD(stepLength, bLength); |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1343 |
end |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1344 |
else if steps > 1 then |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1345 |
begin |
|
13341
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1346 |
toX:= fromX + dX * bLength; |
|
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1347 |
toY:= fromY + dY * bLength; |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1348 |
end; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1349 |
|
|
13341
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1350 |
if bLength > 0 then |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1351 |
begin |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1352 |
VGear := AddVisualGear(round(fromX), round(fromY), vgtLineTrail); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1353 |
if VGear <> nil then |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1354 |
begin |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1355 |
VGear^.X:= fromX; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1356 |
VGear^.Y:= fromY; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1357 |
VGear^.dX:= toX; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1358 |
VGear^.dY:= toY; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1359 |
VGear^.Tint:= $FFFFFF00 or ($FF * (i + 1) div (steps)); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1360 |
|
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1361 |
// reached edge of land. assume infinite beam. Extend it way out past camera |
|
13321
23ade5604f8d
Fix bullet trails overlapping when the pass through wrap or bounce world edge
alfadur
parents:
13318
diff
changeset
|
1362 |
if ((round(toX) and LAND_WIDTH_MASK <> 0) and (not (WorldEdge in [weBounce, weWrap]))) |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1363 |
or (round(toY) and LAND_HEIGHT_MASK <> 0) then |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1364 |
// only extend if not under water |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1365 |
if not CheckCoordInWater(round(toX), round(toY)) then |
| 5841 | 1366 |
begin |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1367 |
VGear^.dX := VGear^.dX + max(LAND_WIDTH,4096) * (VGear^.dX - VGear^.X); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1368 |
VGear^.dY := VGear^.dY + max(LAND_WIDTH,4096) * (VGear^.dY - VGear^.Y); |
| 5841 | 1369 |
end; |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1370 |
VGear^.Timer := 200; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1371 |
end; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1372 |
end; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1373 |
|
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1374 |
if i < steps - 1 then |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1375 |
begin |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1376 |
fromX:= toX; |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1377 |
fromY:= toY; |
|
13341
0c3f612edc19
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
Wuzzy <Wuzzy2@mail.ru>
parents:
13323
diff
changeset
|
1378 |
bLength:= bLength - stepLength; |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1379 |
end |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1380 |
end; |
| 5841 | 1381 |
end; |
1382 |
||
| 12898 | 1383 |
procedure LineShoveHelp(Gear: PGear; oX, oY, tX, tY, dX, dY: hwFloat; count: LongWord); |
1384 |
var dmg,power: LongInt; |
|
1385 |
begin |
|
|
13403
9c9d29be9e00
make all bullets function similar to machinegun bullets (can hit/shove objects without checkin)
nemo
parents:
13402
diff
changeset
|
1386 |
if hwSqr(tX - oX) + hwSqr(tY - oY) > _0_25 then |
| 12898 | 1387 |
begin |
1388 |
if (Gear^.AmmoType = amDEagle) or (Gear^.AmmoType = amMinigun) then |
|
1389 |
dmg:= Gear^.Boom |
|
1390 |
else |
|
1391 |
dmg:= Gear^.Timer * Gear^.Boom div 100000; |
|
1392 |
if (Gear^.AmmoType = amMinigun) then |
|
1393 |
power:= 10 |
|
1394 |
else |
|
1395 |
power:= 20; |
|
1396 |
AmmoShoveLine(Gear, dmg, power, oX, oY, tX, tY); |
|
1397 |
end; |
|
1398 |
if Gear^.Damage > 0 then |
|
1399 |
begin |
|
1400 |
DrawTunnel(oX, oY, dX, dY, count, 1); |
|
1401 |
dec(Gear^.Health, Gear^.Damage); |
|
1402 |
Gear^.Damage := 0 |
|
1403 |
end; |
|
1404 |
end; |
|
1405 |
||
| 13381 | 1406 |
procedure CheckBulletDrowningHelp(Bullet: PGear); |
1407 |
var dX, dY: hwFloat; |
|
1408 |
begin |
|
1409 |
dX := Bullet^.dX; |
|
1410 |
dY := Bullet^.dY; |
|
1411 |
CheckGearDrowning(Bullet); |
|
1412 |
if (dX <> Bullet^.dX) or (dY <> Bullet^.dY) then |
|
1413 |
begin |
|
1414 |
SpawnBulletTrail(Bullet, Bullet^.X, Bullet^.Y, Bullet^.FlightTime = 0); |
|
1415 |
Bullet^.Elasticity := Bullet^.X; |
|
1416 |
Bullet^.Friction := Bullet^.Y; |
|
1417 |
Inc(Bullet^.PortalCounter); |
|
1418 |
Bullet^.FlightTime:= 1; |
|
1419 |
end; |
|
1420 |
end; |
|
1421 |
||
| 13408 | 1422 |
procedure CreateBubblesForBullet(Gear: PGear); |
1423 |
var i, iInit: LongWord; |
|
1424 |
begin |
|
| 14305 | 1425 |
iInit:= 0; |
| 13408 | 1426 |
if ((Gear^.State and gstDrowning) <> 0) and (Gear^.Health > 0) then |
1427 |
begin |
|
1428 |
// draw bubbles |
|
1429 |
if (not SuddenDeathDmg and (WaterOpacity < $FF)) or (SuddenDeathDmg and (SDWaterOpacity < $FF)) then |
|
1430 |
begin |
|
1431 |
case Gear^.Kind of |
|
1432 |
gtMinigunBullet: iInit:= Gear^.Health * 100; |
|
1433 |
gtDEagleShot, gtSniperRifleShot: iInit:= Gear^.Health * 4 |
|
1434 |
end; |
|
1435 |
for i:=iInit downto 0 do |
|
1436 |
begin |
|
1437 |
if Random(6) = 0 then |
|
1438 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble); |
|
1439 |
Gear^.X := Gear^.X + Gear^.dX; |
|
1440 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
1441 |
end; |
|
1442 |
end; |
|
1443 |
// bullet dies underwater |
|
1444 |
Gear^.Health:= 0; |
|
1445 |
end; |
|
1446 |
end; |
|
1447 |
||
|
2023
41d3afaa20c7
Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump
nemo
parents:
2017
diff
changeset
|
1448 |
procedure doStepBulletWork(Gear: PGear); |
| 8795 | 1449 |
var |
|
12377
efa13b925cd8
Fix bullets being reflected too early on bouncy world edge border while digging land
alfadur
parents:
12306
diff
changeset
|
1450 |
i, x, y, iInit: LongWord; |
|
efa13b925cd8
Fix bullets being reflected too early on bouncy world edge border while digging land
alfadur
parents:
12306
diff
changeset
|
1451 |
oX, oY, tX, tY, tDx, tDy: hwFloat; |
| 4327 | 1452 |
VGear: PVisualGear; |
| 12898 | 1453 |
LandFlags: Word; |
1454 |
isDigging: Boolean; |
|
1455 |
isDead: Boolean; |
|
| 38 | 1456 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1457 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1458 |
inc(Gear^.Timer); |
| 12898 | 1459 |
iInit := 100; |
|
12377
efa13b925cd8
Fix bullets being reflected too early on bouncy world edge border while digging land
alfadur
parents:
12306
diff
changeset
|
1460 |
i := iInit; |
| 12898 | 1461 |
isDigging := false; |
1462 |
isDead := false; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1463 |
oX := Gear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1464 |
oY := Gear^.Y; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1465 |
repeat |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1466 |
Gear^.X := Gear^.X + Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1467 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
9485
3dee8a3b0406
add shotgun wrap, revert 100px offset. Problematic w/ things that rely on Land.
nemo
parents:
9479
diff
changeset
|
1468 |
tX:= Gear^.X; |
|
3dee8a3b0406
add shotgun wrap, revert 100px offset. Problematic w/ things that rely on Land.
nemo
parents:
9479
diff
changeset
|
1469 |
tY:= Gear^.Y; |
|
12377
efa13b925cd8
Fix bullets being reflected too early on bouncy world edge border while digging land
alfadur
parents:
12306
diff
changeset
|
1470 |
tDx:= Gear^.dX; |
|
efa13b925cd8
Fix bullets being reflected too early on bouncy world edge border while digging land
alfadur
parents:
12306
diff
changeset
|
1471 |
tDy:= Gear^.dY; |
| 9565 | 1472 |
if (Gear^.PortalCounter < 30) and WorldWrap(Gear) then |
|
9485
3dee8a3b0406
add shotgun wrap, revert 100px offset. Problematic w/ things that rely on Land.
nemo
parents:
9479
diff
changeset
|
1473 |
begin |
| 12898 | 1474 |
LineShoveHelp(Gear, oX, oY, tX, tY, tDx, tDy, iInit + 2 - i); |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1475 |
SpawnBulletTrail(Gear, tX, tY, Gear^.FlightTime = 0); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1476 |
Gear^.FlightTime:= 1; |
|
12377
efa13b925cd8
Fix bullets being reflected too early on bouncy world edge border while digging land
alfadur
parents:
12306
diff
changeset
|
1477 |
iInit:= i; |
|
efa13b925cd8
Fix bullets being reflected too early on bouncy world edge border while digging land
alfadur
parents:
12306
diff
changeset
|
1478 |
oX:= Gear^.X; |
|
efa13b925cd8
Fix bullets being reflected too early on bouncy world edge border while digging land
alfadur
parents:
12306
diff
changeset
|
1479 |
oY:= Gear^.Y; |
|
9485
3dee8a3b0406
add shotgun wrap, revert 100px offset. Problematic w/ things that rely on Land.
nemo
parents:
9479
diff
changeset
|
1480 |
inc(Gear^.PortalCounter); |
|
3dee8a3b0406
add shotgun wrap, revert 100px offset. Problematic w/ things that rely on Land.
nemo
parents:
9479
diff
changeset
|
1481 |
Gear^.Elasticity:= Gear^.X; |
|
3dee8a3b0406
add shotgun wrap, revert 100px offset. Problematic w/ things that rely on Land.
nemo
parents:
9479
diff
changeset
|
1482 |
Gear^.Friction:= Gear^.Y; |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1483 |
SpawnBulletTrail(Gear, Gear^.X, Gear^.Y, false); |
|
13318
9071600f7b22
Fix minigun bullets hitting shooter when it hits hog on other side of world wrap
alfadur
parents:
13285
diff
changeset
|
1484 |
|
|
9071600f7b22
Fix minigun bullets hitting shooter when it hits hog on other side of world wrap
alfadur
parents:
13285
diff
changeset
|
1485 |
// bullets can now hurt the hog that fired them |
|
9071600f7b22
Fix minigun bullets hitting shooter when it hits hog on other side of world wrap
alfadur
parents:
13285
diff
changeset
|
1486 |
if WorldEdge <> weSea then Gear^.Data:= nil; |
|
9485
3dee8a3b0406
add shotgun wrap, revert 100px offset. Problematic w/ things that rely on Land.
nemo
parents:
9479
diff
changeset
|
1487 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1488 |
x := hwRound(Gear^.X); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1489 |
y := hwRound(Gear^.Y); |
| 8795 | 1490 |
|
| 12898 | 1491 |
if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) then |
1492 |
begin |
|
1493 |
LandFlags:= Land[y, x]; |
|
1494 |
if LandFlags <> 0 then inc(Gear^.Damage); |
|
1495 |
isDigging:= (LandFlags and lfLandMask) <> 0; |
|
1496 |
end; |
|
1497 |
// let's interrupt before a collision with land to give portals a chance to catch the bullet |
|
1498 |
if isDigging and (Gear^.Tag = 0) then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1499 |
begin |
| 5841 | 1500 |
Gear^.Tag := 1; |
| 12898 | 1501 |
dec(Gear^.Damage); |
| 5841 | 1502 |
Gear^.X := Gear^.X - Gear^.dX; |
1503 |
Gear^.Y := Gear^.Y - Gear^.dY; |
|
| 13381 | 1504 |
CheckBulletDrowningHelp(Gear); |
| 5841 | 1505 |
break; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1506 |
end |
| 12898 | 1507 |
else if (not isDigging) then |
| 5841 | 1508 |
Gear^.Tag := 0; |
1509 |
||
| 12898 | 1510 |
//Shove static gears to remove the mask and stop damaging the bullet |
1511 |
if (not isDigging) and (Gear^.Damage > 5) and (Gear^.Kind <> gtMinigunBullet) then |
|
1512 |
begin |
|
1513 |
LineShoveHelp(Gear, oX, oY, tX, tY, tDx, tDy, iInit + 2 - i); |
|
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1514 |
SpawnBulletTrail(Gear, tX, tY, Gear^.FlightTime = 0); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1515 |
Gear^.FlightTime:= 1; |
| 12898 | 1516 |
iInit:= i; |
1517 |
oX:= Gear^.X; |
|
1518 |
oY:= Gear^.Y; |
|
| 10125 | 1519 |
end; |
| 12898 | 1520 |
|
| 13381 | 1521 |
CheckBulletDrowningHelp(Gear); |
| 12898 | 1522 |
case Gear^.Kind of |
|
13357
030b085b182f
real droplet fix - default density is fine - also add back in the underwater bullet trails
nemo
parents:
13341
diff
changeset
|
1523 |
gtMinigunBullet: isDead:= isDigging or ((Gear^.State and gstDrowning) <> 0); |
|
030b085b182f
real droplet fix - default density is fine - also add back in the underwater bullet trails
nemo
parents:
13341
diff
changeset
|
1524 |
gtDEagleShot, gtSniperRifleShot: isDead:= (Gear^.Damage >= Gear^.Health) or ((Gear^.State and gstDrowning) <> 0) |
| 12898 | 1525 |
end; |
| 8795 | 1526 |
dec(i) |
|
13357
030b085b182f
real droplet fix - default density is fine - also add back in the underwater bullet trails
nemo
parents:
13341
diff
changeset
|
1527 |
until (i = 0) or (isDead); |
| 12898 | 1528 |
|
1529 |
LineShoveHelp(Gear, oX, oY, Gear^.X, Gear^.Y, |
|
1530 |
Gear^.dX, Gear^.dY, iInit + 2 - i); |
|
|
10650
7f23971bd9db
fix some old code that assumes that a bullet under water is always outside land array - which is wrong (e.g. during sudden-death in previous releases, also weSea now)
sheepluva
parents:
10645
diff
changeset
|
1531 |
|
| 13408 | 1532 |
CreateBubblesForBullet(Gear); |
1533 |
||
1534 |
x := hwRound(Gear^.X); |
|
1535 |
y := hwRound(Gear^.Y); |
|
1536 |
if (isDead) or (x and LAND_WIDTH_MASK <> 0) or (y and LAND_HEIGHT_MASK <> 0) then |
|
1537 |
begin |
|
1538 |
if (Gear^.Kind = gtSniperRifleShot) then |
|
1539 |
cLaserSightingSniper := false; |
|
1540 |
if (Ammoz[Gear^.AmmoType].Ammo.NumPerTurn <= CurrentHedgehog^.MultiShootAttacks) and (CurrentHedgehog^.Effects[heArtillery] = 2) then |
|
1541 |
CurrentHedgehog^.Effects[heArtillery]:= 0; |
|
1542 |
||
1543 |
// Bullet Hit |
|
1544 |
if ((Gear^.State and gstDrowning) = 0) and (x and LAND_WIDTH_MASK = 0) and (y and LAND_HEIGHT_MASK = 0) then |
|
1545 |
begin |
|
1546 |
if Gear^.Kind = gtMinigunBullet then |
|
|
10650
7f23971bd9db
fix some old code that assumes that a bullet under water is always outside land array - which is wrong (e.g. during sudden-death in previous releases, also weSea now)
sheepluva
parents:
10645
diff
changeset
|
1547 |
begin |
| 13408 | 1548 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 5, |
|
14076
82956b3ba2ab
prevent minigun bullet land impacts from pushing hedgehogs
alfadur
parents:
14061
diff
changeset
|
1549 |
Gear^.Hedgehog, (EXPLNoDamage or EXPLDoNotTouchHH){ or EXPLDontDraw or EXPLNoGfx});
|
| 13408 | 1550 |
VGear := AddVisualGear(hwRound(Gear^.X + Gear^.dX * 5), hwRound(Gear^.Y + Gear^.dY * 5), vgtBulletHit); |
1551 |
end |
|
1552 |
else |
|
1553 |
VGear := AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBulletHit); |
|
1554 |
||
1555 |
if VGear <> nil then |
|
1556 |
begin |
|
1557 |
VGear^.Angle := DxDy2Angle(-Gear^.dX, Gear^.dY); |
|
|
10650
7f23971bd9db
fix some old code that assumes that a bullet under water is always outside land array - which is wrong (e.g. during sudden-death in previous releases, also weSea now)
sheepluva
parents:
10645
diff
changeset
|
1558 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1559 |
end; |
| 13408 | 1560 |
|
1561 |
spawnBulletTrail(Gear, Gear^.X, Gear^.Y, Gear^.FlightTime = 0); |
|
1562 |
Gear^.FlightTime:= 1; |
|
1563 |
if Gear^.Kind = gtMinigunBullet then |
|
1564 |
ClearHitOrderLeq(Gear^.Tag); |
|
1565 |
||
1566 |
if (worldEdge = weSea) and (Gear^.Kind = gtMinigunBullet) |
|
1567 |
and Gear^.Y.isNegative and Gear^.dY.isNegative |
|
1568 |
and (Gear^.Health > 0) and (not isZero(Gear^.dX)) then |
|
1569 |
begin |
|
1570 |
if Gear^.dX.isNegative then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1571 |
begin |
| 13408 | 1572 |
|
1573 |
Gear^.X:= int2hwFloat(-1); |
|
1574 |
iInit:= x - leftX; |
|
1575 |
end |
|
1576 |
else |
|
1577 |
begin |
|
1578 |
Gear^.X:= int2hwFloat(LAND_WIDTH); |
|
1579 |
iInit:= rightX - x - 1; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1580 |
end; |
| 13408 | 1581 |
Gear^.Y:= Gear^.Y + Gear^.dY * hwAbs(int2hwFloat(iInit) / Gear^.dX); |
1582 |
CheckGearDrowning(Gear); |
|
1583 |
CreateBubblesForBullet(Gear); |
|
1584 |
end; |
|
1585 |
Gear^.doStep := @doStepShotIdle |
|
1586 |
end; |
|
| 37 | 1587 |
end; |
1588 |
||
| 559 | 1589 |
procedure doStepDEagleShot(Gear: PGear); |
1590 |
begin |
|
|
11550
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1591 |
Gear^.Data:= nil; |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1592 |
// remember who fired this |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1593 |
if (Gear^.Hedgehog <> nil) and (Gear^.Hedgehog^.Gear <> nil) then |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1594 |
Gear^.Data:= Pointer(Gear^.Hedgehog^.Gear); |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1595 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1596 |
PlaySound(sndGun); |
|
13403
9c9d29be9e00
make all bullets function similar to machinegun bullets (can hit/shove objects without checkin)
nemo
parents:
13402
diff
changeset
|
1597 |
ClearHitOrder(); |
| 11553 | 1598 |
// add 2 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths, and also just plain old weird angles |
| 11552 | 1599 |
Gear^.X := Gear^.X + Gear^.dX * 2; |
1600 |
Gear^.Y := Gear^.Y + Gear^.dY * 2; |
|
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1601 |
Gear^.FlightTime := 0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1602 |
Gear^.doStep := @doStepBulletWork |
|
2023
41d3afaa20c7
Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump
nemo
parents:
2017
diff
changeset
|
1603 |
end; |
|
41d3afaa20c7
Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump
nemo
parents:
2017
diff
changeset
|
1604 |
|
|
41d3afaa20c7
Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump
nemo
parents:
2017
diff
changeset
|
1605 |
procedure doStepSniperRifleShot(Gear: PGear); |
| 12898 | 1606 |
var HHGear: PGear; |
|
2023
41d3afaa20c7
Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump
nemo
parents:
2017
diff
changeset
|
1607 |
begin |
|
11550
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1608 |
|
| 4365 | 1609 |
HHGear := Gear^.Hedgehog^.Gear; |
|
13096
d78e65c66573
Add hedgehog effect heArtillery, allows to set per-hedgehog artillery mode
Wuzzy <Wuzzy2@mail.ru>
parents:
13058
diff
changeset
|
1610 |
if (Gear^.Hedgehog^.Effects[heArtillery] <> 1) then |
|
d78e65c66573
Add hedgehog effect heArtillery, allows to set per-hedgehog artillery mode
Wuzzy <Wuzzy2@mail.ru>
parents:
13058
diff
changeset
|
1611 |
Gear^.Hedgehog^.Effects[heArtillery]:= 2; |
| 10174 | 1612 |
|
1613 |
if HHGear = nil then |
|
1614 |
begin |
|
1615 |
DeleteGear(gear); |
|
1616 |
exit |
|
1617 |
end; |
|
1618 |
||
|
11550
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1619 |
// remember who fired this |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1620 |
Gear^.Data:= Pointer(Gear^.Hedgehog^.Gear); |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
1621 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1622 |
HHGear^.State := HHGear^.State or gstNotKickable; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1623 |
HedgehogChAngle(HHGear); |
|
12306
cdd884397760
Fix sniper rifle disabling laser sight utility after shooting
Wuzzy <almikes@aol.com>
parents:
12300
diff
changeset
|
1624 |
if cLaserSightingSniper = false then |
|
cdd884397760
Fix sniper rifle disabling laser sight utility after shooting
Wuzzy <almikes@aol.com>
parents:
12300
diff
changeset
|
1625 |
// Turn sniper's laser sight on and give it a chance to aim |
|
cdd884397760
Fix sniper rifle disabling laser sight utility after shooting
Wuzzy <almikes@aol.com>
parents:
12300
diff
changeset
|
1626 |
begin |
|
cdd884397760
Fix sniper rifle disabling laser sight utility after shooting
Wuzzy <almikes@aol.com>
parents:
12300
diff
changeset
|
1627 |
cLaserSightingSniper := true; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1628 |
HHGear^.Message := 0; |
|
7066
12cc2bd84b0b
Make pas2c even more happier with uGears.c, allow assigning arrays in some cases
unc0rr
parents:
7062
diff
changeset
|
1629 |
if (HHGear^.Angle >= 32) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1630 |
dec(HHGear^.Angle,32) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1631 |
end; |
|
2031
b6f3e56fb100
david_ac's game scheme options for mine delay/quantity, tweaks to sniper rifle
nemo
parents:
2029
diff
changeset
|
1632 |
|
| 3894 | 1633 |
if (HHGear^.Message and gmAttack) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1634 |
begin |
|
13147
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
1635 |
CreateShellForGear(Gear, 1); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1636 |
Gear^.State := Gear^.State or gstAnimation; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1637 |
Gear^.dX := SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _0_5; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1638 |
Gear^.dY := -AngleCos(HHGear^.Angle) * _0_5; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1639 |
PlaySound(sndGun); |
|
13403
9c9d29be9e00
make all bullets function similar to machinegun bullets (can hit/shove objects without checkin)
nemo
parents:
13402
diff
changeset
|
1640 |
ClearHitOrder(); |
| 11553 | 1641 |
// add 2 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths, and also just weird angles |
1642 |
Gear^.X := Gear^.X + Gear^.dX * 2; |
|
1643 |
Gear^.Y := Gear^.Y + Gear^.dY * 2; |
|
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
1644 |
Gear^.FlightTime := 0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1645 |
Gear^.doStep := @doStepBulletWork; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1646 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1647 |
else |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1648 |
if (GameTicks mod 32) = 0 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1649 |
if (GameTicks mod 4096) < 2048 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1650 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1651 |
if (HHGear^.Angle + 1 <= cMaxAngle) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1652 |
inc(HHGear^.Angle) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1653 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1654 |
else |
|
7066
12cc2bd84b0b
Make pas2c even more happier with uGears.c, allow assigning arrays in some cases
unc0rr
parents:
7062
diff
changeset
|
1655 |
if (HHGear^.Angle >= 1) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1656 |
dec(HHGear^.Angle); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1657 |
|
|
11918
9da78300c5d0
Fix sniper rifle making timer gray all the time
Wuzzy <almikes@aol.com>
parents:
11915
diff
changeset
|
1658 |
if (TurnTimeLeft = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1659 |
begin |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
1660 |
HHGear^.State := HHGear^.State and (not gstNotKickable); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1661 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1662 |
AfterAttack |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1663 |
end; |
| 559 | 1664 |
end; |
1665 |
||
| 37 | 1666 |
//////////////////////////////////////////////////////////////////////////////// |
| 4 | 1667 |
procedure doStepActionTimer(Gear: PGear); |
1668 |
begin |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1669 |
dec(Gear^.Timer); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1670 |
case Gear^.Kind of |
| 8795 | 1671 |
gtATStartGame: |
| 8679 | 1672 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1673 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1674 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1675 |
begin |
|
13642
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13640
diff
changeset
|
1676 |
AddCaption(GetEventString(eidRoundStart), capcolDefault, capgrpGameState); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1677 |
end |
| 8679 | 1678 |
end; |
| 8795 | 1679 |
gtATFinishGame: |
| 8679 | 1680 |
begin |
|
5368
a66d5141a3ba
fix build. seems like a indentation-related merge-oopsy dragged deleted code back in.
sheepluva
parents:
5366
diff
changeset
|
1681 |
AllInactive := false; |
|
a66d5141a3ba
fix build. seems like a indentation-related merge-oopsy dragged deleted code back in.
sheepluva
parents:
5366
diff
changeset
|
1682 |
if Gear^.Timer = 1000 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1683 |
begin |
|
5368
a66d5141a3ba
fix build. seems like a indentation-related merge-oopsy dragged deleted code back in.
sheepluva
parents:
5366
diff
changeset
|
1684 |
ScreenFade := sfToBlack; |
|
a66d5141a3ba
fix build. seems like a indentation-related merge-oopsy dragged deleted code back in.
sheepluva
parents:
5366
diff
changeset
|
1685 |
ScreenFadeValue := 0; |
|
a66d5141a3ba
fix build. seems like a indentation-related merge-oopsy dragged deleted code back in.
sheepluva
parents:
5366
diff
changeset
|
1686 |
ScreenFadeSpeed := 1; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1687 |
end; |
|
5368
a66d5141a3ba
fix build. seems like a indentation-related merge-oopsy dragged deleted code back in.
sheepluva
parents:
5366
diff
changeset
|
1688 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1689 |
begin |
| 7068 | 1690 |
SendIPC(_S'N'); |
1691 |
SendIPC(_S'q'); |
|
|
5368
a66d5141a3ba
fix build. seems like a indentation-related merge-oopsy dragged deleted code back in.
sheepluva
parents:
5366
diff
changeset
|
1692 |
GameState := gsExit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1693 |
end |
| 8679 | 1694 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1695 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1696 |
if Gear^.Timer = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1697 |
DeleteGear(Gear) |
| 4 | 1698 |
end; |
1699 |
||
1700 |
//////////////////////////////////////////////////////////////////////////////// |
|
1701 |
procedure doStepPickHammerWork(Gear: PGear); |
|
| 8795 | 1702 |
var |
| 4578 | 1703 |
i, ei, x, y: LongInt; |
| 4 | 1704 |
HHGear: PGear; |
1705 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1706 |
AllInactive := false; |
|
9487
fbe203c1d11e
couple more wrap calls. freezer still doesn't propagate properly. mostly due to
nemo
parents:
9485
diff
changeset
|
1707 |
WorldWrap(Gear); |
| 4365 | 1708 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1709 |
dec(Gear^.Timer); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1710 |
if (TurnTimeLeft = 0) or (Gear^.Timer = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1711 |
or((Gear^.Message and gmDestroy) <> 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1712 |
or((HHGear^.State and gstHHDriven) =0) then |
| 4578 | 1713 |
begin |
| 7053 | 1714 |
StopSoundChan(Gear^.SoundChannel); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1715 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1716 |
AfterAttack; |
|
3954
ae3583ad6ea9
Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too.
nemo
parents:
3953
diff
changeset
|
1717 |
doStepHedgehogMoving(HHGear); // for gfInfAttack |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1718 |
exit |
| 4578 | 1719 |
end; |
1720 |
||
1721 |
x:= hwRound(Gear^.X); |
|
1722 |
y:= hwRound(Gear^.Y); |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1723 |
if (Gear^.Timer mod 33) = 0 then |
| 4578 | 1724 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1725 |
HHGear^.State := HHGear^.State or gstNoDamage; |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
1726 |
doMakeExplosion(x, y + 7, Gear^.Boom, Gear^.Hedgehog, EXPLDontDraw); |
| 6450 | 1727 |
HHGear^.State := HHGear^.State and (not gstNoDamage) |
| 4578 | 1728 |
end; |
| 422 | 1729 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1730 |
if (Gear^.Timer mod 47) = 0 then |
| 4578 | 1731 |
begin |
1732 |
// ok. this was an attempt to turn off dust if not actually drilling land. I have no idea why it isn't working as expected |
|
| 6131 | 1733 |
if (( (y + 12) and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y + 12, x] > 255) then |
| 4578 | 1734 |
for i:= 0 to 1 do |
1735 |
AddVisualGear(x - 5 + Random(10), y + 12, vgtDust); |
|
1736 |
||
1737 |
i := x - Gear^.Radius - LongInt(GetRandom(2)); |
|
1738 |
ei := x + Gear^.Radius + LongInt(GetRandom(2)); |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1739 |
while i <= ei do |
| 4578 | 1740 |
begin |
|
13604
73b096e1d895
Fix hammer/pickhammer not digging land with gfSolidLand on
Wuzzy <Wuzzy2@mail.ru>
parents:
13603
diff
changeset
|
1741 |
doMakeExplosion(i, y + 3, 3, Gear^.Hedgehog, EXPLNoDamage or EXPLDoNotTouchAny or EXPLNoGfx or EXPLForceDraw); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1742 |
inc(i, 1) |
| 4578 | 1743 |
end; |
|
2331
e4941a7986d6
Another try at keeping blowtorch/firepunch/jackhammer from going through indestructible stuff. Shame these routines don't use hedgehog movement
nemo
parents:
2329
diff
changeset
|
1744 |
|
| 6314 | 1745 |
if CheckLandValue(hwRound(Gear^.X + Gear^.dX + SignAs(_6,Gear^.dX)), hwRound(Gear^.Y + _1_9), lfIndestructible) then |
| 4578 | 1746 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1747 |
Gear^.X := Gear^.X + Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1748 |
Gear^.Y := Gear^.Y + _1_9; |
| 4578 | 1749 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1750 |
SetAllHHToActive; |
| 4578 | 1751 |
end; |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
1752 |
if TestCollisionYwithGear(Gear, 1) <> 0 then |
| 4578 | 1753 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1754 |
Gear^.dY := _0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1755 |
SetLittle(HHGear^.dX); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1756 |
HHGear^.dY := _0; |
| 4578 | 1757 |
end |
|
11020
2aa09da8f3ef
fix pickhammer collision when moving upwards, thanks to MK for reporting
sheepluva
parents:
10993
diff
changeset
|
1758 |
else if Gear^.dY.isNegative and (TestCollisionYwithGear(HHGear, -1) <> 0) then |
|
2aa09da8f3ef
fix pickhammer collision when moving upwards, thanks to MK for reporting
sheepluva
parents:
10993
diff
changeset
|
1759 |
begin |
|
2aa09da8f3ef
fix pickhammer collision when moving upwards, thanks to MK for reporting
sheepluva
parents:
10993
diff
changeset
|
1760 |
Gear^.dY := cGravity; |
|
2aa09da8f3ef
fix pickhammer collision when moving upwards, thanks to MK for reporting
sheepluva
parents:
10993
diff
changeset
|
1761 |
HHGear^.dY := cGravity; |
|
2aa09da8f3ef
fix pickhammer collision when moving upwards, thanks to MK for reporting
sheepluva
parents:
10993
diff
changeset
|
1762 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1763 |
else |
| 4578 | 1764 |
begin |
|
8751
4609823efc94
More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places.
nemo
parents:
8744
diff
changeset
|
1765 |
if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y + Gear^.dY + cGravity), lfLandMask) then |
| 6314 | 1766 |
begin |
1767 |
Gear^.dY := Gear^.dY + cGravity; |
|
1768 |
Gear^.Y := Gear^.Y + Gear^.dY |
|
1769 |
end; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1770 |
if hwRound(Gear^.Y) > cWaterLine then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1771 |
Gear^.Timer := 1 |
| 4578 | 1772 |
end; |
| 4 | 1773 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1774 |
Gear^.X := Gear^.X + HHGear^.dX; |
|
8751
4609823efc94
More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places.
nemo
parents:
8744
diff
changeset
|
1775 |
if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y)-cHHRadius, lfLandMask) then |
| 6314 | 1776 |
begin |
1777 |
HHGear^.X := Gear^.X; |
|
1778 |
HHGear^.Y := Gear^.Y - int2hwFloat(cHHRadius) |
|
1779 |
end; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1780 |
|
| 3894 | 1781 |
if (Gear^.Message and gmAttack) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1782 |
if (Gear^.State and gsttmpFlag) <> 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1783 |
Gear^.Timer := 1 |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1784 |
else //there would be a mistake. |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1785 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1786 |
if (Gear^.State and gsttmpFlag) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1787 |
Gear^.State := Gear^.State or gsttmpFlag; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1788 |
if ((Gear^.Message and gmLeft) <> 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1789 |
Gear^.dX := - _0_3 |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1790 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1791 |
if ((Gear^.Message and gmRight) <> 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1792 |
Gear^.dX := _0_3 |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1793 |
else Gear^.dX := _0; |
| 4 | 1794 |
end; |
1795 |
||
1796 |
procedure doStepPickHammer(Gear: PGear); |
|
| 8795 | 1797 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1798 |
i, y: LongInt; |
| 4 | 1799 |
ar: TRangeArray; |
|
911
b709fe13ed69
Fix issue with hedgehog on top of the hedgehog with pickhammer
unc0rr
parents:
883
diff
changeset
|
1800 |
HHGear: PGear; |
| 4 | 1801 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1802 |
i := 0; |
| 4365 | 1803 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1804 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1805 |
y := hwRound(Gear^.Y) - cHHRadius * 2; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1806 |
while y < hwRound(Gear^.Y) do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1807 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1808 |
ar[i].Left := hwRound(Gear^.X) - Gear^.Radius - LongInt(GetRandom(2)); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1809 |
ar[i].Right := hwRound(Gear^.X) + Gear^.Radius + LongInt(GetRandom(2)); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1810 |
inc(y, 2); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1811 |
inc(i) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1812 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1813 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1814 |
DrawHLinesExplosions(@ar, 3, hwRound(Gear^.Y) - cHHRadius * 2, 2, Pred(i)); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1815 |
Gear^.dY := HHGear^.dY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1816 |
DeleteCI(HHGear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1817 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1818 |
Gear^.SoundChannel := LoopSound(sndPickhammer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1819 |
doStepPickHammerWork(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1820 |
Gear^.doStep := @doStepPickHammerWork |
| 4 | 1821 |
end; |
1822 |
||
1823 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 8795 | 1824 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1825 |
BTPrevAngle, BTSteps: LongInt; |
| 302 | 1826 |
|
|
303
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
1827 |
procedure doStepBlowTorchWork(Gear: PGear); |
| 8795 | 1828 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1829 |
HHGear: PGear; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
1830 |
b: boolean; |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
1831 |
prevX: LongInt; |
| 302 | 1832 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1833 |
AllInactive := false; |
| 14358 | 1834 |
WorldWrap(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1835 |
dec(Gear^.Timer); |
| 8795 | 1836 |
|
| 9385 | 1837 |
if Gear^.Hedgehog^.Gear = nil then |
1838 |
begin |
|
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
1839 |
StopSoundChan(Gear^.SoundChannel); |
| 9385 | 1840 |
DeleteGear(Gear); |
1841 |
AfterAttack; |
|
1842 |
exit |
|
1843 |
end; |
|
1844 |
||
| 4365 | 1845 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1846 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1847 |
HedgehogChAngle(HHGear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1848 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1849 |
b := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1850 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1851 |
if abs(LongInt(HHGear^.Angle) - BTPrevAngle) > 7 then |
| 5706 | 1852 |
begin |
|
5722
3b7f2bfc8632
Keep blowtorch direction (doesn't actually fix the bug with hedgehog turning opposite direction)
unc0rr
parents:
5716
diff
changeset
|
1853 |
Gear^.dX := SignAs(AngleSin(HHGear^.Angle) * _0_5, Gear^.dX); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1854 |
Gear^.dY := AngleCos(HHGear^.Angle) * ( - _0_5); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1855 |
BTPrevAngle := HHGear^.Angle; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1856 |
b := true |
| 5706 | 1857 |
end; |
| 1528 | 1858 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1859 |
if ((HHGear^.State and gstMoving) <> 0) then |
| 5706 | 1860 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1861 |
doStepHedgehogMoving(HHGear); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1862 |
if (HHGear^.State and gstHHDriven) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1863 |
Gear^.Timer := 0 |
| 5706 | 1864 |
end; |
| 305 | 1865 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1866 |
if Gear^.Timer mod cHHStepTicks = 0 then |
| 5706 | 1867 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1868 |
b := true; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1869 |
if Gear^.dX.isNegative then |
| 3894 | 1870 |
HHGear^.Message := (HHGear^.Message and (gmAttack or gmUp or gmDown)) or gmLeft |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1871 |
else |
| 3894 | 1872 |
HHGear^.Message := (HHGear^.Message and (gmAttack or gmUp or gmDown)) or gmRight; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1873 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1874 |
if ((HHGear^.State and gstMoving) = 0) then |
| 5706 | 1875 |
begin |
| 6450 | 1876 |
HHGear^.State := HHGear^.State and (not gstAttacking); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1877 |
prevX := hwRound(HHGear^.X); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1878 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1879 |
// why the call to HedgehogStep then a further increment of X? |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1880 |
if (prevX = hwRound(HHGear^.X)) and |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1881 |
CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y), |
| 3519 | 1882 |
lfIndestructible) then HedgehogStep(HHGear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1883 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1884 |
if (prevX = hwRound(HHGear^.X)) and |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1885 |
CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y), |
| 3519 | 1886 |
lfIndestructible) then HHGear^.X := HHGear^.X + SignAs(_1, HHGear^.dX); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1887 |
HHGear^.State := HHGear^.State or gstAttacking |
| 5706 | 1888 |
end; |
| 305 | 1889 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1890 |
inc(BTSteps); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1891 |
if BTSteps = 7 then |
| 5706 | 1892 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1893 |
BTSteps := 0; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1894 |
if CheckLandValue(hwRound(HHGear^.X + Gear^.dX * (cHHRadius + cBlowTorchC) + SignAs(_6,Gear^.dX)), hwRound(HHGear^.Y + Gear^.dY * (cHHRadius + cBlowTorchC)),lfIndestructible) then |
| 5706 | 1895 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1896 |
Gear^.X := HHGear^.X + Gear^.dX * (cHHRadius + cBlowTorchC); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1897 |
Gear^.Y := HHGear^.Y + Gear^.dY * (cHHRadius + cBlowTorchC); |
| 5706 | 1898 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1899 |
HHGear^.State := HHGear^.State or gstNoDamage; |
| 14358 | 1900 |
AmmoShove(Gear, Gear^.Boom, 15); |
| 6450 | 1901 |
HHGear^.State := HHGear^.State and (not gstNoDamage) |
| 5706 | 1902 |
end; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
1903 |
end; |
| 305 | 1904 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1905 |
if b then |
| 9385 | 1906 |
begin |
|
6278
654eed7c6b97
tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't
sheepluva
parents:
6251
diff
changeset
|
1907 |
DrawTunnel(HHGear^.X + Gear^.dX * cHHRadius, |
|
654eed7c6b97
tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't
sheepluva
parents:
6251
diff
changeset
|
1908 |
HHGear^.Y + Gear^.dY * cHHRadius - _1 - |
|
654eed7c6b97
tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't
sheepluva
parents:
6251
diff
changeset
|
1909 |
((hwAbs(Gear^.dX) / (hwAbs(Gear^.dX) + hwAbs(Gear^.dY))) * _0_5 * 7), |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1910 |
Gear^.dX, Gear^.dY, |
|
6278
654eed7c6b97
tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't
sheepluva
parents:
6251
diff
changeset
|
1911 |
cHHStepTicks, cHHRadius * 2 + 7); |
| 9385 | 1912 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1913 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1914 |
if (TurnTimeLeft = 0) or (Gear^.Timer = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1915 |
or ((HHGear^.Message and gmAttack) <> 0) then |
| 5706 | 1916 |
begin |
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
1917 |
StopSoundChan(Gear^.SoundChannel); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1918 |
HHGear^.Message := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1919 |
HHGear^.State := HHGear^.State and (not gstNotKickable); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1920 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1921 |
AfterAttack |
| 5706 | 1922 |
end |
| 302 | 1923 |
end; |
1924 |
||
|
303
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
1925 |
procedure doStepBlowTorch(Gear: PGear); |
| 8795 | 1926 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1927 |
HHGear: PGear; |
|
303
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
1928 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1929 |
BTPrevAngle := High(LongInt); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1930 |
BTSteps := 0; |
| 4365 | 1931 |
HHGear := Gear^.Hedgehog^.Gear; |
|
8617
e7bea88096d2
So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)
nemo
parents:
8612
diff
changeset
|
1932 |
HedgehogChAngle(HHGear); |
|
e7bea88096d2
So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)
nemo
parents:
8612
diff
changeset
|
1933 |
Gear^.dX := SignAs(AngleSin(HHGear^.Angle) * _0_5, Gear^.dX); |
|
e7bea88096d2
So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)
nemo
parents:
8612
diff
changeset
|
1934 |
Gear^.dY := AngleCos(HHGear^.Angle) * ( - _0_5); |
|
e7bea88096d2
So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)
nemo
parents:
8612
diff
changeset
|
1935 |
DrawTunnel(HHGear^.X, |
|
e7bea88096d2
So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)
nemo
parents:
8612
diff
changeset
|
1936 |
HHGear^.Y + Gear^.dY * cHHRadius - _1 - |
|
e7bea88096d2
So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)
nemo
parents:
8612
diff
changeset
|
1937 |
((hwAbs(Gear^.dX) / (hwAbs(Gear^.dX) + hwAbs(Gear^.dY))) * _0_5 * 7), |
|
e7bea88096d2
So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)
nemo
parents:
8612
diff
changeset
|
1938 |
Gear^.dX, Gear^.dY, |
|
e7bea88096d2
So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles)
nemo
parents:
8612
diff
changeset
|
1939 |
cHHStepTicks, cHHRadius * 2 + 7); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1940 |
HHGear^.Message := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1941 |
HHGear^.State := HHGear^.State or gstNotKickable; |
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
1942 |
Gear^.SoundChannel := LoopSound(sndBlowTorch); |
| 14358 | 1943 |
Gear^.doStep := @doStepBlowTorchWork |
|
303
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
1944 |
end; |
|
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
1945 |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
1946 |
|
| 302 | 1947 |
//////////////////////////////////////////////////////////////////////////////// |
| 10 | 1948 |
procedure doStepMine(Gear: PGear); |
|
5690
f6e0c5bd8020
Allow vgtSmoke to scale. Scale it down 50% for mines, so smoke doesn't seem so oversized
nemo
parents:
5688
diff
changeset
|
1949 |
var vg: PVisualGear; |
|
8958
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
1950 |
dxdy: hwFloat; |
|
10679
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
1951 |
dmg: LongWord; |
| 10 | 1952 |
begin |
| 9043 | 1953 |
if Gear^.Health = 0 then dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY); |
|
14771
ab7bf5036314
Render mine timer if gear info is active
Wuzzy <Wuzzy2@mail.ru>
parents:
14770
diff
changeset
|
1954 |
Gear^.RenderTimer:= ((Gear^.State and gstFrozen) = 0) and ((Gear^.State and gstAttacking) = 0) and (Gear^.Health <> 0); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1955 |
if (Gear^.State and gstMoving) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1956 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1957 |
DeleteCI(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1958 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1959 |
if (Gear^.State and gstMoving) = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1960 |
begin |
|
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9289
diff
changeset
|
1961 |
AddCI(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1962 |
Gear^.dX := _0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1963 |
Gear^.dY := _0 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1964 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1965 |
CalcRotationDirAngle(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1966 |
AllInactive := false |
| 7754 | 1967 |
end |
1968 |
else if (GameTicks and $3F) = 25 then |
|
1969 |
doStepFallingGear(Gear); |
|
|
4966
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1970 |
if (Gear^.Health = 0) then |
|
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1971 |
begin |
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
1972 |
if (dxdy > _0_4) and (Gear^.State and gstCollision <> 0) then |
|
10679
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
1973 |
begin |
|
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
1974 |
dmg:= hwRound(dxdy * _50); |
|
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
1975 |
inc(Gear^.Damage, dmg); |
|
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
1976 |
ScriptCall('onGearDamage', Gear^.UID, dmg)
|
|
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
1977 |
end; |
| 8795 | 1978 |
|
| 6498 | 1979 |
if ((GameTicks and $FF) = 0) and (Gear^.Damage > random(30)) then |
| 7754 | 1980 |
begin |
1981 |
vg:= AddVisualGear(hwRound(Gear^.X) - 4 + Random(8), hwRound(Gear^.Y) - 4 - Random(4), vgtSmoke); |
|
1982 |
if vg <> nil then |
|
1983 |
vg^.Scale:= 0.5 |
|
1984 |
end; |
|
|
4966
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1985 |
|
|
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1986 |
if (Gear^.Damage > 35) then |
|
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1987 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
1988 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
4966
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1989 |
DeleteGear(Gear); |
|
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1990 |
exit |
|
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1991 |
end |
|
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
1992 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1993 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1994 |
if ((Gear^.State and gsttmpFlag) <> 0) and (Gear^.Health <> 0) then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1995 |
if ((Gear^.State and gstAttacking) = 0) then |
|
4224
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
1996 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
1997 |
if ((GameTicks and $1F) = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1998 |
if CheckGearNear(Gear, gtHedgehog, 46, 32) <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
1999 |
Gear^.State := Gear^.State or gstAttacking |
|
4224
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2000 |
end |
|
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2001 |
else // gstAttacking <> 0 |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2002 |
begin |
|
4224
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2003 |
AllInactive := false; |
|
12171
115867d77982
Add back accidental removal of random mines
Wuzzy <almikes@aol.com>
parents:
12169
diff
changeset
|
2004 |
// tag of 1 means this mine has a random timer |
|
115867d77982
Add back accidental removal of random mines
Wuzzy <almikes@aol.com>
parents:
12169
diff
changeset
|
2005 |
if (Gear^.Tag = 1) and (Gear^.Timer = 0) then |
|
115867d77982
Add back accidental removal of random mines
Wuzzy <almikes@aol.com>
parents:
12169
diff
changeset
|
2006 |
begin |
|
115867d77982
Add back accidental removal of random mines
Wuzzy <almikes@aol.com>
parents:
12169
diff
changeset
|
2007 |
if (GameTicks mod 2 = 0) then GetRandom(2); |
|
115867d77982
Add back accidental removal of random mines
Wuzzy <almikes@aol.com>
parents:
12169
diff
changeset
|
2008 |
if (GameTicks mod 3 = 0) then GetRandom(2); |
|
115867d77982
Add back accidental removal of random mines
Wuzzy <almikes@aol.com>
parents:
12169
diff
changeset
|
2009 |
Gear^.Timer:= GetRandom(51) * 100; |
|
115867d77982
Add back accidental removal of random mines
Wuzzy <almikes@aol.com>
parents:
12169
diff
changeset
|
2010 |
Gear^.Tag:= 0; |
|
115867d77982
Add back accidental removal of random mines
Wuzzy <almikes@aol.com>
parents:
12169
diff
changeset
|
2011 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2012 |
if (Gear^.Timer and $FF) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2013 |
PlaySound(sndMineTick); |
|
4224
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2014 |
if Gear^.Timer = 0 then |
|
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2015 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2016 |
if ((Gear^.State and gstWait) <> 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2017 |
or (cMineDudPercent = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2018 |
or (getRandom(100) > cMineDudPercent) then |
|
4224
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2019 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2020 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
2021 |
DeleteGear(Gear); |
| 14577 | 2022 |
exit // redundant but we've had too many delete gear bugs |
|
4224
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2023 |
end |
|
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2024 |
else |
|
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2025 |
begin |
|
5690
f6e0c5bd8020
Allow vgtSmoke to scale. Scale it down 50% for mines, so smoke doesn't seem so oversized
nemo
parents:
5688
diff
changeset
|
2026 |
vg:= AddVisualGear(hwRound(Gear^.X) - 4 + Random(8), hwRound(Gear^.Y) - 4 - Random(4), vgtSmoke); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2027 |
if vg <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2028 |
vg^.Scale:= 0.5; |
|
4224
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2029 |
PlaySound(sndVaporize); |
|
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2030 |
Gear^.Health := 0; |
|
4966
fa612a614317
make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade
nemo
parents:
4956
diff
changeset
|
2031 |
Gear^.Damage := 0; |
| 6450 | 2032 |
Gear^.State := Gear^.State and (not gstAttacking) |
|
4224
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2033 |
end; |
|
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2034 |
exit |
|
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2035 |
end; |
|
99c6d87df131
No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time
nemo
parents:
4187
diff
changeset
|
2036 |
dec(Gear^.Timer); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2037 |
end |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2038 |
else // gsttmpFlag = 0 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2039 |
if (TurnTimeLeft = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2040 |
or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2041 |
or (Gear^.Hedgehog^.Gear = nil) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2042 |
Gear^.State := Gear^.State or gsttmpFlag; |
| 10 | 2043 |
end; |
| 57 | 2044 |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2045 |
procedure doStepAirMine(Gear: PGear); |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2046 |
var i,t,targDist,tmpDist: LongWord; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2047 |
targ, tmpG: PGear; |
| 12805 | 2048 |
trackSpeed, airFriction, tX, tY: hwFloat; |
| 10827 | 2049 |
isUnderwater: Boolean; |
| 14223 | 2050 |
sparkle: PVisualGear; |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2051 |
begin |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2052 |
targ:= nil; |
|
14771
ab7bf5036314
Render mine timer if gear info is active
Wuzzy <Wuzzy2@mail.ru>
parents:
14770
diff
changeset
|
2053 |
Gear^.RenderTimer:= ((Gear^.State and gstFrozen) = 0) and ((Gear^.State and gstAttacking) = 0); |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2054 |
if (Gear^.State and gstFrozen) <> 0 then |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2055 |
begin |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2056 |
if Gear^.Damage > 0 then |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2057 |
begin |
|
14364
2221c418026a
Pixel-perfect removal of exploding frozen air mines
Wuzzy <Wuzzy2@mail.ru>
parents:
14363
diff
changeset
|
2058 |
// Normal, damaging explosion |
|
2221c418026a
Pixel-perfect removal of exploding frozen air mines
Wuzzy <Wuzzy2@mail.ru>
parents:
14363
diff
changeset
|
2059 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
14365
e3e06b216e00
Frozen air mines: Don't erase land if gstNoGravity state is off
Wuzzy <Wuzzy2@mail.ru>
parents:
14364
diff
changeset
|
2060 |
if ((Gear^.State and gstNoGravity) <> 0) then |
|
e3e06b216e00
Frozen air mines: Don't erase land if gstNoGravity state is off
Wuzzy <Wuzzy2@mail.ru>
parents:
14364
diff
changeset
|
2061 |
// Remove land created by frozen air mine sprite pixel-perfectly |
|
e3e06b216e00
Frozen air mines: Don't erase land if gstNoGravity state is off
Wuzzy <Wuzzy2@mail.ru>
parents:
14364
diff
changeset
|
2062 |
EraseLand( |
|
e3e06b216e00
Frozen air mines: Don't erase land if gstNoGravity state is off
Wuzzy <Wuzzy2@mail.ru>
parents:
14364
diff
changeset
|
2063 |
hwRound(Gear^.X) - SpritesData[sprFrozenAirMine].Width div 2, |
|
e3e06b216e00
Frozen air mines: Don't erase land if gstNoGravity state is off
Wuzzy <Wuzzy2@mail.ru>
parents:
14364
diff
changeset
|
2064 |
hwRound(Gear^.Y) - SpritesData[sprFrozenAirMine].Height div 2, |
|
e3e06b216e00
Frozen air mines: Don't erase land if gstNoGravity state is off
Wuzzy <Wuzzy2@mail.ru>
parents:
14364
diff
changeset
|
2065 |
sprFrozenAirMine, 0, 0, false, false, false, false); |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
2066 |
DeleteGear(Gear); |
| 14577 | 2067 |
exit |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2068 |
end; |
| 15202 | 2069 |
if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) > _0_02.QWordValue) or ((GameTicks and $3F) = 15) then |
2070 |
doStepFallingGear(Gear); |
|
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2071 |
exit |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2072 |
end; |
| 10827 | 2073 |
isUnderwater:= CheckCoordInWater(hwRound(Gear^.X), hwRound(Gear^.Y) + Gear^.Radius); |
| 10800 | 2074 |
if Gear^.Pos > 0 then |
2075 |
begin |
|
2076 |
airFriction:= _1; |
|
| 10827 | 2077 |
if isUnderwater then |
2078 |
dec(airFriction.QWordValue,Gear^.Pos*2) |
|
2079 |
else |
|
2080 |
dec(airFriction.QWordValue,Gear^.Pos); |
|
| 10800 | 2081 |
Gear^.dX:= Gear^.dX*airFriction; |
2082 |
Gear^.dY:= Gear^.dY*airFriction |
|
2083 |
end; |
|
| 15202 | 2084 |
if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) > _0_02.QWordValue) or ((GameTicks and $3F) = 15) then |
2085 |
doStepFallingGear(Gear); |
|
| 10806 | 2086 |
if (TurnTimeLeft = 0) and ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) > _0_02.QWordValue) then |
2087 |
AllInactive := false; |
|
2088 |
||
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2089 |
// Disable targeting if airmine is not active yet |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2090 |
if ((Gear^.State and gsttmpFlag) = 0) then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2091 |
begin |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2092 |
if (TurnTimeLeft = 0) |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2093 |
or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2094 |
or (CurrentHedgehog^.Gear = nil) then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2095 |
begin |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2096 |
Gear^.FlightTime:= GameTicks; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2097 |
Gear^.State := Gear^.State or gsttmpFlag; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2098 |
Gear^.Hedgehog := nil; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2099 |
end; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2100 |
exit; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2101 |
end; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2102 |
|
| 14221 | 2103 |
//Disable targeting while the airmine is stunned |
2104 |
if Gear^.Tag <> 0 then |
|
2105 |
begin |
|
| 14223 | 2106 |
if ((Gear^.FlightTime and $FF) = 0) then |
2107 |
begin |
|
2108 |
sparkle:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust, 1); |
|
2109 |
if sparkle <> nil then |
|
2110 |
begin |
|
2111 |
sparkle^.dX:= 0.004 * (random(100) - 50); |
|
2112 |
sparkle^.dY:= -0.05 + 0.004 * (random(100) - 50); |
|
2113 |
sparkle^.Tint:= $D5CD8CFF; |
|
2114 |
sparkle^.Angle:= random(360); |
|
2115 |
end; |
|
2116 |
end; |
|
2117 |
||
| 14221 | 2118 |
dec(Gear^.FlightTime); |
2119 |
if Gear^.FlightTime = 0 then |
|
| 14225 | 2120 |
begin |
| 14221 | 2121 |
Gear^.Tag:= 0; |
| 14225 | 2122 |
Gear^.Hedgehog:= nil; |
2123 |
Gear^.State:= Gear^.State and (not gstAttacking); |
|
2124 |
Gear^.Timer:= Gear^.WDTimer |
|
2125 |
end; |
|
| 14221 | 2126 |
exit |
2127 |
end; |
|
2128 |
||
| 10806 | 2129 |
if (TurnTimeLeft = 0) or (Gear^.Angle = 0) or (Gear^.Hedgehog = nil) or (Gear^.Hedgehog^.Gear = nil) then |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2130 |
begin |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2131 |
Gear^.Hedgehog:= nil; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2132 |
targ:= nil; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2133 |
end |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2134 |
else if Gear^.Hedgehog <> nil then |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2135 |
targ:= Gear^.Hedgehog^.Gear; |
| 10800 | 2136 |
if targ <> nil then |
2137 |
begin |
|
| 12805 | 2138 |
tX:=Gear^.X-targ^.X; |
2139 |
tY:=Gear^.Y-targ^.Y; |
|
| 10800 | 2140 |
// allow escaping - should maybe flag this too |
| 14086 | 2141 |
if (GameTicks > Gear^.FlightTime + 10000) or |
| 14100 | 2142 |
(not ((tX.Round + tY.Round < Gear^.Angle * 9) and |
| 14086 | 2143 |
(hwRound(hwSqr(tX) + hwSqr(tY)) < sqr(Gear^.Angle * 6)))) |
2144 |
then |
|
| 10800 | 2145 |
targ:= nil |
2146 |
end; |
|
2147 |
||
|
10807
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2148 |
// If in ready timer, or after turn, or in first 5 seconds of turn (really a window due to extra time utility) |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2149 |
// or hunting is disabled due to seek radius of 0 then we aren't hunting |
|
10807
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2150 |
if (ReadyTimeLeft > 0) or (TurnTimeLeft = 0) or |
|
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2151 |
((TurnTimeLeft < cHedgehogTurnTime) and (cHedgehogTurnTime-TurnTimeLeft < 5000)) or |
|
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2152 |
(Gear^.Angle = 0) then |
|
10818
f642a28cab0c
Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
nemo
parents:
10815
diff
changeset
|
2153 |
gear^.State:= gear^.State and (not gstChooseTarget) |
|
10807
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2154 |
else if |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2155 |
// todo, allow not finding new target, set timeout on target retention |
|
10807
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2156 |
(Gear^.State and gstAttacking = 0) and |
|
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2157 |
((GameTicks and $FF) = 17) and |
|
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2158 |
(GameTicks > Gear^.FlightTime) then // recheck hunted hog |
|
66cde98f8cbe
Make the various mine states a bit clearer (inactive, active but not in seek mode, seek mode, chasing target)
nemo
parents:
10806
diff
changeset
|
2159 |
begin |
|
10818
f642a28cab0c
Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
nemo
parents:
10815
diff
changeset
|
2160 |
gear^.State:= gear^.State or gstChooseTarget; |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2161 |
if targ <> nil then |
| 12805 | 2162 |
targDist:= Distance(Gear^.X-targ^.X,Gear^.Y-targ^.Y).Round |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2163 |
else targDist:= 0; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2164 |
for t:= 0 to Pred(TeamsCount) do |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2165 |
with TeamsArray[t]^ do |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2166 |
for i:= 0 to cMaxHHIndex do |
| 14719 | 2167 |
if (Hedgehogs[i].Gear <> nil) and (Hedgehogs[i].Effects[heFrozen] = 0) then |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2168 |
begin |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2169 |
tmpG:= Hedgehogs[i].Gear; |
| 12805 | 2170 |
tX:=Gear^.X-tmpG^.X; |
2171 |
tY:=Gear^.Y-tmpG^.Y; |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2172 |
if (Gear^.Angle = $FFFFFFFF) or |
| 12805 | 2173 |
((tX.Round+tY.Round < Gear^.Angle) and |
2174 |
(hwRound(hwSqr(tX) + hwSqr(tY)) < sqr(Gear^.Angle))) then |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2175 |
begin |
| 12805 | 2176 |
if targ <> nil then tmpDist:= Distance(tX,tY).Round; |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2177 |
if (targ = nil) or (tmpDist < targDist) then |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2178 |
begin |
| 12805 | 2179 |
if targ = nil then targDist:= Distance(tX,tY).Round |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2180 |
else targDist:= tmpDist; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2181 |
Gear^.Hedgehog:= @Hedgehogs[i]; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2182 |
targ:= tmpG; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2183 |
end |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2184 |
end |
|
10791
0311c9fa7498
tweak a few params. still something wtf going on when on rope
nemo
parents:
10789
diff
changeset
|
2185 |
end; |
|
10802
089e43d01f74
Use the larger scaled airmine sprite originally intended, add some antidickery measures.
nemo
parents:
10800
diff
changeset
|
2186 |
if targ <> nil then Gear^.FlightTime:= GameTicks + 5000 |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2187 |
end; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2188 |
if targ <> nil then |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2189 |
begin |
|
10799
658794118fd8
initialise trackSpeed, add nil check before resetting seek timer
nemo
parents:
10798
diff
changeset
|
2190 |
trackSpeed:= _0; |
| 10827 | 2191 |
if isUnderwater then |
2192 |
trackSpeed.QWordValue:= Gear^.Power div 2 |
|
2193 |
else |
|
2194 |
trackSpeed.QWordValue:= Gear^.Power; |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2195 |
if (Gear^.X < targ^.X) and (Gear^.dX < _0_1) then |
| 12806 | 2196 |
if (WorldEdge = weWrap) and ((targ^.X - Gear^.X) > ((Gear^.X - int2hwFloat(LeftX)) + (int2hwFloat(RightX) - targ^.X))) then |
2197 |
Gear^.dX:= Gear^.dX-trackSpeed |
|
2198 |
else |
|
2199 |
Gear^.dX:= Gear^.dX+trackSpeed // please leave as an add. I like the effect |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2200 |
else if (Gear^.X > targ^.X) and (Gear^.dX > -_0_1) then |
| 12806 | 2201 |
if (WorldEdge = weWrap) and ((Gear^.X - targ^.X) > ((targ^.X - int2hwFloat(LeftX)) + (int2hwFloat(RightX) - Gear^.X))) then |
2202 |
Gear^.dX:= Gear^.dX+trackSpeed |
|
2203 |
else |
|
2204 |
Gear^.dX:= Gear^.dX-trackSpeed; |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2205 |
if (Gear^.Y < targ^.Y) and (Gear^.dY < _0_1) then |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2206 |
Gear^.dY:= Gear^.dY+trackSpeed |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2207 |
else if (Gear^.Y > targ^.Y) and (Gear^.dY > -_0_1) then |
|
10802
089e43d01f74
Use the larger scaled airmine sprite originally intended, add some antidickery measures.
nemo
parents:
10800
diff
changeset
|
2208 |
Gear^.dY:= Gear^.dY-trackSpeed |
| 10800 | 2209 |
end |
2210 |
else Gear^.Hedgehog:= nil; |
|
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2211 |
|
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2212 |
if ((Gear^.State and gstAttacking) = 0) then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2213 |
begin |
| 15202 | 2214 |
if (((GameTicks+Gear^.Uid) and $1F) = 0) then |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2215 |
begin |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2216 |
if targ <> nil then |
|
10794
ace862eda192
radius and sprite drawing tweaks to match the still temporary sprite. also a begin/end sheepluva suggested
nemo
parents:
10791
diff
changeset
|
2217 |
begin |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2218 |
tX:=Gear^.X-targ^.X; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2219 |
tY:=Gear^.Y-targ^.Y; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2220 |
if (tX.Round+tY.Round < Gear^.Boom) and |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2221 |
(hwRound(hwSqr(tX) + hwSqr(tY)) < sqr(Gear^.Boom)) then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2222 |
Gear^.State := Gear^.State or gstAttacking |
|
10794
ace862eda192
radius and sprite drawing tweaks to match the still temporary sprite. also a begin/end sheepluva suggested
nemo
parents:
10791
diff
changeset
|
2223 |
end |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2224 |
else if (Gear^.Angle > 0) and (CheckGearNear(Gear, gtHedgehog, Gear^.Boom, Gear^.Boom) <> nil) then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2225 |
Gear^.State := Gear^.State or gstAttacking |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2226 |
end |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2227 |
end |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2228 |
else // gstAttacking <> 0 |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2229 |
begin |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2230 |
AllInactive := false; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2231 |
if (Gear^.Timer and $FF) = 0 then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2232 |
PlaySound(sndMineTick); |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2233 |
if Gear^.Timer = 0 then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2234 |
begin |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2235 |
// recheck |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2236 |
if targ <> nil then |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2237 |
begin |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2238 |
tX:=Gear^.X-targ^.X; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2239 |
tY:=Gear^.Y-targ^.Y; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2240 |
if (tX.Round+tY.Round < Gear^.Boom) and |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2241 |
(hwRound(hwSqr(tX) + hwSqr(tY)) < sqr(Gear^.Boom)) then |
|
10791
0311c9fa7498
tweak a few params. still something wtf going on when on rope
nemo
parents:
10789
diff
changeset
|
2242 |
begin |
|
0311c9fa7498
tweak a few params. still something wtf going on when on rope
nemo
parents:
10789
diff
changeset
|
2243 |
Gear^.Hedgehog:= CurrentHedgehog; |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2244 |
tmpG:= FollowGear; |
| 13399 | 2245 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2246 |
FollowGear:= tmpG; |
|
10791
0311c9fa7498
tweak a few params. still something wtf going on when on rope
nemo
parents:
10789
diff
changeset
|
2247 |
DeleteGear(Gear); |
|
0311c9fa7498
tweak a few params. still something wtf going on when on rope
nemo
parents:
10789
diff
changeset
|
2248 |
exit |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2249 |
end |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2250 |
end |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2251 |
else if (Gear^.Angle > 0) and (CheckGearNear(Gear, gtHedgehog, Gear^.Boom, Gear^.Boom) <> nil) then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2252 |
begin |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2253 |
Gear^.Hedgehog:= CurrentHedgehog; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2254 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2255 |
DeleteGear(Gear); |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2256 |
exit |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2257 |
end; |
|
14769
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2258 |
Gear^.State:= Gear^.State and (not gstAttacking); |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2259 |
Gear^.Timer:= Gear^.WDTimer |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2260 |
end; |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2261 |
if Gear^.Timer > 0 then |
|
2ad6f0555e61
Fix air mine not colliding with crates initially (bug 679)
Wuzzy <Wuzzy2@mail.ru>
parents:
14763
diff
changeset
|
2262 |
dec(Gear^.Timer); |
|
10791
0311c9fa7498
tweak a few params. still something wtf going on when on rope
nemo
parents:
10789
diff
changeset
|
2263 |
end |
|
10789
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2264 |
end; |
|
acbf69e2e5cf
experiment with air mines. thought they could make shoppa... interesting. ToDo: Allow mines to give up, tweak distances, real graphics, toggle for whether they can acquire a new target while they haven't given up.
nemo
parents:
10736
diff
changeset
|
2265 |
|
| 39 | 2266 |
//////////////////////////////////////////////////////////////////////////////// |
| 3714 | 2267 |
procedure doStepSMine(Gear: PGear); |
|
9731
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
2268 |
var land: Word; |
| 3710 | 2269 |
begin |
| 3714 | 2270 |
// TODO: do real calculation? |
|
9731
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
2271 |
land:= TestCollisionXwithGear(Gear, 2); |
|
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
2272 |
if land = 0 then land:= TestCollisionYwithGear(Gear,-2); |
|
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
2273 |
if land = 0 then land:= TestCollisionXwithGear(Gear,-2); |
|
953197ac43d8
Make sticky mine respect lfBouncy, make hogs do same, kinda... make uCollisions return land w/ mask, restrict bouncy to advbounce gears only, which means piano doesn't bounce anymore
nemo
parents:
9724
diff
changeset
|
2274 |
if land = 0 then land:= TestCollisionYwithGear(Gear, 2); |
|
11305
a20f416c91ec
fix bug reported by S.D.: throwing a sticking mine into a bouncy pit never ends turn. see also http://hedgewars.org/node/6350
sheepluva
parents:
11286
diff
changeset
|
2275 |
if (land <> 0) and ((land and lfBouncy = 0) or ((Gear^.State and gstMoving) = 0)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2276 |
begin |
| 10964 | 2277 |
if ((Gear^.State and gstMoving) <> 0) or (not isZero(Gear^.dX)) or (not isZero(Gear^.dY)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2278 |
begin |
| 3717 | 2279 |
PlaySound(sndRopeAttach); |
|
4880
07e9849c6a70
bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair)
sheepluva
parents:
4874
diff
changeset
|
2280 |
Gear^.dX:= _0; |
|
07e9849c6a70
bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair)
sheepluva
parents:
4874
diff
changeset
|
2281 |
Gear^.dY:= _0; |
|
10164
0570d4b22187
AI doesn't skip till action on the map stops (mostly dedicated to highlander) + various small tweaks
unc0rr
parents:
10145
diff
changeset
|
2282 |
Gear^.State:= Gear^.State and (not gstMoving); |
|
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9289
diff
changeset
|
2283 |
AddCI(Gear); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2284 |
end; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2285 |
end |
| 3714 | 2286 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2287 |
begin |
|
10164
0570d4b22187
AI doesn't skip till action on the map stops (mostly dedicated to highlander) + various small tweaks
unc0rr
parents:
10145
diff
changeset
|
2288 |
Gear^.State:= Gear^.State or gstMoving; |
|
4880
07e9849c6a70
bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair)
sheepluva
parents:
4874
diff
changeset
|
2289 |
DeleteCI(Gear); |
| 3714 | 2290 |
doStepFallingGear(Gear); |
2291 |
AllInactive := false; |
|
2292 |
CalcRotationDirAngle(Gear); |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2293 |
end; |
| 3714 | 2294 |
|
|
14779
bc0e86b0347b
Don't show SMine timer if drowning
Wuzzy <Wuzzy2@mail.ru>
parents:
14771
diff
changeset
|
2295 |
Gear^.RenderTimer:= (Gear^.State and (gstFrozen or gstAttacking or gstDrowning) = 0); |
| 3710 | 2296 |
if ((Gear^.State and gsttmpFlag) <> 0) and (Gear^.Health <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2297 |
begin |
|
12299
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
2298 |
if ((Gear^.State and gstAttacking) = 0) and ((Gear^.State and gstFrozen) = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2299 |
begin |
| 3710 | 2300 |
if ((GameTicks and $1F) = 0) then |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2301 |
// FIXME - values taken from mine. use a gear val and set both to same |
|
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2302 |
if CheckGearNear(Gear, gtHedgehog, 46, 32) <> nil then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2303 |
Gear^.State := Gear^.State or gstAttacking |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2304 |
end |
|
12299
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
2305 |
else if (Gear^.State and gstFrozen) = 0 then // gstAttacking <> 0 |
|
9742
419e5c651870
Remove turntimeleft/hog gear check from smine if infinite attack is enabled. just use the flightime for that.
nemo
parents:
9731
diff
changeset
|
2306 |
begin |
|
4880
07e9849c6a70
bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair)
sheepluva
parents:
4874
diff
changeset
|
2307 |
AllInactive := false; |
|
07e9849c6a70
bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair)
sheepluva
parents:
4874
diff
changeset
|
2308 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2309 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2310 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
4880
07e9849c6a70
bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair)
sheepluva
parents:
4874
diff
changeset
|
2311 |
DeleteGear(Gear); |
|
07e9849c6a70
bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair)
sheepluva
parents:
4874
diff
changeset
|
2312 |
exit |
|
9742
419e5c651870
Remove turntimeleft/hog gear check from smine if infinite attack is enabled. just use the flightime for that.
nemo
parents:
9731
diff
changeset
|
2313 |
end |
|
419e5c651870
Remove turntimeleft/hog gear check from smine if infinite attack is enabled. just use the flightime for that.
nemo
parents:
9731
diff
changeset
|
2314 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2315 |
if (Gear^.Timer and $FF) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2316 |
PlaySound(sndMineTick); |
|
9742
419e5c651870
Remove turntimeleft/hog gear check from smine if infinite attack is enabled. just use the flightime for that.
nemo
parents:
9731
diff
changeset
|
2317 |
dec(Gear^.Timer); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2318 |
end |
|
9742
419e5c651870
Remove turntimeleft/hog gear check from smine if infinite attack is enabled. just use the flightime for that.
nemo
parents:
9731
diff
changeset
|
2319 |
end |
| 3710 | 2320 |
else // gsttmpFlag = 0 |
| 10015 | 2321 |
if ((GameFlags and gfInfAttack = 0) and ((TurnTimeLeft = 0) or (Gear^.Hedgehog^.Gear = nil))) |
|
9742
419e5c651870
Remove turntimeleft/hog gear check from smine if infinite attack is enabled. just use the flightime for that.
nemo
parents:
9731
diff
changeset
|
2322 |
or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2323 |
Gear^.State := Gear^.State or gsttmpFlag; |
| 3710 | 2324 |
end; |
2325 |
||
2326 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 39 | 2327 |
procedure doStepDynamite(Gear: PGear); |
2328 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2329 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2330 |
AllInactive := false; |
|
11527
44e646598e6a
sparkles for dynamite at sheepy's request. he can tweak values if he wishes
nemo
parents:
11523
diff
changeset
|
2331 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2332 |
if Gear^.Timer mod 166 = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2333 |
inc(Gear^.Tag); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2334 |
if Gear^.Timer = 1000 then // might need better timing |
|
14032
3c40754f6cfe
Add Grenade taunt when grenade close to hog is about to blow up
Wuzzy <Wuzzy2@mail.ru>
parents:
14030
diff
changeset
|
2335 |
makeHogsWorry(Gear^.X, Gear^.Y, 75, Gear^.Kind); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2336 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2337 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2338 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2339 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2340 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2341 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2342 |
dec(Gear^.Timer); |
| 39 | 2343 |
end; |
|
14
81f125629b25
- Mine checks whether a hedgehog is near less frequently
unc0rr
parents:
13
diff
changeset
|
2344 |
|
| 351 | 2345 |
/////////////////////////////////////////////////////////////////////////////// |
|
2941
566f967ec22f
White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING
nemo
parents:
2939
diff
changeset
|
2346 |
|
|
566f967ec22f
White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING
nemo
parents:
2939
diff
changeset
|
2347 |
procedure doStepRollingBarrel(Gear: PGear); |
| 8795 | 2348 |
var |
|
10679
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
2349 |
i, dmg: LongInt; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
2350 |
particle: PVisualGear; |
|
8958
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2351 |
dxdy: hwFloat; |
|
2941
566f967ec22f
White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING
nemo
parents:
2939
diff
changeset
|
2352 |
begin |
| 10490 | 2353 |
if (Gear^.dX.QWordValue = 0) and (Gear^.dY.QWordValue = 0) and (TestCollisionYwithGear(Gear, 1) = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2354 |
SetLittle(Gear^.dY); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2355 |
Gear^.State := Gear^.State or gstAnimation; |
| 9954 | 2356 |
if Gear^.Health < cBarrelHealth then Gear^.State:= Gear^.State and (not gstFrozen); |
| 8795 | 2357 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2358 |
if ((Gear^.dX.QWordValue <> 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2359 |
or (Gear^.dY.QWordValue <> 0)) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2360 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2361 |
DeleteCI(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2362 |
AllInactive := false; |
|
8958
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2363 |
dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY); |
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2364 |
doStepFallingGear(Gear); |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2365 |
if (Gear^.State and gstCollision <> 0) and(dxdy > _0_4) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2366 |
begin |
|
8958
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2367 |
if (TestCollisionYwithGear(Gear, 1) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2368 |
begin |
|
8958
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2369 |
Gear^.State := Gear^.State or gsttmpFlag; |
|
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2370 |
for i:= min(12, hwRound(dxdy*_10)) downto 0 do |
|
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2371 |
begin |
|
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2372 |
particle := AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12,vgtDust); |
|
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2373 |
if particle <> nil then |
|
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2374 |
particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480) |
|
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2375 |
end |
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2376 |
end; |
|
10679
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
2377 |
dmg:= hwRound(dxdy * _50); |
|
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
2378 |
inc(Gear^.Damage, dmg); |
|
5989c293955a
add a couple of onGearDamage callbacks to mine/barrel fall damage
nemo
parents:
10676
diff
changeset
|
2379 |
ScriptCall('onGearDamage', Gear^.UID, dmg)
|
|
8958
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2380 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2381 |
CalcRotationDirAngle(Gear); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2382 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2383 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2384 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2385 |
Gear^.State := Gear^.State or gsttmpFlag; |
|
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9289
diff
changeset
|
2386 |
AddCI(Gear) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2387 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2388 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2389 |
if not Gear^.dY.isNegative and (Gear^.dY < _0_001) and (TestCollisionYwithGear(Gear, 1) <> 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2390 |
Gear^.dY := _0; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2391 |
if hwAbs(Gear^.dX) < _0_001 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2392 |
Gear^.dX := _0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2393 |
|
|
5128
3c65326bb713
Check for 0 health to avoid div by 0. spotted by mikade.
nemo
parents:
5121
diff
changeset
|
2394 |
if (Gear^.Health > 0) and ((Gear^.Health * 100 div cBarrelHealth) < random(90)) and ((GameTicks and $FF) = 0) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2395 |
if (cBarrelHealth div Gear^.Health) > 2 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2396 |
AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmoke) |
|
2941
566f967ec22f
White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING
nemo
parents:
2939
diff
changeset
|
2397 |
else |
|
566f967ec22f
White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING
nemo
parents:
2939
diff
changeset
|
2398 |
AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmokeWhite); |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2399 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2400 |
dec(Gear^.Health, Gear^.Damage); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2401 |
Gear^.Damage := 0; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2402 |
if Gear^.Health <= 0 then |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2403 |
doStepCase(Gear) |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2404 |
else |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2405 |
// health texture (FlightTime = health when the last texture was generated) |
|
15049
20c80919d97d
Fix health case/barrel health texture being sometimes not created
Wuzzy <Wuzzy2@mail.ru>
parents:
15014
diff
changeset
|
2406 |
if (Gear^.Health <> Gear^.FlightTime) or (Gear^.Tex = nil) then |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2407 |
begin |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2408 |
Gear^.FlightTime:= Gear^.Health; |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2409 |
FreeAndNilTexture(Gear^.Tex); |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2410 |
Gear^.Tex := RenderStringTex(ansistring(inttostr(Gear^.Health)), $ff808080, fnt16); |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2411 |
end; |
|
2941
566f967ec22f
White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING
nemo
parents:
2939
diff
changeset
|
2412 |
end; |
|
566f967ec22f
White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING
nemo
parents:
2939
diff
changeset
|
2413 |
|
|
14
81f125629b25
- Mine checks whether a hedgehog is near less frequently
unc0rr
parents:
13
diff
changeset
|
2414 |
procedure doStepCase(Gear: PGear); |
| 8795 | 2415 |
var |
|
7406
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
2416 |
i, x, y: LongInt; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
2417 |
k: TGearType; |
|
7406
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
2418 |
dX, dY: HWFloat; |
|
4837
2ea0a152c319
Pass PHedgehog instead of PGear to stats. Fixes crash.
unc0rr
parents:
4824
diff
changeset
|
2419 |
hog: PHedgehog; |
|
7168
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7128
diff
changeset
|
2420 |
sparkles: PVisualGear; |
|
14
81f125629b25
- Mine checks whether a hedgehog is near less frequently
unc0rr
parents:
13
diff
changeset
|
2421 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2422 |
k := Gear^.Kind; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2423 |
|
| 3894 | 2424 |
if (Gear^.Message and gmDestroy) > 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2425 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2426 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2427 |
FreeActionsList; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2428 |
SetAllToActive; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2429 |
// something (hh, mine, etc...) could be on top of the case |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2430 |
with CurrentHedgehog^ do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2431 |
if Gear <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2432 |
Gear^.Message := Gear^.Message and (not (gmLJump or gmHJump)); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2433 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2434 |
end; |
| 9954 | 2435 |
if (k = gtExplosives) and (Gear^.Health < cBarrelHealth) then Gear^.State:= Gear^.State and (not gstFrozen); |
| 15 | 2436 |
|
| 8973 | 2437 |
if ((k <> gtExplosives) and (Gear^.Damage > 0)) or ((k = gtExplosives) and (Gear^.Health<=0)) then |
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2438 |
begin |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2439 |
x := hwRound(Gear^.X); |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2440 |
y := hwRound(Gear^.Y); |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2441 |
hog:= Gear^.Hedgehog; |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2442 |
|
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2443 |
if k = gtCase then |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2444 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2445 |
doMakeExplosion(x, y, Gear^.Boom, hog, EXPLAutoSound); |
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2446 |
for i:= 0 to 63 do |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2447 |
AddGear(x, y, gtFlame, 0, _0, _0, 0); |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2448 |
end |
|
12568
494d3e1c4810
Don't play “missed” taunt if a target has been hit
Wuzzy <almikes@aol.com>
parents:
12377
diff
changeset
|
2449 |
else if k = gtTarget then |
|
494d3e1c4810
Don't play “missed” taunt if a target has been hit
Wuzzy <almikes@aol.com>
parents:
12377
diff
changeset
|
2450 |
uStats.TargetHit() |
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2451 |
else if k = gtExplosives then |
| 14577 | 2452 |
begin |
2453 |
doMakeExplosion(x, y, Gear^.Boom, hog, EXPLAutoSound); |
|
2454 |
for i:= 0 to 31 do |
|
2455 |
begin |
|
2456 |
dX := AngleCos(i * 64) * _0_5 * (getrandomf + _1); |
|
2457 |
dY := AngleSin(i * 64) * _0_5 * (getrandomf + _1); |
|
2458 |
AddGear(x, y, gtFlame, 0, dX, dY, 0); |
|
2459 |
AddGear(x, y, gtFlame, gstTmpFlag, -dX, -dY, 0); |
|
2460 |
end |
|
2461 |
end; |
|
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
2462 |
DeleteGear(Gear); |
| 14577 | 2463 |
exit |
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2464 |
end; |
| 15 | 2465 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2466 |
if k = gtExplosives then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2467 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2468 |
if (hwAbs(Gear^.dX) > _0_15) or ((hwAbs(Gear^.dY) > _0_15) and (hwAbs(Gear^.dX) > _0_02)) then |
|
8962
9780e79619ed
So. This at least should make the math more accurate, even if it still doesn't appear to resolve prob w/ AI attacks
nemo
parents:
8958
diff
changeset
|
2469 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2470 |
Gear^.doStep := @doStepRollingBarrel; |
|
8962
9780e79619ed
So. This at least should make the math more accurate, even if it still doesn't appear to resolve prob w/ AI attacks
nemo
parents:
8958
diff
changeset
|
2471 |
exit; |
|
9780e79619ed
So. This at least should make the math more accurate, even if it still doesn't appear to resolve prob w/ AI attacks
nemo
parents:
8958
diff
changeset
|
2472 |
end |
|
8958
3818b38d72c0
simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines.
nemo
parents:
8952
diff
changeset
|
2473 |
else Gear^.dX:= _0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2474 |
|
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2475 |
if ((Gear^.Health * 100 div cBarrelHealth) < random(90)) and ((GameTicks and $FF) = 0) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2476 |
if (cBarrelHealth div Gear^.Health) > 2 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2477 |
AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmoke) |
|
8971
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2478 |
else |
|
fcb29a13b1b1
Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing.
nemo
parents:
8962
diff
changeset
|
2479 |
AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmokeWhite); |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2480 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2481 |
dec(Gear^.Health, Gear^.Damage); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2482 |
Gear^.Damage := 0; |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2483 |
// health texture (FlightTime = health when the last texture was generated) |
|
15049
20c80919d97d
Fix health case/barrel health texture being sometimes not created
Wuzzy <Wuzzy2@mail.ru>
parents:
15014
diff
changeset
|
2484 |
if (Gear^.Health <> Gear^.FlightTime) or (Gear^.Tex = nil) then |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2485 |
begin |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2486 |
Gear^.FlightTime:= Gear^.Health; |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2487 |
FreeAndNilTexture(Gear^.Tex); |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2488 |
Gear^.Tex := RenderStringTex(ansistring(inttostr(Gear^.Health)), $ff808080, fnt16); |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2489 |
end; |
|
7168
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7128
diff
changeset
|
2490 |
end |
|
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7128
diff
changeset
|
2491 |
else |
| 8795 | 2492 |
begin |
|
14770
533ac9774279
Add key to display extra gear info tags
Wuzzy <Wuzzy2@mail.ru>
parents:
14769
diff
changeset
|
2493 |
// health texture for health crate |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2494 |
if (k = gtCase) and ((Gear^.Pos and posCaseHealth) <> 0) then |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2495 |
begin |
|
14770
533ac9774279
Add key to display extra gear info tags
Wuzzy <Wuzzy2@mail.ru>
parents:
14769
diff
changeset
|
2496 |
if ((Gear^.State and gstFrozen) = 0) then |
|
14782
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2497 |
begin |
| 14780 | 2498 |
// Karma=2: Always hide health |
2499 |
if (Gear^.Karma = 2) then |
|
|
14782
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2500 |
i:= 0 |
| 14780 | 2501 |
// Karma=1: Hide health in game, but show in demo |
|
14782
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2502 |
else if (Gear^.Karma = 1) then |
|
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2503 |
if (GameType in [gmtDemo, gmtRecord]) then |
|
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2504 |
i:= 1 |
|
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2505 |
else |
|
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2506 |
i:= 0 |
| 14780 | 2507 |
// Always show health (default) |
2508 |
else |
|
|
14782
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2509 |
i:= 1; |
|
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2510 |
if i = 1 then |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2511 |
begin |
|
15049
20c80919d97d
Fix health case/barrel health texture being sometimes not created
Wuzzy <Wuzzy2@mail.ru>
parents:
15014
diff
changeset
|
2512 |
if (Gear^.Health <> Gear^.FlightTime) or (Gear^.Tex = nil) then |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2513 |
begin |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2514 |
Gear^.FlightTime:= Gear^.Health; |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2515 |
FreeAndNilTexture(Gear^.Tex); |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2516 |
Gear^.Tex := RenderStringTex(ansistring(inttostr(Gear^.Health)), $ff80ff80, fnt16) |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2517 |
end |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2518 |
end |
|
14782
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2519 |
else |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2520 |
begin |
|
15049
20c80919d97d
Fix health case/barrel health texture being sometimes not created
Wuzzy <Wuzzy2@mail.ru>
parents:
15014
diff
changeset
|
2521 |
if (Gear^.FlightTime <> $ffffffff) or (Gear^.Tex = nil) then |
|
14976
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2522 |
begin |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2523 |
Gear^.FlightTime:= $ffffffff; |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2524 |
FreeAndNilTexture(Gear^.Tex); |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2525 |
Gear^.Tex := RenderStringTex(trmsg[sidUnknownGearValue], $ff80ff80, fnt16) |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2526 |
end |
|
088c1d319612
if at all possible, don't regenerate arbitrary number of health textures each tick
alfadur
parents:
14958
diff
changeset
|
2527 |
end |
|
14782
1b82538970ca
Fix health crate health display not respecting Karma value properly
Wuzzy <Wuzzy2@mail.ru>
parents:
14780
diff
changeset
|
2528 |
end; |
|
14770
533ac9774279
Add key to display extra gear info tags
Wuzzy <Wuzzy2@mail.ru>
parents:
14769
diff
changeset
|
2529 |
end; |
| 7276 | 2530 |
if Gear^.Timer = 500 then |
2531 |
begin |
|
|
7168
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7128
diff
changeset
|
2532 |
(* Can't make sparkles team coloured without working out what the next team is going to be. This should be solved, really, since it also screws up |
|
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7128
diff
changeset
|
2533 |
voices. Reinforcements voices is heard for active team, not team-to-be. Either that or change crate spawn from end of turn to start, although that |
|
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7128
diff
changeset
|
2534 |
has its own complexities. *) |
| 7276 | 2535 |
// Abuse a couple of gear values to track origin |
| 7339 | 2536 |
Gear^.Angle:= hwRound(Gear^.Y); |
| 7276 | 2537 |
Gear^.Tag:= random(2); |
2538 |
inc(Gear^.Timer) |
|
2539 |
end; |
|
2540 |
if Gear^.Timer < 1833 then inc(Gear^.Timer); |
|
2541 |
if Gear^.Timer = 1000 then |
|
|
7168
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7128
diff
changeset
|
2542 |
begin |
| 7339 | 2543 |
sparkles:= AddVisualGear(hwRound(Gear^.X), Gear^.Angle, vgtDust, 1); |
| 7276 | 2544 |
if sparkles <> nil then |
2545 |
begin |
|
2546 |
sparkles^.dX:= 0; |
|
2547 |
sparkles^.dY:= 0; |
|
2548 |
sparkles^.Angle:= 270; |
|
| 8795 | 2549 |
if Gear^.Tag = 1 then |
| 7276 | 2550 |
sparkles^.Tint:= $3744D7FF |
2551 |
else sparkles^.Tint:= $FAB22CFF |
|
2552 |
end; |
|
2553 |
end; |
|
| 8795 | 2554 |
if Gear^.Timer < 1000 then |
| 7283 | 2555 |
begin |
2556 |
AllInactive:= false; |
|
2557 |
exit |
|
2558 |
end |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2559 |
end; |
| 2911 | 2560 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2561 |
|
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2562 |
if (Gear^.dY.QWordValue <> 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2563 |
or (TestCollisionYwithGear(Gear, 1) = 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2564 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2565 |
AllInactive := false; |
|
7661
3046ad5b361e
fix for issue 376 (embedding barrels in ceiling)
sheepluva
parents:
7659
diff
changeset
|
2566 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2567 |
Gear^.dY := Gear^.dY + cGravity; |
|
7661
3046ad5b361e
fix for issue 376 (embedding barrels in ceiling)
sheepluva
parents:
7659
diff
changeset
|
2568 |
|
| 9820 | 2569 |
if ((not Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, 1) <> 0)) or |
2570 |
(Gear^.dY.isNegative and (TestCollisionYwithGear(Gear, -1) <> 0)) then |
|
2571 |
Gear^.dY := _0 |
|
2572 |
else Gear^.Y := Gear^.Y + Gear^.dY; |
|
|
7661
3046ad5b361e
fix for issue 376 (embedding barrels in ceiling)
sheepluva
parents:
7659
diff
changeset
|
2573 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2574 |
if (not Gear^.dY.isNegative) and (Gear^.dY > _0_001) then |
|
8579
d18bc19d780a
graphics tweak. flag a couple more overeager setall HH
nemo
parents:
8578
diff
changeset
|
2575 |
SetAllHHToActive(false); |
|
7661
3046ad5b361e
fix for issue 376 (embedding barrels in ceiling)
sheepluva
parents:
7659
diff
changeset
|
2576 |
|
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
2577 |
if (not Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, 1) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2578 |
begin |
|
3473
f80431269806
Increase minimum threshold for barrel damage to reduce likelihood of blowing one up on jumping out, increase damage to compensate (may need tweaking). Only apply dX for collision w/ kick if barrel is rolling.
nemo
parents:
3471
diff
changeset
|
2579 |
if (Gear^.dY > _0_2) and (k = gtExplosives) then |
|
f80431269806
Increase minimum threshold for barrel damage to reduce likelihood of blowing one up on jumping out, increase damage to compensate (may need tweaking). Only apply dX for collision w/ kick if barrel is rolling.
nemo
parents:
3471
diff
changeset
|
2580 |
inc(Gear^.Damage, hwRound(Gear^.dY * _70)); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2581 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2582 |
if Gear^.dY > _0_2 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2583 |
for i:= min(12, hwRound(Gear^.dY*_10)) downto 0 do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2584 |
AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust); |
| 8795 | 2585 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2586 |
Gear^.dY := - Gear^.dY * Gear^.Elasticity; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2587 |
if Gear^.dY > - _0_001 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2588 |
Gear^.dY := _0 |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2589 |
else if Gear^.dY < - _0_03 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2590 |
PlaySound(Gear^.ImpactSound); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2591 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2592 |
CheckGearDrowning(Gear); |
|
14958
896707084562
Don't render health crate and barrel health when drowning
Wuzzy <Wuzzy2@mail.ru>
parents:
14957
diff
changeset
|
2593 |
if ((Gear^.State and gstDrowning) <> 0) then |
|
896707084562
Don't render health crate and barrel health when drowning
Wuzzy <Wuzzy2@mail.ru>
parents:
14957
diff
changeset
|
2594 |
Gear^.RenderHealth:= false; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2595 |
end; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2596 |
|
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2597 |
if (Gear^.dY.QWordValue = 0) then |
|
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9289
diff
changeset
|
2598 |
AddCI(Gear) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2599 |
else if (Gear^.dY.QWordValue <> 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2600 |
DeleteCI(Gear) |
|
14
81f125629b25
- Mine checks whether a hedgehog is near less frequently
unc0rr
parents:
13
diff
changeset
|
2601 |
end; |
| 49 | 2602 |
|
2603 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 2460 | 2604 |
|
2605 |
procedure doStepTarget(Gear: PGear); |
|
2606 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2607 |
if (Gear^.Timer = 0) and (Gear^.Tag = 0) then |
|
9724
b3fefde4cff7
fixing position of spawning sparkles of target gears by applying a filthy workaround for a filthy bug in the filthy filthy doStepCase handler.
sheepluva
parents:
9723
diff
changeset
|
2608 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2609 |
PlaySound(sndWarp); |
|
9724
b3fefde4cff7
fixing position of spawning sparkles of target gears by applying a filthy workaround for a filthy bug in the filthy filthy doStepCase handler.
sheepluva
parents:
9723
diff
changeset
|
2610 |
// workaround: save spawn Y for doStepCase (which is a mess atm) |
|
b3fefde4cff7
fixing position of spawning sparkles of target gears by applying a filthy workaround for a filthy bug in the filthy filthy doStepCase handler.
sheepluva
parents:
9723
diff
changeset
|
2611 |
Gear^.Angle:= hwRound(Gear^.Y); |
|
b3fefde4cff7
fixing position of spawning sparkles of target gears by applying a filthy workaround for a filthy bug in the filthy filthy doStepCase handler.
sheepluva
parents:
9723
diff
changeset
|
2612 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2613 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2614 |
if (Gear^.Tag = 0) and (Gear^.Timer < 1000) then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2615 |
inc(Gear^.Timer) |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2616 |
else if Gear^.Tag = 1 then |
| 4808 | 2617 |
Gear^.Tag := 2 |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2618 |
else if Gear^.Tag = 2 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2619 |
if Gear^.Timer > 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2620 |
dec(Gear^.Timer) |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
2621 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2622 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2623 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2624 |
exit; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2625 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2626 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2627 |
doStepCase(Gear) |
| 2460 | 2628 |
end; |
2629 |
||
2630 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 854 | 2631 |
procedure doStepIdle(Gear: PGear); |
2632 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2633 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2634 |
dec(Gear^.Timer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2635 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2636 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2637 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2638 |
AfterAttack |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2639 |
end |
| 854 | 2640 |
end; |
2641 |
||
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
2642 |
//////////////////////////////////////////////////////////////////////////////// |
| 79 | 2643 |
procedure doStepShover(Gear: PGear); |
| 8795 | 2644 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2645 |
HHGear: PGear; |
| 79 | 2646 |
begin |
| 12119 | 2647 |
dec(Gear^.Timer); |
2648 |
if Gear^.Timer = 0 then |
|
2649 |
begin |
|
2650 |
inc(Gear^.Tag); |
|
|
14030
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2651 |
Gear^.Timer := 50; |
|
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2652 |
if Gear^.Tag = 3 then |
|
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2653 |
begin |
|
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2654 |
ClearHitOrder(); |
|
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2655 |
RefillProximityCache(Gear, 100); |
|
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2656 |
end; |
| 12828 | 2657 |
end; |
2658 |
||
2659 |
if Gear^.Tag = 3 then |
|
| 12119 | 2660 |
begin |
2661 |
HHGear := Gear^.Hedgehog^.Gear; |
|
2662 |
HHGear^.State := HHGear^.State or gstNoDamage; |
|
2663 |
DeleteCI(HHGear); |
|
2664 |
||
|
14030
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2665 |
AmmoShoveCache(Gear, Gear^.Boom, 115); |
| 12119 | 2666 |
|
2667 |
HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving; |
|
| 12828 | 2668 |
end |
2669 |
else if Gear^.Tag = 4 then |
|
2670 |
begin |
|
|
14030
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2671 |
ClearHitOrder(); |
|
d203bb36225f
and finally make the bat hit moving gears for completeness
alfadur
parents:
14029
diff
changeset
|
2672 |
ClearProximityCache(); |
| 12119 | 2673 |
Gear^.Timer := 250; |
2674 |
Gear^.doStep := @doStepIdle |
|
2675 |
end |
|
| 79 | 2676 |
end; |
2677 |
||
2678 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 925 | 2679 |
procedure doStepWhip(Gear: PGear); |
| 8795 | 2680 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2681 |
HHGear: PGear; |
| 925 | 2682 |
i: LongInt; |
2683 |
begin |
|
| 4365 | 2684 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2685 |
HHGear^.State := HHGear^.State or gstNoDamage; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2686 |
DeleteCI(HHGear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2687 |
|
| 14029 | 2688 |
ClearHitOrder(); |
2689 |
RefillProximityCache(Gear, 100); |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2690 |
for i:= 0 to 3 do |
| 4578 | 2691 |
begin |
|
9723
31d10d684e90
whip: visual enhancements (hat'n'dust) as suggested by nemo
sheepluva
parents:
9721
diff
changeset
|
2692 |
AddVisualGear(hwRound(Gear^.X) + hwSign(Gear^.dX) * (10 + 6 * i), hwRound(Gear^.Y) + 12 + Random(6), vgtDust); |
| 14029 | 2693 |
AmmoShoveCache(Gear, Gear^.Boom, 25); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2694 |
Gear^.X := Gear^.X + Gear^.dX * 5 |
| 4578 | 2695 |
end; |
| 925 | 2696 |
|
| 14029 | 2697 |
ClearHitOrder(); |
2698 |
ClearProximityCache(); |
|
| 4182 | 2699 |
HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving; |
2700 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2701 |
Gear^.Timer := 250; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2702 |
Gear^.doStep := @doStepIdle |
| 925 | 2703 |
end; |
2704 |
||
2705 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 79 | 2706 |
procedure doStepFlame(Gear: PGear); |
| 8795 | 2707 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2708 |
gX,gY,i: LongInt; |
|
3609
bc63ed514b70
Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle)
nemo
parents:
3603
diff
changeset
|
2709 |
sticky: Boolean; |
| 3751 | 2710 |
vgt: PVisualGear; |
| 10591 | 2711 |
tdX,tdY, f: HWFloat; |
|
9362
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2712 |
landPixel: Word; |
| 79 | 2713 |
begin |
|
15246
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2714 |
WorldWrap(Gear); |
|
10586
dbb77726f0c6
add a half-second flighttime delay to flamethrower flames so they can leave the "barrel" of the flamethrower without burning the hog
nemo
parents:
10582
diff
changeset
|
2715 |
if Gear^.FlightTime > 0 then dec(Gear^.FlightTime); |
| 15014 | 2716 |
// There are 2 flame types: normal and sticky |
|
3609
bc63ed514b70
Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle)
nemo
parents:
3603
diff
changeset
|
2717 |
sticky:= (Gear^.State and gsttmpFlag) <> 0; |
|
bc63ed514b70
Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle)
nemo
parents:
3603
diff
changeset
|
2718 |
if not sticky then AllInactive := false; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2719 |
|
|
9362
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2720 |
landPixel:= TestCollisionYwithGear(Gear, 1); |
| 15014 | 2721 |
// Flame is in mid-air |
|
9362
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2722 |
if landPixel = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2723 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2724 |
AllInactive := false; |
| 3751 | 2725 |
|
| 15014 | 2726 |
// Deals damage in mid-air if FlightTime = 0. |
2727 |
// Otherwise, flame is harmless in mid-air. |
|
2728 |
// Intended for use with scripts. |
|
|
10586
dbb77726f0c6
add a half-second flighttime delay to flamethrower flames so they can leave the "barrel" of the flamethrower without burning the hog
nemo
parents:
10582
diff
changeset
|
2729 |
if (GameTicks and $F = 0) and (Gear^.FlightTime = 0) then |
|
10578
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2730 |
begin |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2731 |
Gear^.Radius := 7; |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2732 |
tdX:= Gear^.dX; |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2733 |
tdY:= Gear^.dY; |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2734 |
Gear^.dX.QWordValue:= 120000000; |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2735 |
Gear^.dY.QWordValue:= 429496730; |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2736 |
Gear^.dX.isNegative:= getrandom(2)<>1; |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2737 |
Gear^.dY.isNegative:= true; |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2738 |
AmmoShove(Gear, Gear^.Boom, 125); |
|
10578
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2739 |
Gear^.dX:= tdX; |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2740 |
Gear^.dY:= tdY; |
|
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2741 |
Gear^.Radius := 1 |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
2742 |
end; |
|
10578
814acf1511be
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo
parents:
10547
diff
changeset
|
2743 |
|
| 3751 | 2744 |
if ((GameTicks mod 100) = 0) then |
2745 |
begin |
|
|
4443
d393b9ccd328
Add an extra pass in FindPlace for AI resurrection mode to try to make it unwinnable, add DeleteGear, DeleteVisualGear, AddVisualGear, GetVisualGearValues, SetVisualGearValues to Lua
nemo
parents:
4405
diff
changeset
|
2746 |
vgt:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtFire, gstTmpFlag); |
| 3751 | 2747 |
if vgt <> nil then |
2748 |
begin |
|
2749 |
vgt^.dx:= 0; |
|
2750 |
vgt^.dy:= 0; |
|
2751 |
vgt^.FrameTicks:= 1800 div (Gear^.Tag mod 3 + 2); |
|
2752 |
end; |
|
2753 |
end; |
|
2754 |
||
| 10591 | 2755 |
if (Gear^.dX.QWordValue > _2.QWordValue) |
2756 |
or (Gear^.dY.QWordValue > _2.QWordValue) |
|
2757 |
then |
|
2758 |
begin |
|
2759 |
// norm speed vector to length of 2 for fire particles to keep flying in the same direction |
|
|
10642
8fdfa2b77d83
Normalize to length of _1_9 to avoid endless normalization leading to fire particles floating midair indefinitely
unc0rr
parents:
10634
diff
changeset
|
2760 |
f:= _1_9 / Distance(Gear^.dX, Gear^.dY); |
| 10591 | 2761 |
Gear^.dX:= Gear^.dX * f; |
2762 |
Gear^.dY:= Gear^.dY * f; |
|
2763 |
end |
|
2764 |
else begin |
|
| 15014 | 2765 |
// Gravity and wind |
| 10591 | 2766 |
if Gear^.dX.QWordValue > _0_01.QWordValue then |
2767 |
Gear^.dX := Gear^.dX * _0_995; |
|
2768 |
||
2769 |
Gear^.dY := Gear^.dY + cGravity; |
|
2770 |
||
2771 |
if Gear^.dY.QWordValue > _0_2.QWordValue then |
|
2772 |
Gear^.dY := Gear^.dY * _0_995; |
|
2773 |
||
|
15246
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2774 |
// Apply speed changes |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2775 |
|
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2776 |
tdX:= Gear^.dX + cWindSpeed * 640; |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2777 |
// Don't apply wind speed if moving against bounce world edge |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2778 |
if (WorldEdge = weBounce) and |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2779 |
(((hwRound(Gear^.X + tdX) - Gear^.Radius < leftX) and (hwSign(tdX) = -1)) or |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2780 |
((hwRound(Gear^.X + tdX) + Gear^.Radius > rightX) and (hwSign(tdX) = 1))) then |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2781 |
Gear^.X := Gear^.X + Gear^.dX |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2782 |
else |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2783 |
// Apply dX and wind speed |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2784 |
Gear^.X := Gear^.X + tdX; |
|
ebbc2f04b863
Make flames collide with bounce world edge again, properly this time
Wuzzy <Wuzzy2@mail.ru>
parents:
15245
diff
changeset
|
2785 |
|
| 10591 | 2786 |
Gear^.Y := Gear^.Y + Gear^.dY; |
2787 |
end; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2788 |
|
| 10354 | 2789 |
gX := hwRound(Gear^.X); |
2790 |
gY := hwRound(Gear^.Y); |
|
2791 |
||
| 15014 | 2792 |
// Extinguish in water |
| 10354 | 2793 |
if CheckCoordInWater(gX, gY) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2794 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2795 |
for i:= 0 to 3 do |
| 10354 | 2796 |
AddVisualGear(gX - 8 + Random(16), gY - 8 + Random(16), vgtSteam); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2797 |
PlaySound(sndVaporize); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2798 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2799 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2800 |
end |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
2801 |
end |
| 15014 | 2802 |
// Flame is on terrain |
| 10015 | 2803 |
else |
|
9362
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2804 |
begin |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2805 |
if (Gear^.Timer = 1) and (GameTicks and $3 = 0) then |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2806 |
begin |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2807 |
Gear^.Y:= Gear^.Y+_6; |
| 15014 | 2808 |
// Extinguish on ice |
|
9362
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2809 |
if (landPixel and lfIce <> 0) or (TestCollisionYwithGear(Gear, 1) and lfIce <> 0) then |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2810 |
begin |
|
10379
caa5b40e405b
I a recent commit I caused flames to use uninitialized values. that lead to fire burning slow and desyncs. this commit fixes/reverts this
sheepluva
parents:
10372
diff
changeset
|
2811 |
gX := hwRound(Gear^.X); |
|
caa5b40e405b
I a recent commit I caused flames to use uninitialized values. that lead to fire burning slow and desyncs. this commit fixes/reverts this
sheepluva
parents:
10372
diff
changeset
|
2812 |
gY := hwRound(Gear^.Y) - 6; |
|
13566
acc69f506914
Use wrap-aware doMakeExplosion instead of DrawExplosion in uHandlersMess
Wuzzy <Wuzzy2@mail.ru>
parents:
13470
diff
changeset
|
2813 |
doMakeExplosion(gX, gY, 4, Gear^.Hedgehog, EXPLNoDamage or EXPLDoNotTouchAny or EXPLNoGfx); |
|
9362
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2814 |
PlaySound(sndVaporize); |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2815 |
AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSteam); |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2816 |
DeleteGear(Gear); |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2817 |
exit |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2818 |
end; |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2819 |
Gear^.Y:= Gear^.Y-_6 |
|
c9fdf8a3baf0
crude ice check that probably works well enough in most cases (so far there's just one ucollisions that returns a land pixel - might want to extend that)
nemo
parents:
9356
diff
changeset
|
2820 |
end; |
| 15014 | 2821 |
// Sticky flame damage |
|
9261
6e4feb4191a0
reduce shove frequency (perf). reduce dX so that less time is spent sliding.
nemo
parents:
9251
diff
changeset
|
2822 |
if sticky and (GameTicks and $F = 0) then |
| 5024 | 2823 |
begin |
|
3603
b6b1989744ef
Grid the landscape, and shortcircuit checks on the collision array if there are no nearby checked in collisions to be collided with. This is a big win for fire's ammoshove in particular. Also add a +2 that seemed missing in the check, and update fire accordingly.
nemo
parents:
3594
diff
changeset
|
2824 |
Gear^.Radius := 7; |
|
5415
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2825 |
tdX:= Gear^.dX; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2826 |
tdY:= Gear^.dY; |
|
9261
6e4feb4191a0
reduce shove frequency (perf). reduce dX so that less time is spent sliding.
nemo
parents:
9251
diff
changeset
|
2827 |
Gear^.dX.QWordValue:= 120000000; |
|
5415
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2828 |
Gear^.dY.QWordValue:= 429496730; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2829 |
Gear^.dX.isNegative:= getrandom(2)<>1; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2830 |
Gear^.dY.isNegative:= true; |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2831 |
AmmoShove(Gear, Gear^.Boom, 125); |
|
5415
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2832 |
Gear^.dX:= tdX; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2833 |
Gear^.dY:= tdY; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2834 |
Gear^.Radius := 1 |
| 5024 | 2835 |
end; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
2836 |
if Gear^.Timer > 0 then |
| 5024 | 2837 |
begin |
| 2475 | 2838 |
dec(Gear^.Timer); |
2839 |
inc(Gear^.Damage) |
|
| 5024 | 2840 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2841 |
else |
| 15014 | 2842 |
// Flame burn-down handling |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2843 |
begin |
|
10379
caa5b40e405b
I a recent commit I caused flames to use uninitialized values. that lead to fire burning slow and desyncs. this commit fixes/reverts this
sheepluva
parents:
10372
diff
changeset
|
2844 |
gX := hwRound(Gear^.X); |
|
caa5b40e405b
I a recent commit I caused flames to use uninitialized values. that lead to fire burning slow and desyncs. this commit fixes/reverts this
sheepluva
parents:
10372
diff
changeset
|
2845 |
gY := hwRound(Gear^.Y); |
| 15014 | 2846 |
// Normal flame: Burns down quickly and must be destroyed before the turn ends |
|
3609
bc63ed514b70
Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle)
nemo
parents:
3603
diff
changeset
|
2847 |
if not sticky then |
| 5024 | 2848 |
begin |
| 15014 | 2849 |
// Deal damage |
|
3640
54676a34b9ad
Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable
nemo
parents:
3609
diff
changeset
|
2850 |
if ((GameTicks and $1) = 0) then |
|
54676a34b9ad
Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable
nemo
parents:
3609
diff
changeset
|
2851 |
begin |
|
54676a34b9ad
Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable
nemo
parents:
3609
diff
changeset
|
2852 |
Gear^.Radius := 7; |
|
5415
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2853 |
tdX:= Gear^.dX; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2854 |
tdY:= Gear^.dY; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2855 |
Gear^.dX.QWordValue:= 214748365; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2856 |
Gear^.dY.QWordValue:= 429496730; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2857 |
Gear^.dX.isNegative:= getrandom(2)<>1; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2858 |
Gear^.dY.isNegative:= true; |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
2859 |
AmmoShove(Gear, Gear^.Boom * 3, 100); |
|
5415
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2860 |
Gear^.dX:= tdX; |
|
94e26612e2ec
Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing.
nemo
parents:
5413
diff
changeset
|
2861 |
Gear^.dY:= tdY; |
|
3640
54676a34b9ad
Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable
nemo
parents:
3609
diff
changeset
|
2862 |
Gear^.Radius := 1; |
|
54676a34b9ad
Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable
nemo
parents:
3609
diff
changeset
|
2863 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2864 |
else if ((GameTicks and $3) = 3) then |
|
14593
34e810295d08
Remove a bunch of dead out-commented code
Wuzzy <Wuzzy2@mail.ru>
parents:
14591
diff
changeset
|
2865 |
doMakeExplosion(gX, gY, Gear^.Boom * 4, Gear^.Hedgehog, 0); |
| 8795 | 2866 |
|
|
3096
9330eead14fa
Remove Distance from flake kick, reduce calls to Random() in flame replacing w/ checks on game tick and a little randomness.
nemo
parents:
3094
diff
changeset
|
2867 |
if ((GameTicks and $7) = 0) and (Random(2) = 0) then |
|
7426
55b49cc1f33a
Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots.
nemo
parents:
7416
diff
changeset
|
2868 |
for i:= Random(2) downto 0 do |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2869 |
AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke); |
| 8795 | 2870 |
|
| 15014 | 2871 |
// Flame burn-out due to time |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2872 |
if Gear^.Health > 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2873 |
dec(Gear^.Health); |
| 15014 | 2874 |
|
2875 |
// Calculate time for next flame update with a bit of random jitter |
|
| 9809 | 2876 |
Gear^.Timer := 450 - Gear^.Tag * 8 + LongInt(GetRandom(2)) |
| 5024 | 2877 |
end |
| 15014 | 2878 |
// Sticky flame: Burns down slowly and persists between turns |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2879 |
else |
| 5024 | 2880 |
begin |
| 15014 | 2881 |
// Destroy land very slowly (low chance this gets called) |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2882 |
if ((GameTicks and $7FF) = 0) and ((GameFlags and gfSolidLand) = 0) then |
| 5024 | 2883 |
begin |
|
13566
acc69f506914
Use wrap-aware doMakeExplosion instead of DrawExplosion in uHandlersMess
Wuzzy <Wuzzy2@mail.ru>
parents:
13470
diff
changeset
|
2884 |
doMakeExplosion(gX, gY, 4, Gear^.Hedgehog, EXPLNoDamage or EXPLDoNotTouchAny or EXPLNoGfx); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2885 |
|
|
7426
55b49cc1f33a
Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots.
nemo
parents:
7416
diff
changeset
|
2886 |
for i:= Random(3) downto 0 do |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2887 |
AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke); |
| 5024 | 2888 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2889 |
|
| 15014 | 2890 |
// Calculate time for next flame update with a bit of random jitter |
| 9809 | 2891 |
Gear^.Timer := 100 - Gear^.Tag * 3 + LongInt(GetRandom(2)); |
| 15014 | 2892 |
|
2893 |
// Flame burn-out due to time |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2894 |
if (Gear^.Damage > 3000+Gear^.Tag*1500) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2895 |
Gear^.Health := 0 |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2896 |
end |
|
2424
b52344de23ae
In progress, trying to make a fire for molotov cocktail. Normal fire should still work fairly normally.
nemo
parents:
2376
diff
changeset
|
2897 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2898 |
end; |
| 15014 | 2899 |
// This kills the flame |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2900 |
if Gear^.Health = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2901 |
begin |
|
10379
caa5b40e405b
I a recent commit I caused flames to use uninitialized values. that lead to fire burning slow and desyncs. this commit fixes/reverts this
sheepluva
parents:
10372
diff
changeset
|
2902 |
gX := hwRound(Gear^.X); |
|
caa5b40e405b
I a recent commit I caused flames to use uninitialized values. that lead to fire burning slow and desyncs. this commit fixes/reverts this
sheepluva
parents:
10372
diff
changeset
|
2903 |
gY := hwRound(Gear^.Y); |
|
3609
bc63ed514b70
Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle)
nemo
parents:
3603
diff
changeset
|
2904 |
if not sticky then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2905 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2906 |
if ((GameTicks and $3) = 0) and (Random(1) = 0) then |
|
7426
55b49cc1f33a
Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots.
nemo
parents:
7416
diff
changeset
|
2907 |
for i:= Random(2) downto 0 do |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2908 |
AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2909 |
end |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2910 |
else |
|
7426
55b49cc1f33a
Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots.
nemo
parents:
7416
diff
changeset
|
2911 |
for i:= Random(3) downto 0 do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2912 |
AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2913 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2914 |
DeleteGear(Gear) |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
2915 |
end |
| 79 | 2916 |
end; |
| 82 | 2917 |
|
2918 |
//////////////////////////////////////////////////////////////////////////////// |
|
2919 |
procedure doStepFirePunchWork(Gear: PGear); |
|
| 8795 | 2920 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2921 |
HHGear: PGear; |
| 82 | 2922 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2923 |
AllInactive := false; |
| 3894 | 2924 |
if ((Gear^.Message and gmDestroy) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2925 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2926 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2927 |
AfterAttack; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2928 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2929 |
end; |
| 82 | 2930 |
|
| 4365 | 2931 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2932 |
if hwRound(HHGear^.Y) <= Gear^.Tag - 2 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2933 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2934 |
Gear^.Tag := hwRound(HHGear^.Y); |
| 10887 | 2935 |
DrawTunnel(HHGear^.X - int2hwFloat(cHHRadius), HHGear^.Y - _1, _0_5, _0, cHHRadius * 4+2, 2); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2936 |
HHGear^.State := HHGear^.State or gstNoDamage; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2937 |
Gear^.Y := HHGear^.Y; |
|
14027
105793e575d6
make firepunch hit moving gears (airmines are not amused)
alfadur
parents:
14026
diff
changeset
|
2938 |
AmmoShoveCache(Gear, Gear^.Boom, 40); |
| 6450 | 2939 |
HHGear^.State := HHGear^.State and (not gstNoDamage) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2940 |
end; |
| 351 | 2941 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2942 |
HHGear^.dY := HHGear^.dY + cGravity; |
| 9824 | 2943 |
if Gear^.Timer > 0 then dec(Gear^.Timer); |
2944 |
if not (HHGear^.dY.isNegative) or (Gear^.Timer = 0) then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2945 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2946 |
HHGear^.State := HHGear^.State or gstMoving; |
|
14026
31bdb759d98b
prevent firepunch from hitting the same gear multiple times
alfadur
parents:
14019
diff
changeset
|
2947 |
ClearHitOrder(); |
|
14027
105793e575d6
make firepunch hit moving gears (airmines are not amused)
alfadur
parents:
14026
diff
changeset
|
2948 |
ClearProximityCache(); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2949 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2950 |
AfterAttack; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2951 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2952 |
end; |
| 2089 | 2953 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2954 |
if CheckLandValue(hwRound(HHGear^.X), hwRound(HHGear^.Y + HHGear^.dY + SignAs(_6,Gear^.dY)), |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2955 |
lfIndestructible) then |
|
14027
105793e575d6
make firepunch hit moving gears (airmines are not amused)
alfadur
parents:
14026
diff
changeset
|
2956 |
HHGear^.Y := HHGear^.Y + HHGear^.dY; |
|
105793e575d6
make firepunch hit moving gears (airmines are not amused)
alfadur
parents:
14026
diff
changeset
|
2957 |
|
|
105793e575d6
make firepunch hit moving gears (airmines are not amused)
alfadur
parents:
14026
diff
changeset
|
2958 |
if (Gear^.Timer mod 200) = 0 then |
|
105793e575d6
make firepunch hit moving gears (airmines are not amused)
alfadur
parents:
14026
diff
changeset
|
2959 |
RefillProximityCache(Gear, 300); |
| 82 | 2960 |
end; |
2961 |
||
2962 |
procedure doStepFirePunch(Gear: PGear); |
|
| 8795 | 2963 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2964 |
HHGear: PGear; |
| 82 | 2965 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2966 |
AllInactive := false; |
| 4365 | 2967 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2968 |
DeleteCI(HHGear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2969 |
HHGear^.dX := SignAs(cLittle, Gear^.dX); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2970 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2971 |
HHGear^.dY := - _0_3; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2972 |
|
|
14026
31bdb759d98b
prevent firepunch from hitting the same gear multiple times
alfadur
parents:
14019
diff
changeset
|
2973 |
ClearHitOrder(); |
|
14027
105793e575d6
make firepunch hit moving gears (airmines are not amused)
alfadur
parents:
14026
diff
changeset
|
2974 |
RefillProximityCache(Gear, 300); |
|
14026
31bdb759d98b
prevent firepunch from hitting the same gear multiple times
alfadur
parents:
14019
diff
changeset
|
2975 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2976 |
Gear^.X := HHGear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2977 |
Gear^.dX := SignAs(_0_45, Gear^.dX); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2978 |
Gear^.dY := - _0_9; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2979 |
Gear^.doStep := @doStepFirePunchWork; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2980 |
DrawTunnel(HHGear^.X - int2hwFloat(cHHRadius), HHGear^.Y + _1, _0_5, _0, cHHRadius * 4, 5); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2981 |
|
| 7053 | 2982 |
PlaySoundV(TSound(ord(sndFirePunch1) + GetRandom(6)), HHGear^.Hedgehog^.Team^.voicepack) |
| 82 | 2983 |
end; |
2984 |
||
| 263 | 2985 |
//////////////////////////////////////////////////////////////////////////////// |
2986 |
||
|
929
9456e1e77369
- Continue preparation for implementing attack from rope and parachute
unc0rr
parents:
928
diff
changeset
|
2987 |
procedure doStepParachuteWork(Gear: PGear); |
| 8795 | 2988 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2989 |
HHGear: PGear; |
|
15166
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
2990 |
deltaX, deltaY: hwFloat; |
| 211 | 2991 |
begin |
| 4365 | 2992 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2993 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2994 |
inc(Gear^.Timer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
2995 |
|
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
2996 |
if (TestCollisionYwithGear(HHGear, 1) <> 0) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2997 |
or ((HHGear^.State and gstHHDriven) = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2998 |
or CheckGearDrowning(HHGear) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
2999 |
or ((Gear^.Message and gmAttack) <> 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3000 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3001 |
with HHGear^ do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3002 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3003 |
Message := 0; |
|
15169
95b72e81a866
Fix hog facing direction when landing with parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15166
diff
changeset
|
3004 |
if Gear^.Tag = 1 then |
|
95b72e81a866
Fix hog facing direction when landing with parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15166
diff
changeset
|
3005 |
dX := _1 |
|
95b72e81a866
Fix hog facing direction when landing with parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15166
diff
changeset
|
3006 |
else |
|
95b72e81a866
Fix hog facing direction when landing with parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15166
diff
changeset
|
3007 |
dX := - _1; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3008 |
SetLittle(dX); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3009 |
dY := _0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3010 |
State := State or gstMoving; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3011 |
end; |
|
13977
2568fa516733
Fix hog can drop more than 2 s. mines if first one was dropped from utility, then stop using that utility
Wuzzy <Wuzzy2@mail.ru>
parents:
13898
diff
changeset
|
3012 |
if (GetAmmoEntry(HHGear^.Hedgehog^, amParachute)^.Count >= 1) and ((Ammoz[HHGear^.Hedgehog^.CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) and (HHGear^.Hedgehog^.MultiShootAttacks = 0) then |
|
12820
4c1c468725ff
Fix desync when dropping weapon from parachute or jetpack
Wuzzy <Wuzzy2@mail.ru>
parents:
12815
diff
changeset
|
3013 |
HHGear^.Hedgehog^.CurAmmoType:= amParachute; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3014 |
isCursorVisible := false; |
| 4372 | 3015 |
ApplyAmmoChanges(HHGear^.Hedgehog^); |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
3016 |
DeleteGear(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3017 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3018 |
end; |
| 211 | 3019 |
|
|
14957
d6a8ef85cf53
Fix parachute moving hog very fast or making it stuck when bumping into wall while facing the opposite direction (bug 742)
Wuzzy <Wuzzy2@mail.ru>
parents:
14899
diff
changeset
|
3020 |
deltaX:= _0; |
|
d6a8ef85cf53
Fix parachute moving hog very fast or making it stuck when bumping into wall while facing the opposite direction (bug 742)
Wuzzy <Wuzzy2@mail.ru>
parents:
14899
diff
changeset
|
3021 |
deltaX:= deltaX + cWindSpeed * 200; |
|
15166
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3022 |
deltaY:= _0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3023 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3024 |
if (Gear^.Message and gmLeft) <> 0 then |
|
14957
d6a8ef85cf53
Fix parachute moving hog very fast or making it stuck when bumping into wall while facing the opposite direction (bug 742)
Wuzzy <Wuzzy2@mail.ru>
parents:
14899
diff
changeset
|
3025 |
deltaX := deltaX - cMaxWindSpeed * 80 |
| 8795 | 3026 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3027 |
else if (Gear^.Message and gmRight) <> 0 then |
|
14957
d6a8ef85cf53
Fix parachute moving hog very fast or making it stuck when bumping into wall while facing the opposite direction (bug 742)
Wuzzy <Wuzzy2@mail.ru>
parents:
14899
diff
changeset
|
3028 |
deltaX := deltaX + cMaxWindSpeed * 80; |
| 8795 | 3029 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3030 |
if (Gear^.Message and gmUp) <> 0 then |
|
15166
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3031 |
deltaY := deltaY - cGravity * 40 |
| 8795 | 3032 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3033 |
else if (Gear^.Message and gmDown) <> 0 then |
|
15166
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3034 |
deltaY := deltaY + cGravity * 40; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3035 |
|
|
14957
d6a8ef85cf53
Fix parachute moving hog very fast or making it stuck when bumping into wall while facing the opposite direction (bug 742)
Wuzzy <Wuzzy2@mail.ru>
parents:
14899
diff
changeset
|
3036 |
HHGear^.X := HHGear^.X + deltaX; |
| 4774 | 3037 |
// don't drift into obstacles |
|
14957
d6a8ef85cf53
Fix parachute moving hog very fast or making it stuck when bumping into wall while facing the opposite direction (bug 742)
Wuzzy <Wuzzy2@mail.ru>
parents:
14899
diff
changeset
|
3038 |
if TestCollisionXwithGear(HHGear, hwSign(deltaX)) <> 0 then |
|
15166
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3039 |
begin |
|
14957
d6a8ef85cf53
Fix parachute moving hog very fast or making it stuck when bumping into wall while facing the opposite direction (bug 742)
Wuzzy <Wuzzy2@mail.ru>
parents:
14899
diff
changeset
|
3040 |
HHGear^.X := HHGear^.X - int2hwFloat(hwSign(deltaX)); |
|
15166
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3041 |
deltaX:= _0; |
|
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3042 |
end; |
|
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3043 |
deltaY := deltaY + cGravity * 100; |
|
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3044 |
HHGear^.Y := HHGear^.Y + deltaY; |
|
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3045 |
|
|
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3046 |
HHGear^.dX := deltaX; |
|
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3047 |
HHGear^.dY := deltaY; |
|
d47122a0e4b4
Properly set dx/dy of hedgehog on parachute
Wuzzy <Wuzzy2@mail.ru>
parents:
15155
diff
changeset
|
3048 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3049 |
Gear^.X := HHGear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3050 |
Gear^.Y := HHGear^.Y |
| 263 | 3051 |
end; |
| 211 | 3052 |
|
|
929
9456e1e77369
- Continue preparation for implementing attack from rope and parachute
unc0rr
parents:
928
diff
changeset
|
3053 |
procedure doStepParachute(Gear: PGear); |
| 8795 | 3054 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3055 |
HHGear: PGear; |
|
929
9456e1e77369
- Continue preparation for implementing attack from rope and parachute
unc0rr
parents:
928
diff
changeset
|
3056 |
begin |
| 4365 | 3057 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3058 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3059 |
DeleteCI(HHGear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3060 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3061 |
AfterAttack; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3062 |
|
|
11342
aa3f886c6298
fix hedgehog on parachute facing in wrong direction if parachute opens during double-jump
sheepluva
parents:
11305
diff
changeset
|
3063 |
// make sure hog doesn't end up facing in wrong direction due to high jump |
|
aa3f886c6298
fix hedgehog on parachute facing in wrong direction if parachute opens during double-jump
sheepluva
parents:
11305
diff
changeset
|
3064 |
if (HHGear^.State and gstHHHJump) <> 0 then |
|
aa3f886c6298
fix hedgehog on parachute facing in wrong direction if parachute opens during double-jump
sheepluva
parents:
11305
diff
changeset
|
3065 |
HHGear^.dX.isNegative := (not HHGear^.dX.isNegative); |
|
aa3f886c6298
fix hedgehog on parachute facing in wrong direction if parachute opens during double-jump
sheepluva
parents:
11305
diff
changeset
|
3066 |
|
|
aa3f886c6298
fix hedgehog on parachute facing in wrong direction if parachute opens during double-jump
sheepluva
parents:
11305
diff
changeset
|
3067 |
HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked or gstMoving or gstHHJumping or gstHHHJump)); |
| 6450 | 3068 |
HHGear^.Message := HHGear^.Message and (not gmAttack); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3069 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3070 |
Gear^.doStep := @doStepParachuteWork; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3071 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3072 |
Gear^.Message := HHGear^.Message; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3073 |
doStepParachuteWork(Gear) |
|
929
9456e1e77369
- Continue preparation for implementing attack from rope and parachute
unc0rr
parents:
928
diff
changeset
|
3074 |
end; |
|
9456e1e77369
- Continue preparation for implementing attack from rope and parachute
unc0rr
parents:
928
diff
changeset
|
3075 |
|
| 263 | 3076 |
//////////////////////////////////////////////////////////////////////////////// |
3077 |
procedure doStepAirAttackWork(Gear: PGear); |
|
3078 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3079 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3080 |
Gear^.X := Gear^.X + cAirPlaneSpeed * Gear^.Tag; |
| 11540 | 3081 |
if (Gear^.Health > 0) and (not (Gear^.X < Gear^.dX)) and (Gear^.X < Gear^.dX + cAirPlaneSpeed) then |
|
5612
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3082 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3083 |
dec(Gear^.Health); |
|
15245
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3084 |
// Spawn missile |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3085 |
case Gear^.State of |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3086 |
0: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtAirBomb, 0, cBombsSpeed * Gear^.Tag, _0, 0); |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3087 |
1: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtMine, 0, cBombsSpeed * Gear^.Tag, _0, 0); |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3088 |
2: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtNapalmBomb, 0, cBombsSpeed * Gear^.Tag, _0, 0); |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3089 |
3: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtDrill, gsttmpFlag, cBombsSpeed * Gear^.Tag, _0, Gear^.Timer + 1); |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3090 |
end; |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3091 |
Gear^.dX := Gear^.dX + int2hwFloat(Gear^.Damage * Gear^.Tag); |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3092 |
if CheckCoordInWater(hwRound(Gear^.X), hwRound(Gear^.Y)) then |
|
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3093 |
FollowGear^.State:= FollowGear^.State or gstSubmersible; |
| 7053 | 3094 |
StopSoundChan(Gear^.SoundChannel, 4000); |
|
5612
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3095 |
end; |
| 1124 | 3096 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3097 |
if (GameTicks and $3F) = 0 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3098 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3099 |
|
|
14763
2e8213c0951f
Fix air attack placement in HedgeEditor/Construction Mode
Wuzzy <Wuzzy2@mail.ru>
parents:
14756
diff
changeset
|
3100 |
if (hwRound(Gear^.X) > (max(LAND_WIDTH,4096)+2048)) or (hwRound(Gear^.X) < -2048) or ((Gear^.Message and gmDestroy) > 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3101 |
begin |
|
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4886
diff
changeset
|
3102 |
// avoid to play forever (is this necessary?) |
| 7053 | 3103 |
StopSoundChan(Gear^.SoundChannel); |
|
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4886
diff
changeset
|
3104 |
DeleteGear(Gear) |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
3105 |
end |
| 263 | 3106 |
end; |
3107 |
||
3108 |
procedure doStepAirAttack(Gear: PGear); |
|
|
15245
f16376e9374f
Remove all placement restrictions of air attack and friends
Wuzzy <Wuzzy2@mail.ru>
parents:
15243
diff
changeset
|
3109 |
var HHGear: PGear; |
| 263 | 3110 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3111 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3112 |
|
|
14586
833ab5b359e5
Deny air attack in bounce world edge if target is in "impossible" position
Wuzzy <Wuzzy2@mail.ru>
parents:
14581
diff
changeset
|
3113 |
if (Gear^.Hedgehog <> nil) and (Gear^.Hedgehog^.Gear <> nil) then |
|
833ab5b359e5
Deny air attack in bounce world edge if target is in "impossible" position
Wuzzy <Wuzzy2@mail.ru>
parents:
14581
diff
changeset
|
3114 |
HHGear:= Gear^.Hedgehog^.Gear; |
|
833ab5b359e5
Deny air attack in bounce world edge if target is in "impossible" position
Wuzzy <Wuzzy2@mail.ru>
parents:
14581
diff
changeset
|
3115 |
|
|
833ab5b359e5
Deny air attack in bounce world edge if target is in "impossible" position
Wuzzy <Wuzzy2@mail.ru>
parents:
14581
diff
changeset
|
3116 |
if (HHGear <> nil) then |
|
833ab5b359e5
Deny air attack in bounce world edge if target is in "impossible" position
Wuzzy <Wuzzy2@mail.ru>
parents:
14581
diff
changeset
|
3117 |
PlaySoundV(sndIncoming, Gear^.Hedgehog^.Team^.voicepack); |
|
14756
2d859d34e6f6
Fix turn end if placing air attack in bouncy world edge map was denied
Wuzzy <Wuzzy2@mail.ru>
parents:
14753
diff
changeset
|
3118 |
AfterAttack; |
|
2d859d34e6f6
Fix turn end if placing air attack in bouncy world edge map was denied
Wuzzy <Wuzzy2@mail.ru>
parents:
14753
diff
changeset
|
3119 |
CurAmmoGear := nil; |
|
14586
833ab5b359e5
Deny air attack in bounce world edge if target is in "impossible" position
Wuzzy <Wuzzy2@mail.ru>
parents:
14581
diff
changeset
|
3120 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3121 |
if Gear^.X.QWordValue = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3122 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3123 |
Gear^.Tag := 1; |
|
5067
57101536cf86
fix for Issue 207: To far left for Napalm (and other weapons)
sheepluva
parents:
5063
diff
changeset
|
3124 |
Gear^.X := -_2048; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3125 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3126 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3127 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3128 |
Gear^.Tag := -1; |
|
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7784
diff
changeset
|
3129 |
Gear^.X := int2hwFloat(max(LAND_WIDTH,4096) + 2048); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3130 |
end; |
| 1507 | 3131 |
|
|
14588
5de4d470dafe
Tweak height limit of air attack in bounce edge maps
Wuzzy <Wuzzy2@mail.ru>
parents:
14587
diff
changeset
|
3132 |
Gear^.Y := int2hwFloat(topY - 300); |
| 11540 | 3133 |
Gear^.dX := int2hwFloat(Gear^.Target.X) - int2hwFloat(Gear^.Tag * (Gear^.Health-1) * Gear^.Damage) / 2; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3134 |
|
|
4778
1565a553d200
have napalm strike bombs explode right over the target
sheepluva
parents:
4774
diff
changeset
|
3135 |
// calcs for Napalm Strike, so that it will hit the target (without wind at least :P) |
|
1565a553d200
have napalm strike bombs explode right over the target
sheepluva
parents:
4774
diff
changeset
|
3136 |
if (Gear^.State = 2) then |
| 8795 | 3137 |
Gear^.dX := Gear^.dX - cBombsSpeed * Gear^.Tag * 900 |
|
4778
1565a553d200
have napalm strike bombs explode right over the target
sheepluva
parents:
4774
diff
changeset
|
3138 |
// calcs for regular falling gears |
|
5612
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3139 |
else if (int2hwFloat(Gear^.Target.Y) - Gear^.Y > _0) then |
|
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3140 |
Gear^.dX := Gear^.dX - cBombsSpeed * hwSqrt((int2hwFloat(Gear^.Target.Y) - Gear^.Y) * 2 / |
|
4778
1565a553d200
have napalm strike bombs explode right over the target
sheepluva
parents:
4774
diff
changeset
|
3141 |
cGravity) * Gear^.Tag; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3142 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3143 |
Gear^.doStep := @doStepAirAttackWork; |
|
4956
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4886
diff
changeset
|
3144 |
Gear^.SoundChannel := LoopSound(sndPlane, 4000); |
|
48e1f9a04c28
usound: added function for loops with fade in and out
koda
parents:
4886
diff
changeset
|
3145 |
|
| 263 | 3146 |
end; |
3147 |
||
3148 |
//////////////////////////////////////////////////////////////////////////////// |
|
3149 |
||
3150 |
procedure doStepAirBomb(Gear: PGear); |
|
3151 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3152 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3153 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3154 |
if (Gear^.State and gstCollision) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3155 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
3156 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
| 9954 | 3157 |
{$IFNDEF PAS2C}
|
| 8204 | 3158 |
with mobileRecord do |
3159 |
if (performRumble <> nil) and (not fastUntilLag) then |
|
3160 |
performRumble(kSystemSoundID_Vibrate); |
|
| 9954 | 3161 |
{$ENDIF}
|
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
3162 |
DeleteGear(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3163 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3164 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3165 |
if (GameTicks and $3F) = 0 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3166 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace) |
| 211 | 3167 |
end; |
| 409 | 3168 |
|
3169 |
//////////////////////////////////////////////////////////////////////////////// |
|
3170 |
||
3171 |
procedure doStepGirder(Gear: PGear); |
|
| 8795 | 3172 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3173 |
HHGear: PGear; |
| 1915 | 3174 |
x, y, tx, ty: hwFloat; |
|
9505
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9487
diff
changeset
|
3175 |
rx: LongInt; |
|
9768
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9767
diff
changeset
|
3176 |
LandFlags: Word; |
|
10251
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3177 |
warn: PVisualGear; |
|
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3178 |
distFail: boolean; |
| 409 | 3179 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3180 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3181 |
|
| 4365 | 3182 |
HHGear := Gear^.Hedgehog^.Gear; |
|
5612
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3183 |
tx := int2hwFloat(Gear^.Target.X); |
|
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3184 |
ty := int2hwFloat(Gear^.Target.Y); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3185 |
x := HHGear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3186 |
y := HHGear^.Y; |
|
9505
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9487
diff
changeset
|
3187 |
rx:= hwRound(x); |
|
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9487
diff
changeset
|
3188 |
|
|
9768
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9767
diff
changeset
|
3189 |
LandFlags:= 0; |
|
9811
66a7959869f0
make rubber bouncy even in winter. was considering icy as well but, one, evil, two, would prob want ice sprite like girder
nemo
parents:
9809
diff
changeset
|
3190 |
if Gear^.AmmoType = amRubber then LandFlags:= lfBouncy |
|
66a7959869f0
make rubber bouncy even in winter. was considering icy as well but, one, evil, two, would prob want ice sprite like girder
nemo
parents:
9809
diff
changeset
|
3191 |
else if cIce then LandFlags:= lfIce; |
|
9768
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9767
diff
changeset
|
3192 |
|
|
11057
adb5ef54da54
global variable for defining construction distance limit. value smaller 1 means no limit (wip)
sheepluva
parents:
11046
diff
changeset
|
3193 |
distFail:= (cBuildMaxDist > 0) and ((hwRound(Distance(tx - x, ty - y)) > cBuildMaxDist) and ((WorldEdge <> weWrap) or |
|
9505
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9487
diff
changeset
|
3194 |
( |
|
11057
adb5ef54da54
global variable for defining construction distance limit. value smaller 1 means no limit (wip)
sheepluva
parents:
11046
diff
changeset
|
3195 |
(hwRound(Distance(tx - int2hwFloat(rightX+(rx-leftX)), ty - y)) > cBuildMaxDist) and |
|
adb5ef54da54
global variable for defining construction distance limit. value smaller 1 means no limit (wip)
sheepluva
parents:
11046
diff
changeset
|
3196 |
(hwRound(Distance(tx - int2hwFloat(leftX-(rightX-rx)), ty - y)) > cBuildMaxDist) |
|
10251
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3197 |
))); |
|
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3198 |
if distFail |
|
10286
1940e937fc08
fix TryPlaceOnLand's ambiguity/messup wrt to making terrain indestructible (had boolean parameter for indestructible AND landflags parameters that could contain lfIndestructibly)
sheepluva
parents:
10253
diff
changeset
|
3199 |
or (not TryPlaceOnLand(Gear^.Target.X - SpritesData[Ammoz[Gear^.AmmoType].PosSprite].Width div 2, Gear^.Target.Y - SpritesData[Ammoz[Gear^.AmmoType].PosSprite].Height div 2, Ammoz[Gear^.AmmoType].PosSprite, Gear^.State, true, LandFlags)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3200 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3201 |
PlaySound(sndDenied); |
|
10251
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3202 |
if not distFail then |
|
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3203 |
begin |
|
10298
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3204 |
warn:= AddVisualGear(Gear^.Target.X, Gear^.Target.Y, vgtNoPlaceWarn, 0, true); |
|
10251
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3205 |
if warn <> nil then |
|
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3206 |
warn^.Tex := GetPlaceCollisionTex(Gear^.Target.X - SpritesData[Ammoz[Gear^.AmmoType].PosSprite].Width div 2, Gear^.Target.Y - SpritesData[Ammoz[Gear^.AmmoType].PosSprite].Height div 2, Ammoz[Gear^.AmmoType].PosSprite, Gear^.State); |
|
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10234
diff
changeset
|
3207 |
end; |
| 6450 | 3208 |
HHGear^.Message := HHGear^.Message and (not gmAttack); |
3209 |
HHGear^.State := HHGear^.State and (not gstAttacking); |
|
|
10818
f642a28cab0c
Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
nemo
parents:
10815
diff
changeset
|
3210 |
HHGear^.State := HHGear^.State or gstChooseTarget; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3211 |
isCursorVisible := true; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3212 |
DeleteGear(Gear) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3213 |
end |
| 8795 | 3214 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3215 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3216 |
PlaySound(sndPlaced); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3217 |
DeleteGear(Gear); |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
3218 |
AfterAttack |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3219 |
end; |
| 1914 | 3220 |
|
| 6450 | 3221 |
HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked)); |
3222 |
HHGear^.Message := HHGear^.Message and (not gmAttack); |
|
| 409 | 3223 |
end; |
| 520 | 3224 |
|
3225 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 525 | 3226 |
procedure doStepTeleportAfter(Gear: PGear); |
| 8795 | 3227 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3228 |
HHGear: PGear; |
| 912 | 3229 |
begin |
| 4365 | 3230 |
HHGear := Gear^.Hedgehog^.Gear; |
|
11070
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3231 |
if HHGear <> nil then doStepHedgehogMoving(HHGear); |
| 7659 | 3232 |
// if not infattack mode wait for hedgehog finish falling to collect cases |
3233 |
if ((GameFlags and gfInfAttack) <> 0) |
|
|
11070
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3234 |
or (HHGear = nil) |
| 7659 | 3235 |
or ((HHGear^.State and gstMoving) = 0) |
|
11070
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3236 |
or (HHGear^.Damage > 0) |
| 7659 | 3237 |
or ((HHGear^.State and gstDrowning) = 1) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3238 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3239 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3240 |
AfterAttack |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3241 |
end |
| 912 | 3242 |
end; |
3243 |
||
3244 |
procedure doStepTeleportAnim(Gear: PGear); |
|
| 525 | 3245 |
begin |
|
11070
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3246 |
if (Gear^.Hedgehog^.Gear = nil) or (Gear^.Hedgehog^.Gear^.Damage > 0) then |
| 7659 | 3247 |
begin |
3248 |
DeleteGear(Gear); |
|
3249 |
AfterAttack; |
|
| 14577 | 3250 |
exit |
| 7659 | 3251 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3252 |
inc(Gear^.Timer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3253 |
if Gear^.Timer = 65 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3254 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3255 |
Gear^.Timer := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3256 |
inc(Gear^.Pos); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3257 |
if Gear^.Pos = 11 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3258 |
Gear^.doStep := @doStepTeleportAfter |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3259 |
end; |
| 525 | 3260 |
end; |
| 520 | 3261 |
|
3262 |
procedure doStepTeleport(Gear: PGear); |
|
| 8795 | 3263 |
var |
|
10298
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3264 |
lx, ty, y, oy: LongInt; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3265 |
HHGear : PGear; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3266 |
valid : Boolean; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3267 |
warn : PVisualGear; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3268 |
const |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3269 |
ytol = cHHRadius; |
| 520 | 3270 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3271 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3272 |
|
| 4365 | 3273 |
HHGear := Gear^.Hedgehog^.Gear; |
|
11070
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3274 |
if HHGear = nil then |
|
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3275 |
begin |
|
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3276 |
DeleteGear(Gear); |
|
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3277 |
exit |
|
f9a03078dd4f
Add some HHGear nil checks to teleport. google bug #974
nemo
parents:
11057
diff
changeset
|
3278 |
end; |
|
10298
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3279 |
|
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3280 |
valid:= false; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3281 |
|
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3282 |
lx:= Gear^.Target.X - SpritesData[sprHHTelepMask].Width div 2; // left |
|
12789
28782e03b8f0
Fix CheckWorldWrap not correctly checking for bounce edge. Also fix teleport @ bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12764
diff
changeset
|
3283 |
if WorldEdge <> weBounce then |
|
28782e03b8f0
Fix CheckWorldWrap not correctly checking for bounce edge. Also fix teleport @ bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12764
diff
changeset
|
3284 |
lx:= CalcWorldWrap(lx, SpritesData[sprHHTelepMask].Width div 2); // Take world edge into account |
|
10298
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3285 |
ty:= Gear^.Target.Y - SpritesData[sprHHTelepMask].Height div 2; // top |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3286 |
|
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3287 |
// remember original target location |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3288 |
oy:= Gear^.Target.Y; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3289 |
|
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3290 |
for y:= ty downto ty - ytol do |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3291 |
begin |
|
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10895
diff
changeset
|
3292 |
if TryPlaceOnLand(lx, y, sprHHTelepMask, 0, false, not hasBorder, false, false, false, false, 0, $FFFFFFFF) then |
|
10298
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3293 |
begin |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3294 |
valid:= true; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3295 |
break; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3296 |
end; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3297 |
dec(Gear^.Target.Y); |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3298 |
end; |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3299 |
|
|
12789
28782e03b8f0
Fix CheckWorldWrap not correctly checking for bounce edge. Also fix teleport @ bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12764
diff
changeset
|
3300 |
if (WorldEdge = weBounce) and ((Gear^.Target.X < LeftX) or (Gear^.Target.X > RightX)) then |
|
28782e03b8f0
Fix CheckWorldWrap not correctly checking for bounce edge. Also fix teleport @ bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12764
diff
changeset
|
3301 |
valid:= false; |
|
28782e03b8f0
Fix CheckWorldWrap not correctly checking for bounce edge. Also fix teleport @ bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12764
diff
changeset
|
3302 |
|
|
10298
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3303 |
if not valid then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3304 |
begin |
| 6450 | 3305 |
HHGear^.Message := HHGear^.Message and (not gmAttack); |
3306 |
HHGear^.State := HHGear^.State and (not gstAttacking); |
|
|
10818
f642a28cab0c
Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
nemo
parents:
10815
diff
changeset
|
3307 |
HHGear^.State := HHGear^.State or gstChooseTarget; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3308 |
isCursorVisible := true; |
|
10298
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3309 |
warn:= AddVisualGear(Gear^.Target.X, oy, vgtNoPlaceWarn, 0, true); |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3310 |
if warn <> nil then |
|
7d5d93f9a515
make using the teleporter a bit less challenging
sheepluva
parents:
10286
diff
changeset
|
3311 |
warn^.Tex := GetPlaceCollisionTex(lx, ty, sprHHTelepMask, 0); |
|
10676
7111b4a46b5c
fix for Issue 855: Failure to teleport rarely makes engine crash
sheepluva
parents:
10663
diff
changeset
|
3312 |
DeleteGear(Gear); |
|
7111b4a46b5c
fix for Issue 855: Failure to teleport rarely makes engine crash
sheepluva
parents:
10663
diff
changeset
|
3313 |
PlaySound(sndDenied); |
|
7111b4a46b5c
fix for Issue 855: Failure to teleport rarely makes engine crash
sheepluva
parents:
10663
diff
changeset
|
3314 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3315 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3316 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3317 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
3318 |
DeleteCI(HHGear); |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
3319 |
SetAllHHToActive; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3320 |
Gear^.doStep := @doStepTeleportAnim; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3321 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3322 |
// copy old HH position and direction to Gear (because we need them for drawing the vanishing hog) |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3323 |
Gear^.dX := HHGear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3324 |
// retrieve the cursor direction (it was previously copied to X so it doesn't get lost) |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3325 |
HHGear^.dX.isNegative := (Gear^.X.QWordValue <> 0); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3326 |
Gear^.X := HHGear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3327 |
Gear^.Y := HHGear^.Y; |
|
5612
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3328 |
HHGear^.X := int2hwFloat(Gear^.Target.X); |
|
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3329 |
HHGear^.Y := int2hwFloat(Gear^.Target.Y); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3330 |
HHGear^.State := HHGear^.State or gstMoving; |
|
10547
cc439790ebae
fix for Issue 828: Manual placement animation is drawn twice
sheepluva
parents:
10545
diff
changeset
|
3331 |
if not Gear^.Hedgehog^.Unplaced then |
|
cc439790ebae
fix for Issue 828: Manual placement animation is drawn twice
sheepluva
parents:
10545
diff
changeset
|
3332 |
Gear^.State:= Gear^.State or gstAnimation; |
| 7659 | 3333 |
Gear^.Hedgehog^.Unplaced := false; |
3334 |
isCursorVisible := false; |
|
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
3335 |
playSound(sndWarp) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3336 |
end; |
|
5612
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5606
diff
changeset
|
3337 |
Gear^.Target.X:= NoPointX |
| 520 | 3338 |
end; |
| 534 | 3339 |
|
3340 |
//////////////////////////////////////////////////////////////////////////////// |
|
3341 |
procedure doStepSwitcherWork(Gear: PGear); |
|
| 8795 | 3342 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3343 |
HHGear: PGear; |
|
7341
d70478d265ec
Fix crash when hedgehog dies while switching from it
unc0rr
parents:
7339
diff
changeset
|
3344 |
hedgehog: PHedgehog; |
| 6992 | 3345 |
State: Longword; |
| 10494 | 3346 |
switchDir: Longword; |
| 14997 | 3347 |
oldUid: Longword; |
| 534 | 3348 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3349 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3350 |
|
|
10145
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3351 |
if ((Gear^.Message and (not (gmSwitch or gmPrecise))) <> 0) or (TurnTimeLeft = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3352 |
begin |
|
7341
d70478d265ec
Fix crash when hedgehog dies while switching from it
unc0rr
parents:
7339
diff
changeset
|
3353 |
hedgehog := Gear^.Hedgehog; |
|
d70478d265ec
Fix crash when hedgehog dies while switching from it
unc0rr
parents:
7339
diff
changeset
|
3354 |
ApplyAmmoChanges(hedgehog^); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3355 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3356 |
HHGear := CurrentHedgehog^.Gear; |
| 4372 | 3357 |
ApplyAmmoChanges(HHGear^.Hedgehog^); |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
3358 |
DeleteGear(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3359 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3360 |
end; |
| 534 | 3361 |
|
|
15155
0e0b5fc1674e
Fix floating hog when switching to moving hog
Wuzzy <Wuzzy2@mail.ru>
parents:
15072
diff
changeset
|
3362 |
HHGear := CurrentHedgehog^.Gear; |
| 3894 | 3363 |
if (Gear^.Message and gmSwitch) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3364 |
begin |
| 14997 | 3365 |
oldUid:= HHGear^.uid; |
| 6450 | 3366 |
HHGear^.Message := HHGear^.Message and (not gmSwitch); |
3367 |
Gear^.Message := Gear^.Message and (not gmSwitch); |
|
|
10145
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3368 |
|
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3369 |
// switching in reverse direction |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3370 |
if (Gear^.Message and gmPrecise) <> 0 then |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3371 |
begin |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3372 |
HHGear^.Message := HHGear^.Message and (not gmPrecise); |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3373 |
switchDir:= CurrentTeam^.HedgehogsNumber - 1; |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3374 |
end |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3375 |
else |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3376 |
switchDir:= 1; |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3377 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3378 |
State := HHGear^.State; |
|
15155
0e0b5fc1674e
Fix floating hog when switching to moving hog
Wuzzy <Wuzzy2@mail.ru>
parents:
15072
diff
changeset
|
3379 |
if (HHGear^.State and gstMoving) = 0 then |
|
0e0b5fc1674e
Fix floating hog when switching to moving hog
Wuzzy <Wuzzy2@mail.ru>
parents:
15072
diff
changeset
|
3380 |
HHGear^.Active := false; |
|
0e0b5fc1674e
Fix floating hog when switching to moving hog
Wuzzy <Wuzzy2@mail.ru>
parents:
15072
diff
changeset
|
3381 |
HHGear^.State := HHGear^.State and gstMoving; |
|
7400
09427dbec1d8
Fix TARDIS, make switcher work w/ the new more stringent check.
nemo
parents:
7399
diff
changeset
|
3382 |
HHGear^.Z := cHHZ; |
|
09427dbec1d8
Fix TARDIS, make switcher work w/ the new more stringent check.
nemo
parents:
7399
diff
changeset
|
3383 |
HHGear^.Message:= HHGear^.Message or gmRemoveFromList or gmAddToList; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3384 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3385 |
PlaySound(sndSwitchHog); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3386 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3387 |
repeat |
| 10494 | 3388 |
CurrentTeam^.CurrHedgehog := (CurrentTeam^.CurrHedgehog + switchDir) mod CurrentTeam^.HedgehogsNumber; |
| 8795 | 3389 |
until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) and |
3390 |
(CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^.Damage = 0) and |
|
|
12679
6f05a02d43b2
Fix player being able to switch to dying hog
Wuzzy <almikes@aol.com>
parents:
12676
diff
changeset
|
3391 |
(CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^.Health > 0) and |
|
6f05a02d43b2
Fix player being able to switch to dying hog
Wuzzy <almikes@aol.com>
parents:
12676
diff
changeset
|
3392 |
((CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^.State and gstHHDeath) = 0) and |
|
8563
4d9d8287e601
Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster.
nemo
parents:
8560
diff
changeset
|
3393 |
(CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Effects[heFrozen]=0); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3394 |
|
|
7270
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7268
diff
changeset
|
3395 |
SwitchCurrentHedgehog(@CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog]); |
| 8795 | 3396 |
AmmoMenuInvalidated:= true; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3397 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3398 |
HHGear := CurrentHedgehog^.Gear; |
| 14997 | 3399 |
ScriptCall('onHogSwitch', oldUid);
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3400 |
HHGear^.State := State; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3401 |
HHGear^.Active := true; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3402 |
FollowGear := HHGear; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3403 |
HHGear^.Z := cCurrHHZ; |
|
10145
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3404 |
// restore precise key |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3405 |
if (switchDir <> 1) then |
|
67b255f839db
allow switching through hogs in reverse order with PRECISE+HOGSWITCH
sheepluva
parents:
10135
diff
changeset
|
3406 |
HHGear^.Message:= HHGear^.Message or gmPrecise; |
|
7400
09427dbec1d8
Fix TARDIS, make switcher work w/ the new more stringent check.
nemo
parents:
7399
diff
changeset
|
3407 |
HHGear^.Message:= HHGear^.Message or gmRemoveFromList or gmAddToList; |
|
15155
0e0b5fc1674e
Fix floating hog when switching to moving hog
Wuzzy <Wuzzy2@mail.ru>
parents:
15072
diff
changeset
|
3408 |
end; |
|
0e0b5fc1674e
Fix floating hog when switching to moving hog
Wuzzy <Wuzzy2@mail.ru>
parents:
15072
diff
changeset
|
3409 |
doStepHedgehogMoving(HHGear); |
|
0e0b5fc1674e
Fix floating hog when switching to moving hog
Wuzzy <Wuzzy2@mail.ru>
parents:
15072
diff
changeset
|
3410 |
Gear^.X := HHGear^.X; |
|
0e0b5fc1674e
Fix floating hog when switching to moving hog
Wuzzy <Wuzzy2@mail.ru>
parents:
15072
diff
changeset
|
3411 |
Gear^.Y := HHGear^.Y |
| 534 | 3412 |
end; |
3413 |
||
3414 |
procedure doStepSwitcher(Gear: PGear); |
|
| 8795 | 3415 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3416 |
HHGear: PGear; |
| 534 | 3417 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3418 |
Gear^.doStep := @doStepSwitcherWork; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3419 |
|
| 4365 | 3420 |
HHGear := Gear^.Hedgehog^.Gear; |
| 5358 | 3421 |
OnUsedAmmo(HHGear^.Hedgehog^); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3422 |
with HHGear^ do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3423 |
begin |
| 6450 | 3424 |
State := State and (not gstAttacking); |
|
13825
096cc009e0b8
Clear gmSwitch before activating switcher
Wuzzy <Wuzzy2@mail.ru>
parents:
13806
diff
changeset
|
3425 |
Message := Message and (not (gmAttack or gmSwitch)) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3426 |
end |
| 534 | 3427 |
end; |
| 924 | 3428 |
|
3429 |
//////////////////////////////////////////////////////////////////////////////// |
|
3430 |
procedure doStepMortar(Gear: PGear); |
|
| 8795 | 3431 |
var |
|
8413
454191defee6
restore former cluster behaviour (makes the most diff for the bomb)
nemo
parents:
8370
diff
changeset
|
3432 |
dX, dY, gdX, gdY: hwFloat; |
| 924 | 3433 |
i: LongInt; |
3434 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3435 |
AllInactive := false; |
|
8945
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3436 |
gdX := Gear^.dX; |
|
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3437 |
gdY := Gear^.dY; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3438 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3439 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3440 |
if (Gear^.State and gstCollision) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3441 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
3442 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
8945
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3443 |
gdX.isNegative := not gdX.isNegative; |
|
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3444 |
gdY.isNegative := not gdY.isNegative; |
|
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3445 |
gdX:= gdX*_0_2; |
|
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3446 |
gdY:= gdY*_0_2; |
|
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3447 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3448 |
for i:= 0 to 4 do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3449 |
begin |
|
8945
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3450 |
dX := gdX + rndSign(GetRandomf) * _0_03; |
|
145bf64a9579
this should improve consistency of mortar cluster spread and snowball knocks
nemo
parents:
8934
diff
changeset
|
3451 |
dY := gdY + rndSign(GetRandomf) * _0_03; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3452 |
AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtCluster, 0, dX, dY, 25); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3453 |
end; |
| 2376 | 3454 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3455 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3456 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3457 |
end; |
| 963 | 3458 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3459 |
if (GameTicks and $3F) = 0 then |
| 10352 | 3460 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace); |
| 924 | 3461 |
end; |
| 984 | 3462 |
|
3463 |
//////////////////////////////////////////////////////////////////////////////// |
|
3464 |
procedure doStepKamikazeWork(Gear: PGear); |
|
| 8795 | 3465 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3466 |
i: LongWord; |
| 984 | 3467 |
HHGear: PGear; |
|
5866
9017a0ff4201
aaaallways, I want to beeee with you, and make belieeeeve with you
nemo
parents:
5841
diff
changeset
|
3468 |
sparkles: PVisualGear; |
| 5913 | 3469 |
hasWishes: boolean; |
|
12169
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
3470 |
s: ansistring; |
| 984 | 3471 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3472 |
AllInactive := false; |
| 5913 | 3473 |
hasWishes:= ((Gear^.Message and (gmPrecise or gmSwitch)) = (gmPrecise or gmSwitch)); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3474 |
if hasWishes then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3475 |
Gear^.AdvBounce:= 1; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3476 |
|
| 4365 | 3477 |
HHGear := Gear^.Hedgehog^.Gear; |
| 7958 | 3478 |
if HHGear = nil then |
3479 |
begin |
|
| 14028 | 3480 |
ClearHitOrder(); |
3481 |
ClearProximityCache(); |
|
| 7958 | 3482 |
DeleteGear(Gear); |
3483 |
exit |
|
3484 |
end; |
|
3485 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3486 |
HHGear^.State := HHGear^.State or gstNoDamage; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3487 |
DeleteCI(HHGear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3488 |
|
| 3852 | 3489 |
Gear^.X := HHGear^.X; |
3490 |
Gear^.Y := HHGear^.Y; |
|
| 5913 | 3491 |
if (GameTicks mod 2 = 0) and hasWishes then |
|
5866
9017a0ff4201
aaaallways, I want to beeee with you, and make belieeeeve with you
nemo
parents:
5841
diff
changeset
|
3492 |
begin |
|
9017a0ff4201
aaaallways, I want to beeee with you, and make belieeeeve with you
nemo
parents:
5841
diff
changeset
|
3493 |
sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust, 1); |
| 6131 | 3494 |
if sparkles <> nil then |
|
5924
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
3495 |
begin |
|
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
3496 |
sparkles^.Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF; |
|
7066
12cc2bd84b0b
Make pas2c even more happier with uGears.c, allow assigning arrays in some cases
unc0rr
parents:
7062
diff
changeset
|
3497 |
sparkles^.Angle:= random(360); |
|
5924
82fc26c53d2a
Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour.
nemo
parents:
5922
diff
changeset
|
3498 |
end |
|
5866
9017a0ff4201
aaaallways, I want to beeee with you, and make belieeeeve with you
nemo
parents:
5841
diff
changeset
|
3499 |
end; |
| 3852 | 3500 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3501 |
i := 2; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3502 |
repeat |
| 8795 | 3503 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3504 |
Gear^.X := Gear^.X + HHGear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3505 |
Gear^.Y := Gear^.Y + HHGear^.dY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3506 |
HHGear^.X := Gear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3507 |
HHGear^.Y := Gear^.Y; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3508 |
|
| 10354 | 3509 |
// check for drowning |
3510 |
if CheckGearDrowning(HHGear) then |
|
3511 |
begin |
|
3512 |
AfterAttack; |
|
| 14028 | 3513 |
ClearHitOrder(); |
3514 |
ClearProximityCache(); |
|
| 10354 | 3515 |
DeleteGear(Gear); |
3516 |
exit; |
|
3517 |
end; |
|
3518 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3519 |
inc(Gear^.Damage, 2); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3520 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3521 |
dec(i) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3522 |
until (i = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3523 |
or (Gear^.Damage > Gear^.Health); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3524 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3525 |
inc(upd); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3526 |
if upd > 3 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3527 |
begin |
| 5913 | 3528 |
if Gear^.Health < 1500 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3529 |
begin |
| 5913 | 3530 |
if Gear^.AdvBounce <> 0 then |
3531 |
Gear^.Pos := 3 |
|
3532 |
else |
|
3533 |
Gear^.Pos := 2; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3534 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3535 |
|
| 14028 | 3536 |
AmmoShoveCache(Gear, Gear^.Boom, 40); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3537 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3538 |
DrawTunnel(HHGear^.X - HHGear^.dX * 10, |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3539 |
HHGear^.Y - _2 - HHGear^.dY * 10 + hwAbs(HHGear^.dY) * 2, |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3540 |
HHGear^.dX, |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3541 |
HHGear^.dY, |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3542 |
20 + cHHRadius * 2, |
| 6130 | 3543 |
cHHRadius * 2 + 7); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3544 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3545 |
upd := 0 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3546 |
end; |
| 984 | 3547 |
|
| 14028 | 3548 |
inc(Gear^.Timer); |
3549 |
if (Gear^.Timer mod 100) = 0 then |
|
3550 |
RefillProximityCache(Gear, 300); |
|
3551 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3552 |
if Gear^.Health < Gear^.Damage then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3553 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
3554 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
6112
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3555 |
if hasWishes then |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3556 |
for i:= 0 to 31 do |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3557 |
begin |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3558 |
sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot); |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3559 |
if sparkles <> nil then |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3560 |
with sparkles^ do |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3561 |
begin |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3562 |
Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF; |
|
7066
12cc2bd84b0b
Make pas2c even more happier with uGears.c, allow assigning arrays in some cases
unc0rr
parents:
7062
diff
changeset
|
3563 |
Angle:= random(360); |
|
6112
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3564 |
dx:= 0.001 * (random(200)); |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3565 |
dy:= 0.001 * (random(200)); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3566 |
if random(2) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3567 |
dx := -dx; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3568 |
if random(2) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3569 |
dy := -dy; |
|
6112
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3570 |
FrameTicks:= random(400) + 250 |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3571 |
end |
|
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6092
diff
changeset
|
3572 |
end; |
|
12169
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
3573 |
s:= ansistring(Gear^.Hedgehog^.Name); |
|
13642
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13640
diff
changeset
|
3574 |
AddCaption(FormatA(GetEventString(eidKamikaze), s), capcolDefault, capgrpMessage); |
|
12292
93434ab299a0
Take sacrifices into account for the “Stupid” taunt
Wuzzy <almikes@aol.com>
parents:
12277
diff
changeset
|
3575 |
uStats.HedgehogSacrificed(Gear^.Hedgehog); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3576 |
AfterAttack; |
| 7395 | 3577 |
HHGear^.Message:= HHGear^.Message or gmDestroy; |
| 14028 | 3578 |
ClearHitOrder(); |
3579 |
ClearProximityCache(); |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3580 |
DeleteGear(Gear); |
| 12837 | 3581 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3582 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3583 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3584 |
dec(Gear^.Health, Gear^.Damage); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3585 |
Gear^.Damage := 0 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3586 |
end |
| 984 | 3587 |
end; |
3588 |
||
| 987 | 3589 |
procedure doStepKamikazeIdle(Gear: PGear); |
|
15217
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3590 |
var HHGear: PGear; |
| 987 | 3591 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3592 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3593 |
dec(Gear^.Timer); |
|
15217
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3594 |
HHGear := Gear^.Hedgehog^.Gear; |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3595 |
if (HHGear = nil) or (HHGear^.Damage <> 0) then |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3596 |
begin |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3597 |
if (HHGear <> nil) then |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3598 |
AfterAttack; |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3599 |
ClearHitOrder(); |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3600 |
ClearProximityCache(); |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3601 |
DeleteGear(Gear); |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3602 |
exit; |
|
a0bb57d3d272
Fix buggy kamikaze when hog took damage during short waiting phase at start
Wuzzy <Wuzzy2@mail.ru>
parents:
15202
diff
changeset
|
3603 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3604 |
if Gear^.Timer = 0 then |
| 5922 | 3605 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3606 |
Gear^.Pos := 1; |
| 7053 | 3607 |
PlaySoundV(sndKamikaze, Gear^.Hedgehog^.Team^.voicepack); |
| 14028 | 3608 |
ClearHitOrder(); |
3609 |
RefillProximityCache(Gear, 300); |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3610 |
Gear^.doStep := @doStepKamikazeWork |
| 5922 | 3611 |
end |
| 987 | 3612 |
end; |
3613 |
||
| 984 | 3614 |
procedure doStepKamikaze(Gear: PGear); |
| 8795 | 3615 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3616 |
HHGear: PGear; |
| 984 | 3617 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3618 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3619 |
|
| 4365 | 3620 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3621 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3622 |
HHGear^.dX := Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3623 |
HHGear^.dY := Gear^.dY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3624 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3625 |
Gear^.dX := SignAs(_0_45, Gear^.dX); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3626 |
Gear^.dY := - _0_9; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3627 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3628 |
Gear^.Timer := 550; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3629 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3630 |
Gear^.doStep := @doStepKamikazeIdle |
| 984 | 3631 |
end; |
3632 |
||
| 1103 | 3633 |
//////////////////////////////////////////////////////////////////////////////// |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3634 |
|
| 1110 | 3635 |
procedure doStepCakeExpl(Gear: PGear); |
|
12745
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3636 |
var gi: PGear; |
| 1110 | 3637 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3638 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3639 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3640 |
inc(Gear^.Tag); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3641 |
if Gear^.Tag < 2250 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3642 |
exit; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3643 |
|
| 11523 | 3644 |
InCinematicMode:= false; |
|
12745
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3645 |
gi := GearsList; |
|
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3646 |
while gi <> nil do |
|
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3647 |
begin |
|
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3648 |
if gi^.Kind = gtHedgehog then |
|
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3649 |
gi^.State := gi^.State and (not gstLoser); |
|
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3650 |
gi:= gi^.NextGear; |
|
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3651 |
end; |
|
c162995831d8
Fix cake party face not working across wrap world border
Wuzzy <Wuzzy2@mail.ru>
parents:
12744
diff
changeset
|
3652 |
|
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
3653 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3654 |
AfterAttack; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3655 |
DeleteGear(Gear) |
| 1110 | 3656 |
end; |
3657 |
||
| 1109 | 3658 |
procedure doStepCakeDown(Gear: PGear); |
| 8795 | 3659 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3660 |
gi: PGear; |
| 11523 | 3661 |
dmg, dmgBase, partyEpicness, i: LongInt; |
| 12806 | 3662 |
fX, fY, tdX, tdY: hwFloat; |
| 11523 | 3663 |
sparkles: PVisualGear; |
| 1109 | 3664 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3665 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3666 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3667 |
inc(Gear^.Tag); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3668 |
if Gear^.Tag < 100 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3669 |
exit; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3670 |
Gear^.Tag := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3671 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3672 |
if Gear^.Pos = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3673 |
begin |
| 6765 | 3674 |
///////////// adapted from doMakeExplosion /////////////////////////// |
3675 |
fX:= int2hwFloat(hwRound(Gear^.X)); |
|
3676 |
fY:= int2hwFloat(hwRound(Gear^.Y)); |
|
|
12746
e1395ba033e8
Use Gear^.Boom to calculate cake party faces
Wuzzy <Wuzzy2@mail.ru>
parents:
12745
diff
changeset
|
3677 |
dmgBase:= Gear^.Boom shl 1 + cHHRadius div 2; |
| 11523 | 3678 |
partyEpicness:= 0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3679 |
gi := GearsList; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3680 |
while gi <> nil do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3681 |
begin |
| 6765 | 3682 |
if gi^.Kind = gtHedgehog then |
3683 |
begin |
|
3684 |
dmg:= 0; |
|
| 12806 | 3685 |
tdX:= gi^.X-fX; |
3686 |
tdY:= gi^.Y-fY; |
|
3687 |
if hwRound(hwAbs(tdX)+hwAbs(tdY)) < dmgBase then |
|
3688 |
dmg:= dmgBase - max(hwRound(Distance(tdX, tdY)),gi^.Radius); |
|
|
12746
e1395ba033e8
Use Gear^.Boom to calculate cake party faces
Wuzzy <Wuzzy2@mail.ru>
parents:
12745
diff
changeset
|
3689 |
if (dmg > 1) then dmg:= ModifyDamage(min(dmg div 2, Gear^.Boom), gi); |
| 6765 | 3690 |
if (dmg > 1) then |
|
10011
ead5e4b21671
Add check for gear kind of hedgehog on invulnerability effect. This probably fixes bug #766, is similar to change in previous r2a1483d91977 and was introduced by r7d925e82e572
nemo
parents:
9998
diff
changeset
|
3691 |
if (CurrentHedgehog^.Gear = gi) and (gi^.Hedgehog^.Effects[heInvulnerable] = 0) then |
| 11523 | 3692 |
begin |
3693 |
gi^.State := gi^.State or gstLoser; |
|
3694 |
// probably not too epic if hitting self too... |
|
3695 |
dec(partyEpicness, 45); |
|
3696 |
end |
|
| 6765 | 3697 |
else |
| 11523 | 3698 |
begin |
| 6765 | 3699 |
gi^.State := gi^.State or gstWinner; |
| 11523 | 3700 |
if CurrentHedgehog^.Gear = gi then |
3701 |
dec(partyEpicness, 45) |
|
3702 |
else |
|
3703 |
inc(partyEpicness); |
|
3704 |
end; |
|
| 6765 | 3705 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3706 |
gi := gi^.NextGear |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3707 |
end; |
| 6765 | 3708 |
////////////////////////////////////////////////////////////////////// |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3709 |
Gear^.doStep := @doStepCakeExpl; |
| 11530 | 3710 |
if (partyEpicness > 6) and (abs(90 - abs(trunc(Gear^.DirAngle))) < 20) then |
| 11523 | 3711 |
begin |
3712 |
for i := 0 to (2 * partyEpicness) do |
|
3713 |
begin |
|
3714 |
sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEgg, 1); |
|
3715 |
if sparkles <> nil then |
|
3716 |
begin |
|
3717 |
sparkles^.dX:= 0.008 * (random(100) - 50); |
|
3718 |
sparkles^.dY:= -0.3 + 0.002 * (random(100) - 50); |
|
3719 |
sparkles^.Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF; |
|
3720 |
sparkles^.Angle:= random(360); |
|
3721 |
end |
|
3722 |
end; |
|
3723 |
InCinematicMode:= true; |
|
3724 |
end; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3725 |
PlaySound(sndCake) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3726 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3727 |
else dec(Gear^.Pos) |
| 1109 | 3728 |
end; |
3729 |
||
3730 |
||
| 11531 | 3731 |
procedure doStepCakeWalk(Gear: PGear); |
|
7370
d50b874e7ee8
Introduce uGearsHandlers.pas, for now only part of cake handlers is moved there
unc0rr
parents:
7341
diff
changeset
|
3732 |
var |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
3733 |
tdx, tdy: hwFloat; |
|
10874
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3734 |
cakeData: PCakeData; |
|
13608
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3735 |
i: Longword; |
| 1088 | 3736 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3737 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3738 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3739 |
inc(Gear^.Tag); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3740 |
if Gear^.Tag < 7 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3741 |
exit; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3742 |
|
|
7416
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3743 |
dec(Gear^.Health); |
|
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3744 |
Gear^.Timer := Gear^.Health*10; |
|
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3745 |
if Gear^.Health mod 100 = 0 then |
|
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3746 |
Gear^.PortalCounter:= 0; |
|
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3747 |
// This is not seconds, but at least it is *some* feedback |
|
12641
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3748 |
if (Gear^.Health <= 0) or ((Gear^.Message and gmAttack) <> 0) then |
|
7416
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3749 |
begin |
|
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3750 |
FollowGear := Gear; |
|
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3751 |
Gear^.RenderTimer := false; |
|
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3752 |
Gear^.doStep := @doStepCakeDown; |
|
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3753 |
exit |
| 10875 | 3754 |
end |
3755 |
else if Gear^.Timer < 6000 then |
|
3756 |
Gear^.RenderTimer:= true; |
|
|
7416
2f2f78fc65a3
AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog.
unc0rr
parents:
7408
diff
changeset
|
3757 |
|
| 9969 | 3758 |
if not cakeStep(Gear) then Gear^.doStep:= @doStepCakeFall; |
| 1103 | 3759 |
|
|
13614
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3760 |
// Cake passed world edge. |
|
13607
212036414957
Make cake bounce off bounce edge, stop cake at wrap edge to prevent other bug
Wuzzy <Wuzzy2@mail.ru>
parents:
13605
diff
changeset
|
3761 |
if (Gear^.Karma = 1) then |
|
13614
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3762 |
(* This code is not ideal, but at least not horribly broken. |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3763 |
The cake tries to reach the other side and continue to walk, |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3764 |
but there are some exceptions. |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3765 |
This code is called *after* the X coordinate have been wrapped. |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3766 |
Depending on terrain on the other side, the cake does this: |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3767 |
* Cake collides horizontally (even by 1 pixel): Turn around |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3768 |
* Cake does not see walkable ground above or below: Fall |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3769 |
* Otherwise: Walk normally |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3770 |
*) |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3771 |
begin |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3772 |
// Update coordinates |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3773 |
tdx:=Gear^.X; |
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
3774 |
if (hwRound(Gear^.X) < leftX) then |
|
13614
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3775 |
Gear^.X:= Gear^.X + int2hwfloat(rightX - leftX) |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3776 |
else Gear^.X:= Gear^.X - int2hwfloat(rightX - leftX); |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3777 |
|
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3778 |
Gear^.Tag:= 0; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3779 |
if ((TestCollisionXwithGear(Gear, 1) <> 0) or (TestCollisionXwithGear(Gear, -1) <> 0)) then |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3780 |
// Cake collided horizontally, turn around. Prevents cake from being stuck in infinite loop. |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3781 |
// This can also happen if the terrain is just a slight slope. :-( |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3782 |
begin |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3783 |
Gear^.X := tdx; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3784 |
Gear^.Karma := 3; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3785 |
end |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3786 |
else |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3787 |
begin |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3788 |
// Check if cake has something to walk on the other side. If not, make it drop. |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3789 |
// There is nothing for the cake to stand on. |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3790 |
if (TestCollisionYwithGear(Gear, 1) = 0) and (TestCollisionYwithGear(Gear, -1) = 0) then |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3791 |
Gear^.doStep:= @doStepCakeFall; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3792 |
Gear^.Karma := 4; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3793 |
end; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3794 |
end; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3795 |
// Cake bounced! |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3796 |
if (Gear^.Karma = 2) or (Gear^.Karma = 3) then |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3797 |
begin |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3798 |
// Turn cake around |
|
13607
212036414957
Make cake bounce off bounce edge, stop cake at wrap edge to prevent other bug
Wuzzy <Wuzzy2@mail.ru>
parents:
13605
diff
changeset
|
3799 |
Gear^.dX.isNegative := (not Gear^.dX.isNegative); |
|
212036414957
Make cake bounce off bounce edge, stop cake at wrap edge to prevent other bug
Wuzzy <Wuzzy2@mail.ru>
parents:
13605
diff
changeset
|
3800 |
Gear^.WDTimer := 0; |
|
212036414957
Make cake bounce off bounce edge, stop cake at wrap edge to prevent other bug
Wuzzy <Wuzzy2@mail.ru>
parents:
13605
diff
changeset
|
3801 |
Gear^.Angle := (LongInt(Gear^.Angle) + 2) and 3; |
|
13608
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3802 |
|
|
13609
13f68f3e7153
Add bounce effect to cake when it touches bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13608
diff
changeset
|
3803 |
// Bounce effect |
|
14595
6e5cda26f676
Tweak bounce effects of some gears
Wuzzy <Wuzzy2@mail.ru>
parents:
14593
diff
changeset
|
3804 |
if (Gear^.Karma = 2) then |
|
13609
13f68f3e7153
Add bounce effect to cake when it touches bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13608
diff
changeset
|
3805 |
AddBounceEffectForGear(Gear, 0.55); |
|
13f68f3e7153
Add bounce effect to cake when it touches bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13608
diff
changeset
|
3806 |
|
|
13614
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3807 |
Gear^.Tag:= 0; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3808 |
Gear^.Karma := 4; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3809 |
end; |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3810 |
if (Gear^.Karma = 4) then |
|
c9642782778b
Fix cake walking through land when reaching wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13613
diff
changeset
|
3811 |
begin |
|
13608
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3812 |
// Reset CakePoints to fix cake angle |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3813 |
cakeData:= PCakeData(Gear^.Data); |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3814 |
with cakeData^ do |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3815 |
begin |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3816 |
for i:= 0 to Pred(cakeh) do |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3817 |
begin |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3818 |
CakePoints[i].x := Gear^.X; |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3819 |
CakePoints[i].y := Gear^.Y; |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3820 |
end; |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3821 |
CakeI:= 0; |
|
92b87845beeb
Fix cake rotation angle after bounce from bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13607
diff
changeset
|
3822 |
end; |
|
13607
212036414957
Make cake bounce off bounce edge, stop cake at wrap edge to prevent other bug
Wuzzy <Wuzzy2@mail.ru>
parents:
13605
diff
changeset
|
3823 |
Gear^.Karma := 0; |
|
212036414957
Make cake bounce off bounce edge, stop cake at wrap edge to prevent other bug
Wuzzy <Wuzzy2@mail.ru>
parents:
13605
diff
changeset
|
3824 |
end; |
|
212036414957
Make cake bounce off bounce edge, stop cake at wrap edge to prevent other bug
Wuzzy <Wuzzy2@mail.ru>
parents:
13605
diff
changeset
|
3825 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3826 |
if Gear^.Tag = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3827 |
begin |
|
10874
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3828 |
cakeData:= PCakeData(Gear^.Data); |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3829 |
with cakeData^ do |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3830 |
begin |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3831 |
CakeI := (CakeI + 1) mod cakeh; |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3832 |
tdx := CakePoints[CakeI].x - Gear^.X; |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3833 |
tdy := - CakePoints[CakeI].y + Gear^.Y; |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3834 |
CakePoints[CakeI].x := Gear^.X; |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3835 |
CakePoints[CakeI].y := Gear^.Y; |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3836 |
Gear^.DirAngle := DxDy2Angle(tdx, tdy); |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3837 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3838 |
end; |
| 1088 | 3839 |
end; |
| 1089 | 3840 |
|
| 1103 | 3841 |
procedure doStepCakeUp(Gear: PGear); |
| 8795 | 3842 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3843 |
i: Longword; |
|
10874
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3844 |
cakeData: PCakeData; |
| 1103 | 3845 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3846 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3847 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3848 |
inc(Gear^.Tag); |
|
12641
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3849 |
// Animation delay. Skipped if cake only dropped a very short distance. |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3850 |
if (Gear^.Tag < 100) and (Gear^.FlightTime > 1) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3851 |
exit; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3852 |
Gear^.Tag := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3853 |
|
|
12641
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3854 |
if (Gear^.Pos = 6) or (Gear^.FlightTime <= 1) then |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3855 |
begin |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3856 |
Gear^.Pos := 6; |
|
10874
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3857 |
cakeData:= PCakeData(Gear^.Data); |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3858 |
with cakeData^ do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3859 |
begin |
|
10874
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3860 |
for i:= 0 to Pred(cakeh) do |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3861 |
begin |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3862 |
CakePoints[i].x := Gear^.X; |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3863 |
CakePoints[i].y := Gear^.Y |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3864 |
end; |
|
059a6492176e
allow gear specific data (with gear type specific type). applied to cake
sheepluva
parents:
10831
diff
changeset
|
3865 |
CakeI := 0; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3866 |
end; |
|
12641
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3867 |
(* This is called frequently if the cake is completely stuck. |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3868 |
With this a stuck cake takes equally long to explode then |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3869 |
a normal cake. Removing this code just makes the cake walking |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3870 |
for a few seconds longer. *) |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3871 |
if (Gear^.FlightTime <= 1) and (Gear^.Health > 2) then |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3872 |
dec(Gear^.Health); |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3873 |
Gear^.FlightTime := 0; |
| 11531 | 3874 |
Gear^.doStep := @doStepCakeWalk |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3875 |
end |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3876 |
else |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3877 |
inc(Gear^.Pos) |
| 1103 | 3878 |
end; |
3879 |
||
| 1089 | 3880 |
procedure doStepCakeFall(Gear: PGear); |
3881 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3882 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3883 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3884 |
Gear^.dY := Gear^.dY + cGravity; |
|
12641
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3885 |
// FlightTime remembers the drop time |
|
f30b70976577
Fix cake taking >200s to explode when it's completely stuck and can't move (bug 194)
Wuzzy <almikes@aol.com>
parents:
12621
diff
changeset
|
3886 |
inc(Gear^.FlightTime); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3887 |
if TestCollisionYwithGear(Gear, 1) <> 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3888 |
Gear^.doStep := @doStepCakeUp |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3889 |
else |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
3890 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3891 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3892 |
if CheckGearDrowning(Gear) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
3893 |
AfterAttack |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
3894 |
end |
| 1089 | 3895 |
end; |
3896 |
||
3897 |
procedure doStepCake(Gear: PGear); |
|
3898 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3899 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3900 |
|
|
13469
f1d349a52bc7
Refactor: lfCurrentHog→lfCurHogCrate, lfNotCurrentMask→lfNotCurHogCrate
Wuzzy <Wuzzy2@mail.ru>
parents:
13408
diff
changeset
|
3901 |
Gear^.CollisionMask:= lfNotCurHogCrate; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3902 |
|
|
10038
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
3903 |
Gear^.dY:= cMaxWindSpeed * 100; |
|
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
3904 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3905 |
Gear^.doStep := @doStepCakeFall |
| 1089 | 3906 |
end; |
3907 |
||
| 1259 | 3908 |
//////////////////////////////////////////////////////////////////////////////// |
| 1284 | 3909 |
procedure doStepSeductionWork(Gear: PGear); |
| 5706 | 3910 |
var i: LongInt; |
| 7335 | 3911 |
hogs: PGearArrayS; |
|
14015
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3912 |
HHGear: PGear; |
| 1259 | 3913 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3914 |
AllInactive := false; |
|
14015
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3915 |
|
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3916 |
HHGear := Gear^.Hedgehog^.Gear; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3917 |
if (HHGear <> nil) and ((HHGear^.State and gstHHDriven) = 0) then |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3918 |
begin |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3919 |
StopSound(sndYoohoo); |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3920 |
AfterAttack; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3921 |
DeleteGear(Gear); |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3922 |
exit; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3923 |
end; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3924 |
|
| 5525 | 3925 |
hogs := GearsNear(Gear^.X, Gear^.Y, gtHedgehog, Gear^.Radius); |
| 7335 | 3926 |
if hogs.size > 0 then |
3927 |
begin |
|
3928 |
for i:= 0 to hogs.size - 1 do |
|
3929 |
with hogs.ar^[i]^ do |
|
| 10544 | 3930 |
if (hogs.ar^[i] <> CurrentHedgehog^.Gear) and (Hedgehog^.Effects[heFrozen] = 0) then |
| 7335 | 3931 |
begin |
|
12743
f45ffb4cf1e1
Make GearsNear and CheckGearNear check gears across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12737
diff
changeset
|
3932 |
if (WorldEdge <> weWrap) or (not (hwAbs(Gear^.X - X) > int2hwFloat(Gear^.Radius))) then |
|
f45ffb4cf1e1
Make GearsNear and CheckGearNear check gears across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12737
diff
changeset
|
3933 |
dX:= _50 * cGravity * (Gear^.X - X) / _25 |
|
f45ffb4cf1e1
Make GearsNear and CheckGearNear check gears across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12737
diff
changeset
|
3934 |
else if (not (hwAbs(Gear^.X + int2hwFloat(RightX-LeftX) - X) > int2hwFloat(Gear^.Radius))) then |
|
f45ffb4cf1e1
Make GearsNear and CheckGearNear check gears across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12737
diff
changeset
|
3935 |
dX:= _50 * cGravity * ((Gear^.X + int2hwFloat(RightX-LeftX)) - X) / _25 |
|
f45ffb4cf1e1
Make GearsNear and CheckGearNear check gears across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12737
diff
changeset
|
3936 |
else |
|
f45ffb4cf1e1
Make GearsNear and CheckGearNear check gears across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12737
diff
changeset
|
3937 |
dX:= _50 * cGravity * ((Gear^.X - int2hwFloat(RightX-LeftX)) - X) / _25; |
|
13058
004f4f7dc9d4
Enemy hogs should at least try to get to you in low gravity
nemo
parents:
12989
diff
changeset
|
3938 |
dY:= -_450 * cMaxWindSpeed * 2; |
| 7335 | 3939 |
Active:= true; |
3940 |
end |
|
| 10545 | 3941 |
else if Hedgehog^.Effects[heFrozen] > 255 then |
3942 |
Hedgehog^.Effects[heFrozen]:= 255 |
|
| 5525 | 3943 |
end ; |
|
14015
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3944 |
AfterAttack; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3945 |
DeleteGear(Gear); |
| 1286 | 3946 |
end; |
3947 |
||
3948 |
procedure doStepSeductionWear(Gear: PGear); |
|
| 5562 | 3949 |
var heart: PVisualGear; |
|
14015
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3950 |
HHGear: PGear; |
| 1286 | 3951 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3952 |
AllInactive := false; |
|
14015
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3953 |
|
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3954 |
HHGear := Gear^.Hedgehog^.Gear; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3955 |
if (HHGear <> nil) and ((HHGear^.State and gstHHDriven) = 0) then |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3956 |
begin |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3957 |
StopSound(sndYoohoo); |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3958 |
AfterAttack; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3959 |
DeleteGear(Gear); |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3960 |
exit; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3961 |
end; |
|
996ef4c5d064
Fix seduction not stopping if hog took damage before attack was complete
Wuzzy <Wuzzy2@mail.ru>
parents:
14006
diff
changeset
|
3962 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3963 |
inc(Gear^.Timer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3964 |
if Gear^.Timer > 250 then |
| 5562 | 3965 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3966 |
Gear^.Timer := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3967 |
inc(Gear^.Pos); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
3968 |
if Gear^.Pos = 5 then |
|
11698
e86feecadced
Fix issue 12: “Yoohoo” sound for seduction is missing
sheepluva
parents:
11553
diff
changeset
|
3969 |
PlaySound(sndYoohoo); |
|
14841
183677a07c8d
Separate Yoohoo.ogg into "Yoohoo" voice and kiss sound
Wuzzy <Wuzzy2@mail.ru>
parents:
14782
diff
changeset
|
3970 |
if Gear^.Pos = 14 then |
|
183677a07c8d
Separate Yoohoo.ogg into "Yoohoo" voice and kiss sound
Wuzzy <Wuzzy2@mail.ru>
parents:
14782
diff
changeset
|
3971 |
PlaySound(sndKiss); |
| 5562 | 3972 |
end; |
3973 |
||
| 11858 | 3974 |
|
3975 |
// note: use GameTicks, not RealTicks, otherwise amount can vary greatly |
|
|
11860
0abbe6f1e4f2
increase heart count in seduction effect. FPS are overrated anyway
sheepluva
parents:
11858
diff
changeset
|
3976 |
if (Gear^.Pos = 14) and (GameTicks and $1 = 0) then |
| 5562 | 3977 |
begin |
3978 |
heart:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot); |
|
| 6131 | 3979 |
if heart <> nil then |
|
5564
4f42009237df
For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same
nemo
parents:
5563
diff
changeset
|
3980 |
with heart^ do |
|
4f42009237df
For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same
nemo
parents:
5563
diff
changeset
|
3981 |
begin |
| 11858 | 3982 |
|
3983 |
// randomize speed in both directions |
|
3984 |
dx:= 0.001 * (random(201)); |
|
3985 |
dy:= 0.001 * (random(201)); |
|
3986 |
||
3987 |
// half of hearts go down |
|
3988 |
if random(2) = 0 then |
|
3989 |
begin |
|
3990 |
// create a pointy shape |
|
3991 |
if 0.2 < dx + dy then |
|
3992 |
begin |
|
3993 |
dy:= 0.2 - dy; |
|
3994 |
dx:= 0.2 - dx; |
|
3995 |
end; |
|
3996 |
// sin bulge it out a little to avoid corners on the side |
|
3997 |
dx:= dx + (dx/0.2) * ((0.2 * sin(pi * ((0.2 - dy) / 0.4))) - (0.2 - dy)); |
|
3998 |
// change sign |
|
3999 |
dy:= -dy; |
|
4000 |
end |
|
4001 |
else // shape hearts on top into 2 arcs |
|
4002 |
dy:= dy * (0.3 + 0.7 * sin(pi * dx / 0.2)); |
|
4003 |
||
4004 |
// half of the hearts go left |
|
4005 |
if random(2) = 0 then |
|
4006 |
dx := -dx; |
|
|
5564
4f42009237df
For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same
nemo
parents:
5563
diff
changeset
|
4007 |
FrameTicks:= random(750) + 1000; |
|
5748
70d7f8e40f53
Just for fun. Flowers! Also, use a less blatant image in ammo menu.
nemo
parents:
5738
diff
changeset
|
4008 |
State:= ord(sprSeduction) |
|
5564
4f42009237df
For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same
nemo
parents:
5563
diff
changeset
|
4009 |
end; |
| 5562 | 4010 |
end; |
4011 |
||
4012 |
if Gear^.Pos = 15 then |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4013 |
Gear^.doStep := @doStepSeductionWork |
| 1259 | 4014 |
end; |
| 1284 | 4015 |
|
4016 |
procedure doStepSeduction(Gear: PGear); |
|
4017 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4018 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4019 |
Gear^.doStep := @doStepSeductionWear |
| 1284 | 4020 |
end; |
| 1298 | 4021 |
|
4022 |
//////////////////////////////////////////////////////////////////////////////// |
|
4023 |
procedure doStepWaterUp(Gear: PGear); |
|
| 8795 | 4024 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4025 |
i: LongWord; |
| 1298 | 4026 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4027 |
if (Gear^.Tag = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4028 |
or (cWaterLine = 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4029 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4030 |
DeleteGear(Gear); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4031 |
exit |
|
4153
6bd94e4c5d65
2 more variables to control water rise and health loss during sudden death.
henek
parents:
4135
diff
changeset
|
4032 |
end; |
|
6bd94e4c5d65
2 more variables to control water rise and health loss during sudden death.
henek
parents:
4135
diff
changeset
|
4033 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4034 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4035 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4036 |
inc(Gear^.Timer); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4037 |
if Gear^.Timer = 17 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4038 |
Gear^.Timer := 0 |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4039 |
else |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4040 |
exit; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4041 |
|
| 10359 | 4042 |
if (WorldEdge = weSea) and (playWidth > cMinPlayWidth) then |
| 10354 | 4043 |
begin |
4044 |
inc(leftX); |
|
4045 |
dec(rightX); |
|
4046 |
dec(playWidth, 2); |
|
4047 |
for i:= 0 to LAND_HEIGHT - 1 do |
|
4048 |
begin |
|
4049 |
Land[i, leftX] := 0; |
|
4050 |
Land[i, rightX] := 0; |
|
4051 |
end; |
|
4052 |
end; |
|
4053 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4054 |
if cWaterLine > 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4055 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4056 |
dec(cWaterLine); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4057 |
for i:= 0 to LAND_WIDTH - 1 do |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4058 |
Land[cWaterLine, i] := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4059 |
SetAllToActive |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4060 |
end; |
| 1298 | 4061 |
|
|
4153
6bd94e4c5d65
2 more variables to control water rise and health loss during sudden death.
henek
parents:
4135
diff
changeset
|
4062 |
dec(Gear^.Tag); |
| 1298 | 4063 |
end; |
| 1573 | 4064 |
|
4065 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 1590 | 4066 |
procedure doStepDrillDrilling(Gear: PGear); |
| 8795 | 4067 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4068 |
t: PGearArray; |
| 8795 | 4069 |
tempColl: Word; |
| 1573 | 4070 |
begin |
|
13624
6a06904c7bb8
Fix drill rocket exploding when digging at bounce/wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
13614
diff
changeset
|
4071 |
WorldWrap(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4072 |
AllInactive := false; |
|
8822
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4073 |
if (Gear^.Timer > 0) and (Gear^.Timer mod 10 <> 0) then |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4074 |
begin |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4075 |
dec(Gear^.Timer); |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4076 |
exit; |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4077 |
end; |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4078 |
|
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4079 |
DrawTunnel(Gear^.X, Gear^.Y, Gear^.dX, Gear^.dY, 2, 6); |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4080 |
Gear^.X := Gear^.X + Gear^.dX; |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4081 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4082 |
if (Gear^.Timer mod 30) = 0 then |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4083 |
AddVisualGear(hwRound(Gear^.X + _20 * Gear^.dX), hwRound(Gear^.Y + _20 * Gear^.dY), vgtDust); |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4084 |
if (CheckGearDrowning(Gear)) then |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4085 |
begin |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4086 |
StopSoundChan(Gear^.SoundChannel); |
|
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4087 |
exit |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4088 |
end; |
|
8822
fc9877ff7f1a
Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient.
nemo
parents:
8814
diff
changeset
|
4089 |
|
| 8564 | 4090 |
tempColl:= Gear^.CollisionMask; |
|
13470
7b4643ff60ea
Refactor collision mask checks, remove hardcoded numbers
Wuzzy <Wuzzy2@mail.ru>
parents:
13469
diff
changeset
|
4091 |
Gear^.CollisionMask:= lfObjMask; |
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
4092 |
if (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) <> 0) or (TestCollisionXWithGear(Gear, hwSign(Gear^.dX)) <> 0) or (GameTicks > Gear^.FlightTime) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4093 |
t := CheckGearsCollision(Gear) |
|
6532
76d63e00002f
Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face.
nemo
parents:
6507
diff
changeset
|
4094 |
else t := nil; |
| 8564 | 4095 |
Gear^.CollisionMask:= tempColl; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4096 |
//fixes drill not exploding when touching HH bug |
| 8795 | 4097 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4098 |
if (Gear^.Timer = 0) or ((t <> nil) and (t^.Count <> 0)) |
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
4099 |
or ( ((Gear^.State and gsttmpFlag) = 0) and (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (TestCollisionXWithGear(Gear, hwSign(Gear^.dX)) = 0)) |
|
3509
d72c2219595d
Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents:
3505
diff
changeset
|
4100 |
// CheckLandValue returns true if the type isn't matched |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4101 |
or (not CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y), lfIndestructible)) then |
|
4758
73aef6a577ba
drill strike falling instead of exploding when exiting ground
Henek
parents:
4708
diff
changeset
|
4102 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4103 |
//out of time or exited ground |
| 7053 | 4104 |
StopSoundChan(Gear^.SoundChannel); |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
4105 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4106 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4107 |
exit |
|
4758
73aef6a577ba
drill strike falling instead of exploding when exiting ground
Henek
parents:
4708
diff
changeset
|
4108 |
end |
| 8795 | 4109 |
|
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
4110 |
else if (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (TestCollisionXWithGear(Gear, hwSign(Gear^.dX)) = 0) then |
|
4758
73aef6a577ba
drill strike falling instead of exploding when exiting ground
Henek
parents:
4708
diff
changeset
|
4111 |
begin |
| 7053 | 4112 |
StopSoundChan(Gear^.SoundChannel); |
|
4867
e604ee83e34f
let players set timer of drill strike. yes. drill strike :3 the timer starts to tick on first impact
sheepluva
parents:
4837
diff
changeset
|
4113 |
Gear^.Tag := 1; |
|
10895
bce67defd804
Make bouncing a bit less wtf for various gears tested (hog, 'zooka, saucer hog, drill strike). Less hacky is another matter.
nemo
parents:
10887
diff
changeset
|
4114 |
Gear^.AdvBounce:= 50; |
|
4758
73aef6a577ba
drill strike falling instead of exploding when exiting ground
Henek
parents:
4708
diff
changeset
|
4115 |
Gear^.doStep := @doStepDrill |
|
73aef6a577ba
drill strike falling instead of exploding when exiting ground
Henek
parents:
4708
diff
changeset
|
4116 |
end; |
| 1590 | 4117 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4118 |
dec(Gear^.Timer); |
| 1573 | 4119 |
end; |
4120 |
||
4121 |
procedure doStepDrill(Gear: PGear); |
|
| 8795 | 4122 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4123 |
t: PGearArray; |
|
10038
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
4124 |
oldX, oldY, oldDx, oldDy: hwFloat; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4125 |
t2: hwFloat; |
| 1573 | 4126 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4127 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4128 |
|
| 11391 | 4129 |
if (Gear^.State and gsttmpFlag = 0) and (GameFlags and gfMoreWind = 0) then |
|
4293
d79ffcdd77df
makes drill attack drills weaker and not affected by wind
Henek
parents:
4282
diff
changeset
|
4130 |
Gear^.dX := Gear^.dX + cWindSpeed; |
|
d79ffcdd77df
makes drill attack drills weaker and not affected by wind
Henek
parents:
4282
diff
changeset
|
4131 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4132 |
oldDx := Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4133 |
oldDy := Gear^.dY; |
|
10038
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
4134 |
oldX := Gear^.X; |
|
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
4135 |
oldY := Gear^.Y; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4136 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4137 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4138 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4139 |
if (GameTicks and $3F) = 0 then |
| 10352 | 4140 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4141 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4142 |
if ((Gear^.State and gstCollision) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4143 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4144 |
//hit |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4145 |
Gear^.dX := oldDx; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4146 |
Gear^.dY := oldDy; |
|
10038
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
4147 |
Gear^.X := oldX; |
|
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
4148 |
Gear^.Y := oldY; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4149 |
|
| 8795 | 4150 |
if GameTicks > Gear^.FlightTime then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4151 |
t := CheckGearsCollision(Gear) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4152 |
else |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4153 |
t := nil; |
|
6532
76d63e00002f
Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face.
nemo
parents:
6507
diff
changeset
|
4154 |
if (t = nil) or (t^.Count = 0) then |
|
76d63e00002f
Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face.
nemo
parents:
6507
diff
changeset
|
4155 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4156 |
//hit the ground not the HH |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4157 |
t2 := _0_5 / Distance(Gear^.dX, Gear^.dY); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4158 |
Gear^.dX := Gear^.dX * t2; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4159 |
Gear^.dY := Gear^.dY * t2; |
|
6532
76d63e00002f
Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face.
nemo
parents:
6507
diff
changeset
|
4160 |
end |
| 8795 | 4161 |
|
|
6532
76d63e00002f
Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face.
nemo
parents:
6507
diff
changeset
|
4162 |
else if (t <> nil) then |
|
76d63e00002f
Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face.
nemo
parents:
6507
diff
changeset
|
4163 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4164 |
//explode right on contact with HH |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
4165 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4166 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4167 |
exit; |
|
6532
76d63e00002f
Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face.
nemo
parents:
6507
diff
changeset
|
4168 |
end; |
| 2376 | 4169 |
|
|
10038
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
4170 |
Gear^.X:= Gear^.X+Gear^.dX*4; |
|
0a5e651d494c
Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c.
sheepluva
parents:
10011
diff
changeset
|
4171 |
Gear^.Y:= Gear^.Y+Gear^.dY*4; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4172 |
Gear^.SoundChannel := LoopSound(sndDrillRocket); |
| 15059 | 4173 |
Gear^.Pos:= 1; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4174 |
Gear^.doStep := @doStepDrillDrilling; |
| 8795 | 4175 |
|
|
4867
e604ee83e34f
let players set timer of drill strike. yes. drill strike :3 the timer starts to tick on first impact
sheepluva
parents:
4837
diff
changeset
|
4176 |
if (Gear^.State and gsttmpFlag) <> 0 then |
|
e604ee83e34f
let players set timer of drill strike. yes. drill strike :3 the timer starts to tick on first impact
sheepluva
parents:
4837
diff
changeset
|
4177 |
gear^.RenderTimer:= true; |
| 6761 | 4178 |
if Gear^.Timer > 0 then dec(Gear^.Timer) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4179 |
end |
| 6761 | 4180 |
else if ((Gear^.State and gsttmpFlag) <> 0) and (Gear^.Tag <> 0) then |
4181 |
begin |
|
| 8795 | 4182 |
if Gear^.Timer > 0 then |
| 7325 | 4183 |
dec(Gear^.Timer) |
4184 |
else |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4185 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
4186 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
| 6761 | 4187 |
DeleteGear(Gear); |
4188 |
end |
|
4189 |
end; |
|
| 1590 | 4190 |
end; |
| 1601 | 4191 |
|
| 1633 | 4192 |
//////////////////////////////////////////////////////////////////////////////// |
| 1601 | 4193 |
procedure doStepBallgunWork(Gear: PGear); |
| 8795 | 4194 |
var |
| 7296 | 4195 |
HHGear, ball: PGear; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4196 |
rx, ry: hwFloat; |
| 3143 | 4197 |
gX, gY: LongInt; |
| 1601 | 4198 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4199 |
AllInactive := false; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4200 |
dec(Gear^.Timer); |
| 4365 | 4201 |
HHGear := Gear^.Hedgehog^.Gear; |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
4202 |
if HHGear = nil then |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
4203 |
begin |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
4204 |
DeleteGear(gear); |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
4205 |
exit |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
4206 |
end; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4207 |
HedgehogChAngle(HHGear); |
| 3484 | 4208 |
gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle); |
4209 |
gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle); |
|
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4210 |
if (Gear^.Timer mod 100) = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4211 |
begin |
| 7001 | 4212 |
rx := rndSign(getRandomf * _0_1); |
4213 |
ry := rndSign(getRandomf * _0_1); |
|
| 2376 | 4214 |
|
| 7296 | 4215 |
ball:= AddGear(gx, gy, gtBall, 0, SignAs(AngleSin(HHGear^.Angle) * _0_8, HHGear^.dX) + rx, AngleCos(HHGear^.Angle) * ( - _0_8) + ry, 0); |
|
13469
f1d349a52bc7
Refactor: lfCurrentHog→lfCurHogCrate, lfNotCurrentMask→lfNotCurHogCrate
Wuzzy <Wuzzy2@mail.ru>
parents:
13408
diff
changeset
|
4216 |
ball^.CollisionMask:= lfNotCurHogCrate; |
| 2376 | 4217 |
|
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4218 |
PlaySound(sndGun); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4219 |
end; |
| 1601 | 4220 |
|
|
7195
9e6e8e5a4c2e
Check for gstHHDriven instead of damage check, so ballgun stops when turn ends in multiattack mode
unc0rr
parents:
7170
diff
changeset
|
4221 |
if (Gear^.Timer = 0) or ((HHGear^.State and gstHHDriven) = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4222 |
begin |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
4223 |
HHGear^.State := HHGear^.State and (not gstNotKickable); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4224 |
DeleteGear(Gear); |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4225 |
AfterAttack |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4226 |
end |
| 1601 | 4227 |
end; |
4228 |
||
4229 |
procedure doStepBallgun(Gear: PGear); |
|
| 8795 | 4230 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4231 |
HHGear: PGear; |
| 1601 | 4232 |
begin |
| 4365 | 4233 |
HHGear := Gear^.Hedgehog^.Gear; |
| 6450 | 4234 |
HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown)); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4235 |
HHGear^.State := HHGear^.State or gstNotKickable; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4236 |
Gear^.doStep := @doStepBallgunWork |
| 1633 | 4237 |
end; |
| 1689 | 4238 |
|
| 1696 | 4239 |
//////////////////////////////////////////////////////////////////////////////// |
| 1689 | 4240 |
procedure doStepRCPlaneWork(Gear: PGear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4241 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4242 |
const cAngleSpeed = 3; |
| 8795 | 4243 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4244 |
HHGear: PGear; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4245 |
i: LongInt; |
|
12989
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4246 |
s: ansistring; |
|
10110
a7aed2eea727
simplify rc-plane's angle-adjustment-after-wrap code
sheepluva
parents:
10108
diff
changeset
|
4247 |
dX, dY : hwFloat; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4248 |
fChanged: boolean; |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4249 |
trueAngle: Longword; |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2944
diff
changeset
|
4250 |
t: PGear; |
| 1689 | 4251 |
begin |
|
10110
a7aed2eea727
simplify rc-plane's angle-adjustment-after-wrap code
sheepluva
parents:
10108
diff
changeset
|
4252 |
if WorldWrap(Gear) then |
|
a7aed2eea727
simplify rc-plane's angle-adjustment-after-wrap code
sheepluva
parents:
10108
diff
changeset
|
4253 |
begin |
|
10112
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4254 |
if (WorldEdge = weBounce) then // mirror |
|
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4255 |
Gear^.Angle:= 4096 - Gear^.Angle |
|
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4256 |
else if (WorldEdge = weSea) then // rotate 90 degree |
|
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4257 |
begin |
|
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4258 |
// sea-wrapped gears move upwards, so let's mirror angle if needed |
|
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4259 |
if Gear^.Angle < 2048 then |
|
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4260 |
Gear^.Angle:= 4096 - Gear^.Angle; |
|
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4261 |
Gear^.Angle:= (Gear^.Angle + 1024) mod 4096; |
|
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
4262 |
end; |
| 9477 | 4263 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4264 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4265 |
|
| 4365 | 4266 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4267 |
FollowGear := Gear; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4268 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4269 |
if Gear^.Timer > 0 then |
|
11152
3ac7f6d43200
stop rc plane prop/engine sound when out of fuel
sheepluva
parents:
11070
diff
changeset
|
4270 |
begin |
|
3ac7f6d43200
stop rc plane prop/engine sound when out of fuel
sheepluva
parents:
11070
diff
changeset
|
4271 |
if Gear^.Timer = 1 then |
|
3ac7f6d43200
stop rc plane prop/engine sound when out of fuel
sheepluva
parents:
11070
diff
changeset
|
4272 |
begin |
|
3ac7f6d43200
stop rc plane prop/engine sound when out of fuel
sheepluva
parents:
11070
diff
changeset
|
4273 |
StopSoundChan(Gear^.SoundChannel); |
|
3ac7f6d43200
stop rc plane prop/engine sound when out of fuel
sheepluva
parents:
11070
diff
changeset
|
4274 |
Gear^.SoundChannel:= -1; |
|
3ac7f6d43200
stop rc plane prop/engine sound when out of fuel
sheepluva
parents:
11070
diff
changeset
|
4275 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4276 |
dec(Gear^.Timer); |
|
11152
3ac7f6d43200
stop rc plane prop/engine sound when out of fuel
sheepluva
parents:
11070
diff
changeset
|
4277 |
end; |
| 4886 | 4278 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4279 |
fChanged := false; |
| 9559 | 4280 |
if (HHGear = nil) or ((HHGear^.State and gstHHDriven) = 0) or (Gear^.Timer = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4281 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4282 |
fChanged := true; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4283 |
if Gear^.Angle > 2048 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4284 |
dec(Gear^.Angle) |
| 6785 | 4285 |
else if Gear^.Angle < 2048 then |
4286 |
inc(Gear^.Angle) |
|
4287 |
else fChanged := false |
|
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
4288 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4289 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4290 |
begin |
| 3894 | 4291 |
if ((Gear^.Message and gmLeft) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4292 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4293 |
fChanged := true; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4294 |
Gear^.Angle := (Gear^.Angle + (4096 - cAngleSpeed)) mod 4096 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4295 |
end; |
| 1689 | 4296 |
|
| 3894 | 4297 |
if ((Gear^.Message and gmRight) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4298 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4299 |
fChanged := true; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4300 |
Gear^.Angle := (Gear^.Angle + cAngleSpeed) mod 4096 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4301 |
end |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4302 |
end; |
| 1689 | 4303 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4304 |
if fChanged then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4305 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4306 |
Gear^.dX.isNegative := (Gear^.Angle > 2048); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4307 |
if Gear^.dX.isNegative then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4308 |
trueAngle := 4096 - Gear^.Angle |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4309 |
else |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4310 |
trueAngle := Gear^.Angle; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4311 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4312 |
Gear^.dX := SignAs(AngleSin(trueAngle), Gear^.dX) * _0_25; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4313 |
Gear^.dY := AngleCos(trueAngle) * -_0_25; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4314 |
end; |
| 1689 | 4315 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4316 |
Gear^.X := Gear^.X + Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4317 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4318 |
|
| 4808 | 4319 |
if (GameTicks and $FF) = 0 then |
4320 |
if Gear^.Timer < 3500 then |
|
4321 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEvilTrace) |
|
4322 |
else |
|
4323 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace); |
|
4324 |
||
|
12989
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4325 |
if (HHGear <> nil) and ((HHGear^.Message and gmAttack) <> 0) then |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4326 |
begin |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4327 |
if (Gear^.Health) <> 0 then |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4328 |
begin |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4329 |
HHGear^.Message := HHGear^.Message and (not gmAttack); |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4330 |
AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtAirBomb, 0, Gear^.dX * _0_5, Gear^.dY * |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4331 |
_0_5, 0); |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4332 |
dec(Gear^.Health) |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4333 |
end; |
|
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4334 |
s:= ansistring(inttostr(Gear^.Health)); |
|
13642
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13640
diff
changeset
|
4335 |
AddCaption(formatA(trmsg[sidRemaining], s), capcolDefault, capgrpAmmostate); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4336 |
end; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4337 |
|
| 9559 | 4338 |
if (HHGear <> nil) and ((HHGear^.Message and gmLJump) <> 0) and ((Gear^.State and gsttmpFlag) = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4339 |
begin |
| 4808 | 4340 |
Gear^.State := Gear^.State or gsttmpFlag; |
|
13996
350adfa0e896
Refactor usage of sndRideOfTheValkyries, now can play if music is on and sound is off
Wuzzy <Wuzzy2@mail.ru>
parents:
13995
diff
changeset
|
4341 |
PlayMusicSound(sndRideOfTheValkyries); |
|
11519
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11475
diff
changeset
|
4342 |
inCinematicMode:= true; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4343 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4344 |
|
| 4808 | 4345 |
// pickup bonuses |
4346 |
t := CheckGearNear(Gear, gtCase, 36, 36); |
|
| 10234 | 4347 |
if (t <> nil) and (HHGear <> nil) then |
| 4808 | 4348 |
PickUp(HHGear, t); |
4349 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4350 |
CheckCollision(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4351 |
|
| 4808 | 4352 |
if ((Gear^.State and gstCollision) <> 0) or CheckGearDrowning(Gear) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4353 |
begin |
|
11519
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11475
diff
changeset
|
4354 |
inCinematicMode:= false; |
| 7053 | 4355 |
StopSoundChan(Gear^.SoundChannel); |
|
13996
350adfa0e896
Refactor usage of sndRideOfTheValkyries, now can play if music is on and sound is off
Wuzzy <Wuzzy2@mail.ru>
parents:
13995
diff
changeset
|
4356 |
StopMusicSound(sndRideOfTheValkyries); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4357 |
|
| 4808 | 4358 |
if ((Gear^.State and gstCollision) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4359 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
4360 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
| 5228 | 4361 |
for i:= 0 to 15 do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4362 |
begin |
| 7001 | 4363 |
dX := AngleCos(i * 64) * _0_5 * (GetRandomf + _1); |
4364 |
dY := AngleSin(i * 64) * _0_5 * (GetRandomf + _1); |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4365 |
AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, dY, 0); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4366 |
AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, -dY, 0); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4367 |
end; |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
4368 |
if HHGear <> nil then HHGear^.State := HHGear^.State and (not gstNotKickable); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4369 |
DeleteGear(Gear) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4370 |
end; |
| 1713 | 4371 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4372 |
AfterAttack; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4373 |
CurAmmoGear := nil; |
|
5016
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
5013
diff
changeset
|
4374 |
if (GameFlags and gfInfAttack) = 0 then |
|
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
5013
diff
changeset
|
4375 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4376 |
if TagTurnTimeLeft = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4377 |
TagTurnTimeLeft:= TurnTimeLeft; |
| 8795 | 4378 |
|
|
5016
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
5013
diff
changeset
|
4379 |
TurnTimeLeft:= 14 * 125; |
|
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
5013
diff
changeset
|
4380 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4381 |
|
| 10510 | 4382 |
if HHGear <> nil then |
|
12815
92218a06c9ff
Don't send taunt message for automatically happening taunt animation
unc0rr
parents:
12806
diff
changeset
|
4383 |
begin |
| 10234 | 4384 |
HHGear^.Message := 0; |
|
12815
92218a06c9ff
Don't send taunt message for automatically happening taunt animation
unc0rr
parents:
12806
diff
changeset
|
4385 |
PlayTaunt(1) |
|
92218a06c9ff
Don't send taunt message for automatically happening taunt animation
unc0rr
parents:
12806
diff
changeset
|
4386 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4387 |
end |
| 1689 | 4388 |
end; |
4389 |
||
4390 |
procedure doStepRCPlane(Gear: PGear); |
|
| 8795 | 4391 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4392 |
HHGear: PGear; |
| 1689 | 4393 |
begin |
| 4365 | 4394 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4395 |
HHGear^.Message := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4396 |
HHGear^.State := HHGear^.State or gstNotKickable; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4397 |
Gear^.Angle := HHGear^.Angle; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4398 |
Gear^.Tag := hwSign(HHGear^.dX); |
| 8795 | 4399 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4400 |
if HHGear^.dX.isNegative then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4401 |
Gear^.Angle := 4096 - Gear^.Angle; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4402 |
Gear^.doStep := @doStepRCPlaneWork |
| 1712 | 4403 |
end; |
|
2177
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4404 |
|
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
4405 |
//////////////////////////////////////////////////////////////////////////////// |
|
2177
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4406 |
procedure doStepJetpackWork(Gear: PGear); |
| 8795 | 4407 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4408 |
HHGear: PGear; |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4409 |
fuel, i: LongInt; |
|
2177
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4410 |
move: hwFloat; |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4411 |
isUnderwater: Boolean; |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4412 |
bubble: PVisualGear; |
|
2177
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4413 |
begin |
| 10354 | 4414 |
isUnderwater:= CheckCoordInWater(hwRound(Gear^.X), hwRound(Gear^.Y) + Gear^.Radius); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4415 |
if Gear^.Pos > 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4416 |
dec(Gear^.Pos); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4417 |
AllInactive := false; |
| 4365 | 4418 |
HHGear := Gear^.Hedgehog^.Gear; |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4419 |
move := _0_2; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4420 |
fuel := 50; |
|
8987
47cf32305d99
some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess
nemo
parents:
8973
diff
changeset
|
4421 |
if HHGear^.Message and gmPrecise <> 0 then |
|
47cf32305d99
some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess
nemo
parents:
8973
diff
changeset
|
4422 |
HedgehogChAngle(HHGear) |
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4423 |
else if (Gear^.Health > 0) or (Gear^.Health = JETPACK_FUEL_INFINITE) then |
|
8987
47cf32305d99
some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess
nemo
parents:
8973
diff
changeset
|
4424 |
begin |
|
47cf32305d99
some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess
nemo
parents:
8973
diff
changeset
|
4425 |
if HHGear^.Message and gmUp <> 0 then |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4426 |
begin |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4427 |
if (not HHGear^.dY.isNegative) or (HHGear^.Y > -_256) then |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4428 |
begin |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4429 |
if isUnderwater then |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4430 |
begin |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4431 |
HHGear^.dY := HHGear^.dY - (move * _0_7); |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4432 |
for i:= random(10)+10 downto 0 do |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4433 |
begin |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4434 |
bubble := AddVisualGear(hwRound(HHGear^.X) - 8 + random(16), hwRound(HHGear^.Y) + 16 + random(8), vgtBubble); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4435 |
if bubble <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4436 |
bubble^.dY:= random(20)/10+0.1; |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4437 |
end |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4438 |
end |
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4439 |
else |
|
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4440 |
begin |
|
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4441 |
PlaySound(sndJetpackBoost); |
|
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4442 |
HHGear^.dY := HHGear^.dY - move; |
|
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4443 |
end |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4444 |
end; |
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4445 |
if Gear^.Health <> JETPACK_FUEL_INFINITE then |
|
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4446 |
dec(Gear^.Health, fuel); |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4447 |
Gear^.MsgParam := Gear^.MsgParam or gmUp; |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4448 |
Gear^.Timer := GameTicks |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4449 |
end; |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4450 |
move.isNegative := (HHGear^.Message and gmLeft) <> 0; |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4451 |
if (HHGear^.Message and (gmLeft or gmRight)) <> 0 then |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4452 |
begin |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4453 |
HHGear^.dX := HHGear^.dX + (move * _0_1); |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4454 |
if isUnderwater then |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4455 |
begin |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4456 |
for i:= random(5)+5 downto 0 do |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4457 |
begin |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4458 |
bubble := AddVisualGear(hwRound(HHGear^.X)+random(8), hwRound(HHGear^.Y) - 8 + random(16), vgtBubble); |
| 6131 | 4459 |
if bubble <> nil then |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4460 |
begin |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4461 |
bubble^.dX:= (random(10)/10 + 0.02) * -1; |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4462 |
if (move.isNegative) then |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4463 |
begin |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4464 |
bubble^.X := bubble^.X + 28; |
| 4187 | 4465 |
bubble^.dX:= bubble^.dX * (-1) |
|
3909
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4466 |
end |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4467 |
else bubble^.X := bubble^.X - 28; |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4468 |
end; |
|
4ba25a3d15af
remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater
nemo
parents:
3907
diff
changeset
|
4469 |
end |
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4470 |
end |
|
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4471 |
else PlaySound(sndJetpackBoost); |
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4472 |
if Gear^.Health <> JETPACK_FUEL_INFINITE then |
|
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4473 |
dec(Gear^.Health, fuel div 5); |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4474 |
Gear^.MsgParam := Gear^.MsgParam or (HHGear^.Message and (gmLeft or gmRight)); |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4475 |
Gear^.Timer := GameTicks |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4476 |
end |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4477 |
end; |
|
2182
ed7e7eb3f9ed
Ugly graphic for jetpack - jetpack should be essentially functional.
nemo
parents:
2181
diff
changeset
|
4478 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4479 |
// erases them all at once :-/ |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4480 |
if (Gear^.Timer <> 0) and (GameTicks - Gear^.Timer > 250) then |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
4481 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4482 |
Gear^.Timer := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4483 |
Gear^.MsgParam := 0 |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
4484 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4485 |
|
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4486 |
if (Gear^.Health < 0) and (Gear^.Health <> JETPACK_FUEL_INFINITE) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4487 |
Gear^.Health := 0; |
| 8795 | 4488 |
|
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
4489 |
i:= Gear^.Health div 20; |
| 8795 | 4490 |
|
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
4491 |
if (i <> Gear^.Damage) and ((GameTicks and $3F) = 0) then |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4492 |
begin |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
4493 |
Gear^.Damage:= i; |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10597
diff
changeset
|
4494 |
FreeAndNilTexture(Gear^.Tex); |
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4495 |
if Gear^.Health <> JETPACK_FUEL_INFINITE then |
| 13898 | 4496 |
Gear^.Tex := RenderStringTex(FormatA(trmsg[sidFuel], ansistring(inttostr(i))), cWhiteColor, fntSmall) |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4497 |
end; |
|
2182
ed7e7eb3f9ed
Ugly graphic for jetpack - jetpack should be essentially functional.
nemo
parents:
2181
diff
changeset
|
4498 |
|
|
8987
47cf32305d99
some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess
nemo
parents:
8973
diff
changeset
|
4499 |
if (HHGear^.Message and (gmAttack or gmUp or gmLeft or gmRight) <> 0) and |
|
47cf32305d99
some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess
nemo
parents:
8973
diff
changeset
|
4500 |
(HHGear^.Message and gmPrecise = 0) then |
| 6450 | 4501 |
Gear^.State := Gear^.State and (not gsttmpFlag); |
| 8795 | 4502 |
|
|
8987
47cf32305d99
some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess
nemo
parents:
8973
diff
changeset
|
4503 |
if HHGear^.Message and gmPrecise = 0 then |
|
47cf32305d99
some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess
nemo
parents:
8973
diff
changeset
|
4504 |
HHGear^.Message := HHGear^.Message and (not (gmUp or gmLeft or gmRight)); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4505 |
HHGear^.State := HHGear^.State or gstMoving; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4506 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4507 |
Gear^.X := HHGear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4508 |
Gear^.Y := HHGear^.Y; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4509 |
|
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4510 |
if not isUnderWater and hasBorder and ((HHGear^.X < _0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4511 |
or (hwRound(HHGear^.X) > LAND_WIDTH)) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4512 |
HHGear^.dY.isNegative:= false; |
| 8795 | 4513 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4514 |
if ((Gear^.State and gsttmpFlag) = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4515 |
or (HHGear^.dY < _0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4516 |
doStepHedgehogMoving(HHGear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4517 |
|
|
14593
34e810295d08
Remove a bunch of dead out-commented code
Wuzzy <Wuzzy2@mail.ru>
parents:
14591
diff
changeset
|
4518 |
if |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4519 |
(HHGear^.Damage <> 0) |
| 10354 | 4520 |
// drown if too deep under water |
| 8990 | 4521 |
or (cWaterLine + cVisibleWater * 4 < hwRound(HHGear^.Y)) |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4522 |
or (TurnTimeLeft = 0) |
|
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4523 |
// allow brief ground touches - to be fair on this, might need another counter |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
4524 |
or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0)) |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4525 |
or ((Gear^.Message and gmAttack) <> 0) then |
|
4233
b4ad20bfe310
make weapons on rope/parachute/UFO inherit momentum of the hog. needs testing of course
nemo
parents:
4224
diff
changeset
|
4526 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4527 |
with HHGear^ do |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4528 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4529 |
Message := 0; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4530 |
Active := true; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4531 |
State := State or gstMoving |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4532 |
end; |
|
13977
2568fa516733
Fix hog can drop more than 2 s. mines if first one was dropped from utility, then stop using that utility
Wuzzy <Wuzzy2@mail.ru>
parents:
13898
diff
changeset
|
4533 |
if (GetAmmoEntry(HHGear^.Hedgehog^, amJetpack)^.Count >= 1) and ((Ammoz[HHGear^.Hedgehog^.CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) and (HHGear^.Hedgehog^.MultiShootAttacks = 0) then |
|
12820
4c1c468725ff
Fix desync when dropping weapon from parachute or jetpack
Wuzzy <Wuzzy2@mail.ru>
parents:
12815
diff
changeset
|
4534 |
HHGear^.Hedgehog^.CurAmmoType:= amJetpack; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4535 |
isCursorVisible := false; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4536 |
ApplyAmmoChanges(HHGear^.Hedgehog^); |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
4537 |
DeleteGear(Gear); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4538 |
end |
|
2177
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4539 |
end; |
|
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4540 |
|
|
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4541 |
procedure doStepJetpack(Gear: PGear); |
| 8795 | 4542 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4543 |
HHGear: PGear; |
|
2177
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4544 |
begin |
|
3907
5b516f0d9957
Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls.
nemo
parents:
3894
diff
changeset
|
4545 |
Gear^.Pos:= 0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4546 |
Gear^.doStep := @doStepJetpackWork; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4547 |
|
| 4365 | 4548 |
HHGear := Gear^.Hedgehog^.Gear; |
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4549 |
|
|
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4550 |
PlaySound(sndJetpackLaunch); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4551 |
FollowGear := HHGear; |
|
3965
09eea558ba83
Call OnUsedAmmo *after* doing the normal CurAmmoType stuff so CurAmmoType actually points to the right bloody weapon
nemo
parents:
3963
diff
changeset
|
4552 |
AfterAttack; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4553 |
with HHGear^ do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4554 |
begin |
| 6450 | 4555 |
State := State and (not gstAttacking); |
4556 |
Message := Message and (not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight)); |
|
| 8795 | 4557 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4558 |
if (dY < _0_1) and (dY > -_0_1) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4559 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4560 |
Gear^.State := Gear^.State or gsttmpFlag; |
| 13281 | 4561 |
dX := SignAs(_0, dX); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4562 |
dY := dY - _0_2 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4563 |
end |
| 2301 | 4564 |
end |
|
2177
c045698e044f
Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon
nemo
parents:
2143
diff
changeset
|
4565 |
end; |
| 2983 | 4566 |
|
4567 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 3149 | 4568 |
procedure doStepBirdyDisappear(Gear: PGear); |
| 2983 | 4569 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4570 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4571 |
Gear^.Pos := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4572 |
if Gear^.Timer < 2000 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4573 |
inc(Gear^.Timer, 1) |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4574 |
else |
|
14576
945bf1d4d1a4
deletegear rearrangement applied to branch too. if this causes desyncs you're probably in a crashy state already
nemo
parents:
14379
diff
changeset
|
4575 |
DeleteGear(Gear) |
| 2983 | 4576 |
end; |
4577 |
||
4578 |
procedure doStepBirdyFly(Gear: PGear); |
|
| 8795 | 4579 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4580 |
HHGear: PGear; |
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4581 |
energy, i: LongInt; |
| 2983 | 4582 |
move: hwFloat; |
|
12989
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4583 |
s: ansistring; |
| 2983 | 4584 |
begin |
| 6154 | 4585 |
HHGear := Gear^.Hedgehog^.Gear; |
| 8795 | 4586 |
if HHGear = nil then |
| 6154 | 4587 |
begin |
| 9698 | 4588 |
Gear^.Timer := 0; |
4589 |
Gear^.State := Gear^.State or gstAnimation or gstTmpFlag; |
|
4590 |
Gear^.Timer := 0; |
|
4591 |
Gear^.doStep := @doStepBirdyDisappear; |
|
4592 |
CurAmmoGear := nil; |
|
4593 |
isCursorVisible := false; |
|
4594 |
AfterAttack; |
|
| 6154 | 4595 |
exit |
4596 |
end; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4597 |
|
|
3915
c05855146440
Correct bug in flight ceiling for birdy as well, increase clip on velocity to 1.9 (shouldn't cause problems with most collision checks still), apply clip to both + and -
nemo
parents:
3909
diff
changeset
|
4598 |
move := _0_2; |
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4599 |
energy:= 50; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4600 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4601 |
if Gear^.Pos > 0 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4602 |
dec(Gear^.Pos, 1) |
| 3894 | 4603 |
else if (HHGear^.Message and (gmLeft or gmRight or gmUp)) <> 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4604 |
Gear^.Pos := 500; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4605 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4606 |
if HHGear^.dX.isNegative then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4607 |
Gear^.Tag := -1 |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4608 |
else |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4609 |
Gear^.Tag := 1; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4610 |
|
| 3894 | 4611 |
if (HHGear^.Message and gmUp) <> 0 then |
|
4272
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4612 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4613 |
if (not HHGear^.dY.isNegative) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4614 |
or (HHGear^.Y > -_256) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4615 |
HHGear^.dY := HHGear^.dY - move; |
| 8795 | 4616 |
|
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4617 |
if (Gear^.Health <> BIRDY_ENERGY_INFINITE) then |
|
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4618 |
dec(Gear^.Health, energy); |
| 3894 | 4619 |
Gear^.MsgParam := Gear^.MsgParam or gmUp; |
|
4272
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4620 |
end; |
| 8795 | 4621 |
|
| 3894 | 4622 |
if (HHGear^.Message and gmLeft) <> 0 then move.isNegative := true; |
4623 |
if (HHGear^.Message and (gmLeft or gmRight)) <> 0 then |
|
|
4272
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4624 |
begin |
|
3915
c05855146440
Correct bug in flight ceiling for birdy as well, increase clip on velocity to 1.9 (shouldn't cause problems with most collision checks still), apply clip to both + and -
nemo
parents:
3909
diff
changeset
|
4625 |
HHGear^.dX := HHGear^.dX + (move * _0_1); |
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4626 |
if (Gear^.Health <> BIRDY_ENERGY_INFINITE) then |
|
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4627 |
dec(Gear^.Health, energy div 5); |
| 3894 | 4628 |
Gear^.MsgParam := Gear^.MsgParam or (HHGear^.Message and (gmLeft or gmRight)); |
|
4272
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4629 |
end; |
| 2983 | 4630 |
|
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4631 |
if (Gear^.Health < 0) and (Gear^.Health <> BIRDY_ENERGY_INFINITE) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4632 |
Gear^.Health := 0; |
| 8795 | 4633 |
|
|
13593
083733ec7941
Add support for infinite fly time of jetpack and Birdy
Wuzzy <Wuzzy2@mail.ru>
parents:
13572
diff
changeset
|
4634 |
if ((GameTicks and $FF) = 0) and (Gear^.Health < 500) and (Gear^.Health <> BIRDY_ENERGY_INFINITE) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4635 |
for i:= ((500-Gear^.Health) div 250) downto 0 do |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4636 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtFeather); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4637 |
|
| 3894 | 4638 |
if (HHGear^.Message and gmAttack <> 0) then |
|
4272
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4639 |
begin |
| 6450 | 4640 |
HHGear^.Message := HHGear^.Message and (not gmAttack); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4641 |
if Gear^.FlightTime > 0 then |
|
4272
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4642 |
begin |
|
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4643 |
AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) + 32, gtEgg, 0, Gear^.dX * _0_5, Gear^.dY, 0); |
| 3123 | 4644 |
PlaySound(sndBirdyLay); |
| 3115 | 4645 |
dec(Gear^.FlightTime) |
|
4272
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4646 |
end; |
|
12989
c08c53624c0f
Show remaining ammo when using Birdy egg or RC Plane bomb
Wuzzy <Wuzzy2@mail.ru>
parents:
12914
diff
changeset
|
4647 |
s:= ansistring(inttostr(Gear^.FlightTime)); |
|
13642
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13640
diff
changeset
|
4648 |
AddCaption(formatA(trmsg[sidRemaining], s), capcolDefault, capgrpAmmostate); |
| 3115 | 4649 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4650 |
|
| 6131 | 4651 |
if HHGear^.Message and (gmUp or gmPrecise or gmLeft or gmRight) <> 0 then |
| 6450 | 4652 |
Gear^.State := Gear^.State and (not gsttmpFlag); |
| 8795 | 4653 |
|
| 6450 | 4654 |
HHGear^.Message := HHGear^.Message and (not (gmUp or gmPrecise or gmLeft or gmRight)); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4655 |
HHGear^.State := HHGear^.State or gstMoving; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4656 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4657 |
Gear^.X := HHGear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4658 |
Gear^.Y := HHGear^.Y - int2hwFloat(32); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4659 |
// For some reason I need to reapply followgear here, something else grabs it otherwise. |
|
6325
cdd3d8c723ec
Update changelog, comment on possibly redundant lines in GSHandlers
nemo
parents:
6314
diff
changeset
|
4660 |
// this is probably not needed anymore |
|
cdd3d8c723ec
Update changelog, comment on possibly redundant lines in GSHandlers
nemo
parents:
6314
diff
changeset
|
4661 |
if not CurrentTeam^.ExtDriven then FollowGear := HHGear; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4662 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4663 |
if ((Gear^.State and gsttmpFlag) = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4664 |
or (HHGear^.dY < _0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4665 |
doStepHedgehogMoving(HHGear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4666 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4667 |
if (Gear^.Health = 0) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4668 |
or (HHGear^.Damage <> 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4669 |
or CheckGearDrowning(HHGear) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4670 |
or (TurnTimeLeft = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4671 |
// allow brief ground touches - to be fair on this, might need another counter |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4672 |
or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0)) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4673 |
or ((Gear^.Message and gmAttack) <> 0) then |
|
4272
cf18de7ea3d4
engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine
nemo
parents:
4265
diff
changeset
|
4674 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4675 |
with HHGear^ do |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4676 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4677 |
Message := 0; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4678 |
Active := true; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4679 |
State := State or gstMoving |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4680 |
end; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4681 |
Gear^.State := Gear^.State or gstAnimation or gstTmpFlag; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4682 |
if HHGear^.dY < _0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4683 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4684 |
Gear^.dX := HHGear^.dX; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4685 |
Gear^.dY := HHGear^.dY; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4686 |
end; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4687 |
Gear^.Timer := 0; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4688 |
Gear^.doStep := @doStepBirdyDisappear; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4689 |
CurAmmoGear := nil; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4690 |
isCursorVisible := false; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4691 |
AfterAttack; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4692 |
end |
| 2983 | 4693 |
end; |
4694 |
||
4695 |
procedure doStepBirdyDescend(Gear: PGear); |
|
| 8795 | 4696 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4697 |
HHGear: PGear; |
| 2983 | 4698 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4699 |
if Gear^.Timer > 0 then |
| 9698 | 4700 |
dec(Gear^.Timer, 1); |
4701 |
||
4702 |
HHGear := Gear^.Hedgehog^.Gear; |
|
|
12644
59b46e6f36ff
Fix Birdy descending into water if hog took damage before it got picked up (bug 160)
Wuzzy <almikes@aol.com>
parents:
12641
diff
changeset
|
4703 |
if (HHGear = nil) or ((HHGear^.State and gstHHDriven) = 0) then |
|
59b46e6f36ff
Fix Birdy descending into water if hog took damage before it got picked up (bug 160)
Wuzzy <almikes@aol.com>
parents:
12641
diff
changeset
|
4704 |
begin |
|
59b46e6f36ff
Fix Birdy descending into water if hog took damage before it got picked up (bug 160)
Wuzzy <almikes@aol.com>
parents:
12641
diff
changeset
|
4705 |
Gear^.Hedgehog := nil; |
| 9698 | 4706 |
Gear^.Timer := 0; |
4707 |
Gear^.State := Gear^.State or gstAnimation or gstTmpFlag; |
|
4708 |
Gear^.doStep := @doStepBirdyDisappear; |
|
4709 |
CurAmmoGear := nil; |
|
4710 |
isCursorVisible := false; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4711 |
AfterAttack; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4712 |
exit |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4713 |
end; |
| 9698 | 4714 |
|
| 6450 | 4715 |
HHGear^.Message := HHGear^.Message and (not (gmUp or gmPrecise or gmLeft or gmRight)); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4716 |
if abs(hwRound(HHGear^.Y - Gear^.Y)) > 32 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4717 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4718 |
if Gear^.Timer = 0 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4719 |
Gear^.Y := Gear^.Y + _0_1 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4720 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4721 |
else if Gear^.Timer = 0 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4722 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4723 |
Gear^.doStep := @doStepBirdyFly; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4724 |
HHGear^.dY := -_0_2 |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4725 |
end |
| 2983 | 4726 |
end; |
4727 |
||
| 3149 | 4728 |
procedure doStepBirdyAppear(Gear: PGear); |
4729 |
begin |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4730 |
Gear^.Pos := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4731 |
if Gear^.Timer < 2000 then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4732 |
inc(Gear^.Timer, 1) |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4733 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4734 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4735 |
Gear^.Timer := 500; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4736 |
Gear^.dX := _0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4737 |
Gear^.dY := _0; |
| 6450 | 4738 |
Gear^.State := Gear^.State and (not gstAnimation); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4739 |
Gear^.doStep := @doStepBirdyDescend; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4740 |
end |
| 3149 | 4741 |
end; |
4742 |
||
| 2983 | 4743 |
procedure doStepBirdy(Gear: PGear); |
| 8795 | 4744 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4745 |
HHGear: PGear; |
| 2983 | 4746 |
begin |
| 6450 | 4747 |
gear^.State := gear^.State or gstAnimation and (not gstTmpFlag); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4748 |
Gear^.doStep := @doStepBirdyAppear; |
| 8795 | 4749 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4750 |
if CurrentHedgehog = nil then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4751 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4752 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4753 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4754 |
end; |
| 2995 | 4755 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4756 |
HHGear := CurrentHedgehog^.Gear; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4757 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4758 |
if HHGear^.dX.isNegative then |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4759 |
Gear^.Tag := -1 |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4760 |
else |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4761 |
Gear^.Tag := 1; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4762 |
Gear^.Pos := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4763 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4764 |
FollowGear := HHGear; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4765 |
with HHGear^ do |
| 5706 | 4766 |
begin |
| 6450 | 4767 |
State := State and (not gstAttacking); |
4768 |
Message := Message and (not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight)) |
|
| 5706 | 4769 |
end |
| 2983 | 4770 |
end; |
| 3032 | 4771 |
|
4772 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 3065 | 4773 |
procedure doStepEggWork(Gear: PGear); |
| 8795 | 4774 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4775 |
vg: PVisualGear; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4776 |
i: LongInt; |
| 3065 | 4777 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4778 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4779 |
Gear^.dX := Gear^.dX; |
| 3115 | 4780 |
doStepFallingGear(Gear); |
4781 |
CalcRotationDirAngle(Gear); |
|
4782 |
||
4783 |
if (Gear^.State and gstCollision) <> 0 then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4784 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
4785 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLPoisoned, $C0E0FFE0); |
| 3115 | 4786 |
PlaySound(sndEggBreak); |
4787 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEgg); |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4788 |
vg := AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEgg); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4789 |
if vg <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4790 |
vg^.Frame := 2; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4791 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4792 |
for i:= 10 downto 0 do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4793 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4794 |
vg := AddVisualGear(hwRound(Gear^.X) - 3 + Random(6), hwRound(Gear^.Y) - 3 + Random(6), |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4795 |
vgtDust); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4796 |
if vg <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4797 |
vg^.dX := vg^.dX + (Gear^.dX.QWordValue / 21474836480); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4798 |
end; |
| 3115 | 4799 |
|
4800 |
DeleteGear(Gear); |
|
4801 |
exit |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4802 |
end; |
| 3065 | 4803 |
end; |
|
3342
b4f01613dcd7
Some initial stubs for portal just so Tiy will quit nagging. Also let folks know what approximation of physics I plan to try, here.
nemo
parents:
3320
diff
changeset
|
4804 |
|
|
3401
d5d31d16eccc
add a part of my landslide vector collision and use if for the portal gun DirAngle, not flawless yet
sheepluva
parents:
3399
diff
changeset
|
4805 |
//////////////////////////////////////////////////////////////////////////////// |
| 3428 | 4806 |
procedure doPortalColorSwitch(); |
| 4790 | 4807 |
var CurWeapon: PAmmo; |
| 3428 | 4808 |
begin |
|
14141
7bb0e27910aa
Fix portal color being switchable after losing control
Wuzzy <Wuzzy2@mail.ru>
parents:
14100
diff
changeset
|
4809 |
if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and ((CurrentHedgehog^.Gear^.State and gstHHDriven) <> 0) and ((CurrentHedgehog^.Gear^.Message and gmSwitch) <> 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4810 |
with CurrentHedgehog^ do |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4811 |
if (CurAmmoType = amPortalGun) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4812 |
begin |
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
4813 |
PlaySound(sndPortalSwitch); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4814 |
CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and (not gmSwitch); |
| 8795 | 4815 |
|
| 6924 | 4816 |
CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4817 |
if CurWeapon^.Pos <> 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4818 |
CurWeapon^.Pos := 0 |
| 8795 | 4819 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4820 |
else |
| 4790 | 4821 |
CurWeapon^.Pos := 1; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4822 |
end; |
| 3428 | 4823 |
end; |
4824 |
||
|
3342
b4f01613dcd7
Some initial stubs for portal just so Tiy will quit nagging. Also let folks know what approximation of physics I plan to try, here.
nemo
parents:
3320
diff
changeset
|
4825 |
procedure doStepPortal(Gear: PGear); |
| 8795 | 4826 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4827 |
iterator, conPortal: PGear; |
| 5594 | 4828 |
s, r, nx, ny, ox, oy, poffs, noffs, pspeed, nspeed, |
4829 |
resetx, resety, resetdx, resetdy: hwFloat; |
|
4830 |
sx, sy, rh, resetr: LongInt; |
|
4831 |
hasdxy, isbullet, iscake, isCollision: Boolean; |
|
|
3342
b4f01613dcd7
Some initial stubs for portal just so Tiy will quit nagging. Also let folks know what approximation of physics I plan to try, here.
nemo
parents:
3320
diff
changeset
|
4832 |
begin |
| 3428 | 4833 |
doPortalColorSwitch(); |
4834 |
||
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4835 |
// destroy portal if ground it was attached too is gone |
|
8751
4609823efc94
More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places.
nemo
parents:
8744
diff
changeset
|
4836 |
if (Land[hwRound(Gear^.Y), hwRound(Gear^.X)] <= lfAllObjMask) |
| 10905 | 4837 |
or (Land[hwRound(Gear^.Y), hwRound(Gear^.X)] and lfBouncy <> 0) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4838 |
or (Gear^.Timer < 1) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4839 |
or (Gear^.Hedgehog^.Team <> CurrentHedgehog^.Team) |
| 10354 | 4840 |
or CheckCoordInWater(hwRound(Gear^.X), hwRound(Gear^.Y)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4841 |
begin |
| 3428 | 4842 |
deleteGear(Gear); |
4843 |
EXIT; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4844 |
end; |
| 3428 | 4845 |
|
4846 |
if (TurnTimeLeft < 1) |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4847 |
or (Gear^.Health < 1) then |
| 3428 | 4848 |
dec(Gear^.Timer); |
4849 |
||
4850 |
if Gear^.Timer < 10000 then |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4851 |
gear^.RenderTimer := true; |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4852 |
|
|
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4853 |
// abort if there is no other portal connected to this one |
|
7272
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
4854 |
if (Gear^.LinkedGear = nil) then |
| 3428 | 4855 |
exit; |
|
7272
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
4856 |
if ((Gear^.LinkedGear^.Tag and 1) = 0) then // or if it's still moving; |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4857 |
exit; |
|
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4858 |
|
|
7272
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
4859 |
conPortal := Gear^.LinkedGear; |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4860 |
|
|
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4861 |
// check all gears for stuff to port through |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4862 |
iterator := nil; |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4863 |
while true do |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4864 |
begin |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4865 |
|
| 3571 | 4866 |
// iterate through GearsList |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4867 |
if iterator = nil then |
| 3571 | 4868 |
iterator := GearsList |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4869 |
else |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4870 |
iterator := iterator^.NextGear; |
| 3571 | 4871 |
|
4872 |
// end of list? |
|
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4873 |
if iterator = nil then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4874 |
break; |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4875 |
|
|
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4876 |
// don't port portals or other gear that wouldn't make sense |
|
8634
5dcb1dc9e01b
fix portal/hammer interaction, ban freezer from portal
nemo
parents:
8632
diff
changeset
|
4877 |
if (iterator^.Kind in [gtPortal, gtRope, gtAirAttack, gtIceGun]) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4878 |
or (iterator^.PortalCounter > 32) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4879 |
continue; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4880 |
|
| 3428 | 4881 |
// don't port hogs on rope |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4882 |
// TODO: this will also prevent hogs while falling after rope use from |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4883 |
// falling through portals... fix that! |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4884 |
|
| 3571 | 4885 |
// check if gear fits through portal |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4886 |
if (iterator^.Radius > Gear^.Radius) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4887 |
continue; |
| 3571 | 4888 |
|
4889 |
// this is the max range we accept incoming gears in |
|
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4890 |
r := Int2hwFloat(iterator^.Radius+Gear^.Radius); |
|
3422
41ae3c48faa0
* some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted
sheepluva
parents:
3419
diff
changeset
|
4891 |
|
| 3571 | 4892 |
// too far away? |
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4893 |
if (iterator^.X < Gear^.X - r) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4894 |
or (iterator^.X > Gear^.X + r) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4895 |
or (iterator^.Y < Gear^.Y - r) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4896 |
or (iterator^.Y > Gear^.Y + r) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
4897 |
continue; |
| 5044 | 4898 |
|
| 10490 | 4899 |
hasdxy := (((iterator^.dX.QWordValue <> 0) or (iterator^.dY.QWordValue <> 0)) or ((iterator^.State and gstMoving) = 0)); |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4900 |
|
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4901 |
// in case the object is not moving, let's asume it's falling towards the portal |
|
4038
8972dd38bbad
potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test
sheepluva
parents:
4036
diff
changeset
|
4902 |
if not hasdxy then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4903 |
begin |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4904 |
if Gear^.Y < iterator^.Y then |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4905 |
continue; |
|
4038
8972dd38bbad
potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test
sheepluva
parents:
4036
diff
changeset
|
4906 |
ox:= Gear^.X - iterator^.X; |
|
8972dd38bbad
potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test
sheepluva
parents:
4036
diff
changeset
|
4907 |
oy:= Gear^.Y - iterator^.Y; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4908 |
end |
|
4038
8972dd38bbad
potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test
sheepluva
parents:
4036
diff
changeset
|
4909 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4910 |
begin |
|
4038
8972dd38bbad
potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test
sheepluva
parents:
4036
diff
changeset
|
4911 |
ox:= iterator^.dX; |
|
8972dd38bbad
potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test
sheepluva
parents:
4036
diff
changeset
|
4912 |
oy:= iterator^.dY; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4913 |
end; |
|
4038
8972dd38bbad
potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test
sheepluva
parents:
4036
diff
changeset
|
4914 |
|
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4915 |
// cake will need extra treatment... it's so delicious and moist! |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4916 |
iscake:= (iterator^.Kind = gtCake); |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4917 |
|
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4918 |
// won't port stuff that does not move towards the front/portal entrance |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4919 |
if iscake then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4920 |
begin |
| 6452 | 4921 |
if not (((iterator^.X - Gear^.X)*ox + (iterator^.Y - Gear^.Y)*oy).isNegative) then |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4922 |
continue; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4923 |
end |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4924 |
else |
|
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6452
diff
changeset
|
4925 |
if not ((Gear^.dX*ox + Gear^.dY*oy).isNegative) then |
| 3571 | 4926 |
continue; |
4927 |
||
| 12898 | 4928 |
isbullet:= (iterator^.Kind in [gtShotgunShot, gtDEagleShot, gtSniperRifleShot, gtSineGunShot, gtMinigunBullet]); |
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4929 |
|
|
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4930 |
r:= int2hwFloat(iterator^.Radius); |
|
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4931 |
|
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
4932 |
if not (isbullet or iscake) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4933 |
begin |
| 3571 | 4934 |
// wow! good candidate there, let's see if the distance and direction is okay! |
4935 |
if hasdxy then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4936 |
begin |
|
8900
b77fd3c2eec5
whoops, unbreak build. how come that cmake doesn't stop anymore on engine build error?
sheepluva
parents:
8898
diff
changeset
|
4937 |
s := Distance(iterator^.dX, iterator^.dY); |
| 8898 | 4938 |
// if the resulting distance is 0 skip this gear |
4939 |
if s.QWordValue = 0 then |
|
4940 |
continue; |
|
|
8900
b77fd3c2eec5
whoops, unbreak build. how come that cmake doesn't stop anymore on engine build error?
sheepluva
parents:
8898
diff
changeset
|
4941 |
s := r / s; |
| 3571 | 4942 |
ox:= iterator^.X + s * iterator^.dX; |
4943 |
oy:= iterator^.Y + s * iterator^.dY; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4944 |
end |
| 3571 | 4945 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4946 |
begin |
| 3571 | 4947 |
ox:= iterator^.X; |
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4948 |
oy:= iterator^.Y + r; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4949 |
end; |
| 3571 | 4950 |
|
| 3578 | 4951 |
if (hwRound(Distance(Gear^.X-ox,Gear^.Y-oy)) > Gear^.Radius + 1 ) then |
| 3571 | 4952 |
continue; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
4953 |
end; |
| 3571 | 4954 |
|
| 12898 | 4955 |
if (iterator^.Kind in [gtDEagleShot, gtSniperRifleShot, gtMinigunBullet]) then |
|
11550
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
4956 |
begin |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
4957 |
// draw bullet trail |
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
4958 |
spawnBulletTrail(iterator, iterator^.X, iterator^.Y, iterator^.FlightTime = 0); |
|
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
4959 |
iterator^.FlightTime := 1; |
|
11550
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
4960 |
// the bullet can now hurt the hog that fired it |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
4961 |
iterator^.Data:= nil; |
|
881231c1ba46
disallow bullets to hit the hedgehog that fired them (unless bounced/wrapped/portal'd)
sheepluva
parents:
11540
diff
changeset
|
4962 |
end; |
| 5841 | 4963 |
|
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4964 |
// calc gear offset in portal vector direction |
| 3571 | 4965 |
ox := (iterator^.X - Gear^.X); |
4966 |
oy := (iterator^.Y - Gear^.Y); |
|
4967 |
poffs:= (Gear^.dX * ox + Gear^.dY * oy); |
|
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4968 |
|
| 5841 | 4969 |
if not isBullet and poffs.isNegative then |
4970 |
continue; |
|
4971 |
||
4972 |
// only port bullets close to the portal |
|
| 6450 | 4973 |
if isBullet and (not (hwAbs(poffs) < _3)) then |
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4974 |
continue; |
|
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4975 |
|
| 4076 | 4976 |
// |
4977 |
// gears that make it till here will definately be ported |
|
4978 |
// |
|
| 5594 | 4979 |
// (but old position/movement vector might be restored in case there's |
4980 |
// not enough space on the other side) |
|
4981 |
// |
|
4982 |
||
4983 |
resetr := iterator^.Radius; |
|
4984 |
resetx := iterator^.X; |
|
4985 |
resety := iterator^.Y; |
|
4986 |
resetdx := iterator^.dX; |
|
4987 |
resetdy := iterator^.dY; |
|
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4988 |
|
| 3578 | 4989 |
// create a normal of the portal vector, but ... |
4990 |
nx := Gear^.dY; |
|
| 3570 | 4991 |
ny := Gear^.dX; |
| 3578 | 4992 |
// ... decide where the top is based on the hog's direction when firing the portal |
4993 |
if Gear^.Elasticity.isNegative then |
|
|
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6452
diff
changeset
|
4994 |
nx.isNegative := (not nx.isNegative) |
| 3578 | 4995 |
else |
| 3570 | 4996 |
ny.isNegative := not ny.isNegative; |
| 3578 | 4997 |
|
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4998 |
// calc gear offset in portal normal vector direction |
|
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
4999 |
noffs:= (nx * ox + ny * oy); |
|
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
5000 |
|
| 7721 | 5001 |
if isBullet and (noffs.Round >= Longword(Gear^.Radius)) then |
| 5841 | 5002 |
continue; |
5003 |
||
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5004 |
// avoid gravity related loops of not really moving gear |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5005 |
if not (iscake or isbullet) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5006 |
and (Gear^.dY.isNegative) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5007 |
and (conPortal^.dY.isNegative) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5008 |
and ((iterator^.dX.QWordValue + iterator^.dY.QWordValue) < _0_08.QWordValue) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5009 |
and (iterator^.PortalCounter > 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5010 |
continue; |
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
5011 |
|
|
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
5012 |
// calc gear speed along to the vector and the normal vector of the portal |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5013 |
if hasdxy then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5014 |
begin |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5015 |
pspeed:= (Gear^.dX * iterator^.dX + Gear^.dY * iterator^.dY); |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5016 |
nspeed:= (nx * iterator^.dX + ny * iterator^.dY); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5017 |
end |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5018 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5019 |
begin |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5020 |
pspeed:= hwAbs(cGravity * oy); |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5021 |
nspeed:= _0; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5022 |
end; |
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
5023 |
|
|
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
5024 |
// creating normal vector of connected (exit) portal |
| 3578 | 5025 |
nx := conPortal^.dY; |
| 3570 | 5026 |
ny := conPortal^.dX; |
| 3578 | 5027 |
if conPortal^.Elasticity.isNegative then |
|
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6452
diff
changeset
|
5028 |
nx.isNegative := (not nx.isNegative) |
| 3578 | 5029 |
else |
| 3570 | 5030 |
ny.isNegative := not ny.isNegative; |
| 3578 | 5031 |
|
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5032 |
// inverse cake's normal movement direction, |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5033 |
// as if it just walked through a hole |
|
5750
6bbf7aee2cdf
Reenable a bunch of old portal play stuff, like dropping grenade into portal on hog, jumping through portal w/ hog on other end, collecting crate w/ portal etc. Also add cooldown to cake/portal interaction. It may still not do what you expect, but it probably shouldn't spin in place.
nemo
parents:
5748
diff
changeset
|
5034 |
//if iscake then nspeed.isNegative:= not nspeed.isNegative; |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5035 |
|
| 3571 | 5036 |
//AddFileLog('poffs:'+cstr(poffs)+' noffs:'+cstr(noffs)+' pspeed:'+cstr(pspeed)+' nspeed:'+cstr(nspeed));
|
| 3578 | 5037 |
iterator^.dX := -pspeed * conPortal^.dX + nspeed * nx; |
5038 |
iterator^.dY := -pspeed * conPortal^.dY + nspeed * ny; |
|
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5039 |
|
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5040 |
// make the gear's exit position close to the portal while |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5041 |
// still respecting the movement direction |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5042 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5043 |
// determine the distance (in exit vector direction) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5044 |
// that we want the gear at |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5045 |
if iscake then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5046 |
ox:= (r - _0_7) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5047 |
else |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5048 |
ox:= (r * _1_5); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5049 |
s:= ox / poffs; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5050 |
poffs:= ox; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5051 |
if (nspeed.QWordValue <> 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5052 |
and (pspeed > _0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5053 |
noffs:= noffs * s * (nspeed / pspeed); |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5054 |
|
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5055 |
// move stuff with high normal offset closer to the portal's center |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5056 |
if not isbullet then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5057 |
begin |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5058 |
s := hwAbs(noffs) + r - int2hwFloat(Gear^.Radius); |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5059 |
if s > _0 then |
|
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5060 |
noffs:= noffs - SignAs(s,noffs) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5061 |
end; |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5062 |
|
| 3571 | 5063 |
iterator^.X := conPortal^.X + poffs * conPortal^.dX + noffs * nx; |
5064 |
iterator^.Y := conPortal^.Y + poffs * conPortal^.dY + noffs * ny; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5065 |
|
| 6450 | 5066 |
if not hasdxy and (not (conPortal^.dY.isNegative)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5067 |
begin |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5068 |
iterator^.dY:= iterator^.dY + hwAbs(cGravity * (iterator^.Y - conPortal^.Y)) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5069 |
end; |
|
4092
bf13068194b3
more portal tweaks (closer exit position, cake stuff, etc)
sheepluva
parents:
4076
diff
changeset
|
5070 |
|
| 5594 | 5071 |
// see if the space on the exit side actually is enough |
5072 |
||
5073 |
if not (isBullet or isCake) then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5074 |
begin |
| 5594 | 5075 |
// TestCollisionXwithXYShift requires a hwFloat for xShift |
5076 |
ox.QWordValue := _1.QWordValue; |
|
5077 |
ox.isNegative := not iterator^.dX.isNegative; |
|
5078 |
||
5079 |
sx := hwSign(iterator^.dX); |
|
5080 |
sy := hwSign(iterator^.dY); |
|
5081 |
||
5082 |
if iterator^.Radius > 1 then |
|
5083 |
iterator^.Radius := iterator^.Radius - 1; |
|
5084 |
||
5085 |
// check front |
|
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
5086 |
isCollision := (TestCollisionY(iterator, sy) <> 0) or (TestCollisionX(iterator, sx) <> 0); |
| 5594 | 5087 |
|
5088 |
if not isCollision then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5089 |
begin |
| 5594 | 5090 |
// check center area (with half the radius so that the |
5091 |
// the square check won't check more pixels than we want to) |
|
5092 |
iterator^.Radius := 1 + resetr div 2; |
|
5093 |
rh := resetr div 4; |
|
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
5094 |
isCollision := (TestCollisionYwithXYShift(iterator, 0, -sy * rh, sy, false) <> 0) |
|
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
5095 |
or (TestCollisionXwithXYShift(iterator, ox * rh, 0, sx, false) <> 0); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5096 |
end; |
| 5594 | 5097 |
|
5098 |
iterator^.Radius := resetr; |
|
5099 |
||
5100 |
if isCollision then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5101 |
begin |
| 5594 | 5102 |
// collision! oh crap! go back! |
5103 |
iterator^.X := resetx; |
|
5104 |
iterator^.Y := resety; |
|
5105 |
iterator^.dX := resetdx; |
|
5106 |
iterator^.dY := resetdy; |
|
5107 |
continue; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5108 |
end; |
| 5594 | 5109 |
end; |
5110 |
||
| 14222 | 5111 |
if iterator^.Kind = gtKamikaze then |
5112 |
RefillProximityCache(iterator, 300); |
|
5113 |
||
| 5594 | 5114 |
// |
5115 |
// You're now officially portaled! |
|
5116 |
// |
|
5117 |
||
5118 |
// Until loops are reliably broken |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5119 |
if iscake then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5120 |
iterator^.PortalCounter:= 33 |
| 5940 | 5121 |
else |
5122 |
begin |
|
5123 |
inc(iterator^.PortalCounter); |
|
| 7658 | 5124 |
iterator^.Active:= true; |
| 7992 | 5125 |
iterator^.State:= iterator^.State and (not gstHHHJump) or gstMoving; |
| 5940 | 5126 |
end; |
| 5594 | 5127 |
|
| 6785 | 5128 |
// is it worth adding an arcsin table? Just how often would we end up doing something like this? |
| 6787 | 5129 |
// SYNCED ANGLE UPDATE |
| 6785 | 5130 |
if iterator^.Kind = gtRCPlane then |
|
10112
275ad81e4718
fix indentation of previous commit and simplify rc-plane's angle-fix after portal code
sheepluva
parents:
10110
diff
changeset
|
5131 |
iterator^.Angle:= (1024 + vector2Angle(iterator^.dX, iterator^.dY) mod 4096) |
| 6787 | 5132 |
// VISUAL USE OF ANGLE ONLY |
5133 |
else if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind = gtKamikaze) and (CurAmmoGear^.Hedgehog = iterator^.Hedgehog) then |
|
5134 |
begin |
|
5135 |
iterator^.Angle:= DxDy2AttackAngle(iterator^.dX, iterator^.dY); |
|
5136 |
iterator^.Angle:= 2048-iterator^.Angle; |
|
| 6786 | 5137 |
if iterator^.dX.isNegative then iterator^.Angle:= 4096-iterator^.Angle; |
| 6785 | 5138 |
end; |
5139 |
||
| 6555 | 5140 |
if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5141 |
and (iterator = CurrentHedgehog^.Gear) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5142 |
and (CurAmmoGear <> nil) |
| 9539 | 5143 |
and (CurAmmoGear^.Kind = gtRope) |
5144 |
and (CurAmmoGear^.Elasticity <> _0) then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5145 |
CurAmmoGear^.PortalCounter:= 1; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5146 |
|
| 8795 | 5147 |
if not isbullet and (iterator^.State and gstInvisible = 0) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5148 |
and (iterator^.Kind <> gtFlake) then |
|
4050
8e4f4b72c132
various portal tweaks, also: nemo's gear jiggling is back
sheepluva
parents:
4047
diff
changeset
|
5149 |
FollowGear := iterator; |
| 5594 | 5150 |
|
| 5841 | 5151 |
// store X/Y values of exit for net bullet trail |
5152 |
if isbullet then |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5153 |
begin |
| 5841 | 5154 |
iterator^.Elasticity:= iterator^.X; |
5155 |
iterator^.Friction := iterator^.Y; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5156 |
end; |
| 5841 | 5157 |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5158 |
if Gear^.Health > 1 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5159 |
dec(Gear^.Health); |
| 3571 | 5160 |
end; |
|
3342
b4f01613dcd7
Some initial stubs for portal just so Tiy will quit nagging. Also let folks know what approximation of physics I plan to try, here.
nemo
parents:
3320
diff
changeset
|
5161 |
end; |
| 3350 | 5162 |
|
| 6490 | 5163 |
|
| 3428 | 5164 |
|
5165 |
procedure loadNewPortalBall(oldPortal: PGear; destroyGear: Boolean); |
|
| 4790 | 5166 |
var |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3821
diff
changeset
|
5167 |
CurWeapon: PAmmo; |
|
3388
ab9352a4ddcc
Fix portal graphic name, continuing work on portal movement
nemo
parents:
3384
diff
changeset
|
5168 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5169 |
if CurrentHedgehog <> nil then |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3821
diff
changeset
|
5170 |
with CurrentHedgehog^ do |
| 3428 | 5171 |
begin |
| 6924 | 5172 |
CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^); |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3821
diff
changeset
|
5173 |
if (CurAmmoType = amPortalGun) then |
|
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3821
diff
changeset
|
5174 |
begin |
| 4790 | 5175 |
if not destroyGear then |
5176 |
begin |
|
5177 |
// switch color of ball to opposite of oldPortal |
|
5178 |
if (oldPortal^.Tag and 2) = 0 then |
|
5179 |
CurWeapon^.Pos:= 1 |
|
5180 |
else |
|
5181 |
CurWeapon^.Pos:= 0; |
|
5182 |
end; |
|
5183 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5184 |
// make the ball visible |
| 4790 | 5185 |
CurWeapon^.Timer := 0; |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3821
diff
changeset
|
5186 |
end |
| 3428 | 5187 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5188 |
if destroyGear then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5189 |
oldPortal^.Timer:= 0; |
| 3428 | 5190 |
end; |
5191 |
||
| 6490 | 5192 |
procedure doStepMovingPortal_real(Gear: PGear); |
| 8795 | 5193 |
var |
| 6490 | 5194 |
x, y, tx, ty: LongInt; |
5195 |
s: hwFloat; |
|
| 3428 | 5196 |
begin |
| 9477 | 5197 |
WorldWrap(Gear); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5198 |
x := hwRound(Gear^.X); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5199 |
y := hwRound(Gear^.Y); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5200 |
tx := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5201 |
ty := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5202 |
// avoid compiler hints |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5203 |
|
| 7309 | 5204 |
if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y, x] > 255) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5205 |
begin |
| 3569 | 5206 |
Gear^.State := Gear^.State or gstCollision; |
| 6450 | 5207 |
Gear^.State := Gear^.State and (not gstMoving); |
| 8795 | 5208 |
|
| 7310 | 5209 |
if (Land[y, x] and lfBouncy <> 0) |
|
7426
55b49cc1f33a
Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots.
nemo
parents:
7416
diff
changeset
|
5210 |
or (not CalcSlopeTangent(Gear, x, y, tx, ty, 255)) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5211 |
or (DistanceI(tx,ty) < _12) then // reject shots at too irregular terrain |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5212 |
begin |
| 3428 | 5213 |
loadNewPortalBall(Gear, true); |
5214 |
EXIT; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5215 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5216 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5217 |
// making a normalized normal vector |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5218 |
s := _1/DistanceI(tx,ty); |
| 3562 | 5219 |
Gear^.dX := s * ty; |
5220 |
Gear^.dY := -s * tx; |
|
5221 |
||
5222 |
Gear^.DirAngle := DxDy2Angle(-Gear^.dY,Gear^.dX); |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5223 |
if not Gear^.dX.isNegative then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5224 |
Gear^.DirAngle := 180-Gear^.DirAngle; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5225 |
|
|
7272
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
5226 |
if ((Gear^.LinkedGear = nil) |
|
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
5227 |
or (hwRound(Distance(Gear^.X - Gear^.LinkedGear^.X,Gear^.Y-Gear^.LinkedGear^.Y)) >=Gear^.Radius*2)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5228 |
begin |
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
5229 |
PlaySound(sndPortalOpen); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5230 |
loadNewPortalBall(Gear, false); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5231 |
inc(Gear^.Tag); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5232 |
Gear^.doStep := @doStepPortal; |
|
3396
e5b3e5f2818e
More portal changes. Allows for a multishoot utility. Hopefully not breaking anything.
nemo
parents:
3391
diff
changeset
|
5233 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5234 |
else |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5235 |
loadNewPortalBall(Gear, true); |
|
3388
ab9352a4ddcc
Fix portal graphic name, continuing work on portal movement
nemo
parents:
3384
diff
changeset
|
5236 |
end |
| 8795 | 5237 |
|
| 10354 | 5238 |
else if CheckCoordInWater(x, y) |
|
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7784
diff
changeset
|
5239 |
or (y < -max(LAND_WIDTH,4096)) |
|
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7784
diff
changeset
|
5240 |
or (x > 2*max(LAND_WIDTH,4096)) |
|
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7784
diff
changeset
|
5241 |
or (x < -max(LAND_WIDTH,4096)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5242 |
loadNewPortalBall(Gear, true); |
| 3428 | 5243 |
end; |
5244 |
||
| 3569 | 5245 |
procedure doStepMovingPortal(Gear: PGear); |
5246 |
begin |
|
5247 |
doPortalColorSwitch(); |
|
5248 |
doStepPerPixel(Gear, @doStepMovingPortal_real, true); |
|
| 8795 | 5249 |
if (Gear^.Timer < 1) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5250 |
or (Gear^.Hedgehog^.Team <> CurrentHedgehog^.Team) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5251 |
deleteGear(Gear); |
| 3569 | 5252 |
end; |
5253 |
||
| 3428 | 5254 |
procedure doStepPortalShot(newPortal: PGear); |
| 8795 | 5255 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5256 |
iterator: PGear; |
|
3560
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5257 |
s: hwFloat; |
|
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3821
diff
changeset
|
5258 |
CurWeapon: PAmmo; |
| 3428 | 5259 |
begin |
|
3560
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5260 |
s:= Distance (newPortal^.dX, newPortal^.dY); |
|
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5261 |
|
|
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5262 |
// Adds the hog speed (only that part in/directly against shot direction) |
|
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5263 |
// to the shot speed (which we triple previously btw) |
|
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5264 |
// (This is done my projecting the hog movement vector onto the shot movement vector and then adding the resulting length |
|
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5265 |
// to the scaler) |
| 3562 | 5266 |
s := (_2 * s + (newPortal^.dX * CurrentHedgehog^.Gear^.dX + newPortal^.dY * CurrentHedgehog^.Gear^.dY ) / s) / s; |
|
3560
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5267 |
newPortal^.dX := newPortal^.dX * s; |
|
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5268 |
newPortal^.dY := newPortal^.dY * s; |
|
3e51dad04026
portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up)
sheepluva
parents:
3552
diff
changeset
|
5269 |
|
|
7272
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
5270 |
newPortal^.LinkedGear := nil; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5271 |
|
|
11911
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
5272 |
PlaySound(sndPortalShot); |
|
6145efcff302
Add sounds for blowtorch, invuln., f. saucer, lasersight, portal gun
Wuzzy <almikes@aol.com>
parents:
11860
diff
changeset
|
5273 |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5274 |
if CurrentHedgehog <> nil then |
|
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6452
diff
changeset
|
5275 |
with CurrentHedgehog^ do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5276 |
begin |
| 6924 | 5277 |
CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^); |
| 3578 | 5278 |
// let's save the HH's dX's direction so we can decide where the "top" of the portal hole |
5279 |
newPortal^.Elasticity.isNegative := CurrentHedgehog^.Gear^.dX.isNegative; |
|
5280 |
// when doing a backjump the dx is the opposite of the facing direction |
|
|
13096
d78e65c66573
Add hedgehog effect heArtillery, allows to set per-hedgehog artillery mode
Wuzzy <Wuzzy2@mail.ru>
parents:
13058
diff
changeset
|
5281 |
if ((Gear^.State and gstHHHJump) <> 0) and (Effects[heArtillery] = 0) then |
| 3578 | 5282 |
newPortal^.Elasticity.isNegative := not newPortal^.Elasticity.isNegative; |
5283 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5284 |
// make portal gun look unloaded |
| 4790 | 5285 |
if (CurWeapon <> nil) and (CurAmmoType = amPortalGun) then |
5286 |
CurWeapon^.Timer := CurWeapon^.Timer or 2; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5287 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5288 |
iterator := GearsList; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5289 |
while iterator <> nil do |
|
7581
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5290 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5291 |
if (iterator^.Kind = gtPortal) then |
|
6556
faa47a7e614a
Allow multiple portals, so long as the team hasn't changed...
nemo
parents:
6555
diff
changeset
|
5292 |
if (iterator <> newPortal) and (iterator^.Timer > 0) and (iterator^.Hedgehog = CurrentHedgehog) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5293 |
begin |
|
6556
faa47a7e614a
Allow multiple portals, so long as the team hasn't changed...
nemo
parents:
6555
diff
changeset
|
5294 |
if ((iterator^.Tag and 2) = (newPortal^.Tag and 2)) then |
|
faa47a7e614a
Allow multiple portals, so long as the team hasn't changed...
nemo
parents:
6555
diff
changeset
|
5295 |
begin |
|
3468
c7b80bdbc384
* make portals delete each other only indirectly (by setting timer to 0)
sheepluva
parents:
3462
diff
changeset
|
5296 |
iterator^.Timer:= 0; |
|
6556
faa47a7e614a
Allow multiple portals, so long as the team hasn't changed...
nemo
parents:
6555
diff
changeset
|
5297 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5298 |
else |
|
6556
faa47a7e614a
Allow multiple portals, so long as the team hasn't changed...
nemo
parents:
6555
diff
changeset
|
5299 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5300 |
// link portals with each other |
|
7272
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
5301 |
newPortal^.LinkedGear := iterator; |
|
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
5302 |
iterator^.LinkedGear := newPortal; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5303 |
iterator^.Health := newPortal^.Health; |
|
6556
faa47a7e614a
Allow multiple portals, so long as the team hasn't changed...
nemo
parents:
6555
diff
changeset
|
5304 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5305 |
end; |
|
3480
c4c3f3512404
Prevent all portal loops the guaranteed way, at least until sheepluva's tests yield something reliable.
nemo
parents:
3476
diff
changeset
|
5306 |
iterator^.PortalCounter:= 0; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5307 |
iterator := iterator^.NextGear |
|
7581
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5308 |
end; |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5309 |
|
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5310 |
if newPortal^.LinkedGear <> nil then |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5311 |
begin |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5312 |
// This jiggles gears, to ensure a portal connection just placed under a gear takes effect. |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5313 |
iterator:= GearsList; |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5314 |
while iterator <> nil do |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5315 |
begin |
|
12676
2e6dcd97f085
No longer jiggle sticky mines if using portable portal device
Wuzzy <almikes@aol.com>
parents:
12672
diff
changeset
|
5316 |
if not (iterator^.Kind in [gtPortal, gtAirAttack, gtKnife, gtSMine]) and ((iterator^.Hedgehog <> CurrentHedgehog) |
|
7581
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5317 |
or ((iterator^.Message and gmAllStoppable) = 0)) then |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5318 |
begin |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5319 |
iterator^.Active:= true; |
| 7992 | 5320 |
if iterator^.dY.QWordValue = 0 then |
|
7581
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5321 |
iterator^.dY.isNegative:= false; |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5322 |
iterator^.State:= iterator^.State or gstMoving; |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5323 |
DeleteCI(iterator); |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5324 |
//inc(iterator^.dY.QWordValue,10); |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5325 |
end; |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5326 |
iterator:= iterator^.NextGear |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5327 |
end |
|
ea509b70e03d
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
nemo
parents:
7564
diff
changeset
|
5328 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5329 |
end; |
| 6450 | 5330 |
newPortal^.State := newPortal^.State and (not gstCollision); |
| 3569 | 5331 |
newPortal^.State := newPortal^.State or gstMoving; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5332 |
newPortal^.doStep := @doStepMovingPortal; |
|
3388
ab9352a4ddcc
Fix portal graphic name, continuing work on portal movement
nemo
parents:
3384
diff
changeset
|
5333 |
end; |
|
ab9352a4ddcc
Fix portal graphic name, continuing work on portal movement
nemo
parents:
3384
diff
changeset
|
5334 |
|
|
14587
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5335 |
procedure doStepPiano(Gear: PGear); |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5336 |
var valid: boolean; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5337 |
HHGear: PGear; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5338 |
begin |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5339 |
AllInactive := false; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5340 |
valid := true; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5341 |
|
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5342 |
if (Gear^.Hedgehog <> nil) and (Gear^.Hedgehog^.Gear <> nil) then |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5343 |
HHGear := Gear^.Hedgehog^.Gear; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5344 |
|
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5345 |
if (WorldEdge = weBounce) then |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5346 |
if (hwRound(Gear^.X) - Gear^.Radius < leftX) then |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5347 |
valid := false |
|
14753
52916435d9b1
Fix right limit of piano placement in bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14719
diff
changeset
|
5348 |
else if (hwRound(Gear^.X) + Gear^.Radius > rightX) then |
|
14587
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5349 |
valid := false; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5350 |
|
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5351 |
if (not valid) then |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5352 |
begin |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5353 |
if (HHGear <> nil) then |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5354 |
begin |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5355 |
HHGear^.Message := HHGear^.Message and (not gmAttack); |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5356 |
HHGear^.State := HHGear^.State and (not gstAttacking); |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5357 |
HHGear^.State := HHGear^.State or gstChooseTarget; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5358 |
isCursorVisible := true; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5359 |
end; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5360 |
DeleteGear(Gear); |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5361 |
PlaySound(sndDenied); |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5362 |
exit; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5363 |
end; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5364 |
|
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5365 |
isCursorVisible := false; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5366 |
if (HHGear <> nil) then |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5367 |
begin |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5368 |
PlaySoundV(sndIncoming, Gear^.Hedgehog^.Team^.voicepack); |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5369 |
// Tuck the hedgehog away until the piano attack is completed |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5370 |
Gear^.Hedgehog^.Unplaced:= true; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5371 |
HHGear^.X:= _0; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5372 |
HHGear^.Y:= _0; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5373 |
end; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5374 |
|
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5375 |
PauseMusic; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5376 |
Gear^.doStep:= @doStepPianoWork; |
|
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5377 |
end; |
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
5378 |
//////////////////////////////////////////////////////////////////////////////// |
|
14587
85921db6f7c3
Disallow placement of piano beyond bounce world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14586
diff
changeset
|
5379 |
procedure doStepPianoWork(Gear: PGear); |
| 8795 | 5380 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5381 |
r0, r1: LongInt; |
| 3728 | 5382 |
odY: hwFloat; |
| 3350 | 5383 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5384 |
AllInactive := false; |
|
13999
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5385 |
// Play piano notes with slot keys |
| 8795 | 5386 |
if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5387 |
((CurrentHedgehog^.Gear^.Message and gmSlot) <> 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5388 |
begin |
|
13999
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5389 |
// Piano notes are played if sound OR music (or both) is enabled |
| 8795 | 5390 |
case CurrentHedgehog^.Gear^.MsgParam of |
|
13999
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5391 |
0: PlaySound(sndPiano0, false, false, true); |
|
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5392 |
1: PlaySound(sndPiano1, false, false, true); |
|
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5393 |
2: PlaySound(sndPiano2, false, false, true); |
|
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5394 |
3: PlaySound(sndPiano3, false, false, true); |
|
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5395 |
4: PlaySound(sndPiano4, false, false, true); |
|
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5396 |
5: PlaySound(sndPiano5, false, false, true); |
|
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5397 |
6: PlaySound(sndPiano6, false, false, true); |
|
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5398 |
7: PlaySound(sndPiano7, false, false, true); |
|
3ae88a9f9dca
If u play Piano, you can now hear the notes if sound effects OR music is enabled
Wuzzy <Wuzzy2@mail.ru>
parents:
13996
diff
changeset
|
5399 |
8: PlaySound(sndPiano8, false, false, true); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5400 |
end; |
| 3704 | 5401 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5402 |
CurrentHedgehog^.Gear^.MsgParam := 0; |
| 6450 | 5403 |
CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and (not gmSlot); |
|
6304
3036c242b19d
Set CurrentAmmoGear on piano (should fix notes again). Also disable focus on current hog if unplaced.
nemo
parents:
6278
diff
changeset
|
5404 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5405 |
|
|
14593
34e810295d08
Remove a bunch of dead out-commented code
Wuzzy <Wuzzy2@mail.ru>
parents:
14591
diff
changeset
|
5406 |
if (Gear^.Pos = 5) then |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5407 |
begin |
| 3728 | 5408 |
Gear^.dY := Gear^.dY + cGravity * 2; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5409 |
Gear^.Y := Gear^.Y + Gear^.dY; |
|
6803
0e70f3ea3bf8
bit of an experiment in variable splash sizes based on object/speed. not sure if it looks good yet. need to drown more stuff.
nemo
parents:
6792
diff
changeset
|
5410 |
if CheckGearDrowning(Gear) then |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5411 |
begin |
|
6803
0e70f3ea3bf8
bit of an experiment in variable splash sizes based on object/speed. not sure if it looks good yet. need to drown more stuff.
nemo
parents:
6792
diff
changeset
|
5412 |
Gear^.Y:= Gear^.Y + _50; |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5413 |
OnUsedAmmo(CurrentHedgehog^); |
|
12292
93434ab299a0
Take sacrifices into account for the “Stupid” taunt
Wuzzy <almikes@aol.com>
parents:
12277
diff
changeset
|
5414 |
uStats.HedgehogSacrificed(CurrentHedgehog); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5415 |
if CurrentHedgehog^.Gear <> nil then |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5416 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5417 |
// Drown the hedgehog. Could also just delete it, but hey, this gets a caption |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5418 |
CurrentHedgehog^.Gear^.Active := true; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5419 |
CurrentHedgehog^.Gear^.X := Gear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5420 |
CurrentHedgehog^.Gear^.Y := int2hwFloat(cWaterLine+cVisibleWater)+_128; |
|
3954
ae3583ad6ea9
Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too.
nemo
parents:
3953
diff
changeset
|
5421 |
CurrentHedgehog^.Unplaced := false; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5422 |
if TagTurnTimeLeft = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5423 |
TagTurnTimeLeft:= TurnTimeLeft; |
|
3954
ae3583ad6ea9
Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too.
nemo
parents:
3953
diff
changeset
|
5424 |
TurnTimeLeft:= 0 |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5425 |
end; |
|
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5426 |
ResumeMusic |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5427 |
end; |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5428 |
exit |
| 3351 | 5429 |
end; |
5430 |
||
| 3728 | 5431 |
odY:= Gear^.dY; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5432 |
doStepFallingGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5433 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5434 |
if (Gear^.State and gstDrowning) <> 0 then |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5435 |
begin |
|
6803
0e70f3ea3bf8
bit of an experiment in variable splash sizes based on object/speed. not sure if it looks good yet. need to drown more stuff.
nemo
parents:
6792
diff
changeset
|
5436 |
Gear^.Y:= Gear^.Y + _50; |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5437 |
OnUsedAmmo(CurrentHedgehog^); |
|
12292
93434ab299a0
Take sacrifices into account for the “Stupid” taunt
Wuzzy <almikes@aol.com>
parents:
12277
diff
changeset
|
5438 |
uStats.HedgehogSacrificed(CurrentHedgehog); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5439 |
if CurrentHedgehog^.Gear <> nil then |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5440 |
begin |
|
3419
b66a1b597f88
Add drown-the-playing-hog check for case of piano falling off the landscape.
nemo
parents:
3417
diff
changeset
|
5441 |
// Drown the hedgehog. Could also just delete it, but hey, this gets a caption |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5442 |
CurrentHedgehog^.Gear^.Active := true; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5443 |
CurrentHedgehog^.Gear^.X := Gear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5444 |
CurrentHedgehog^.Gear^.Y := int2hwFloat(cWaterLine+cVisibleWater)+_128; |
|
3954
ae3583ad6ea9
Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too.
nemo
parents:
3953
diff
changeset
|
5445 |
CurrentHedgehog^.Unplaced := false; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5446 |
if TagTurnTimeLeft = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5447 |
TagTurnTimeLeft:= TurnTimeLeft; |
|
3954
ae3583ad6ea9
Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too.
nemo
parents:
3953
diff
changeset
|
5448 |
TurnTimeLeft:= 0 |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5449 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5450 |
ResumeMusic |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5451 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5452 |
else if (Gear^.State and gstCollision) <> 0 then |
| 3399 | 5453 |
begin |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
5454 |
r0 := GetRandom(Gear^.Boom div 4 + 1); |
|
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
5455 |
r1 := GetRandom(Gear^.Boom div 4 + 1); |
|
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
5456 |
doMakeExplosion(hwRound(Gear^.X) - 30 - r0, hwRound(Gear^.Y) + 40, Gear^.Boom div 2 + r1, Gear^.Hedgehog, 0); |
|
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
5457 |
doMakeExplosion(hwRound(Gear^.X) + 30 + r1, hwRound(Gear^.Y) + 40, Gear^.Boom div 2 + r0, Gear^.Hedgehog, 0); |
|
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
5458 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom + r0, Gear^.Hedgehog, EXPLAutoSound); |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5459 |
for r0:= 0 to 4 do |
|
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5460 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote); |
|
7066
12cc2bd84b0b
Make pas2c even more happier with uGears.c, allow assigning arrays in some cases
unc0rr
parents:
7062
diff
changeset
|
5461 |
Gear^.dY := cGravity * 2 - odY; |
|
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6304
diff
changeset
|
5462 |
Gear^.Pos := Gear^.Pos + 1; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5463 |
end |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5464 |
else |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5465 |
Gear^.dY := Gear^.dY + cGravity * 2; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5466 |
// let it fall faster so itdoesn't take too long for the whole attack |
| 3382 | 5467 |
end; |
| 3384 | 5468 |
|
5469 |
||
5470 |
//////////////////////////////////////////////////////////////////////////////// |
|
5471 |
procedure doStepSineGunShotWork(Gear: PGear); |
|
| 8795 | 5472 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5473 |
x, y, rX, rY, t, tmp, initHealth: LongInt; |
| 3384 | 5474 |
oX, oY, ldX, ldY, sdX, sdY, sine, lx, ly, amp: hwFloat; |
| 10657 | 5475 |
justCollided, justBounced: boolean; |
| 3384 | 5476 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5477 |
AllInactive := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5478 |
initHealth := Gear^.Health; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5479 |
lX := Gear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5480 |
lY := Gear^.Y; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5481 |
ldX := Gear^.dX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5482 |
ldY := Gear^.dY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5483 |
sdy := _0_5/Distance(Gear^.dX,Gear^.dY); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5484 |
ldX := ldX * sdy; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5485 |
ldY := ldY * sdy; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5486 |
sdY := hwAbs(ldX) + hwAbs(ldY); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5487 |
sdX := _1 - hwAbs(ldX/sdY); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5488 |
sdY := _1 - hwAbs(ldY/sdY); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5489 |
if (ldX.isNegative = ldY.isNegative) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5490 |
sdY := -sdY; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5491 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5492 |
// initial angle depends on current GameTicks |
| 7745 | 5493 |
t := getRandom(4096); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5494 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5495 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5496 |
// used for a work-around detection of area that is within land array, but outside borders |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5497 |
justCollided := false; |
| 10657 | 5498 |
// this variable is just to ensure we don't run in infinite loop due to precision errors |
5499 |
justBounced:= false; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5500 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5501 |
repeat |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5502 |
lX := lX + ldX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5503 |
lY := lY + ldY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5504 |
oX := Gear^.X; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5505 |
oY := Gear^.Y; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5506 |
rX := hwRound(oX); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5507 |
rY := hwRound(oY); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5508 |
tmp := t mod 4096; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5509 |
amp := _128 * (_1 - hwSqr(int2hwFloat(Gear^.Health)/initHealth)); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5510 |
sine := amp * AngleSin(tmp mod 2048); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5511 |
sine.isNegative := (tmp < 2048); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5512 |
Gear^.X := lX + (sine * sdX); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5513 |
Gear^.Y := ly + (sine * sdY); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5514 |
Gear^.dX := Gear^.X - oX; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5515 |
Gear^.dY := Gear^.Y - oY; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5516 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5517 |
x := hwRound(Gear^.X); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5518 |
y := hwRound(Gear^.Y); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5519 |
|
| 10652 | 5520 |
if WorldEdge = weWrap then |
5521 |
begin |
|
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
5522 |
if x > rightX then |
| 10659 | 5523 |
repeat |
5524 |
dec(x, playWidth); |
|
5525 |
dec(rx, playWidth); |
|
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
5526 |
until x <= rightX |
|
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
5527 |
else if x < leftX then |
| 10659 | 5528 |
repeat |
5529 |
inc(x, playWidth); |
|
5530 |
inc(rx, playWidth); |
|
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
5531 |
until x >= leftX; |
| 10657 | 5532 |
end |
5533 |
else if (WorldEdge = weBounce) then |
|
5534 |
begin |
|
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
5535 |
if (not justBounced) and ((x > rightX) or (x < leftX)) then |
| 10657 | 5536 |
begin |
5537 |
// reflect |
|
5538 |
lX:= lX - ldX + ((oX - lX) * 2); |
|
5539 |
lY:= lY - ldY; |
|
5540 |
Gear^.X:= oX; |
|
5541 |
Gear^.Y:= oY; |
|
5542 |
ldX.isNegative:= (not ldX.isNegative); |
|
5543 |
sdX.isNegative:= (not sdX.isNegative); |
|
5544 |
justBounced:= true; |
|
5545 |
continue; |
|
5546 |
end |
|
5547 |
else |
|
5548 |
justBounced:= false; |
|
| 10652 | 5549 |
end; |
5550 |
||
| 10657 | 5551 |
|
5552 |
inc(t,Gear^.Health div 313); |
|
5553 |
||
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5554 |
// if borders are on, stop outside land array |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5555 |
if hasBorder and (((x and LAND_WIDTH_MASK) <> 0) or ((y and LAND_HEIGHT_MASK) <> 0)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5556 |
begin |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5557 |
Gear^.Damage := 0; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5558 |
Gear^.Health := 0; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5559 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5560 |
else |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5561 |
begin |
| 10372 | 5562 |
if (not CheckCoordInWater(rX, rY)) or (not CheckCoordInWater(x, y)) then |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5563 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5564 |
if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5565 |
and (Land[y, x] <> 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5566 |
begin |
| 10118 | 5567 |
if ((GameFlags and gfSolidLand) <> 0) and (Land[y, x] > 255) then |
5568 |
Gear^.Damage := initHealth |
|
5569 |
else if justCollided then |
|
5570 |
begin |
|
5571 |
Gear^.Damage := initHealth; |
|
5572 |
end |
|
5573 |
else |
|
5574 |
begin |
|
5575 |
inc(Gear^.Damage,3); |
|
5576 |
justCollided := true; |
|
5577 |
end; |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5578 |
end |
| 3384 | 5579 |
else |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5580 |
justCollided := false; |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5581 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5582 |
// kick nearby hogs, dig tunnel and add some fire |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5583 |
// if at least 5 collisions occured |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5584 |
if Gear^.Damage > 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5585 |
begin |
| 10118 | 5586 |
if ((GameFlags and gfSolidLand) = 0) then |
5587 |
begin |
|
|
13566
acc69f506914
Use wrap-aware doMakeExplosion instead of DrawExplosion in uHandlersMess
Wuzzy <Wuzzy2@mail.ru>
parents:
13470
diff
changeset
|
5588 |
doMakeExplosion(rX,rY,Gear^.Radius, Gear^.Hedgehog, EXPLNoDamage or EXPLDoNotTouchAny or EXPLNoGfx); |
| 10118 | 5589 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5590 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5591 |
// kick nearby hogs |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
5592 |
AmmoShove(Gear, Gear^.Boom, 50); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5593 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5594 |
dec(Gear^.Health, Gear^.Damage); |
| 10118 | 5595 |
|
5596 |
// explode when impacting on solid land/borders |
|
5597 |
if Gear^.Damage >= initHealth then |
|
5598 |
begin |
|
5599 |
// add some random offset to angles |
|
5600 |
tmp := getRandom(256); |
|
5601 |
// spawn some flames |
|
5602 |
for t:= 0 to 3 do |
|
5603 |
begin |
|
5604 |
if not isZero(Gear^.dX) then rX := rx - hwSign(Gear^.dX); |
|
5605 |
if not isZero(Gear^.dY) then rY := ry - hwSign(Gear^.dY); |
|
5606 |
lX := AngleCos(tmp + t * 512) * _0_25 * (GetRandomf + _1); |
|
5607 |
lY := AngleSin(tmp + t * 512) * _0_25 * (GetRandomf + _1); |
|
5608 |
AddGear(rX, rY, gtFlame, 0, lX, lY, 0); |
|
5609 |
AddGear(rX, rY, gtFlame, 0, lX, -lY, 0); |
|
5610 |
end; |
|
5611 |
end |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5612 |
// add some fire to the tunnel |
| 10118 | 5613 |
else if getRandom(6) = 0 then |
|
7391
588eabb4b384
Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call.
nemo
parents:
7389
diff
changeset
|
5614 |
begin |
|
588eabb4b384
Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call.
nemo
parents:
7389
diff
changeset
|
5615 |
tmp:= GetRandom(2 * Gear^.Radius); |
|
588eabb4b384
Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call.
nemo
parents:
7389
diff
changeset
|
5616 |
AddGear(x - Gear^.Radius + tmp, y - GetRandom(Gear^.Radius + 1), gtFlame, gsttmpFlag, _0, _0, 0) |
| 10118 | 5617 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5618 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5619 |
|
| 10118 | 5620 |
Gear^.Damage := 0; |
5621 |
||
|
7391
588eabb4b384
Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call.
nemo
parents:
7389
diff
changeset
|
5622 |
if random(100) = 0 then |
| 8795 | 5623 |
AddVisualGear(x, y, vgtSmokeTrace); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5624 |
end |
| 10118 | 5625 |
else dec(Gear^.Health, 5); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5626 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5627 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5628 |
dec(Gear^.Health); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5629 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5630 |
// decrease bullet size towards the end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5631 |
if (Gear^.Radius > 4) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5632 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5633 |
if (Gear^.Health <= (initHealth div 3)) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5634 |
dec(Gear^.Radius) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5635 |
end |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5636 |
else if (Gear^.Radius > 3) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5637 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5638 |
if (Gear^.Health <= (initHealth div 4)) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5639 |
dec(Gear^.Radius) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5640 |
end |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5641 |
else if (Gear^.Radius > 2) then begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5642 |
if (Gear^.Health <= (initHealth div 5)) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5643 |
dec(Gear^.Radius) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5644 |
end |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5645 |
else if (Gear^.Radius > 1) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5646 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5647 |
if (Gear^.Health <= (initHealth div 6)) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5648 |
dec(Gear^.Radius) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5649 |
end; |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5650 |
until (Gear^.Health <= 0); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5651 |
|
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5652 |
DeleteGear(Gear); |
|
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5653 |
AfterAttack; |
| 3384 | 5654 |
end; |
5655 |
||
5656 |
procedure doStepSineGunShot(Gear: PGear); |
|
| 7745 | 5657 |
var |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5658 |
HHGear: PGear; |
| 3384 | 5659 |
begin |
| 8795 | 5660 |
PlaySound(sndSineGun); |
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5661 |
|
| 11551 | 5662 |
if (Gear^.Hedgehog <> nil) and (Gear^.Hedgehog^.Gear <> nil) then |
5663 |
begin |
|
5664 |
HHGear := Gear^.Hedgehog^.Gear; |
|
5665 |
// push the shooting Hedgehog back |
|
5666 |
Gear^.dX.isNegative := not Gear^.dX.isNegative; |
|
5667 |
Gear^.dY.isNegative := not Gear^.dY.isNegative; |
|
5668 |
HHGear^.dX := Gear^.dX; |
|
5669 |
HHGear^.dY := Gear^.dY; |
|
|
13806
506cca5a48cb
Fix sinegun dealing 1 damage when shooting straight up. Reduces sine gun knockback strength by 1.25%
alfadur
parents:
13760
diff
changeset
|
5670 |
AmmoShove(Gear, 0, 79); |
| 11551 | 5671 |
Gear^.dX.isNegative := not Gear^.dX.isNegative; |
5672 |
Gear^.dY.isNegative := not Gear^.dY.isNegative; |
|
5673 |
end; |
|
|
3454
a9bef74bd6e0
Code restlyling: experimental restyling of one module
mbait
parents:
3440
diff
changeset
|
5674 |
|
|
4034
634a8c8682de
add some phone rumbling to big explosions, airbomb and sinegun
koda
parents:
4026
diff
changeset
|
5675 |
Gear^.doStep := @doStepSineGunShotWork; |
| 9954 | 5676 |
{$IFNDEF PAS2C}
|
| 8204 | 5677 |
with mobileRecord do |
5678 |
if (performRumble <> nil) and (not fastUntilLag) then |
|
5679 |
performRumble(kSystemSoundID_Vibrate); |
|
| 9954 | 5680 |
{$ENDIF}
|
| 3384 | 5681 |
end; |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5682 |
|
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5683 |
//////////////////////////////////////////////////////////////////////////////// |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5684 |
procedure doStepFlamethrowerWork(Gear: PGear); |
| 8795 | 5685 |
var |
| 7281 | 5686 |
HHGear, flame: PGear; |
| 3485 | 5687 |
rx, ry, speed: hwFloat; |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5688 |
i, gX, gY: LongInt; |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5689 |
begin |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5690 |
AllInactive := false; |
| 4365 | 5691 |
HHGear := Gear^.Hedgehog^.Gear; |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5692 |
if HHGear = nil then |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5693 |
begin |
| 14004 | 5694 |
StopSoundChan(Gear^.SoundChannel, 300); |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5695 |
DeleteGear(gear); |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5696 |
exit |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5697 |
end; |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5698 |
HedgehogChAngle(HHGear); |
| 3484 | 5699 |
gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle); |
5700 |
gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle); |
|
| 8795 | 5701 |
|
| 3485 | 5702 |
if (GameTicks and $FF) = 0 then |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5703 |
begin |
| 3894 | 5704 |
if (HHGear^.Message and gmRight) <> 0 then |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5705 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5706 |
if HHGear^.dX.isNegative and (Gear^.Tag < 20) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5707 |
inc(Gear^.Tag) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5708 |
else if Gear^.Tag > 5 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5709 |
dec(Gear^.Tag); |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5710 |
end |
| 3894 | 5711 |
else if (HHGear^.Message and gmLeft) <> 0 then |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5712 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5713 |
if HHGear^.dX.isNegative and (Gear^.Tag > 5) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5714 |
dec(Gear^.Tag) |
| 8795 | 5715 |
else if Gear^.Tag < 20 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5716 |
inc(Gear^.Tag); |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5717 |
end |
|
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5718 |
end; |
| 8795 | 5719 |
|
| 3485 | 5720 |
dec(Gear^.Timer); |
5721 |
if Gear^.Timer = 0 then |
|
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5722 |
begin |
| 3485 | 5723 |
dec(Gear^.Health); |
|
5417
c56a6be662bf
try to tweak flamethrower a bit to do more damage with fire changes. An optimal firepit test dealt 68.
nemo
parents:
5415
diff
changeset
|
5724 |
if (Gear^.Health mod 5) = 0 then |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5725 |
begin |
| 7001 | 5726 |
rx := rndSign(getRandomf * _0_1); |
5727 |
ry := rndSign(getRandomf * _0_1); |
|
|
5417
c56a6be662bf
try to tweak flamethrower a bit to do more damage with fire changes. An optimal firepit test dealt 68.
nemo
parents:
5415
diff
changeset
|
5728 |
speed := _0_5 * (_10 / Gear^.Tag); |
| 8795 | 5729 |
|
| 7281 | 5730 |
flame:= AddGear(gx, gy, gtFlame, gstTmpFlag, |
|
6126
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
5731 |
SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx, |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
5732 |
AngleCos(HHGear^.Angle) * ( - speed) + ry, 0); |
|
13469
f1d349a52bc7
Refactor: lfCurrentHog→lfCurHogCrate, lfNotCurrentMask→lfNotCurHogCrate
Wuzzy <Wuzzy2@mail.ru>
parents:
13408
diff
changeset
|
5733 |
flame^.CollisionMask:= lfNotCurHogCrate; |
| 8795 | 5734 |
|
| 6131 | 5735 |
if (Gear^.Health mod 30) = 0 then |
| 7281 | 5736 |
begin |
5737 |
flame:= AddGear(gx, gy, gtFlame, 0, |
|
|
6126
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
5738 |
SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx, |
|
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
5739 |
AngleCos(HHGear^.Angle) * ( - speed) + ry, 0); |
|
13469
f1d349a52bc7
Refactor: lfCurrentHog→lfCurHogCrate, lfNotCurrentMask→lfNotCurHogCrate
Wuzzy <Wuzzy2@mail.ru>
parents:
13408
diff
changeset
|
5740 |
flame^.CollisionMask:= lfNotCurHogCrate; |
| 7281 | 5741 |
end |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5742 |
end; |
| 3485 | 5743 |
Gear^.Timer:= Gear^.Tag |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5744 |
end; |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5745 |
|
| 7539 | 5746 |
if (Gear^.Health = 0) or ((HHGear^.State and gstHHDriven) = 0) then |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5747 |
begin |
|
14019
23fb123bd70c
Clear gmLeft/gmRight after using landspray/flamethrower to prevent accidental walking
Wuzzy <Wuzzy2@mail.ru>
parents:
14017
diff
changeset
|
5748 |
HHGear^.Message:= HHGear^.Message and (not (gmAttack or gmLeft or gmRight)); |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5749 |
HHGear^.State := HHGear^.State and (not gstNotKickable); |
| 14004 | 5750 |
StopSoundChan(Gear^.SoundChannel, 300); |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5751 |
DeleteGear(Gear); |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5752 |
AfterAttack |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5753 |
end |
| 3485 | 5754 |
else |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5755 |
begin |
|
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5756 |
i:= Gear^.Health div 5; |
|
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5757 |
if (i <> Gear^.Damage) and ((GameTicks and $3F) = 0) then |
|
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5758 |
begin |
|
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5759 |
Gear^.Damage:= i; |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10597
diff
changeset
|
5760 |
FreeAndNilTexture(Gear^.Tex); |
| 13898 | 5761 |
Gear^.Tex := RenderStringTex(FormatA(trmsg[sidFuel], ansistring(inttostr(i))), |
|
13640
cb0191394133
Use full string for sidFuel and avoid string concatenation
Wuzzy <Wuzzy2@mail.ru>
parents:
13624
diff
changeset
|
5762 |
cWhiteColor, fntSmall) |
|
4251
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5763 |
end |
|
4b7d3507d175
pull bugfix into 0.9.14 avoid major performance hit when using flamethrower
nemo
parents:
4233
diff
changeset
|
5764 |
end |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5765 |
end; |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5766 |
|
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5767 |
procedure doStepFlamethrower(Gear: PGear); |
| 8795 | 5768 |
var |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5769 |
HHGear: PGear; |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5770 |
begin |
| 4365 | 5771 |
HHGear := Gear^.Hedgehog^.Gear; |
| 6450 | 5772 |
HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown or gmLeft or gmRight)); |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5773 |
HHGear^.State := HHGear^.State or gstNotKickable; |
|
14653
5132548cdb77
Add workaround around an SDL_mixer bug that screws up volume after using flamethrower (bug 721)
Wuzzy <Wuzzy2@mail.ru>
parents:
14637
diff
changeset
|
5774 |
(* NOTE: Flamethrower sound is supposed to start instantly (no fade in), |
|
5132548cdb77
Add workaround around an SDL_mixer bug that screws up volume after using flamethrower (bug 721)
Wuzzy <Wuzzy2@mail.ru>
parents:
14637
diff
changeset
|
5775 |
but this would cause the game volume to screw up because of a bug in SDL_mixer: |
|
5132548cdb77
Add workaround around an SDL_mixer bug that screws up volume after using flamethrower (bug 721)
Wuzzy <Wuzzy2@mail.ru>
parents:
14637
diff
changeset
|
5776 |
https://bugzilla.libsdl.org/show_bug.cgi?id=4205 |
|
5132548cdb77
Add workaround around an SDL_mixer bug that screws up volume after using flamethrower (bug 721)
Wuzzy <Wuzzy2@mail.ru>
parents:
14637
diff
changeset
|
5777 |
As workaround, a tiny fade-in delay was added. |
|
5132548cdb77
Add workaround around an SDL_mixer bug that screws up volume after using flamethrower (bug 721)
Wuzzy <Wuzzy2@mail.ru>
parents:
14637
diff
changeset
|
5778 |
FIXME: Remove the fade-in delay argument when the SDL bug has been fixed. *) |
|
5132548cdb77
Add workaround around an SDL_mixer bug that screws up volume after using flamethrower (bug 721)
Wuzzy <Wuzzy2@mail.ru>
parents:
14637
diff
changeset
|
5779 |
Gear^.SoundChannel := LoopSound(sndFlamethrower, 20); |
|
3476
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5780 |
Gear^.doStep := @doStepFlamethrowerWork |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5781 |
end; |
|
1ec68b8d3bd1
Henek adds a flamethrower, updates some translations, and tweaks how fire works.
nemo
parents:
3475
diff
changeset
|
5782 |
|
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
5783 |
//////////////////////////////////////////////////////////////////////////////// |
| 5024 | 5784 |
procedure doStepLandGunWork(Gear: PGear); |
| 8795 | 5785 |
var |
| 7281 | 5786 |
HHGear, land: PGear; |
| 5024 | 5787 |
rx, ry, speed: hwFloat; |
5788 |
i, gX, gY: LongInt; |
|
5789 |
begin |
|
5790 |
AllInactive := false; |
|
5791 |
HHGear := Gear^.Hedgehog^.Gear; |
|
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5792 |
if HHGear = nil then |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5793 |
begin |
| 14006 | 5794 |
StopSoundChan(gear^.SoundChannel); |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5795 |
DeleteGear(gear); |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5796 |
exit |
|
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5797 |
end; |
| 5024 | 5798 |
HedgehogChAngle(HHGear); |
5799 |
gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle); |
|
5800 |
gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle); |
|
| 8795 | 5801 |
|
| 5024 | 5802 |
if (GameTicks and $FF) = 0 then |
5803 |
begin |
|
5804 |
if (HHGear^.Message and gmRight) <> 0 then |
|
5805 |
begin |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5806 |
if HHGear^.dX.isNegative and (Gear^.Tag < 20) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5807 |
inc(Gear^.Tag) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5808 |
else if Gear^.Tag > 5 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5809 |
dec(Gear^.Tag); |
| 5024 | 5810 |
end |
5811 |
else if (HHGear^.Message and gmLeft) <> 0 then |
|
5812 |
begin |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5813 |
if HHGear^.dX.isNegative and (Gear^.Tag > 5) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5814 |
dec(Gear^.Tag) |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5815 |
else if Gear^.Tag < 20 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5816 |
inc(Gear^.Tag); |
| 5024 | 5817 |
end |
5818 |
end; |
|
| 8795 | 5819 |
|
| 5024 | 5820 |
dec(Gear^.Timer); |
5821 |
if Gear^.Timer = 0 then |
|
5822 |
begin |
|
5823 |
dec(Gear^.Health); |
|
| 5480 | 5824 |
|
| 7001 | 5825 |
rx := rndSign(getRandomf * _0_1); |
5826 |
ry := rndSign(getRandomf * _0_1); |
|
| 5480 | 5827 |
speed := (_3 / Gear^.Tag); |
5828 |
||
| 8795 | 5829 |
land:= AddGear(gx, gy, gtFlake, gstTmpFlag, |
5830 |
SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx, |
|
|
6126
61c1161ee32f
Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier.
nemo
parents:
6122
diff
changeset
|
5831 |
AngleCos(HHGear^.Angle) * ( - speed) + ry, 0); |
|
13469
f1d349a52bc7
Refactor: lfCurrentHog→lfCurHogCrate, lfNotCurrentMask→lfNotCurHogCrate
Wuzzy <Wuzzy2@mail.ru>
parents:
13408
diff
changeset
|
5832 |
land^.CollisionMask:= lfNotCurHogCrate; |
| 8795 | 5833 |
|
| 5024 | 5834 |
Gear^.Timer:= Gear^.Tag |
5835 |
end; |
|
5836 |
||
| 7539 | 5837 |
if (Gear^.Health = 0) or ((HHGear^.State and gstHHDriven) = 0) or ((HHGear^.Message and gmAttack) <> 0) then |
| 5024 | 5838 |
begin |
|
14019
23fb123bd70c
Clear gmLeft/gmRight after using landspray/flamethrower to prevent accidental walking
Wuzzy <Wuzzy2@mail.ru>
parents:
14017
diff
changeset
|
5839 |
HHGear^.Message:= HHGear^.Message and (not (gmAttack or gmLeft or gmRight)); |
|
10831
19d056c10bbd
Clear flag set by gear on gear deletion. Also added a few more nil checks on HHGear
nemo
parents:
10827
diff
changeset
|
5840 |
HHGear^.State := HHGear^.State and (not gstNotKickable); |
| 14006 | 5841 |
StopSoundChan(gear^.SoundChannel); |
| 5024 | 5842 |
DeleteGear(Gear); |
5843 |
AfterAttack |
|
5844 |
end |
|
5845 |
else |
|
5846 |
begin |
|
5847 |
i:= Gear^.Health div 10; |
|
5848 |
if (i <> Gear^.Damage) and ((GameTicks and $3F) = 0) then |
|
5849 |
begin |
|
5850 |
Gear^.Damage:= i; |
|
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10597
diff
changeset
|
5851 |
FreeAndNilTexture(Gear^.Tex); |
| 13898 | 5852 |
Gear^.Tex := RenderStringTex(FormatA(trmsg[sidFuel], ansistring(inttostr(i))), |
|
13640
cb0191394133
Use full string for sidFuel and avoid string concatenation
Wuzzy <Wuzzy2@mail.ru>
parents:
13624
diff
changeset
|
5853 |
cWhiteColor, fntSmall) |
| 5024 | 5854 |
end |
5855 |
end |
|
5856 |
end; |
|
5857 |
||
5858 |
procedure doStepLandGun(Gear: PGear); |
|
| 8795 | 5859 |
var |
| 5024 | 5860 |
HHGear: PGear; |
5861 |
begin |
|
5862 |
HHGear := Gear^.Hedgehog^.Gear; |
|
| 6450 | 5863 |
HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown or gmLeft or gmRight or gmAttack)); |
| 5024 | 5864 |
HHGear^.State := HHGear^.State or gstNotKickable; |
| 14006 | 5865 |
Gear^.SoundChannel := LoopSound(sndLandGun); |
| 5024 | 5866 |
Gear^.doStep := @doStepLandGunWork |
5867 |
end; |
|
5868 |
||
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
5869 |
//////////////////////////////////////////////////////////////////////////////// |
| 3712 | 5870 |
procedure doStepPoisonCloud(Gear: PGear); |
5871 |
begin |
|
| 11236 | 5872 |
// don't bounce |
5873 |
if WorldEdge <> weBounce then |
|
5874 |
WorldWrap(Gear); |
|
| 3712 | 5875 |
if Gear^.Timer = 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5876 |
begin |
| 3712 | 5877 |
DeleteGear(Gear); |
5878 |
exit |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5879 |
end; |
| 3712 | 5880 |
dec(Gear^.Timer); |
5881 |
Gear^.X:= Gear^.X + Gear^.dX; |
|
5882 |
Gear^.Y:= Gear^.Y + Gear^.dY; |
|
| 3713 | 5883 |
Gear^.dX := Gear^.dX + cWindSpeed / 4; |
| 3712 | 5884 |
Gear^.dY := Gear^.dY + cGravity / 100; |
|
5340
6963e37f2dd2
- Allow snow to drop a bit outside the map, where it already is allowed to spawn
unc0rr
parents:
5336
diff
changeset
|
5885 |
if (GameTicks and $FF) = 0 then |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
5886 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLDontDraw or EXPLNoGfx or EXPLNoDamage or EXPLDoNotTouchAny or EXPLPoisoned); |
| 9817 | 5887 |
if Gear^.State and gstTmpFlag = 0 then |
5888 |
AllInactive:= false; |
|
| 3717 | 5889 |
end; |
5890 |
||
5891 |
//////////////////////////////////////////////////////////////////////////////// |
|
5892 |
procedure doStepHammer(Gear: PGear); |
|
| 3720 | 5893 |
var HHGear, tmp, tmp2: PGear; |
| 3717 | 5894 |
t: PGearArray; |
| 12621 | 5895 |
i, dmg: LongInt; |
| 3717 | 5896 |
begin |
| 4365 | 5897 |
HHGear:= Gear^.Hedgehog^.Gear; |
| 3717 | 5898 |
HHGear^.State:= HHGear^.State or gstNoDamage; |
5899 |
DeleteCI(HHGear); |
|
|
11044
c3d76daae637
this should prevent hogs from hovering in air after using hammer
sheepluva
parents:
11042
diff
changeset
|
5900 |
SetLittle(HHGear^.dY); |
|
c3d76daae637
this should prevent hogs from hovering in air after using hammer
sheepluva
parents:
11042
diff
changeset
|
5901 |
HHGear^.dY.IsNegative:= true; |
|
c3d76daae637
this should prevent hogs from hovering in air after using hammer
sheepluva
parents:
11042
diff
changeset
|
5902 |
HHGear^.State:= HHGear^.State or gstMoving; |
| 3717 | 5903 |
|
5904 |
t:= CheckGearsCollision(Gear); |
|
| 3720 | 5905 |
|
5906 |
for i:= 5 downto 0 do |
|
5907 |
AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust); |
|
5908 |
||
| 3717 | 5909 |
i:= t^.Count; |
5910 |
while i > 0 do |
|
5911 |
begin |
|
5912 |
dec(i); |
|
5913 |
tmp:= t^.ar[i]; |
|
5914 |
if (tmp^.State and gstNoDamage) = 0 then |
|
|
5624
b6f70f6335ee
Allow hammer to bash mines/barrels too, increase escape time to 3s
nemo
parents:
5612
diff
changeset
|
5915 |
if (tmp^.Kind = gtHedgehog) or (tmp^.Kind = gtMine) or (tmp^.Kind = gtExplosives) then |
| 3717 | 5916 |
begin |
| 11042 | 5917 |
dmg:= 0; |
|
10011
ead5e4b21671
Add check for gear kind of hedgehog on invulnerability effect. This probably fixes bug #766, is similar to change in previous r2a1483d91977 and was introduced by r7d925e82e572
nemo
parents:
9998
diff
changeset
|
5918 |
if (tmp^.Kind <> gtHedgehog) or (tmp^.Hedgehog^.Effects[heInvulnerable] = 0) then |
|
11039
cd4b0851b060
Hammer changes/fixes: honor extra-damage (Issue 975), round up damage, do correct damage when being spammed in infinite-attack mode
sheepluva
parents:
11020
diff
changeset
|
5919 |
begin |
|
cd4b0851b060
Hammer changes/fixes: honor extra-damage (Issue 975), round up damage, do correct damage when being spammed in infinite-attack mode
sheepluva
parents:
11020
diff
changeset
|
5920 |
// base damage on remaining health |
|
cd4b0851b060
Hammer changes/fixes: honor extra-damage (Issue 975), round up damage, do correct damage when being spammed in infinite-attack mode
sheepluva
parents:
11020
diff
changeset
|
5921 |
dmg:= (tmp^.Health - tmp^.Damage); |
|
cd4b0851b060
Hammer changes/fixes: honor extra-damage (Issue 975), round up damage, do correct damage when being spammed in infinite-attack mode
sheepluva
parents:
11020
diff
changeset
|
5922 |
if dmg > 0 then |
|
cd4b0851b060
Hammer changes/fixes: honor extra-damage (Issue 975), round up damage, do correct damage when being spammed in infinite-attack mode
sheepluva
parents:
11020
diff
changeset
|
5923 |
begin |
|
11277
d63ef6afabe3
make hammer non-lethal again (as requested by unC0Rr)
sheepluva
parents:
11236
diff
changeset
|
5924 |
// always rounding down |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
5925 |
dmg:= dmg div Gear^.Boom; |
|
11277
d63ef6afabe3
make hammer non-lethal again (as requested by unC0Rr)
sheepluva
parents:
11236
diff
changeset
|
5926 |
|
|
d63ef6afabe3
make hammer non-lethal again (as requested by unC0Rr)
sheepluva
parents:
11236
diff
changeset
|
5927 |
if dmg > 0 then |
|
14061
128fbd36eee4
Stop using dsUnknown, replace with concrete damage sources
Wuzzy <Wuzzy2@mail.ru>
parents:
14040
diff
changeset
|
5928 |
ApplyDamage(tmp, CurrentHedgehog, dmg, dsHammer); |
|
11039
cd4b0851b060
Hammer changes/fixes: honor extra-damage (Issue 975), round up damage, do correct damage when being spammed in infinite-attack mode
sheepluva
parents:
11020
diff
changeset
|
5929 |
end; |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
5930 |
tmp^.dY:= _0_03 * Gear^.Boom |
| 11042 | 5931 |
end; |
5932 |
||
5933 |
if (tmp^.Kind <> gtHedgehog) or (dmg > 0) or (tmp^.Health > tmp^.Damage) then |
|
5934 |
begin |
|
5935 |
tmp2:= AddGear(hwRound(tmp^.X), hwRound(tmp^.Y), gtHammerHit, 0, _0, _0, 0); |
|
5936 |
tmp2^.LinkedGear:= tmp; |
|
5937 |
SetAllToActive |
|
5938 |
end; |
|
|
11039
cd4b0851b060
Hammer changes/fixes: honor extra-damage (Issue 975), round up damage, do correct damage when being spammed in infinite-attack mode
sheepluva
parents:
11020
diff
changeset
|
5939 |
end; |
| 3717 | 5940 |
end; |
5941 |
||
| 6450 | 5942 |
HHGear^.State:= HHGear^.State and (not gstNoDamage); |
| 3717 | 5943 |
Gear^.Timer:= 250; |
5944 |
Gear^.doStep:= @doStepIdle |
|
5945 |
end; |
|
| 3720 | 5946 |
|
5947 |
procedure doStepHammerHitWork(Gear: PGear); |
|
| 8795 | 5948 |
var |
| 5628 | 5949 |
i, j, ei: LongInt; |
|
5624
b6f70f6335ee
Allow hammer to bash mines/barrels too, increase escape time to 3s
nemo
parents:
5612
diff
changeset
|
5950 |
HitGear: PGear; |
| 3720 | 5951 |
begin |
5952 |
AllInactive := false; |
|
|
7272
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7270
diff
changeset
|
5953 |
HitGear := Gear^.LinkedGear; |
| 3720 | 5954 |
dec(Gear^.Timer); |
|
5624
b6f70f6335ee
Allow hammer to bash mines/barrels too, increase escape time to 3s
nemo
parents:
5612
diff
changeset
|
5955 |
if (HitGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gmDestroy) <> 0) then |
| 5628 | 5956 |
begin |
| 3720 | 5957 |
DeleteGear(Gear); |
5958 |
exit |
|
| 5628 | 5959 |
end; |
| 3720 | 5960 |
|
5961 |
if (Gear^.Timer mod 5) = 0 then |
|
| 5628 | 5962 |
begin |
| 3720 | 5963 |
AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust); |
5964 |
||
| 5628 | 5965 |
i := hwRound(Gear^.X) - HitGear^.Radius + 2; |
5966 |
ei := hwRound(Gear^.X) + HitGear^.Radius - 2; |
|
|
13604
73b096e1d895
Fix hammer/pickhammer not digging land with gfSolidLand on
Wuzzy <Wuzzy2@mail.ru>
parents:
13603
diff
changeset
|
5967 |
for j := 1 to 4 do doMakeExplosion(i - GetRandom(5), hwRound(Gear^.Y) + 6*j, 3, Gear^.Hedgehog, EXPLNoDamage or EXPLDoNotTouchAny or EXPLNoGfx or EXPLForceDraw); |
|
73b096e1d895
Fix hammer/pickhammer not digging land with gfSolidLand on
Wuzzy <Wuzzy2@mail.ru>
parents:
13603
diff
changeset
|
5968 |
for j := 1 to 4 do doMakeExplosion(ei + LongInt(GetRandom(5)), hwRound(Gear^.Y) + 6*j, 3, Gear^.Hedgehog, EXPLNoDamage or EXPLDoNotTouchAny or EXPLNoGfx or EXPLForceDraw); |
| 3720 | 5969 |
while i <= ei do |
| 5628 | 5970 |
begin |
|
13604
73b096e1d895
Fix hammer/pickhammer not digging land with gfSolidLand on
Wuzzy <Wuzzy2@mail.ru>
parents:
13603
diff
changeset
|
5971 |
for j := 1 to 11 do doMakeExplosion(i, hwRound(Gear^.Y) + 3*j, 3, Gear^.Hedgehog, EXPLNoDamage or EXPLDoNotTouchAny or EXPLNoGfx or EXPLForceDraw); |
| 3720 | 5972 |
inc(i, 1) |
| 5628 | 5973 |
end; |
| 3720 | 5974 |
|
5975 |
if CheckLandValue(hwRound(Gear^.X + Gear^.dX + SignAs(_6,Gear^.dX)), hwRound(Gear^.Y + _1_9) |
|
| 13603 | 5976 |
, lfIndestructible) then |
5977 |
begin |
|
5978 |
Gear^.Y := Gear^.Y + _1_9 |
|
5979 |
end; |
|
| 3720 | 5980 |
end; |
|
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
6011
diff
changeset
|
5981 |
if TestCollisionYwithGear(Gear, 1) <> 0 then |
| 5628 | 5982 |
begin |
| 3720 | 5983 |
Gear^.dY := _0; |
|
5624
b6f70f6335ee
Allow hammer to bash mines/barrels too, increase escape time to 3s
nemo
parents:
5612
diff
changeset
|
5984 |
SetLittle(HitGear^.dX); |
|
b6f70f6335ee
Allow hammer to bash mines/barrels too, increase escape time to 3s
nemo
parents:
5612
diff
changeset
|
5985 |
HitGear^.dY := _0; |
| 5628 | 5986 |
end |
| 3720 | 5987 |
else |
| 5628 | 5988 |
begin |
| 10354 | 5989 |
if CheckCoordInWater(hwRound(Gear^.X), hwRound(Gear^.Y)) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
5990 |
Gear^.Timer := 1 |
| 5628 | 5991 |
end; |
| 3720 | 5992 |
|
|
5624
b6f70f6335ee
Allow hammer to bash mines/barrels too, increase escape time to 3s
nemo
parents:
5612
diff
changeset
|
5993 |
HitGear^.X := Gear^.X; |
|
8634
5dcb1dc9e01b
fix portal/hammer interaction, ban freezer from portal
nemo
parents:
8632
diff
changeset
|
5994 |
HitGear^.Y := Gear^.Y; |
| 5628 | 5995 |
SetLittle(HitGear^.dY); |
5996 |
HitGear^.Active:= true; |
|
| 3720 | 5997 |
end; |
5998 |
||
5999 |
procedure doStepHammerHit(Gear: PGear); |
|
| 8795 | 6000 |
var |
| 3720 | 6001 |
i, y: LongInt; |
6002 |
ar: TRangeArray; |
|
6003 |
HHGear: PGear; |
|
6004 |
begin |
|
6005 |
i := 0; |
|
| 4365 | 6006 |
HHGear := Gear^.Hedgehog^.Gear; |
| 3720 | 6007 |
|
6008 |
y := hwRound(Gear^.Y) - cHHRadius * 2; |
|
6009 |
while y < hwRound(Gear^.Y) do |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6010 |
begin |
| 3720 | 6011 |
ar[i].Left := hwRound(Gear^.X) - Gear^.Radius - LongInt(GetRandom(2)); |
6012 |
ar[i].Right := hwRound(Gear^.X) + Gear^.Radius + LongInt(GetRandom(2)); |
|
6013 |
inc(y, 2); |
|
6014 |
inc(i) |
|
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6015 |
end; |
| 3720 | 6016 |
|
6017 |
DrawHLinesExplosions(@ar, 3, hwRound(Gear^.Y) - cHHRadius * 2, 2, Pred(i)); |
|
6018 |
Gear^.dY := HHGear^.dY; |
|
6019 |
DeleteCI(HHGear); |
|
6020 |
||
6021 |
doStepHammerHitWork(Gear); |
|
| 3821 | 6022 |
Gear^.doStep := @doStepHammerHitWork |
| 3720 | 6023 |
end; |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6024 |
|
|
4293
d79ffcdd77df
makes drill attack drills weaker and not affected by wind
Henek
parents:
4282
diff
changeset
|
6025 |
//////////////////////////////////////////////////////////////////////////////// |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6026 |
procedure doStepResurrectorWork(Gear: PGear); |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6027 |
var |
| 7335 | 6028 |
graves: PGearArrayS; |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6029 |
resgear: PGear; |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6030 |
hh: PHedgehog; |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6031 |
i: LongInt; |
|
12169
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
6032 |
s: ansistring; |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6033 |
begin |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6034 |
AllInactive := false; |
| 4365 | 6035 |
hh := Gear^.Hedgehog; |
| 4387 | 6036 |
|
| 6131 | 6037 |
if ((Gear^.Message and gmUp) <> 0) then |
|
4017
048bcb8c72ae
Kill off hog immediately on using up health, use more common formatting, call render less often
nemo
parents:
4005
diff
changeset
|
6038 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6039 |
if (GameTicks and $F) <> 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6040 |
exit; |
| 8795 | 6041 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6042 |
else if (GameTicks and $1FF) <> 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6043 |
exit; |
|
4017
048bcb8c72ae
Kill off hog immediately on using up health, use more common formatting, call render less often
nemo
parents:
4005
diff
changeset
|
6044 |
|
| 6131 | 6045 |
if Gear^.Power < 45 then |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6046 |
begin |
|
4023
8de77872ef21
Resurrector: Levitate hog + show cross
Tobias Neumann <mail@tobias-neumann.eu>
parents:
4021
diff
changeset
|
6047 |
inc(Gear^.Power); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6048 |
if TestCollisionYwithGear(hh^.Gear, -1) = 0 then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6049 |
hh^.Gear^.Y := hh^.Gear^.Y - _1; |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6050 |
end; |
|
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6051 |
|
|
4184
bc2b88eea8c4
fix stray offset in resurrector, make resurrector use time
nemo
parents:
4182
diff
changeset
|
6052 |
graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius); |
|
4024
1ffb84b3823d
Resurrector: respect modified Gear position for resurrection range circle
Tobias Neumann <mail@tobias-neumann.eu>
parents:
4023
diff
changeset
|
6053 |
|
| 7335 | 6054 |
if graves.size = 0 then |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6055 |
begin |
| 7053 | 6056 |
StopSoundChan(Gear^.SoundChannel); |
|
3975
3f605cca9215
Resurrector weapon: do not make it end turn, add description,
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3971
diff
changeset
|
6057 |
Gear^.Timer := 250; |
|
3f605cca9215
Resurrector weapon: do not make it end turn, add description,
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3971
diff
changeset
|
6058 |
Gear^.doStep := @doStepIdle; |
|
3f605cca9215
Resurrector weapon: do not make it end turn, add description,
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3971
diff
changeset
|
6059 |
exit; |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6060 |
end; |
|
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6061 |
|
| 6131 | 6062 |
if ((Gear^.Message and gmAttack) <> 0) and (hh^.Gear^.Health > 0) and (TurnTimeLeft > 0) then |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6063 |
begin |
| 7721 | 6064 |
if LongInt(graves.size) <= Gear^.Tag then Gear^.Tag:= 0; |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6065 |
dec(hh^.Gear^.Health); |
|
4017
048bcb8c72ae
Kill off hog immediately on using up health, use more common formatting, call render less often
nemo
parents:
4005
diff
changeset
|
6066 |
if (hh^.Gear^.Health = 0) and (hh^.Gear^.Damage = 0) then |
|
048bcb8c72ae
Kill off hog immediately on using up health, use more common formatting, call render less often
nemo
parents:
4005
diff
changeset
|
6067 |
hh^.Gear^.Damage:= 1; |
|
048bcb8c72ae
Kill off hog immediately on using up health, use more common formatting, call render less often
nemo
parents:
4005
diff
changeset
|
6068 |
RenderHealth(hh^); |
| 7399 | 6069 |
RecountTeamHealth(hh^.Team); |
| 7335 | 6070 |
inc(graves.ar^[Gear^.Tag]^.Health); |
|
4253
160f987a5d9f
improve behaviour of resurrection. pull in 4254 and 4259 which replace random with index
nemo
parents:
4251
diff
changeset
|
6071 |
inc(Gear^.Tag) |
| 8795 | 6072 |
end |
6073 |
else |
|
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6074 |
begin |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6075 |
// now really resurrect the hogs with the hp saved in the graves |
| 7335 | 6076 |
for i:= 0 to graves.size - 1 do |
6077 |
if graves.ar^[i]^.Health > 0 then |
|
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6078 |
begin |
| 11203 | 6079 |
resgear := AddGear(hwRound(graves.ar^[i]^.X), hwRound(graves.ar^[i]^.Y), gtHedgehog, gstWait, _0, _0, 0,graves.ar^[i]^.Pos); |
| 7335 | 6080 |
resgear^.Hedgehog := graves.ar^[i]^.Hedgehog; |
6081 |
resgear^.Health := graves.ar^[i]^.Health; |
|
6082 |
PHedgehog(graves.ar^[i]^.Hedgehog)^.Gear := resgear; |
|
| 7394 | 6083 |
graves.ar^[i]^.Message:= graves.ar^[i]^.Message or gmDestroy; |
| 7399 | 6084 |
graves.ar^[i]^.Active:= true; |
| 4372 | 6085 |
RenderHealth(resgear^.Hedgehog^); |
6086 |
RecountTeamHealth(resgear^.Hedgehog^.Team); |
|
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6087 |
resgear^.Hedgehog^.Effects[heResurrected]:= 1; |
|
14419
87562a68c41f
Fix some King Mode bugs causing minions not always being properly killed
Wuzzy <Wuzzy2@mail.ru>
parents:
14379
diff
changeset
|
6088 |
if resgear^.Hedgehog^.King then |
|
87562a68c41f
Fix some King Mode bugs causing minions not always being properly killed
Wuzzy <Wuzzy2@mail.ru>
parents:
14379
diff
changeset
|
6089 |
resgear^.Hedgehog^.Team^.hasKing:= true; |
|
13760
b1177e9c9ee9
Fix player rankings getting confused if a clan was revived
Wuzzy <Wuzzy2@mail.ru>
parents:
13739
diff
changeset
|
6090 |
{ Reviving a hog implies its clan is now alive, too. }
|
|
b1177e9c9ee9
Fix player rankings getting confused if a clan was revived
Wuzzy <Wuzzy2@mail.ru>
parents:
13739
diff
changeset
|
6091 |
resgear^.Hedgehog^.Team^.Clan^.DeathLogged:= false; |
|
14637
4638aa2ea8f2
Update clan passive status when team died / got resurrected
Wuzzy <Wuzzy2@mail.ru>
parents:
14595
diff
changeset
|
6092 |
if (not resgear^.Hedgehog^.Team^.Passive) then |
|
4638aa2ea8f2
Update clan passive status when team died / got resurrected
Wuzzy <Wuzzy2@mail.ru>
parents:
14595
diff
changeset
|
6093 |
resgear^.Hedgehog^.Team^.Clan^.Passive:= false; |
|
12169
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
6094 |
s:= ansistring(resgear^.Hedgehog^.Name); |
|
13642
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13640
diff
changeset
|
6095 |
AddCaption(FormatA(GetEventString(eidResurrected), s), capcolDefault, capgrpMessage); |
| 4874 | 6096 |
// only make hat-less hedgehogs look like zombies, preserve existing hats |
| 7394 | 6097 |
|
| 4372 | 6098 |
if resgear^.Hedgehog^.Hat = 'NoHat' then |
| 7754 | 6099 |
LoadHedgehogHat(resgear^.Hedgehog^, 'Reserved/Zombie'); |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6100 |
end; |
|
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6101 |
|
| 4045 | 6102 |
hh^.Gear^.dY := _0; |
6103 |
hh^.Gear^.dX := _0; |
|
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6104 |
doStepHedgehogMoving(hh^.Gear); |
| 7053 | 6105 |
StopSoundChan(Gear^.SoundChannel); |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6106 |
Gear^.Timer := 250; |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6107 |
Gear^.doStep := @doStepIdle; |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6108 |
end |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6109 |
end; |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6110 |
|
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6111 |
procedure doStepResurrector(Gear: PGear); |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6112 |
var |
| 7335 | 6113 |
graves: PGearArrayS; |
|
8730
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6114 |
hh: PHedgehog; |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6115 |
i: LongInt; |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6116 |
begin |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6117 |
AllInactive := false; |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6118 |
graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius); |
|
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6119 |
|
| 7335 | 6120 |
if graves.size > 0 then |
6121 |
begin |
|
|
8730
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6122 |
hh := Gear^.Hedgehog; |
| 7335 | 6123 |
for i:= 0 to graves.size - 1 do |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6124 |
begin |
| 7335 | 6125 |
PHedgehog(graves.ar^[i]^.Hedgehog)^.Gear := nil; |
6126 |
graves.ar^[i]^.Health := 0; |
|
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6127 |
end; |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6128 |
Gear^.doStep := @doStepResurrectorWork; |
|
8730
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6129 |
if ((Gear^.Message and gmAttack) <> 0) and (hh^.Gear^.Health > 0) and (TurnTimeLeft > 0) then |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6130 |
begin |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6131 |
if LongInt(graves.size) <= Gear^.Tag then Gear^.Tag:= 0; |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6132 |
dec(hh^.Gear^.Health); |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6133 |
if (hh^.Gear^.Health = 0) and (hh^.Gear^.Damage = 0) then |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6134 |
hh^.Gear^.Damage:= 1; |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6135 |
RenderHealth(hh^); |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6136 |
RecountTeamHealth(hh^.Team); |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6137 |
inc(graves.ar^[Gear^.Tag]^.Health); |
|
b39f433f8ab4
at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips
nemo
parents:
8727
diff
changeset
|
6138 |
inc(Gear^.Tag) |
| 8795 | 6139 |
end |
6140 |
end |
|
6141 |
else |
|
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6142 |
begin |
| 7053 | 6143 |
StopSoundChan(Gear^.SoundChannel); |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6144 |
Gear^.Timer := 250; |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6145 |
Gear^.doStep := @doStepIdle; |
|
4044
de7170e51cc6
Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation
nemo
parents:
4038
diff
changeset
|
6146 |
end |
|
3963
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6147 |
end; |
|
6090d2a2472e
New Weapon: Resurrector (TODO: ammo icon + sprites)
Tobias Neumann <mail@tobias-neumann.eu>
parents:
3959
diff
changeset
|
6148 |
|
|
4293
d79ffcdd77df
makes drill attack drills weaker and not affected by wind
Henek
parents:
4282
diff
changeset
|
6149 |
//////////////////////////////////////////////////////////////////////////////// |
|
4313
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6150 |
procedure doStepNapalmBomb(Gear: PGear); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6151 |
var |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6152 |
i, gX, gY: LongInt; |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6153 |
dX, dY: hwFloat; |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6154 |
begin |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6155 |
AllInactive := false; |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6156 |
doStepFallingGear(Gear); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6157 |
if (Gear^.Timer > 0) and ((Gear^.State and gstCollision) <> 0) then |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6158 |
begin |
|
4837
2ea0a152c319
Pass PHedgehog instead of PGear to stats. Fixes crash.
unc0rr
parents:
4824
diff
changeset
|
6159 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 10, Gear^.Hedgehog, EXPLAutoSound); |
|
4313
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6160 |
gX := hwRound(Gear^.X); |
| 8795 | 6161 |
gY := hwRound(Gear^.Y); |
|
4313
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6162 |
for i:= 0 to 10 do |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6163 |
begin |
| 7001 | 6164 |
dX := AngleCos(i * 2) * ((_0_1*(i div 5))) * (GetRandomf + _1); |
6165 |
dY := AngleSin(i * 8) * _0_5 * (GetRandomf + _1); |
|
|
4313
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6166 |
AddGear(gX, gY, gtFlame, 0, dX, dY, 0); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6167 |
AddGear(gX, gY, gtFlame, 0, dX, -dY, 0); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6168 |
AddGear(gX, gY, gtFlame, 0, -dX, dY, 0); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6169 |
AddGear(gX, gY, gtFlame, 0, -dX, -dY, 0); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6170 |
end; |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6171 |
DeleteGear(Gear); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6172 |
exit |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6173 |
end; |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6174 |
if (Gear^.Timer = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6175 |
begin |
|
4837
2ea0a152c319
Pass PHedgehog instead of PGear to stats. Fixes crash.
unc0rr
parents:
4824
diff
changeset
|
6176 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 10, Gear^.Hedgehog, EXPLAutoSound); |
|
4313
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6177 |
for i:= -19 to 19 do |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6178 |
FollowGear := AddGear(hwRound(Gear^.X) + i div 3, hwRound(Gear^.Y), gtFlame, 0, _0_001 * i, _0, 0); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6179 |
DeleteGear(Gear); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6180 |
exit |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6181 |
end; |
|
4313
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6182 |
if (GameTicks and $3F) = 0 then |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6183 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace); |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6184 |
dec(Gear^.Timer) |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6185 |
end; |
|
0690067bc5ff
made napalm use napalmbombs instead of just dropping fire
Henek
parents:
4301
diff
changeset
|
6186 |
|
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
6187 |
//////////////////////////////////////////////////////////////////////////////// |
| 5706 | 6188 |
(* |
| 8795 | 6189 |
TARDIS needs |
| 5706 | 6190 |
Warp in. Pos = 1 |
6191 |
Pause. Pos = 2 |
|
6192 |
Hide gear (TARDIS hedgehog was nil) |
|
6193 |
Warp out. Pos = 3 |
|
6194 |
... idle active for some time period ... Pos = 4 |
|
6195 |
Warp in. Pos = 1 |
|
6196 |
Pause. Pos = 2 |
|
6197 |
Restore gear (TARDIS hedgehog was not nil) |
|
6198 |
Warp out. Pos = 3 |
|
6199 |
*) |
|
6200 |
||
6201 |
procedure doStepTardisWarp(Gear: PGear); |
|
6202 |
var HH: PHedgehog; |
|
6203 |
i,j,cnt: LongWord; |
|
|
12169
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
6204 |
s: ansistring; |
|
5197
9fa96377a69c
Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
nemo
parents:
5186
diff
changeset
|
6205 |
begin |
| 5706 | 6206 |
HH:= Gear^.Hedgehog; |
|
15243
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6207 |
if Gear^.Tag = 0 then |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6208 |
begin |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6209 |
if HH^.Gear <> nil then |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6210 |
begin |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6211 |
if (HH^.Gear^.Damage <> 0) or (HH^.Gear^.Health = 0) or |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6212 |
((HH^.Gear^.State and (gstMoving or gstHHDeath or gstHHGone or gstDrowning)) <> 0) then |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6213 |
Gear^.Tag:= 1; |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6214 |
end |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6215 |
else if HH^.GearHidden = nil then |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6216 |
Gear^.Tag:= 1; |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6217 |
if (Gear^.Tag = 1) and (Gear = CurAmmoGear) then |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6218 |
CurAmmoGear:= nil; |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6219 |
end; |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6220 |
|
| 5706 | 6221 |
if Gear^.Pos = 2 then |
6222 |
begin |
|
| 7053 | 6223 |
StopSoundChan(Gear^.SoundChannel); |
|
12672
c98179b00740
Fix short sound breakdown shortly after using time box
Wuzzy <almikes@aol.com>
parents:
12656
diff
changeset
|
6224 |
Gear^.SoundChannel:= -1; |
| 5706 | 6225 |
if (Gear^.Timer = 0) then |
|
5197
9fa96377a69c
Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
nemo
parents:
5186
diff
changeset
|
6226 |
begin |
|
5715
59a8dd33f274
Restore gear ASAP, add denied sound for illegal activation without wasting ammo.
nemo
parents:
5710
diff
changeset
|
6227 |
if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible = 0) then |
|
5197
9fa96377a69c
Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
nemo
parents:
5186
diff
changeset
|
6228 |
begin |
|
15243
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6229 |
if Gear^.Tag = 0 then |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6230 |
AfterAttack; |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6231 |
if Gear = CurAmmoGear then |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6232 |
CurAmmoGear:= nil; |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6233 |
if Gear^.Tag = 0 then |
|
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6234 |
HideHog(HH); |
| 5706 | 6235 |
end |
|
14593
34e810295d08
Remove a bunch of dead out-commented code
Wuzzy <Wuzzy2@mail.ru>
parents:
14591
diff
changeset
|
6236 |
else if (HH^.GearHidden <> nil) then |
|
12169
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
6237 |
begin |
|
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
6238 |
RestoreHog(HH); |
|
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
6239 |
s:= ansistring(HH^.Name); |
|
13642
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13640
diff
changeset
|
6240 |
AddCaption(FormatA(GetEventString(eidTimeTravelEnd), s), capcolDefault, capgrpMessage) |
|
12169
869cf5f34700
More ticker messages: Sick, king died, resurrect, time box return, timeout, kamikaze
Wuzzy <almikes@aol.com>
parents:
12120
diff
changeset
|
6241 |
end |
| 5706 | 6242 |
end; |
6243 |
||
| 5971 | 6244 |
inc(Gear^.Timer); |
| 5706 | 6245 |
if (Gear^.Timer > 2000) and ((GameTicks mod 2000) = 1000) then |
6246 |
begin |
|
| 5728 | 6247 |
Gear^.SoundChannel := LoopSound(sndTardis); |
6248 |
Gear^.Pos:= 3 |
|
6249 |
end |
|
| 5706 | 6250 |
end; |
6251 |
||
| 6131 | 6252 |
if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then |
| 5935 | 6253 |
begin |
6254 |
inc(Gear^.Power); |
|
| 8795 | 6255 |
if (Gear^.Power = 172) and (HH^.Gear <> nil) and |
|
15243
deaa316af414
TimeBox: Fix buggy behaviour if hog took damage or died before time box arrived
Wuzzy <Wuzzy2@mail.ru>
parents:
15242
diff
changeset
|
6256 |
(Gear^.Tag = 0) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6257 |
with HH^.Gear^ do |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6258 |
begin |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6259 |
State:= State or gstAnimation; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6260 |
Tag:= 2; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6261 |
Timer:= 0; |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6262 |
Pos:= 0 |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6263 |
end |
| 5935 | 6264 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6265 |
if (Gear^.Pos = 3) and (GameTicks and $1F = 0) and (Gear^.Power > 0) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6266 |
dec(Gear^.Power); |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6267 |
if (Gear^.Pos = 1) and (Gear^.Power = 255) and ((GameTicks mod 2000) = 1000) then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6268 |
Gear^.Pos:= 2; |
| 5706 | 6269 |
if (Gear^.Pos = 3) and (Gear^.Power = 0) then |
6270 |
begin |
|
| 7053 | 6271 |
StopSoundChan(Gear^.SoundChannel); |
|
12672
c98179b00740
Fix short sound breakdown shortly after using time box
Wuzzy <almikes@aol.com>
parents:
12656
diff
changeset
|
6272 |
Gear^.SoundChannel:= -1; |
| 5710 | 6273 |
if HH^.GearHidden = nil then |
6274 |
begin |
|
6275 |
DeleteGear(Gear); |
|
6276 |
exit |
|
6277 |
end; |
|
| 5706 | 6278 |
Gear^.Pos:= 4; |
6279 |
// This condition might need tweaking |
|
|
8632
b5ed76d2a1f9
Make hogs thaw only on enemy turns, make timebox counter decrement only on your turn, adjust knock for frozen hogs, increase damage on frozen hogs, make freezer fuel only reduce when not adjusting angle.
nemo
parents:
8628
diff
changeset
|
6280 |
Gear^.Timer:= GetRandom(cHedgehogTurnTime*TeamsCount)+cHedgehogTurnTime |
| 5706 | 6281 |
end; |
6282 |
||
6283 |
if (Gear^.Pos = 4) then |
|
6284 |
begin |
|
6285 |
cnt:= 0; |
|
6286 |
for j:= 0 to Pred(HH^.Team^.Clan^.TeamsNumber) do |
|
| 9470 | 6287 |
with HH^.Team^.Clan^.Teams[j]^ do |
6288 |
for i:= 0 to Pred(HedgehogsNumber) do |
|
6289 |
if (Hedgehogs[i].Gear <> nil) |
|
6290 |
and ((Hedgehogs[i].Gear^.State and gstDrowning) = 0) |
|
6291 |
and (Hedgehogs[i].Gear^.Health > Hedgehogs[i].Gear^.Damage) then |
|
6292 |
inc(cnt); |
|
| 5706 | 6293 |
if (cnt = 0) or SuddenDeathDmg or (Gear^.Timer = 0) then |
|
5197
9fa96377a69c
Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
nemo
parents:
5186
diff
changeset
|
6294 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6295 |
if HH^.GearHidden <> nil then |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6556
diff
changeset
|
6296 |
FindPlace(HH^.GearHidden, false, 0, LAND_WIDTH,true); |
| 8795 | 6297 |
|
| 6131 | 6298 |
if HH^.GearHidden <> nil then |
|
5197
9fa96377a69c
Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
nemo
parents:
5186
diff
changeset
|
6299 |
begin |
| 5738 | 6300 |
Gear^.X:= HH^.GearHidden^.X; |
6301 |
Gear^.Y:= HH^.GearHidden^.Y; |
|
|
7092
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6302 |
end; |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6303 |
Gear^.Timer:= 0; |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6304 |
|
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6305 |
if (HH^.GearHidden <> nil) and (cnt = 0) then // do an emergency jump back in this case. the team needs you! |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6306 |
begin |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6307 |
AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtExplosion); |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6308 |
Gear^.Pos:= 2; |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6309 |
Gear^.Power:= 255; |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6310 |
end |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6311 |
else begin |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6312 |
Gear^.SoundChannel := LoopSound(sndTardis); |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6313 |
Gear^.Pos:= 1; |
|
c9ca770fd7fc
Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival
nemo
parents:
7068
diff
changeset
|
6314 |
Gear^.Power:= 0; |
| 5706 | 6315 |
end |
|
5197
9fa96377a69c
Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
nemo
parents:
5186
diff
changeset
|
6316 |
end |
|
8632
b5ed76d2a1f9
Make hogs thaw only on enemy turns, make timebox counter decrement only on your turn, adjust knock for frozen hogs, increase damage on frozen hogs, make freezer fuel only reduce when not adjusting angle.
nemo
parents:
8628
diff
changeset
|
6317 |
else if (CurrentHedgehog^.Team^.Clan = Gear^.Hedgehog^.Team^.Clan) then dec(Gear^.Timer) |
| 5706 | 6318 |
end; |
6319 |
||
6320 |
end; |
|
6321 |
||
6322 |
procedure doStepTardis(Gear: PGear); |
|
|
12712
31f7e0a31736
AI player checks if it can use tardis before selecting it
Wuzzy <almikes@aol.com>
parents:
12700
diff
changeset
|
6323 |
var HH: PHedgehog; |
| 5706 | 6324 |
begin |
6325 |
HH:= Gear^.Hedgehog; |
|
|
12712
31f7e0a31736
AI player checks if it can use tardis before selecting it
Wuzzy <almikes@aol.com>
parents:
12700
diff
changeset
|
6326 |
if (not CanUseTardis(HH^.Gear)) then |
|
31f7e0a31736
AI player checks if it can use tardis before selecting it
Wuzzy <almikes@aol.com>
parents:
12700
diff
changeset
|
6327 |
begin |
|
31f7e0a31736
AI player checks if it can use tardis before selecting it
Wuzzy <almikes@aol.com>
parents:
12700
diff
changeset
|
6328 |
HH^.Gear^.Message := HH^.Gear^.Message and (not gmAttack); |
|
31f7e0a31736
AI player checks if it can use tardis before selecting it
Wuzzy <almikes@aol.com>
parents:
12700
diff
changeset
|
6329 |
HH^.Gear^.State:= HH^.Gear^.State and (not gstAttacking); |
|
5715
59a8dd33f274
Restore gear ASAP, add denied sound for illegal activation without wasting ammo.
nemo
parents:
5710
diff
changeset
|
6330 |
PlaySound(sndDenied); |
|
12712
31f7e0a31736
AI player checks if it can use tardis before selecting it
Wuzzy <almikes@aol.com>
parents:
12700
diff
changeset
|
6331 |
DeleteGear(Gear); |
| 5706 | 6332 |
exit |
|
12712
31f7e0a31736
AI player checks if it can use tardis before selecting it
Wuzzy <almikes@aol.com>
parents:
12700
diff
changeset
|
6333 |
end; |
| 5728 | 6334 |
Gear^.SoundChannel := LoopSound(sndTardis); |
| 5706 | 6335 |
Gear^.doStep:= @doStepTardisWarp |
|
5197
9fa96377a69c
Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
nemo
parents:
5186
diff
changeset
|
6336 |
end; |
|
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
6337 |
|
|
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
6338 |
//////////////////////////////////////////////////////////////////////////////// |
|
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5298
diff
changeset
|
6339 |
|
| 7007 | 6340 |
(* |
|
14593
34e810295d08
Remove a bunch of dead out-commented code
Wuzzy <Wuzzy2@mail.ru>
parents:
14591
diff
changeset
|
6341 |
The ice gun has the following effects: |
|
34e810295d08
Remove a bunch of dead out-commented code
Wuzzy <Wuzzy2@mail.ru>
parents:
14591
diff
changeset
|
6342 |
A "ray" like a deagle is projected out from the gun. |
| 8795 | 6343 |
All these effects assume the ray's angle is not changed and that the target type was unchanged over a number of ticks. This is a simplifying assumption for "gun was applying freezing effect to the same target". |
| 7007 | 6344 |
* When fired at water a layer of ice textured land is added above the water. |
|
8751
4609823efc94
More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places.
nemo
parents:
8744
diff
changeset
|
6345 |
* When fired at non-ice land (land and lfLandMask and not lfIce) the land is overlaid with a thin layer of ice textured land around that point (say, 1 or 2px into land, 1px above). For attractiveness, a slope would probably be needed. |
| 11191 | 6346 |
* When fired at a hog (land and $00FF <> 0), while the hog is targetted, the hog's state is set to frozen. |
6347 |
As long as the gun is on the hog, a frozen hog sprite creeps up from the feet to the head. |
|
6348 |
If the effect is interrupted before reaching the top, the freezing state is cleared. |
|
6349 |
A frozen hog will animate differently. |
|
|
14593
34e810295d08
Remove a bunch of dead out-commented code
Wuzzy <Wuzzy2@mail.ru>
parents:
14591
diff
changeset
|
6350 |
Frozen hogs take less damage and are harder to push. |
| 11191 | 6351 |
This might make freezing potentially useful for friendlies in a bad position. |
6352 |
A frozen hog stays frozen for a certain number of turns. |
|
6353 |
Each turn the frozen overlay becomes fainter, until it fades and the hog animates normally again. |
|
| 7007 | 6354 |
*) |
| 8548 | 6355 |
|
6356 |
||
6357 |
procedure updateFuel(Gear: PGear); |
|
| 8795 | 6358 |
var |
| 8548 | 6359 |
t:LongInt; |
6360 |
begin |
|
6361 |
t:= Gear^.Health div 10; |
|
6362 |
if (t <> Gear^.Damage) and ((GameTicks and $3F) = 0) then |
|
6363 |
begin |
|
6364 |
Gear^.Damage:= t; |
|
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10597
diff
changeset
|
6365 |
FreeAndNilTexture(Gear^.Tex); |
| 13898 | 6366 |
Gear^.Tex := RenderStringTex(FormatA(trmsg[sidFuel], ansistring(inttostr(t))), |
|
13640
cb0191394133
Use full string for sidFuel and avoid string concatenation
Wuzzy <Wuzzy2@mail.ru>
parents:
13624
diff
changeset
|
6367 |
cWhiteColor, fntSmall) |
| 8548 | 6368 |
end; |
|
8934
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8924
diff
changeset
|
6369 |
if Gear^.Message and (gmUp or gmDown) <> 0 then |
|
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8924
diff
changeset
|
6370 |
begin |
| 14005 | 6371 |
if (Gear^.Tag <> 2) then |
6372 |
begin |
|
6373 |
StopSoundChan(Gear^.SoundChannel); |
|
6374 |
Gear^.SoundChannel:= LoopSound(sndIceBeamIdle); |
|
6375 |
Gear^.Tag:= 2; |
|
6376 |
end; |
|
|
8934
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8924
diff
changeset
|
6377 |
if GameTicks mod 40 = 0 then dec(Gear^.Health) |
|
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8924
diff
changeset
|
6378 |
end |
| 10015 | 6379 |
else |
| 9072 | 6380 |
begin |
| 14005 | 6381 |
if (Gear^.Tag <> 1) then |
6382 |
begin |
|
6383 |
StopSoundChan(Gear^.SoundChannel); |
|
6384 |
Gear^.SoundChannel:= LoopSound(sndIceBeam); |
|
6385 |
Gear^.Tag:= 1; |
|
6386 |
end; |
|
| 9072 | 6387 |
if GameTicks mod 10 = 0 then dec(Gear^.Health) |
6388 |
end |
|
| 8548 | 6389 |
end; |
6390 |
||
6391 |
||
6392 |
procedure updateTarget(Gear:PGear; newX, newY:HWFloat); |
|
6393 |
begin |
|
6394 |
with Gear^ do |
|
6395 |
begin |
|
6396 |
dX:= newX; |
|
6397 |
dY:= newY; |
|
6398 |
Pos:= 0; |
|
6399 |
Target.X:= NoPointX; |
|
6400 |
LastDamage:= nil; |
|
6401 |
X:= Hedgehog^.Gear^.X; |
|
6402 |
Y:= Hedgehog^.Gear^.Y; |
|
6403 |
end; |
|
6404 |
end; |
|
6405 |
||
| 7007 | 6406 |
procedure doStepIceGun(Gear: PGear); |
| 9145 | 6407 |
const iceWaitCollision = 0; |
6408 |
const iceCollideWithGround = 1; |
|
6409 |
const iceCollideWithWater = 5; |
|
6410 |
const groundFreezingTime = 1000; |
|
|
8601
7668f92734b8
Make refactoring. Remove DrawIce function
Urbertar@gmail.com
parents:
8599
diff
changeset
|
6411 |
const iceRadius = 32; |
| 8602 | 6412 |
const iceHeight = 40; |
| 7716 | 6413 |
var |
|
9026
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6414 |
HHGear, iter: PGear; |
|
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
6415 |
landRect: TSDL_Rect; |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6416 |
ndX, ndY: hwFloat; |
|
7128
574b385ce7df
Minor freezer changes, allow snow to accumulate on indestructible terrain too.
nemo
parents:
7101
diff
changeset
|
6417 |
i, t, gX, gY: LongInt; |
| 7335 | 6418 |
hogs: PGearArrayS; |
|
8934
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8924
diff
changeset
|
6419 |
vg: PVisualGear; |
| 7007 | 6420 |
begin |
| 7093 | 6421 |
HHGear := Gear^.Hedgehog^.Gear; |
| 9356 | 6422 |
if (Gear^.Message and gmAttack <> 0) or (Gear^.Health = 0) or (HHGear = nil) or ((HHGear^.State and gstHHDriven) = 0) or (HHGear^.dX.QWordValue > 4294967) then |
| 7093 | 6423 |
begin |
| 9072 | 6424 |
StopSoundChan(Gear^.SoundChannel); |
| 7093 | 6425 |
DeleteGear(Gear); |
6426 |
AfterAttack; |
|
6427 |
exit |
|
|
8934
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8924
diff
changeset
|
6428 |
end; |
|
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8924
diff
changeset
|
6429 |
updateFuel(Gear); |
|
14591
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6430 |
if (WorldEdge <> weBounce) then |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6431 |
if WorldWrap(Gear) and (WorldEdge = weWrap) and (Gear^.Target.X = NoPointX) then |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6432 |
// Use FlightTime to count number of times the gear has world-wrapped |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6433 |
inc(Gear^.FlightTime); |
| 8548 | 6434 |
|
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6435 |
with Gear^ do |
|
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6436 |
begin |
|
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6437 |
HedgehogChAngle(HHGear); |
| 7093 | 6438 |
ndX:= SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _4; |
6439 |
ndY:= -AngleCos(HHGear^.Angle) * _4; |
|
|
13995
4d0c80f7aa32
Fix freezer ray extending with low fuel usage when firing straight up/down while holding up/down key
Wuzzy <Wuzzy2@mail.ru>
parents:
13977
diff
changeset
|
6440 |
if (ndX <> dX) or (ndY <> dY) or (Gear^.Message and (gmUp or gmDown) <> 0) or |
| 13399 | 6441 |
(((Target.X <> NoPointX) and (Target.X and LAND_WIDTH_MASK = 0) and |
| 10582 | 6442 |
(Target.Y and LAND_HEIGHT_MASK = 0) and ((Land[Target.Y, Target.X] = 0)) and |
|
14591
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6443 |
(not CheckCoordInWater(Target.X, Target.Y))) and (CheckGearNear(gtAirMine, int2hwFloat(Target.X),int2hwFloat(Target.Y), Gear^.Radius*3, Gear^.Radius*3) = nil) and |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6444 |
(not ((WorldEdge = weBounce) and ((Target.X > rightX) or (Target.X < leftX))))) then |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6445 |
begin |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6446 |
updateTarget(Gear, ndX, ndY); |
|
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6447 |
Timer := iceWaitCollision; |
|
13572
a71e6856ffab
Fix freeze ray not working through wrap world edge; add DrawLineWrapped
Wuzzy <Wuzzy2@mail.ru>
parents:
13566
diff
changeset
|
6448 |
FlightTime := 0; |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6449 |
end |
|
14581
45c6c12c12e2
Fix wrong ice beam angle if it goes diagonally up out of map thru world wrap (bug 718)
Wuzzy <Wuzzy2@mail.ru>
parents:
14578
diff
changeset
|
6450 |
// Extend ice beam, unless it is far outside he map boundaries |
|
45c6c12c12e2
Fix wrong ice beam angle if it goes diagonally up out of map thru world wrap (bug 718)
Wuzzy <Wuzzy2@mail.ru>
parents:
14578
diff
changeset
|
6451 |
else if (not ((hwRound(X + dX) > max(LAND_WIDTH,4096)*2) or |
|
45c6c12c12e2
Fix wrong ice beam angle if it goes diagonally up out of map thru world wrap (bug 718)
Wuzzy <Wuzzy2@mail.ru>
parents:
14578
diff
changeset
|
6452 |
(hwRound(X + dX) < -max(LAND_WIDTH,4096)*2) or |
|
45c6c12c12e2
Fix wrong ice beam angle if it goes diagonally up out of map thru world wrap (bug 718)
Wuzzy <Wuzzy2@mail.ru>
parents:
14578
diff
changeset
|
6453 |
(hwRound(Y + dY) < -max(LAND_HEIGHT,4096)*2) or |
|
45c6c12c12e2
Fix wrong ice beam angle if it goes diagonally up out of map thru world wrap (bug 718)
Wuzzy <Wuzzy2@mail.ru>
parents:
14578
diff
changeset
|
6454 |
(hwRound(Y + dY) > max(LAND_HEIGHT,4096)+512))) then |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6455 |
begin |
|
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6456 |
X:= X + dX; |
|
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6457 |
Y:= Y + dY; |
| 7093 | 6458 |
gX:= hwRound(X); |
| 8795 | 6459 |
gY:= hwRound(Y); |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6460 |
if Target.X = NoPointX then t:= hwRound(hwSqr(X-HHGear^.X)+hwSqr(Y-HHGear^.Y)); |
| 8548 | 6461 |
|
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6462 |
if Target.X <> NoPointX then |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6463 |
begin |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6464 |
CheckCollision(Gear); |
|
13404
8ce83caec236
Make mine active/hunting glow a bit more obvious. Add frozen sprite, increase ice beam mine "hit" radius a bit
nemo
parents:
13403
diff
changeset
|
6465 |
if ((State and gstCollision) <> 0) or (CheckGearNear(gtAirMine, int2hwFloat(Target.X),int2hwFloat(Target.Y), Gear^.Radius*4, Gear^.Radius*4) <> nil) then |
| 8548 | 6466 |
begin |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6467 |
if Timer = iceWaitCollision then |
|
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6468 |
begin |
|
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6469 |
Timer := iceCollideWithGround; |
|
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6470 |
Power := GameTicks; |
|
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6471 |
end |
| 8795 | 6472 |
end |
| 10582 | 6473 |
else if CheckCoordInWater(Target.X, Target.Y) or |
6474 |
((Target.X and LAND_WIDTH_MASK = 0) and |
|
6475 |
(Target.Y and LAND_HEIGHT_MASK = 0) and |
|
6476 |
(Land[Target.Y, Target.X] = lfIce) and |
|
6477 |
((Target.Y+iceHeight+5 > cWaterLine) or |
|
6478 |
((WorldEdge = weSea) and |
|
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
6479 |
((Target.X+iceHeight+5 > rightX) or |
|
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
6480 |
(Target.X-iceHeight-5 < leftX)))) |
| 10582 | 6481 |
) then |
| 8602 | 6482 |
begin |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6483 |
if Timer = iceWaitCollision then |
| 8602 | 6484 |
begin |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6485 |
Timer := iceCollideWithWater; |
| 8795 | 6486 |
Power := GameTicks; |
| 8602 | 6487 |
end; |
| 8548 | 6488 |
end; |
6489 |
||
|
7098
f8c453ade379
Minor tweaks to freezer, mostly to simplify current state to laptop
nemo
parents:
7093
diff
changeset
|
6490 |
if (abs(gX-Target.X) < 2) and (abs(gY-Target.Y) < 2) then |
| 8602 | 6491 |
begin |
|
7098
f8c453ade379
Minor tweaks to freezer, mostly to simplify current state to laptop
nemo
parents:
7093
diff
changeset
|
6492 |
X:= HHGear^.X; |
|
f8c453ade379
Minor tweaks to freezer, mostly to simplify current state to laptop
nemo
parents:
7093
diff
changeset
|
6493 |
Y:= HHGear^.Y |
| 8602 | 6494 |
end; |
| 8548 | 6495 |
|
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6496 |
if (Timer = iceCollideWithGround) and ((GameTicks - Power) > groundFreezingTime) then |
| 8795 | 6497 |
begin |
|
9885
34e8880f1f0a
missed this in the merge. rejected the uGearsHandlersMess changes thinking they were all desyncing, but there was the function rename from uLandGraphics
nemo
parents:
9881
diff
changeset
|
6498 |
FillRoundInLandFT(target.x, target.y, iceRadius, icePixel); |
|
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
6499 |
landRect.x := min(max(target.x - iceRadius, 0), LAND_WIDTH - 1); |
|
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
6500 |
landRect.y := min(max(target.y - iceRadius, 0), LAND_HEIGHT - 1); |
|
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
6501 |
landRect.w := min(2*iceRadius, LAND_WIDTH - landRect.x - 1); |
|
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
6502 |
landRect.h := min(2*iceRadius, LAND_HEIGHT - landRect.y - 1); |
|
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
6503 |
UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true); |
| 10015 | 6504 |
|
|
9026
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6505 |
// Freeze nearby mines/explosives/cases too |
|
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6506 |
iter := GearsList; |
|
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6507 |
while iter <> nil do |
|
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6508 |
begin |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6509 |
if (iter^.State and gstFrozen = 0) and |
| 13399 | 6510 |
((iter^.Kind = gtExplosives) or (iter^.Kind = gtAirMine) or (iter^.Kind = gtCase) or (iter^.Kind = gtMine) or (iter^.Kind = gtSMine)) and |
|
14368
1dcc37b6913e
Fix freezer failing to freeze gears with negative coordinate
Wuzzy <Wuzzy2@mail.ru>
parents:
14367
diff
changeset
|
6511 |
(abs(hwRound(iter^.X) - target.x) + abs(hwRound(iter^.Y) - target.y) + 2 < 2 * iceRadius) |
| 9954 | 6512 |
and (Distance(iter^.X - int2hwFloat(target.x), iter^.Y - int2hwFloat(target.y)) < int2hwFloat(iceRadius * 2)) then |
|
9026
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6513 |
begin |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6514 |
for t:= 0 to 5 do |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6515 |
begin |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6516 |
vg:= AddVisualGear(hwRound(iter^.X)+random(4)-8, hwRound(iter^.Y)+random(8), vgtDust, 1); |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6517 |
if vg <> nil then |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6518 |
begin |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6519 |
i:= random(100) + 155; |
| 9145 | 6520 |
vg^.Tint:= (i shl 24) or (i shl 16) or ($FF shl 8) or (random(200) + 55); |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6521 |
vg^.Angle:= random(360); |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6522 |
vg^.dx:= 0.001 * random(80); |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6523 |
vg^.dy:= 0.001 * random(80) |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6524 |
end |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6525 |
end; |
|
9077
e8d9d94c122f
Waddaya think. Add it for iced up water and mines/cases/explosives
nemo
parents:
9076
diff
changeset
|
6526 |
PlaySound(sndHogFreeze); |
|
9026
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6527 |
if iter^.Kind = gtMine then // dud mine block |
|
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6528 |
begin |
| 9251 | 6529 |
iter^.State:= iter^.State or gstFrozen; |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6530 |
vg:= AddVisualGear(hwRound(iter^.X) - 4 + Random(8), hwRound(iter^.Y) - 4 - Random(4), vgtSmoke); |
|
9026
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6531 |
if vg <> nil then |
|
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6532 |
vg^.Scale:= 0.5; |
|
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6533 |
PlaySound(sndVaporize); |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6534 |
iter^.Health := 0; |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6535 |
iter^.Damage := 0; |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6536 |
iter^.State := iter^.State and (not gstAttacking) |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6537 |
end |
|
12300
6486a012987e
Make sticky mines fall off the map when frozen
Wuzzy <almikes@aol.com>
parents:
12299
diff
changeset
|
6538 |
else if iter^.Kind = gtSMine then // disabe sticky mine and drop it into the water |
|
12299
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
6539 |
begin |
|
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
6540 |
iter^.State:= iter^.State or gstFrozen; |
|
12300
6486a012987e
Make sticky mines fall off the map when frozen
Wuzzy <almikes@aol.com>
parents:
12299
diff
changeset
|
6541 |
iter^.CollisionMask:= 0; |
|
12299
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
6542 |
vg:= AddVisualGear(hwRound(iter^.X) - 2 + Random(4), hwRound(iter^.Y) - 2 - Random(2), vgtSmoke); |
|
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
6543 |
if vg <> nil then |
|
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
6544 |
vg^.Scale:= 0.4; |
|
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
6545 |
PlaySound(sndVaporize); |
|
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
6546 |
iter^.State := iter^.State and (not gstAttacking) |
|
6b25d117a904
Freezer allows to freeze sticky mines (currently only disables them)
Wuzzy <almikes@aol.com>
parents:
12292
diff
changeset
|
6547 |
end |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6548 |
else if iter^.Kind = gtCase then |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6549 |
begin |
|
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
9026
diff
changeset
|
6550 |
DeleteCI(iter); |
| 9251 | 6551 |
iter^.State:= iter^.State or gstFrozen; |
|
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9289
diff
changeset
|
6552 |
AddCI(iter) |
|
9026
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6553 |
end |
| 13399 | 6554 |
else if iter^.Kind = gtAirMine then |
6555 |
begin |
|
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6556 |
iter^.Damage:= 0; |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6557 |
iter^.State:= iter^.State or gstFrozen; |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6558 |
if (hwRound(iter^.X) < RightX-16) and (hwRound(iter^.X) > LeftX+16) and |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6559 |
(hwRound(iter^.Y) > topY+16) and (hwRound(iter^.Y) < LAND_HEIGHT-16) then |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6560 |
begin |
|
14367
22c91ac48d38
Do not call AddCI when air mine is frozen without creating land
Wuzzy <Wuzzy2@mail.ru>
parents:
14365
diff
changeset
|
6561 |
AddCI(iter); |
| 14577 | 6562 |
iter^.X:= int2hwFloat(min(RightX-16,max(hwRound(iter^.X), LeftX+16))); |
6563 |
iter^.Y:= int2hwFloat(min(LAND_HEIGHT-16,max(hwRound(iter^.Y),TopY+16))); |
|
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6564 |
ForcePlaceOnLand(hwRound(iter^.X)-16, hwRound(iter^.Y)-16, sprFrozenAirMine, 0, lfIce, $FFFFFFFF, false, false, false); |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6565 |
iter^.State:= iter^.State or gstInvisible |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6566 |
end |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6567 |
else |
| 14577 | 6568 |
begin |
6569 |
updateTarget(Gear, ndX, ndY); |
|
6570 |
FlightTime := 0; |
|
6571 |
Timer := iceWaitCollision; |
|
6572 |
Power := GameTicks; |
|
|
14379
1f87c7c2b151
Make sad Pas2C happy again (add missing parenthesis around a "not")
Wuzzy <Wuzzy2@mail.ru>
parents:
14368
diff
changeset
|
6573 |
iter^.State:= iter^.State and (not gstNoGravity) |
| 14577 | 6574 |
end |
| 13399 | 6575 |
end |
|
9045
6561c42399d3
sheepluva suggestion for frozen barrel behaviour. untested.
nemo
parents:
9043
diff
changeset
|
6576 |
else // gtExplosives |
| 9251 | 6577 |
begin |
6578 |
iter^.State:= iter^.State or gstFrozen; |
|
|
9045
6561c42399d3
sheepluva suggestion for frozen barrel behaviour. untested.
nemo
parents:
9043
diff
changeset
|
6579 |
iter^.Health:= iter^.Health + cBarrelHealth |
| 9251 | 6580 |
end |
|
9026
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6581 |
end; |
|
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6582 |
iter:= iter^.NextGear |
|
f6074540bab2
Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise.
nemo
parents:
8993
diff
changeset
|
6583 |
end; |
| 8795 | 6584 |
|
|
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
6585 |
SetAllHHToActive; |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6586 |
Timer := iceWaitCollision; |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6587 |
Power:= GameTicks |
| 8602 | 6588 |
end; |
6589 |
||
| 10411 | 6590 |
if (Timer = iceCollideWithWater) and ((GameTicks - Power) > groundFreezingTime div 2) then |
| 8795 | 6591 |
begin |
|
9077
e8d9d94c122f
Waddaya think. Add it for iced up water and mines/cases/explosives
nemo
parents:
9076
diff
changeset
|
6592 |
PlaySound(sndHogFreeze); |
| 10582 | 6593 |
if CheckCoordInWater(Target.X, Target.Y) then |
6594 |
DrawIceBreak(Target.X, Target.Y, iceRadius, iceHeight) |
|
6595 |
else if Target.Y+iceHeight+5 > cWaterLine then |
|
6596 |
DrawIceBreak(Target.X, Target.Y+iceHeight+5, iceRadius, iceHeight) |
|
|
14303
6015b74eea55
overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents:
14225
diff
changeset
|
6597 |
else if Target.X+iceHeight+5 > rightX then |
| 10582 | 6598 |
DrawIceBreak(Target.X+iceHeight+5, Target.Y, iceRadius, iceHeight) |
6599 |
else |
|
6600 |
DrawIceBreak(Target.X-iceHeight-5, Target.Y, iceRadius, iceHeight); |
|
| 8795 | 6601 |
SetAllHHToActive; |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6602 |
Timer := iceWaitCollision; |
| 8602 | 6603 |
end; |
|
7128
574b385ce7df
Minor freezer changes, allow snow to accumulate on indestructible terrain too.
nemo
parents:
7101
diff
changeset
|
6604 |
// freeze nearby hogs |
| 8560 | 6605 |
hogs := GearsNear(int2hwFloat(Target.X), int2hwFloat(Target.Y), gtHedgehog, Gear^.Radius*2); |
| 7335 | 6606 |
if hogs.size > 0 then |
6607 |
for i:= 0 to hogs.size - 1 do |
|
6608 |
if hogs.ar^[i] <> HHGear then |
|
| 8795 | 6609 |
if GameTicks mod 5 = 0 then |
|
8563
4d9d8287e601
Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster.
nemo
parents:
8560
diff
changeset
|
6610 |
begin |
| 8565 | 6611 |
hogs.ar^[i]^.Active:= true; |
6612 |
if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] < 256 then |
|
6613 |
hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] := hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] + 1 |
|
6614 |
else if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] = 256 then |
|
| 9073 | 6615 |
begin |
| 9059 | 6616 |
hogs.ar^[i]^.Hedgehog^.Effects[heFrozen]:= 200000-1;//cHedgehogTurnTime + cReadyDelay |
| 9073 | 6617 |
PlaySound(sndHogFreeze); |
6618 |
end; |
|
|
8563
4d9d8287e601
Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster.
nemo
parents:
8560
diff
changeset
|
6619 |
end; |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6620 |
inc(Pos) |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6621 |
end |
| 10582 | 6622 |
else if (t > 400) and (CheckCoordInWater(gX, gY) or |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6623 |
(((gX and LAND_WIDTH_MASK = 0) and (gY and LAND_HEIGHT_MASK = 0)) |
|
7128
574b385ce7df
Minor freezer changes, allow snow to accumulate on indestructible terrain too.
nemo
parents:
7101
diff
changeset
|
6624 |
and (Land[gY, gX] <> 0))) then |
|
8812
fdac638c6f9a
oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear
nemo
parents:
8795
diff
changeset
|
6625 |
begin |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6626 |
Target.X:= gX; |
|
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6627 |
Target.Y:= gY; |
| 7093 | 6628 |
X:= HHGear^.X; |
6629 |
Y:= HHGear^.Y |
|
| 13399 | 6630 |
end |
|
14591
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6631 |
else if (WorldEdge = weBounce) and ((gX > rightX) or (gX < leftX)) then |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6632 |
begin |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6633 |
Target.X:= gX; |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6634 |
Target.Y:= gY; |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6635 |
X:= HHGear^.X; |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6636 |
Y:= HHGear^.Y |
|
0da43a3d5500
Properly stop freezeray at bounce edge (instead of restarting the ray over and over again)
Wuzzy <Wuzzy2@mail.ru>
parents:
14589
diff
changeset
|
6637 |
end |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6638 |
else |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6639 |
begin |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6640 |
iter:= CheckGearNear(Gear, gtAirMine, Gear^.Radius*2, Gear^.Radius*2); |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6641 |
if (iter <> nil) and (iter^.State <> gstFrozen) then |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6642 |
begin |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6643 |
Target.X:= gX; |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6644 |
Target.Y:= gY; |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6645 |
X:= HHGear^.X; |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6646 |
Y:= HHGear^.Y |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6647 |
end |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6648 |
end; |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6649 |
end |
|
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7007
diff
changeset
|
6650 |
end; |
| 7007 | 6651 |
end; |
|
7389
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6652 |
|
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6653 |
procedure doStepAddAmmo(Gear: PGear); |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6654 |
var a: TAmmoType; |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6655 |
gi: PGear; |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6656 |
begin |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6657 |
if Gear^.Timer > 0 then dec(Gear^.Timer) |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6658 |
else |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6659 |
begin |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6660 |
CheckSum:= CheckSum xor GameTicks; |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6661 |
gi := GearsList; |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6662 |
while gi <> nil do |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6663 |
begin |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6664 |
with gi^ do CheckSum:= CheckSum xor X.round xor X.frac xor dX.round xor dX.frac xor Y.round xor Y.frac xor dY.round xor dY.frac; |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6665 |
AddRandomness(CheckSum); |
|
13214
9c81e34f1933
gtGenericFaller: Use Tag=1 to allow gtGenericFaller to be displaced randomly. Otherwise it is left alone
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
6666 |
if (gi^.Kind = gtGenericFaller) and (gi^.Tag = 1) then |
|
9c81e34f1933
gtGenericFaller: Use Tag=1 to allow gtGenericFaller to be displaced randomly. Otherwise it is left alone
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
6667 |
gi^.State:= gi^.State and (not gstTmpFlag); |
|
7389
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6668 |
gi := gi^.NextGear |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6669 |
end; |
| 13285 | 6670 |
if Gear^.Pos = posCaseUtility then |
6671 |
a:= GetUtility(Gear^.Hedgehog) |
|
6672 |
else a:= GetAmmo(Gear^.Hedgehog); |
|
|
7389
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6673 |
AddPickup(Gear^.Hedgehog^, a, Gear^.Power, hwRound(Gear^.X), hwRound(Gear^.Y)); |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6674 |
DeleteGear(Gear) |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6675 |
end; |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6676 |
end; |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6677 |
|
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6678 |
procedure doStepGenericFaller(Gear: PGear); |
|
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6679 |
begin |
|
7406
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
6680 |
if Gear^.Timer < $FFFFFFFF then |
|
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
6681 |
if Gear^.Timer > 0 then |
|
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
6682 |
dec(Gear^.Timer) |
|
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
6683 |
else |
|
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
6684 |
begin |
|
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
6685 |
DeleteGear(Gear); |
|
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
6686 |
exit |
|
1fe2c821f9bf
Try avoiding spamming the log by retaining the gears. untested.
nemo
parents:
7400
diff
changeset
|
6687 |
end; |
|
8030
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6688 |
if (Gear^.State and gstTmpFlag <> 0) or (GameTicks and $7 = 0) then |
|
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6689 |
begin |
|
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6690 |
doStepFallingGear(Gear); |
| 14307 | 6691 |
if (Gear^.Tag = 1) and (GameTicks and $FF = 0) and (hwRound(Gear^.X) < leftX) or (hwRound(Gear^.X) > rightX) or (hwRound(Gear^.Y) < topY) then |
|
8030
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6692 |
begin |
|
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6693 |
Gear^.X:= int2hwFloat(GetRandom(rightX-leftX)+leftX); |
|
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6694 |
Gear^.Y:= int2hwFloat(GetRandom(LAND_HEIGHT-topY)+topY); |
|
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6695 |
Gear^.dX:= _90-(GetRandomf*_360); |
|
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6696 |
Gear^.dY:= _90-(GetRandomf*_360) |
|
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6697 |
end; |
|
165aeaaaf445
Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.
nemo
parents:
8003
diff
changeset
|
6698 |
end |
|
7389
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7370
diff
changeset
|
6699 |
end; |
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6700 |
|
|
13872
f01798038c2e
Rename amDuck and related symbols to amCreeper, gtCreeper, etc.
Wuzzy <Wuzzy2@mail.ru>
parents:
13871
diff
changeset
|
6701 |
// TODO: Finish creeper implementation |
| 7627 | 6702 |
procedure doStepCreeper(Gear: PGear); |
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6703 |
var i,t,targDist,tmpDist: LongWord; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6704 |
targ, tmpG: PGear; |
|
13613
d6b79a080a3e
Remove unused variables of creeper handler
Wuzzy <Wuzzy2@mail.ru>
parents:
13610
diff
changeset
|
6705 |
tX, tY: hwFloat; |
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6706 |
vg: PVisualGear; |
| 7627 | 6707 |
begin |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6708 |
targ:= nil; |
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6709 |
doStepFallingGear(Gear); |
|
14362
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6710 |
if (Gear^.State and gstFrozen) <> 0 then |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6711 |
begin |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6712 |
if Gear^.Damage > 0 then |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6713 |
begin |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6714 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6715 |
DeleteGear(Gear) |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6716 |
end; |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6717 |
exit |
|
d5317635f368
fix bounds check, make out of bounds air mines fall since there's no land to check them into
nemo
parents:
14361
diff
changeset
|
6718 |
end; |
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6719 |
if (TurnTimeLeft = 0) or (Gear^.Angle = 0) or (Gear^.Hedgehog = nil) or (Gear^.Hedgehog^.Gear = nil) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6720 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6721 |
Gear^.Hedgehog:= nil; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6722 |
targ:= nil; |
| 7627 | 6723 |
end |
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6724 |
else if Gear^.Hedgehog <> nil then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6725 |
targ:= Gear^.Hedgehog^.Gear; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6726 |
if (targ <> nil) and ((GameTicks and $3F) = 0) and (TestCollisionYKick(Gear, 1) <> 0) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6727 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6728 |
vg:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeWhite); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6729 |
if vg <> nil then vg^.Tint:= $FF0000FF; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6730 |
if (Gear^.X < targ^.X) then // need to add collision checks to avoid walking off edges or getting too close to obstacles where jumping is needed |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6731 |
if (WorldEdge = weWrap) and ((targ^.X - Gear^.X) > ((Gear^.X - int2hwFloat(LeftX)) + (int2hwFloat(RightX) - targ^.X))) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6732 |
Gear^.dX:= -cLittle |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6733 |
else |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6734 |
Gear^.dX:= cLittle |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6735 |
else if (Gear^.X > targ^.X) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6736 |
if (WorldEdge = weWrap) and ((Gear^.X - targ^.X) > ((targ^.X - int2hwFloat(LeftX)) + (int2hwFloat(RightX) - Gear^.X))) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6737 |
Gear^.dX:= cLittle |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6738 |
else |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6739 |
Gear^.dX:= -cLittle; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6740 |
if (GetRandom(30) = 0) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6741 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6742 |
Gear^.dY := -_0_15; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6743 |
Gear^.dX:= SignAs(_0_15, Gear^.dX); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6744 |
end; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6745 |
MakeHedgehogsStep(Gear); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6746 |
end; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6747 |
if (TurnTimeLeft = 0) and ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) > _0_02.QWordValue) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6748 |
AllInactive := false; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6749 |
|
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6750 |
if targ <> nil then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6751 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6752 |
tX:=Gear^.X-targ^.X; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6753 |
tY:=Gear^.Y-targ^.Y; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6754 |
// allow escaping - should maybe flag this too |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6755 |
if (GameTicks > Gear^.FlightTime+10000) or |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6756 |
((tX.Round+tY.Round > Gear^.Angle*6) and |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6757 |
(hwRound(hwSqr(tX) + hwSqr(tY)) > sqr(Gear^.Angle*6))) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6758 |
targ:= nil |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6759 |
end; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6760 |
|
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6761 |
// If in ready timer, or after turn, or in first 5 seconds of turn (really a window due to extra time utility) |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6762 |
// or mine is inactive due to lack of gsttmpflag or hunting is disabled due to seek radius of 0 |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6763 |
// then we aren't hunting |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6764 |
if (ReadyTimeLeft > 0) or (TurnTimeLeft = 0) or |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6765 |
((TurnTimeLeft < cHedgehogTurnTime) and (cHedgehogTurnTime-TurnTimeLeft < 5000)) or |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6766 |
(Gear^.State and gsttmpFlag = 0) or |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6767 |
(Gear^.Angle = 0) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6768 |
gear^.State:= gear^.State and (not gstChooseTarget) |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6769 |
else if |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6770 |
// todo, allow not finding new target, set timeout on target retention |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6771 |
(Gear^.State and gstAttacking = 0) and |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6772 |
((GameTicks and $FF) = 17) and |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6773 |
(GameTicks > Gear^.FlightTime) then // recheck hunted hog |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6774 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6775 |
gear^.State:= gear^.State or gstChooseTarget; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6776 |
if targ <> nil then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6777 |
targDist:= Distance(Gear^.X-targ^.X,Gear^.Y-targ^.Y).Round |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6778 |
else targDist:= 0; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6779 |
for t:= 0 to Pred(TeamsCount) do |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6780 |
with TeamsArray[t]^ do |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6781 |
for i:= 0 to cMaxHHIndex do |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6782 |
if Hedgehogs[i].Gear <> nil then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6783 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6784 |
tmpG:= Hedgehogs[i].Gear; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6785 |
tX:=Gear^.X-tmpG^.X; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6786 |
tY:=Gear^.Y-tmpG^.Y; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6787 |
if (Gear^.Angle = $FFFFFFFF) or |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6788 |
((tX.Round+tY.Round < Gear^.Angle) and |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6789 |
(hwRound(hwSqr(tX) + hwSqr(tY)) < sqr(Gear^.Angle))) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6790 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6791 |
if targ <> nil then tmpDist:= Distance(tX,tY).Round; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6792 |
if (targ = nil) or (tmpDist < targDist) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6793 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6794 |
if targ = nil then targDist:= Distance(tX,tY).Round |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6795 |
else targDist:= tmpDist; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6796 |
Gear^.Hedgehog:= @Hedgehogs[i]; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6797 |
targ:= tmpG; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6798 |
end |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6799 |
end |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6800 |
end; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6801 |
if targ <> nil then Gear^.FlightTime:= GameTicks + 5000 |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6802 |
end; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6803 |
|
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6804 |
if ((Gear^.State and gsttmpFlag) <> 0) and (Gear^.Health <> 0) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6805 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6806 |
if ((Gear^.State and gstAttacking) = 0) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6807 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6808 |
if ((GameTicks and $1F) = 0) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6809 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6810 |
if targ <> nil then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6811 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6812 |
tX:=Gear^.X-targ^.X; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6813 |
tY:=Gear^.Y-targ^.Y; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6814 |
if (tX.Round+tY.Round < Gear^.Boom) and |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6815 |
(hwRound(hwSqr(tX) + hwSqr(tY)) < sqr(Gear^.Boom)) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6816 |
Gear^.State := Gear^.State or gstAttacking |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6817 |
end |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6818 |
else if (Gear^.Angle > 0) and (CheckGearNear(Gear, gtHedgehog, Gear^.Boom, Gear^.Boom) <> nil) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6819 |
Gear^.State := Gear^.State or gstAttacking |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6820 |
end |
| 7627 | 6821 |
end |
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6822 |
else // gstAttacking <> 0 |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6823 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6824 |
AllInactive := false; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6825 |
if (Gear^.Timer and $1FF) = 0 then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6826 |
PlaySound(sndVaporize); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6827 |
if Gear^.Timer = 0 then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6828 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6829 |
// recheck |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6830 |
if targ <> nil then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6831 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6832 |
tX:=Gear^.X-targ^.X; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6833 |
tY:=Gear^.Y-targ^.Y; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6834 |
if (tX.Round+tY.Round < Gear^.Boom) and |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6835 |
(hwRound(hwSqr(tX) + hwSqr(tY)) < sqr(Gear^.Boom)) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6836 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6837 |
Gear^.Hedgehog:= CurrentHedgehog; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6838 |
tmpG:= FollowGear; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6839 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6840 |
FollowGear:= tmpG; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6841 |
DeleteGear(Gear); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6842 |
exit |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6843 |
end |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6844 |
end |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6845 |
else if (Gear^.Angle > 0) and (CheckGearNear(Gear, gtHedgehog, Gear^.Boom, Gear^.Boom) <> nil) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6846 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6847 |
Gear^.Hedgehog:= CurrentHedgehog; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6848 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6849 |
DeleteGear(Gear); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6850 |
exit |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6851 |
end; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6852 |
Gear^.State:= Gear^.State and (not gstAttacking); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6853 |
Gear^.Timer:= Gear^.WDTimer |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6854 |
end; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6855 |
if Gear^.Timer > 0 then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6856 |
dec(Gear^.Timer); |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6857 |
end |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6858 |
end |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6859 |
else // gsttmpFlag = 0 |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6860 |
if (TurnTimeLeft = 0) |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6861 |
or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6862 |
or (CurrentHedgehog^.Gear = nil) then |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6863 |
begin |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6864 |
Gear^.FlightTime:= GameTicks; |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6865 |
Gear^.State := Gear^.State or gsttmpFlag |
|
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6866 |
end |
| 7627 | 6867 |
end; |
|
13605
422d6062620a
hijack the duck for an attempted resurrection of the creeper. initial pass.
nemo
parents:
13604
diff
changeset
|
6868 |
|
|
7730
2013733f9ca9
A bit more on the knife. Also add missing files to CMakeLists
nemo
parents:
7729
diff
changeset
|
6869 |
//////////////////////////////////////////////////////////////////////////////// |
| 7754 | 6870 |
procedure doStepKnife(Gear: PGear); |
| 8370 | 6871 |
var a: real; |
| 7754 | 6872 |
begin |
6873 |
// Gear is shrunk so it can actually escape the hog without carving into the terrain |
|
|
13470
7b4643ff60ea
Refactor collision mask checks, remove hardcoded numbers
Wuzzy <Wuzzy2@mail.ru>
parents:
13469
diff
changeset
|
6874 |
if (Gear^.Radius = 4) and (Gear^.CollisionMask = lfAll) then Gear^.Radius:= 7; |
|
7872
ab6db9e07c4d
Allow cleavers to be knocked loose by explosions. Probabilities might need tweaking.
nemo
parents:
7864
diff
changeset
|
6875 |
if Gear^.Damage > 100 then Gear^.CollisionMask:= 0 |
|
7874
c8aba48f38dc
Arbitrarily tweaked to not firepunch loose, and to increase chance of bazooka doing it to about 20%
nemo
parents:
7872
diff
changeset
|
6876 |
else if Gear^.Damage > 30 then |
|
c8aba48f38dc
Arbitrarily tweaked to not firepunch loose, and to increase chance of bazooka doing it to about 20%
nemo
parents:
7872
diff
changeset
|
6877 |
if GetRandom(max(4,18-Gear^.Damage div 10)) < 3 then Gear^.CollisionMask:= 0; |
|
7872
ab6db9e07c4d
Allow cleavers to be knocked loose by explosions. Probabilities might need tweaking.
nemo
parents:
7864
diff
changeset
|
6878 |
Gear^.Damage:= 0; |
| 7759 | 6879 |
if Gear^.Timer > 0 then dec(Gear^.Timer); |
| 7754 | 6880 |
if (Gear^.State and gstMoving <> 0) and (Gear^.State and gstCollision = 0) then |
6881 |
begin |
|
6882 |
DeleteCI(Gear); |
|
|
8494
53b91a602955
Cleaver tweaks based on feedback. Nerf damage, shrink radius. This means cleaver will embed into ground quite a bit further.
nemo
parents:
8413
diff
changeset
|
6883 |
Gear^.Radius:= 7; |
| 7754 | 6884 |
// used for damage and impact calc. needs balancing I think |
|
11468
2f6f8baa2a97
Make weapon damage in most cases be a structure value and also expose it to lua. Needs testing/review due to conditions at time of doing this (w/ one arm, dizzy/tingling due to sodium citrate), and just number of places changed..
nemo
parents:
11391
diff
changeset
|
6885 |
Gear^.Health:= hwRound(hwSqr((hwAbs(Gear^.dY)+hwAbs(Gear^.dX))*Gear^.Boom/10000)); |
| 7754 | 6886 |
doStepFallingGear(Gear); |
6887 |
AllInactive := false; |
|
|
7864
667b7583c389
double cleaver rotation speed, also make spin direction dX dependent.
nemo
parents:
7829
diff
changeset
|
6888 |
a:= Gear^.DirAngle; |
|
667b7583c389
double cleaver rotation speed, also make spin direction dX dependent.
nemo
parents:
7829
diff
changeset
|
6889 |
CalcRotationDirAngle(Gear); |
|
667b7583c389
double cleaver rotation speed, also make spin direction dX dependent.
nemo
parents:
7829
diff
changeset
|
6890 |
Gear^.DirAngle:= a+(Gear^.DirAngle-a)*2*hwSign(Gear^.dX) // double rotation |
| 7754 | 6891 |
end |
| 7759 | 6892 |
else if (Gear^.CollisionIndex = -1) and (Gear^.Timer = 0) then |
| 7754 | 6893 |
begin |
|
11765
10860d4bca22
Add sound effects for: cleaver impact, air mine impact, using extra time
Wuzzy <almikes@aol.com>
parents:
11553
diff
changeset
|
6894 |
if Gear^.Health > 0 then |
|
10860d4bca22
Add sound effects for: cleaver impact, air mine impact, using extra time
Wuzzy <almikes@aol.com>
parents:
11553
diff
changeset
|
6895 |
PlaySound(Gear^.ImpactSound); |
|
10860d4bca22
Add sound effects for: cleaver impact, air mine impact, using extra time
Wuzzy <almikes@aol.com>
parents:
11553
diff
changeset
|
6896 |
|
|
7784
cf6261f7fdb5
Disable jiggling of cleavers 'cause it just looks odd. Adding a constraint based on proximity to portal is an option too, this was just easier.
nemo
parents:
7777
diff
changeset
|
6897 |
Gear^.DirAngle:= DxDy2Angle(Gear^.dX, Gear^.dY) + (random(30)-15); |
|
7758
a225cc45513e
Remove slot overcrowding, disable angle detection which isn't doing what I want.
nemo
parents:
7754
diff
changeset
|
6898 |
if (Gear^.dX.isNegative and Gear^.dY.isNegative) or |
|
a225cc45513e
Remove slot overcrowding, disable angle detection which isn't doing what I want.
nemo
parents:
7754
diff
changeset
|
6899 |
((not Gear^.dX.isNegative) and (not Gear^.dY.isNegative)) then Gear^.DirAngle:= Gear^.DirAngle-90; |
| 7754 | 6900 |
Gear^.dX:= _0; |
6901 |
Gear^.dY:= _0; |
|
6902 |
Gear^.State:= Gear^.State and (not gstMoving) or gstCollision; |
|
|
8494
53b91a602955
Cleaver tweaks based on feedback. Nerf damage, shrink radius. This means cleaver will embed into ground quite a bit further.
nemo
parents:
8413
diff
changeset
|
6903 |
Gear^.Radius:= 16; |
| 7754 | 6904 |
if Gear^.Health > 0 then AmmoShove(Gear, Gear^.Health, 0); |
6905 |
Gear^.Health:= 0; |
|
| 7759 | 6906 |
Gear^.Timer:= 500; |
|
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9289
diff
changeset
|
6907 |
AddCI(Gear) |
| 7754 | 6908 |
end |
6909 |
else if GameTicks and $3F = 0 then |
|
6910 |
begin |
|
|
9706
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
6911 |
if (TestCollisionYwithGear(Gear,-1) = 0) |
|
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
6912 |
and (TestCollisionXwithGear(Gear, 1) = 0) |
|
5178d2263521
return land word from uCollisions to make decisions based on it. Should be handy for trampoline.
nemo
parents:
9698
diff
changeset
|
6913 |
and (TestCollisionXwithGear(Gear,-1) = 0) |
| 7754 | 6914 |
and (TestCollisionYwithGear(Gear, 1) = 0) then Gear^.State:= Gear^.State and (not gstCollision) or gstMoving; |
6915 |
end |
|
6916 |
end; |
|
| 12192 | 6917 |
|
6918 |
//////////////////////////////////////////////////////////////////////////////// |
|
| 12898 | 6919 |
procedure doStepMinigunWork(Gear: PGear); |
6920 |
var HHGear: PGear; |
|
6921 |
bullet: PGear; |
|
6922 |
rx, ry: hwFloat; |
|
6923 |
gX, gY: LongInt; |
|
6924 |
begin |
|
6925 |
AllInactive:= false; |
|
6926 |
HHGear := Gear^.Hedgehog^.Gear; |
|
6927 |
if HHGear = nil then |
|
6928 |
begin |
|
6929 |
ClearHitOrder(); |
|
6930 |
DeleteGear(gear); |
|
6931 |
exit |
|
6932 |
end; |
|
6933 |
||
6934 |
HedgehogChAngle(HHGear); |
|
6935 |
||
6936 |
dec(Gear^.Timer); |
|
6937 |
if (Gear^.Timer mod 50) = 0 then |
|
6938 |
begin |
|
6939 |
Gear^.Tag := ((Gear^.Tag - 1) and 1) + 2; |
|
6940 |
||
6941 |
gX := hwRound(Gear^.X) + GetLaunchX(amMinigun, hwSign(HHGear^.dX), HHGear^.Angle); |
|
6942 |
gY := hwRound(Gear^.Y) + GetLaunchY(amMinigun, HHGear^.Angle); |
|
6943 |
rx := rndSign(getRandomf * _0_2); |
|
6944 |
ry := rndSign(getRandomf * _0_2); |
|
6945 |
||
6946 |
bullet:= AddGear(gx, gy, gtMinigunBullet, 0, SignAs(AngleSin(HHGear^.Angle) * _0_8, HHGear^.dX) + rx, AngleCos(HHGear^.Angle) * ( - _0_8) + ry, 0); |
|
|
13469
f1d349a52bc7
Refactor: lfCurrentHog→lfCurHogCrate, lfNotCurrentMask→lfNotCurHogCrate
Wuzzy <Wuzzy2@mail.ru>
parents:
13408
diff
changeset
|
6947 |
bullet^.CollisionMask:= lfNotCurHogCrate; |
| 12898 | 6948 |
bullet^.WDTimer := Gear^.WDTimer; |
6949 |
Inc(Gear^.WDTimer); |
|
6950 |
||
|
13147
7040506c831f
Fix direction of dispensed bullet shells from shotgun/sniper/minigun
alfadur
parents:
13140
diff
changeset
|
6951 |
CreateShellForGear(Gear, Gear^.Tag and 1); |
| 12898 | 6952 |
end; |
6953 |
||
6954 |
if (Gear^.Timer = 0) or ((HHGear^.State and gstHHDriven) = 0) then |
|
6955 |
begin |
|
| 13323 | 6956 |
if (HHGear^.State and gstHHDriven) = 0 then |
6957 |
StopSound(sndMinigun); |
|
| 12898 | 6958 |
HHGear^.State := HHGear^.State and (not gstNotKickable); |
6959 |
ClearHitOrder(); |
|
6960 |
DeleteGear(Gear); |
|
6961 |
AfterAttack |
|
6962 |
end |
|
6963 |
end; |
|
6964 |
||
6965 |
procedure doStepMinigun(Gear: PGear); |
|
6966 |
var HHGear: PGear; |
|
6967 |
begin |
|
6968 |
dec(Gear^.Timer); |
|
6969 |
if (Gear^.Timer mod 100) = 0 then |
|
6970 |
Gear^.Tag := (Gear^.Tag + 1) and 1; |
|
6971 |
||
6972 |
if Gear^.Timer = 0 then |
|
6973 |
begin |
|
6974 |
Gear^.Tag := 2; |
|
6975 |
HHGear := Gear^.Hedgehog^.Gear; |
|
6976 |
HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown)); |
|
6977 |
HHGear^.State := HHGear^.State or gstNotKickable; |
|
6978 |
||
|
13154
44351ea57b71
Minigun: Move attack timer to Karma to make gear type more Lua-friendly
Wuzzy <Wuzzy2@mail.ru>
parents:
13153
diff
changeset
|
6979 |
Gear^.Timer := Gear^.Karma; |
| 12898 | 6980 |
Gear^.WDTimer := 0; // Order of the next bullet; |
6981 |
ClearHitOrder(); |
|
6982 |
Gear^.doStep := @doStepMinigunWork |
|
6983 |
end; |
|
6984 |
end; |
|
6985 |
||
6986 |
//////////////////////////////////////////////////////////////////////////////// |
|
6987 |
||
6988 |
procedure doStepMinigunBullet(Gear: PGear); |
|
6989 |
begin |
|
6990 |
Gear^.Data:= nil; |
|
6991 |
// remember who fired this |
|
6992 |
if (Gear^.Hedgehog <> nil) and (Gear^.Hedgehog^.Gear <> nil) then |
|
6993 |
Gear^.Data:= Pointer(Gear^.Hedgehog^.Gear); |
|
6994 |
||
6995 |
Gear^.X := Gear^.X + Gear^.dX * 2; |
|
6996 |
Gear^.Y := Gear^.Y + Gear^.dY * 2; |
|
|
13151
deab88f1f6f7
Improve appearance of bullet trails, slight fade out at beginning
alfadur
parents:
13147
diff
changeset
|
6997 |
Gear^.FlightTime := 0; |
| 12898 | 6998 |
Gear^.doStep := @doStepBulletWork |
6999 |
end; |
|
7000 |
||
| 9285 | 7001 |
end. |