.gitignore

@@ -56,4 +56,7 @@ Temporary Items
  
 # GameMaker temporary files
 *.resource_order
-*.old
+*.old
+
+# GMRT build directory
+Build

ATT21546.gitignore

@@ -0,0 +1,59 @@
+# Windows
+ 
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+ 
+# Dump file
+*.stackdump
+ 
+# Folder config file
+[Dd]esktop.ini
+ 
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+ 
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+ 
+# Windows shortcuts
+*.lnk
+ 
+# Mac
+ 
+## General
+.DS_Store
+.AppleDouble
+.LSOverride
+ 
+## Icon must end with two \r
+Icon
+ 
+## Thumbnails
+._*
+ 
+## Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+ 
+## Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+ 
+# GameMaker temporary files
+*.resource_order
+*.old

ATT81076.gitattributes

@@ -0,0 +1,8 @@
+# Ignore .yy files for language statistics
+*.yy linguist-generated=true
+ 
+# force LF for metadata files for merge simplicity
+*.gml text eol=lf
+*.yy text eol=lf
+*.yyp text eol=lf
+*.json text eol=lf

ddmyx.yyp

@@ -40,28 +40,30 @@
   "resources":[
     {"id":{"name":"fTest","path":"fonts/fTest/fTest.yy",},},
     {"id":{"name":"Parents","path":"notes/Parents/Parents.yy",},},
-    {"id":{"name":"早上起来看这个","path":"notes/早上起来看这个/早上起来看这个.yy",},},
     {"id":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},},
     {"id":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},},
     {"id":{"name":"oCamera","path":"objects/oCamera/oCamera.yy",},},
     {"id":{"name":"oDoubleJumpEffect","path":"objects/oDoubleJumpEffect/oDoubleJumpEffect.yy",},},
     {"id":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},},
     {"id":{"name":"oEnemyHitbox","path":"objects/oEnemyHitbox/oEnemyHitbox.yy",},},
+    {"id":{"name":"oFade","path":"objects/oFade/oFade.yy",},},
     {"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},},
     {"id":{"name":"oInput","path":"objects/oInput/oInput.yy",},},
     {"id":{"name":"oParentAttackable","path":"objects/oParentAttackable/oParentAttackable.yy",},},
     {"id":{"name":"oParentEnemy","path":"objects/oParentEnemy/oParentEnemy.yy",},},
     {"id":{"name":"oParentHazard","path":"objects/oParentHazard/oParentHazard.yy",},},
+    {"id":{"name":"oParentPlayerHitbox","path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",},},
     {"id":{"name":"oParentSolid","path":"objects/oParentSolid/oParentSolid.yy",},},
     {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},},
     {"id":{"name":"oPlayerAfterImage","path":"objects/oPlayerAfterImage/oPlayerAfterImage.yy",},},
     {"id":{"name":"oPlayerHitboxArc","path":"objects/oPlayerHitboxArc/oPlayerHitboxArc.yy",},},
-    {"id":{"name":"oPlayerHitboxRec","path":"objects/oPlayerHitboxRec/oPlayerHitboxRec.yy",},},
+    {"id":{"name":"oPlayerHitboxHor","path":"objects/oPlayerHitboxHor/oPlayerHitboxHor.yy",},},
+    {"id":{"name":"oPlayerHitboxMark","path":"objects/oPlayerHitboxMark/oPlayerHitboxMark.yy",},},
+    {"id":{"name":"oPlayerHitboxVer","path":"objects/oPlayerHitboxVer/oPlayerHitboxVer.yy",},},
     {"id":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},},
     {"id":{"name":"rTest","path":"rooms/rTest/rTest.yy",},},
     {"id":{"name":"EnemyStates","path":"scripts/EnemyStates/EnemyStates.yy",},},
     {"id":{"name":"general","path":"scripts/general/general.yy",},},
-    {"id":{"name":"Interaction","path":"scripts/Interaction/Interaction.yy",},},
     {"id":{"name":"PlayerStates","path":"scripts/PlayerStates/PlayerStates.yy",},},
     {"id":{"name":"Simplifier","path":"scripts/Simplifier/Simplifier.yy",},},
     {"id":{"name":"sBlockClimbable","path":"sprites/sBlockClimbable/sBlockClimbable.yy",},},
@@ -70,14 +72,17 @@
     {"id":{"name":"sEnemyCrawl","path":"sprites/sEnemyCrawl/sEnemyCrawl.yy",},},
     {"id":{"name":"sEnemyCrawlHitbox","path":"sprites/sEnemyCrawlHitbox/sEnemyCrawlHitbox.yy",},},
     {"id":{"name":"sHitboxArc","path":"sprites/sHitboxArc/sHitboxArc.yy",},},
-    {"id":{"name":"sHitboxRec","path":"sprites/sHitboxRec/sHitboxRec.yy",},},
+    {"id":{"name":"sHitboxHor","path":"sprites/sHitboxHor/sHitboxHor.yy",},},
+    {"id":{"name":"sHitboxMark","path":"sprites/sHitboxMark/sHitboxMark.yy",},},
+    {"id":{"name":"sHitboxVer","path":"sprites/sHitboxVer/sHitboxVer.yy",},},
     {"id":{"name":"sPlayerArcSlash","path":"sprites/sPlayerArcSlash/sPlayerArcSlash.yy",},},
     {"id":{"name":"sPlayerAttack","path":"sprites/sPlayerAttack/sPlayerAttack.yy",},},
     {"id":{"name":"sPlayerDash","path":"sprites/sPlayerDash/sPlayerDash.yy",},},
-    {"id":{"name":"sPlayerDodgeYDodge","path":"sprites/sPlayerDodgeYDodge/sPlayerDodgeYDodge.yy",},},
-    {"id":{"name":"sPlayerDodgeYEnding","path":"sprites/sPlayerDodgeYEnding/sPlayerDodgeYEnding.yy",},},
-    {"id":{"name":"sPlayerDodgeYWait","path":"sprites/sPlayerDodgeYWait/sPlayerDodgeYWait.yy",},},
-    {"id":{"name":"sPlayerHitstun","path":"sprites/sPlayerHitstun/sPlayerHitstun.yy",},},
+    {"id":{"name":"sPlayerDodge","path":"sprites/sPlayerDodge/sPlayerDodge.yy",},},
+    {"id":{"name":"sPlayerDodgeEnding","path":"sprites/sPlayerDodgeEnding/sPlayerDodgeEnding.yy",},},
+    {"id":{"name":"sPlayerDodgeWait","path":"sprites/sPlayerDodgeWait/sPlayerDodgeWait.yy",},},
+    {"id":{"name":"sPlayerHitstunAttacked","path":"sprites/sPlayerHitstunAttacked/sPlayerHitstunAttacked.yy",},},
+    {"id":{"name":"sPlayerHitstunHazard","path":"sprites/sPlayerHitstunHazard/sPlayerHitstunHazard.yy",},},
     {"id":{"name":"sPlayerHP_2","path":"sprites/sPlayerHP_2/sPlayerHP_2.yy",},},
     {"id":{"name":"sPlayerHP","path":"sprites/sPlayerHP/sPlayerHP.yy",},},
     {"id":{"name":"sPlayerIdle","path":"sprites/sPlayerIdle/sPlayerIdle.yy",},},

fonts/fTest/fTest.yy

@@ -3,7 +3,7 @@
   "%Name":"fTest",
   "AntiAlias":1,
   "applyKerning":0,
-  "ascender":44,
+  "ascender":49,
   "ascenderOffset":0,
   "bold":false,
   "canGenerateBitmap":true,
