diff --git a/src/love/images/png/characters/darnellFighting.png b/src/love/images/png/characters/darnellFighting.png new file mode 100644 index 00000000..ea0d3c87 Binary files /dev/null and b/src/love/images/png/characters/darnellFighting.png differ diff --git a/src/love/sprites/characters/darnell-fighting.lua b/src/love/sprites/characters/darnell-fighting.lua new file mode 100644 index 00000000..9745af0d --- /dev/null +++ b/src/love/sprites/characters/darnell-fighting.lua @@ -0,0 +1,169 @@ +return graphics.newSprite( + love.graphics.newImage(graphics.imagePath("characters/darnellFighting")), + -- Automatically generated from Darnell Fighting Animations V2.xml + { + {x = 2550, y = 543, width = 413, height = 519, offsetX = 2, offsetY = 2, offsetWidth = 414, offsetHeight = 515, rotated = false}, -- 1: Blocking Darnell0000 + {x = 2550, y = 543, width = 413, height = 519, offsetX = 2, offsetY = 2, offsetWidth = 414, offsetHeight = 515, rotated = false}, -- 2: Blocking Darnell0001 + {x = 2973, y = 997, width = 399, height = 518, offsetX = -17, offsetY = 1, offsetWidth = 414, offsetHeight = 515, rotated = false}, -- 3: Blocking Darnell0002 + {x = 2973, y = 997, width = 399, height = 518, offsetX = -17, offsetY = 1, offsetWidth = 414, offsetHeight = 515, rotated = false}, -- 4: Blocking Darnell0003 + {x = 2973, y = 997, width = 399, height = 518, offsetX = -17, offsetY = 1, offsetWidth = 414, offsetHeight = 515, rotated = false}, -- 5: Blocking Darnell0004 + {x = 410, y = 967, width = 450, height = 574, offsetX = 2, offsetY = 2, offsetWidth = 446, offsetHeight = 575, rotated = false}, -- 6: Hit High Darnell0000 + {x = 410, y = 967, width = 450, height = 574, offsetX = 2, offsetY = 2, offsetWidth = 446, offsetHeight = 575, rotated = false}, -- 7: Hit High Darnell0001 + {x = 1606, y = 535, width = 427, height = 578, offsetX = -16, offsetY = 1, offsetWidth = 446, offsetHeight = 575, rotated = false}, -- 8: Hit High Darnell0002 + {x = 1606, y = 535, width = 427, height = 578, offsetX = -16, offsetY = 1, offsetWidth = 446, offsetHeight = 575, rotated = false}, -- 9: Hit High Darnell0003 + {x = 1606, y = 535, width = 427, height = 578, offsetX = -16, offsetY = 1, offsetWidth = 446, offsetHeight = 575, rotated = false}, -- 10: Hit High Darnell0004 + {x = 1606, y = 535, width = 427, height = 578, offsetX = -16, offsetY = 1, offsetWidth = 446, offsetHeight = 575, rotated = false}, -- 11: Hit High Darnell0005 + {x = 1606, y = 535, width = 427, height = 578, offsetX = -16, offsetY = 1, offsetWidth = 446, offsetHeight = 575, rotated = false}, -- 12: Hit High Darnell0006 + {x = 1955, y = 2520, width = 392, height = 493, offsetX = 2, offsetY = -13, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 13: Idle Fight Darnell0000 + {x = 1955, y = 2520, width = 392, height = 493, offsetX = 2, offsetY = -13, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 14: Idle Fight Darnell0001 + {x = 1563, y = 2520, width = 392, height = 493, offsetX = 2, offsetY = -13, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 15: Idle Fight Darnell0002 + {x = 1169, y = 2520, width = 394, height = 493, offsetX = 1, offsetY = -13, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 16: Idle Fight Darnell0003 + {x = 2087, y = 1575, width = 394, height = 497, offsetX = 1, offsetY = -9, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 17: Idle Fight Darnell0004 + {x = 2087, y = 1575, width = 394, height = 497, offsetX = 1, offsetY = -9, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 18: Idle Fight Darnell0005 + {x = 780, y = 2520, width = 389, height = 505, offsetX = -3, offsetY = -1, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 19: Idle Fight Darnell0006 + {x = 780, y = 2520, width = 389, height = 505, offsetX = -3, offsetY = -1, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 20: Idle Fight Darnell0007 + {x = 391, y = 2520, width = 389, height = 507, offsetX = -3, offsetY = 1, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 21: Idle Fight Darnell0008 + {x = 0, y = 2520, width = 391, height = 507, offsetX = -3, offsetY = 1, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 22: Idle Fight Darnell0009 + {x = 0, y = 2520, width = 391, height = 507, offsetX = -3, offsetY = 1, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 23: Idle Fight Darnell0010 + {x = 2973, y = 1998, width = 391, height = 508, offsetX = -1, offsetY = 2, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 24: Idle Fight Darnell0011 + {x = 2973, y = 1998, width = 391, height = 508, offsetX = -1, offsetY = 2, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 25: Idle Fight Darnell0012 + {x = 2973, y = 1998, width = 391, height = 508, offsetX = -1, offsetY = 2, offsetWidth = 392, offsetHeight = 504, rotated = false}, -- 26: Idle Fight Darnell0013 + {x = 3389, y = 1081, width = 329, height = 501, offsetX = -3, offsetY = -5, offsetWidth = 334, offsetHeight = 504, rotated = false}, -- 27: cringe darnell0000 + {x = 3389, y = 1081, width = 329, height = 501, offsetX = -3, offsetY = -5, offsetWidth = 334, offsetHeight = 504, rotated = false}, -- 28: cringe darnell0001 + {x = 3389, y = 574, width = 338, height = 507, offsetX = 2, offsetY = 2, offsetWidth = 334, offsetHeight = 504, rotated = false}, -- 29: cringe darnell0002 + {x = 3389, y = 574, width = 338, height = 507, offsetX = 2, offsetY = 2, offsetWidth = 334, offsetHeight = 504, rotated = false}, -- 30: cringe darnell0003 + {x = 3389, y = 574, width = 338, height = 507, offsetX = 2, offsetY = 2, offsetWidth = 334, offsetHeight = 504, rotated = false}, -- 31: cringe darnell0004 + {x = 0, y = 3027, width = 375, height = 457, offsetX = 2, offsetY = 2, offsetWidth = 371, offsetHeight = 453, rotated = false}, -- 32: ddg snap grey darnell0000 + {x = 2725, y = 2520, width = 376, height = 458, offsetX = 0, offsetY = -1, offsetWidth = 377, offsetHeight = 461, rotated = false}, -- 33: dodge darnell0000 + {x = 2725, y = 2520, width = 376, height = 458, offsetX = 0, offsetY = -1, offsetWidth = 377, offsetHeight = 461, rotated = false}, -- 34: dodge darnell0001 + {x = 2347, y = 2520, width = 378, height = 461, offsetX = 2, offsetY = 2, offsetWidth = 377, offsetHeight = 461, rotated = false}, -- 35: dodge darnell0002 + {x = 2347, y = 2520, width = 378, height = 461, offsetX = 2, offsetY = 2, offsetWidth = 377, offsetHeight = 461, rotated = false}, -- 36: dodge darnell0003 + {x = 2347, y = 2520, width = 378, height = 461, offsetX = 2, offsetY = 2, offsetWidth = 377, offsetHeight = 461, rotated = false}, -- 37: dodge darnell0004 + {x = 518, y = 2074, width = 484, height = 430, offsetX = 0, offsetY = -4, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 38: fake out darnell0000 + {x = 518, y = 2074, width = 484, height = 430, offsetX = 0, offsetY = -4, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 39: fake out darnell0001 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 40: fake out darnell0002 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 41: fake out darnell0003 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 42: fake out darnell0004 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 43: fake out darnell0005 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 44: fake out darnell0006 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 45: fake out darnell0007 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 46: fake out darnell0008 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 47: fake out darnell0009 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 48: fake out darnell0010 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 49: fake out darnell0011 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 50: fake out darnell0012 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 51: fake out darnell0013 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 52: fake out darnell0014 + {x = 1606, y = 1113, width = 474, height = 436, offsetX = 2, offsetY = 2, offsetWidth = 483, offsetHeight = 433, rotated = false}, -- 53: fake out darnell0015 + {x = 0, y = 0, width = 634, height = 460, offsetX = 2, offsetY = -22, offsetWidth = 630, offsetHeight = 480, rotated = false}, -- 54: hit low darnell0000 + {x = 0, y = 0, width = 634, height = 460, offsetX = 2, offsetY = -22, offsetWidth = 630, offsetHeight = 480, rotated = false}, -- 55: hit low darnell0001 + {x = 2973, y = 1515, width = 412, height = 483, offsetX = -141, offsetY = 2, offsetWidth = 630, offsetHeight = 480, rotated = false}, -- 56: hit low darnell0002 + {x = 2973, y = 1515, width = 412, height = 483, offsetX = -141, offsetY = 2, offsetWidth = 630, offsetHeight = 480, rotated = false}, -- 57: hit low darnell0003 + {x = 2973, y = 1515, width = 412, height = 483, offsetX = -141, offsetY = 2, offsetWidth = 630, offsetHeight = 480, rotated = false}, -- 58: hit low darnell0004 + {x = 2973, y = 1515, width = 412, height = 483, offsetX = -141, offsetY = 2, offsetWidth = 630, offsetHeight = 480, rotated = false}, -- 59: hit low darnell0005 + {x = 3389, y = 1582, width = 339, height = 483, offsetX = 2, offsetY = -1, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 60: pissed darnell0000 + {x = 3389, y = 1582, width = 339, height = 483, offsetX = 2, offsetY = -1, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 61: pissed darnell0001 + {x = 3389, y = 2065, width = 333, height = 487, offsetX = -1, offsetY = 2, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 62: pissed darnell0002 + {x = 3389, y = 2065, width = 333, height = 487, offsetX = -1, offsetY = 2, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 63: pissed darnell0003 + {x = 3389, y = 2065, width = 333, height = 487, offsetX = -1, offsetY = 2, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 64: pissed darnell0004 + {x = 3389, y = 2065, width = 333, height = 487, offsetX = -1, offsetY = 2, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 65: pissed darnell0005 + {x = 3389, y = 2065, width = 333, height = 487, offsetX = -1, offsetY = 2, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 66: pissed darnell0006 + {x = 3389, y = 2065, width = 333, height = 487, offsetX = -1, offsetY = 2, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 67: pissed darnell0007 + {x = 3389, y = 2065, width = 333, height = 487, offsetX = -1, offsetY = 2, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 68: pissed darnell0008 + {x = 3389, y = 2065, width = 333, height = 487, offsetX = -1, offsetY = 2, offsetWidth = 335, offsetHeight = 483, rotated = false}, -- 69: pissed darnell0009 + {x = 1485, y = 2074, width = 481, height = 331, offsetX = 2, offsetY = -8, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 70: pre-uppercut darnell0000 + {x = 1485, y = 2074, width = 481, height = 331, offsetX = 2, offsetY = -8, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 71: pre-uppercut darnell0001 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 72: pre-uppercut darnell0002 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 73: pre-uppercut darnell0003 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 74: pre-uppercut darnell0004 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 75: pre-uppercut darnell0005 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 76: pre-uppercut darnell0006 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 77: pre-uppercut darnell0007 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 78: pre-uppercut darnell0008 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 79: pre-uppercut darnell0009 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 80: pre-uppercut darnell0010 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 81: pre-uppercut darnell0011 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 82: pre-uppercut darnell0012 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 83: pre-uppercut darnell0013 + {x = 1002, y = 2074, width = 483, height = 341, offsetX = -6, offsetY = 2, offsetWidth = 487, offsetHeight = 337, rotated = false}, -- 84: pre-uppercut darnell0014 + {x = 0, y = 1598, width = 531, height = 476, offsetX = 1, offsetY = 2, offsetWidth = 528, offsetHeight = 472, rotated = false}, -- 85: punch high 2 darnell 0000 + {x = 0, y = 1598, width = 531, height = 476, offsetX = 1, offsetY = 2, offsetWidth = 528, offsetHeight = 472, rotated = false}, -- 86: punch high 2 darnell 0001 + {x = 531, y = 1598, width = 509, height = 473, offsetX = 2, offsetY = -1, offsetWidth = 528, offsetHeight = 472, rotated = false}, -- 87: punch high 2 darnell 0002 + {x = 531, y = 1598, width = 509, height = 473, offsetX = 2, offsetY = -1, offsetWidth = 528, offsetHeight = 472, rotated = false}, -- 88: punch high 2 darnell 0003 + {x = 531, y = 1598, width = 509, height = 473, offsetX = 2, offsetY = -1, offsetWidth = 528, offsetHeight = 472, rotated = false}, -- 89: punch high 2 darnell 0004 + {x = 0, y = 460, width = 542, height = 507, offsetX = -2, offsetY = 1, offsetWidth = 542, offsetHeight = 504, rotated = false}, -- 90: punch high Darnell0000 + {x = 0, y = 460, width = 542, height = 507, offsetX = -2, offsetY = 1, offsetWidth = 542, offsetHeight = 504, rotated = false}, -- 91: punch high Darnell0001 + {x = 1088, y = 0, width = 518, height = 507, offsetX = 2, offsetY = 1, offsetWidth = 542, offsetHeight = 504, rotated = false}, -- 92: punch high Darnell0002 + {x = 1088, y = 0, width = 518, height = 507, offsetX = 2, offsetY = 1, offsetWidth = 542, offsetHeight = 504, rotated = false}, -- 93: punch high Darnell0003 + {x = 1088, y = 0, width = 518, height = 507, offsetX = 2, offsetY = 1, offsetWidth = 542, offsetHeight = 504, rotated = false}, -- 94: punch high Darnell0004 + {x = 0, y = 2074, width = 518, height = 446, offsetX = -1, offsetY = -5, offsetWidth = 517, offsetHeight = 449, rotated = false}, -- 95: punch low 2 Darnell 0000 + {x = 0, y = 2074, width = 518, height = 446, offsetX = -1, offsetY = -5, offsetWidth = 517, offsetHeight = 449, rotated = false}, -- 96: punch low 2 Darnell 0001 + {x = 1570, y = 1598, width = 497, height = 452, offsetX = 2, offsetY = 1, offsetWidth = 517, offsetHeight = 449, rotated = false}, -- 97: punch low 2 Darnell 0002 + {x = 1570, y = 1598, width = 497, height = 452, offsetX = 2, offsetY = 1, offsetWidth = 517, offsetHeight = 449, rotated = false}, -- 98: punch low 2 Darnell 0003 + {x = 1570, y = 1598, width = 497, height = 452, offsetX = 2, offsetY = 1, offsetWidth = 517, offsetHeight = 449, rotated = false}, -- 99: punch low 2 Darnell 0004 + {x = 1040, y = 1598, width = 530, height = 452, offsetX = 0, offsetY = -6, offsetWidth = 528, offsetHeight = 456, rotated = false}, -- 100: punch low darnell0000 + {x = 1040, y = 1598, width = 530, height = 452, offsetX = 0, offsetY = -6, offsetWidth = 528, offsetHeight = 456, rotated = false}, -- 101: punch low darnell0001 + {x = 1088, y = 507, width = 513, height = 460, offsetX = 2, offsetY = 2, offsetWidth = 528, offsetHeight = 456, rotated = false}, -- 102: punch low darnell0002 + {x = 1088, y = 507, width = 513, height = 460, offsetX = 2, offsetY = 2, offsetWidth = 528, offsetHeight = 456, rotated = false}, -- 103: punch low darnell0003 + {x = 1088, y = 507, width = 513, height = 460, offsetX = 2, offsetY = 2, offsetWidth = 528, offsetHeight = 456, rotated = false}, -- 104: punch low darnell0004 + {x = 2550, y = 1062, width = 382, height = 560, offsetX = -46, offsetY = -17, offsetWidth = 426, offsetHeight = 575, rotated = false}, -- 105: spinning darnell0000 + {x = 3389, y = 0, width = 345, height = 574, offsetX = -18, offsetY = 2, offsetWidth = 426, offsetHeight = 575, rotated = false}, -- 106: spinning darnell0001 + {x = 2550, y = 0, width = 423, height = 543, offsetX = 2, offsetY = -12, offsetWidth = 426, offsetHeight = 575, rotated = false}, -- 107: spinning darnell0002 + {x = 634, y = 0, width = 454, height = 579, offsetX = -10, offsetY = -42, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 108: uppercit hit darnell0000 + {x = 0, y = 967, width = 410, height = 631, offsetX = -20, offsetY = 2, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 109: uppercit hit darnell0001 + {x = 0, y = 967, width = 410, height = 631, offsetX = -20, offsetY = 2, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 110: uppercit hit darnell0002 + {x = 2550, y = 1622, width = 412, height = 506, offsetX = -3, offsetY = -128, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 111: uppercit hit darnell0003 + {x = 2550, y = 1622, width = 412, height = 506, offsetX = -3, offsetY = -128, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 112: uppercit hit darnell0004 + {x = 2973, y = 0, width = 416, height = 500, offsetX = 1, offsetY = -133, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 113: uppercit hit darnell0005 + {x = 2973, y = 0, width = 416, height = 500, offsetX = 1, offsetY = -133, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 114: uppercit hit darnell0006 + {x = 2973, y = 500, width = 416, height = 497, offsetX = 2, offsetY = -136, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 115: uppercit hit darnell0007 + {x = 2973, y = 500, width = 416, height = 497, offsetX = 2, offsetY = -136, offsetWidth = 462, offsetHeight = 632, rotated = false}, -- 116: uppercit hit darnell0008 + {x = 1606, y = 0, width = 481, height = 535, offsetX = -2, offsetY = 2, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 117: uppercut darnell0000 + {x = 860, y = 967, width = 481, height = 535, offsetX = -2, offsetY = 2, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 118: uppercut darnell0001 + {x = 2087, y = 525, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 119: uppercut darnell0002 + {x = 2087, y = 0, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 120: uppercut darnell0003 + {x = 2087, y = 1050, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 121: uppercut darnell0004 + {x = 2087, y = 525, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 122: uppercut darnell0005 + {x = 2087, y = 0, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 123: uppercut darnell0006 + {x = 2087, y = 1050, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 124: uppercut darnell0007 + {x = 2087, y = 525, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 125: uppercut darnell0008 + {x = 2087, y = 0, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 126: uppercut darnell0009 + {x = 2087, y = 1050, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 127: uppercut darnell0010 + {x = 2087, y = 525, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 128: uppercut darnell0011 + {x = 2087, y = 0, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 129: uppercut darnell0012 + {x = 2087, y = 1050, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 130: uppercut darnell0013 + {x = 2087, y = 525, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 131: uppercut darnell0014 + {x = 2087, y = 0, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 132: uppercut darnell0015 + {x = 2087, y = 1050, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 133: uppercut darnell0016 + {x = 2087, y = 525, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 134: uppercut darnell0017 + {x = 2087, y = 0, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 135: uppercut darnell0018 + {x = 2087, y = 1050, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 136: uppercut darnell0019 + {x = 2087, y = 525, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 137: uppercut darnell0020 + {x = 2087, y = 0, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false}, -- 138: uppercut darnell0021 + {x = 2087, y = 1050, width = 463, height = 525, offsetX = 2, offsetY = -8, offsetWidth = 481, offsetHeight = 531, rotated = false} -- 139: uppercut darnell0022 + }, + { + ["idle"] = {start = 13, stop = 26, speed = 24, offsetX = 0, offsetY = 0}, + ["blocking"] = {start = 1, stop = 5, speed = 24, offsetX = 0, offsetY = 0}, + ["hit high"] = {start = 6, stop = 12, speed = 24, offsetX = 0, offsetY = 0}, + ["cringe"] = {start = 27, stop = 31, speed = 24, offsetX = 0, offsetY = 0}, + ["dodge"] = {start = 33, stop = 37, speed = 24, offsetX = 0, offsetY = 0}, + ["fake out"] = {start = 38, stop = 53, speed = 24, offsetX = 0, offsetY = 0}, + ["hit low"] = {start = 54, stop = 59, speed = 24, offsetX = 0, offsetY = 0}, + ["pissed"] = {start = 60, stop = 69, speed = 24, offsetX = 0, offsetY = 0}, + ["pre-uppercut"] = {start = 70, stop = 84, speed = 24, offsetX = 0, offsetY = 0}, + ["punch high 2"] = {start = 85, stop = 89, speed = 24, offsetX = 0, offsetY = 0}, + ["punch high"] = {start = 90, stop = 94, speed = 24, offsetX = 0, offsetY = 0}, + ["punch low 2"] = {start = 95, stop = 99, speed = 24, offsetX = 0, offsetY = 0}, + ["punch low"] = {start = 100, stop = 104, speed = 24, offsetX = 0, offsetY = 0}, + ["spinning"] = {start = 105, stop = 107, speed = 24, offsetX = 0, offsetY = 0}, + ["uppercut"] = {start = 108, stop = 139, speed = 24, offsetX = 0, offsetY = 0}, + }, + "idle", + false, + { + sing_duration = 4, + isCharacter = true, + icon = "darnell" + } +) diff --git a/src/love/stages/streets.lua b/src/love/stages/streets.lua index 9a0e1f22..f0f3eac3 100644 --- a/src/love/stages/streets.lua +++ b/src/love/stages/streets.lua @@ -237,7 +237,7 @@ return { stageImages["abot"]:draw() girlfriend:draw() enemy:draw() - boyfriend:draw() + --boyfriend:draw() stageImages["spraycanPile"]:draw() love.graphics.pop() end, diff --git a/src/love/states/debug/sprite-debug.lua b/src/love/states/debug/sprite-debug.lua index 016fecab..96615b84 100644 --- a/src/love/states/debug/sprite-debug.lua +++ b/src/love/states/debug/sprite-debug.lua @@ -91,6 +91,8 @@ return { sprite = spriteData() overlaySprite = spriteData() + print(spritePath, spriteData, overlaySprite, sprite) + spriteAnims = {} for i, _ in pairs(sprite.getAnims()) do table.insert(spriteAnims, i) diff --git a/src/love/weeks/weekend1.lua b/src/love/weeks/weekend1.lua index 1f663482..53f06583 100644 --- a/src/love/weeks/weekend1.lua +++ b/src/love/weeks/weekend1.lua @@ -23,6 +23,7 @@ function WEEKEND1_getNextCanWithState(state) end end ]] local lastSaveDataBool = false +local alternates = {false, false} return { enter = function(self, from, songNum, songAppend, isErect) @@ -59,6 +60,8 @@ return { voicesEnemy = nil rainShaderStartIntensity = 0.2 rainShaderEndIntensity = 0.4 + enemy = love.filesystem.load("sprites/characters/darnell-fighting.lua")() + enemy.x = 350 elseif song == 3 then inst = love.audio.newSource("songs/2hot/Inst" .. (erectMode and "-erect" or "") .. ".ogg", "stream") if curOS ~= "NX" then @@ -148,18 +151,97 @@ return { onNoteHit = function(self, character, noteType, rating, id) -- rating is "EnemyHit" when an enemy hits it. Can be used to determine if the player hit it or the enemy hit it when needed -- Return "true" to not play ANY animations, return "false" or nothing to play the default animations + if not util.startsWith(noteType or "", "weekend-1-") then return false end + if rating == "EnemyHit" then if noteType == "weekend-1-lightcan" then character:animate("light-can") - return true elseif noteType == "wekend-1-kickcan" then character:animate("kick-can") - return true elseif noteType == "weekend-1-kneecan" then character:animate("knee-forward") - return true end + else + end + + -- blazin + if noteType == "weekend-1-blockhigh" then + alternates[1] = not alternates[1] + enemy:animate("punch high" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-blocklow" then + alternates[1] = not alternates[1] + enemy:animate("punch low" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-blockspin" then + alternates[1] = not alternates[1] + enemy:animate("punch high" .. (alternates[1] and " 2" or "")) + + elseif noteType == "weekend-1-punchlow" then + alternates[1] = not alternates[1] + enemy:animate("punch low" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-punchlowblocked" then + alternates[1] = not alternates[1] + enemy:animate("punch low" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-punchlowdodged" then + alternates[1] = not alternates[1] + enemy:animate("punch low" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-punchlowspin" then + alternates[1] = not alternates[1] + enemy:animate("punch low" .. (alternates[1] and " 2" or "")) + + elseif noteType == "weekend-1-punchhigh" then + enemy:animate("hit high") + elseif noteType == "weekend-1-punchhighblocked" then + enemy:animate("blocking") + elseif noteType == "weekend-1-punchhighdodged" then + enemy:animate("dodge") + elseif noteType == "weekend-1-punchhighspin" then + enemy:animate("spin") + + elseif noteType == "weekend-1-dodgehigh" then + alternates[1] = not alternates[1] + enemy:animate("punch high" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-dodgelow" then + alternates[1] = not alternates[1] + enemy:animate("punch low" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-dodgespin" then + alternates[1] = not alternates[1] + enemy:animate("punch high" .. (alternates[1] and " 2" or "")) + + elseif noteType == "weekend-1-hithigh" then + alternates[1] = not alternates[1] + enemy:animate("punch high" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-hitlow" then + alternates[1] = not alternates[1] + enemy:animate("punch low" .. (alternates[1] and " 2" or "")) + + elseif noteType == "weekend-1-hitspin" then + alternates[1] = not alternates[1] + enemy:animate("punch high" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-picouppercutprep" then + alternates[1] = not alternates[1] + enemy:animate("punch high" .. (alternates[1] and " 2" or "")) + elseif noteType == "weekend-1-picouppercut" then + + + elseif noteType == "weekend-1-darnelluppercutprep" then + alternates[1] = not alternates[1] + enemy:animate("pre-uppercut") + elseif noteType == "weekend-1-darnelluppercut" then + enemy:animate("uppercut") + elseif noteType == "weekend-1-idle" then + enemy:animate("idle") + elseif noteType == "weekend-1-fakeout" then + enemy:animate("fake out") + elseif noteType == "weekend-1-taunt" then + enemy:animate("cringe") + elseif noteType == "weekend-1-tauntforce" then + enemy:animate("pissed") + elseif noteType == "weekend-1-reversefakeout" then + enemy:animate("fake out") + end + + return true end, update = function(self, dt)