Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit c1bbb3d

Browse files
garethyrgarethyr
authored
Merge pull request #21 from cortex-command-community/attachable-collisions-followup
Attachable Collisions Followup
2 parents d52dc03 + 19c0395 commit c1bbb3d

File tree

62 files changed

+129
-18
lines changed

Some content is hidden

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

62 files changed

+129
-18
lines changed

‎Base.rte/Actors/Mecha/Medic/MedicDrone.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ AddEffect = Attachable
2929
Mass = 25
3030
HitsMOs = 1
3131
GetsHitByMOs = 1
32+
CollidesWithTerrainWhenAttached = 1
3233
SpriteFile = ContentFile
3334
FilePath = Base.rte/Actors/Mecha/Medic/DroneTop.bmp
3435
FrameCount = 1

‎Base.rte/Actors/Shared/Hats/Hats.ini

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AddEffect = Attachable
77
Mass = 3
88
HitsMOs = 0
99
GetsHitByMOs = 1
10+
CollidesWithTerrainWhenAttached = 1
1011
SpriteFile = ContentFile
1112
FilePath = Base.rte/Actors/Shared/Hats/hat_topper.bmp
1213
FrameCount = 1
@@ -34,6 +35,7 @@ AddEffect = Attachable
3435
Mass = 3
3536
HitsMOs = 0
3637
GetsHitByMOs = 1
38+
CollidesWithTerrainWhenAttached = 1
3739
SpriteFile = ContentFile
3840
FilePath = Base.rte/Actors/Shared/Hats/hat_tyrant.bmp
3941
FrameCount = 1
@@ -63,14 +65,14 @@ AddEffect = Attachable
6365
Mass = 3
6466
HitsMOs = 0
6567
GetsHitByMOs = 1
68+
CollidesWithTerrainWhenAttached = 1
6669
SpriteFile = ContentFile
6770
FilePath = Base.rte/Actors/Shared/Hats/hat_runner.bmp
6871
FrameCount = 1
6972
SpriteOffset = Vector
7073
X = -11
7174
Y = -11
7275
AngularVel = 6
73-
7476
AtomGroup = AtomGroup
7577
AutoGenerate = 1
7678
Material = Material
@@ -91,14 +93,14 @@ AddEffect = Attachable
9193
Mass = 3
9294
HitsMOs = 0
9395
GetsHitByMOs = 1
96+
CollidesWithTerrainWhenAttached = 1
9497
SpriteFile = ContentFile
9598
FilePath = Base.rte/Actors/Shared/Hats/face_bonk.bmp
9699
FrameCount = 1
97100
SpriteOffset = Vector
98101
X = -14
99102
Y = -6
100103
AngularVel = 6
101-
102104
AtomGroup = AtomGroup
103105
AutoGenerate = 1
104106
Material = Material
@@ -119,14 +121,14 @@ AddEffect = Attachable
119121
Mass = 3
120122
HitsMOs = 0
121123
GetsHitByMOs = 1
124+
CollidesWithTerrainWhenAttached = 1
122125
SpriteFile = ContentFile
123126
FilePath = Base.rte/Actors/Shared/Hats/face_shades.bmp
124127
FrameCount = 1
125128
SpriteOffset = Vector
126129
X = -17
127130
Y = -3
128131
AngularVel = 6
129-
130132
AtomGroup = AtomGroup
131133
AutoGenerate = 1
132134
Material = Material
@@ -147,14 +149,14 @@ AddEffect = Attachable
147149
Mass = 3
148150
HitsMOs = 0
149151
GetsHitByMOs = 1
152+
CollidesWithTerrainWhenAttached = 1
150153
SpriteFile = ContentFile
151154
FilePath = Base.rte/Actors/Shared/Hats/hat_bregade.bmp
152155
FrameCount = 1
153156
SpriteOffset = Vector
154157
X = -15
155158
Y = -7
156159
AngularVel = 6
157-
158160
AtomGroup = AtomGroup
159161
AutoGenerate = 1
160162
Material = Material
@@ -175,14 +177,14 @@ AddEffect = Attachable
175177
Mass = 3
176178
HitsMOs = 0
177179
GetsHitByMOs = 1
180+
CollidesWithTerrainWhenAttached = 1
178181
SpriteFile = ContentFile
179182
FilePath = Base.rte/Actors/Shared/Hats/hat_captain.bmp
180183
FrameCount = 1
181184
SpriteOffset = Vector
182185
X = -16
183186
Y = -8
184187
AngularVel = 6
185-
186188
AtomGroup = AtomGroup
187189
AutoGenerate = 1
188190
Material = Material
@@ -203,14 +205,14 @@ AddEffect = Attachable
203205
Mass = 3
204206
HitsMOs = 0
205207
GetsHitByMOs = 1
208+
CollidesWithTerrainWhenAttached = 1
206209
SpriteFile = ContentFile
207210
FilePath = Base.rte/Actors/Shared/Hats/hat_dogger.bmp
208211
FrameCount = 1
209212
SpriteOffset = Vector
210213
X = -16
211214
Y = -13
212215
AngularVel = 6
213-
214216
AtomGroup = AtomGroup
215217
AutoGenerate = 1
216218
Material = Material
@@ -231,14 +233,14 @@ AddEffect = Attachable
231233
Mass = 3
232234
HitsMOs = 0
233235
GetsHitByMOs = 1
236+
CollidesWithTerrainWhenAttached = 1
234237
SpriteFile = ContentFile
235238
FilePath = Base.rte/Actors/Shared/Hats/hat_fez.bmp
236239
FrameCount = 1
237240
SpriteOffset = Vector
238241
X = -10
239242
Y = -7
240243
AngularVel = 6
241-
242244
AtomGroup = AtomGroup
243245
AutoGenerate = 1
244246
Material = Material
@@ -259,6 +261,7 @@ AddEffect = Attachable
259261
Mass = 3
260262
HitsMOs = 0
261263
GetsHitByMOs = 1
264+
CollidesWithTerrainWhenAttached = 1
262265
SpriteFile = ContentFile
263266
FilePath = Base.rte/Actors/Shared/Hats/hat_football.bmp
264267
EntryWound = AEmitter
@@ -268,7 +271,6 @@ AddEffect = Attachable
268271
X = -11
269272
Y = -18
270273
AngularVel = 6
271-
272274
AtomGroup = AtomGroup
273275
AutoGenerate = 1
274276
Material = Material
@@ -289,14 +291,14 @@ AddEffect = Attachable
289291
Mass = 3
290292
HitsMOs = 0
291293
GetsHitByMOs = 1
294+
CollidesWithTerrainWhenAttached = 1
292295
SpriteFile = ContentFile
293296
FilePath = Base.rte/Actors/Shared/Hats/hat_masters.bmp
294297
FrameCount = 1
295298
SpriteOffset = Vector
296299
X = -11
297300
Y = -6
298301
AngularVel = 6
299-
300302
AtomGroup = AtomGroup
301303
AutoGenerate = 1
302304
Material = Material
@@ -317,14 +319,14 @@ AddEffect = Attachable
317319
Mass = 3
318320
HitsMOs = 0
319321
GetsHitByMOs = 1
322+
CollidesWithTerrainWhenAttached = 1
320323
SpriteFile = ContentFile
321324
FilePath = Base.rte/Actors/Shared/Hats/hat_mirror.bmp
322325
FrameCount = 1
323326
SpriteOffset = Vector
324327
X = -13
325328
Y = -6
326329
AngularVel = 6
327-
328330
AtomGroup = AtomGroup
329331
AutoGenerate = 1
330332
Material = Material
@@ -345,6 +347,7 @@ AddEffect = Attachable
345347
Mass = 3
346348
HitsMOs = 0
347349
GetsHitByMOs = 1
350+
CollidesWithTerrainWhenAttached = 1
348351
SpriteFile = ContentFile
349352
FilePath = Base.rte/Actors/Shared/Hats/hat_pan.bmp
350353
FrameCount = 1
@@ -354,7 +357,6 @@ AddEffect = Attachable
354357
X = -15
355358
Y = -7
356359
AngularVel = 6
357-
358360
AtomGroup = AtomGroup
359361
AutoGenerate = 1
360362
Material = Material
@@ -375,14 +377,14 @@ AddEffect = Attachable
375377
Mass = 3
376378
HitsMOs = 0
377379
GetsHitByMOs = 1
380+
CollidesWithTerrainWhenAttached = 1
378381
SpriteFile = ContentFile
379382
FilePath = Base.rte/Actors/Shared/Hats/hat_pith.bmp
380383
FrameCount = 1
381384
SpriteOffset = Vector
382385
X = -13
383386
Y = -11
384387
AngularVel = 6
385-
386388
AtomGroup = AtomGroup
387389
AutoGenerate = 1
388390
Material = Material
@@ -403,6 +405,7 @@ AddEffect = Attachable
403405
Mass = 3
404406
HitsMOs = 0
405407
GetsHitByMOs = 1
408+
CollidesWithTerrainWhenAttached = 1
406409
SpriteFile = ContentFile
407410
FilePath = Base.rte/Actors/Shared/Hats/hat_stash.bmp
408411
EntryWound = AEmitter
@@ -412,7 +415,6 @@ AddEffect = Attachable
412415
X = -11
413416
Y = -8
414417
AngularVel = 6
415-
416418
AtomGroup = AtomGroup
417419
AutoGenerate = 1
418420
Material = Material
@@ -433,6 +435,7 @@ AddEffect = Attachable
433435
Mass = 3
434436
HitsMOs = 0
435437
GetsHitByMOs = 1
438+
CollidesWithTerrainWhenAttached = 1
436439
SpriteFile = ContentFile
437440
FilePath = Base.rte/Actors/Shared/Hats/hat_tarvish.bmp
438441
EntryWound = AEmitter
@@ -442,7 +445,6 @@ AddEffect = Attachable
442445
X = -10
443446
Y = -10
444447
AngularVel = 6
445-
446448
AtomGroup = AtomGroup
447449
AutoGenerate = 1
448450
Material = Material
@@ -463,14 +465,14 @@ AddEffect = Attachable
463465
Mass = 3
464466
HitsMOs = 0
465467
GetsHitByMOs = 1
468+
CollidesWithTerrainWhenAttached = 1
466469
SpriteFile = ContentFile
467470
FilePath = Base.rte/Actors/Shared/Hats/hat_toque.bmp
468471
FrameCount = 1
469472
SpriteOffset = Vector
470473
X = -16
471474
Y = -14
472475
AngularVel = 6
473-
474476
AtomGroup = AtomGroup
475477
AutoGenerate = 1
476478
Material = Material
@@ -491,14 +493,14 @@ AddEffect = Attachable
491493
Mass = 3
492494
HitsMOs = 0
493495
GetsHitByMOs = 1
496+
CollidesWithTerrainWhenAttached = 1
494497
SpriteFile = ContentFile
495498
FilePath = Base.rte/Actors/Shared/Hats/hat_texas.bmp
496499
FrameCount = 1
497500
SpriteOffset = Vector
498501
X = -12
499502
Y = -8
500503
AngularVel = 6
501-
502504
AtomGroup = AtomGroup
503505
AutoGenerate = 1
504506
Material = Material
@@ -519,14 +521,14 @@ AddEffect = Attachable
519521
Mass = 3
520522
HitsMOs = 0
521523
GetsHitByMOs = 1
524+
CollidesWithTerrainWhenAttached = 1
522525
SpriteFile = ContentFile
523526
FilePath = Base.rte/Actors/Shared/Hats/hat_slug.bmp
524527
FrameCount = 1
525528
SpriteOffset = Vector
526529
X = -6
527530
Y = -3
528531
AngularVel = 6
529-
530532
AtomGroup = AtomGroup
531533
AutoGenerate = 1
532534
Material = Material
@@ -547,14 +549,14 @@ AddEffect = Attachable
547549
Mass = 3
548550
HitsMOs = 0
549551
GetsHitByMOs = 1
552+
CollidesWithTerrainWhenAttached = 1
550553
SpriteFile = ContentFile
551554
FilePath = Base.rte/Actors/Shared/Hats/hat_apple.bmp
552555
FrameCount = 1
553556
SpriteOffset = Vector
554557
X = -13
555558
Y = -8
556559
AngularVel = 6
557-
558560
AtomGroup = AtomGroup
559561
AutoGenerate = 1
560562
Material = Material