@@ -12,561 +12,529 @@
   "fontName":"LXGW WenKai",
   "glyphOperations":0,
   "glyphs":{
-    "32":{"character":32,"h":56,"offset":0,"shift":13,"w":13,"x":2,"y":2,},
-    "33":{"character":33,"h":56,"offset":4,"shift":13,"w":6,"x":494,"y":118,},
-    "34":{"character":34,"h":56,"offset":4,"shift":19,"w":11,"x":481,"y":118,},
-    "35":{"character":35,"h":56,"offset":0,"shift":27,"w":27,"x":452,"y":118,},
-    "36":{"character":36,"h":56,"offset":3,"shift":25,"w":20,"x":430,"y":118,},
-    "37":{"character":37,"h":56,"offset":1,"shift":38,"w":36,"x":392,"y":118,},
-    "38":{"character":38,"h":56,"offset":2,"shift":37,"w":35,"x":355,"y":118,},
-    "39":{"character":39,"h":56,"offset":3,"shift":11,"w":5,"x":348,"y":118,},
-    "40":{"character":40,"h":56,"offset":3,"shift":14,"w":11,"x":335,"y":118,},
-    "41":{"character":41,"h":56,"offset":0,"shift":14,"w":12,"x":321,"y":118,},
-    "42":{"character":42,"h":56,"offset":1,"shift":20,"w":17,"x":2,"y":176,},
-    "43":{"character":43,"h":56,"offset":5,"shift":32,"w":22,"x":297,"y":118,},
-    "44":{"character":44,"h":56,"offset":0,"shift":10,"w":8,"x":265,"y":118,},
-    "45":{"character":45,"h":56,"offset":3,"shift":19,"w":13,"x":250,"y":118,},
-    "46":{"character":46,"h":56,"offset":2,"shift":10,"w":6,"x":242,"y":118,},
-    "47":{"character":47,"h":56,"offset":-1,"shift":18,"w":20,"x":220,"y":118,},
-    "48":{"character":48,"h":56,"offset":1,"shift":25,"w":23,"x":195,"y":118,},
-    "49":{"character":49,"h":56,"offset":4,"shift":25,"w":13,"x":180,"y":118,},
-    "50":{"character":50,"h":56,"offset":2,"shift":25,"w":21,"x":157,"y":118,},
-    "51":{"character":51,"h":56,"offset":3,"shift":25,"w":20,"x":135,"y":118,},
-    "52":{"character":52,"h":56,"offset":0,"shift":25,"w":25,"x":108,"y":118,},
-    "53":{"character":53,"h":56,"offset":3,"shift":25,"w":20,"x":275,"y":118,},
-    "54":{"character":54,"h":56,"offset":2,"shift":25,"w":22,"x":21,"y":176,},
-    "55":{"character":55,"h":56,"offset":2,"shift":25,"w":21,"x":45,"y":176,},
-    "56":{"character":56,"h":56,"offset":2,"shift":25,"w":22,"x":68,"y":176,},
-    "57":{"character":57,"h":56,"offset":2,"shift":25,"w":21,"x":42,"y":234,},
-    "58":{"character":58,"h":56,"offset":2,"shift":10,"w":6,"x":34,"y":234,},
-    "59":{"character":59,"h":56,"offset":0,"shift":10,"w":8,"x":24,"y":234,},
-    "60":{"character":60,"h":56,"offset":6,"shift":32,"w":20,"x":2,"y":234,},
-    "61":{"character":61,"h":56,"offset":5,"shift":32,"w":22,"x":485,"y":176,},
-    "62":{"character":62,"h":56,"offset":6,"shift":32,"w":20,"x":463,"y":176,},
-    "63":{"character":63,"h":56,"offset":2,"shift":21,"w":17,"x":444,"y":176,},
-    "64":{"character":64,"h":56,"offset":3,"shift":44,"w":38,"x":404,"y":176,},
-    "65":{"character":65,"h":56,"offset":0,"shift":30,"w":30,"x":372,"y":176,},
-    "66":{"character":66,"h":56,"offset":4,"shift":27,"w":21,"x":349,"y":176,},
-    "67":{"character":67,"h":56,"offset":2,"shift":29,"w":25,"x":322,"y":176,},
-    "68":{"character":68,"h":56,"offset":4,"shift":33,"w":27,"x":293,"y":176,},
-    "69":{"character":69,"h":56,"offset":4,"shift":24,"w":18,"x":273,"y":176,},
-    "70":{"character":70,"h":56,"offset":4,"shift":23,"w":17,"x":254,"y":176,},
-    "71":{"character":71,"h":56,"offset":2,"shift":32,"w":27,"x":225,"y":176,},
-    "72":{"character":72,"h":56,"offset":4,"shift":33,"w":26,"x":197,"y":176,},
-    "73":{"character":73,"h":56,"offset":4,"shift":13,"w":5,"x":190,"y":176,},
-    "74":{"character":74,"h":56,"offset":0,"shift":17,"w":14,"x":174,"y":176,},
-    "75":{"character":75,"h":56,"offset":4,"shift":27,"w":24,"x":148,"y":176,},
-    "76":{"character":76,"h":56,"offset":4,"shift":22,"w":18,"x":128,"y":176,},
-    "77":{"character":77,"h":56,"offset":4,"shift":42,"w":34,"x":92,"y":176,},
-    "78":{"character":78,"h":56,"offset":4,"shift":35,"w":27,"x":79,"y":118,},
-    "79":{"character":79,"h":56,"offset":2,"shift":35,"w":31,"x":65,"y":234,},
-    "80":{"character":80,"h":56,"offset":4,"shift":26,"w":21,"x":56,"y":118,},
-    "81":{"character":81,"h":56,"offset":2,"shift":35,"w":34,"x":18,"y":118,},
-    "82":{"character":82,"h":56,"offset":4,"shift":28,"w":24,"x":479,"y":2,},
-    "83":{"character":83,"h":56,"offset":2,"shift":25,"w":21,"x":456,"y":2,},
-    "84":{"character":84,"h":56,"offset":0,"shift":25,"w":24,"x":430,"y":2,},
-    "85":{"character":85,"h":56,"offset":3,"shift":32,"w":26,"x":402,"y":2,},
-    "86":{"character":86,"h":56,"offset":0,"shift":29,"w":29,"x":371,"y":2,},
-    "87":{"character":87,"h":56,"offset":0,"shift":44,"w":44,"x":325,"y":2,},
-    "88":{"character":88,"h":56,"offset":0,"shift":28,"w":28,"x":295,"y":2,},
-    "89":{"character":89,"h":56,"offset":0,"shift":26,"w":26,"x":267,"y":2,},
-    "90":{"character":90,"h":56,"offset":0,"shift":27,"w":26,"x":239,"y":2,},
-    "91":{"character":91,"h":56,"offset":4,"shift":14,"w":10,"x":2,"y":60,},
-    "92":{"character":92,"h":56,"offset":-1,"shift":18,"w":20,"x":217,"y":2,},
-    "93":{"character":93,"h":56,"offset":1,"shift":14,"w":9,"x":189,"y":2,},
-    "94":{"character":94,"h":56,"offset":5,"shift":32,"w":22,"x":165,"y":2,},
-    "95":{"character":95,"h":56,"offset":0,"shift":19,"w":20,"x":143,"y":2,},
-    "96":{"character":96,"h":56,"offset":1,"shift":13,"w":10,"x":131,"y":2,},
-    "97":{"character":97,"h":56,"offset":1,"shift":24,"w":20,"x":109,"y":2,},
-    "98":{"character":98,"h":56,"offset":3,"shift":27,"w":23,"x":84,"y":2,},
-    "99":{"character":99,"h":56,"offset":2,"shift":22,"w":18,"x":64,"y":2,},
-    "100":{"character":100,"h":56,"offset":2,"shift":28,"w":22,"x":40,"y":2,},
-    "101":{"character":101,"h":56,"offset":2,"shift":24,"w":21,"x":17,"y":2,},
-    "102":{"character":102,"h":56,"offset":1,"shift":15,"w":15,"x":200,"y":2,},
-    "103":{"character":103,"h":56,"offset":2,"shift":28,"w":22,"x":14,"y":60,},
-    "104":{"character":104,"h":56,"offset":3,"shift":26,"w":21,"x":38,"y":60,},
-    "105":{"character":105,"h":56,"offset":3,"shift":11,"w":6,"x":61,"y":60,},
-    "106":{"character":106,"h":56,"offset":-5,"shift":11,"w":14,"x":2,"y":118,},
-    "107":{"character":107,"h":56,"offset":3,"shift":23,"w":21,"x":477,"y":60,},
-    "108":{"character":108,"h":56,"offset":3,"shift":11,"w":5,"x":470,"y":60,},
-    "109":{"character":109,"h":56,"offset":3,"shift":40,"w":35,"x":433,"y":60,},
-    "110":{"character":110,"h":56,"offset":3,"shift":27,"w":21,"x":410,"y":60,},
-    "111":{"character":111,"h":56,"offset":2,"shift":27,"w":24,"x":384,"y":60,},
-    "112":{"character":112,"h":56,"offset":3,"shift":27,"w":23,"x":359,"y":60,},
-    "113":{"character":113,"h":56,"offset":2,"shift":28,"w":22,"x":335,"y":60,},
-    "114":{"character":114,"h":56,"offset":3,"shift":16,"w":14,"x":319,"y":60,},
-    "115":{"character":115,"h":56,"offset":2,"shift":20,"w":17,"x":300,"y":60,},
-    "116":{"character":116,"h":56,"offset":0,"shift":16,"w":15,"x":283,"y":60,},
-    "117":{"character":117,"h":56,"offset":3,"shift":27,"w":20,"x":261,"y":60,},
-    "118":{"character":118,"h":56,"offset":0,"shift":23,"w":23,"x":236,"y":60,},
-    "119":{"character":119,"h":56,"offset":0,"shift":34,"w":34,"x":200,"y":60,},
-    "120":{"character":120,"h":56,"offset":0,"shift":22,"w":22,"x":176,"y":60,},
-    "121":{"character":121,"h":56,"offset":0,"shift":23,"w":23,"x":151,"y":60,},
-    "122":{"character":122,"h":56,"offset":0,"shift":21,"w":21,"x":128,"y":60,},
-    "123":{"character":123,"h":56,"offset":2,"shift":14,"w":11,"x":115,"y":60,},
-    "124":{"character":124,"h":56,"offset":4,"shift":12,"w":4,"x":109,"y":60,},
-    "125":{"character":125,"h":56,"offset":1,"shift":14,"w":12,"x":95,"y":60,},
-    "126":{"character":126,"h":56,"offset":4,"shift":32,"w":24,"x":69,"y":60,},
-    "127":{"character":127,"h":56,"offset":0,"shift":13,"w":0,"x":54,"y":118,},
-    "9647":{"character":9647,"h":56,"offset":8,"shift":42,"w":26,"x":98,"y":234,},
+    "32":{"character":32,"h":62,"offset":0,"shift":15,"w":15,"x":2,"y":2,},
+    "33":{"character":33,"h":62,"offset":5,"shift":15,"w":5,"x":373,"y":130,},
+    "34":{"character":34,"h":62,"offset":3,"shift":14,"w":8,"x":363,"y":130,},
+    "35":{"character":35,"h":62,"offset":2,"shift":26,"w":23,"x":338,"y":130,},
+    "36":{"character":36,"h":62,"offset":1,"shift":26,"w":23,"x":313,"y":130,},
+    "37":{"character":37,"h":62,"offset":2,"shift":34,"w":30,"x":281,"y":130,},
+    "38":{"character":38,"h":62,"offset":2,"shift":30,"w":28,"x":251,"y":130,},
+    "39":{"character":39,"h":62,"offset":6,"shift":15,"w":3,"x":246,"y":130,},
+    "40":{"character":40,"h":62,"offset":4,"shift":14,"w":10,"x":234,"y":130,},
+    "41":{"character":41,"h":62,"offset":1,"shift":15,"w":10,"x":222,"y":130,},
+    "42":{"character":42,"h":62,"offset":4,"shift":21,"w":14,"x":380,"y":130,},
+    "43":{"character":43,"h":62,"offset":2,"shift":25,"w":21,"x":199,"y":130,},
+    "44":{"character":44,"h":62,"offset":4,"shift":15,"w":6,"x":168,"y":130,},
+    "45":{"character":45,"h":62,"offset":1,"shift":15,"w":13,"x":153,"y":130,},
+    "46":{"character":46,"h":62,"offset":5,"shift":15,"w":5,"x":146,"y":130,},
+    "47":{"character":47,"h":62,"offset":0,"shift":15,"w":14,"x":130,"y":130,},
+    "48":{"character":48,"h":62,"offset":3,"shift":26,"w":19,"x":109,"y":130,},
+    "49":{"character":49,"h":62,"offset":5,"shift":26,"w":10,"x":97,"y":130,},
+    "50":{"character":50,"h":62,"offset":2,"shift":26,"w":21,"x":74,"y":130,},
+    "51":{"character":51,"h":62,"offset":3,"shift":26,"w":20,"x":52,"y":130,},
+    "52":{"character":52,"h":62,"offset":2,"shift":26,"w":22,"x":28,"y":130,},
+    "53":{"character":53,"h":62,"offset":2,"shift":26,"w":21,"x":176,"y":130,},
+    "54":{"character":54,"h":62,"offset":3,"shift":26,"w":20,"x":396,"y":130,},
+    "55":{"character":55,"h":62,"offset":3,"shift":26,"w":19,"x":418,"y":130,},
+    "56":{"character":56,"h":62,"offset":2,"shift":26,"w":20,"x":439,"y":130,},
+    "57":{"character":57,"h":62,"offset":3,"shift":26,"w":21,"x":418,"y":194,},
+    "58":{"character":58,"h":62,"offset":5,"shift":14,"w":4,"x":412,"y":194,},
+    "59":{"character":59,"h":62,"offset":4,"shift":14,"w":5,"x":405,"y":194,},
+    "60":{"character":60,"h":62,"offset":4,"shift":26,"w":18,"x":385,"y":194,},
+    "61":{"character":61,"h":62,"offset":3,"shift":26,"w":20,"x":363,"y":194,},
+    "62":{"character":62,"h":62,"offset":4,"shift":25,"w":18,"x":343,"y":194,},
+    "63":{"character":63,"h":62,"offset":3,"shift":25,"w":19,"x":322,"y":194,},
+    "64":{"character":64,"h":62,"offset":2,"shift":34,"w":31,"x":289,"y":194,},
+    "65":{"character":65,"h":62,"offset":0,"shift":29,"w":30,"x":257,"y":194,},
+    "66":{"character":66,"h":62,"offset":1,"shift":27,"w":24,"x":231,"y":194,},
+    "67":{"character":67,"h":62,"offset":2,"shift":30,"w":27,"x":202,"y":194,},
+    "68":{"character":68,"h":62,"offset":2,"shift":31,"w":27,"x":173,"y":194,},
+    "69":{"character":69,"h":62,"offset":3,"shift":27,"w":22,"x":149,"y":194,},
+    "70":{"character":70,"h":62,"offset":3,"shift":25,"w":21,"x":126,"y":194,},
+    "71":{"character":71,"h":62,"offset":2,"shift":32,"w":28,"x":96,"y":194,},
+    "72":{"character":72,"h":62,"offset":2,"shift":30,"w":24,"x":70,"y":194,},
+    "73":{"character":73,"h":62,"offset":5,"shift":13,"w":3,"x":65,"y":194,},
+    "74":{"character":74,"h":62,"offset":0,"shift":20,"w":16,"x":47,"y":194,},
+    "75":{"character":75,"h":62,"offset":4,"shift":26,"w":22,"x":23,"y":194,},
+    "76":{"character":76,"h":62,"offset":4,"shift":23,"w":19,"x":2,"y":194,},
+    "77":{"character":77,"h":62,"offset":1,"shift":36,"w":34,"x":461,"y":130,},
+    "78":{"character":78,"h":62,"offset":3,"shift":31,"w":24,"x":2,"y":130,},
+    "79":{"character":79,"h":62,"offset":2,"shift":31,"w":27,"x":469,"y":66,},
+    "80":{"character":80,"h":62,"offset":3,"shift":27,"w":22,"x":445,"y":66,},
+    "81":{"character":81,"h":62,"offset":2,"shift":31,"w":28,"x":2,"y":66,},
+    "82":{"character":82,"h":62,"offset":3,"shift":28,"w":25,"x":447,"y":2,},
+    "83":{"character":83,"h":62,"offset":1,"shift":26,"w":23,"x":422,"y":2,},
+    "84":{"character":84,"h":62,"offset":1,"shift":26,"w":24,"x":396,"y":2,},
+    "85":{"character":85,"h":62,"offset":4,"shift":29,"w":21,"x":373,"y":2,},
+    "86":{"character":86,"h":62,"offset":0,"shift":26,"w":26,"x":345,"y":2,},
+    "87":{"character":87,"h":62,"offset":0,"shift":38,"w":38,"x":305,"y":2,},
+    "88":{"character":88,"h":62,"offset":0,"shift":26,"w":26,"x":277,"y":2,},
+    "89":{"character":89,"h":62,"offset":0,"shift":25,"w":25,"x":250,"y":2,},
+    "90":{"character":90,"h":62,"offset":1,"shift":25,"w":23,"x":225,"y":2,},
+    "91":{"character":91,"h":62,"offset":7,"shift":15,"w":7,"x":474,"y":2,},
+    "92":{"character":92,"h":62,"offset":0,"shift":15,"w":14,"x":209,"y":2,},
+    "93":{"character":93,"h":62,"offset":1,"shift":16,"w":8,"x":182,"y":2,},
+    "94":{"character":94,"h":62,"offset":3,"shift":26,"w":20,"x":160,"y":2,},
+    "95":{"character":95,"h":62,"offset":0,"shift":23,"w":23,"x":135,"y":2,},
+    "96":{"character":96,"h":62,"offset":4,"shift":15,"w":8,"x":125,"y":2,},
+    "97":{"character":97,"h":62,"offset":2,"shift":24,"w":20,"x":103,"y":2,},
+    "98":{"character":98,"h":62,"offset":4,"shift":24,"w":18,"x":83,"y":2,},
+    "99":{"character":99,"h":62,"offset":2,"shift":22,"w":19,"x":62,"y":2,},
+    "100":{"character":100,"h":62,"offset":2,"shift":24,"w":20,"x":40,"y":2,},
+    "101":{"character":101,"h":62,"offset":2,"shift":23,"w":19,"x":19,"y":2,},
+    "102":{"character":102,"h":62,"offset":1,"shift":16,"w":15,"x":192,"y":2,},
+    "103":{"character":103,"h":62,"offset":2,"shift":25,"w":19,"x":32,"y":66,},
+    "104":{"character":104,"h":62,"offset":4,"shift":25,"w":17,"x":229,"y":66,},
+    "105":{"character":105,"h":62,"offset":3,"shift":11,"w":4,"x":53,"y":66,},
+    "106":{"character":106,"h":62,"offset":1,"shift":13,"w":9,"x":415,"y":66,},
+    "107":{"character":107,"h":62,"offset":4,"shift":22,"w":18,"x":395,"y":66,},
+    "108":{"character":108,"h":62,"offset":4,"shift":11,"w":3,"x":390,"y":66,},
+    "109":{"character":109,"h":62,"offset":4,"shift":35,"w":28,"x":360,"y":66,},
+    "110":{"character":110,"h":62,"offset":4,"shift":25,"w":17,"x":341,"y":66,},
+    "111":{"character":111,"h":62,"offset":2,"shift":23,"w":19,"x":320,"y":66,},
+    "112":{"character":112,"h":62,"offset":4,"shift":24,"w":18,"x":300,"y":66,},
+    "113":{"character":113,"h":62,"offset":2,"shift":24,"w":18,"x":280,"y":66,},
+    "114":{"character":114,"h":62,"offset":4,"shift":19,"w":14,"x":264,"y":66,},
+    "115":{"character":115,"h":62,"offset":3,"shift":22,"w":17,"x":426,"y":66,},
+    "116":{"character":116,"h":62,"offset":1,"shift":16,"w":14,"x":248,"y":66,},
+    "117":{"character":117,"h":62,"offset":4,"shift":25,"w":19,"x":208,"y":66,},
+    "118":{"character":118,"h":62,"offset":1,"shift":21,"w":19,"x":187,"y":66,},
+    "119":{"character":119,"h":62,"offset":1,"shift":31,"w":30,"x":155,"y":66,},
+    "120":{"character":120,"h":62,"offset":1,"shift":21,"w":19,"x":134,"y":66,},
+    "121":{"character":121,"h":62,"offset":1,"shift":22,"w":20,"x":112,"y":66,},
+    "122":{"character":122,"h":62,"offset":2,"shift":22,"w":18,"x":92,"y":66,},
+    "123":{"character":123,"h":62,"offset":3,"shift":15,"w":12,"x":78,"y":66,},
+    "124":{"character":124,"h":62,"offset":6,"shift":15,"w":3,"x":73,"y":66,},
+    "125":{"character":125,"h":62,"offset":0,"shift":15,"w":12,"x":59,"y":66,},
+    "126":{"character":126,"h":62,"offset":2,"shift":26,"w":21,"x":441,"y":194,},
+    "9647":{"character":9647,"h":62,"offset":6,"shift":26,"w":14,"x":464,"y":194,},
   },
   "hinting":0,
   "includeTTF":false,
   "interpreter":0,
   "italic":false,
   "kerningPairs":[
-    {"amount":-1,"first":34,"second":114,},
-    {"amount":-1,"first":34,"second":115,},
-    {"amount":-1,"first":39,"second":114,},
-    {"amount":-1,"first":39,"second":115,},
-    {"amount":5,"first":40,"second":106,},
-    {"amount":-4,"first":42,"second":65,},
-    {"amount":-3,"first":42,"second":74,},
-    {"amount":-2,"first":42,"second":99,},
-    {"amount":-2,"first":42,"second":100,},
-    {"amount":-2,"first":42,"second":101,},
-    {"amount":-2,"first":42,"second":103,},
-    {"amount":-2,"first":42,"second":111,},
-    {"amount":-2,"first":42,"second":113,},
-    {"amount":-5,"first":44,"second":8216,},
-    {"amount":-5,"first":44,"second":8217,},
-    {"amount":-5,"first":44,"second":8220,},
-    {"amount":-5,"first":44,"second":8221,},
-    {"amount":-5,"first":46,"second":8216,},
-    {"amount":-4,"first":46,"second":8217,},
-    {"amount":-5,"first":46,"second":8220,},
-    {"amount":-4,"first":46,"second":8221,},
-    {"amount":-3,"first":65,"second":42,},
-    {"amount":2,"first":65,"second":44,},
-    {"amount":2,"first":65,"second":59,},
-    {"amount":-1,"first":65,"second":67,},
-    {"amount":-1,"first":65,"second":71,},
-    {"amount":2,"first":65,"second":74,},
-    {"amount":-1,"first":65,"second":79,},
-    {"amount":-3,"first":65,"second":84,},
-    {"amount":-1,"first":65,"second":85,},
-    {"amount":-3,"first":65,"second":86,},
-    {"amount":-2,"first":65,"second":87,},
-    {"amount":-3,"first":65,"second":89,},
-    {"amount":1,"first":65,"second":90,},
-    {"amount":-1,"first":65,"second":116,},
-    {"amount":-1,"first":65,"second":118,},
-    {"amount":-1,"first":65,"second":119,},
-    {"amount":-1,"first":65,"second":121,},
-    {"amount":-3,"first":65,"second":8216,},
-    {"amount":-4,"first":65,"second":8217,},
-    {"amount":-3,"first":65,"second":8220,},
-    {"amount":-4,"first":65,"second":8221,},
-    {"amount":-2,"first":66,"second":84,},
-    {"amount":-1,"first":66,"second":89,},
-    {"amount":-1,"first":67,"second":67,},
-    {"amount":-1,"first":67,"second":71,},
-    {"amount":-1,"first":67,"second":79,},
-    {"amount":-1,"first":67,"second":81,},
-    {"amount":-3,"first":68,"second":44,},
-    {"amount":-3,"first":68,"second":46,},
-    {"amount":-1,"first":68,"second":65,},
-    {"amount":-2,"first":68,"second":84,},
-    {"amount":-1,"first":68,"second":88,},
-    {"amount":-1,"first":68,"second":90,},
-    {"amount":-3,"first":68,"second":8230,},
-    {"amount":2,"first":69,"second":74,},
-    {"amount":1,"first":69,"second":87,},
-    {"amount":-3,"first":70,"second":44,},
-    {"amount":-3,"first":70,"second":46,},
-    {"amount":-3,"first":70,"second":65,},
-    {"amount":-1,"first":70,"second":74,},
-    {"amount":-1,"first":70,"second":83,},
-    {"amount":-2,"first":70,"second":97,},
-    {"amount":-3,"first":70,"second":8230,},
-    {"amount":-1,"first":71,"second":84,},
-    {"amount":-1,"first":71,"second":86,},
-    {"amount":-1,"first":71,"second":121,},
-    {"amount":-2,"first":74,"second":44,},
-    {"amount":-2,"first":74,"second":46,},
-    {"amount":-1,"first":74,"second":65,},
-    {"amount":-1,"first":74,"second":74,},
-    {"amount":-1,"first":74,"second":97,},
-    {"amount":-1,"first":74,"second":224,},
-    {"amount":-1,"first":74,"second":225,},
-    {"amount":-2,"first":74,"second":8230,},
-    {"amount":1,"first":75,"second":44,},
-    {"amount":1,"first":75,"second":59,},
-    {"amount":-2,"first":75,"second":67,},
-    {"amount":-2,"first":75,"second":71,},
-    {"amount":2,"first":75,"second":74,},
-    {"amount":-2,"first":75,"second":79,},
-    {"amount":-2,"first":75,"second":81,},
-    {"amount":1,"first":75,"second":88,},
-    {"amount":1,"first":75,"second":90,},
-    {"amount":-1,"first":75,"second":99,},
-    {"amount":-1,"first":75,"second":100,},
-    {"amount":-1,"first":75,"second":101,},
-    {"amount":-1,"first":75,"second":103,},
-    {"amount":-1,"first":75,"second":111,},
-    {"amount":-1,"first":75,"second":113,},
-    {"amount":-1,"first":75,"second":116,},
-    {"amount":-2,"first":75,"second":118,},
-    {"amount":-1,"first":75,"second":119,},
-    {"amount":-2,"first":75,"second":121,},
-    {"amount":-1,"first":75,"second":232,},
-    {"amount":-1,"first":75,"second":233,},
-    {"amount":-1,"first":75,"second":234,},
-    {"amount":-1,"first":75,"second":237,},
-    {"amount":-1,"first":75,"second":242,},
-    {"amount":-1,"first":75,"second":243,},
-    {"amount":-5,"first":76,"second":42,},
-    {"amount":-2,"first":76,"second":63,},
-    {"amount":1,"first":76,"second":65,},
-    {"amount":-1,"first":76,"second":67,},
-    {"amount":-1,"first":76,"second":71,},
-    {"amount":2,"first":76,"second":74,},
-    {"amount":-2,"first":76,"second":79,},
-    {"amount":-2,"first":76,"second":81,},
-    {"amount":-3,"first":76,"second":84,},
-    {"amount":-1,"first":76,"second":85,},
-    {"amount":-3,"first":76,"second":86,},
-    {"amount":-1,"first":76,"second":87,},
-    {"amount":-3,"first":76,"second":89,},
-    {"amount":1,"first":76,"second":90,},
-    {"amount":-1,"first":76,"second":116,},
-    {"amount":-2,"first":76,"second":118,},
-    {"amount":-1,"first":76,"second":119,},
-    {"amount":-2,"first":76,"second":121,},
-    {"amount":-3,"first":76,"second":8216,},
-    {"amount":-3,"first":76,"second":8217,},
-    {"amount":-3,"first":76,"second":8220,},
-    {"amount":-3,"first":76,"second":8221,},
-    {"amount":-2,"first":79,"second":44,},
-    {"amount":-2,"first":79,"second":46,},
-    {"amount":-1,"first":79,"second":65,},
-    {"amount":-2,"first":79,"second":84,},
-    {"amount":-1,"first":79,"second":88,},
-    {"amount":-1,"first":79,"second":89,},
-    {"amount":-1,"first":79,"second":90,},
-    {"amount":-2,"first":79,"second":8230,},
-    {"amount":-7,"first":80,"second":44,},
-    {"amount":-7,"first":80,"second":46,},
-    {"amount":-4,"first":80,"second":65,},
-    {"amount":-3,"first":80,"second":74,},
-    {"amount":1,"first":80,"second":87,},
-    {"amount":-1,"first":80,"second":88,},
-    {"amount":-1,"first":80,"second":97,},
-    {"amount":-2,"first":80,"second":99,},
-    {"amount":-2,"first":80,"second":100,},
-    {"amount":-2,"first":80,"second":101,},
-    {"amount":-2,"first":80,"second":103,},
-    {"amount":-2,"first":80,"second":111,},
-    {"amount":-2,"first":80,"second":113,},
-    {"amount":-1,"first":80,"second":224,},
-    {"amount":-1,"first":80,"second":225,},
-    {"amount":-2,"first":80,"second":232,},
-    {"amount":-2,"first":80,"second":233,},
-    {"amount":-2,"first":80,"second":234,},
-    {"amount":-2,"first":80,"second":242,},
-    {"amount":-2,"first":80,"second":243,},
-    {"amount":-7,"first":80,"second":8230,},
-    {"amount":-2,"first":81,"second":44,},
-    {"amount":-3,"first":81,"second":46,},
-    {"amount":-1,"first":81,"second":65,},
-    {"amount":-2,"first":81,"second":84,},
-    {"amount":-1,"first":81,"second":88,},
-    {"amount":-1,"first":81,"second":90,},
-    {"amount":-3,"first":81,"second":8230,},
-    {"amount":2,"first":82,"second":59,},
-    {"amount":-1,"first":82,"second":67,},
-    {"amount":-1,"first":82,"second":71,},
-    {"amount":1,"first":82,"second":74,},
-    {"amount":-1,"first":82,"second":84,},
-    {"amount":-1,"first":82,"second":89,},
-    {"amount":-1,"first":82,"second":99,},
-    {"amount":-1,"first":82,"second":100,},
-    {"amount":-1,"first":82,"second":101,},
-    {"amount":-1,"first":82,"second":103,},
-    {"amount":-1,"first":82,"second":111,},
-    {"amount":-1,"first":82,"second":113,},
-    {"amount":-1,"first":82,"second":232,},
-    {"amount":-1,"first":82,"second":233,},
-    {"amount":-1,"first":82,"second":234,},
-    {"amount":-1,"first":82,"second":242,},
-    {"amount":-1,"first":82,"second":243,},
-    {"amount":-1,"first":83,"second":116,},
-    {"amount":-1,"first":83,"second":118,},
-    {"amount":-1,"first":83,"second":119,},
-    {"amount":-1,"first":83,"second":121,},
-    {"amount":-3,"first":84,"second":44,},
-    {"amount":-4,"first":84,"second":46,},
-    {"amount":-1,"first":84,"second":58,},
-    {"amount":-1,"first":84,"second":59,},
-    {"amount":-3,"first":84,"second":65,},
-    {"amount":-2,"first":84,"second":67,},
-    {"amount":-2,"first":84,"second":71,},
-    {"amount":-3,"first":84,"second":74,},
-    {"amount":-2,"first":84,"second":79,},
-    {"amount":-2,"first":84,"second":81,},
-    {"amount":1,"first":84,"second":84,},
-    {"amount":1,"first":84,"second":86,},
-    {"amount":1,"first":84,"second":87,},
-    {"amount":1,"first":84,"second":89,},
-    {"amount":-5,"first":84,"second":97,},
-    {"amount":-5,"first":84,"second":99,},
-    {"amount":-5,"first":84,"second":100,},
-    {"amount":-5,"first":84,"second":101,},
-    {"amount":-2,"first":84,"second":102,},
-    {"amount":-5,"first":84,"second":103,},
-    {"amount":-4,"first":84,"second":109,},
-    {"amount":-4,"first":84,"second":110,},
-    {"amount":-5,"first":84,"second":111,},
-    {"amount":-4,"first":84,"second":112,},
-    {"amount":-5,"first":84,"second":113,},
-    {"amount":-4,"first":84,"second":114,},
-    {"amount":-3,"first":84,"second":115,},
-    {"amount":-4,"first":84,"second":117,},
-    {"amount":-2,"first":84,"second":118,},
-    {"amount":-3,"first":84,"second":119,},
-    {"amount":-4,"first":84,"second":120,},
-    {"amount":-3,"first":84,"second":121,},
-    {"amount":-3,"first":84,"second":122,},
-    {"amount":-5,"first":84,"second":224,},
-    {"amount":-5,"first":84,"second":225,},
-    {"amount":-5,"first":84,"second":232,},
-    {"amount":-5,"first":84,"second":233,},
-    {"amount":-5,"first":84,"second":234,},
-    {"amount":-1,"first":84,"second":237,},
-    {"amount":-5,"first":84,"second":242,},
-    {"amount":-5,"first":84,"second":243,},
-    {"amount":-4,"first":84,"second":249,},
-    {"amount":-4,"first":84,"second":250,},
-    {"amount":-4,"first":84,"second":252,},
-    {"amount":1,"first":84,"second":8217,},
+    {"amount":1,"first":40,"second":105,},
+    {"amount":1,"first":40,"second":106,},
+    {"amount":1,"first":40,"second":108,},
+    {"amount":1,"first":40,"second":116,},
+    {"amount":1,"first":40,"second":121,},
+    {"amount":-1,"first":65,"second":84,},
+    {"amount":-1,"first":65,"second":86,},
+    {"amount":-1,"first":65,"second":89,},
+    {"amount":-1,"first":65,"second":221,},
+    {"amount":-1,"first":65,"second":376,},
+    {"amount":-1,"first":65,"second":700,},
+    {"amount":-1,"first":65,"second":8217,},
+    {"amount":-1,"first":65,"second":8221,},
+    {"amount":-1,"first":66,"second":44,},
+    {"amount":-1,"first":68,"second":44,},
+    {"amount":-1,"first":68,"second":46,},
+    {"amount":-2,"first":70,"second":44,},
+    {"amount":-2,"first":70,"second":46,},
+    {"amount":-1,"first":70,"second":65,},
+    {"amount":-1,"first":70,"second":97,},
+    {"amount":-1,"first":70,"second":101,},
+    {"amount":-1,"first":70,"second":111,},
+    {"amount":-1,"first":70,"second":192,},
+    {"amount":-1,"first":70,"second":193,},
+    {"amount":-1,"first":70,"second":194,},
+    {"amount":-1,"first":70,"second":195,},
+    {"amount":-1,"first":70,"second":196,},
+    {"amount":-1,"first":70,"second":197,},
+    {"amount":-1,"first":70,"second":224,},
+    {"amount":-1,"first":70,"second":225,},
+    {"amount":-1,"first":70,"second":226,},
+    {"amount":-1,"first":70,"second":227,},
+    {"amount":-1,"first":70,"second":228,},
+    {"amount":-1,"first":70,"second":229,},
+    {"amount":-1,"first":70,"second":232,},
+    {"amount":-1,"first":70,"second":233,},
+    {"amount":-1,"first":70,"second":234,},
+    {"amount":-1,"first":70,"second":235,},
+    {"amount":-1,"first":70,"second":242,},
+    {"amount":-1,"first":70,"second":243,},
+    {"amount":-1,"first":70,"second":244,},
+    {"amount":-1,"first":70,"second":245,},
+    {"amount":-1,"first":70,"second":246,},
+    {"amount":-1,"first":70,"second":256,},
+    {"amount":-1,"first":70,"second":257,},
+    {"amount":-1,"first":70,"second":275,},
+    {"amount":-1,"first":70,"second":283,},
+    {"amount":-1,"first":70,"second":333,},
+    {"amount":-1,"first":70,"second":461,},
+    {"amount":-1,"first":70,"second":462,},
+    {"amount":-1,"first":70,"second":466,},
+    {"amount":1,"first":70,"second":700,},
+    {"amount":-1,"first":70,"second":7869,},
+    {"amount":1,"first":70,"second":8217,},
+    {"amount":1,"first":70,"second":8221,},
+    {"amount":1,"first":73,"second":41,},
+    {"amount":1,"first":73,"second":93,},
+    {"amount":1,"first":73,"second":125,},
+    {"amount":1,"first":73,"second":8221,},
+    {"amount":-1,"first":74,"second":44,},
+    {"amount":-1,"first":74,"second":46,},
+    {"amount":1,"first":75,"second":65,},
+    {"amount":-1,"first":75,"second":121,},
+    {"amount":1,"first":75,"second":192,},
+    {"amount":1,"first":75,"second":193,},
+    {"amount":1,"first":75,"second":194,},
+    {"amount":1,"first":75,"second":195,},
+    {"amount":1,"first":75,"second":196,},
+    {"amount":1,"first":75,"second":197,},
+    {"amount":-1,"first":75,"second":253,},
+    {"amount":-1,"first":75,"second":255,},
+    {"amount":1,"first":75,"second":256,},
+    {"amount":1,"first":75,"second":461,},
+    {"amount":-1,"first":76,"second":84,},
+    {"amount":-1,"first":76,"second":89,},
+    {"amount":-1,"first":76,"second":221,},
+    {"amount":-1,"first":76,"second":376,},
+    {"amount":-1,"first":76,"second":700,},
+    {"amount":-1,"first":76,"second":8217,},
+    {"amount":-1,"first":76,"second":8221,},
+    {"amount":-1,"first":79,"second":44,},
+    {"amount":-1,"first":79,"second":46,},
+    {"amount":-3,"first":80,"second":44,},
+    {"amount":-3,"first":80,"second":46,},
+    {"amount":-1,"first":80,"second":65,},
+    {"amount":-3,"first":80,"second":97,},
+    {"amount":-3,"first":80,"second":101,},
+    {"amount":-3,"first":80,"second":111,},
+    {"amount":-1,"first":80,"second":117,},
+    {"amount":-1,"first":80,"second":192,},
+    {"amount":-1,"first":80,"second":193,},
+    {"amount":-1,"first":80,"second":194,},
+    {"amount":-1,"first":80,"second":195,},
+    {"amount":-1,"first":80,"second":196,},
+    {"amount":-1,"first":80,"second":197,},
+    {"amount":-3,"first":80,"second":224,},
+    {"amount":-3,"first":80,"second":225,},
+    {"amount":-3,"first":80,"second":226,},
+    {"amount":-3,"first":80,"second":227,},
+    {"amount":-3,"first":80,"second":228,},
+    {"amount":-3,"first":80,"second":229,},
+    {"amount":-3,"first":80,"second":232,},
+    {"amount":-3,"first":80,"second":233,},
+    {"amount":-3,"first":80,"second":234,},
+    {"amount":-3,"first":80,"second":235,},
+    {"amount":-3,"first":80,"second":242,},
+    {"amount":-3,"first":80,"second":243,},
+    {"amount":-3,"first":80,"second":244,},
+    {"amount":-3,"first":80,"second":245,},
+    {"amount":-3,"first":80,"second":246,},
+    {"amount":-1,"first":80,"second":249,},
+    {"amount":-1,"first":80,"second":250,},
+    {"amount":-1,"first":80,"second":251,},
+    {"amount":-1,"first":80,"second":252,},
+    {"amount":-1,"first":80,"second":256,},
+    {"amount":-3,"first":80,"second":257,},
+    {"amount":-3,"first":80,"second":275,},
+    {"amount":-3,"first":80,"second":283,},
+    {"amount":-3,"first":80,"second":333,},
+    {"amount":-1,"first":80,"second":361,},
+    {"amount":-1,"first":80,"second":363,},
+    {"amount":-1,"first":80,"second":367,},
+    {"amount":-1,"first":80,"second":461,},
+    {"amount":-3,"first":80,"second":462,},
+    {"amount":-3,"first":80,"second":466,},
+    {"amount":-1,"first":80,"second":468,},
+    {"amount":-3,"first":80,"second":7869,},
+    {"amount":1,"first":81,"second":65,},
+    {"amount":1,"first":81,"second":192,},
+    {"amount":1,"first":81,"second":193,},
+    {"amount":1,"first":81,"second":194,},
+    {"amount":1,"first":81,"second":195,},
+    {"amount":1,"first":81,"second":196,},
+    {"amount":1,"first":81,"second":197,},
+    {"amount":1,"first":81,"second":256,},
+    {"amount":1,"first":81,"second":461,},
+    {"amount":-2,"first":84,"second":44,},
+    {"amount":-1,"first":84,"second":45,},
+    {"amount":-2,"first":84,"second":46,},
+    {"amount":-1,"first":84,"second":65,},
+    {"amount":2,"first":84,"second":84,},
+    {"amount":-2,"first":84,"second":97,},
+    {"amount":-2,"first":84,"second":101,},
+    {"amount":-2,"first":84,"second":111,},
+    {"amount":-1,"first":84,"second":114,},
+    {"amount":-2,"first":84,"second":115,},
+    {"amount":-1,"first":84,"second":117,},
+    {"amount":-1,"first":84,"second":119,},
+    {"amount":-1,"first":84,"second":121,},
+    {"amount":-1,"first":84,"second":122,},
+    {"amount":-1,"first":84,"second":192,},
+    {"amount":-1,"first":84,"second":193,},
+    {"amount":-1,"first":84,"second":194,},
+    {"amount":-1,"first":84,"second":195,},
+    {"amount":-1,"first":84,"second":196,},
+    {"amount":-1,"first":84,"second":197,},
+    {"amount":-2,"first":84,"second":224,},
+    {"amount":-2,"first":84,"second":225,},
+    {"amount":-2,"first":84,"second":226,},
+    {"amount":-2,"first":84,"second":227,},
+    {"amount":-2,"first":84,"second":228,},
+    {"amount":-2,"first":84,"second":229,},
+    {"amount":-2,"first":84,"second":232,},
+    {"amount":-2,"first":84,"second":233,},
+    {"amount":-2,"first":84,"second":234,},
+    {"amount":-2,"first":84,"second":235,},
+    {"amount":-2,"first":84,"second":242,},
+    {"amount":-2,"first":84,"second":243,},
+    {"amount":-2,"first":84,"second":244,},
+    {"amount":-2,"first":84,"second":245,},
+    {"amount":-2,"first":84,"second":246,},
+    {"amount":-1,"first":84,"second":249,},
+    {"amount":-1,"first":84,"second":250,},
+    {"amount":-1,"first":84,"second":251,},
+    {"amount":-1,"first":84,"second":252,},
+    {"amount":-1,"first":84,"second":253,},
+    {"amount":-1,"first":84,"second":255,},
+    {"amount":-1,"first":84,"second":256,},
+    {"amount":-2,"first":84,"second":257,},
+    {"amount":-2,"first":84,"second":275,},
+    {"amount":-2,"first":84,"second":283,},
+    {"amount":-2,"first":84,"second":333,},
+    {"amount":-2,"first":84,"second":353,},
+    {"amount":-1,"first":84,"second":361,},
+    {"amount":-1,"first":84,"second":363,},
+    {"amount":-1,"first":84,"second":367,},
+    {"amount":-1,"first":84,"second":382,},
+    {"amount":-1,"first":84,"second":461,},
+    {"amount":-2,"first":84,"second":462,},
+    {"amount":-2,"first":84,"second":466,},
+    {"amount":-1,"first":84,"second":468,},
+    {"amount":-2,"first":84,"second":7869,},
+    {"amount":-1,"first":84,"second":8209,},
     {"amount":1,"first":84,"second":8221,},
-    {"amount":-4,"first":84,"second":8230,},
-    {"amount":-1,"first":85,"second":65,},
-    {"amount":-5,"first":86,"second":44,},
-    {"amount":-5,"first":86,"second":46,},
-    {"amount":-3,"first":86,"second":65,},
-    {"amount":-1,"first":86,"second":67,},
-    {"amount":-1,"first":86,"second":71,},
-    {"amount":-2,"first":86,"second":74,},
-    {"amount":-1,"first":86,"second":81,},
-    {"amount":-1,"first":86,"second":83,},
-    {"amount":1,"first":86,"second":84,},
-    {"amount":-3,"first":86,"second":97,},
-    {"amount":-3,"first":86,"second":99,},
-    {"amount":-3,"first":86,"second":100,},
-    {"amount":-3,"first":86,"second":101,},
-    {"amount":-3,"first":86,"second":103,},
-    {"amount":-2,"first":86,"second":109,},
-    {"amount":-2,"first":86,"second":110,},
-    {"amount":-3,"first":86,"second":111,},
-    {"amount":-2,"first":86,"second":112,},
-    {"amount":-3,"first":86,"second":113,},
-    {"amount":-2,"first":86,"second":114,},
-    {"amount":-1,"first":86,"second":115,},
-    {"amount":-2,"first":86,"second":117,},
-    {"amount":-3,"first":86,"second":224,},
-    {"amount":-3,"first":86,"second":225,},
-    {"amount":-3,"first":86,"second":232,},
-    {"amount":-3,"first":86,"second":233,},
-    {"amount":-3,"first":86,"second":234,},
-    {"amount":-3,"first":86,"second":242,},
-    {"amount":-3,"first":86,"second":243,},
-    {"amount":-2,"first":86,"second":249,},
-    {"amount":-2,"first":86,"second":250,},
-    {"amount":-2,"first":86,"second":252,},
-    {"amount":-5,"first":86,"second":8230,},
-    {"amount":-3,"first":87,"second":44,},
-    {"amount":-3,"first":87,"second":46,},
-    {"amount":-2,"first":87,"second":65,},
-    {"amount":1,"first":87,"second":84,},
-    {"amount":-2,"first":87,"second":97,},
-    {"amount":-1,"first":87,"second":99,},
+    {"amount":-1,"first":85,"second":44,},
+    {"amount":-1,"first":85,"second":46,},
+    {"amount":-2,"first":86,"second":44,},
+    {"amount":-2,"first":86,"second":46,},
+    {"amount":-1,"first":86,"second":65,},
+    {"amount":-2,"first":86,"second":97,},
+    {"amount":-2,"first":86,"second":101,},
+    {"amount":-2,"first":86,"second":111,},
+    {"amount":-1,"first":86,"second":117,},
+    {"amount":-1,"first":86,"second":192,},
+    {"amount":-1,"first":86,"second":193,},
+    {"amount":-1,"first":86,"second":194,},
+    {"amount":-1,"first":86,"second":195,},
+    {"amount":-1,"first":86,"second":196,},
+    {"amount":-1,"first":86,"second":197,},
+    {"amount":-2,"first":86,"second":224,},
+    {"amount":-2,"first":86,"second":225,},
+    {"amount":-2,"first":86,"second":226,},
+    {"amount":-2,"first":86,"second":227,},
+    {"amount":-2,"first":86,"second":228,},
+    {"amount":-2,"first":86,"second":229,},
+    {"amount":-2,"first":86,"second":232,},
+    {"amount":-2,"first":86,"second":233,},
+    {"amount":-2,"first":86,"second":234,},
+    {"amount":-2,"first":86,"second":235,},
+    {"amount":1,"first":86,"second":236,},
+    {"amount":1,"first":86,"second":237,},
+    {"amount":2,"first":86,"second":238,},
+    {"amount":2,"first":86,"second":239,},
+    {"amount":-2,"first":86,"second":242,},
+    {"amount":-2,"first":86,"second":243,},
+    {"amount":-2,"first":86,"second":244,},
+    {"amount":-2,"first":86,"second":245,},
+    {"amount":-2,"first":86,"second":246,},
+    {"amount":-1,"first":86,"second":249,},
+    {"amount":-1,"first":86,"second":250,},
+    {"amount":-1,"first":86,"second":251,},
+    {"amount":-1,"first":86,"second":252,},
+    {"amount":-1,"first":86,"second":256,},
+    {"amount":-2,"first":86,"second":257,},
+    {"amount":-2,"first":86,"second":275,},
+    {"amount":-2,"first":86,"second":283,},
+    {"amount":2,"first":86,"second":297,},
+    {"amount":2,"first":86,"second":299,},
+    {"amount":-2,"first":86,"second":333,},
+    {"amount":-1,"first":86,"second":361,},
+    {"amount":-1,"first":86,"second":363,},
+    {"amount":-1,"first":86,"second":367,},
+    {"amount":-1,"first":86,"second":461,},
+    {"amount":-2,"first":86,"second":462,},
+    {"amount":1,"first":86,"second":464,},
+    {"amount":-2,"first":86,"second":466,},
+    {"amount":-1,"first":86,"second":468,},
+    {"amount":1,"first":86,"second":822,},
+    {"amount":-2,"first":86,"second":7869,},
+    {"amount":1,"first":86,"second":8212,},
+    {"amount":1,"first":86,"second":8221,},
+    {"amount":-2,"first":87,"second":44,},
+    {"amount":-2,"first":87,"second":46,},
+    {"amount":-1,"first":87,"second":97,},
     {"amount":-1,"first":87,"second":100,},
     {"amount":-1,"first":87,"second":101,},
-    {"amount":-1,"first":87,"second":103,},
     {"amount":-1,"first":87,"second":111,},
-    {"amount":-1,"first":87,"second":113,},
-    {"amount":-2,"first":87,"second":224,},
-    {"amount":-2,"first":87,"second":225,},
+    {"amount":-1,"first":87,"second":224,},
+    {"amount":-1,"first":87,"second":225,},
+    {"amount":-1,"first":87,"second":226,},
+    {"amount":-1,"first":87,"second":227,},
+    {"amount":-1,"first":87,"second":228,},
+    {"amount":-1,"first":87,"second":229,},
     {"amount":-1,"first":87,"second":232,},
     {"amount":-1,"first":87,"second":233,},
     {"amount":-1,"first":87,"second":234,},
+    {"amount":-1,"first":87,"second":235,},
     {"amount":-1,"first":87,"second":242,},
     {"amount":-1,"first":87,"second":243,},
-    {"amount":-3,"first":87,"second":8230,},
-    {"amount":2,"first":88,"second":44,},
-    {"amount":1,"first":88,"second":46,},
-    {"amount":2,"first":88,"second":59,},
-    {"amount":-1,"first":88,"second":67,},
-    {"amount":-1,"first":88,"second":71,},
-    {"amount":2,"first":88,"second":74,},
-    {"amount":-1,"first":88,"second":79,},
-    {"amount":-1,"first":88,"second":81,},
-    {"amount":1,"first":88,"second":84,},
-    {"amount":1,"first":88,"second":8230,},
-    {"amount":-4,"first":89,"second":44,},
-    {"amount":-4,"first":89,"second":46,},
-    {"amount":-4,"first":89,"second":65,},
+    {"amount":-1,"first":87,"second":244,},
+    {"amount":-1,"first":87,"second":245,},
+    {"amount":-1,"first":87,"second":246,},
+    {"amount":-1,"first":87,"second":257,},
+    {"amount":-1,"first":87,"second":275,},
+    {"amount":-1,"first":87,"second":283,},
+    {"amount":-1,"first":87,"second":333,},
+    {"amount":-1,"first":87,"second":462,},
+    {"amount":-1,"first":87,"second":466,},
+    {"amount":-1,"first":87,"second":7869,},
+    {"amount":1,"first":87,"second":8221,},
+    {"amount":1,"first":88,"second":8221,},
+    {"amount":-2,"first":89,"second":44,},
+    {"amount":-1,"first":89,"second":45,},
+    {"amount":-2,"first":89,"second":46,},
+    {"amount":-1,"first":89,"second":65,},
     {"amount":-1,"first":89,"second":67,},
     {"amount":-1,"first":89,"second":71,},
-    {"amount":-1,"first":89,"second":74,},
     {"amount":-1,"first":89,"second":79,},
     {"amount":-1,"first":89,"second":81,},
-    {"amount":-1,"first":89,"second":83,},
-    {"amount":1,"first":89,"second":84,},
-    {"amount":-4,"first":89,"second":97,},
-    {"amount":-4,"first":89,"second":99,},
-    {"amount":-4,"first":89,"second":100,},
-    {"amount":-4,"first":89,"second":101,},
-    {"amount":-1,"first":89,"second":102,},
-    {"amount":-4,"first":89,"second":103,},
-    {"amount":-3,"first":89,"second":109,},
-    {"amount":-3,"first":89,"second":110,},
-    {"amount":-4,"first":89,"second":111,},
-    {"amount":-3,"first":89,"second":112,},
-    {"amount":-4,"first":89,"second":113,},
-    {"amount":-3,"first":89,"second":114,},
-    {"amount":-3,"first":89,"second":115,},
-    {"amount":-3,"first":89,"second":117,},
-    {"amount":-4,"first":89,"second":224,},
-    {"amount":-4,"first":89,"second":225,},
-    {"amount":-4,"first":89,"second":232,},
-    {"amount":-4,"first":89,"second":233,},
-    {"amount":-4,"first":89,"second":234,},
-    {"amount":-4,"first":89,"second":242,},
-    {"amount":-4,"first":89,"second":243,},
-    {"amount":-3,"first":89,"second":249,},
-    {"amount":-3,"first":89,"second":250,},
-    {"amount":-3,"first":89,"second":252,},
-    {"amount":-4,"first":89,"second":8230,},
-    {"amount":2,"first":90,"second":74,},
-    {"amount":1,"first":90,"second":84,},
-    {"amount":-1,"first":90,"second":121,},
-    {"amount":5,"first":91,"second":106,},
-    {"amount":-1,"first":98,"second":97,},
-    {"amount":-1,"first":98,"second":120,},
-    {"amount":-1,"first":98,"second":224,},
-    {"amount":-1,"first":98,"second":225,},
-    {"amount":2,"first":99,"second":74,},
-    {"amount":-2,"first":99,"second":84,},
-    {"amount":-2,"first":99,"second":89,},
-    {"amount":-2,"first":101,"second":34,},
-    {"amount":-2,"first":101,"second":39,},
-    {"amount":3,"first":102,"second":41,},
-    {"amount":-3,"first":102,"second":44,},
-    {"amount":-2,"first":102,"second":45,},
-    {"amount":-3,"first":102,"second":46,},
-    {"amount":2,"first":102,"second":58,},
-    {"amount":2,"first":102,"second":59,},
-    {"amount":1,"first":102,"second":63,},
-    {"amount":3,"first":102,"second":93,},
-    {"amount":1,"first":102,"second":116,},
-    {"amount":1,"first":102,"second":118,},
-    {"amount":1,"first":102,"second":119,},
-    {"amount":1,"first":102,"second":121,},
-    {"amount":2,"first":102,"second":125,},
-    {"amount":1,"first":102,"second":236,},
-    {"amount":2,"first":102,"second":8216,},
-    {"amount":2,"first":102,"second":8217,},
-    {"amount":2,"first":102,"second":8220,},
-    {"amount":2,"first":102,"second":8221,},
-    {"amount":-3,"first":102,"second":8230,},
-    {"amount":1,"first":103,"second":106,},
-    {"amount":1,"first":106,"second":106,},
-    {"amount":2,"first":107,"second":44,},
-    {"amount":-3,"first":107,"second":45,},
-    {"amount":2,"first":107,"second":46,},
-    {"amount":2,"first":107,"second":58,},
-    {"amount":2,"first":107,"second":59,},
-    {"amount":-1,"first":107,"second":99,},
-    {"amount":-1,"first":107,"second":100,},
-    {"amount":-1,"first":107,"second":101,},
-    {"amount":-1,"first":107,"second":103,},
-    {"amount":-1,"first":107,"second":111,},
-    {"amount":-1,"first":107,"second":113,},
-    {"amount":-1,"first":107,"second":232,},
-    {"amount":-1,"first":107,"second":233,},
-    {"amount":-1,"first":107,"second":234,},
-    {"amount":-1,"first":107,"second":242,},
-    {"amount":-1,"first":107,"second":243,},
-    {"amount":2,"first":107,"second":8230,},
-    {"amount":-2,"first":110,"second":34,},
-    {"amount":-2,"first":110,"second":39,},
-    {"amount":-3,"first":111,"second":34,},
-    {"amount":-3,"first":111,"second":39,},
-    {"amount":-1,"first":111,"second":97,},
-    {"amount":-1,"first":111,"second":102,},
-    {"amount":-1,"first":111,"second":120,},
-    {"amount":-1,"first":111,"second":224,},
-    {"amount":-1,"first":111,"second":225,},
-    {"amount":-1,"first":111,"second":8216,},
-    {"amount":-3,"first":111,"second":8217,},
-    {"amount":-2,"first":111,"second":8220,},
-    {"amount":-3,"first":111,"second":8221,},
-    {"amount":-1,"first":112,"second":97,},
-    {"amount":-1,"first":112,"second":102,},
-    {"amount":-1,"first":112,"second":120,},
-    {"amount":-1,"first":112,"second":224,},
-    {"amount":-1,"first":112,"second":225,},
-    {"amount":-3,"first":112,"second":8216,},
-    {"amount":-3,"first":112,"second":8217,},
-    {"amount":-1,"first":112,"second":8220,},
-    {"amount":-3,"first":112,"second":8221,},
-    {"amount":2,"first":113,"second":106,},
-    {"amount":-4,"first":114,"second":44,},
-    {"amount":-3,"first":114,"second":45,},
-    {"amount":-4,"first":114,"second":46,},
-    {"amount":2,"first":114,"second":58,},
-    {"amount":2,"first":114,"second":59,},
-    {"amount":-1,"first":114,"second":99,},
-    {"amount":-1,"first":114,"second":100,},
-    {"amount":-1,"first":114,"second":101,},
-    {"amount":1,"first":114,"second":102,},
-    {"amount":-1,"first":114,"second":103,},
-    {"amount":-1,"first":114,"second":111,},
-    {"amount":-1,"first":114,"second":113,},
-    {"amount":1,"first":114,"second":116,},
-    {"amount":2,"first":114,"second":118,},
-    {"amount":2,"first":114,"second":119,},
-    {"amount":1,"first":114,"second":120,},
-    {"amount":2,"first":114,"second":121,},
-    {"amount":1,"first":114,"second":122,},
-    {"amount":-1,"first":114,"second":232,},
-    {"amount":-1,"first":114,"second":233,},
-    {"amount":-1,"first":114,"second":234,},
-    {"amount":-1,"first":114,"second":242,},
-    {"amount":-1,"first":114,"second":243,},
-    {"amount":4,"first":114,"second":8216,},
-    {"amount":3,"first":114,"second":8217,},
-    {"amount":4,"first":114,"second":8220,},
-    {"amount":3,"first":114,"second":8221,},
-    {"amount":-4,"first":114,"second":8230,},
-    {"amount":-3,"first":116,"second":45,},
-    {"amount":-1,"first":116,"second":63,},
-    {"amount":-1,"first":116,"second":99,},
-    {"amount":-1,"first":116,"second":100,},
-    {"amount":1,"first":116,"second":120,},
-    {"amount":-1,"first":117,"second":34,},
-    {"amount":-1,"first":117,"second":39,},
-    {"amount":-3,"first":118,"second":44,},
-    {"amount":-3,"first":118,"second":46,},
-    {"amount":-1,"first":118,"second":97,},
-    {"amount":-1,"first":118,"second":224,},
-    {"amount":-1,"first":118,"second":225,},
-    {"amount":-3,"first":118,"second":8230,},
-    {"amount":-2,"first":119,"second":44,},
-    {"amount":-2,"first":119,"second":46,},
-    {"amount":-2,"first":119,"second":8230,},
-    {"amount":1,"first":121,"second":34,},
-    {"amount":1,"first":121,"second":39,},
-    {"amount":-2,"first":121,"second":44,},
-    {"amount":-3,"first":121,"second":46,},
-    {"amount":-2,"first":121,"second":63,},
-    {"amount":-3,"first":121,"second":8230,},
-    {"amount":5,"first":123,"second":106,},
+    {"amount":-3,"first":89,"second":97,},
+    {"amount":-3,"first":89,"second":100,},
+    {"amount":-3,"first":89,"second":101,},
+    {"amount":-3,"first":89,"second":111,},
+    {"amount":-3,"first":89,"second":113,},
+    {"amount":-1,"first":89,"second":117,},
+    {"amount":-1,"first":89,"second":192,},
+    {"amount":-1,"first":89,"second":193,},
+    {"amount":-1,"first":89,"second":194,},
+    {"amount":-1,"first":89,"second":195,},
+    {"amount":-1,"first":89,"second":196,},
+    {"amount":-1,"first":89,"second":197,},
+    {"amount":-1,"first":89,"second":210,},
+    {"amount":-1,"first":89,"second":211,},
+    {"amount":-1,"first":89,"second":212,},
+    {"amount":-1,"first":89,"second":213,},
+    {"amount":-1,"first":89,"second":214,},
+    {"amount":-3,"first":89,"second":224,},
+    {"amount":-3,"first":89,"second":225,},
+    {"amount":-3,"first":89,"second":226,},
+    {"amount":-3,"first":89,"second":227,},
+    {"amount":-3,"first":89,"second":228,},
+    {"amount":-3,"first":89,"second":229,},
+    {"amount":-3,"first":89,"second":232,},
+    {"amount":-3,"first":89,"second":233,},
+    {"amount":-3,"first":89,"second":234,},
+    {"amount":-3,"first":89,"second":235,},
+    {"amount":1,"first":89,"second":236,},
+    {"amount":1,"first":89,"second":237,},
+    {"amount":2,"first":89,"second":238,},
+    {"amount":2,"first":89,"second":239,},
+    {"amount":-3,"first":89,"second":242,},
+    {"amount":-3,"first":89,"second":243,},
+    {"amount":-3,"first":89,"second":244,},
+    {"amount":-3,"first":89,"second":245,},
+    {"amount":-3,"first":89,"second":246,},
+    {"amount":-1,"first":89,"second":249,},
+    {"amount":-1,"first":89,"second":250,},
+    {"amount":-1,"first":89,"second":251,},
+    {"amount":-1,"first":89,"second":252,},
+    {"amount":-1,"first":89,"second":256,},
+    {"amount":-3,"first":89,"second":257,},
+    {"amount":-3,"first":89,"second":275,},
+    {"amount":-3,"first":89,"second":283,},
+    {"amount":2,"first":89,"second":297,},
+    {"amount":2,"first":89,"second":299,},
+    {"amount":-1,"first":89,"second":332,},
+    {"amount":-3,"first":89,"second":333,},
+    {"amount":-1,"first":89,"second":361,},
+    {"amount":-1,"first":89,"second":363,},
+    {"amount":-1,"first":89,"second":367,},
+    {"amount":-1,"first":89,"second":461,},
+    {"amount":-3,"first":89,"second":462,},
+    {"amount":2,"first":89,"second":464,},
+    {"amount":-1,"first":89,"second":465,},
+    {"amount":-3,"first":89,"second":466,},
+    {"amount":-1,"first":89,"second":468,},
+    {"amount":-3,"first":89,"second":7869,},
+    {"amount":-1,"first":89,"second":8209,},
+    {"amount":1,"first":89,"second":8221,},
+    {"amount":1,"first":90,"second":65,},
+    {"amount":1,"first":90,"second":121,},
+    {"amount":1,"first":90,"second":192,},
+    {"amount":1,"first":90,"second":193,},
+    {"amount":1,"first":90,"second":194,},
+    {"amount":1,"first":90,"second":195,},
+    {"amount":1,"first":90,"second":196,},
+    {"amount":1,"first":90,"second":197,},
+    {"amount":1,"first":90,"second":253,},
+    {"amount":1,"first":90,"second":255,},
+    {"amount":1,"first":90,"second":256,},
+    {"amount":1,"first":90,"second":461,},
+    {"amount":1,"first":90,"second":8221,},
+    {"amount":1,"first":91,"second":73,},
+    {"amount":1,"first":91,"second":102,},
+    {"amount":1,"first":91,"second":105,},
+    {"amount":1,"first":91,"second":106,},
+    {"amount":1,"first":91,"second":108,},
+    {"amount":1,"first":91,"second":116,},
+    {"amount":1,"first":91,"second":121,},
+    {"amount":-1,"first":98,"second":44,},
+    {"amount":-1,"first":98,"second":46,},
+    {"amount":-1,"first":99,"second":44,},
+    {"amount":1,"first":102,"second":41,},
+    {"amount":-1,"first":102,"second":44,},
+    {"amount":1,"first":102,"second":93,},
+    {"amount":1,"first":102,"second":125,},
+    {"amount":1,"first":102,"second":700,},
+    {"amount":1,"first":102,"second":8217,},
+    {"amount":1,"first":102,"second":8221,},
+    {"amount":1,"first":105,"second":41,},
+    {"amount":1,"first":105,"second":93,},
+    {"amount":1,"first":105,"second":125,},
+    {"amount":1,"first":105,"second":700,},
+    {"amount":1,"first":105,"second":8217,},
+    {"amount":1,"first":105,"second":8221,},
+    {"amount":1,"first":106,"second":41,},
+    {"amount":1,"first":106,"second":93,},
+    {"amount":1,"first":106,"second":125,},
+    {"amount":1,"first":106,"second":700,},
+    {"amount":1,"first":106,"second":8217,},
+    {"amount":1,"first":106,"second":8221,},
+    {"amount":1,"first":108,"second":41,},
+    {"amount":1,"first":108,"second":93,},
+    {"amount":1,"first":108,"second":125,},
+    {"amount":1,"first":108,"second":700,},
+    {"amount":1,"first":108,"second":8217,},
+    {"amount":1,"first":108,"second":8221,},
+    {"amount":-1,"first":114,"second":44,},
+    {"amount":-1,"first":114,"second":46,},
+    {"amount":1,"first":116,"second":41,},
+    {"amount":1,"first":116,"second":93,},
+    {"amount":1,"first":116,"second":125,},
+    {"amount":1,"first":116,"second":700,},
+    {"amount":1,"first":116,"second":8217,},
+    {"amount":1,"first":116,"second":8221,},
+    {"amount":-1,"first":118,"second":44,},
+    {"amount":-1,"first":118,"second":46,},
+    {"amount":-1,"first":119,"second":44,},
+    {"amount":-1,"first":119,"second":46,},
+    {"amount":-1,"first":121,"second":44,},
+    {"amount":-1,"first":121,"second":46,},
+    {"amount":1,"first":123,"second":73,},
+    {"amount":1,"first":123,"second":102,},
+    {"amount":1,"first":123,"second":105,},
+    {"amount":1,"first":123,"second":106,},
+    {"amount":1,"first":123,"second":108,},
+    {"amount":1,"first":123,"second":116,},
+    {"amount":1,"first":123,"second":121,},
   ],
   "last":0,
