Allow turrets to connect to walls in D2K. Fixes #5032.

This commit is contained in:
Paul Chote
2014-04-05 17:06:00 +13:00
parent 82ac8d8d80
commit 15c2930eeb
2 changed files with 50 additions and 120 deletions

View File

@@ -452,7 +452,7 @@ WALL:
BuildSounds: CHUNG.WAV BuildSounds: CHUNG.WAV
SellSounds: CHUNG.WAV SellSounds: CHUNG.WAV
Selectable: Selectable:
Bounds: 32,32 Bounds: 32,40,0,-8
Priority: 3 Priority: 3
-GivesBuildableArea: -GivesBuildableArea:
Health: Health:
@@ -462,7 +462,8 @@ WALL:
RevealsShroud: RevealsShroud:
Range: 8c0 Range: 8c0
RenderRangeCircle: RenderRangeCircle:
RenderBuilding: -RenderBuilding:
RenderBuildingWall:
HasMakeAnimation: false HasMakeAnimation: false
BodyOrientation: BodyOrientation:
QuantizedFacings: 32 QuantizedFacings: 32
@@ -473,7 +474,7 @@ WALL:
InitialFacing: 128 InitialFacing: 128
Armament: Armament:
Weapon: TurretGun Weapon: TurretGun
LocalOffset: 448,0,128 LocalOffset: 672,0,480
MuzzleSequence: muzzle MuzzleSequence: muzzle
AttackTurreted: AttackTurreted:
AutoTarget: AutoTarget:
@@ -502,7 +503,7 @@ WALL:
BuildSounds: CHUNG.WAV BuildSounds: CHUNG.WAV
SellSounds: CHUNG.WAV SellSounds: CHUNG.WAV
Selectable: Selectable:
Bounds: 32,32 Bounds: 32,40,0,-8
Priority: 3 Priority: 3
-GivesBuildableArea: -GivesBuildableArea:
Health: Health:
@@ -512,14 +513,15 @@ WALL:
RevealsShroud: RevealsShroud:
Range: 10c0 Range: 10c0
RenderRangeCircle: RenderRangeCircle:
RenderBuilding: -RenderBuilding:
RenderBuildingWall:
HasMakeAnimation: false HasMakeAnimation: false
BodyOrientation: BodyOrientation:
QuantizedFacings: 32 QuantizedFacings: 32
WithTurret: WithTurret:
Armament: Armament:
Weapon: TowerMissile Weapon: TowerMissile
LocalOffset: 256,384,448, 256,-384,448 LocalOffset: 256,384,768, 256,-384,768
AttackTurreted: AttackTurreted:
Turreted: Turreted:
ROT: 8 ROT: 8

View File

