diff --git a/desktop/asset-work/inside-jail/crowbar.png b/desktop/asset-work/inside-jail/crowbar.png index 293f9328..b369e191 100644 Binary files a/desktop/asset-work/inside-jail/crowbar.png and b/desktop/asset-work/inside-jail/crowbar.png differ diff --git a/desktop/asset-work/inside-jail/crowbar.pxa/0.pxi b/desktop/asset-work/inside-jail/crowbar.pxa/0.pxi new file mode 100644 index 00000000..cc0f6d48 Binary files /dev/null and b/desktop/asset-work/inside-jail/crowbar.pxa/0.pxi differ diff --git a/desktop/asset-work/inside-jail/crowbar.pxa/1.pxi b/desktop/asset-work/inside-jail/crowbar.pxa/1.pxi new file mode 100644 index 00000000..1fd322c6 Binary files /dev/null and b/desktop/asset-work/inside-jail/crowbar.pxa/1.pxi differ diff --git a/desktop/asset-work/inside-jail/crowbar.pxa/2.pxi b/desktop/asset-work/inside-jail/crowbar.pxa/2.pxi new file mode 100644 index 00000000..355a3ac7 Binary files /dev/null and b/desktop/asset-work/inside-jail/crowbar.pxa/2.pxi differ diff --git a/desktop/asset-work/inside-jail/crowbar.pxa/3.pxi b/desktop/asset-work/inside-jail/crowbar.pxa/3.pxi new file mode 100644 index 00000000..433fc450 Binary files /dev/null and b/desktop/asset-work/inside-jail/crowbar.pxa/3.pxi differ diff --git a/desktop/asset-work/inside-jail/crowbar.pxa/CelData.plist b/desktop/asset-work/inside-jail/crowbar.pxa/CelData.plist new file mode 100644 index 00000000..f0b74d60 --- /dev/null +++ b/desktop/asset-work/inside-jail/crowbar.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index fb2b01b2..a01567d0 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -172,14 +172,7 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -dream/dot - rotate: false - xy: 704, 916 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -outsidehouse/dot +title/dot rotate: false xy: 704, 916 size: 1, 1 @@ -193,14 +186,14 @@ inside-antique/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-jail/dot +outsidehouse/dot rotate: false xy: 704, 916 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -title/dot +inside-house/dot rotate: false xy: 704, 916 size: 1, 1 @@ -214,14 +207,21 @@ ego/dot orig: 1, 1 offset: 0, 0 index: -1 -wizard/dot +dream/dot rotate: false xy: 704, 916 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -inside-house/dot +inside-jail/dot + rotate: false + xy: 704, 916 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +wizard/dot rotate: false xy: 704, 916 size: 1, 1 @@ -363,7 +363,7 @@ dream/fairy-godfather-magic index: -1 dream/plaque1 rotate: false - xy: 1787, 58 + xy: 1787, 76 size: 8, 11 orig: 8, 11 offset: 0, 0 @@ -377,7 +377,7 @@ dream/plaque2 index: -1 dream/plaque3 rotate: false - xy: 1274, 1044 + xy: 1274, 1055 size: 8, 11 orig: 8, 11 offset: 0, 0 @@ -706,14 +706,14 @@ inside-antique/shopkeep-talk index: -1 inside-antique/sword rotate: false - xy: 1787, 71 + xy: 1274, 1068 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 inside-castle/sword rotate: false - xy: 1787, 71 + xy: 1274, 1068 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -942,13 +942,6 @@ inside-jail/ball-n-chain orig: 38, 16 offset: 0, 0 index: -1 -inside-jail/crowbar - rotate: false - xy: 1274, 1057 - size: 8, 27 - orig: 8, 27 - offset: 0, 0 - index: -1 inside-jail/moveable-bars rotate: false xy: 1988, 1387 @@ -2160,7 +2153,7 @@ castle-gate/Untitled index: -1 castle-gate/goon-1 rotate: false - xy: 896, 277 + xy: 381, 50 size: 26, 33 orig: 26, 33 offset: 0, 0 @@ -2237,77 +2230,77 @@ castle-gate/throw-walkie-9 index: -1 cat-tree/grandma-cry-10 rotate: false - xy: 737, 55 + xy: 571, 15 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 573, 15 + xy: 631, 15 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 677, 13 + xy: 891, 34 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 737, 13 + xy: 1323, 390 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 1451, 445 + xy: 1383, 373 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 1511, 445 + xy: 1443, 373 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 1571, 445 + xy: 1503, 373 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 998, 384 + xy: 1563, 373 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 1582, 806 + xy: 1583, 806 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 1642, 806 + xy: 1643, 806 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 1702, 806 + xy: 1703, 806 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2335,7 +2328,7 @@ cat-tree/grandma-cry-8 index: -1 cat-tree/grandma-cry-9 rotate: false - xy: 677, 55 + xy: 412, 79 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2398,14 +2391,14 @@ ego/grow-talk index: -1 ego/hand-hold rotate: false - xy: 1534, 559 + xy: 1545, 816 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ending-castle/hand-hold rotate: false - xy: 1534, 559 + xy: 1545, 816 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2426,119 +2419,119 @@ ego/jump-straight index: -1 ego/love-10 rotate: false - xy: 625, 57 + xy: 1452, 487 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-11 rotate: false - xy: 1337, 467 + xy: 1504, 487 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-12 rotate: false - xy: 1389, 487 + xy: 1556, 487 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-13 rotate: false - xy: 1441, 487 + xy: 1389, 415 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-14 rotate: false - xy: 1493, 487 + xy: 1441, 415 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-15 rotate: false - xy: 1545, 487 + xy: 1493, 415 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-16 rotate: false - xy: 797, 13 + xy: 1545, 415 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-17 rotate: false - xy: 849, 13 + xy: 472, 63 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-18 rotate: false - xy: 885, 205 + xy: 571, 57 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-19 rotate: false - xy: 901, 19 + xy: 623, 57 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-20 rotate: false - xy: 1337, 395 + xy: 885, 205 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-21 rotate: false - xy: 1389, 383 + xy: 1597, 415 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-22 rotate: false - xy: 1441, 373 + xy: 891, 76 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-23 rotate: false - xy: 1493, 373 + xy: 691, 25 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-24 rotate: false - xy: 1545, 373 + xy: 743, 25 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-25 rotate: false - xy: 1597, 373 + xy: 795, 13 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-26 rotate: false - xy: 953, 19 + xy: 1763, 776 size: 50, 70 orig: 50, 70 offset: 0, 0 @@ -2573,14 +2566,14 @@ ego/love-7 index: -1 ego/love-8 rotate: false - xy: 474, 63 + xy: 1337, 432 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-9 rotate: false - xy: 573, 57 + xy: 1400, 487 size: 50, 70 orig: 50, 70 offset: 0, 0 @@ -2664,7 +2657,7 @@ ego/throw index: -1 ego/warden rotate: false - xy: 633, 14 + xy: 847, 42 size: 42, 41 orig: 42, 41 offset: 0, 0 @@ -2678,231 +2671,231 @@ ending-castle/crowd-right index: -1 ending-castle/frankie-fall-1 rotate: false - xy: 987, 142 + xy: 1812, 592 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 1621, 222 + xy: 453, 26 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 1199, 242 + xy: 1105, 311 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 1115, 205 + xy: 1115, 348 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-2 rotate: false - xy: 1005, 15 + xy: 998, 389 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 1047, 15 + xy: 1040, 389 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 1369, 232 + xy: 989, 352 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 1411, 222 + xy: 1031, 352 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 1453, 222 + xy: 1073, 348 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 1495, 222 + xy: 979, 315 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 1537, 222 + xy: 1021, 315 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 1579, 222 + xy: 1063, 311 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 1241, 243 + xy: 409, 36 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 georgia/kick-1 rotate: false - xy: 1199, 356 + xy: 1649, 419 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-10 rotate: false - xy: 1047, 52 + xy: 1241, 355 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-11 rotate: false - xy: 1031, 267 + xy: 1157, 311 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-12 rotate: false - xy: 1031, 222 + xy: 1199, 311 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-13 rotate: false - xy: 1029, 177 + xy: 1241, 310 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-14 rotate: false - xy: 1073, 267 + xy: 1283, 345 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-15 rotate: false - xy: 1073, 222 + xy: 1325, 345 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-16 rotate: false - xy: 1071, 177 + xy: 1283, 300 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-17 rotate: false - xy: 1069, 132 + xy: 1325, 300 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-18 rotate: false - xy: 1285, 241 + xy: 1367, 328 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-19 rotate: false - xy: 1327, 236 + xy: 1409, 328 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-2 rotate: false - xy: 1199, 311 + xy: 1812, 674 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-4 rotate: false - xy: 1199, 311 + xy: 1812, 674 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-20 rotate: false - xy: 1115, 242 + xy: 1451, 328 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-3 rotate: false - xy: 924, 281 + xy: 1812, 629 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-5 rotate: false - xy: 966, 281 + xy: 1811, 547 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-6 rotate: false - xy: 987, 179 + xy: 1082, 385 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-7 rotate: false - xy: 985, 97 + xy: 896, 280 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 1005, 52 + xy: 1157, 356 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 1027, 97 + xy: 1199, 356 size: 40, 43 orig: 40, 43 offset: 0, 0 @@ -3098,7 +3091,7 @@ inside-castle/roof index: -1 inside-castle/walkie-talkie rotate: false - xy: 1545, 818 + xy: 1545, 780 size: 35, 34 orig: 35, 34 offset: 0, 0 @@ -3112,18 +3105,25 @@ inside-house/candle index: -1 inside-jail/chest-top rotate: false - xy: 428, 49 + xy: 1577, 601 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 inside-jail/chest-top-open rotate: false - xy: 428, 15 + xy: 1608, 487 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 +inside-jail/crowbar + rotate: false + xy: 1334, 504 + size: 64, 33 + orig: 64, 33 + offset: 0, 0 + index: -1 outside-castle/Untitled rotate: false xy: 983, 740 @@ -3140,7 +3140,7 @@ outside-castle/peddler-talk index: -1 outside-castle/balloons rotate: false - xy: 412, 83 + xy: 1534, 559 size: 60, 36 orig: 60, 36 offset: 0, 0 @@ -3371,14 +3371,14 @@ space/susp index: -1 talk-bg rotate: false - xy: 1157, 245 + xy: 1493, 331 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 title/balloon rotate: false - xy: 1389, 455 + xy: 847, 2 size: 60, 30 orig: 60, 30 offset: 0, 0 @@ -3392,77 +3392,77 @@ wizard/Untitled index: -1 wizard/cloud rotate: false - xy: 1199, 279 + xy: 909, 2 size: 40, 30 orig: 40, 30 offset: 0, 0 index: -1 wizard/experiment-10 rotate: false - xy: 381, 26 + xy: 1676, 749 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-11 rotate: false - xy: 474, 6 + xy: 1573, 692 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-12 rotate: false - xy: 1058, 369 + xy: 1620, 692 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-13 rotate: false - xy: 1105, 373 + xy: 1667, 692 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-14 rotate: false - xy: 1152, 344 + xy: 1577, 635 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-15 rotate: false - xy: 1241, 343 + xy: 1624, 635 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-16 rotate: false - xy: 1288, 343 + xy: 1671, 635 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-17 rotate: false - xy: 1335, 338 + xy: 1623, 578 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-18 rotate: false - xy: 1382, 326 + xy: 1670, 578 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-19 rotate: false - xy: 1429, 316 + xy: 1714, 692 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3476,154 +3476,154 @@ wizard/experiment-2 index: -1 wizard/experiment-20 rotate: false - xy: 1476, 316 + xy: 1718, 635 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-21 rotate: false - xy: 1523, 316 + xy: 1717, 578 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-22 rotate: false - xy: 1570, 316 + xy: 1761, 719 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-23 rotate: false - xy: 1617, 316 + xy: 1765, 662 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 1105, 316 + xy: 1765, 605 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 1152, 287 + xy: 1764, 548 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-26 rotate: false - xy: 1241, 286 + xy: 1608, 521 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-27 rotate: false - xy: 1288, 286 + xy: 1655, 521 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-28 rotate: false - xy: 1335, 281 + xy: 1702, 521 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 1382, 269 + xy: 1654, 464 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-3 rotate: false - xy: 526, 78 + xy: 524, 78 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-30 rotate: false - xy: 1429, 259 + xy: 1701, 464 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 1476, 259 + xy: 1691, 407 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 1523, 259 + xy: 1670, 350 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 1570, 259 + xy: 1717, 350 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 1617, 259 + xy: 1738, 407 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 989, 327 + xy: 1748, 464 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 1036, 312 + xy: 1764, 350 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 937, 224 + xy: 1785, 407 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 940, 167 + xy: 1811, 350 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 984, 224 + xy: 1808, 719 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-4 rotate: false - xy: 526, 21 + xy: 524, 21 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3637,28 +3637,28 @@ wizard/experiment-5 index: -1 wizard/experiment-6 rotate: false - xy: 891, 91 + xy: 1815, 791 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-7 rotate: false - xy: 938, 91 + xy: 1623, 358 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-8 rotate: false - xy: 1762, 791 + xy: 1582, 749 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-9 rotate: false - xy: 1809, 791 + xy: 1629, 749 size: 45, 55 orig: 45, 55 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 8e2e852c..427c585e 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png index f4a08b8f..bd69fa16 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 85cad6c9..2a723643 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -226,7 +226,8 @@ warden-sleep (animation 0.25 (for [i (flatten [ 3 4 3 4 3 4 3 4 3 4 5 5 2 2 2 2 2 2])] (aget warden-sheet 0 i))) candle (utils/make-anim "inside-jail/candle.png" [20 25] 0.1 (range 4)) - candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1])] + candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1]) + crowbar (utils/make-anim "inside-jail/crowbar.png" [16 33] 0.15 (flatten [(repeat 120 0) [1 2 3 3 2 1]]))] (rooms/make :music :inside-antique :name "In jail" :sounds { @@ -427,8 +428,11 @@ :candle-smoke (doto (assoc (particle-effect "particles/candle") :x 215 :y 130 :baseline 200) (particle-effect! :set-position 215 130)) - :crowbar (assoc (utils/get-texture "inside-jail/crowbar.png") - :x 304 :y 65 :baseline 175 + :crowbar (assoc (animation->texture screen crowbar) + :anim crowbar + :anim-start 0 + + :x 300 :y 60 :baseline 175 :night-profile :none :script (actions/get-script entities (if (get-in @entities [:state :opened-bars?]) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 3ffc1a5c..268339c9 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -481,6 +481,8 @@ (actions/do-dialogue entities :ego "It's a little late for a last meal." :ego "Plus, these are just legs. This frog doesn't even have a mouth."))} + :script (actions/get-script entities + (actions/talk entities :ego "Those flies seem to be attracted to Angus' stench.")) )} :note (rooms/make-entity :note (assoc (utils/get-texture "outside-castle/note.png") :x 198 :y 66 :baseline 174