-  "lineHeight":56,
+  "lineHeight":62,
   "maintainGms1Font":false,
   "name":"fTest",
   "parent":{

notes/早上起来看这个/早上起来看这个.txt

@@ -1,3 +0,0 @@
--键位冲突问题（冲刺/闪避）
-
--输入句柄的注册与注销

notes/早上起来看这个/早上起来看这个.yy

@@ -1,11 +0,0 @@
-{
-  "$GMNotes":"v1",
-  "%Name":"早上起来看这个",
-  "name":"早上起来看这个",
-  "parent":{
-    "name":"ddmyx",
-    "path":"ddmyx.yyp",
-  },
-  "resourceType":"GMNotes",
-  "resourceVersion":"2.0",
-}

objects/oCamera/Step_0.gml

@@ -1,4 +1,4 @@
-if (instance_exists(follow))
+if instance_exists(follow)
 {
     x_to = follow.x;
     y_to = follow.y;

objects/oEnemyCrawl/Create_0.gml

@@ -1,9 +1,9 @@
 event_inherited();
 
 walk_spd = 2;
-hp = 1500;
+hp = 150;
 
-kb_factor = 1.5;
+enemy_ai = enemy_crawl_ai;
 
 collision_hitbox = icl(oEnemyHitbox);
 collision_hitbox.owner = id;

objects/oEnemyCrawl/Step_0.gml

@@ -1,15 +0,0 @@
-event_inherited();
-if endstep
-	exit;
-
-if hitstun_timer > 0 || !place_meeting(x, y + 1, oParentSolid)
-{
-	hitstun_timer -= global.time_scale;
-    x_spd = lerp(x_spd, 0, 0.15); 
-    enemy_physics(); 
-    exit;
-}
-enemy_crawl_ai();
-enemy_physics();
-
-image_xscale = facing;

objects/oEnemyCrawl/oEnemyCrawl.yy

@@ -2,7 +2,6 @@
   "$GMObject":"",
   "%Name":"oEnemyCrawl",
   "eventList":[
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],

objects/oFade/Create_0.gml

@@ -0,0 +1,11 @@
+timer = 0;         
+alpha = 0;         
+state = 0;
+
+_callback = undefined; 
+
+fade_in_time = 20;
+stay_time = 20;
+fade_out_time = 20;
+
+depth = -9999;

objects/oFade/Draw_64.gml

@@ -0,0 +1,8 @@
+draw_set_color(c_black);
+draw_set_alpha(alpha);
+
+draw_rectangle(0, 0,
+display_get_gui_width(), display_get_gui_height(), false);
+
+draw_set_colour(c_white);
+draw_set_alpha(1.0);

objects/oFade/Step_0.gml

@@ -0,0 +1,35 @@
+timer++;
+
+switch(state)
+{
+    case 0:
+        alpha = timer / fade_in_time;
+        if timer >= fade_in_time
+		{
+            state = 1;
+			timer = 0;
+		}
+        break;
+        
+    case 1:
+		alpha = 1.0;
+        if !is_undefined(_callback)
+            _callback();
+        state = 2;
+        break;
+		
+	case 2:
+		alpha = 1.0;
+		if timer >= stay_time
+		{
+			state = 3;
+			timer = 0;
+		}
+		break;
+        
+    case 3:
+        alpha = 1 - timer / fade_out_time;
+        if timer >= fade_out_time
+            instance_destroy();
+        break;
+}

objects/oFade/oFade.yy

@@ -0,0 +1,37 @@
+{
+  "$GMObject":"",
+  "%Name":"oFade",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oFade",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"CoreObjects",
+    "path":"folders/CoreObjects.yy",
+  },
+  "parentObjectId":null,
+  "persistent":false,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":null,
+  "spriteMaskId":null,
+  "visible":true,
+}

objects/oGame/Create_0.gml

@@ -1,6 +1,6 @@
 icl(oInput);
 icl(oCamera);
-icl(oPlayer, 320, 1920);
+icl(oPlayer, 160, 2016);
 
 global.g = 0.5;
 

objects/oInput/Step_0.gml

@@ -1,5 +1,5 @@
 _jump_p = kcp("Z") || kcp("K");
-_jump_r = kcr("Z") || kcr("K");
+_jump_r = kcr("Z") || kcp("K");
 _left = kc("A") || kc(vk_left);
 _right = kc("D") || kc(vk_right);
 _up = kc("W") || kc(vk_up);

objects/oParentEnemy/Create_0.gml

@@ -1,14 +1,17 @@
-hp = 1;
-walk_spd = 0;
-facing = 1;
 x_spd = 0;
 y_spd = 0;
+facing = 1;
+
+hp = 1;
+walk_spd = 0;
 
 hitstun_timer = 0;
 hitstun_max = 10;
 can_hitstun = true;
 kb_factor = 1.0;
 
+collision_hitbox = noone;
+
 is_dead = false;
 
-endstep = false;
+enemy_ai = function(){};

objects/oParentEnemy/Step_0.gml

@@ -1,4 +1,8 @@
 if check_hitstop() || is_dead
-	endstep = true;
-else
-	endstep = false;
+	exit;
+	
+enemy_ai();
+
+enemy_check_hitstun();
+
+enemy_move_and_collide();

objects/oParentPlayerHitbox/Create_0.gml

@@ -0,0 +1,19 @@
+owner = noone;
+damage = 1;
+
+hit_list = ds_list_create();
+
+x_offset = 0;
+y_offset = 0;
+
+kb_factor_x = 1.0;
+kb_factor_y = 1.0;
+
+alarm[0] = 8;
+
+hit_feedback = function(){};
+
+if global.developer_mode
+	image_blend = c_red;
+else
+	image_alpha = 0;

objects/oPlayerHitboxRec/Step_0.gml → objects/oParentPlayerHitbox/Step_0.gml

@@ -1,8 +1,5 @@
 if !instance_exists(owner)
-{
 	instance_destroy();
-	exit;
-}
 
 x = owner.x + x_offset;
 y = owner.y + y_offset;
@@ -19,15 +16,16 @@ for (var i = 0; i < _num; i++)
 		if ds_list_empty(hit_list)
             with(owner)
 			{
-                if other.kb_dir_y == 1
+                global.hitstop = other.hit_feedback;
+				if other.y_offset > 0 // 下劈
 					player_perform_pogo();
-                else
+				if other.x_offset != 0 // 反冲
 					player_perform_recoil();
             }
 		if object_is_ancestor(_inst.object_index, oParentEnemy)
             with(_inst)
 			{
-				enemy_get_hit(other.damage, other.kb_dir_x, other.kb_dir_y);
+				enemy_get_hit(other.damage, other.kb_factor_x, other.kb_factor_y);
 			}
         ds_list_add(hit_list, _inst);
     }