‎Base.rte/Craft/DropShips/DropshipMK1.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,6 +1402,19 @@ AddActor = Attachable
14021402
SpriteOffset = Vector
14031403
X = -18
14041404
Y = -16
1405+
AtomGroup = AtomGroup
1406+
AutoGenerate = 1
1407+
Material = Material
1408+
CopyOf = Military Stuff
1409+
Resolution = 10
1410+
Depth = 0
1411+
DeepGroup = AtomGroup
1412+
AutoGenerate = 1
1413+
Material = Material
1414+
CopyOf = Military Stuff
1415+
Resolution = 10
1416+
Depth = 2
1417+
DeepCheck = 1
14051418
JointOffset = Vector
14061419
X = -18
14071420
Y = -38

‎Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayer.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ AddAmmo = Magazine
6161
Mass = 10
6262
HitsMOs = 0
6363
GetsHitByMOs = 0
64+
CollidesWithTerrainWhenAttached = 1
6465
SpriteFile = ContentFile
6566
FilePath = Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayerMagazine.bmp
6667
FrameCount = 1

‎Base.rte/Devices/Tools/Constructor/Constructor.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ AddAmmo = Magazine
493493
Mass = 5
494494
HitsMOs = 0
495495
GetsHitByMOs = 0
496+
CollidesWithTerrainWhenAttached = 1
496497
SpriteFile = ContentFile
497498
FilePath = Base.rte/Devices/Tools/Constructor/ConstructorMagazine.bmp
498499
FrameCount = 1

