shuvit 6 years ago
parent
commit
9b10a962a6
2 changed files with 64 additions and 32 deletions
  1. 50
    18
      co_ActionState.py
  2. 14
    14
      controller2.py

+ 50
- 18
co_ActionState.py
File diff suppressed because it is too large
View File


+ 14
- 14
controller2.py View File

3209
     if own['hippy'] == 1 and own['last_hippy'] == 0:
3209
     if own['hippy'] == 1 and own['last_hippy'] == 0:
3210
         if STANCE == 0:
3210
         if STANCE == 0:
3211
             #own['requestAction'] = 'reg_hippy'
3211
             #own['requestAction'] = 'reg_hippy'
3212
-            own['requestAction'] = 'reg_hippy'
3213
-            skater.playAction("reg_hippy", 1,10, layer=1101, priority=1, layer_weight=0, play_mode=0, speed=.5)
3212
+            own['requestAction'] = 'reg_hippy_in'
3213
+            #skater.playAction("reg_hippy", 1,10, layer=1101, priority=1, layer_weight=0, play_mode=0, speed=.5)
3214
         if STANCE == 1:
3214
         if STANCE == 1:
3215
-            own['requestAction'] = 'fak_hippy'
3216
-            skater.playAction("fak_hippy", 1,10, layer=1101, priority=1, layer_weight=0, play_mode=0, speed=.5)            
3215
+            own['requestAction'] = 'fak_hippy_in'
3216
+            #skater.playAction("fak_hippy", 1,10, layer=1101, priority=1, layer_weight=0, play_mode=0, speed=.5)            
3217
     if own['hippy'] == 1 and own['last_hippy'] == 1:
3217
     if own['hippy'] == 1 and own['last_hippy'] == 1:
3218
         if STANCE == 0:
3218
         if STANCE == 0:
3219
-            own['requestAction'] = 'reg_hippy'
3220
-            skater.playAction("reg_hippy", 10,10, layer=1100, priority=0, layer_weight=0, play_mode=1, speed=.5)
3219
+            own['requestAction'] = 'reg_hippy_in'
3220
+            #skater.playAction("reg_hippy", 10,10, layer=1100, priority=0, layer_weight=0, play_mode=1, speed=.5)
3221
         if STANCE == 1:
3221
         if STANCE == 1:
3222
-            own['requestAction'] = 'fak_hippy'
3223
-            skater.playAction("fak_hippy", 10,10, layer=1100, priority=0, layer_weight=0, play_mode=1, speed=.5)
3222
+            own['requestAction'] = 'fak_hippy_in'
3223
+            #skater.playAction("fak_hippy", 10,10, layer=1100, priority=0, layer_weight=0, play_mode=1, speed=.5)
3224
     if own['hippy'] == 0 and own['last_hippy'] == 1:
3224
     if own['hippy'] == 0 and own['last_hippy'] == 1:
3225
         killact(1100)
3225
         killact(1100)
3226
         if rLR > turnsens:
3226
         if rLR > turnsens:
3230
             print("hippy turn")
3230
             print("hippy turn")
3231
             if STANCE == 0:
3231
             if STANCE == 0:
3232
                 own['requestAction'] = 'reg_hippy_ncw'
3232
                 own['requestAction'] = 'reg_hippy_ncw'
3233
-                skater.playAction("reg_hippy_ncw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)
3233
+                #skater.playAction("reg_hippy_ncw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)
3234
                 print('%hip1')
3234
                 print('%hip1')
3235
             if STANCE == 1:
3235
             if STANCE == 1:
3236
                 own['requestAction'] = 'fak_hippy_ncw'
3236
                 own['requestAction'] = 'fak_hippy_ncw'
3237
-                skater.playAction("fak_hippy_ncw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)                
3237
+                #skater.playAction("fak_hippy_ncw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)                
3238
                 print('%hip2')
3238
                 print('%hip2')
3239
         elif rLR < -turnsens:
3239
         elif rLR < -turnsens:
3240
             local = True
3240
             local = True
3243
             print("hippy turn neg")            
3243
             print("hippy turn neg")            
3244
             if STANCE == 0:
3244
             if STANCE == 0:
3245
                 own['requestAction'] = 'fak_hippy_nccw'
3245
                 own['requestAction'] = 'fak_hippy_nccw'
3246
-                skater.playAction("fak_hippy_nccw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)  
3246
+                #skater.playAction("fak_hippy_nccw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)  
3247
                 print('%hip3')
3247
                 print('%hip3')
3248
             if STANCE == 1:
3248
             if STANCE == 1:
3249
                 own['requestAction'] = 'reg_hippy_nccw'
3249
                 own['requestAction'] = 'reg_hippy_nccw'
3250
-                skater.playAction("reg_hippy_nccw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5) 
3250
+                #skater.playAction("reg_hippy_nccw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5) 
3251
                 print('%hip4')
3251
                 print('%hip4')
3252
 ##straight        
3252
 ##straight        
3253
         else:
3253
         else:
3254
             if STANCE == 0:
3254
             if STANCE == 0:
3255
-                skater.playAction("reg_hippy", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)
3255
+                #skater.playAction("reg_hippy", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)
3256
                 own['requestAction'] = 'reg_hippy'
3256
                 own['requestAction'] = 'reg_hippy'
3257
             if STANCE == 1:
3257
             if STANCE == 1:
3258
                 own['requestAction'] = 'fak_hippy'
3258
                 own['requestAction'] = 'fak_hippy'
3259
-                skater.playAction("fak_hippy", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)                                        
3259
+                #skater.playAction("fak_hippy", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)                                        
3260
 
3260
 
3261
 #pushing and hippy jumps
3261
 #pushing and hippy jumps
3262
 
3262
 

Loading…
Cancel
Save