objects/oPlayerHitboxRec/oPlayerHitboxRec.yy → objects/oParentPlayerHitbox/oParentPlayerHitbox.yy

@@ -1,15 +1,14 @@
 {
   "$GMObject":"",
-  "%Name":"oPlayerHitboxRec",
+  "%Name":"oParentPlayerHitbox",
   "eventList":[
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
-  "name":"oPlayerHitboxRec",
+  "name":"oParentPlayerHitbox",
   "overriddenProperties":[],
   "parent":{
     "name":"Hitbox",
@@ -33,10 +32,7 @@
   "resourceType":"GMObject",
   "resourceVersion":"2.0",
   "solid":false,
-  "spriteId":{
-    "name":"sHitboxRec",
-    "path":"sprites/sHitboxRec/sHitboxRec.yy",
-  },
+  "spriteId":null,
   "spriteMaskId":null,
   "visible":true,
 }

objects/oPlayer/Alarm_1.gml

@@ -0,0 +1 @@
+state = state_free;

objects/oPlayer/Collision_oParentHazard.gml

@@ -1,2 +0,0 @@
-x = 320;
-y = 1920;

objects/oPlayer/Create_0.gml

@@ -46,4 +46,4 @@ debug_hitbox_y1 = 0;
 debug_hitbox_x2 = 0;
 debug_hitbox_y2 = 0;
 
-timer = 0;
+tp_lastsafe = false;

objects/oPlayer/Draw_0.gml

@@ -9,7 +9,8 @@ if global.developer_mode
 	draw_text(x + 72, y - 24, script_get_name(state));
 	draw_text(x + 72, y + 24, sprite_get_name(sprite_index) + " " + string(image_index));
 
-	if (state == player_dodge_y && dodge_phase == "WAIT")
+/*
+	if (state == player_dodge && dodge_phase == "WAIT")
 	{
 		draw_set_color(c_red);
     
@@ -17,4 +18,5 @@ if global.developer_mode
     
 		draw_set_color(c_white);
 	}
+*/
 }

objects/oPlayer/Step_0.gml

@@ -3,6 +3,7 @@ if check_hitstop()
 
 player_state_update();
 player_check_attacked();
+player_check_hazard();
 
 state();
 

objects/oPlayer/oPlayer.yy

@@ -4,9 +4,9 @@
   "eventList":[
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":{"name":"oParentHazard","path":"objects/oParentHazard/oParentHazard.yy",},"eventNum":0,"eventType":4,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
   "name":"oPlayer",

objects/oPlayerAfterImage/oPlayerAfterImage.yy

@@ -8,8 +8,8 @@
   "name":"oPlayerAfterImage",
   "overriddenProperties":[],
   "parent":{
-    "name":"misc",
-    "path":"folders/misc.yy",
+    "name":"Sprites",
+    "path":"folders/Player/Sprites.yy",
   },
   "parentObjectId":null,
   "persistent":false,

objects/oPlayerHitboxArc/Create_0.gml

@@ -1,7 +1,8 @@
-owner = noone;
+event_inherited();
 
 damage = 20;
 
-alarm[0] = 6;
+kb_factor_x = 100;
+kb_factor_y = -20;
 
-hit_list = ds_list_create();
+hit_feedback = 30;

objects/oPlayerHitboxArc/Draw_0.gml

@@ -1,3 +0,0 @@
-draw_set_color(c_red);
-draw_self();
-draw_set_colour(c_white);

objects/oPlayerHitboxArc/Step_0.gml

@@ -1,29 +0,0 @@
-if !instance_exists(owner)
-{
-	instance_destroy();
-	exit;
-}
-
-x = owner.x;
-y = owner.y;
-
-var _temp_list = ds_list_create();
-var _num = instance_place_list(x, y, oParentAttackable, _temp_list, false);
-
-for (var i = 0; i < _num; i++)
-{
-    var _inst = _temp_list[| i];
-
-    if ds_list_find_index(hit_list, _inst) == -1
-	{
-		if ds_list_empty(hit_list)
-			global.hitstop = 30;
-		if object_is_ancestor(_inst.object_index, oParentEnemy)
-            with(_inst)
-			{
-				enemy_get_hit(other.damage, 5 * other.image_xscale, -2.5);
-			}
-        ds_list_add(hit_list, _inst);
-    }
-}
-ds_list_destroy(_temp_list);

objects/oPlayerHitboxArc/oPlayerHitboxArc.yy

@@ -3,10 +3,6 @@
   "%Name":"oPlayerHitboxArc",
   "eventList":[
     {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
   "name":"oPlayerHitboxArc",
@@ -15,7 +11,10 @@
     "name":"Hitbox",
     "path":"folders/Player/Hitbox.yy",
   },
-  "parentObjectId":null,
+  "parentObjectId":{
+    "name":"oParentPlayerHitbox",
+    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+  },
   "persistent":false,
   "physicsAngularDamping":0.1,
   "physicsDensity":0.5,

objects/oPlayerHitboxHor/Create_0.gml

@@ -0,0 +1,7 @@
+event_inherited();
+
+damage = 5;
+
+kb_factor_x = 5;
+
+hit_feedback = 2;

objects/oPlayerHitboxHor/oPlayerHitboxHor.yy

@@ -0,0 +1,41 @@
+{
+  "$GMObject":"",
+  "%Name":"oPlayerHitboxHor",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oPlayerHitboxHor",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"Hitbox",
+    "path":"folders/Player/Hitbox.yy",
+  },
+  "parentObjectId":{
+    "name":"oParentPlayerHitbox",
+    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+  },
+  "persistent":false,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":{
+    "name":"sHitboxHor",
+    "path":"sprites/sHitboxHor/sHitboxHor.yy",
+  },
+  "spriteMaskId":null,
+  "visible":true,
+}

objects/oPlayerHitboxMark/Create_0.gml

@@ -0,0 +1,7 @@
+event_inherited();
+
+damage = 5;
+
+kb_factor_y = -5;
+
+hit_feedback = 0;

objects/oPlayerHitboxMark/oPlayerHitboxMark.yy

@@ -0,0 +1,41 @@
+{
+  "$GMObject":"",
+  "%Name":"oPlayerHitboxMark",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oPlayerHitboxMark",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"Hitbox",
+    "path":"folders/Player/Hitbox.yy",
+  },
+  "parentObjectId":{
+    "name":"oParentPlayerHitbox",
+    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+  },
+  "persistent":false,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":{
+    "name":"sHitboxMark",
+    "path":"sprites/sHitboxMark/sHitboxMark.yy",
+  },
+  "spriteMaskId":null,
+  "visible":true,
+}

