manifest update

Author: Mister-Kay

lib/core.js

@@ -62,217 +62,12 @@ module.exports = function PingCompensationCore(dispatch) {
                 enabled = false
                 return
             }
-<<<<<<< HEAD
             // debug
             if (option.toLowerCase() == 'debug') {
                 config.debug = !config.debug
                 command.message(`Ping Compensation debug ${config.debug ? 'enabled.' : 'disabled.'}`)
                 return
             }
-=======
-        }
-
-        if (info.type == 'charging') {
-            opts.stage += 1;
-            stageEnd = sendActionStage.bind(null, opts);
-            stageEndTime = Date.now() + length;
-            stageEndTimeout = setTimeout(stageEnd, length);
-            return
-        }
-
-        stageEnd = sendActionEnd.bind(null, info.type == 'dash' ? 39 : 0, opts.distance * opts.distanceMult);
-        stageEndTime = Date.now() + length;
-        stageEndTimeout = setTimeout(stageEnd, length)
-    }
-
-    function getServerTimeout() {
-        return (ping.min * 2) + (ping.max > 300 ? 125 : ping.max / 2) + (config.skillRetryCount * config.skillRetryMs) + config.serverTimeout
-    }
-
-    function clearStage() {
-        clearTimeout(serverTimeout);
-        clearTimeout(stageEndTimeout)
-    }
-
-    function refreshStageEnd() {
-        clearTimeout(stageEndTimeout);
-        stageEndTimeout = setTimeout(stageEnd, stageEndTime - Date.now())
-    }
-
-    function grantCharge(skill, info, stage) {
-        let levels = info.chargeLevels;
-        dispatch.toClient('S_GRANT_SKILL', 1, {
-            skill: modifyChain(skill, levels ? levels[stage] : 10 + stage)
-        })
-    }
-
-    function sendInstantDash(location) {
-        dispatch.toClient('S_INSTANT_DASH', 1, {
-            source: myChar(),
-            unk1: 0,
-            unk2: 0,
-            unk3: 0,
-            x: location.x,
-            y: location.y,
-            z: location.z,
-            w: currentLocation.w
-        })
-    }
-
-    function sendInstantMove(location) {
-        if (location) currentLocation = location;
-
-        dispatch.toClient('S_INSTANT_MOVE', 1, {
-            id: myChar(),
-            x: currentLocation.x,
-            y: currentLocation.y,
-            z: currentLocation.z,
-            w: currentLocation.w
-        })
-    }
-
-    function sendActionEnd(type, distance) {
-        clearStage();
-
-        if (!currentAction) return;
-
-        if (config.debug) debug(['<* S_ACTION_END', skillId(currentAction.skill), type || 0, currentLocation.w + '\xb0', (distance || 0) + 'u'].join(' '));
-
-        if (oopsLocation && (config.forceClipStrict || !currentLocation.inAction)) sendInstantMove(oopsLocation);
-        else movePlayer(distance);
-
-        if (canChainVB) { // In case VB didn't get used on line 670
-            switchVB = false;
-            canChainVB = false;
-            if (config.debug) debug('[Skill Prediction] Chained VB disabled');
-        }
-
-        dispatch.toClient('S_ACTION_END', 2, {
-            gameId: myChar(),
-            x: currentLocation.x,
-            y: currentLocation.y,
-            z: currentLocation.z,
-            w: currentLocation.w,
-            templateId,
-            skill: currentAction.skill,
-            type: type || 0,
-            id: currentAction.id
-        });
-
-        if (currentAction.id == actionNumber) {
-            let info = skillInfo(currentAction.skill);
-            if (info) {
-                if (info.consumeAbnormalEnd)
-                    if (Array.isArray(info.consumeAbnormalEnd))
-                        for (let id of info.consumeAbnormalEnd)
-                            abnormality.remove(id)
-                    else
-                        abnormality.remove(info.consumeAbnormalEnd);
-
-                if (info.triggerAbnormalEnd)
-                    for (let id in info.triggerAbnormalEnd) {
-                        let abnormal = info.triggerAbnormalEnd[id];
-
-                        if (Array.isArray(abnormal))
-                            abnormality.add(id, abnormal[0], abnormal[1]);
-                        else
-                            abnormality.add(id, abnormal, 1)
-                    }
-
-                if (info.type == 'dash') lastEndLocation = currentLocation
-            }
-        } else lastEndedId = currentAction.id;
-
-        actionNumber++;
-        if (actionNumber > 0xffffffff) actionNumber = 0x80000000;
-
-        oopsLocation = currentAction = null;
-
-        lastEndedTime = Date.now()
-    }
-
-    function sendCannotStartSkill(skill) {
-        dispatch.toClient('S_CANNOT_START_SKILL', 1, {
-            skill
-        })
-    }
-
-    function sendSystemMessage(type, vars) {
-        let message = '@' + sysmsg.maps.get(dispatch.base.protocolVersion).name.get(type);
-
-        for (let key in vars) message += '\v' + key + '\v' + vars[key]
-
-        dispatch.toClient('S_SYSTEM_MESSAGE', 1, {
-            message
-        })
-    }
-
-    function updateLocation(event, inAction, special) {
-        event = event || currentAction;
-
-        currentLocation = special ? {
-            x: event.x,
-            y: event.y,
-            z: event.z,
-            w: event.w || currentLocation.w, // Should be a skill flag maybe?
-            inAction
-        } : {
-                x: event.x,
-                y: event.y,
-                z: event.z,
-                w: event.w,
-                inAction
-            }
-    }
-
-    function retry(cb, count = 1) {
-        if (count > config.skillRetryCount) return;
-
-        setTimeout(() => {
-            if (cb()) retry(cb, count + 1)
-        }, config.skillRetryMs)
-    }
-
-    function movePlayer(distance) {
-        if (distance && !currentLocation.inAction) applyDistance(currentLocation, distance)
-    }
-
-    function calcDistance(loc1, loc2) {
-        return Math.sqrt(Math.pow(loc2.x - loc1.x, 2) + Math.pow(loc2.y - loc1.y, 2))
-    }
-
-    function applyDistance(loc, distance) {
-        let r = (loc.w / 0x8000) * Math.PI;
-
-        loc.x += Math.cos(r) * distance;
-        loc.y += Math.sin(r) * distance;
-        return loc
-    }
-
-    // Modifies the chain part (last 2 digits) of a skill ID, preserving flags
-    function modifyChain(id, chain) {
-        return id - ((id & 0x3ffffff) % 100) + chain
-    }
-
-    function skillId(id, flagAs) {
-        id |= flagAs;
-
-        let skillFlags = ['P', 'C', '[?3]', '[?4]', '[?5]', '[?6]'],
-            flags = '';
-
-        for (let i = 0, x = id >>> 26; x; i++ , x >>>= 1)
-            if (x & 1) flags += skillFlags[i];
-
-        id = (id & 0x3ffffff).toString();
-
-        switch (flags) {
-            case 'P':
-                id = [id.slice(0, -4), id.slice(-4, -2), id.slice(-2)].join('-');
-                break;
-            case 'C':
-                id = [id.slice(0, -2), id.slice(-2)].join('-');
-                break
->>>>>>> salty/master
         }
         command.message('Ping Compensation command input missing. Input options are "ping", "on", "off", or "debug".')
     })