@@ -13,18 +13,10 @@ walla:
Frames: 2527, 2530, 2528, 2538, 2531, 2532, 2542, 2535, 2529, 2539, 2533, 2534, 2540, 2536, 2537, 2541 Frames: 2527, 2530, 2528, 2538, 2531, 2532, 2542, 2535, 2529, 2539, 2533, 2534, 2540, 2536, 2537, 2541
Length: 16 Length: 16
Offset: -16,16 Offset: -16,16
scratched-idle: DATA
Frames: 2527, 2530, 2528, 2538, 2531, 2532, 2542, 2535, 2529, 2539, 2533, 2534, 2540, 2536, 2537, 2541
Length: 16
Offset: -16,16
damaged-idle: DATA damaged-idle: DATA
Frames: 2543, 2546, 2544, 2554, 2547, 2548, 2558, 2551, 2545, 2555, 2549, 2550, 2556, 2552, 2553, 2557 Frames: 2543, 2546, 2544, 2554, 2547, 2548, 2558, 2551, 2545, 2555, 2549, 2550, 2556, 2552, 2553, 2557
Length: 16 Length: 16
Offset: -16,16 Offset: -16,16
critical-idle: DATA
Frames: 2543, 2546, 2544, 2554, 2547, 2548, 2558, 2551, 2545, 2555, 2549, 2550, 2556, 2552, 2553, 2557
Length: 16
Offset: -16,16
icon: DATA icon: DATA
Start: 4063 Start: 4063
Offset: -30,-24 Offset: -30,-24
@@ -34,18 +26,10 @@ wallh:
Frames: 2687, 2690, 2688, 2698, 2691, 2692, 2702, 2695, 2689, 2699, 2693, 2694, 2700, 2696, 2697, 2701 Frames: 2687, 2690, 2688, 2698, 2691, 2692, 2702, 2695, 2689, 2699, 2693, 2694, 2700, 2696, 2697, 2701
Length: 16 Length: 16
Offset: -16,16 Offset: -16,16
scratched-idle: DATA
Frames: 2687, 2690, 2688, 2698, 2691, 2692, 2702, 2695, 2689, 2699, 2693, 2694, 2700, 2696, 2697, 2701
Length: 16
Offset: -16,16
damaged-idle: DATA damaged-idle: DATA
Frames: 2703, 2706, 2704, 2714, 2707, 2708, 2718, 2711, 2705, 2715, 2709, 2710, 2716, 2712, 2713, 2717 Frames: 2703, 2706, 2704, 2714, 2707, 2708, 2718, 2711, 2705, 2715, 2709, 2710, 2716, 2712, 2713, 2717
Length: 16 Length: 16
Offset: -16,16 Offset: -16,16
critical-idle: DATA
Frames: 2703, 2706, 2704, 2714, 2707, 2708, 2718, 2711, 2705, 2715, 2709, 2710, 2716, 2712, 2713, 2717
Length: 16
Offset: -16,16
icon: DATA icon: DATA
Start: 4064 Start: 4064
Offset: -30,-24 Offset: -30,-24
@@ -55,43 +39,27 @@ wallo:
Frames: 2847, 2850, 2848, 2858, 2851, 2852, 2862, 2855, 2849, 2859, 2853, 2854, 2860, 2856, 2857, 2861 Frames: 2847, 2850, 2848, 2858, 2851, 2852, 2862, 2855, 2849, 2859, 2853, 2854, 2860, 2856, 2857, 2861
Length: 16 Length: 16
Offset: -16,16 Offset: -16,16
scratched-idle: DATA
Frames: 2847, 2850, 2848, 2858, 2851, 2852, 2862, 2855, 2849, 2859, 2853, 2854, 2860, 2856, 2857, 2861
Length: 16
Offset: -16,16
damaged-idle: DATA damaged-idle: DATA
Frames: 2863, 2866, 2864, 2874, 2867, 2868, 2878, 2871, 2865, 2875, 2869, 2870, 2876, 2872, 2873, 2877 Frames: 2863, 2866, 2864, 2874, 2867, 2868, 2878, 2871, 2865, 2875, 2869, 2870, 2876, 2872, 2873, 2877
Length: 16 Length: 16
Offset: -16,16 Offset: -16,16
critical-idle: DATA
Frames: 2863, 2866, 2864, 2874, 2867, 2868, 2878, 2871, 2865, 2875, 2869, 2870, 2876, 2872, 2873, 2877
Length: 16
Offset: -16,16
icon: DATA icon: DATA
Start: 4065 Start: 4065
Offset: -30,-24 Offset: -30,-24
guntowera: guntowera:
idle: DATA idle: DATA
Start: 2573 Frames: 2573, 2576, 2574, 2584, 2577, 2578, 2588, 2581, 2575, 2585, 2579, 2580, 2586, 2582, 2583, 2587
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
recoil: DATA
Start: 2573
Facings: 1
Offset: -24,24
damaged-idle: DATA damaged-idle: DATA
Start: 2573 Frames: 2621, 2624, 2622, 2632, 2625, 2626, 2636, 2629, 2623, 2633, 2627, 2628, 2634, 2630, 2631, 2635
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
damaged-recoil: DATA
Start: 2573
Facings: 1
Offset: -24,24
turret: DATA turret: DATA
Start: 2589 Start: 2589
Facings: -32 Facings: -32
Offset: -24,24 Offset: -24,16
muzzle: DATA muzzle: DATA
Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806 Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
Facings: -32 Facings: -32
@@ -103,25 +71,17 @@ guntowera:
guntowerh: guntowerh:
idle: DATA idle: DATA
Start: 2733 Frames: 2733, 2736, 2734, 2744, 2737, 2738, 2748, 2741, 2735, 2745, 2739, 2740, 2746, 2742, 2743, 2747
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
recoil: DATA
Start: 2733
Facings: 1
Offset: -24,24
damaged-idle: DATA damaged-idle: DATA
Start: 2733 Frames: 2781, 2784, 2782, 2792, 2785, 2786, 2796, 2789, 2783, 2793, 2787, 2788, 2794, 2790, 2791, 2795
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
damaged-recoil: DATA
Start: 2733
Facings: 1
Offset: -24,24
turret: DATA turret: DATA
Start: 2749 Start: 2749
Facings: -32 Facings: -32
Offset: -24,24 Offset: -24,16
muzzle: DATA muzzle: DATA
Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806 Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
Facings: -32 Facings: -32
@@ -133,25 +93,17 @@ guntowerh:
guntowero: guntowero:
idle: DATA idle: DATA
Start: 2893 Frames: 2893, 2896, 2894, 2904, 2897, 2898, 2908, 2901, 2895, 2905, 2899, 2900, 2906, 2902, 2903, 2907
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
recoil: DATA
Start: 2893
Facings: 1
Offset: -24,24
damaged-idle: DATA damaged-idle: DATA
Start: 2893 Frames: 2941, 2944, 2942, 2952, 2945, 2946, 2956, 2949, 2943, 2953, 2947, 2948, 2954, 2950, 2951, 2955
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
damaged-recoil: DATA
Start: 2893
Facings: 1
Offset: -24,24
turret: DATA turret: DATA
Start: 2909 Start: 2909
Facings: -32 Facings: -32
Offset: -24,24 Offset: -24,16
muzzle: DATA muzzle: DATA
Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806 Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
Facings: -32 Facings: -32
@@ -163,75 +115,51 @@ guntowero:
rockettowera: rockettowera:
idle: DATA idle: DATA
Start: 2733 Frames: 2573, 2576, 2574, 2584, 2577, 2578, 2588, 2581, 2575, 2585, 2579, 2580, 2586, 2582, 2583, 2587
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
recoil: DATA
Start: 2733
Facings: 1
Offset: -24,24
damaged-idle: DATA damaged-idle: DATA
Start: 2733 Frames: 2621, 2624, 2622, 2632, 2625, 2626, 2636, 2629, 2623, 2633, 2627, 2628, 2634, 2630, 2631, 2635
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
damaged-recoil: DATA
Start: 2733
Facings: 1
Offset: -24,24
turret: DATA turret: DATA
Start: 2637 Start: 2637
Facings: -32 Facings: -32
Offset: -24,24 Offset: -24,16
icon: DATA icon: DATA
Start: 4075 Start: 4075
Offset: -30,-24 Offset: -30,-24
rockettowerh: rockettowerh:
idle: DATA idle: DATA
Start: 2781 Frames: 2733, 2736, 2734, 2744, 2737, 2738, 2748, 2741, 2735, 2745, 2739, 2740, 2746, 2742, 2743, 2747
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
recoil: DATA
Start: 2781
Facings: 1
Offset: -24,24
damaged-idle: DATA damaged-idle: DATA
Start: 2781 Frames: 2781, 2784, 2782, 2792, 2785, 2786, 2796, 2789, 2783, 2793, 2787, 2788, 2794, 2790, 2791, 2795
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
damaged-recoil: DATA
Start: 2781
Facings: 1
Offset: -24,24
turret: DATA turret: DATA
Start: 2797 Start: 2797
Facings: -32 Facings: -32
Offset: -24,24 Offset: -24,16
icon: DATA icon: DATA
Start: 4076 Start: 4076
Offset: -30,-24 Offset: -30,-24
rockettowero: rockettowero:
idle: DATA idle: DATA
Start: 2941 Frames: 2893, 2896, 2894, 2904, 2897, 2898, 2908, 2901, 2895, 2905, 2899, 2900, 2906, 2902, 2903, 2907
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
recoil: DATA
Start: 2941
Facings: 1
Offset: -24,24
damaged-idle: DATA damaged-idle: DATA
Start: 2941 Frames: 2941, 2944, 2942, 2952, 2945, 2946, 2956, 2949, 2943, 2953, 2947, 2948, 2954, 2950, 2951, 2955
Facings: 1 Length: 16
Offset: -24,24 Offset: -24,16
damaged-recoil: DATA
Start: 2941
Facings: 1
Offset: -24,24
turret: DATA turret: DATA
Start: 2957 Start: 2957
Facings: -32 Facings: -32
Offset: -24,24 Offset: -24,16
icon: DATA icon: DATA
Start: 4077 Start: 4077
Offset: -30,-24 Offset: -30,-24