objects/oPlayerHitboxRec/Alarm_0.gml

@@ -1 +0,0 @@
-instance_destroy();

objects/oPlayerHitboxRec/CleanUp_0.gml

@@ -1 +0,0 @@
-ds_list_destroy(hit_list);

objects/oPlayerHitboxRec/Create_0.gml

@@ -1,8 +0,0 @@
-owner = noone;
-is_pogo = false;
-damage = 5;
-hit_list = ds_list_create();
-x_offset = 0;
-y_offset = 0;
-
-alarm[0] = 6;

objects/oPlayerHitboxRec/Draw_0.gml

@@ -1,4 +0,0 @@
-draw_set_color(c_red);
-draw_rectangle(bbox_left, bbox_top, bbox_right, bbox_bottom, true); 
-draw_rectangle(bbox_left, bbox_top, bbox_right, bbox_bottom, false);
-draw_set_color(c_white);

objects/oPlayerHitboxVer/Create_0.gml

@@ -0,0 +1,5 @@
+event_inherited();
+
+damage = 5;
+
+hit_feedback = 2;

objects/oPlayerHitboxVer/oPlayerHitboxVer.yy

@@ -0,0 +1,41 @@
+{
+  "$GMObject":"",
+  "%Name":"oPlayerHitboxVer",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oPlayerHitboxVer",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"Hitbox",
+    "path":"folders/Player/Hitbox.yy",
+  },
+  "parentObjectId":{
+    "name":"oParentPlayerHitbox",
+    "path":"objects/oParentPlayerHitbox/oParentPlayerHitbox.yy",
+  },
+  "persistent":false,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":{
+    "name":"sHitboxVer",
+    "path":"sprites/sHitboxVer/sHitboxVer.yy",
+  },
+  "spriteMaskId":null,
+  "visible":true,
+}

