Skip to content

Commit e8ce0ec

Browse files
skymyjskymyj
authored
Merge pull request #1769 from techannihilation/skymyj-branch-nov
Fix velocity for all Ground AA Missiles.
2 parents ceb80e8 + 0ff24a5 commit e8ce0ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+277
-242
lines changed

‎scripts/corsam.bos‎

Lines changed: 47 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
piece base, body, turret, Rlauncher, fire1, fire2, fire3,
77
fire4, Llauncher, fire5, fire6, fire7, fire8, turrettop;
88

9-
static-var gun_1, Static_Var_2, Static_Var_3, Static_Var_4, bAiming;
9+
static-var gun_1, gun_2, Static_Var_2, Static_Var_3, Static_Var_4, bAiming;
1010

1111
// Signal definitions
12-
#define SIG_AIM 2
12+
#define SIG_AIM_1 2
13+
#define SIG_AIM_2 4
1314

1415

1516
SmokeUnit(healthpercent, sleeptime, smoketype)
@@ -49,6 +50,7 @@ SmokeUnit(healthpercent, sleeptime, smoketype)
4950
Create()
5051
{
5152
gun_1 = 1;
53+
gun_2 = 1;
5254
start-script SmokeUnit();
5355
}
5456

@@ -80,19 +82,23 @@ QueryPrimary(piecenum)
8082
{
8183
piecenum = fire4;
8284
}
83-
if( gun_1 == 5 )
85+
}
86+
87+
QuerySecondary(piecenum)
88+
{
89+
if( gun_2 == 1 )
8490
{
8591
piecenum = fire5;
8692
}
87-
if( gun_1 == 6 )
93+
if( gun_2 == 2 )
8894
{
8995
piecenum = fire6;
9096
}
91-
if( gun_1 == 7 )
97+
if( gun_2 == 3 )
9298
{
9399
piecenum = fire7;
94100
}
95-
if( gun_1 == 8 )
101+
if( gun_2 == 4 )
96102
{
97103
piecenum = fire8;
98104
}
@@ -103,10 +109,15 @@ AimFromPrimary(piecenum)
103109
piecenum = turret;
104110
}
105111

112+
AimFromSecondary(piecenum)
113+
{
114+
piecenum = turret;
115+
}
116+
106117
AimPrimary(heading, pitch)
107118
{
108-
signal SIG_AIM;
109-
set-signal-mask SIG_AIM;
119+
signal SIG_AIM_1;
120+
set-signal-mask SIG_AIM_1;
110121
turn turret to y-axis heading speed <245.000000>;
111122
turn Llauncher to x-axis <0.000000> - pitch speed <185.000000>;
112123
turn Rlauncher to x-axis <0.000000> - pitch speed <185.000000>;
@@ -116,6 +127,15 @@ AimPrimary(heading, pitch)
116127
return (1);
117128
}
118129

130+
AimSecondary(heading, pitch)
131+
{
132+
signal SIG_AIM_2;
133+
set-signal-mask SIG_AIM_2;
134+
wait-for-turn turret around y-axis;
135+
wait-for-turn Rlauncher around x-axis;
136+
return (1);
137+
}
138+
/*
119139
FirePrimary()
120140
{
121141

@@ -146,6 +166,25 @@ FirePrimary()
146166
return (0);
147167
}
148168
}
169+
*/
170+
171+
FirePrimary()
172+
{
173+
174+
if(gun_1 == 5)
175+
{
176+
gun_1 = 1;
177+
}
178+
}
179+
180+
FireSecondary()
181+
{
182+
183+
if(gun_2 == 5)
184+
{
185+
gun_2 = 1;
186+
}
187+
}
149188

