|
1 | 1 | --- TX-Sector (Gottlieb 1988) SG1bsoN Mod V1.1.vbs.original |
2 | 2 | +++ TX-Sector (Gottlieb 1988) SG1bsoN Mod V1.1.vbs |
3 | | -@@ -809,6 +809,39 @@ |
4 | | - ' DROP TARGETS INITIALIZATION |
5 | | - '****************************************************** |
6 | | - |
| 3 | +@@ -811,0 +812,33 @@ |
7 | 4 | +Class DropTarget |
8 | 5 | + Private m_primary, m_secondary, m_prim, m_sw, m_animate, m_isDropped |
9 | 6 | + |
|
37 | 34 | + End Function |
38 | 35 | +End Class |
39 | 36 | + |
40 | | - 'Define a variable for each drop target |
41 | | - Dim DT40, DT41, DT42, DT50, DT51, DT60, DT61, DT70, DT71 |
42 | | - |
43 | | -@@ -828,15 +861,15 @@ |
44 | | - ' |
45 | | - ' Values for annimate: 1 - bend target (hit to primary), 2 - drop target (hit to secondary), 3 - brick target (high velocity hit to secondary), -1 - raise target |
46 | | - |
| 37 | +@@ -831,9 +864,9 @@ |
47 | 38 | -DT40 = Array(sw40, sw40y, sw40p, 40, 0) |
48 | 39 | -DT41 = Array(sw41, sw41y, sw41p, 41, 0) |
49 | 40 | -DT42 = Array(sw42, sw42y, sw42p, 42, 0) |
|
62 | 53 | +Set DT61 = (new DropTarget)(sw61, sw61y, sw61p, 61, 0, false) |
63 | 54 | +Set DT70 = (new DropTarget)(sw70, sw70y, sw70p, 70, 0, false) |
64 | 55 | +Set DT71 = (new DropTarget)(sw71, sw71y, sw71p, 71, 0, false) |
65 | | - |
66 | | - |
67 | | - 'Add all the Drop Target Arrays to Drop Target Animation Array |
68 | | -@@ -866,9 +899,9 @@ |
69 | | - i = DTArrayID(switch) |
70 | | - |
71 | | - PlayTargetSound |
| 56 | +@@ -869,3 +902,3 @@ |
72 | 57 | - DTArray(i)(4) = DTCheckBrick(Activeball,DTArray(i)(2)) |
73 | 58 | - If DTArray(i)(4) = 1 or DTArray(i)(4) = 3 or DTArray(i)(4) = 4 Then |
74 | 59 | - DTBallPhysics Activeball, DTArray(i)(2).rotz, DTMass |
75 | 60 | + DTArray(i).animate = DTCheckBrick(Activeball,DTArray(i).prim) |
76 | 61 | + If DTArray(i).animate = 1 or DTArray(i).animate = 3 or DTArray(i).animate = 4 Then |
77 | 62 | + DTBallPhysics Activeball, DTArray(i).prim.rotz, DTMass |
78 | | - End If |
79 | | - DoDTAnim |
80 | | - End Sub |
81 | | -@@ -877,7 +910,7 @@ |
82 | | - Dim i |
83 | | - i = DTArrayID(switch) |
84 | | - |
| 63 | +@@ -880 +913 @@ |
85 | 64 | - DTArray(i)(4) = -1 |
86 | 65 | + DTArray(i).animate = -1 |
87 | | - DoDTAnim |
88 | | - End Sub |
89 | | - |
90 | | -@@ -885,14 +918,14 @@ |
91 | | - Dim i |
92 | | - i = DTArrayID(switch) |
93 | | - |
| 66 | +@@ -888 +921 @@ |
94 | 67 | - DTArray(i)(4) = 1 |
95 | 68 | + DTArray(i).animate = 1 |
96 | | - DoDTAnim |
97 | | - End Sub |
98 | | - |
99 | | - Function DTArrayID(switch) |
100 | | - Dim i |
101 | | - For i = 0 to uBound(DTArray) |
| 69 | +@@ -895 +928 @@ |
102 | 70 | - If DTArray(i)(3) = switch Then DTArrayID = i:Exit Function |
103 | 71 | + If DTArray(i).sw = switch Then DTArrayID = i:Exit Function |
104 | | - Next |
105 | | - End Function |
106 | | - |
107 | | -@@ -945,7 +978,7 @@ |
108 | | - Sub DoDTAnim() |
109 | | - Dim i |
110 | | - For i=0 to Ubound(DTArray) |
| 72 | +@@ -948 +981 @@ |
111 | 73 | - DTArray(i)(4) = DTAnimate(DTArray(i)(0),DTArray(i)(1),DTArray(i)(2),DTArray(i)(3),DTArray(i)(4)) |
112 | 74 | + DTArray(i).animate = DTAnimate(DTArray(i).primary,DTArray(i).secondary,DTArray(i).prim,DTArray(i).sw,DTArray(i).animate) |
113 | | - Next |
114 | | - End Sub |
115 | | - |
116 | | -@@ -3546,16 +3579,16 @@ |
117 | | - 'RampRoll.Interval = RampRoll.Interval 'reset timer |
118 | | - exit Sub |
119 | | - End If |
| 75 | +@@ -3549 +3582 @@ |
120 | 76 | - if x = uBound(RampBalls) then 'debug |
121 | 77 | + 'if x = uBound(RampBalls) then 'debug |
122 | | - 'Debug.print "WireRampOn error, ball queue is full: " & vbnewline & _ |
123 | | - 'RampBalls(0, 0) & vbnewline & _ |
| 78 | +@@ -3552,7 +3585,7 @@ |
124 | 79 | - Typename(RampBalls(1, 0)) & " ID:" & RampBalls(1, 1) & "type:" & RampType(1) & vbnewline & _ |
125 | 80 | - Typename(RampBalls(2, 0)) & " ID:" & RampBalls(2, 1) & "type:" & RampType(2) & vbnewline & _ |
126 | 81 | - Typename(RampBalls(3, 0)) & " ID:" & RampBalls(3, 1) & "type:" & RampType(3) & vbnewline & _ |
|
135 | 90 | + 'Typename(RampBalls(5, 0)) & " ID:" & RampBalls(5, 1) & "type:" & RampType(5) & vbnewline & _ |
136 | 91 | + '" " |
137 | 92 | + 'End If |
138 | | - next |
139 | | - End Sub |
140 | | - |
0 commit comments