objects/oSpike/Create_0.gml

@@ -0,0 +1 @@
+damage = 1;

objects/oSpike/oSpike.yy

@@ -1,7 +1,9 @@
 {
   "$GMObject":"",
   "%Name":"oSpike",
-  "eventList":[],
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
   "managed":true,
   "name":"oSpike",
   "overriddenProperties":[],

options/mac/options_mac.yy

@@ -0,0 +1,38 @@
+{
+  "$GMMacOptions":"",
+  "%Name":"macOS",
+  "name":"macOS",
+  "option_mac_allow_fullscreen":false,
+  "option_mac_allow_incoming_network":false,
+  "option_mac_allow_outgoing_network":false,
+  "option_mac_apple_sign_in":false,
+  "option_mac_app_category":"Games",
+  "option_mac_app_id":"com.company.game",
+  "option_mac_arm64":true,
+  "option_mac_build_app_store":false,
+  "option_mac_build_number":0,
+  "option_mac_copyright":"",
+  "option_mac_disable_sandbox":false,
+  "option_mac_display_cursor":true,
+  "option_mac_display_name":"ddmyx",
+  "option_mac_enable_retina":false,
+  "option_mac_enable_steam":false,
+  "option_mac_icon_png":"${base_options_dir}/mac/icons/1024.png",
+  "option_mac_installer_background_png":"${base_options_dir}/mac/splash/installer_background.png",
+  "option_mac_interpolate_pixels":true,
+  "option_mac_menu_dock":false,
+  "option_mac_min_version":"10.10",
+  "option_mac_output_dir":"~/gamemakerstudio2",
+  "option_mac_resize_window":false,
+  "option_mac_scale":0,
+  "option_mac_signing_identity":"Developer ID Application:",
+  "option_mac_splash_png":"${base_options_dir}/mac/splash/splash.png",
+  "option_mac_start_fullscreen":false,
+  "option_mac_team_id":"",
+  "option_mac_texture_page":"2048x2048",
+  "option_mac_version":"1.0.0.0",
+  "option_mac_vsync":true,
+  "option_mac_x86_64":true,
+  "resourceType":"GMMacOptions",
+  "resourceVersion":"2.0",
+}

options/main/options_main.yy

@@ -18,7 +18,7 @@
   "option_mips_for_3d_textures":false,
   "option_remove_unused_assets":true,
   "option_sci_usesci":false,
-  "option_spine_licence":false,
+  "option_spine_licence":true,
   "option_steam_app_id":"0",
   "option_template_description":null,
   "option_template_icon":"${base_options_dir}/main/template_icon.png",

options/windows/options_windows.yy

@@ -1,37 +0,0 @@
-{
-  "$GMWindowsOptions":"v1",
-  "%Name":"Windows",
-  "name":"Windows",
-  "option_windows_allow_fullscreen_switching":false,
-  "option_windows_borderless":false,
-  "option_windows_company_info":"YoYo Games Ltd",
-  "option_windows_copyright_info":"",
-  "option_windows_copy_exe_to_dest":false,
-  "option_windows_d3dswapeffectdiscard":false,
-  "option_windows_description_info":"A GameMaker Game",
-  "option_windows_disable_sandbox":false,
-  "option_windows_display_cursor":true,
-  "option_windows_display_name":"ddmyx0210",
-  "option_windows_enable_steam":false,
-  "option_windows_executable_name":"${project_name}.exe",
-  "option_windows_icon":"${base_options_dir}/windows/icons/icon.ico",
-  "option_windows_installer_finished":"${base_options_dir}/windows/installer/finished.bmp",
-  "option_windows_installer_header":"${base_options_dir}/windows/installer/header.bmp",
-  "option_windows_interpolate_pixels":true,
-  "option_windows_license":"${base_options_dir}/windows/installer/license.txt",
-  "option_windows_nsis_file":"${base_options_dir}/windows/installer/nsis_script.nsi",
-  "option_windows_product_info":"${project_name}",
-  "option_windows_resize_window":false,
-  "option_windows_save_location":0,
-  "option_windows_scale":0,
-  "option_windows_sleep_margin":10,
-  "option_windows_splash_screen":"${base_options_dir}/windows/splash/splash.png",
-  "option_windows_start_fullscreen":false,
-  "option_windows_steam_use_alternative_launcher":false,
-  "option_windows_texture_page":"2048x2048",
-  "option_windows_use_splash":false,
-  "option_windows_version":"1.0.0.0",
-  "option_windows_vsync":true,
-  "resourceType":"GMWindowsOptions",
-  "resourceVersion":"2.0",
-}

scripts/EnemyStates/EnemyStates.gml

@@ -1,32 +1,58 @@
-function enemy_physics(_solid_obj = oParentSolid) 
+function enemy_move_and_collide()
 {
-	if !place_meeting(x, y + 1, oParentSolid)
-		y_spd += global.g;
-    if place_meeting(x, y + y_spd, _solid_obj)
+	var _y_spd_total = (y_spd + y_spd_kb) * global.time_scale;
+	var _x_spd_total = (x_spd + x_spd_kb) * global.time_scale;
+	
+    if place_meeting(x, y + _y_spd_total, oParentSolid)
     {
-        while !place_meeting(x, y + sign(y_spd), _solid_obj)
-            y += sign(y_spd);
-        y_spd = 0;
+        while !place_meeting(x, y + sign(_y_spd_total), oParentSolid)
+            y += sign(_y_spd_total);
+			
+        _y_spd_total = 0;
+		y_spd = 0;
+		y_spd_kb = 0;
     }
-    y += y_spd * global.time_scale;
+    y += _y_spd_total;
 
-    if place_meeting(x + x_spd, y, _solid_obj)
+    if place_meeting(x + _x_spd_total, y, oParentSolid)
     {
-        while !place_meeting(x + sign(x_spd), y, _solid_obj)
-            x += sign(x_spd);
-        x_spd = 0;
+        while !place_meeting(x + sign(_x_spd_total), y, oParentSolid)
+            x += sign(_x_spd_total);
+			
+        _x_spd_total = 0;
+		x_spd = 0;
+		x_spd_kb = 0;
     }
-    x += x_spd * global.time_scale;
+    x += _x_spd_total;
 }
-function enemy_get_hit(_damage, _kx, _ky)
+
+function enemy_check_hitstun()
+{
+	if hitstun_timer > 0
+	{
+		hitstun_timer -= global.time_scale;
+		x_spd_kb = lerp(x_spd_kb, 0, 0.1);
+		y_spd_kb = lerp(y_spd_kb, 0, 0.1);
+	
+		x_spd = 0;
+		y_spd = 0;
+	}
+	else
+	{
+		x_spd_kb = 0;
+		y_spd_kb = 0;
+	}
+}
+
+function enemy_get_hit(_damage, _kb_x, _kb_y)
 {
     hp -= _damage;
     
     if can_hitstun
         hitstun_timer = hitstun_max;
 
-    x_spd = _kx * 10 * kb_factor;
-	y_spd = _ky * 4 * kb_factor;
+    x_spd_kb = _kb_x * kb_factor;
+	y_spd_kb = _kb_y * kb_factor;
 
     image_blend = c_blue;
     alarm[0] = 10;
@@ -37,6 +63,7 @@ function enemy_get_hit(_damage, _kx, _ky)
         instance_destroy(); // animation
     }
 }