150189
SweetSpot(piecenum)
151190
{

‎scripts/corsam.cob‎

-1 Bytes
Binary file not shown.

‎units/armaak.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,15 @@ return {
174174
soundhitwetvolume = 0.6,
175175
soundstart = "rocklit1",
176176
soundstartvolume = 7.5,
177-
startvelocity = 600,
177+
startvelocity = 900,
178178
texture1 = "null",
179179
texture2 = "armsmoketrail",
180180
texture3 = "null",
181181
texture4 = "null",
182-
tolerance = 9000,
183182
tracks = true,
184183
turnrate = 63000,
185184
turret = true,
186-
weaponacceleration = 200,
185+
weaponacceleration = 300,
187186
weapontimer = 2,
188187
weapontype = "MissileLauncher",
189188
weaponvelocity = 1200,

‎units/armaas.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ return {
138138
impulsefactor = 0.123,
139139
metalpershot = 0,
140140
model = "weapon_missile.s3o",
141-
name = "AA2Missile",
141+
name = "AA Missile",
142142
noselfdamage = true,
143143
range = 850,
144144
reloadtime = 0.5,
@@ -149,7 +149,7 @@ return {
149149
soundhitwetvolume = 0.6,
150150
soundstart = "packolau",
151151
soundtrigger = true,
152-
startvelocity = 600,
152+
startvelocity = 900,
153153
texture1 = "null",
154154
texture2 = "armsmoketrail",
155155
texture3 = "null",
@@ -158,7 +158,7 @@ return {
158158
tracks = true,
159159
turnrate = 68000,
160160
turret = true,
161-
weaponacceleration = 200,
161+
weaponacceleration = 300,
162162
weapontimer = 2,
163163
weapontype = "MissileLauncher",
164164
weaponvelocity = 1200,

‎units/armah.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,15 @@ return {
149149
soundhitwet = "splshbig",
150150
soundhitwetvolume = 0.6,
151151
soundstart = "rockhvy2",
152-
startvelocity = 600,
152+
startvelocity = 900,
153153
texture1 = "null",
154154
texture2 = "armsmoketrail",
155155
texture3 = "null",
156156
texture4 = "null",
157-
tolerance = 10000,
158157
tracks = true,
159158
turnrate = 63000,
160159
turret = true,
161-
weaponacceleration = 200,
160+
weaponacceleration = 300,
162161
weapontimer = 2,
163162
weapontype = "MissileLauncher",
164163
weaponvelocity = 1200,

‎units/armamph.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ return {
146146
soundhitwet = "splshbig",
147147
soundhitwetvolume = 0.6,
148148
soundstart = "rocklit1",
149-
startvelocity = 600,
149+
startvelocity = 900,
150150
texture1 = "null",
151151
texture2 = "armsmoketrail",
152152
texture3 = "null",
@@ -155,7 +155,7 @@ return {
155155
tracks = true,
156156
turnrate = 48000,
157157
turret = true,
158-
weaponacceleration = 200,
158+
weaponacceleration = 300,
159159
weapontimer = 2,
160160
weapontype = "MissileLauncher",
161161
weaponvelocity = 1200,

‎units/armbc.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,26 +203,26 @@ return {
203203
firestarter = 70,
204204
metalpershot = 0,
205205
model = "weapon_missile.s3o",
206-
name = "Missiles",
206+
name = "AA Missiles",
207207
range = 900,
208208
reloadtime = 0.25,
209209
smoketrail = false,
210210
soundhitdry = "xplomed2",
211211
soundhitwet = "splshbig",
212212
soundhitwetvolume = 0.6,
213213
soundstart = "rockhvy2",
214-
startvelocity = 470,
214+
startvelocity = 900,
215215
texture1 = "null",
216216
texture2 = "armsmoketrail",
217217
texture3 = "null",
218218
texture4 = "null",
219219
tracks = true,
220220
turnrate = 50000,
221221
turret = true,
222-
weaponacceleration = 154,
222+
weaponacceleration = 300,
223223
weapontimer = 1,
224224
weapontype = "MissileLauncher",
225-
weaponvelocity = 660,
225+
weaponvelocity = 1200,
226226
damage = {
227227
areoship = 75,
228228
default = 5,

‎units/armchimera.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ return {
143143
impulsefactor = 0.123,
144144
metalpershot = 0,
145145
model = "weapon_missile.s3o",
146-
name = "Missiles",
146+
name = "AA Missiles",
147147
noselfdamage = true,
148148
range = 600,
149149
reloadtime = 2,
@@ -153,15 +153,15 @@ return {
153153
soundhitwet = "splshbig",
154154
soundhitwetvolume = 0.6,
155155
soundstart = "rocklit1",
156-
startvelocity = 600,
156+
startvelocity = 900,
157157
texture1 = "null",
158158
texture2 = "armsmoketrail",
159159
texture3 = "null",
160160
texture4 = "null",
161161
tracks = true,
162162
turnrate = 48000,
163163
turret = true,
164-
weaponacceleration = 200,
164+
weaponacceleration = 300,
165165
weapontimer = 2,
166166
weapontype = "MissileLauncher",
167167
weaponvelocity = 1200,

‎units/armcir.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ return {
120120
},
121121
},
122122
weapondefs = {
123-
arm_cir2 = {
123+
arm_cir = {
124124
areaofeffect = 64,
125125
avoidfeature = false,
126126
burnblow = true,
@@ -136,7 +136,7 @@ return {
136136
impulseboost = 0.123,
137137
impulsefactor = 0.123,
138138
model = "weapon_missile.s3o",
139-
name = "ExplosiveRockets",
139+
name = "AA Missile",
140140
noselfdamage = true,
141141
proximitypriority = -1,
142142
range = 1045,
@@ -147,15 +147,15 @@ return {
147147
soundhitwetvolume = 0.6,
148148
soundstart = "rocklit1",
149149
soundtrigger = true,
150-
startvelocity = 600,
150+
startvelocity = 900,
151151
texture1 = "null",
152152
texture2 = "armsmoketrail",
153153
texture3 = "null",
154154
texture4 = "null",
155155
tracks = true,
156156
turnrate = 55000,
157157
turret = true,
158-
weaponacceleration = 200,
158+
weaponacceleration = 300,
159159
weapontimer = 3,
160160
weapontype = "MissileLauncher",
161161
weaponvelocity = 1200,
@@ -169,7 +169,7 @@ return {
169169
weapons = {
170170
[1] = {
171171
badtargetcategory = "MINOR MAJOR FIGHTER", --Ground AA
172-
def = "ARM_CIR2",
172+
def = "ARM_CIR",
173173
onlytargetcategory = "VTOL",
174174
},
175175
},

‎units/armeak.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ return {
163163
impulseboost = 0,
164164
impulsefactor = 0,
165165
model = "weapon_missile.s3o",
166-
name = "Missiles",
166+
name = "AA Missile",
167167
noselfdamage = true,
168168
range = 1000,
169169
reloadtime = 0.2,
@@ -175,12 +175,12 @@ return {
175175
soundhitwetvolume = 0.6,
176176
soundstart = "rocklit1",
177177
soundstartvolume = 7.5,
178-
startvelocity = 600,
178+
startvelocity = 900,
179179
texture2 = "coresmoketrail",
180180
tracks = true,
181181
turnrate = 36000,
182182
turret = true,
183-
weaponacceleration = 200,
183+
weaponacceleration = 300,
184184
weapontimer = 2,
185185
weapontype = "MissileLauncher",
186186
weaponvelocity = 1200,

0 commit comments

Comments
 (0)