diff --git a/api/api.lua b/api/api.lua index 4f5e460f..9df3653a 100644 --- a/api/api.lua +++ b/api/api.lua @@ -542,19 +542,6 @@ do -- create a scope so we don't have to worry about upvalue collisions end end --- [ HookScript ] --- Securely post-hooks a script handler. --- 'f' [frame] the frame which needs a hook --- 'script' [string] the handler to hook --- 'func' [function] the function that should be added -function HookScript(f, script, func) - local prev = f:GetScript(script) - f:SetScript(script, function(a1,a2,a3,a4,a5,a6,a7,a8,a9) - if prev then prev(a1,a2,a3,a4,a5,a6,a7,a8,a9) end - func(a1,a2,a3,a4,a5,a6,a7,a8,a9) - end) -end - -- [ HookAddonOrVariable ] -- Sets a function to be called automatically once an addon gets loaded -- 'addon' [string] addon or variable name diff --git a/api/ui-widgets.lua b/api/ui-widgets.lua index 40e2b822..0de64bf6 100644 --- a/api/ui-widgets.lua +++ b/api/ui-widgets.lua @@ -569,7 +569,7 @@ end -- 'frame' [frame] the modelframe that should be used function pfUI.api.EnableClickRotate(frame) frame:EnableMouse(true) - HookScript(frame, "OnUpdate", function() + frame:HookScript("OnUpdate", function() if this.rotate then local x,_ = GetCursorPosition() if this.curx > x then @@ -582,14 +582,14 @@ function pfUI.api.EnableClickRotate(frame) end end) - HookScript(frame, "OnMouseDown", function() + frame:HookScript("OnMouseDown", function() if arg1 == "LeftButton" then this.rotate = true this.curx, this.cury = GetCursorPosition() end end) - HookScript(frame, "OnMouseUp", function() + frame:HookScript("OnMouseUp", function() this.rotate, this.curx, this.cury = nil, nil, nil end) end @@ -615,7 +615,6 @@ function pfUI.api.SetHighlight(frame, cr, cg, cb) frame.rr, frame.rg, frame.rb, frame.ra = GetStringColor(pfUI_config.appearance.border.color) if not frame.pfEnterLeave then - if not frame.HookScript then frame.HookScript = HookScript end local enter, leave = frame:GetScript("OnEnter"), frame:GetScript("OnLeave") if enter then @@ -844,7 +843,6 @@ function pfUI.api.SkinScrollbar(frame, always) -- always show parent frame if always then RunOOC(function() - if not parent.HookScript then parent.HookScript = HookScript end parent:HookScript("OnHide", function() this:Show() end) end) end diff --git a/env/tables.lua b/env/tables.lua index e2f6d457..e08d92b9 100644 --- a/env/tables.lua +++ b/env/tables.lua @@ -2417,58 +2417,3 @@ pfSellData = { [23725]=2600, [23727]=2600, [23728]=2600, [23743]=11, [24071]=393470, [24101]=400000, [24102]=400000, [24222]=221054, [24231]=211, [24232]=900, [24281]=1210, [24282]=18250, [24283]=152345, [24358]=365815 } -pfMapOverlayData = { - ["Alterac"] = {"CHILLWINDPOINT:308:250:660:261", "CORRAHNSDAGGER:173:277:411:391", "CRUSHRIDGEHOLD:269:230:339:167:283:0", "DALARAN:277:283:39:275", "DANDREDSFOLD:273:224:282:0", "GALLOWSCORNER:183:185:415:287", "GAVINSNAZE:140:161:235:486", "GROWLESSCAVE:175:156:327:382", "LORDAMEREINTERNMENTCAMP:315:255:55:413", "MISTYSHORE:204:268:207:139", "RUINSOFALTERAC:252:249:274:201", "RAVENHOLDTMANOR:217:165:737:452", "SOFERASNAZE:241:312:469:311", "STRAHNBRAD:355:289:555:110", "THEHEADLAND:142:187:325:481", "THEUPLANDS:219:183:470:84",}, - ["AlteracValley"] = {"DUNBALDAR:254:228:356:18:3299:3318", "FROSTWOLFKEEP:220:278:408:382:3299:3318", "ICEBLOODGARRISON:286:288:343:179:3299:3318",}, - ["Arathi"] = {"BOULDERFISTHALL:190:214:442:371", "BOULDERGOR:222:214:244:167", "CIRCLEOFEASTBINDING:140:213:568:125", "CIRCLEOFINNERBINDING:186:164:302:321", "CIRCLEOFOUTERBINDING:149:137:429:301", "CIRCLEOFWESTBINDING:156:189:152:71", "DABYRIESFARMSTEAD:160:171:482:197", "FALDIRSCOVE:247:197:180:428", "FARWELLSTEAD:112:128:267:31", "GOSHEKFARM:208:177:539:284", "HAMMERFALL:182:235:665:128:318:0", "NORTHFOLDMANOR:202:205:204:119", "REFUGEPOINT:157:189:380:214", "RUINSOFZULRASAZ:160:160:346:29", "STROMGARDEKEEP:220:213:122:295", "THANDOLSPAN:175:198:369:424", "THORADINSWALL:173:225:103:148", "WITHERBARKVILLAGE:197:194:566:339", "WILDTUSKVILLAGE:183:102:379:145",}, - ["Ashenvale"] = {"ASTRANAAR:190:173:281:259", "BOUGHSHADOW:140:190:862:157", "FALLENSKYLAKE:219:190:555:433:432:0", "FELFIREHILL:241:244:720:349", "FIRESCARSHRINE:153:161:194:332", "FORESTSONG:162:142:817:232", "IRISLAKE:185:190:401:226", "LAKEFALATHIM:115:181:138:144", "MAESTRASPOST:198:290:216:46", "MYSTRALLAKE:262:228:363:354:420:2359", "NIGHTRUN:212:244:604:263:431:0", "RAYNEWOODRETREAT:165:235:527:243", "SATYRNAAR:163:172:702:230", "THEHOWLINGVALE:196:172:471:147", "THERUINSOFSTARDUST:141:135:268:382", "THESHRINEOFAESSINA:205:179:113:268", "THEZORAMSTRAND:228:235:26:33", "THISTLEFURVILLAGE:243:184:210:164", "WARSONGLUMBERCAMP:185:146:804:319",}, - ["Aszhara"] = {"BAYOFSTORMS:257:285:486:208", "BITTERREACHES:231:173:651:46", "FORLORNRIDGE:210:247:198:373", "HALDARRENCAMPMENT:191:138:83:339", "JAGGEDREEF:556:153:373:9", "LAKEMENNAR:301:184:302:437", "LEGASHENCAMPMENT:224:131:484:49", "RAVENCRESTMONUMENT:227:115:559:506", "RUINSOFELDARATH:251:268:246:228", "SHADOWSONGSHRINE:213:170:43:428", "SOUTHRIDGEBEACH:355:207:397:360", "TEMPLEOFARKKORAN:177:187:689:160", "THALASSIANBASECAMP:224:144:507:126", "THERUINEDREACHES:384:116:403:549", "THESHATTEREDSTRAND:148:199:412:202", "TIMBERMAWHOLD:209:194:258:175", "TOWEROFELDARA:107:145:824:114", "URSOLAN:219:212:327:94", "VALORMOK:201:158:93:236",}, - ["Badlands"] = {"AGMONDSEND:249:256:354:396", "ANGORFORTRESS:186:241:327:101", "APOCRYPHANSREST:251:195:20:315", "CAMPBOFF:195:207:506:361", "CAMPCAGG:247:205:15:432:347:0", "CAMPKOSH:214:211:556:56", "CRYSTALLINEPINNACLE:140:155:609:337", "DUSTWINDGULCH:229:190:506:216", "HAMMERTOESDIGSITE:185:177:455:131", "KARGATH:232:245:0:154", "LETHLORRAVINE:344:395:627:173", "MIRAGEFLATS:276:229:153:387", "REDBRANDSDIGSITE:325:155:496:454", "RUINSOFCORTHAN:210:200:203:124", "SCALEBANERIDGE:205:179:751:142", "THEDUSTBOWL:253:266:166:203", "THEMAKERSTERRACE:230:172:399:16:1517:0", "VALLEYOFFANGS:215:215:358:265",}, - ["Balor"] = {"BILGERATCOMPOUND:174:141:323:76", "CROAKINGPLATEAU:371:154:397:201", "GRAHANESTATE:93:116:306:392", "GULLWINGWRECKAGE:110:105:221:34", "LANGSTONORCHARD:102:129:410:346", "RUINSOFBREEZEHAVEN:163:141:450:256", "SCURRYINGTHICKET:144:158:283:161", "SIOUTPOST:175:232:597:389", "SORROWMORELAKE:174:140:303:277", "STORMBREAKERPOINT:243:197:583:212", "STORMREAVERSPIRE:151:119:491:429", "STORMWROUGHTCASTLE:202:166:458:332", "TREACHEROUSCRAGS:243:171:381:457", "VANDERFARMSTEAD:146:140:330:372", "WINDROCKCLIFFS:192:279:256:303",}, - ["Barrens"] = {"AGAMAGOR:183:173:348:242", "ANCHORSEDGE:118:83:690:300", "BAELMODAN:120:123:435:482", "BLACKTHORNRIDGE:140:123:340:465", "BOULDERLODEMINE:109:105:560:0", "BRAMBLESCAR:112:152:446:304", "CAMPTAURAJO:130:113:370:355", "DREADMISTPEAK:121:93:423:68", "FARWATCHPOST:85:152:572:58", "FIELDOFGIANTS:194:137:363:410", "GROLDOMFARM:112:107:499:67", "HONORSSTAND:128:128:306:130", "LUSHWATEROASIS:160:169:372:186", "NORTHWATCHFOLD:134:107:533:310", "RAPTORGROUNDS:101:99:512:299", "RATCHET:116:118:556:190", "RAZORFENDOWNS:137:106:414:562", "RAZORFENKRAUL:116:123:345:539", "THECROSSROADS:142:140:436:127", "THEDRYHILLS:185:134:324:36", "THEFORGOTTENPOOLS:104:116:391:120", "THEMERCHANTCOAST:80:123:584:249", "THEMORSHANRAMPART:118:91:418:0", "THESLUDGEFEN:153:113:463:0", "THESTAGNANTOASIS:147:126:484:211", "THORNHILL:128:120:502:123",}, - ["BlackstoneIsland"] = {"BLACKASHCOALPITS:303:474:209:178", "BLACKASHMINE:251:204:397:222", "GAZZIKSWORKSHOP:329:247:439:403", "RUSTGATELUMBERYARD:217:245:551:241", "RUSTGATERIDGE:396:226:372:360", "THEWATERHOLE:386:239:382:43", "VENTURECOSLUMS:270:192:498:129",}, - ["BlastedLands"] = {"ALTAROFSTORMS:169:142:318:141", "DARKPORTAL:254:208:460:265", "DREADMAULHOLD:200:171:351:21", "DREADMAULPOST:228:183:370:204", "GARRISONARMORY:155:192:480:15", "NETHERGARDEKEEP:169:178:567:35", "RISEOFTHEDEFILER:150:131:414:131", "SERPENTSCOIL:211:155:510:148", "THETAINTEDSCAR:370:438:220:184",}, - ["BurningSteppes"] = {"ALTAROFSTORMS:215:210:41:114", "BLACKROCKMOUNTAIN:249:272:178:104", "BLACKROCKPASS:259:299:597:285", "BLACKROCKSTRONGHOLD:232:258:342:120", "DRACODAR:405:309:61:262", "DREADMAULROCK:203:214:717:174", "MORGANSVIGIL:287:265:715:311", "PILLAROFASH:313:261:382:289", "RUINSOFTHAURISSAN:258:275:521:105", "TERRORWINGPATH:271:296:730:52",}, - ["Darkshore"] = {"AMETHARAN:163:178:340:323", "AUBERDINE:134:179:323:191", "BASHALARAN:153:171:379:199", "CLIFFSPRINGRIVER:205:161:391:112:445:0", "GROVEOFTHEANCIENTS:180:138:314:436", "REMTRAVELSEXCAVATION:148:164:245:504", "RUINSOFMATHYSTRA:176:205:519:3", "THEMASTERSGLAIVE:146:139:346:529", "TOWEROFALTHALAXX:142:159:484:110",}, - ["DeadwindPass"] = {"DEADMANSCROSSING:368:353:257:81:2938:0", "KARAZHAN:287:234:277:342", "THEVICE:254:257:433:305",}, - ["Desolace"] = {"ETHELRETHOR:189:237:318:68", "GELKISVILLAGE:181:235:300:433", "KODOGRAVEYARD:253:237:396:251", "KOLKARVILLAGE:206:208:615:221", "KORMEKSHUT:156:147:562:187", "MAGRAMVILLAGE:182:272:606:373", "MANNOROCCOVEN:270:271:408:385", "NIJELSPOINT:188:246:561:0", "RANAZJARISLE:88:89:248:11", "SARGERON:274:237:632:38", "SHADOWBREAKRAVINE:190:181:698:454", "SHADOWPREYVILLAGE:215:218:175:395", "TETHRISARAN:185:137:440:0", "THUNDERAXEFORTRESS:174:207:455:108", "VALLEYOFSPEARS:234:274:217:221",}, - ["DunMorogh"] = {"AMBERSTILLRANCH:105:104:582:288", "ANVILMAR:209:159:167:414:77:0", "BREWNALLVILLAGE:94:102:263:256", "CHILLBREEZEVALLEY:160:113:281:304", "COLDRIDGEPASS:134:123:300:387", "FROSTMANEHOLD:112:118:225:291", "GNOMERAGON:158:176:178:164", "GOLBOLARQUARRY:144:149:619:301", "HELMSBEDLAKE:131:153:706:284:716:0", "ICEFLOWLAKE:117:167:286:173", "IRONFORGE:291:187:414:166", "IRONFORGEAIRFIELDS:213:233:582:100", "KHARANOS:175:186:397:296:189:0", "MISTYPINEREFUGE:117:155:507:224", "NORTHERNGATEOUTPOST:115:155:766:177", "RUGFORDSMOUNTAINREST:199:114:739:406", "SHIMMERRIDGE:115:173:355:169", "SOUTHERNGATEOUTPOST:113:106:800:284", "THEGRIZZLEDDEN:178:155:321:328", "THETUNDRIDHILLS:135:115:531:328",}, - ["Durotar"] = {"DRYGULCHRAVINE:139:134:438:92:410:0", "ECHOISLES:175:236:561:432", "KOLKARCRAG:131:96:426:487", "ORGRIMMAR:427:150:251:0", "RAZORHILL:188:207:445:182", "RAZORMANEGROUNDS:196:202:318:204", "SENJINVILLAGE:133:167:485:398", "SKULLROCK:118:79:469:51", "SPARKWATERPORT:122:134:522:94", "THUNDERRIDGE:156:174:341:72", "TIRAGARDEKEEP:160:148:477:300", "VALLEYOFTRIALS:186:184:370:335",}, - ["Duskwood"] = {"ADDLESSTEAD:255:231:67:353", "BRIGHTWOODGROVE:191:315:520:131", "DARKSHIRE:291:259:644:173:576:0", "MANORMISTMANTLE:174:150:668:134", "RAVENHILL:166:115:117:317", "RAVENHILLCEMETARY:323:276:99:165:243:0", "THEDARKENEDBANK:886:184:105:44", "THEHUSHEDBANK:136:306:29:143", "THEROTTINGORCHARD:231:210:549:380", "THEYORGENFARMSTEAD:211:235:403:393", "TRANQUILGARDENSCEMETARY:204:196:692:363", "TWILIGHTGROVE:327:384:314:99", "VULGOLOGREMOUND:231:266:259:365",}, - ["Dustwallow"] = {"ALCAZISLAND:176:179:671:29", "BACKBAYWETLANDS:384:243:248:196", "BRACKENWALLVILLAGE:264:264:239:2:507:0", "THEDENOFFLAME:246:235:264:320", "THERAMOREISLE:214:187:542:232", "THEWYRMBOG:263:229:372:387", "WITCHHILL:230:311:431:1:518:0", "WESTHAVENHOLLOW:166:149:603:428",}, - ["EasternPlaguelands"] = {"BLACKWOODLAKE:217:221:451:207", "CORINSCROSSING:153:146:544:373", "CROWNGUARDTOWER:193:152:299:408", "DARROWSHIRE:195:167:316:497", "EASTWALLTOWER:164:143:600:250", "FORLORNSUMMIT:192:185:64:225", "LAKEMERELDAR:240:164:543:469", "LIGHTSHOPECHAPEL:165:238:721:304", "NORTHDALE:172:191:628:135", "NORTHPASSTOWER:228:178:465:118", "PESTILENTSCAR:189:241:416:349", "PLAGUEWOOD:346:258:178:92", "QUELLITHIENLODGE:216:136:430:44", "STRATHOLME:227:189:202:15", "TERRORDALE:175:129:86:137", "THEFUNGALVALE:202:199:277:267", "THEINFECTISSCAR:183:262:628:298", "THEMARRISSTEAD:182:194:164:367", "THENOXIOUSGLADE:211:202:730:172", "THEUNDERCROFT:171:136:178:484", "THONDRORILRIVER:210:348:12:235", "TYRSHAND:201:159:724:475", "ZULMASHAR:189:152:621:36",}, - ["Elwynn"] = {"BRACKWELLPUMPKINPATCH:222:223:592:431", "CRYSTALLAKE:196:192:435:345", "EASTVALELOGGINGCAMP:237:190:713:339", "FARGODEEPMINE:238:230:247:438:63:64", "FORESTSEDGE:242:335:132:333:120:0", "GOLDSHIRE:219:199:261:280", "JERODSLANDING:206:212:437:445", "NORTHSHIREVALLEY:237:244:390:154", "RIDGEPOINTTOWER:287:207:710:445", "STONECAIRNLAKE:278:230:601:203", "STORMWIND:452:392:21:3", "TOWEROFAZORA:232:226:561:303:54:0",}, - ["Felwood"] = {"BLOODVENOMFALLS:225:132:297:269", "DEADWOODVILLAGE:162:129:415:539", "EMERALDSANCTUARY:171:150:411:436", "FELPAWVILLAGE:224:138:489:0:1769:0", "IRONTREEWOODS:200:203:426:60", "JADEFIREGLEN:151:145:339:469", "JADEFIRERUN:181:159:338:35", "JAEDENAR:236:122:275:333", "MORLOSARAN:129:151:503:515", "RUINSOFCONSTELLAS:224:142:303:387", "SHATTERSCARVALE:218:186:315:130", "TALONBRANCHGLADE:145:130:554:97",}, - ["Feralas"] = {"CAMPMOJACHE:146:148:694:238", "CHIMAERAROOSTVALE:106:150:785:321", "DIREMAUL:214:180:461:208", "DREAMBOUGH:141:122:459:0", "FERALSCARVALE:103:104:491:335", "FRAYFEATHERHIGHLANDS:101:163:485:391", "GORDUNNIOUTPOST:154:128:697:148", "GRIMTOTEMCOMPOUND:110:186:630:172", "ISLEOFDREAD:205:285:197:381", "LOWERWILDS:214:152:756:204", "ONEIROS:101:103:499:74", "RUINSOFISILDIEN:179:241:547:326", "RUINSOFRAVENWIND:178:149:310:0", "SARDORISLE:167:168:216:241", "THEFORGOTTENCOAST:132:316:409:258", "THETWINCOLOSSALS:278:235:323:78", "THEWRITHINGDEEP:214:205:625:305:2519:0",}, - ["Gillijim"] = {"DEEPTIDESANCTUM:204:117:199:512", "DISTILLERYISLE:90:69:234:216", "FAELONSFOLLY:108:103:331:304", "GILLIJIMSTRAND:108:324:641:160", "JADEMINE:141:149:500:256", "KALKORPOINT:123:115:421:210", "KAZONISLAND:194:113:432:51", "MAULOGGPOST:137:227:512:401", "MAULOGGREFUGE:231:132:615:465", "RUINSOFZULRAZAR:215:136:369:384", "SILVERCOAST:245:184:311:386", "SILVERSANDBAR:47:128:256:398", "SOUTHSEASANDBAR:125:172:178:63", "TANGLEWOOD:135:188:576:297", "ZULRAZAR:137:168:375:282",}, - ["Gilneas"] = {"BLACKTHORNSCAMP:160:163:32:171", "BROLOKMOUND:140:120:467:349", "DAWNSTONEMINE:130:144:292:155", "FREYSHEARKEEP:72:70:624:405", "GILNEASCITY:295:242:89:105", "GLAYMORESTEAD:140:127:483:129", "GREYMANESWATCH:119:158:580:311", "HOLLOWWEBCEMETARY:180:167:215:395", "HOLLOWWEBWOODS:171:118:341:452", "NORTHGATETOWER:130:137:397:172", "OLDROCKPASS:155:165:290:37", "RAVENSHIRE:194:237:472:431", "RAVENWOODKEEP:253:174:496:494", "ROSEWICKPLANTATION:134:140:331:155", "RUINSOFGREYSHIRE:192:144:230:260", "SHADEMORETAVERN:117:120:279:336", "SOUTHMIREORCHARD:202:133:302:354", "STILLWARDCHURCH:213:166:471:220", "THEDRYROCKMINE:129:127:145:262", "THEDRYROCKPIT:230:217:69:295", "THEGREYMANEWALL:131:173:412:48", "THEOVERGROWNACRE:134:154:390:269",}, - ["GrimReaches"] = {"BAGGOTHSRAMPART:112:113:399:238", "BARLEYCRESTFARMSTEAD:116:88:499:222", "BRANGARSFOLLY:108:123:568:33", "DUNKITHAS:137:95:470:329", "EASTRIDGEOUTPOST:166:107:374:165", "GETHKAR:118:124:444:84", "GROLDANSEXCAVATION:125:117:567:231", "LAKEKITHAS:217:150:481:270", "RUINSOFSTOLGAZKEEP:134:146:366:53", "SALGAZMINES:150:119:535:380", "SHATTERBLADEPOST:186:130:512:126", "SLATEBEARDSFORGE:136:99:457:404", "THEGRIMHOLLOW:288:200:396:463", "THEHIGHPASS:97:141:409:315", "ZARMGETHPOINT:143:76:405:16", "ZARMGETHSTRONGHOLD:120:150:487:17",}, - ["Hilsbrad"] = {"AZURELOADMINE:146:174:188:288", "DARROWHILL:173:132:426:164", "DUNGAROK:225:257:644:305", "DURNHOLDEKEEP:367:347:614:82", "EASTERNSTRAND:208:301:537:350", "HILLSBRADFIELDS:282:257:211:166", "NETHANDERSTEAD:190:215:554:249", "PURGATIONISLE:120:94:111:485", "SOUTHPOINTTOWER:271:207:11:203", "SOUTHSHORE:219:245:423:213", "TARRENMILL:195:291:524:9", "WESTERNSTRAND:272:139:215:377",}, - ["Hinterlands"] = {"AERIEPEAK:240:195:20:250", "AGOLWATHA:188:180:382:173", "HIRIWATHA:201:118:188:314", "JINTHAALOR:223:277:514:338", "PLAGUEMISTRAVINE:124:203:170:158", "QUELDANILLODGE:168:181:248:194", "SERADANE:260:263:519:25", "SHADRAALOR:181:170:247:394", "SHAOLWATHA:265:190:580:247", "SKULKROCK:148:133:520:241", "THEALTAROFZUL:186:153:382:371", "THECREEPINGRUIN:168:157:417:268", "THEOVERLOOKCLIFFS:153:299:702:309", "THERASAZTRAILS:118:133:210:381", "VALORWINDLAKE:153:160:329:309",}, - ["Hyjal"] = {"BARKSKINPLATEAU:207:167:390:297", "BARKSKINVILLAGE:502:293:417:346", "BLEAKHOLLOWCRATER:297:335:401:20", "CIRCLEOFPOWER:277:331:203:63", "DARKHOLLOWPASS:214:237:342:389", "NORDANAAR:139:146:778:118", "NORDRASSILGLADE:418:408:578:0", "RUINSOFTELENNAS:165:193:141:236", "THEEMERALDGATEWAY:309:244:109:353", "ZULHATHA:191:210:3:194",}, - ["Icepoint"] = {"KANEQNUUN:512:430:237:129",}, - ["Lapidis"] = {"BRIGHTCOAST:298:213:237:246", "CAELANSREST:147:111:517:230", "CROWNISLAND:140:95:512:33", "GORDOSHHEIGHTS:253:243:256:89", "HAZURRIGLADE:87:82:486:306", "SHANKSREEF:207:90:446:109", "THEROCK:74:72:687:149", "TOWEROFLAPIDIS:203:118:487:175", "WALLOWINGCOAST:240:184:505:326", "ZULHAZU:227:178:348:407",}, - ["LochModan"] = {"GRIZZLEPAWRIDGE:262:343:326:325", "IRONBANDSEXCAVATIONSITE:321:294:491:276", "MOGROSHSTRONGHOLD:287:265:558:61", "NORTHGATEPASS:195:273:143:24:925:0", "SILVERSTREAMMINE:201:243:247:25", "STONESPLINTERVALLEY:226:255:230:363", "STONEWROUGHTDAM:260:149:354:23", "THEFARSTRIDERLODGE:162:182:741:298", "THELOCH:288:380:367:99", "THELSAMAR:243:205:225:214", "VALLEYOFKINGS:166:224:123:382",}, - ["Moonglade"] = {"LAKEELUNEARA:530:484:256:101:2361:0",}, - ["Moonwhisper"] = {"ANSHESRESPITE:170:120:398:81", "ANCESTRALGROUNDS:164:82:295:88", "BLACKROOTHOLD:162:137:495:465", "BLACKROOTVILLAGE:224:143:411:525", "FOULHEARTSANCTUM:157:149:496:232", "GROVEOFTHEMOON:152:146:464:347", "LUNARCLAWDEN:84:60:674:376", "MARASETHIL:96:94:640:417", "MOONHOOFRETREAT:172:144:419:167", "MOONHOOFVILLAGE:163:157:570:188", "MOONSILKHOLLOW:125:114:577:458", "MOROGAIVILLAGE:133:127:571:372", "NARVALISPOINT:162:139:503:118", "RUINSOFNENDIS:183:130:584:275", "STARSHARDCRADLE:122:109:334:121", "TYRANDAS:158:169:580:61", "VYSNAGOSASREST:163:102:420:8",}, - ["Mulgore"] = {"BAELDUNDIGSITE:175:151:269:227", "BLOODHOOFVILLAGE:236:182:378:311", "PALEMANEROCK:102:183:315:317", "RAVAGEDCARAVAN:110:100:482:269", "REDCLOUDMESA:436:231:285:437:221:0", "REDROCKS:154:138:522:92", "SUNTAILPASS:129:116:533:18", "THEGOLDENPLAINS:184:217:441:91", "THEROLLINGPLAINS:231:166:536:369", "THEVENTURECOMINE:187:204:549:251", "THUNDERBLUFF:254:217:264:70", "THUNDERHORNWATERWELL:118:137:384:248", "WILDMANEWATERWELL:152:111:299:10", "WINDFURYRIDGE:182:119:405:2", "WINTERHOOFWATERWELL:144:107:470:379",}, - ["Northwind"] = {"ABBEYGARDENS:250:224:512:33", "AMBERSHIRE:234:215:334:278", "AMBERWOODKEEP:243:205:187:308", "BLACKROCKBREACH:255:201:721:222", "BRISTLEWHISKERCAVERN:197:185:568:232", "CINDERFALLPASS:229:229:733:348", "CRAWFORDWINERY:160:222:513:285", "CRYSTALFALLS:320:205:627:464", "GRIMMENLAKE:218:210:550:352", "MERCHANTSHIGHROAD:353:249:256:420", "NORTHRIDGEPOINT:298:314:349:31", "NORTHWINDLOGGINGCAMP:224:185:258:171", "RUINSOFBIRKHAVEN:180:208:645:116", "SHERWOODQUARRY:293:287:702:1", "STILLHEARTPORT:174:155:116:217", "TOWEROFMAGILOU:181:223:189:169", "WITCHCOVEN:147:162:257:81",}, - ["Redridge"] = {"ALTHERSMILL:222:260:407:134", "GALARDELLVALLEY:234:240:661:168:96:0", "LAKEEVERSTILL:522:260:140:249", "LAKERIDGEHIGHWAY:411:274:196:341", "LAKESHIRE:325:179:92:204", "REDRIDGECANYONS:345:232:132:79:98:0", "RENDERSCAMP:264:248:284:4:998:0", "RENDERSVALLEY:453:248:491:365", "REDWALLKEEP:162:110:830:466", "STONEWATCH:243:289:507:221:999:0", "STONEWATCHFALLS:308:200:601:325", "THREECORNERS:360:337:0:288",}, - ["SearingGorge"] = {"BLACKCHARCAVE:264:224:84:371", "DUSTFIREVALLEY:446:355:428:11", "FIREWATCHRIDGE:385:413:95:39", "GRIMSILTDIGSITE:292:210:501:306", "TANNERCAMP:292:215:552:413", "THECAULDRON:414:310:257:178", "THESEAOFCINDERS:345:273:256:395",}, - ["Silithus"] = {"HIVEASHI:431:276:305:34:3426:0", "HIVEREGAL:469:335:262:333:3427:0", "HIVEZORA:343:424:117:188", "SOUTHWINDVILLAGE:346:348:519:83:3077:0", "THECRYSTALVALE:285:274:121:31", "THESCARABWALL:271:145:125:523:2741:0", "TWILIGHTBASECAMP:297:238:355:206:3097:2739",}, - ["Silverpine"] = {"AMBERMILL:204:210:512:279", "BERENSPERIL:206:146:508:433", "DEEPELEMMINE:127:143:484:274", "FENRISISLE:234:187:593:88:232:0", "MALDENSORCHARD:228:138:479:9:239:0", "NORTHTIDESHOLLOW:152:104:337:141", "OLSENSFARTHING:128:152:401:267", "PYREWOODVILLAGE:122:108:405:456", "SHADOWFANGKEEP:185:131:380:373", "THEDEADFIELD:141:134:419:82", "THEDECREPITFERRY:144:156:475:160", "THEGREYMANEWALL:175:185:398:465", "THESEPULCHER:193:135:360:184", "THESHININGSTRAND:225:192:475:27:227:0", "THESKITTERINGDARK:160:165:302:18",}, - ["StonetalonMountains"] = {"AMANIALOR:504:252:8:5", "BAELHARDUL:357:252:512:257", "BLACKSANDOILFIELDS:504:504:8:5", "BOULDERSLIDERAVINE:90:76:586:547", "BRAMBLETHORNPASS:382:359:512:257", "BROKENCLIFFMINE:252:504:260:5", "CAMPAPARAJE:222:100:670:552", "GRIMTOTEMPOST:146:77:675:519", "MALAKAJIN:137:86:662:562", "MIRKFALLONLAKE:504:504:260:5", "POWDERTOWN:252:252:260:257", "SISHIRCANYON:252:264:512:257", "STONETALONPEAK:258:252:260:5", "SUNROCKRETREAT:504:252:260:257", "THECHARREDVALE:252:308:260:257", "THEEARTHENRING:504:252:260:257", "VENTURECOMPANYCAMP:252:504:260:5", "WEBWINDERPATH:256:324:512:256", "WINDSHEARCRAG:256:256:512:256:1277:0",}, - ["Stranglethorn"] = {"BALALRUINS:83:65:245:101", "BALIAMAHRUINS:100:133:376:133", "BLOODSAILCOMPOUND:154:163:201:291", "BOOTYBAY:137:125:207:435:312:0", "CRYSTALVEINMINE:111:114:350:280", "GROMGOLBASECAMP:101:98:265:137", "JAGUEROISLE:132:107:319:498", "KALAIRUINS:86:89:303:93", "KURZENSCOMPOUND:141:139:394:5", "LAKENAZFERITI:124:120:332:60", "MISTVALEVALLEY:120:116:283:372", "MIZJAHRUINS:93:102:315:133", "MOSHOGGOGREMOUND:123:168:435:96", "NEKMANIWELLSPRING:80:102:215:365", "NESINGWARYSEXPEDITION:128:98:274:29", "REBELCAMP:164:86:289:0", "RUINSOFABORAZ:87:87:356:340", "RUINSOFJUBUWAL:100:105:312:304", "RUINSOFZULKUNDA:113:132:201:8", "RUINSOFZULMAMWE:162:122:397:213", "THEARENA:186:176:241:194", "THEVILEREEF:177:160:159:98", "VENTURECOBASECAMP:96:120:391:66", "WILDSHORE:151:175:237:431", "ZIATAJAIRUINS:127:120:364:231", "ZULGURUB:230:213:489:12", "ZUULDAIARUINS:103:105:160:47",}, - ["SwampOfSorrows"] = {"FALLOWSANCTUARY:348:292:501:0", "ITHARIUSSCAVE:230:232:0:270", "MISTYREEDSTRAND:250:664:752:0:1978:0", "MISTYVALLEY:211:179:29:148", "POOLOFTEARS:280:256:576:227", "SORROWMURK:199:351:734:128", "SPLINTERSPEARJUNCTION:258:222:138:245", "STAGALBOG:328:238:561:386", "STONARD:343:303:287:244", "SORROWGUARDKEEP:220:174:0:266", "THEHARBORAGE:216:187:182:157", "THESHIFTINGMIRE:303:221:294:118",}, - ["Tanaris"] = {"ABYSSALSANDS:194:159:376:207", "BROKENPILLAR:93:165:481:243", "CAVERNSOFTIME:139:132:567:262", "DUNEMAULCOMPOUND:186:127:337:298", "EASTMOONRUINS:143:130:405:355", "GADGETZAN:156:149:430:102", "LANDSENDBEACH:184:148:456:514", "LOSTRIGGERCOVE:141:173:635:230", "NOONSHADERUINS:129:191:530:43", "SANDSORROWWATCH:175:157:311:111", "SOUTHBREAKSHORE:192:151:510:304", "SOUTHMOONRUINS:185:196:324:366", "STEAMWHEEDLEPORT:136:129:599:86", "SLICKWICKOILRIG:237:181:129:436", "THEGAPINGCHASM:198:188:458:380", "THENOXIOUSLAIR:155:180:265:209", "THISTLESHRUBVALLEY:166:234:217:294", "VALLEYOFTHEWATCHERS:125:115:311:470", "WATERSPRINGFIELD:145:164:516:177", "ZALASHJISDEN:90:127:619:157", "ZULFARRAK:191:166:265:5",}, - ["TelAbim"] = {"BIXXLESSTOREHOUSE:300:127:368:178", "HIGHVALERISE:191:187:468:248", "TAZZOSSHACK:229:232:453:391", "TELCOBASECAMP:184:183:342:440", "THEDERELICTCAMP:165:205:364:273", "THEJAGGEDISLES:313:256:385:16",}, - ["Teldrassil"] = {"BANETHILHOLLOW:136:191:392:289", "DARNASSUS:294:252:110:251", "DOLANAAR:170:119:469:327", "GNARLPINEHOLD:230:158:316:417", "LAKEALAMETH:237:163:445:388", "POOLSOFARLITHRIEN:125:180:337:314", "RUTTHERANVILLAGE:110:91:504:548", "SHADOWGLEN:198:201:504:164", "STARBREEZEVILLAGE:153:175:588:303", "THEORACLEGLADE:150:223:279:135", "URSANHEIGHTS:229:154:243:423", "WELLSPRINGLAKE:166:245:383:98:265:0",}, - ["ThalassianHighlands"] = {"ALAHTHALAS:470:276:429:38", "ANASTERIANPARK:229:219:385:256", "BRINTHILIEN:180:211:395:450", "FELSTRIDERRETREAT:201:207:165:428", "ISLEOFETERNALAUTUMN:204:167:236:117", "RUINSOFNASHALARAN:249:266:36:151", "SILVERSUNMINE:208:189:288:373", "THEFARSTRIDE:230:199:212:255", "THELASTRUNESTONE:179:203:507:379",}, - ["ThousandNeedles"] = {"CAMPETHOK:289:300:7:1:2237:0", "DARKCLOUDPINNACLE:189:182:267:138", "FREEWINDPOST:193:173:366:273", "HIGHPERCH:178:174:39:164", "SPLITHOOFCRAG:193:175:400:203", "THEGREATLIFT:191:163:213:78", "THESCREECHINGCANYON:240:231:187:206", "THESHIMMERINGFLATS:312:355:612:308", "WINDBREAKCANYON:225:213:501:249",}, - ["Tirisfal"] = {"AGAMANDMILLS:244:191:342:148", "BALNIRFARMSTEAD:179:153:639:335", "BRIGHTWATERLAKE:176:280:598:143", "BRILL:121:144:540:305", "BULWARK:184:169:712:374", "COLDHEARTHMANOR:136:125:479:328", "CRUSADEROUTPOST:154:121:701:293", "DEATHKNELL:210:186:236:337", "GARRENSHAUNT:148:199:507:154", "GLENSHIRE:163:161:157:393:5033:5039", "MONASTARY:175:157:762:139:161:0", "NIGHTMAREVALE:209:151:370:355", "RUINSOFLORDAERON:299:216:469:370", "SCARLETWATCHPOST:141:223:701:113", "SOLLIDENFARMSTEAD:225:138:247:259", "STEEPCLIFFPORT:121:120:5:350", "STILLWATERPOND:168:123:401:279", "THECORINTHFARMSTEAD:116:152:73:402:5041:0", "THEWHISPERINGFOREST:243:175:86:263:5035:0", "VENOMWEBVALE:199:183:776:225",}, - ["UngoroCrater"] = {"FIREPLUMERIDGE:277:258:377:185", "GOLAKKAHOTSPRINGS:299:334:133:158", "IRONSTONEPLATEAU:276:281:588:69", "LAKKARITARPITS:553:255:170:13", "TERRORRUN:333:275:166:375", "THEMARSHLANDS:295:341:568:247", "THESLITHERINGSCAR:326:260:378:403",}, - ["WesternPlaguelands"] = {"CAERDARROW:158:150:608:421", "DALSONSTEARS:209:138:388:271", "DARROWMERELAKE:359:261:510:348", "FELSTONEFIELD:149:119:306:315", "GAHRRONSWITHERING:165:191:527:257", "HEARTHGLEN:331:280:312:20", "NORTHRIDGELUMBERCAMP:205:168:390:170", "RUINSOFANDORHOL:275:219:265:360", "SORROWHILL:290:201:360:467", "THEBULWARK:216:172:143:300", "THEWEEPINGCAVE:148:192:572:203", "THEWRITHINGHAUNT:159:177:457:329", "THONDRORILRIVER:193:326:597:94",}, - ["Westfall"] = {"ALEXSTONFARMSTEAD:275:182:220:274", "DEMONTSPLACE:166:155:226:391", "FURLBROWSPUMPKINFARM:186:191:399:24", "GOLDCOASTQUARRY:194:241:234:113", "JANGOLODEMINE:185:187:323:44", "MOONBROOK:208:174:317:349:919:0", "SALDEANSFARM:191:184:478:119", "SENTINELHILL:161:210:461:259", "THEDAGGERHILLS:235:149:349:430", "THEDEADACRE:164:213:542:267", "THEDUSTPLAINS:260:204:538:393", "THEJANSENSTEAD:143:183:498:6", "THEMOLSENFARM:199:180:342:161", "WESTFALLLIGHTHOUSE:306:161:171:482",}, - ["Wetlands"] = {"ANGERFANGENCAMPMENT:196:150:364:241", "BLACKCHANNELMARSH:213:173:95:260", "BLUEGILLMARSH:195:165:111:157", "DIREFORGEHILL:233:225:515:128", "DUNMODR:173:147:419:42", "DUNAGRATH:222:190:97:335", "GRIMBATOL:317:331:623:242:1037:0", "HAWKSVIGIL:170:162:264:353", "IRONBEARDSTOMB:165:156:368:135", "MENETHILHARBOR:156:116:27:321", "MOSSHIDEFEN:215:224:539:277", "RAPTORRIDGE:159:115:640:191", "SALTSPRAYGLEN:170:214:254:58", "SUNDOWNMARSH:265:212:113:100", "THEGREENBELT:153:209:473:143", "THELGANROCK:207:165:478:383:836:0", "WHELGARSEXCAVATIONSITE:172:156:264:224",}, - ["Winterspring"] = {"DARKWHISPERGORGE:247:191:452:447", "EVERLOOK:151:189:516:114", "FROSTFIREHOTSPRINGS:226:124:231:180", "FROSTSABERROCK:240:172:375:11", "FROSTWHISPERGORGE:184:144:531:383", "ICETHISTLEHILLS:116:155:617:247", "LAKEKELTHERIL:203:176:409:205", "MAZTHORIL:174:169:499:265", "OWLWINGTHICKET:149:127:600:348", "STARFALLVILLAGE:174:148:399:143", "THEHIDDENGROVE:162:174:562:33", "TIMBERMAWPOST:223:112:235:248", "WINTERFALLVILLAGE:133:120:622:163",}, -} diff --git a/modules/actionbar.lua b/modules/actionbar.lua index b7d3dc87..10af21fc 100644 --- a/modules/actionbar.lua +++ b/modules/actionbar.lua @@ -335,8 +335,7 @@ pfUI:RegisterModule("actionbar", function () local slfcast = C.bars.altself == "1" and IsAltKeyDown() and true or self.slfcast slfcast = C.bars.rightself == "1" and arg1 and arg1 == "RightButton" and true or slfcast self.slfcast = nil - - if ( pfUI_config.bars.keydown == "1" and keystate == "down" and not drag_active ) or (pfUI_config.bars.keydown == "0" and keystate == "up" or drag_active ) or self.bar == 11 or mouse then + if ( C.bars.keydown == "1" and keystate == "down" and not drag_active ) or (C.bars.keydown == "0" and keystate == "up" or drag_active ) or self.bar == 11 or mouse then if self.bar == 11 then CastShapeshiftForm(self.id) elseif grid == 1 then diff --git a/modules/equipmentmanager.lua b/modules/equipmentmanager.lua index 7ad69e46..d27cf723 100644 --- a/modules/equipmentmanager.lua +++ b/modules/equipmentmanager.lua @@ -940,10 +940,10 @@ pfUI:RegisterModule("equipmentmanager", function() -- Tie popout visibility to the EM sidecar. They appear when the -- sidecar opens, hide when it closes, and the flyout closes too. - HookScript(frame, "OnShow", function() + frame:HookScript("OnShow", function() for _, b in ipairs(popoutButtons) do b:Show() end end) - HookScript(frame, "OnHide", function() + frame:HookScript("OnHide", function() for _, b in ipairs(popoutButtons) do b:Hide() end if flyout then flyout:Hide() end end) diff --git a/modules/map.lua b/modules/map.lua index ea356578..2c906e7e 100644 --- a/modules/map.lua +++ b/modules/map.lua @@ -54,7 +54,7 @@ pfUI:RegisterModule("map", function () if not this.hooked then this.hooked = true - HookScript(WorldMapFrame, "OnShow", function() + WorldMapFrame:HookScript("OnShow", function() -- customize this:EnableKeyboard(false) this:EnableMouseWheel(1) @@ -66,7 +66,7 @@ pfUI:RegisterModule("map", function () pfOrigSetMapToCurrentZone() end) - HookScript(WorldMapFrame, "OnMouseWheel", function() + WorldMapFrame:HookScript("OnMouseWheel", function() if IsShiftKeyDown() then alpha = clamp(WorldMapFrame:GetAlpha() + arg1/10, 0.1, 1.0) WorldMapFrame:SetAlpha(alpha) @@ -91,11 +91,11 @@ pfUI:RegisterModule("map", function () SaveMovable(this, true) end) - HookScript(WorldMapFrame, "OnDragStart", function() + WorldMapFrame:HookScript("OnDragStart", function() WorldMapFrame:StartMoving() end) - HookScript(WorldMapFrame, "OnDragStop",function() + WorldMapFrame:HookScript("OnDragStop",function() WorldMapFrame:StopMovingOrSizing() SaveMovable(this, true) end) diff --git a/modules/mapreveal.lua b/modules/mapreveal.lua index 7a3bf794..fd177470 100644 --- a/modules/mapreveal.lua +++ b/modules/mapreveal.lua @@ -30,25 +30,6 @@ pfUI:RegisterModule("mapreveal", function () pfUI.mapreveal:UpdateConfig() end) - local function unpack_hash(prefix, hash) - local _, stored_prefix, textureName, textureWidth, textureHeight, offsetX, offsetY, mapPointX, mapPointY, name - _, _, stored_prefix, textureName, textureWidth, textureHeight, offsetX, offsetY = string.find(hash, "^([|]?)([^:]+):([^:]+):([^:]+):([^:]+):([^:]+)") - if (not textureName or not offsetY) then - return - end - if (offsetY) then - _, _, mapPointX, mapPointY = string.find(hash,"^[|]?[^:]+:[^:]+:[^:]+:[^:]+:[^:]+:([^:]+):([^:]+)") - end - if (not mapPointY) then - mapPointX = 0 mapPointY = 0 - end - if (stored_prefix ~= "|") then - name = textureName - textureName = string.format("%s%s",prefix,textureName) - end - return textureName, textureWidth + 0, textureHeight + 0, offsetX + 0, offsetY + 0, mapPointX + 0, mapPointY + 0, name - end - local explores = {} local explorecaches = {} local alreadyknown = {} -- per-zone accumulator: { [zone] = { [texName] = true } } @@ -88,13 +69,6 @@ pfUI:RegisterModule("mapreveal", function () end end - -- overlay data with lazy init - local overlayData = setmetatable(pfMapOverlayData, {__index = function(t,k) - local v = {} - rawset(t,k,v) - return v - end}) - local function pfWorldMapFrame_Update() -- clear stale caches for k in pairs(explorecaches) do explorecaches[k] = nil end @@ -108,7 +82,6 @@ pfUI:RegisterModule("mapreveal", function () local mapFileName = GetMapInfo() if not mapFileName then mapFileName = "World" end - local prefix = string.format("Interface\\WorldMap\\%s\\", mapFileName) local numOverlays = GetNumMapOverlays() -- accumulate explored overlays per zone (never clear, only add) @@ -123,12 +96,18 @@ pfUI:RegisterModule("mapreveal", function () -- hide explore icons for _, frame in pairs(explores) do frame:Hide() end - local zoneData = overlayData[mapFileName] + -- ClassicAPI: full overlay list for the viewed zone (explored + unexplored), + -- read straight from WorldMapOverlay.dbc. Replaces the hand-measured pfMapOverlayData. + local zoneData = C_Map.GetMapOverlays() or {} local textureCount = 0 - for i, hash in ipairs(zoneData) do - local textureName, textureWidth, textureHeight, offsetX, offsetY, mapPointX, mapPointY, name = unpack_hash(prefix, hash) - if not textureName then break end + for i, overlay in ipairs(zoneData) do + local name = overlay.textureName -- bare, e.g. "DRYGULCHRAVINE" + local textureName = overlay.texturePath -- full engine path (for SetTexture) + local textureWidth = overlay.textureWidth + local textureHeight = overlay.textureHeight + local offsetX = overlay.offsetX + local offsetY = overlay.offsetY -- explore magnifying glass icon explores[i] = explores[i] or CreateFrame("Frame", nil, WorldMapDetailFrame) @@ -146,6 +125,8 @@ pfUI:RegisterModule("mapreveal", function () explore.tex:SetTexCoord(.08, .92, .08, .92) explore.tex:SetAllPoints() + -- `alreadyknown` stores the FULL paths GetMapOverlayInfo returns, + -- so compare with the full path, not the bare name. if C.appearance.worldmap.mapexploration == "1" and not zoneKnown[string.upper(textureName)] then explore.tex:SetTexture("Interface\\WorldMap\\WorldMap-MagnifyingGlass") explore:Show() @@ -155,49 +136,31 @@ pfUI:RegisterModule("mapreveal", function () -- render overlay texture tiles on BORDER draw layer -- Blizzard's explored overlays on ARTWORK draw on top of BORDER + -- + -- overlay.tiles is pre-resolved by ClassicAPI: per-tile file / + -- draw size / texcoords / canvas position, with Octo's data + -- quirks (sliver columns the DBC rect rounds away, foreign tiles + -- appended to the number sequence, upscaled re-exports) already + -- disambiguated from the actual BLP dimensions. No 256px grid + -- math here — deriving the grid from textureWidth/Height is + -- exactly what shears quirky overlays (e.g. Icepoint's Kaneq'nuun). if C.appearance.worldmap.mapreveal == "1" then - local numH = math.ceil(textureWidth / 256) - local numV = math.ceil(textureHeight / 256) - local texPixW, texFileW, texPixH, texFileH + for _, tile in ipairs(overlay.tiles) do + textureCount = textureCount + 1 + local tex = pfGetOverlay(textureCount) - for j = 1, numV do - if j < numV then - texPixH = 256 - texFileH = 256 - else - texPixH = mod(textureHeight, 256) - if texPixH == 0 then texPixH = 256 end - texFileH = 16 - while texFileH < texPixH do texFileH = texFileH * 2 end - end + tex:SetWidth(tile.width) + tex:SetHeight(tile.height) + tex:SetTexCoord(0, tile.texCoordX, 0, tile.texCoordY) + tex:ClearAllPoints() + tex:SetPoint("TOPLEFT", "WorldMapDetailFrame", "TOPLEFT", tile.offsetX, -tile.offsetY) + tex:SetTexture(tile.file) - for k = 1, numH do - textureCount = textureCount + 1 - local tex = pfGetOverlay(textureCount) + explorecaches[name] = explorecaches[name] or {} + explorecaches[name][tex] = true - if k < numH then - texPixW = 256 - texFileW = 256 - else - texPixW = mod(textureWidth, 256) - if texPixW == 0 then texPixW = 256 end - texFileW = 16 - while texFileW < texPixW do texFileW = texFileW * 2 end - end - - tex:SetWidth(texPixW) - tex:SetHeight(texPixH) - tex:SetTexCoord(0, texPixW/texFileW, 0, texPixH/texFileH) - tex:ClearAllPoints() - tex:SetPoint("TOPLEFT", "WorldMapDetailFrame", "TOPLEFT", offsetX + 256*(k-1), -(offsetY + 256*(j-1))) - tex:SetTexture(string.format("%s%s", textureName, ((j-1)*numH + k))) - - explorecaches[name] = explorecaches[name] or {} - explorecaches[name][tex] = true - - tex:SetVertexColor(r,g,b,a) - tex:Show() - end + tex:SetVertexColor(r,g,b,a) + tex:Show() end end end diff --git a/modules/nameplates.lua b/modules/nameplates.lua index 5b697702..64ea43c4 100644 --- a/modules/nameplates.lua +++ b/modules/nameplates.lua @@ -695,7 +695,7 @@ end end end - HookScript(nameplate.original.healthbar, "OnValueChanged", nameplates.OnValueChanged) + nameplate.original.healthbar:HookScript("OnValueChanged", nameplates.OnValueChanged) -- adjust sizes and scaling of the nameplate nameplate:SetScale(UIParent:GetScale()) diff --git a/modules/thirdparty-vanilla.lua b/modules/thirdparty-vanilla.lua index 45d702c7..a01bd3d9 100644 --- a/modules/thirdparty-vanilla.lua +++ b/modules/thirdparty-vanilla.lua @@ -267,7 +267,7 @@ pfUI:RegisterModule("thirdparty-vanilla", function() SW_BarFrame1_Selector:Hide() -- let user select mode by clicking the title - HookScript(SW_BarFrame1_Title, "OnMouseUp", function() + SW_BarFrame1_Title:HookScript("OnMouseUp", function() local page = SW_Settings and SW_Settings.BarFrames and SW_Settings.BarFrames.SW_BarFrame1 and SW_Settings.BarFrames.SW_BarFrame1.Selected if page then local target = (arg1 == "LeftButton") and (page + 1) or (arg1 == "RightButton") and (page - 1) @@ -944,7 +944,7 @@ pfUI:RegisterModule("thirdparty-vanilla", function() if pfUI.eqcompare then pfUI.eqcompare.HookTooltip(AtlasLootTooltip) - HookScript(AtlasLootTooltip, "OnHide", function() + AtlasLootTooltip:HookScript("OnHide", function() ShoppingTooltip1:Hide() ShoppingTooltip2:Hide() end) diff --git a/modules/turtle-wow.lua b/modules/turtle-wow.lua index 54e709a3..99e15538 100644 --- a/modules/turtle-wow.lua +++ b/modules/turtle-wow.lua @@ -355,823 +355,6 @@ pfUI:RegisterModule("turtle-wow", function () end end) - -- add turtle-wow overlay values - -- coordinates from paokkerkir/ShaguTweaks-extras, measured for TurtleWoW 1.18.1 - pfMapOverlayData = { - ["Durotar"] = { - "DRYGULCHRAVINE:139:134:438:92", - "ECHOISLES:175:236:561:432", - "KOLKARCRAG:131:96:426:487", - "ORGRIMMAR:427:150:251:0", - "RAZORHILL:188:207:445:182", - "RAZORMANEGROUNDS:196:202:318:204", - "SENJINVILLAGE:133:167:485:398", - "SKULLROCK:118:79:469:51", - "SparkwaterPort:122:134:522:94", - "THUNDERRIDGE:156:174:341:72", - "TIRAGARDEKEEP:160:148:477:300", - "VALLEYOFTRIALS:186:184:370:335", - }, - ["Mulgore"] = { - "BAELDUNDIGSITE:175:151:269:227", - "BLOODHOOFVILLAGE:236:182:378:311", - "PALEMANEROCK:102:183:315:317", - "RAVAGEDCARAVAN:110:100:482:269", - "REDCLOUDMESA:436:231:285:437", - "REDROCKS:154:138:522:92", - "SuntailPass:129:116:533:18", - "THEGOLDENPLAINS:184:217:441:91", - "THEROLLINGPLAINS:231:166:536:369", - "THEVENTURECOMINE:187:204:549:251", - "THUNDERBLUFF:254:217:264:70", - "THUNDERHORNWATERWELL:118:137:384:248", - "WILDMANEWATERWELL:152:111:299:10", - "WINDFURYRIDGE:182:119:405:2", - "WINTERHOOFWATERWELL:144:107:470:379", - }, - ["Barrens"] = { - "AGAMAGOR:183:173:348:242", - "AnchorsEdge:118:83:690:300", - "BAELMODAN:120:123:435:482", - "BLACKTHORNRIDGE:140:123:340:465", - "BOULDERLODEMINE:109:105:560:0", - "BRAMBLESCAR:112:152:446:304", - "CAMPTAURAJO:130:113:370:355", - "DREADMISTPEAK:121:93:423:68", - "FARWATCHPOST:85:152:572:58", - "FIELDOFGIANTS:194:137:363:410", - "GROLDOMFARM:112:107:499:67", - "HONORSSTAND:128:128:306:130", - "LUSHWATEROASIS:160:169:372:186", - "NORTHWATCHFOLD:134:107:533:310", - "RAPTORGROUNDS:101:99:512:299", - "RATCHET:116:118:556:190", - "RAZORFENDOWNS:137:106:414:562", - "RAZORFENKRAUL:116:123:345:539", - "THECROSSROADS:142:140:436:127", - "THEDRYHILLS:185:134:324:36", - "THEFORGOTTENPOOLS:104:116:391:120", - "THEMERCHANTCOAST:80:123:584:249", - "THEMORSHANRAMPART:118:91:418:0", - "THESLUDGEFEN:153:113:463:0", - "THESTAGNANTOASIS:147:126:484:211", - "THORNHILL:128:120:502:123", - }, - ["Alterac"] = { - "CHILLWINDPOINT:308:250:660:261", - "CORRAHNSDAGGER:173:277:411:391", - "CRUSHRIDGEHOLD:269:230:339:167", - "DALARAN:277:283:39:275", - "DANDREDSFOLD:273:224:282:0", - "GALLOWSCORNER:183:185:415:287", - "GAVINSNAZE:140:161:235:486", - "GROWLESSCAVE:175:156:327:382", - "LORDAMEREINTERNMENTCAMP:315:255:55:413", - "MISTYSHORE:204:268:207:139", - "RUINSOFALTERAC:252:249:274:201", - "RavenholdtManor:217:165:737:452", - "SOFERASNAZE:241:312:469:311", - "STRAHNBRAD:355:289:555:110", - "THEHEADLAND:142:187:325:481", - "THEUPLANDS:219:183:470:84", - }, - ["Arathi"] = { - "BOULDERFISTHALL:190:214:442:371", - "BOULDERGOR:222:214:244:167", - "CIRCLEOFEASTBINDING:140:213:568:125", - "CIRCLEOFINNERBINDING:186:164:302:321", - "CIRCLEOFOUTERBINDING:149:137:429:301", - "CIRCLEOFWESTBINDING:156:189:152:71", - "DABYRIESFARMSTEAD:160:171:482:197", - "FALDIRSCOVE:247:197:180:428", - "FarwellStead:112:128:267:31", - "GOSHEKFARM:208:177:539:284", - "HAMMERFALL:182:235:665:128", - "NORTHFOLDMANOR:202:205:204:119", - "REFUGEPOINT:157:189:380:214", - "RuinsOfZulRasaz:160:160:346:29", - "STROMGARDEKEEP:220:213:122:295", - "THANDOLSPAN:175:198:369:424", - "THORADINSWALL:173:225:103:148", - "WITHERBARKVILLAGE:197:194:566:339", - "WildtuskVillage:183:102:379:145", - }, - ["Badlands"] = { - "AGMONDSEND:249:256:354:396", - "ANGORFORTRESS:186:241:327:101", - "APOCRYPHANSREST:251:195:20:315", - "CAMPBOFF:195:207:506:361", - "CAMPCAGG:247:205:15:432", - "CAMPKOSH:214:211:556:56", - "CrystallinePinnacle:140:155:609:337", - "DUSTWINDGULCH:229:190:506:216", - "HAMMERTOESDIGSITE:185:177:455:131", - "KARGATH:232:245:0:154", - "LETHLORRAVINE:344:395:627:173", - "MIRAGEFLATS:276:229:153:387", - "RedbrandsDigsite:325:155:496:454", - "RuinsOfCorthan:210:200:203:124", - "ScalebaneRidge:205:179:751:142", - "THEDUSTBOWL:253:266:166:203", - "THEMAKERSTERRACE:230:172:399:16", - "VALLEYOFFANGS:215:215:358:265", - }, - ["BlastedLands"] = { - "ALTAROFSTORMS:169:142:318:141", - "DARKPORTAL:254:208:460:265", - "DREADMAULHOLD:200:171:351:21", - "DREADMAULPOST:228:183:370:204", - "GARRISONARMORY:155:192:480:15", - "NETHERGARDEKEEP:169:178:567:35", - "RISEOFTHEDEFILER:150:131:414:131", - "SERPENTSCOIL:211:155:510:148", - "THETAINTEDSCAR:370:438:220:184", - }, - ["Tirisfal"] = { - "AGAMANDMILLS:244:191:342:148", - "BALNIRFARMSTEAD:179:153:639:335", - "BRIGHTWATERLAKE:176:280:598:143", - "BRILL:121:144:540:305", - "BULWARK:184:169:712:374", - "COLDHEARTHMANOR:136:125:479:328", - "CRUSADEROUTPOST:154:121:701:293", - "DEATHKNELL:210:186:236:337", - "GARRENSHAUNT:148:199:507:154", - "GLENSHIRE:163:161:157:393", - "MONASTARY:175:157:762:139", - "NIGHTMAREVALE:209:151:370:355", - "RUINSOFLORDAERON:299:216:469:370", - "SCARLETWATCHPOST:141:223:701:113", - "SOLLIDENFARMSTEAD:225:138:247:259", - "STEEPCLIFFPORT:121:120:5:350", - "STILLWATERPOND:168:123:401:279", - "THECORINTHFARMSTEAD:116:152:73:402", - "THEWHISPERINGFOREST:243:175:86:263", - "VENOMWEBVALE:199:183:776:225", - }, - ["Silverpine"] = { - "AMBERMILL:204:210:512:279", - "BERENSPERIL:206:146:508:433", - "DEEPELEMMINE:127:143:484:274", - "FENRISISLE:234:187:593:88", - "MALDENSORCHARD:228:138:479:9", - "NORTHTIDESHOLLOW:152:104:337:141", - "OLSENSFARTHING:128:152:401:267", - "PYREWOODVILLAGE:122:108:405:456", - "SHADOWFANGKEEP:185:131:380:373", - "THEDEADFIELD:141:134:419:82", - "THEDECREPITFERRY:144:156:475:160", - "THEGREYMANEWALL:175:185:398:465", - "THESEPULCHER:193:135:360:184", - "THESHININGSTRAND:225:192:475:27", - "THESKITTERINGDARK:160:165:302:18", - }, - ["WesternPlaguelands"] = { - "CAERDARROW:158:150:608:421", - "DALSONSTEARS:209:138:388:271", - "DARROWMERELAKE:359:261:510:348", - "FELSTONEFIELD:149:119:306:315", - "GAHRRONSWITHERING:165:191:527:257", - "HEARTHGLEN:331:280:312:20", - "NORTHRIDGELUMBERCAMP:205:168:390:170", - "RUINSOFANDORHOL:275:219:265:360", - "SORROWHILL:290:201:360:467", - "THEBULWARK:216:172:143:300", - "THEWEEPINGCAVE:148:192:572:203", - "THEWRITHINGHAUNT:159:177:457:329", - "THONDRORILRIVER:193:326:597:94", - }, - ["EasternPlaguelands"] = { - "BLACKWOODLAKE:217:221:451:207", - "CORINSCROSSING:153:146:544:373", - "CROWNGUARDTOWER:193:152:299:408", - "DARROWSHIRE:195:167:316:497", - "EASTWALLTOWER:164:143:600:250", - "ForlornSummit:192:185:64:225", - "LAKEMERELDAR:240:164:543:469", - "LIGHTSHOPECHAPEL:165:238:721:304", - "NORTHDALE:172:191:628:135", - "NORTHPASSTOWER:228:178:465:118", - "PESTILENTSCAR:189:241:416:349", - "PLAGUEWOOD:346:258:178:92", - "QUELLITHIENLODGE:216:136:430:44", - "STRATHOLME:227:189:202:15", - "TERRORDALE:175:129:86:137", - "THEFUNGALVALE:202:199:277:267", - "THEINFECTISSCAR:183:262:628:298", - "THEMARRISSTEAD:182:194:164:367", - "THENOXIOUSGLADE:211:202:730:172", - "THEUNDERCROFT:171:136:178:484", - "THONDRORILRIVER:210:348:12:235", - "TYRSHAND:201:159:724:475", - "ZULMASHAR:189:152:621:36", - }, - ["Hilsbrad"] = { - "AZURELOADMINE:146:174:188:288", - "DARROWHILL:173:132:426:164", - "DUNGAROK:225:257:644:305", - "DURNHOLDEKEEP:367:347:614:82", - "EASTERNSTRAND:208:301:537:350", - "HILLSBRADFIELDS:282:257:211:166", - "NETHANDERSTEAD:190:215:554:249", - "PURGATIONISLE:120:94:111:485", - "SOUTHPOINTTOWER:271:207:11:203", - "SOUTHSHORE:219:245:423:213", - "TARRENMILL:195:291:524:9", - "WESTERNSTRAND:272:139:215:377", - }, - ["Hinterlands"] = { - "AERIEPEAK:240:195:20:250", - "AGOLWATHA:188:180:382:173", - "HIRIWATHA:201:118:188:314", - "JINTHAALOR:223:277:514:338", - "PLAGUEMISTRAVINE:124:203:170:158", - "QUELDANILLODGE:168:181:248:194", - "SERADANE:260:263:519:25", - "SHADRAALOR:181:170:247:394", - "SHAOLWATHA:265:190:580:247", - "SKULKROCK:148:133:520:241", - "THEALTAROFZUL:186:153:382:371", - "THECREEPINGRUIN:168:157:417:268", - "THEOVERLOOKCLIFFS:153:299:702:309", - "TheRasazTrails:118:133:210:381", - "VALORWINDLAKE:153:160:329:309", - }, - ["DunMorogh"] = { - "AMBERSTILLRANCH:105:104:582:288", - "ANVILMAR:209:159:167:414", - "BREWNALLVILLAGE:94:102:263:256", - "CHILLBREEZEVALLEY:160:113:281:304", - "COLDRIDGEPASS:134:123:300:387", - "FROSTMANEHOLD:112:118:225:291", - "GNOMERAGON:158:176:178:164", - "GOLBOLARQUARRY:144:149:619:301", - "HELMSBEDLAKE:131:153:706:284", - "ICEFLOWLAKE:117:167:286:173", - "IRONFORGE:291:187:414:166", - "IronforgeAirfields:213:233:582:100", - "KHARANOS:175:186:397:296", - "MISTYPINEREFUGE:117:155:507:224", - "NORTHERNGATEOUTPOST:115:155:766:177", - "RugfordsMountainRest:199:114:739:406", - "SHIMMERRIDGE:115:173:355:169", - "SOUTHERNGATEOUTPOST:113:106:800:284", - "THEGRIZZLEDDEN:178:155:321:328", - "THETUNDRIDHILLS:135:115:531:328", - }, - ["SearingGorge"] = { - "BLACKCHARCAVE:264:224:84:371", - "DUSTFIREVALLEY:446:355:428:11", - "FIREWATCHRIDGE:385:413:95:39", - "GRIMSILTDIGSITE:292:210:501:306", - "TANNERCAMP:292:215:552:413", - "THECAULDRON:414:310:257:178", - "THESEAOFCINDERS:345:273:256:395", - }, - ["BurningSteppes"] = { - "ALTAROFSTORMS:215:210:41:114", - "BLACKROCKMOUNTAIN:249:272:178:104", - "BLACKROCKPASS:259:299:597:285", - "BLACKROCKSTRONGHOLD:232:258:342:120", - "DRACODAR:405:309:61:262", - "DREADMAULROCK:203:214:717:174", - "MORGANSVIGIL:287:265:715:311", - "PILLAROFASH:313:261:382:289", - "RUINSOFTHAURISSAN:258:275:521:105", - "TERRORWINGPATH:271:296:730:52", - }, - ["Elwynn"] = { - "BRACKWELLPUMPKINPATCH:222:223:592:431", - "CRYSTALLAKE:196:192:435:345", - "EASTVALELOGGINGCAMP:237:190:713:339", - "FARGODEEPMINE:238:230:247:438", - "FORESTSEDGE:242:335:132:333", - "GOLDSHIRE:219:199:261:280", - "JERODSLANDING:206:212:437:445", - "NORTHSHIREVALLEY:237:244:390:154", - "RIDGEPOINTTOWER:287:207:710:445", - "STONECAIRNLAKE:278:230:601:203", - "STORMWIND:452:392:21:3", - "TOWEROFAZORA:232:226:561:303", - }, - ["DeadwindPass"] = { - "DEADMANSCROSSING:368:353:257:81", - "KARAZHAN:287:234:277:342", - "THEVICE:254:257:433:305", - }, - ["Duskwood"] = { - "ADDLESSTEAD:255:231:67:353", - "BRIGHTWOODGROVE:191:315:520:131", - "DARKSHIRE:291:259:644:173", - "MANORMISTMANTLE:174:150:668:134", - "RAVENHILL:166:115:117:317", - "RAVENHILLCEMETARY:323:276:99:165", - "THEDARKENEDBANK:886:184:105:44", - "THEHUSHEDBANK:136:306:29:143", - "THEROTTINGORCHARD:231:210:549:380", - "THEYORGENFARMSTEAD:211:235:403:393", - "TRANQUILGARDENSCEMETARY:204:196:692:363", - "TWILIGHTGROVE:327:384:314:99", - "VULGOLOGREMOUND:231:266:259:365", - }, - ["LochModan"] = { - "GRIZZLEPAWRIDGE:262:343:326:325", - "IRONBANDSEXCAVATIONSITE:321:294:491:276", - "MOGROSHSTRONGHOLD:287:265:558:61", - "NORTHGATEPASS:195:273:143:24", - "SILVERSTREAMMINE:201:243:247:25", - "STONESPLINTERVALLEY:226:255:230:363", - "STONEWROUGHTDAM:260:149:354:23", - "THEFARSTRIDERLODGE:162:182:741:298", - "THELOCH:288:380:367:99", - "THELSAMAR:243:205:225:214", - "VALLEYOFKINGS:166:224:123:382", - }, - ["Redridge"] = { - "ALTHERSMILL:222:260:407:134", - "GALARDELLVALLEY:234:240:661:168", - "LAKEEVERSTILL:522:260:140:249", - "LAKERIDGEHIGHWAY:411:274:196:341", - "LAKESHIRE:325:179:92:204", - "REDRIDGECANYONS:345:232:132:79", - "RENDERSCAMP:264:248:284:4", - "RENDERSVALLEY:453:248:491:365", - "RedwallKeep:162:110:830:466", - "STONEWATCH:243:289:507:221", - "STONEWATCHFALLS:308:200:601:325", - "THREECORNERS:360:337:0:288", - }, - ["Stranglethorn"] = { - "BALALRUINS:83:65:245:101", - "BALIAMAHRUINS:100:133:376:133", - "BLOODSAILCOMPOUND:154:163:201:291", - "BOOTYBAY:137:125:207:435", - "CRYSTALVEINMINE:111:114:350:280", - "GROMGOLBASECAMP:101:98:265:137", - "JAGUEROISLE:132:107:319:498", - "KALAIRUINS:86:89:303:93", - "KURZENSCOMPOUND:141:139:394:5", - "LAKENAZFERITI:124:120:332:60", - "MISTVALEVALLEY:120:116:283:372", - "MIZJAHRUINS:93:102:315:133", - "MOSHOGGOGREMOUND:123:168:435:96", - "NEKMANIWELLSPRING:80:102:215:365", - "NESINGWARYSEXPEDITION:128:98:274:29", - "REBELCAMP:164:86:289:0", - "RUINSOFABORAZ:87:87:356:340", - "RUINSOFJUBUWAL:100:105:312:304", - "RUINSOFZULKUNDA:113:132:201:8", - "RUINSOFZULMAMWE:162:122:397:213", - "THEARENA:186:176:241:194", - "THEVILEREEF:177:160:159:98", - "VENTURECOBASECAMP:96:120:391:66", - "WILDSHORE:151:175:237:431", - "ZIATAJAIRUINS:127:120:364:231", - "ZULGURUB:230:213:489:12", - "ZUULDAIARUINS:103:105:160:47", - }, - ["SwampOfSorrows"] = { - "FALLOWSANCTUARY:348:292:501:0", - "ITHARIUSSCAVE:230:232:0:270", - "MISTYREEDSTRAND:250:664:752:0", - "MISTYVALLEY:211:179:29:148", - "POOLOFTEARS:280:256:576:227", - "SORROWMURK:199:351:734:128", - "SPLINTERSPEARJUNCTION:258:222:138:245", - "STAGALBOG:328:238:561:386", - "STONARD:343:303:287:244", - "SorrowguardKeep:220:174:0:266", - "THEHARBORAGE:216:187:182:157", - "THESHIFTINGMIRE:303:221:294:118", - }, - ["Westfall"] = { - "ALEXSTONFARMSTEAD:275:182:220:274", - "DEMONTSPLACE:166:155:226:391", - "FURLBROWSPUMPKINFARM:186:191:399:24", - "GOLDCOASTQUARRY:194:241:234:113", - "JANGOLODEMINE:185:187:323:44", - "MOONBROOK:208:174:317:349", - "SALDEANSFARM:191:184:478:119", - "SENTINELHILL:161:210:461:259", - "THEDAGGERHILLS:235:149:349:430", - "THEDEADACRE:164:213:542:267", - "THEDUSTPLAINS:260:204:538:393", - "THEJANSENSTEAD:143:183:498:6", - "THEMOLSENFARM:199:180:342:161", - "WESTFALLLIGHTHOUSE:306:161:171:482", - }, - ["Wetlands"] = { - "ANGERFANGENCAMPMENT:196:150:364:241", - "BLACKCHANNELMARSH:213:173:95:260", - "BLUEGILLMARSH:195:165:111:157", - "DIREFORGEHILL:233:225:515:128", - "DUNMODR:173:147:419:42", - "DunAgrath:222:190:97:335", - "GRIMBATOL:317:331:623:242", - "HawksVigil:170:162:264:353", - "IRONBEARDSTOMB:165:156:368:135", - "MENETHILHARBOR:156:116:27:321", - "MOSSHIDEFEN:215:224:539:277", - "RAPTORRIDGE:159:115:640:191", - "SALTSPRAYGLEN:170:214:254:58", - "SUNDOWNMARSH:265:212:113:100", - "THEGREENBELT:153:209:473:143", - "THELGANROCK:207:165:478:383", - "WHELGARSEXCAVATIONSITE:172:156:264:224", - }, - ["Teldrassil"] = { - "BANETHILHOLLOW:136:191:392:289", - "DARNASSUS:294:252:110:251", - "DOLANAAR:170:119:469:327", - "GNARLPINEHOLD:230:158:316:417", - "LAKEALAMETH:237:163:445:388", - "POOLSOFARLITHRIEN:125:180:337:314", - "RUTTHERANVILLAGE:110:91:504:548", - "SHADOWGLEN:198:201:504:164", - "STARBREEZEVILLAGE:153:175:588:303", - "THEORACLEGLADE:150:223:279:135", - "UrsanHeights:229:154:243:423", - "WELLSPRINGLAKE:166:245:383:98", - }, - ["Darkshore"] = { - "AMETHARAN:163:178:340:323", - "AUBERDINE:134:179:323:191", - "BASHALARAN:153:171:379:199", - "CLIFFSPRINGRIVER:205:161:391:112", - "GROVEOFTHEANCIENTS:180:138:314:436", - "REMTRAVELSEXCAVATION:148:164:245:504", - "RUINSOFMATHYSTRA:176:205:519:3", - "THEMASTERSGLAIVE:146:139:346:529", - "TOWEROFALTHALAXX:142:159:484:110", - }, - ["Ashenvale"] = { - "ASTRANAAR:190:173:281:259", - "BOUGHSHADOW:140:190:862:157", - "FALLENSKYLAKE:219:190:555:433", - "FELFIREHILL:241:244:720:349", - "FIRESCARSHRINE:153:161:194:332", - "ForestSong:162:142:817:232", - "IRISLAKE:185:190:401:226", - "LAKEFALATHIM:115:181:138:144", - "MAESTRASPOST:198:290:216:46", - "MYSTRALLAKE:262:228:363:354", - "NIGHTRUN:212:244:604:263", - "RAYNEWOODRETREAT:165:235:527:243", - "SATYRNAAR:163:172:702:230", - "THEHOWLINGVALE:196:172:471:147", - "THERUINSOFSTARDUST:141:135:268:382", - "THESHRINEOFAESSINA:205:179:113:268", - "THEZORAMSTRAND:228:235:26:33", - "THISTLEFURVILLAGE:243:184:210:164", - "WARSONGLUMBERCAMP:185:146:804:319", - }, - ["ThousandNeedles"] = { - "CAMPETHOK:289:300:7:1", - "DARKCLOUDPINNACLE:189:182:267:138", - "FREEWINDPOST:193:173:366:273", - "HIGHPERCH:178:174:39:164", - "SPLITHOOFCRAG:193:175:400:203", - "THEGREATLIFT:191:163:213:78", - "THESCREECHINGCANYON:240:231:187:206", - "THESHIMMERINGFLATS:312:355:612:308", - "WINDBREAKCANYON:225:213:501:249", - }, - ["StonetalonMountains"] = { - "AMANIALOR:504:252:8:5", - "BAELHARDUL:357:252:512:257", - "BLACKSANDOILFIELDS:504:504:8:5", - "BOULDERSLIDERAVINE:90:76:586:547", - "BRAMBLETHORNPASS:382:359:512:257", - "BROKENCLIFFMINE:252:504:260:5", - "CAMPAPARAJE:222:100:670:552", - "GRIMTOTEMPOST:146:77:675:519", - "MALAKAJIN:137:86:662:562", - "MIRKFALLONLAKE:504:504:260:5", - "POWDERTOWN:252:252:260:257", - "SISHIRCANYON:252:264:512:257", - "STONETALONPEAK:258:252:260:5", - "SUNROCKRETREAT:504:252:260:257", - "THECHARREDVALE:252:308:260:257", - "THEEARTHENRING:504:252:260:257", - "VENTURECOMPANYCAMP:252:504:260:5", - "WEBWINDERPATH:256:324:512:256", - "WINDSHEARCRAG:256:256:512:256", - }, - ["Desolace"] = { - "ETHELRETHOR:189:237:318:68", - "GELKISVILLAGE:181:235:300:433", - "KODOGRAVEYARD:253:237:396:251", - "KOLKARVILLAGE:206:208:615:221", - "KORMEKSHUT:156:147:562:187", - "MAGRAMVILLAGE:182:272:606:373", - "MANNOROCCOVEN:270:271:408:385", - "NIJELSPOINT:188:246:561:0", - "RANAZJARISLE:88:89:248:11", - "SARGERON:274:237:632:38", - "SHADOWBREAKRAVINE:190:181:698:454", - "SHADOWPREYVILLAGE:215:218:175:395", - "TETHRISARAN:185:137:440:0", - "THUNDERAXEFORTRESS:174:207:455:108", - "VALLEYOFSPEARS:234:274:217:221", - }, - ["Feralas"] = { - "CAMPMOJACHE:146:148:694:238", - "ChimaeraRoostVale:106:150:785:321", - "DIREMAUL:214:180:461:208", - "DREAMBOUGH:141:122:459:0", - "FERALSCARVALE:103:104:491:335", - "FRAYFEATHERHIGHLANDS:101:163:485:391", - "GORDUNNIOUTPOST:154:128:697:148", - "GRIMTOTEMCOMPOUND:110:186:630:172", - "ISLEOFDREAD:205:285:197:381", - "LOWERWILDS:214:152:756:204", - "ONEIROS:101:103:499:74", - "RUINSOFISILDIEN:179:241:547:326", - "RUINSOFRAVENWIND:178:149:310:0", - "SARDORISLE:167:168:216:241", - "THEFORGOTTENCOAST:132:316:409:258", - "THETWINCOLOSSALS:278:235:323:78", - "THEWRITHINGDEEP:214:205:625:305", - }, - ["Dustwallow"] = { - "ALCAZISLAND:176:179:671:29", - "BACKBAYWETLANDS:384:243:248:196", - "BRACKENWALLVILLAGE:264:264:239:2", - "THEDENOFFLAME:246:235:264:320", - "THERAMOREISLE:214:187:542:232", - "THEWYRMBOG:263:229:372:387", - "WITCHHILL:230:311:431:1", - "WesthavenHollow:166:149:603:428", - }, - ["Tanaris"] = { - "ABYSSALSANDS:194:159:376:207", - "BROKENPILLAR:93:165:481:243", - "CAVERNSOFTIME:139:132:567:262", - "DUNEMAULCOMPOUND:186:127:337:298", - "EASTMOONRUINS:143:130:405:355", - "GADGETZAN:156:149:430:102", - "LANDSENDBEACH:184:148:456:514", - "LOSTRIGGERCOVE:141:173:635:230", - "NOONSHADERUINS:129:191:530:43", - "SANDSORROWWATCH:175:157:311:111", - "SOUTHBREAKSHORE:192:151:510:304", - "SOUTHMOONRUINS:185:196:324:366", - "STEAMWHEEDLEPORT:136:129:599:86", - "SlickwickOilRig:237:181:129:436", - "THEGAPINGCHASM:198:188:458:380", - "THENOXIOUSLAIR:155:180:265:209", - "THISTLESHRUBVALLEY:166:234:217:294", - "VALLEYOFTHEWATCHERS:125:115:311:470", - "WATERSPRINGFIELD:145:164:516:177", - "ZALASHJISDEN:90:127:619:157", - "ZULFARRAK:191:166:265:5", - }, - ["Aszhara"] = { - "BAYOFSTORMS:257:285:486:208", - "BITTERREACHES:231:173:651:46", - "FORLORNRIDGE:210:247:198:373", - "HALDARRENCAMPMENT:191:138:83:339", - "JAGGEDREEF:556:153:373:9", - "LAKEMENNAR:301:184:302:437", - "LEGASHENCAMPMENT:224:131:484:49", - "RAVENCRESTMONUMENT:227:115:559:506", - "RUINSOFELDARATH:251:268:246:228", - "SHADOWSONGSHRINE:213:170:43:428", - "SOUTHRIDGEBEACH:355:207:397:360", - "TEMPLEOFARKKORAN:177:187:689:160", - "THALASSIANBASECAMP:224:144:507:126", - "THERUINEDREACHES:384:116:403:549", - "THESHATTEREDSTRAND:148:199:412:202", - "TIMBERMAWHOLD:209:194:258:175", - "TOWEROFELDARA:107:145:824:114", - "URSOLAN:219:212:327:94", - "VALORMOK:201:158:93:236", - }, - ["Felwood"] = { - "BLOODVENOMFALLS:225:132:297:269", - "DEADWOODVILLAGE:162:129:415:539", - "EMERALDSANCTUARY:171:150:411:436", - "FELPAWVILLAGE:224:138:489:0", - "IRONTREEWOODS:200:203:426:60", - "JADEFIREGLEN:151:145:339:469", - "JADEFIRERUN:181:159:338:35", - "JAEDENAR:236:122:275:333", - "MORLOSARAN:129:151:503:515", - "RUINSOFCONSTELLAS:224:142:303:387", - "SHATTERSCARVALE:218:186:315:130", - "TALONBRANCHGLADE:145:130:554:97", - }, - ["UngoroCrater"] = { - "FIREPLUMERIDGE:277:258:377:185", - "GOLAKKAHOTSPRINGS:299:334:133:158", - "IRONSTONEPLATEAU:276:281:588:69", - "LAKKARITARPITS:553:255:170:13", - "TERRORRUN:333:275:166:375", - "THEMARSHLANDS:295:341:568:247", - "THESLITHERINGSCAR:326:260:378:403", - }, - ["Moonglade"] = { - "LAKEELUNEARA:530:484:256:101", - }, - ["Silithus"] = { - "HIVEASHI:431:276:305:34", - "HIVEREGAL:469:335:262:333", - "HIVEZORA:343:424:117:188", - "SOUTHWINDVILLAGE:346:348:519:83", - "THECRYSTALVALE:285:274:121:31", - "THESCARABWALL:271:145:125:523", - "TWILIGHTBASECAMP:297:238:355:206", - }, - ["Winterspring"] = { - "DARKWHISPERGORGE:247:191:452:447", - "EVERLOOK:151:189:516:114", - "FROSTFIREHOTSPRINGS:226:124:231:180", - "FROSTSABERROCK:240:172:375:11", - "FROSTWHISPERGORGE:184:144:531:383", - "ICETHISTLEHILLS:116:155:617:247", - "LAKEKELTHERIL:203:176:409:205", - "MAZTHORIL:174:169:499:265", - "OWLWINGTHICKET:149:127:600:348", - "STARFALLVILLAGE:174:148:399:143", - "THEHIDDENGROVE:162:174:562:33", - "TIMBERMAWPOST:223:112:235:248", - "WINTERFALLVILLAGE:133:120:622:163", - }, - ["AlteracValley"] = { - "DUNBALDAR:254:228:356:18", - "FROSTWOLFKEEP:220:278:408:382", - "ICEBLOODGARRISON:286:288:343:179", - }, - ["Hyjal"] = { - "BARKSKINPLATEAU:207:167:390:297", - "BARKSKINVILLAGE:502:293:417:346", - "BLEAKHOLLOWCRATER:297:335:401:20", - "CIRCLEOFPOWER:277:331:203:63", - "DARKHOLLOWPASS:214:237:342:389", - "NORDANAAR:139:146:778:118", - "NORDRASSILGLADE:418:408:578:0", - "RUINSOFTELENNAS:165:193:141:236", - "THEEMERALDGATEWAY:309:244:109:353", - "ZULHATHA:191:210:3:194", - }, - ["Lapidis"] = { - "BRIGHTCOAST:298:213:237:246", - "CAELANSREST:147:111:517:230", - "CROWNISLAND:140:95:512:33", - "GORDOSHHEIGHTS:253:243:256:89", - "HAZURRIGLADE:87:82:486:306", - "SHANKSREEF:207:90:446:109", - "THEROCK:74:72:687:149", - "TOWEROFLAPIDIS:203:118:487:175", - "WALLOWINGCOAST:240:184:505:326", - "ZULHAZU:227:178:348:407", - }, - ["Gillijim"] = { - "DEEPTIDESANCTUM:204:117:199:512", - "DISTILLERYISLE:90:69:234:216", - "FAELONSFOLLY:108:103:331:304", - "GILLIJIMSTRAND:108:324:641:160", - "JADEMINE:141:149:500:256", - "KALKORPOINT:123:115:421:210", - "KAZONISLAND:194:113:432:51", - "MAULOGGPOST:137:227:512:401", - "MAULOGGREFUGE:231:132:615:465", - "RUINSOFZULRAZAR:215:136:369:384", - "SILVERCOAST:245:184:311:386", - "SILVERSANDBAR:47:128:256:398", - "SOUTHSEASANDBAR:125:172:178:63", - "TANGLEWOOD:135:188:576:297", - "ZULRAZAR:137:168:375:282", - }, - ["TelAbim"] = { - "BIXXLESSTOREHOUSE:300:127:368:178", - "HIGHVALERISE:191:187:468:248", - "TAZZOSSHACK:229:232:453:391", - "TELCOBASECAMP:184:183:342:440", - "THEDERELICTCAMP:165:205:364:273", - "THEJAGGEDISLES:313:256:385:16", - }, - ["Gilneas"] = { - "BLACKTHORNSCAMP:160:163:32:171", - "BROLOKMOUND:140:120:467:349", - "DAWNSTONEMINE:130:144:292:155", - "FREYSHEARKEEP:72:70:624:405", - "GILNEASCITY:295:242:89:105", - "GLAYMORESTEAD:140:127:483:129", - "GREYMANESWATCH:119:158:580:311", - "HOLLOWWEBCEMETARY:180:167:215:395", - "HOLLOWWEBWOODS:171:118:341:452", - "NORTHGATETOWER:130:137:397:172", - "OLDROCKPASS:155:165:290:37", - "RAVENSHIRE:194:237:472:431", - "RAVENWOODKEEP:253:174:496:494", - "ROSEWICKPLANTATION:134:140:331:155", - "RUINSOFGREYSHIRE:192:144:230:260", - "SHADEMORETAVERN:117:120:279:336", - "SOUTHMIREORCHARD:202:133:302:354", - "STILLWARDCHURCH:213:166:471:220", - "THEDRYROCKMINE:129:127:145:262", - "THEDRYROCKPIT:230:217:69:295", - "THEGREYMANEWALL:131:173:412:48", - "THEOVERGROWNACRE:134:154:390:269", - }, - ["Icepoint"] = { - "KANEQNUUN:512:430:237:129", - }, - ["BlackstoneIsland"] = { - "BLACKASHCOALPITS:303:474:209:178", - "BLACKASHMINE:251:204:397:222", - "GAZZIKSWORKSHOP:329:247:439:403", - "RUSTGATELUMBERYARD:217:245:551:241", - "RUSTGATERIDGE:396:226:372:360", - "THEWATERHOLE:386:239:382:43", - "VENTURECOSLUMS:270:192:498:129", - }, - ["ThalassianHighlands"] = { - "ALAHTHALAS:470:276:429:38", - "ANASTERIANPARK:229:219:385:256", - "BRINTHILIEN:180:211:395:450", - "FELSTRIDERRETREAT:201:207:165:428", - "ISLEOFETERNALAUTUMN:204:167:236:117", - "RUINSOFNASHALARAN:249:266:36:151", - "SILVERSUNMINE:208:189:288:373", - "THEFARSTRIDE:230:199:212:255", - "THELASTRUNESTONE:179:203:507:379", - }, - ["GrimReaches"] = { - "BAGGOTHSRAMPART:112:113:399:238", - "BARLEYCRESTFARMSTEAD:116:88:499:222", - "BRANGARSFOLLY:108:123:568:33", - "DUNKITHAS:137:95:470:329", - "EASTRIDGEOUTPOST:166:107:374:165", - "GETHKAR:118:124:444:84", - "GROLDANSEXCAVATION:125:117:567:231", - "LAKEKITHAS:217:150:481:270", - "RUINSOFSTOLGAZKEEP:134:146:366:53", - "SALGAZMINES:150:119:535:380", - "SHATTERBLADEPOST:186:130:512:126", - "SLATEBEARDSFORGE:136:99:457:404", - "THEGRIMHOLLOW:288:200:396:463", - "THEHIGHPASS:97:141:409:315", - "ZARMGETHPOINT:143:76:405:16", - "ZARMGETHSTRONGHOLD:120:150:487:17", - }, - ["Balor"] = { - "BILGERATCOMPOUND:174:141:323:76", - "CROAKINGPLATEAU:371:154:397:201", - "GRAHANESTATE:93:116:306:392", - "GULLWINGWRECKAGE:110:105:221:34", - "LANGSTONORCHARD:102:129:410:346", - "RUINSOFBREEZEHAVEN:163:141:450:256", - "SCURRYINGTHICKET:144:158:283:161", - "SIOUTPOST:175:232:597:389", - "SORROWMORELAKE:174:140:303:277", - "STORMBREAKERPOINT:243:197:583:212", - "STORMREAVERSPIRE:151:119:491:429", - "STORMWROUGHTCASTLE:202:166:458:332", - "TREACHEROUSCRAGS:243:171:381:457", - "VANDERFARMSTEAD:146:140:330:372", - "WINDROCKCLIFFS:192:279:256:303", - }, - ["Northwind"] = { - "ABBEYGARDENS:250:224:512:33", - "AMBERSHIRE:234:215:334:278", - "AMBERWOODKEEP:243:205:187:308", - "BLACKROCKBREACH:255:201:721:222", - "BRISTLEWHISKERCAVERN:197:185:568:232", - "CINDERFALLPASS:229:229:733:348", - "CRAWFORDWINERY:160:222:513:285", - "CRYSTALFALLS:320:205:627:464", - "GRIMMENLAKE:218:210:550:352", - "MERCHANTSHIGHROAD:353:249:256:420", - "NORTHRIDGEPOINT:298:314:349:31", - "NORTHWINDLOGGINGCAMP:224:185:258:171", - "RUINSOFBIRKHAVEN:180:208:645:116", - "SHERWOODQUARRY:293:287:702:1", - "STILLHEARTPORT:174:155:116:217", - "TOWEROFMAGILOU:181:223:189:169", - "WITCHCOVEN:147:162:257:81", - }, - ["Moonwhisper"] = { - "AnShesRespite:170:120:398:81", - "AncestralGrounds:164:82:295:88", - "BlackrootHold:162:137:495:465", - "BlackrootVillage:224:143:411:525", - "FoulheartSanctum:157:149:496:232", - "GroveOfTheMoon:152:146:464:347", - "LunarclawDen:84:60:674:376", - "MarasEthil:96:94:640:417", - "MoonhoofRetreat:172:144:419:167", - "MoonhoofVillage:163:157:570:188", - "MoonsilkHollow:125:114:577:458", - "MoroGaiVillage:133:127:571:372", - "NarvalisPoint:162:139:503:118", - "RuinsOfNendis:183:130:584:275", - "StarshardCradle:122:109:334:121", - "Tyrandas:158:169:580:61", - "VysnagosasRest:163:102:420:8", - }, - } -- add turtle-wow sell values pfSellData = { diff --git a/pfUI.lua b/pfUI.lua index 0fa98ea8..97232131 100644 --- a/pfUI.lua +++ b/pfUI.lua @@ -27,7 +27,7 @@ do -- ClassicAPI dependency check. -- pfUI relies pervasively on the modern C_* / SuperWoW / nameplate / focus -- API surface that ClassicAPI polyfills, so presence is required. - local PFUI_CLASSIC_API_MIN = 10511 -- (X*10000 + Y*100 + Z) + local PFUI_CLASSIC_API_MIN = 10600 -- (X*10000 + Y*100 + Z) local PFUI_CLASSIC_API_LATEST = PFUI_CLASSIC_API_MIN local PFUI_CLASSIC_API_WEBSITE = "https://github.com/brues-code/ClassicAPI" local PFUI_CLASSIC_API_LATEST_URL = PFUI_CLASSIC_API_WEBSITE .. "/releases/latest" diff --git a/skins/blizzard/battlefield_minimap.lua b/skins/blizzard/battlefield_minimap.lua index 2c4cf869..6c15cc57 100644 --- a/skins/blizzard/battlefield_minimap.lua +++ b/skins/blizzard/battlefield_minimap.lua @@ -15,7 +15,7 @@ pfUI:RegisterSkin("Battlefield Minimap", function () BattlefieldMinimapTabText:ClearAllPoints() BattlefieldMinimapTabText:SetPoint("CENTER", 0, 0) - HookScript(BattlefieldMinimap, "OnShow", function() + BattlefieldMinimap:HookScript("OnShow", function() BattlefieldMinimapTab:Hide() end) diff --git a/skins/blizzard/itemtext.lua b/skins/blizzard/itemtext.lua index 0f13ec7c..f0c3dc1b 100644 --- a/skins/blizzard/itemtext.lua +++ b/skins/blizzard/itemtext.lua @@ -86,7 +86,7 @@ pfUI:RegisterSkin("Books", function () ItemTextScrollFrameScrollBarScrollDownButton.Hide = function(self) self:Disable() end local first - HookScript(ItemTextFrame, "OnShow", function() + ItemTextFrame:HookScript("OnShow", function() if not first then -- it is necessary to update the scrollbar when you first open the frame ItemTextScrollFrameScrollBar:Show() ItemTextScrollFrameScrollBar:Hide() diff --git a/skins/blizzard/options-new.lua b/skins/blizzard/options-new.lua index 67928230..588a28df 100644 --- a/skins/blizzard/options-new.lua +++ b/skins/blizzard/options-new.lua @@ -11,7 +11,7 @@ pfUI:RegisterSkin("Options - New", function () CreateBackdropShadow(OptionsFrame) EnableMovable(OptionsFrame) - HookScript(OptionsFrame, "OnShow", function() + OptionsFrame:HookScript("OnShow", function() this:ClearAllPoints() this:SetPoint("CENTER", 0, 0) end) @@ -109,13 +109,13 @@ pfUI:RegisterSkin("Options - New", function () local color = PFUI_CLASS_COLORS[class] SetHighlight(btn, color.r, color.g, color.b) btn:SetFont(pfUI.font_default, pfUI_config.global.font_size, "OUTLINE") - HookScript(btn, "OnMouseDown", function() + btn:HookScript("OnMouseDown", function() StripTextures(this, true) this:SetBackdrop(pfUI.backdrop) this:SetBackdropColor(br, bg, bb, 0.75) this:SetBackdropBorderColor(er, eg, eb, 1) end) - HookScript(btn, "OnMouseUp", function() + btn:HookScript("OnMouseUp", function() StripTextures(this, true) this:SetBackdrop(pfUI.backdrop) this:SetBackdropColor(br, bg, bb, 0.75) @@ -186,5 +186,5 @@ pfUI:RegisterSkin("Options - New", function () -- hook after category selection: UpdateOptions is local so we hook its caller pfUI.hooksecurefunc("OptionsListButton_OnClick", SkinControls) -- also cover initial load - HookScript(OptionsFrame, "OnShow", SkinControls) + OptionsFrame:HookScript("OnShow", SkinControls) end) \ No newline at end of file diff --git a/skins/blizzard/options-sound.lua b/skins/blizzard/options-sound.lua index d3d2154f..9a7a5380 100644 --- a/skins/blizzard/options-sound.lua +++ b/skins/blizzard/options-sound.lua @@ -44,7 +44,7 @@ pfUI:RegisterSkin("Options - Sound", function () EnableMovable(SoundOptionsFrame) - HookScript(SoundOptionsFrame, "OnShow", function() + SoundOptionsFrame:HookScript("OnShow", function() this:ClearAllPoints() this:SetPoint("CENTER", 0, 0) end) diff --git a/skins/blizzard/options-video.lua b/skins/blizzard/options-video.lua index b91e6ec0..1563b3cd 100644 --- a/skins/blizzard/options-video.lua +++ b/skins/blizzard/options-video.lua @@ -49,7 +49,7 @@ pfUI:RegisterSkin("Options - Video", function () EnableMovable(OptionsFrame) - HookScript(OptionsFrame, "OnShow", function() + OptionsFrame:HookScript("OnShow", function() this:ClearAllPoints() this:SetPoint("CENTER", 0, 0) end) diff --git a/skins/blizzard/questlog.lua b/skins/blizzard/questlog.lua index c4756ed0..21f627fc 100644 --- a/skins/blizzard/questlog.lua +++ b/skins/blizzard/questlog.lua @@ -102,13 +102,13 @@ pfUI:RegisterSkin("Quest Log", function () end end) - HookScript(QuestLogDetailScrollFrame, "OnHide", function() + QuestLogDetailScrollFrame:HookScript("OnHide", function() SkinArrowButton(QuestLogFrameExpandButton, "RIGHT", 21) QuestLogDetailScrollFrame:Hide() QuestLogFrame:SetWidth(340) end) - HookScript(QuestLogDetailScrollFrame, "OnShow", function() + QuestLogDetailScrollFrame:HookScript("OnShow", function() SkinArrowButton(QuestLogFrameExpandButton, "LEFT", 21) QuestLogDetailScrollFrame:Show() QuestLogFrame:SetWidth(676) diff --git a/skins/blizzard/tooltips.lua b/skins/blizzard/tooltips.lua index 44ff5097..b0a29035 100644 --- a/skins/blizzard/tooltips.lua +++ b/skins/blizzard/tooltips.lua @@ -7,7 +7,7 @@ pfUI:RegisterSkin("Tooltips", function () CreateBackdropShadow(tooltip) end - HookScript(WorldMapTooltip, "OnShow", function() + WorldMapTooltip:HookScript("OnShow", function() CreateBackdrop(WorldMapTooltip, nil, nil, alpha) CreateBackdropShadow(WorldMapTooltip) end) @@ -16,7 +16,7 @@ pfUI:RegisterSkin("Tooltips", function () for _, tooltip in pairs({ShoppingTooltip1, ShoppingTooltip2}) do tooltip:SetClampedToScreen(true) - HookScript(tooltip, "OnShow", function() + tooltip:HookScript("OnShow", function() local a, b, c, x, y = this:GetPoint() if not x or x == 0 then x = (border*2) + ( x or 0 ) + 1 end if a then this:SetPoint(a, b, c, x, y) end