+
 function enemy_crawl_ai()
 {
 	var _wall_ahead = place_meeting(x + facing, y, oParentSolid);
@@ -47,4 +74,5 @@ function enemy_crawl_ai()
     facing *= -1;
 	
 	x_spd = facing * walk_spd;
+	y_spd += global.g;
 }

scripts/EnemyStates/EnemyStates.yy

@@ -5,8 +5,8 @@
   "isDnD":false,
   "name":"EnemyStates",
   "parent":{
-    "name":"Scripts",
-    "path":"folders/Scripts.yy",
+    "name":"Enemy",
+    "path":"folders/Enemy.yy",
   },
   "resourceType":"GMScript",
   "resourceVersion":"2.0",

scripts/Interaction/Interaction.gml

@@ -1,67 +0,0 @@
-global.input_consumed = {}; 
-if !(variable_global_exists("handle_priority")) global.handle_priority = [1]
-
-var _max_priority = 0;
-for(var i = 0; i < array_length(global.handle_priority); i++){
-	_max_priority = max(_max_priority, global.handle_priority[i])
-}
-global.current_priority = _max_priority
-
-/// @desc 尝试对按键进行消费
-/// @param {Constant.VirtualKey|Real} _key 检测的键盘按键
-/// @param {Constant.Real} _tier 当前句柄的优先级
-function _try_input_consume(_key, _tier){
-	//如果低于最高优先级 且 非系统级优先级( -1 ), 则拒绝访问
-	if(_tier < global.current_priority && _tier != -1) return false;
-	
-	//同一帧内已经被同级句柄/更高级句柄访问( 消费 ), 则拒绝访问
-	var _key_id = string(_key);
-	if (struct_exists(global.input_consumed, _key_id)) return false;
-	
-	return true;
-}	
-
-/// @desc 强制消费给定键盘按键
-/// @param {Constant.VirtualKey|Real} _key 检测的键盘按键
-function _force_input_consume(_key){
-    var _id = key_get_id(_key);
-    global.input_consumed[$ string(_id)] = true;
-}
-
-/// @desc 优雅地检测此帧某给定键盘按键是否被按住
-/// @param {Constant.VirtualKey|Real} _key 检测的键盘按键
-/// @param {Constant.Real} _tier 当前句柄的优先级
-function kc(_key, _tier = 0)
-{
-    var _id = key_get_id(_key);
-    if (_try_input_consume(_id, _tier) && keyboard_check(_id)) {
-        //判定成功则对按键进行消费
-        global.input_consumed[$ string(_id)] = true; 
-        return true;
-    }
-    return false;
-}  
-/// @desc 优雅地检测此帧某给定键盘按键是否被按下
-/// @param {Constant.VirtualKey|Real} _key 检测的键盘按键
-/// @param {Constant.Real} _tier 当前句柄的优先级
-function kcp( _key, _tier = 0) {
-    var _id = key_get_id(_key);
-    if (_try_input_consume(_id, _tier) && keyboard_check_pressed(_id)) {
-        //判定成功则对按键进行消费
-        global.input_consumed[$ string(_id)] = true; 
-        return true;
-    }
-    return false;
-}
-/// @desc 优雅地检测此帧某给定键盘按键是否被松开
-/// @param {Constant.VirtualKey|Real} _key 检测的键盘按键
-/// @param {Constant.Real} _tier 当前句柄的优先级
-function kcr(_key, _tier = 0) {
-    var _id = key_get_id(_key);
-    if (_try_input_consume(_id, _tier) && keyboard_check_released(_id)) {
-        //判定成功则对按键进行消费
-        global.input_consumed[$ string(_id)] = true; 
-        return true;
-    }
-    return false;
-}

scripts/Interaction/Interaction.yy

@@ -1,13 +0,0 @@
-{
-  "$GMScript":"v1",
-  "%Name":"Interaction",
-  "isCompatibility":false,
-  "isDnD":false,
-  "name":"Interaction",
-  "parent":{
-    "name":"Scripts",
-    "path":"folders/Scripts.yy",
-  },
-  "resourceType":"GMScript",
-  "resourceVersion":"2.0",
-}

scripts/PlayerStates/PlayerStates.gml

@@ -1,5 +1,5 @@
 function player_move_and_collide()
-{    
+{
     if place_meeting(x, y + y_spd, oParentSolid)
 	{
         while !place_meeting(x, y + sign(y_spd), oParentSolid)
@@ -28,7 +28,8 @@ function player_move_and_collide()
         }
 	}
     x += x_spd;
- function player_state_update()
+}
+function player_state_update()
 {
 	current_attacker = instance_place(x, y, oEnemyHitbox);
 	
@@ -106,8 +107,8 @@ function state_free()
 	if _current_sprite != sprite_index
 		image_index = 0;
 	/**/
-	player_check_dodge_y();
-	if state == player_dodge_y return;
+	player_check_dodge();
+	if state == player_dodge return;
 	
 	player_check_movement();
 	player_check_dash();
@@ -118,14 +119,16 @@ function state_dash()
 {
     y_spd += 0.2 * global.g;
     icl(oPlayerAfterImage);
-	if !_on_ground
-		jump_cnt = max(jump_cnt, 1);
+	
     if animation_end()
 	{
+		if !_on_ground
+			jump_cnt = max(jump_cnt, 1);
+			
 		state = state_free;
         player_check_attack();
     }
-	player_check_dodge_y();
+	player_check_dodge();
 }
 function state_attack()
 {
@@ -135,58 +138,39 @@ function state_attack()
 	
     if image_index == 1
 	{
-        var _up = oInput._up;
-        var _down = oInput._down;
-        
-        var _hb = icd(oPlayerHitboxRec);
-		_hb.owner = id;
-        
-        var _base = 2;
-
-        if _up
+		var _hb;
+		if oInput._down && !_on_ground
 		{
-            _hb.y -= 64;
-            _hb.image_xscale = 72 / _base;
-            _hb.image_yscale = 224 / _base;
-			
-			_hb.kb_dir_x = 0;
-			_hb.kb_dir_y = -1;
-        } 
-        else if _down && !_on_ground
+			_hb = icl(oPlayerHitboxVer, x, y + 64);
+			_hb.y_offset = 64;
+		}
+		else if oInput._up
 		{
-            _hb.y += 64;
-            _hb.image_xscale = 72 / _base;
-            _hb.image_yscale = 224 / _base;
-			
-            _hb.kb_dir_x = 0;
-			_hb.kb_dir_y = 1;
-        } 
-        else
+			_hb = icl(oPlayerHitboxVer, x, y - 64);
+			_hb.y_offset = -64;
+		}
+		else
 		{
-            _hb.x += 72 * facing;
-            _hb.image_xscale = 144 / _base * facing;
-            _hb.image_yscale = 96 / _base;
+			_hb = icl(oPlayerHitboxHor, x + 72 * facing);
+			_hb.x_offset += 72 * facing;
 			
-			_hb.kb_dir_x = facing;
-			_hb.kb_dir_y = 0;
-        }
-		//攻击碰撞箱跟随
-		_hb.x_offset = _hb.x - x;
-		_hb.y_offset = _hb.y - y;
-    }
+			_hb.kb_factor_x *= facing;
+		}
+			
+		_hb.owner = id;
+	}
     // 冲刺预输入 & 预读帧数
     if image_index >= 2
-	{
-		with(oPlayerHitboxRec)
-		{
-			instance_destroy();
-		}
         player_check_dash();
-	}
 	// 攻击后摇结束
     if animation_end()
         state = state_free;
 }
+function state_locked()
+{
+	x_spd = 0;
+	y_spd += global.g;
+}
 
 function player_check_dash()
 {
@@ -208,32 +192,6 @@ function player_check_movement()
     if move_lock_timer <= 0
         x_spd = _move_dir * walk_spd;
 }
-function player_check_attacked()
-{
-	if current_attacker == noone || is_invincible
-	|| state == player_dodge_y
-		return;
-	
-	global.playerHP -= current_attacker.damage;
-	is_invincible = true;
-	alarm[0] = 80;
-	
-	var _dir = sign(x - current_attacker.x); 
-    if _dir == 0
-		_dir = facing;
-	
-	global.hitstop = 12;
-	
-	x_spd = _dir * 30;
-    y_spd = -5;
-	
-	state = player_hitstun;
-	
-	sprite_index = sPlayerHitstun;
-	image_speed = 1;
-	image_index = 0;
-	//effects
-}
 function player_check_jump()
 {
 	if oInput.jump_buffer_timer > 0
@@ -277,21 +235,75 @@ function player_check_attack()
     }
 }
 
+function player_check_attacked()
+{
+	if current_attacker == noone || is_invincible
+	|| state == player_dodge
+		return;
+	
+	global.playerHP -= current_attacker.damage;
+	is_invincible = true;
+	alarm[0] = 80;
+	
+	var _dir = sign(x - current_attacker.x); 
+    if _dir == 0
+		_dir = facing;
+	
+	global.hitstop = 12;
+	
+	x_spd = _dir * 30;
+    y_spd = -5;
+	
+	state = player_hitstun_attacked;
+	
+	sprite_index = sPlayerHitstunAttacked;
+	image_speed = 1;
+	image_index = 0;
+	//effects
+}
+function player_check_hazard()
+{
+	var _hazard = instance_place(x, y, oParentHazard);
+	
+	if _hazard != noone
+    {
+        global.playerHP -= _hazard.damage;
+		
+		is_invincible = true;
+        alarm[0] = 150;
+		
+		var _dir = sign(x - _hazard.x); 
+		if _dir == 0
+			_dir = facing;
+		
+		global.hitstop = 18;
+	
+		x_spd = _dir * 10;
+		y_spd = -10;
+		
+		state = player_hitstun_hazard;
+	
+		sprite_index = sPlayerHitstunHazard;
+		image_speed = 1;
+		image_index = 0;
+	}
+}
+
 function player_perform_pogo()
 {
 	y_spd = jump_spd * 0.8;
 	jump_cnt = 1;
 	can_dash = true;
 	coyote_timer = 0;
-	//hitstop = 3;
+	global.hitstop = 3;
 }
 function player_perform_recoil()
 {
-	x_spd = -image_xscale * 3;
+	x_spd = - facing * 3;
 	move_lock_timer = 6;
-	//hitstop = 3;
+	global.hitstop = 2;
 }
