Browse Source

anim_add_trans_missing_decks

shuvit 6 years ago
parent
commit
2551f65e60
1 changed files with 49 additions and 9 deletions
  1. 49
    9
      co_ActionState.py

+ 49
- 9
co_ActionState.py View File

@@ -158,8 +158,8 @@ def main():
158 158
                 actionState = 'reg_land'
159 159
                 own['actionTimer'] = 39
160 160
                 skater.playAction("reg_land", 1,20, layer=trans_layer, play_mode=0, speed=.5)
161
-                deck.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=.5)
162
-                trucks.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=.5)                        
161
+                deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)
162
+                trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)                        
163 163
                 print("play land") 
164 164
             if requestAction == 'fak_land' and own["grindHit"] == False:
165 165
                 actionState = 'fak_land'
@@ -171,8 +171,8 @@ def main():
171 171
                 deck.stopAction(trans_layer)                                
172 172
                 own['actionTimer'] = 39
173 173
                 skater.playAction("fak_land", 1,20, layer=trans_layer, play_mode=0, speed=.5)                        
174
-                deck.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=.5)
175
-                trucks.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=.5)        
174
+                deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)
175
+                trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)        
176 176
                 print("play land")
177 177
 
178 178
             if requestAction == 'reg_dropin':
@@ -200,10 +200,12 @@ def main():
200 200
                 if trans_playing and cur_frame > 1:                
201 201
                     skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
202 202
                     deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
203
+                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
203 204
                     own['actionTimer'] = cur_frame
204 205
                 else:                      