‎Base.rte/Devices/Tools/Digger/Digger.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ AddAmmo = Magazine
167167
Mass = 5
168168
HitsMOs = 0
169169
GetsHitByMOs = 0
170+
CollidesWithTerrainWhenAttached = 1
170171
SpriteFile = ContentFile
171172
FilePath = Base.rte/Devices/Tools/Digger/LightDiggerMagazine.bmp
172173
FrameCount = 1
@@ -209,6 +210,7 @@ AddAmmo = Magazine
209210
Mass = 5
210211
HitsMOs = 0
211212
GetsHitByMOs = 0
213+
CollidesWithTerrainWhenAttached = 1
212214
SpriteFile = ContentFile
213215
FilePath = Base.rte/Devices/Tools/Digger/MediumDiggerMagazine.bmp
214216
FrameCount = 1
@@ -251,6 +253,7 @@ AddAmmo = Magazine
251253
Mass = 5
252254
HitsMOs = 0
253255
GetsHitByMOs = 0
256+
CollidesWithTerrainWhenAttached = 1
254257
SpriteFile = ContentFile
255258
FilePath = Base.rte/Devices/Tools/Digger/HeavyDiggerMagazine.bmp
256259
FrameCount = 1

‎Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ AddAmmo = Magazine
107107
Mass = 0
108108
HitsMOs = 0
109109
GetsHitByMOs = 0
110+
CollidesWithTerrainWhenAttached = 1
110111
SpriteFile = ContentFile
111112
FilePath = Base.rte/Devices/Tools/GrappleGun/Claw001.bmp
112113
FrameCount = 1

‎Base.rte/Devices/Tools/Repeller/Repeller.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ AddAmmo = Magazine
3535
Mass = 2
3636
HitsMOs = 0
3737
GetsHitByMOs = 0
38+
CollidesWithTerrainWhenAttached = 1
3839
SpriteFile = ContentFile
3940
FilePath = Base.rte/Devices/Tools/Repeller/RepellerMagazine.bmp
4041
FrameCount = 1

‎Base.rte/Devices/Weapons/BattleRifle/BattleRifle.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AddAmmo = Magazine
77
Mass = 2
88
HitsMOs = 0
99
GetsHitByMOs = 0
10+
CollidesWithTerrainWhenAttached = 1
1011
SpriteFile = ContentFile
1112
FilePath = Base.rte/Devices/Weapons/BattleRifle/BattleRifleMagazine.bmp
1213
FrameCount = 1

0 commit comments

Comments
 (0)