-function player_hitstun()
+function player_hitstun_attacked()
 {
 	x_spd = lerp(x_spd, 0, 0.1);	
 	y_spd += global.g;
@@ -299,14 +311,32 @@ function player_hitstun()
 	if animation_end()
 		state = state_free;
 }
+function player_hitstun_hazard()
+{
+	x_spd = lerp(x_spd, 0, 0.1);
+	y_spd += global.g;
+	
+	if animation_end()
+	{
+		alarm[1] = 60;
+		state = state_locked;
+		var _fade = icl(oFade);
+		_fade._callback = function()
+		{
+			oPlayer.x = 160;//oPlayer.last_safe_x;
+			oPlayer.y = 2016;//oPlayer.last_safe_y;
+			camera_snap();
+		};
+	}
+}
 
-function player_check_dodge_y()
+function player_check_dodge()
 {
 	if (oInput._down || oInput._up) && _on_ground
 	&& (oInput._dash || state == state_dash)
 	{
-		state = player_dodge_y;
-		sprite_index = sPlayerDodgeYWait;
+		state = player_dodge;
+		sprite_index = sPlayerDodgeWait;
 		image_index = 0;
 		image_speed = 1;
 		
@@ -315,22 +345,25 @@ function player_check_dodge_y()
 		marked_target = noone;
 		is_marked = false;
 		is_perfect = false;
+		
+		var _hb = icl(oPlayerHitboxMark, x + facing * 60, y + 40);
+		_hb.owner = id;
+		_hb.x_offset = 60 * facing;
+		_hb.y_offset = 40;
 	}
 }
-function player_dodge_y()
+function player_dodge()
 {
 	if dodge_phase == "WAIT"
 	{
 		x_spd = 0;
-		if !is_marked
-			player_check_mark_y();
 
 		if current_attacker != noone || animation_end()
 		{
 			y_spd = jump_spd;
 			dodge_phase = "DODGE";
 			
-			sprite_index = sPlayerDodgeYDodge;
+			sprite_index = sPlayerDodge;
 			image_index = 0;
 			
 			if current_attacker != noone && is_marked
@@ -364,8 +397,8 @@ function player_dodge_y()
 			}
 			else
 			{
-				state = player_dodge_y_ending;
-				sprite_index = sPlayerDodgeYEnding;
+				state = player_dodge_ending;
+				sprite_index = sPlayerDodgeEnding;
 				image_index = 0;
 			}
 		}
@@ -375,13 +408,22 @@ function player_arc_slash()
 {
     if image_index == 7
 	{
-		var _hb = icd(oPlayerHitboxArc);
+		var _hb = icl(oPlayerHitboxArc);
         _hb.owner = id;
         
         if facing == 1
+		{
             _hb.image_xscale = 1;
+			_hb.image_angle = 30;
+			_hb.kb_factor_x *= 1;
+		}
 		else
-            _hb.image_xscale = -1; 
+		{
+            _hb.image_xscale = -1;
+			_hb.image_angle = -30;
+			_hb.kb_factor_x *= -1;
+		}
+		
     }
 	else if animation_end()
 	{
@@ -389,34 +431,32 @@ function player_arc_slash()
         state = state_free;
     }
 }
-function player_dodge_y_ending()
+function player_dodge_ending()
 {
     if animation_end()
 		state = state_free;
 }
-function player_check_mark_y()
+function player_check_mark()
 {
-    // 定义矩形相对于玩家中心的偏移和尺寸
+
+    /*
     var _width  = 2 * (72 + 16);
     var _height = 64;
     var _x_offset = facing * (36 + 16);
     var _y_offset = 0;
     
-    // 计算出矩形的四个边界坐标
     var x1 = x + _x_offset - (_width / 2);
     var y1 = y + _y_offset;
     var x2 = x + _x_offset + (_width / 2);
     var y2 = y + _y_offset + _height;
 
-    // 将这些坐标存入变量
     debug_hitbox_x1 = x1;
     debug_hitbox_y1 = y1;
     debug_hitbox_x2 = x2;
     debug_hitbox_y2 = y2;
 
-    // 执行核心碰撞检测
     var _target = collision_rectangle(x1, y1, x2, y2, oParentEnemy, false, true);
- 
+
     if _target != noone
 	{
         is_marked = true;
@@ -424,4 +464,6 @@ function player_check_mark_y()
         // animation
         // instance_create_layer(_target.x, _target.y, "FX", oFx_Marked);
     }
+	*/
+	
 }

scripts/PlayerStates/PlayerStates.yy

@@ -5,8 +5,8 @@
   "isDnD":false,
   "name":"PlayerStates",
   "parent":{
-    "name":"Scripts",
-    "path":"folders/Scripts.yy",
+    "name":"Player",
+    "path":"folders/Player.yy",
   },
   "resourceType":"GMScript",
   "resourceVersion":"2.0",

scripts/Simplifier/Simplifier.gml

@@ -21,7 +21,6 @@ function icl(_obj, _x = x, _y = y, _layer_id = "Instances")
 function key_get_id(_key) {
     return is_string(_key) ? ord(_key) : _key;
 }
-/*
 /// @desc 优雅地检测此帧某给定键盘按键是否被按住
 /// @param {Constant.VirtualKey|Real} _key 检测的键盘按键
 function kc(_key)
@@ -30,13 +29,11 @@ function kc(_key)
 }  
 /// @desc 优雅地检测此帧某给定键盘按键是否被按下
 /// @param {Constant.VirtualKey|Real} _key 检测的键盘按键
-function kcp( _key) {
+function kcp(_key) {
     return keyboard_check_pressed(key_get_id(_key));
 }
 /// @desc 优雅地检测此帧某给定键盘按键是否被松开
 /// @param {Constant.VirtualKey|Real} _key 检测的键盘按键
 function kcr(_key) {
     return keyboard_check_released(key_get_id(_key));
-}
-已移动至Interaction.gml
-*/
+}

scripts/general/general.gml

@@ -1,9 +1,15 @@
 function check_hitstop()
 {
 	if global.hitstop > 0
+	{
+		image_speed = 0;
 		return true;
+	}
 	else
+	{
+		image_speed = 1;
 		return false;
+	}
 }
 /// @desc 优雅地检测该实例的sprite当前动画是否到达最后一帧
 function animation_end()
@@ -11,4 +17,10 @@ function animation_end()
 	if (image_speed == 0)
 		return false;
     return (image_index + image_speed >= image_number);
+}
+
+function camera_snap()
+{
+	oCamera.x = oCamera.x_to;
+	oCamera.y = oCamera.y_to;	
 }

sprites/sHitboxArc/sHitboxArc.yy

@@ -5,7 +5,7 @@
   "bbox_bottom":511,
   "bbox_left":0,
   "bbox_right":511,
-  "bbox_top":96,
+  "bbox_top":129,
   "collisionKind":1,
   "collisionTolerance":0,
   "DynamicTexturePage":false,

sprites/sHitboxRec/sHitboxRec.yy → sprites/sHitboxHor/sHitboxHor.yy

@@ -1,10 +1,10 @@
 {
   "$GMSprite":"v2",
-  "%Name":"sHitboxRec",
+  "%Name":"sHitboxHor",
   "bboxMode":0,
-  "bbox_bottom":1,
+  "bbox_bottom":95,
   "bbox_left":0,
-  "bbox_right":1,
+  "bbox_right":143,
   "bbox_top":0,
   "collisionKind":1,
   "collisionTolerance":0,
@@ -16,12 +16,12 @@
   ],
   "gridX":0,
   "gridY":0,
-  "height":2,
+  "height":96,
   "HTile":false,
   "layers":[
     {"$GMImageLayer":"","%Name":"697040fe-66b1-4c20-9282-88683dd20e44","blendMode":0,"displayName":"default","isLocked":false,"name":"697040fe-66b1-4c20-9282-88683dd20e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
   ],
-  "name":"sHitboxRec",
+  "name":"sHitboxHor",
   "nineSlice":null,
   "origin":4,
   "parent":{
@@ -33,7 +33,7 @@
   "resourceVersion":"2.0",
   "sequence":{
     "$GMSequence":"v1",
-    "%Name":"sHitboxRec",
+    "%Name":"sHitboxHor",
     "autoRecord":true,
     "backdropHeight":768,
     "backdropImageOpacity":0.5,
@@ -57,7 +57,7 @@
       "resourceType":"KeyframeStore<MomentsEventKeyframe>",
       "resourceVersion":"2.0",
     },
-    "name":"sHitboxRec",
+    "name":"sHitboxHor",
     "playback":1,
     "playbackSpeed":30.0,
     "playbackSpeedType":0,
@@ -69,14 +69,14 @@
     "tracks":[
       {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","path":"sprites/sHitboxRec/sHitboxRec.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","path":"sprites/sHitboxHor/sHitboxHor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"5a775b81-534b-4082-b351-9b23dbf1f88a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
           ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
     ],
     "visibleRange":null,
     "volume":1.0,
-    "xorigin":1,
-    "yorigin":1,
+    "xorigin":72,
+    "yorigin":48,
   },
   "swatchColours":null,
   "swfPrecision":0.5,
@@ -86,5 +86,5 @@
   },
   "type":0,
   "VTile":false,
-  "width":2,
+  "width":144,
 }

sprites/sHitboxMark/sHitboxMark.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sHitboxMark",
+  "bboxMode":0,
+  "bbox_bottom":47,
+  "bbox_left":0,
+  "bbox_right":191,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":48,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"697040fe-66b1-4c20-9282-88683dd20e44","blendMode":0,"displayName":"default","isLocked":false,"name":"697040fe-66b1-4c20-9282-88683dd20e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sHitboxMark",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"UIsprite",
+    "path":"folders/UIsprite.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sHitboxMark",
+    "autoRecord":true,
+    "backdropHeight":768,
+    "backdropImageOpacity":0.5,
+    "backdropImagePath":"",
+    "backdropWidth":1366,
+    "backdropXOffset":0.0,
+    "backdropYOffset":0.0,
+    "events":{
+      "$KeyframeStore<MessageEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MessageEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "eventStubScript":null,
+    "eventToFunction":{},
+    "length":1.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sHitboxMark",
+    "playback":1,
+    "playbackSpeed":30.0,
+    "playbackSpeedType":0,
+    "resourceType":"GMSequence",
+    "resourceVersion":"2.0",
+    "showBackdrop":true,
+    "showBackdropImage":false,
+    "timeUnits":1,
+    "tracks":[
+      {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","path":"sprites/sHitboxMark/sHitboxMark.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"5a775b81-534b-4082-b351-9b23dbf1f88a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+          ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
+    ],
+    "visibleRange":null,
+    "volume":1.0,
+    "xorigin":96,
+    "yorigin":24,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":192,
+}

sprites/sHitboxVer/sHitboxVer.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sHitboxVer",
+  "bboxMode":0,
+  "bbox_bottom":223,
+  "bbox_left":0,
+  "bbox_right":71,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":224,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"697040fe-66b1-4c20-9282-88683dd20e44","blendMode":0,"displayName":"default","isLocked":false,"name":"697040fe-66b1-4c20-9282-88683dd20e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sHitboxVer",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"UIsprite",
+    "path":"folders/UIsprite.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sHitboxVer",
+    "autoRecord":true,
+    "backdropHeight":768,
+    "backdropImageOpacity":0.5,
+    "backdropImagePath":"",
+    "backdropWidth":1366,
+    "backdropXOffset":0.0,
+    "backdropYOffset":0.0,
+    "events":{
+      "$KeyframeStore<MessageEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MessageEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "eventStubScript":null,
+    "eventToFunction":{},
+    "length":1.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sHitboxVer",
+    "playback":1,
+    "playbackSpeed":30.0,
+    "playbackSpeedType":0,
+    "resourceType":"GMSequence",
+    "resourceVersion":"2.0",
+    "showBackdrop":true,
+    "showBackdropImage":false,
+    "timeUnits":1,
+    "tracks":[
+      {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1218c0f1-724c-4ab3-94fd-98b4d8d18aba","path":"sprites/sHitboxVer/sHitboxVer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"5a775b81-534b-4082-b351-9b23dbf1f88a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+          ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
+    ],
+    "visibleRange":null,
+    "volume":1.0,
+    "xorigin":36,
+    "yorigin":112,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":72,
+}

sprites/sPlayerDodgeYDodge/sPlayerDodgeYDodge.yy → sprites/sPlayerDodge/sPlayerDodge.yy

@@ -1,6 +1,6 @@
 {
   "$GMSprite":"v2",
-  "%Name":"sPlayerDodgeYDodge",
+  "%Name":"sPlayerDodge",
   "bboxMode":1,
   "bbox_bottom":127,
   "bbox_left":0,
@@ -24,7 +24,7 @@
   "layers":[
     {"$GMImageLayer":"","%Name":"21d8bf7d-8959-4267-a6af-fcedb5d5d32f","blendMode":0,"displayName":"default","isLocked":false,"name":"21d8bf7d-8959-4267-a6af-fcedb5d5d32f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
   ],
-  "name":"sPlayerDodgeYDodge",
+  "name":"sPlayerDodge",
   "nineSlice":null,
   "origin":4,
   "parent":{
@@ -36,7 +36,7 @@
   "resourceVersion":"2.0",
   "sequence":{
     "$GMSequence":"v1",
-    "%Name":"sPlayerDodgeYDodge",
+    "%Name":"sPlayerDodge",
     "autoRecord":true,
     "backdropHeight":768,
     "backdropImageOpacity":0.5,
@@ -60,7 +60,7 @@
       "resourceType":"KeyframeStore<MomentsEventKeyframe>",
       "resourceVersion":"2.0",
     },
-    "name":"sPlayerDodgeYDodge",
+    "name":"sPlayerDodge",
     "playback":1,
     "playbackSpeed":15.0,
     "playbackSpeedType":0,
@@ -72,16 +72,16 @@
     "tracks":[
       {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e059014-ab30-43ef-b64b-2c190950eb74","path":"sprites/sPlayerDodgeYDodge/sPlayerDodgeYDodge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e059014-ab30-43ef-b64b-2c190950eb74","path":"sprites/sPlayerDodge/sPlayerDodge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"be693aeb-a110-4fa9-8fa3-2f20a287f903","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"024d89c6-16ff-4e8a-9a31-69abf3768033","path":"sprites/sPlayerDodgeYDodge/sPlayerDodgeYDodge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"024d89c6-16ff-4e8a-9a31-69abf3768033","path":"sprites/sPlayerDodge/sPlayerDodge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"f5842df1-e49b-4322-9e97-71a26feace32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6739d4db-a1f7-4970-807d-dc609eaeba97","path":"sprites/sPlayerDodgeYDodge/sPlayerDodgeYDodge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6739d4db-a1f7-4970-807d-dc609eaeba97","path":"sprites/sPlayerDodge/sPlayerDodge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"4a7cef2c-dd3c-4451-acad-d163816dd562","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16f6de5b-f9ba-40c6-953b-4ccf70d5666e","path":"sprites/sPlayerDodgeYDodge/sPlayerDodgeYDodge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16f6de5b-f9ba-40c6-953b-4ccf70d5666e","path":"sprites/sPlayerDodge/sPlayerDodge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"31464e0f-a6a3-4ce3-b258-a8587262f623","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
           ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
     ],