205 206
                     skater.playAction("nreg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
206
-                    deck.playAction("a_reg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)                   
207
+                    deck.playAction("a_reg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
208
+                    trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)                   
207 209
                     
208 210
             if requestAction == 'reg_turnLeft_out':
209 211
                 actionState = 'reg_turnLeft_out'
@@ -215,10 +217,12 @@ def main():
215 217
                 if trans_playing and cur_frame > 1:                
216 218
                     skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
217 219
                     deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
220
+                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
218 221
                     own['actionTimer'] = cur_frame
219 222
                 else:                      
220 223
                     skater.playAction("nreg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
221 224
                     deck.playAction("a_reg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
225
+                    trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)
222 226
                 
223 227
             if requestAction == 'fak_turnRight_out':
224 228
                 actionState = 'fak_turnRight_out'
@@ -230,10 +234,12 @@ def main():
230 234
                 if trans_playing and cur_frame > 1:                
231 235
                     skater.playAction("nfak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
232 236
                     deck.playAction("a_fak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
237
+                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
233 238
                     own['actionTimer'] = cur_frame
234 239
                 else:                      
235 240
                     skater.playAction("nfak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
236
-                    deck.playAction("a_fak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)                   
241
+                    deck.playAction("a_fak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
242
+                    trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)                   
237 243
                     
238 244
             if requestAction == 'fak_turnLeft_out':
239 245
                 actionState = 'fak_turnLeft_out'
@@ -245,10 +251,12 @@ def main():
245 251
                 if trans_playing and cur_frame > 1:                
246 252
                     skater.playAction("nfak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
247 253
                     deck.playAction("a_fak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
254
+                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
248 255
                     own['actionTimer'] = cur_frame
249 256
                 else:                      
250 257
                     skater.playAction("nfak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
251
-                    deck.playAction("a_fak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)                
258
+                    deck.playAction("a_fak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)  
259
+                    trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)              
252 260
                                       
253 261
 
254 262
             if requestAction == 'reg_opos_out':
@@ -260,9 +268,13 @@ def main():
260 268
                     #cur_frame -= 2                    
261 269
                 if trans_playing and cur_frame > 1:                
262 270
                     skater.playAction("noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
271
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
272
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
263 273
                     own['actionTimer'] = cur_frame
264 274
                 else:                      
265 275
                     skater.playAction("noposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
276
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
277
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
266 278
 
267 279
             if requestAction == 'fak_opos_out':
268 280
                 actionState = 'fak_opos_out'
@@ -273,9 +285,13 @@ def main():
273 285
                     #cur_frame -= 2                    
274 286
                 if trans_playing and cur_frame > 1:                
275 287
                     skater.playAction("fak_oposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
288
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
289
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
276 290
                     own['actionTimer'] = cur_frame
277 291
                 else:                      
278 292
                     skater.playAction("fak_oposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
293
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
294
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
279 295
 
280 296
             if requestAction == 'reg_nopos_out':
281 297
                 actionState = 'reg_nopos_out'
@@ -286,9 +302,13 @@ def main():
286 302
                     #cur_frame -= 2                    
287 303
                 if trans_playing and cur_frame > 1:                
288 304
                     skater.playAction("nnoposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
305
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
306
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
289 307
                     own['actionTimer'] = cur_frame
290 308
                 else:                      
291 309
                     skater.playAction("nnoposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
310
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
311
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
292 312
 
293 313
             if requestAction == 'fak_nopos_out':
294 314
                 actionState = 'fak_nopos_out'
@@ -299,9 +319,13 @@ def main():
299 319
                     #cur_frame -= 2                    
300 320
                 if trans_playing and cur_frame > 1:                
301 321
                     skater.playAction("fak_noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
322
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
323
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
302 324
                     own['actionTimer'] = cur_frame
303 325
                 else:                      
304
-                    skater.playAction("fak_noposin", 20,1, layer=trans_layer, play_mode=0, speed=1)    
326
+                    skater.playAction("fak_noposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
327
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
328
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)    
305 329
                     
306 330
             if requestAction == 'reg_pump_out':
307 331
                 actionState = 'reg_pump_out'
@@ -312,10 +336,14 @@ def main():
312 336
                     #cur_frame -= 2                    
313 337
                 if trans_playing and cur_frame > 1:                
314 338
                     skater.playAction("nreg_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
339
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
340
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
315 341
                     
316 342
                     own['actionTimer'] = cur_frame
317 343
                 else:                      
318 344
                     skater.playAction("nreg_pump_in", 10,1, layer=trans_layer, play_mode=0, speed=.5)
345
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
346
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
319 347
                     
320 348
             if requestAction == 'fak_pump_out':
321 349
                 actionState = 'fak_pump_out'
@@ -326,23 +354,35 @@ def main():
326 354
                     #cur_frame -= 2                    
327 355
                 if trans_playing and cur_frame > 1:                
328 356
                     skater.playAction("nfak_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
357
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
358
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
329 359
                     
330 360
                     own['actionTimer'] = cur_frame
331 361
                 else:                      
332
-                    skater.playAction("nfak_pump_in", 10,1, layer=trans_layer, play_mode=0, speed=.5)                                                                           
362
+                    skater.playAction("nfak_pump_in", 10,1, layer=trans_layer, play_mode=0, speed=.5)
363
+                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
364
+                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)                                                                           
333 365
                     
334 366
             if requestAction == 'reg_push':
335 367
                 own['actionTimer'] = 70
336 368
                 skater.playAction("reg_push", 1,35, layer=trans_layer, play_mode=0, speed=.5)
369
+                deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
370
+                trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
337 371
             if requestAction == 'reg_push_goof':
338 372
                 own['actionTimer'] = 70
339 373
                 skater.playAction("reg_push_goof", 1,35, layer=trans_layer, play_mode=0, speed=.5)
374
+                deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
375
+                trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
340 376
             if requestAction == 'fak_push':
341 377
                 own['actionTimer'] = 70
342 378
                 skater.playAction("fak_push", 1,35, layer=trans_layer, play_mode=0, speed=.5)
379
+                deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
380
+                trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
343 381
             if requestAction == 'fak_push_goof':
344 382
                 own['actionTimer'] = 70
345 383
                 skater.playAction("fak_push_goof", 1,35, layer=trans_layer, play_mode=0, speed=.5)
384
+                deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
385
+                trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
346 386
                 
347 387
             if requestAction == 'reg_manual_revert_ccw':
348 388
                 own['actionTimer'] = 15

Loading…
Cancel
Save