From e072d8d2e4ab78113ac6839634a53ff5170f972a Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Mon, 3 Oct 2022 14:17:04 -0500 Subject: [PATCH] Add duration and loop to some anim data --- scripts/shared/gamedata.js | 110 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/scripts/shared/gamedata.js b/scripts/shared/gamedata.js index 7ce10d36..aebe9878 100644 --- a/scripts/shared/gamedata.js +++ b/scripts/shared/gamedata.js @@ -16,6 +16,8 @@ class AnimationData { this.animType = (typeof data.animType != "undefined") ? data.animType : AGRP_ANIMTYPE_NORMAL; this.animSpeed = (typeof data.animSpeed != "undefined") ? data.animSpeed : 0.0; this.moveType = (typeof data.moveType != "undefined") ? data.moveType : AGRP_ANIMMOVE_NONE; + this.duration = -1; + this.loop = true; // GTA IV this.infiniteLoop = (typeof data.infiniteLoop != "undefined") ? data.infiniteLoop : false; @@ -4786,8 +4788,8 @@ let gameData = { new AnimationData("talk", { groupId: 0, animId: 11 }), new AnimationData("chat", { groupId: 0, animId: 11 }), - new AnimationData("hailtaxi", { groupId: 0, animId: 12 }), - new AnimationData("wave", { groupId: 0, animId: 12 }), + new AnimationData("hailtaxi", { groupId: 0, animId: 12, duration: 2000 }), + new AnimationData("wave", { groupId: 0, animId: 12, duration: 5250 }), new AnimationData("headscratch", { groupId: 0, animId: 157 }), new AnimationData("lookaround1", { groupId: 0, animId: 158 }), @@ -4832,19 +4834,19 @@ let gameData = { new AnimationData("phonein", { groupId: 0, animId: 165 }), new AnimationData("phonetalk", { groupId: 0, animId: 166 }), new AnimationData("sit", { groupId: 0, animId: 169, animSpeed: 1.0 }), - new AnimationData("atm", { groupId: 0, animId: 171 }), - new AnimationData("cpr", { groupId: 24, animId: 214 }), + new AnimationData("atm", { groupId: 0, animId: 171, duration: 7500, loop: true }), + new AnimationData("cpr", { groupId: 24, animId: 214, duration: 5000, loop: true }), new AnimationData("idle1", { groupId: 26, animId: 215 }), new AnimationData("idle2", { groupId: 26, animId: 216 }), new AnimationData("idle3", { groupId: 26, animId: 217 }), new AnimationData("idle4", { groupId: 26, animId: 218 }), - new AnimationData("dance1", { groupId: 28, animId: 226 }), - new AnimationData("dance2", { groupId: 28, animId: 227 }), - new AnimationData("dance3", { groupId: 28, animId: 228 }), - new AnimationData("dance4", { groupId: 28, animId: 229 }), - new AnimationData("dance5", { groupId: 28, animId: 230 }), - new AnimationData("dance6", { groupId: 28, animId: 231 }), - new AnimationData("dance7", { groupId: 28, animId: 232 }), + new AnimationData("dance1", { groupId: 28, animId: 226, duration: 5000, loop: true }), + new AnimationData("dance2", { groupId: 28, animId: 227, duration: 5000, loop: true }), + new AnimationData("dance3", { groupId: 28, animId: 228, duration: 5000, loop: true }), + new AnimationData("dance4", { groupId: 28, animId: 229, duration: 5000, loop: true }), + new AnimationData("dance5", { groupId: 28, animId: 230, duration: 5000, loop: true }), + new AnimationData("dance6", { groupId: 28, animId: 231, duration: 5000, loop: true }), + new AnimationData("dance7", { groupId: 28, animId: 232, duration: 5000, loop: true }), new AnimationData("pressbutton", { groupId: 0, animId: 62 }), new AnimationData("sitright", { groupId: 0, animId: 169, moveType: AGRP_ANIMMOVE_RIGHT }), new AnimationData("sitleft", { groupId: 0, animId: 169, moveType: AGRP_ANIMMOVE_LEFT }), @@ -6770,51 +6772,49 @@ let gameData = { SingleSparking: 21, } }, - mapAreas: { + areas: { [AGRP_GAME_GTA_III]: [ - /* - [ROADBR1, 1, [[617.442, -958.347, 6.26083], [1065.44, -908.347, 206.261]], 1], - [PORT_W, 0, [[751.68, -1178.22, -13.8723], [1065.68, -958.725, 136.128]], 1], - [FISHFAC, 2, [[944.208, -1149.81, -9.72576], [1016.14, -1076.01, 40.2742]], 1], - [PORT_S, 0, [[1065.88, -1251.55, -13.5049], [1501.88, -1069.93, 136.495]], 1], - [PORT_E, 0, [[1363.68, -1069.65, -18.8643], [1815.68, -613.646, 131.136]], 1], - [PORT_I, 0, [[1065.88, -1069.85, 1.49868], [1363.38, -742.054, 151.499]], 1], - [CHINA, 0, [[745.421, -908.289, -21.203], [1065.42, -463.69, 129.593]], 1], - [REDLIGH, 0, [[745.378, -463.616, -22.6676], [1065.38, -282.616, 147.332]], 1], - [TOWERS, 0, [[745.421, -282.4, -13.4117], [1065.42, -78.7699, 136.588]], 1], - [LITTLEI, 0, [[1065.9, -512.324, -14.296], [1388.9, -78.324, 135.704]], 1], - [HARWOOD, 0, [[745.979, -78.1778, -48.5832], [1388.98, 322.676, 101.417]], 1], - [EASTBAY, 0, [[1389.37, -613.467, -29.883], [1797.6, 199.628, 120.117]], 1], - [S_VIEW, 0, [[1066.1, -741.806, -34.2068], [1363.6, -512.806, 115.793]], 1], - [COPS_1, 2, [[1135.8, -695.021, 6.9661], [1182.36, -631.021, 56.9661]], 1], - [HOSPI_1, 2, [[1136.09, -609.976, 6.287], [1182.09, -521.167, 56.287]], 1], - [IND_ZON, 0, [[617.151, -1329.72, -117.535], [1902.66, 434.115, 482.465]], 1], - [ROADBR2, 1, [[444.768, -958.298, 30.7441], [614.878, -908.298, 180.744]], 2], - [FILLIN1, 2, [[1363.77, -613.339, -4.43849], [1389.17, -512.539, 70.4322]], 1], - [CONSTRU, 0, [[239.878, -411.617, 7.62939], [614.322, -61.6167, 163.819]], 2], - [STADIUM, 0, [[-225.764, -412.604, -9.53674], [116.236, 160.496, 120.271]], 2], - [YAKUSA, 0, [[199.766, -1672.42, -61.7588], [577.766, -1059.93, 432.688]], 2], - [SHOPING, 0, [[-224.438, -1672.05, -61.3183], [99.562, -1004.45, 432.352]], 2], - [COM_EAS, 0, [[200.107, -1059.19, -0.000144958], [615.107, -412.193, 198.864]], 2], - [PARK, 0, [[-121.567, -1003.07, -46.7463], [199.271, -413.068, 224.163]], 2], - [UNIVERS, 0, [[117.268, -411.622, 0.000190735], [239.268, -61.6218, 166.36]], 2], - [HOSPI_2, 0, [[117.236, -61.1105, -17.071], [615.236, 268.889, 83.754]], 2], - [AIRPORT, 0, [[-1632.97, -1344.71, -45.9404], [-468.629, -268.443, 254.696]], 3], - [PROJECT, 0, [[-811.835, -268.074, -45.8745], [-371.041, 92.7263, 254.241]], 3], - [SWANKS, 0, [[-867.229, 93.3882, -50.1134], [-266.914, 650.058, 250.426]], 3], - [SUB_IND, 0, [[-1407.57, -267.966, -49.6792], [-812.306, 92.7559, 250.437]], 3], - [BIG_DAM, 0, [[-1394.5, 93.4441, -46.7412], [-867.52, 704.544, 253.344]], 3], - [MAIN_D1, 2, [[1037.53, -907.274, 0.0, 1065.16], [-637.689, 30.0069]], 1], - [MAIN_D2, 2, [[966.079, -637.366, 0.0, 1064.83], [-609.557, 30.0789]], 1], - [MAIN_D3, 2, [[965.795, -608.99, 0.0, 995.306], [-470.23, 30.9302]], 1], - [MAIN_D4, 2, [[995.59, -511.092, 0.0, 1065.11], [-470.23, 30.0789]], 1], - [MAIN_D5, 2, [[1035.88, -463.56, 0.0, 1064.8], [85, -179.224, 30.6465]], 1], - [SUB_ZON, 0, [[-1644.64, -1351.38, -117.0], [-266.895, 1206.35, 483.0]], 3], - [COM_ZON, 0, [[-265.479, -1719.97, -114.769], [615.52, 367.265, 485.231]], 1], - [SUB_ZO2, 0, [[-265.444, 161.113, -41.7094], [-121.287, 367.043, 358.291]], 1], - [SUB_ZO3, 0, [[-265.434, 79.0922, -45.8201], [-226.334, 161.064, 354.18]], 1], - [WEE_DAM, 2, [[-1238.59, 306.841, -0.48605], [-910.445, 504.646, 39.514]], 3], - */ + ["Callahan Bridge", 1, [[617.442, -958.347, 6.26083], [1065.44, -908.347, 206.261]], 1], + ["Callahan Point", 0, [[751.68, -1178.22, -13.8723], [1065.68, -958.725, 136.128]], 1], + ["Fish Factory", 2, [[944.208, -1149.81, -9.72576], [1016.14, -1076.01, 40.2742]], 1], + ["Atlantic Quays", 0, [[1065.88, -1251.55, -13.5049], [1501.88, -1069.93, 136.495]], 1], + ["Portland Harbor", 0, [[1363.68, -1069.65, -18.8643], [1815.68, -613.646, 131.136]], 1], + ["Trenton", 0, [[1065.88, -1069.85, 1.49868], [1363.38, -742.054, 151.499]], 1], + ["Chinatown", 0, [[745.421, -908.289, -21.203], [1065.42, -463.69, 129.593]], 1], + ["Red Light District", 0, [[745.378, -463.616, -22.6676], [1065.38, -282.616, 147.332]], 1], + ["Hepburn Heights", 0, [[745.421, -282.4, -13.4117], [1065.42, -78.7699, 136.588]], 1], + ["Saint Marks", 0, [[1065.9, -512.324, -14.296], [1388.9, -78.324, 135.704]], 1], + ["Harwood", 0, [[745.979, -78.1778, -48.5832], [1388.98, 322.676, 101.417]], 1], + ["Portland Beach", 0, [[1389.37, -613.467, -29.883], [1797.6, 199.628, 120.117]], 1], + ["Portland View", 0, [[1066.1, -741.806, -34.2068], [1363.6, -512.806, 115.793]], 1], + ["Liberty City", 2, [[1135.8, -695.021, 6.9661], [1182.36, -631.021, 56.9661]], 1], + ["Liberty City", 2, [[1136.09, -609.976, 6.287], [1182.09, -521.167, 56.287]], 1], + ["Portland", 0, [[617.151, -1329.72, -117.535], [1902.66, 434.115, 482.465]], 1], + ["Callahan Bridge", 1, [[444.768, -958.298, 30.7441], [614.878, -908.298, 180.744]], 2], + ["Liberty City", 2, [[1363.77, -613.339, -4.43849], [1389.17, -512.539, 70.4322]], 1], + ["Fort Staunton", 0, [[239.878, -411.617, 7.62939], [614.322, -61.6167, 163.819]], 2], + ["Aspatria", 0, [[-225.764, -412.604, -9.53674], [116.236, 160.496, 120.271]], 2], + ["Torrington", 0, [[199.766, -1672.42, -61.7588], [577.766, -1059.93, 432.688]], 2], + ["Bedford Point", 0, [[-224.438, -1672.05, -61.3183], [99.562, -1004.45, 432.352]], 2], + ["Newport", 0, [[200.107, -1059.19, -0.000144958], [615.107, -412.193, 198.864]], 2], + ["Belleville Park", 0, [[-121.567, -1003.07, -46.7463], [199.271, -413.068, 224.163]], 2], + ["Liberty Campus", 0, [[117.268, -411.622, 0.000190735], [239.268, -61.6218, 166.36]], 2], + ["Rockford", 0, [[117.236, -61.1105, -17.071], [615.236, 268.889, 83.754]], 2], + ["Francis Intl. Airport", 0, [[-1632.97, -1344.71, -45.9404], [-468.629, -268.443, 254.696]], 3], + ["Wichita Gardens", 0, [[-811.835, -268.074, -45.8745], [-371.041, 92.7263, 254.241]], 3], + ["Cedar Grove", 0, [[-867.229, 93.3882, -50.1134], [-266.914, 650.058, 250.426]], 3], + ["Pike Creek", 0, [[-1407.57, -267.966, -49.6792], [-812.306, 92.7559, 250.437]], 3], + ["Cochrane Dam", 0, [[-1394.5, 93.4441, -46.7412], [-867.52, 704.544, 253.344]], 3], + ["Liberty City", 2, [[1037.53, -907.274, 0.0, 1065.16], [-637.689, 30.0069]], 1], + ["Liberty City", 2, [[966.079, -637.366, 0.0, 1064.83], [-609.557, 30.0789]], 1], + ["Liberty City", 2, [[965.795, -608.99, 0.0, 995.306], [-470.23, 30.9302]], 1], + ["Liberty City", 2, [[995.59, -511.092, 0.0, 1065.11], [-470.23, 30.0789]], 1], + ["Liberty City", 2, [[1035.88, -463.56, 0.0, 1064.8], [85, -179.224, 30.6465]], 1], + ["Shoreside Vale", 0, [[-1644.64, -1351.38, -117.0], [-266.895, 1206.35, 483.0]], 3], + ["Staunton Island", 0, [[-265.479, -1719.97, -114.769], [615.52, 367.265, 485.231]], 1], + ["Shoreside Vale", 0, [[-265.444, 161.113, -41.7094], [-121.287, 367.043, 358.291]], 1], + ["Shoreside Vale", 0, [[-265.434, 79.0922, -45.8201], [-226.334, 161.064, 354.18]], 1], + ["Cochrane Dam", 2, [[-1238.59, 306.841, -0.48605], [-910.445, 504.646, 39.514]], 3], ] } };