manifest.json

@@ -13,11 +13,11 @@
             "overwrite": false,
             "hash": "2154eea4db57f2fb633f8238e897824acfe5f2e48ed55ef57b677d27e0ee6bc6"
         },
-        "config/data/awakening.js": "97a4e55915e3f9dca9a69efc01393151b8a272118a27fedaa37d8cc9a9ccb5f1",
-		"config/data/basicCC.json": "6d9b4aed42035973afcfc0f25121184bf95ca090e84d48ecc3381be86d1b702f",
+        "config/data/awakening.js": "6ee61e258a01e50ef514ea22d3487605b923b0c30344494a16c290e2c9a33c48",
+		"config/data/basicCC.json": "b94ff2356594b6c1f8502013cfa3fe35bb5961fea3e3e662a0171ed52bc062a2",
 		"config/data/evasiveCC.json": "e3b8afd622054569da25e12463c1fc79f33dacd2d570c0646bcceaca219a9a03",
 		"config/data/extendedCC.json": "f873db2dc2df74fcdad1b3322253f6669f3c5441d9ed302860b3cbecafbe9de3",
-		"config/data/skills.js": "f005e1470a388b41aa987d140d60dac57627ee62608f2df70d9eaeb1e39de292",
+		"config/data/skills.js": "909701416feedd6aaedfa664f57652764f0c6b8bff815529c093acb31e4d4d62",
 		"docs/commands.md": "b67a1215d2f53de5943041cec3ccf349cbd7d32ace1f0779f1b1a3c54ea75eb3",
 		"docs/config.md": "4df9d7469e5daec20618e8c64bb4b0bf2df76fb4427d54f75704181053ea3a72",
 		"docs/ping.md": "13e32834603a523adee6ff50083079693ef8d92c83644091f21f6b184e1547a9",