diff --git a/resources/[cfx-default]/[gamemodes]/[maps]/fivem-map-hipster/fxmanifest.lua b/resources/[cfx-default]/[gamemodes]/[maps]/fivem-map-hipster/fxmanifest.lua index 938db51..aec55b6 100644 --- a/resources/[cfx-default]/[gamemodes]/[maps]/fivem-map-hipster/fxmanifest.lua +++ b/resources/[cfx-default]/[gamemodes]/[maps]/fivem-map-hipster/fxmanifest.lua @@ -10,5 +10,5 @@ resource_type 'map' { gameTypes = { ['basic-gamemode'] = true } } map 'map.lua' -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' diff --git a/resources/[cfx-default]/[gamemodes]/[maps]/fivem-map-skater/fxmanifest.lua b/resources/[cfx-default]/[gamemodes]/[maps]/fivem-map-skater/fxmanifest.lua index aaa83c4..5075a0c 100644 --- a/resources/[cfx-default]/[gamemodes]/[maps]/fivem-map-skater/fxmanifest.lua +++ b/resources/[cfx-default]/[gamemodes]/[maps]/fivem-map-skater/fxmanifest.lua @@ -10,5 +10,5 @@ resource_type 'map' { gameTypes = { ['basic-gamemode'] = true } } map 'map.lua' -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' diff --git a/resources/[cfx-default]/[gamemodes]/[maps]/redm-map-one/fxmanifest.lua b/resources/[cfx-default]/[gamemodes]/[maps]/redm-map-one/fxmanifest.lua index 6296375..a5b1f49 100644 --- a/resources/[cfx-default]/[gamemodes]/[maps]/redm-map-one/fxmanifest.lua +++ b/resources/[cfx-default]/[gamemodes]/[maps]/redm-map-one/fxmanifest.lua @@ -10,7 +10,7 @@ resource_type 'map' { gameTypes = { ['basic-gamemode'] = true } } map 'map.lua' -fx_version 'cerulean' +fx_version 'adamant' game 'rdr3' rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' diff --git a/resources/[cfx-default]/[gamemodes]/basic-gamemode/fxmanifest.lua b/resources/[cfx-default]/[gamemodes]/basic-gamemode/fxmanifest.lua index a49533e..74911e9 100644 --- a/resources/[cfx-default]/[gamemodes]/basic-gamemode/fxmanifest.lua +++ b/resources/[cfx-default]/[gamemodes]/basic-gamemode/fxmanifest.lua @@ -11,4 +11,4 @@ resource_type 'gametype' { name = 'Freeroam' } client_script 'basic_client.lua' game 'common' -fx_version 'cerulean' +fx_version 'adamant' diff --git a/resources/[cfx-default]/[gameplay]/[examples]/money/fxmanifest.lua b/resources/[cfx-default]/[gameplay]/[examples]/money/fxmanifest.lua index d8d5d30..6c02e23 100644 --- a/resources/[cfx-default]/[gameplay]/[examples]/money/fxmanifest.lua +++ b/resources/[cfx-default]/[gameplay]/[examples]/money/fxmanifest.lua @@ -6,7 +6,7 @@ description 'An example money system using KVS.' repository 'https://github.com/citizenfx/cfx-server-data' author 'Cfx.re ' -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' client_script 'client.lua' diff --git a/resources/[cfx-default]/[gameplay]/player-data/fxmanifest.lua b/resources/[cfx-default]/[gameplay]/player-data/fxmanifest.lua index 6d3570b..2b4015f 100644 --- a/resources/[cfx-default]/[gameplay]/player-data/fxmanifest.lua +++ b/resources/[cfx-default]/[gameplay]/player-data/fxmanifest.lua @@ -6,7 +6,7 @@ description 'A basic resource for storing player identifiers.' author 'Cfx.re ' repository 'https://github.com/citizenfx/cfx-server-data' -fx_version 'cerulean' +fx_version 'adamant' game 'common' server_script 'server.lua' diff --git a/resources/[cfx-default]/[gameplay]/playernames/fxmanifest.lua b/resources/[cfx-default]/[gameplay]/playernames/fxmanifest.lua index 60da554..547afc1 100644 --- a/resources/[cfx-default]/[gameplay]/playernames/fxmanifest.lua +++ b/resources/[cfx-default]/[gameplay]/playernames/fxmanifest.lua @@ -32,5 +32,5 @@ files { } -- support the latest resource manifest -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' diff --git a/resources/[cfx-default]/[local]/screenshot-basic/fxmanifest.lua b/resources/[cfx-default]/[local]/screenshot-basic/fxmanifest.lua index 0d0549a..b629c23 100644 --- a/resources/[cfx-default]/[local]/screenshot-basic/fxmanifest.lua +++ b/resources/[cfx-default]/[local]/screenshot-basic/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'bodacious' +fx_version 'adamant' game 'common' client_script 'dist/client.js' diff --git a/resources/[cfx-default]/[managers]/mapmanager/fxmanifest.lua b/resources/[cfx-default]/[managers]/mapmanager/fxmanifest.lua index 67279b6..9e89921 100644 --- a/resources/[cfx-default]/[managers]/mapmanager/fxmanifest.lua +++ b/resources/[cfx-default]/[managers]/mapmanager/fxmanifest.lua @@ -16,7 +16,7 @@ server_scripts { "mapmanager_server.lua" } -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5', 'rdr3' } server_export "getCurrentGameType" diff --git a/resources/[cfx-default]/[managers]/spawnmanager/fxmanifest.lua b/resources/[cfx-default]/[managers]/spawnmanager/fxmanifest.lua index aa15198..13eb96b 100644 --- a/resources/[cfx-default]/[managers]/spawnmanager/fxmanifest.lua +++ b/resources/[cfx-default]/[managers]/spawnmanager/fxmanifest.lua @@ -8,7 +8,7 @@ repository 'https://github.com/citizenfx/cfx-server-data' client_script 'spawnmanager.lua' -fx_version 'cerulean' +fx_version 'adamant' games { 'rdr3', 'gta5' } rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' diff --git a/resources/[cfx-default]/[system]/[builders]/webpack/fxmanifest.lua b/resources/[cfx-default]/[system]/[builders]/webpack/fxmanifest.lua index 42c4b3c..b8b8a4b 100644 --- a/resources/[cfx-default]/[system]/[builders]/webpack/fxmanifest.lua +++ b/resources/[cfx-default]/[system]/[builders]/webpack/fxmanifest.lua @@ -9,5 +9,5 @@ repository 'https://github.com/citizenfx/cfx-server-data' dependency 'yarn' server_script 'webpack_builder.js' -fx_version 'cerulean' +fx_version 'adamant' game 'common' diff --git a/resources/[cfx-default]/[system]/[builders]/yarn/fxmanifest.lua b/resources/[cfx-default]/[system]/[builders]/yarn/fxmanifest.lua index 295fb94..24aeba8 100644 --- a/resources/[cfx-default]/[system]/[builders]/yarn/fxmanifest.lua +++ b/resources/[cfx-default]/[system]/[builders]/yarn/fxmanifest.lua @@ -6,7 +6,7 @@ author 'Cfx.re ' description 'Builds resources with yarn. To learn more: https://classic.yarnpkg.com' repository 'https://github.com/citizenfx/cfx-server-data' -fx_version 'cerulean' +fx_version 'adamant' game 'common' server_script 'yarn_builder.js' diff --git a/resources/[cfx-default]/[system]/[builders]/yarn/yarn_cli.js b/resources/[cfx-default]/[system]/[builders]/yarn/yarn_cli.js index c347ca1..d31be0b 100644 --- a/resources/[cfx-default]/[system]/[builders]/yarn/yarn_cli.js +++ b/resources/[cfx-default]/[system]/[builders]/yarn/yarn_cli.js @@ -102,7 +102,7 @@ module.exports = require("path"); Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the -License at https://www.apache.org/licenses/LICENSE-2.0 +License at http://www.apache.org/licenses/LICENSE-2.0 THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED @@ -5546,7 +5546,7 @@ var hashAlgs = { /* * Taken from - * https://csrc.nist.gov/groups/ST/toolkit/documents/dss/NISTReCur.pdf + * http://csrc.nist.gov/groups/ST/toolkit/documents/dss/NISTReCur.pdf */ var curves = { 'nistp256': { @@ -7725,7 +7725,7 @@ function normalizePattern(pattern) { * Lodash * Copyright JS Foundation and other contributors * Released under MIT license - * Based on Underscore.js 1.8.3 + * Based on Underscore.js 1.8.3 * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors */ ;(function() { @@ -7869,7 +7869,7 @@ function normalizePattern(pattern) { /** * Used to match `RegExp` - * [syntax characters](https://ecma-international.org/ecma-262/7.0/#sec-patterns). + * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns). */ var reRegExpChar = /[\\^$.*+?()[\]{}|]/g, reHasRegExpChar = RegExp(reRegExpChar.source); @@ -7892,7 +7892,7 @@ function normalizePattern(pattern) { /** * Used to match - * [ES template delimiters](https://ecma-international.org/ecma-262/7.0/#sec-template-literal-lexical-components). + * [ES template delimiters](http://ecma-international.org/ecma-262/7.0/#sec-template-literal-lexical-components). */ var reEsTemplate = /\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g; @@ -7994,7 +7994,7 @@ function normalizePattern(pattern) { rsEmoji ].join('|'), 'g'); - /** Used to detect strings with [zero-width joiners or code points from the astral planes](https://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */ + /** Used to detect strings with [zero-width joiners or code points from the astral planes](http://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */ var reHasUnicode = RegExp('[' + rsZWJ + rsAstralRange + rsComboRange + rsVarRange + ']'); /** Used to detect strings that need a more robust regexp to match words. */ @@ -9178,7 +9178,7 @@ function normalizePattern(pattern) { /** * Used to resolve the - * [`toStringTag`](https://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring) + * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring) * of values. */ var nativeObjectToString = objectProto.toString; @@ -10196,7 +10196,7 @@ function normalizePattern(pattern) { /** * Assigns `value` to `key` of `object` if the existing value is not equivalent - * using [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * for equality comparisons. * * @private @@ -12724,7 +12724,7 @@ function normalizePattern(pattern) { function createCtor(Ctor) { return function() { // Use a `switch` statement to work with class constructors. See - // https://ecma-international.org/ecma-262/7.0/#sec-ecmascript-function-objects-call-thisargument-argumentslist + // http://ecma-international.org/ecma-262/7.0/#sec-ecmascript-function-objects-call-thisargument-argumentslist // for more details. var args = arguments; switch (args.length) { @@ -13460,7 +13460,7 @@ function normalizePattern(pattern) { case regexpTag: case stringTag: // Coerce regexes to strings and treat strings, primitives and objects, - // as equal. See https://www.ecma-international.org/ecma-262/7.0/#sec-regexp.prototype.tostring + // as equal. See http://www.ecma-international.org/ecma-262/7.0/#sec-regexp.prototype.tostring // for more details. return object == (other + ''); @@ -14248,7 +14248,7 @@ function normalizePattern(pattern) { /** * This function is like - * [`Object.keys`](https://ecma-international.org/ecma-262/7.0/#sec-object.keys) + * [`Object.keys`](http://ecma-international.org/ecma-262/7.0/#sec-object.keys) * except that it includes inherited enumerable properties. * * @private @@ -14647,7 +14647,7 @@ function normalizePattern(pattern) { /** * Creates an array of `array` values not included in the other given arrays - * using [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * for equality comparisons. The order and references of result values are * determined by the first array. * @@ -15148,7 +15148,7 @@ function normalizePattern(pattern) { /** * Gets the index at which the first occurrence of `value` is found in `array` - * using [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * for equality comparisons. If `fromIndex` is negative, it's used as the * offset from the end of `array`. * @@ -15202,7 +15202,7 @@ function normalizePattern(pattern) { /** * Creates an array of unique values that are included in all given arrays - * using [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * for equality comparisons. The order and references of result values are * determined by the first array. * @@ -15396,7 +15396,7 @@ function normalizePattern(pattern) { /** * Removes all given values from `array` using - * [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * for equality comparisons. * * **Note:** Unlike `_.without`, this method mutates `array`. Use `_.remove` @@ -16015,7 +16015,7 @@ function normalizePattern(pattern) { /** * Creates an array of unique values, in order, from all given arrays using - * [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * for equality comparisons. * * @static @@ -16093,7 +16093,7 @@ function normalizePattern(pattern) { /** * Creates a duplicate-free version of an array, using - * [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * for equality comparisons, in which only the first occurrence of each element * is kept. The order of result values is determined by the order they occur * in the array. @@ -16236,7 +16236,7 @@ function normalizePattern(pattern) { /** * Creates an array excluding all given values using - * [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * for equality comparisons. * * **Note:** Unlike `_.pull`, this method returns a new array. @@ -17123,7 +17123,7 @@ function normalizePattern(pattern) { /** * Checks if `value` is in `collection`. If `collection` is a string, it's * checked for a substring of `value`, otherwise - * [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * is used for equality comparisons. If `fromIndex` is negative, it's used as * the offset from the end of `collection`. * @@ -17828,7 +17828,7 @@ function normalizePattern(pattern) { * * This method differs from `_.bind` by allowing bound functions to reference * methods that may be redefined or don't yet exist. See - * [Peter Michaux's article](https://peter.michaux.ca/articles/lazy-function-definition-pattern) + * [Peter Michaux's article](http://peter.michaux.ca/articles/lazy-function-definition-pattern) * for more details. * * The `_.bindKey.placeholder` value, which defaults to `_` in monolithic @@ -18224,7 +18224,7 @@ function normalizePattern(pattern) { * **Note:** The cache is exposed as the `cache` property on the memoized * function. Its creation may be customized by replacing the `_.memoize.Cache` * constructor with one whose instances implement the - * [`Map`](https://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object) + * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object) * method interface of `clear`, `delete`, `get`, `has`, and `set`. * * @static @@ -18524,7 +18524,7 @@ function normalizePattern(pattern) { /** * Creates a function that invokes `func` with the `this` binding of the * create function and an array of arguments much like - * [`Function#apply`](https://www.ecma-international.org/ecma-262/7.0/#sec-function.prototype.apply). + * [`Function#apply`](http://www.ecma-international.org/ecma-262/7.0/#sec-function.prototype.apply). * * **Note:** This method is based on the * [spread operator](https://mdn.io/spread_operator). @@ -18872,7 +18872,7 @@ function normalizePattern(pattern) { /** * Performs a - * [`SameValueZero`](https://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) * comparison between two values to determine if they are equivalent. * * @static @@ -19409,7 +19409,7 @@ function normalizePattern(pattern) { * Checks if `value` is a valid array-like length. * * **Note:** This method is loosely based on - * [`ToLength`](https://ecma-international.org/ecma-262/7.0/#sec-tolength). + * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength). * * @static * @memberOf _ @@ -19438,7 +19438,7 @@ function normalizePattern(pattern) { /** * Checks if `value` is the - * [language type](https://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types) + * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types) * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`) * * @static @@ -20092,7 +20092,7 @@ function normalizePattern(pattern) { * Converts `value` to an integer. * * **Note:** This method is loosely based on - * [`ToInteger`](https://www.ecma-international.org/ecma-262/7.0/#sec-tointeger). + * [`ToInteger`](http://www.ecma-international.org/ecma-262/7.0/#sec-tointeger). * * @static * @memberOf _ @@ -20126,7 +20126,7 @@ function normalizePattern(pattern) { * array-like object. * * **Note:** This method is based on - * [`ToLength`](https://ecma-international.org/ecma-262/7.0/#sec-tolength). + * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength). * * @static * @memberOf _ @@ -21000,7 +21000,7 @@ function normalizePattern(pattern) { * Creates an array of the own enumerable property names of `object`. * * **Note:** Non-object values are coerced to objects. See the - * [ES spec](https://ecma-international.org/ecma-262/7.0/#sec-object.keys) + * [ES spec](http://ecma-international.org/ecma-262/7.0/#sec-object.keys) * for more details. * * @static @@ -21955,7 +21955,7 @@ function normalizePattern(pattern) { * (under "semi-related fun fact") for more details. * * When working with HTML you should always - * [quote attribute values](https://wonko.com/post/html-escaping) to reduce + * [quote attribute values](http://wonko.com/post/html-escaping) to reduce * XSS vectors. * * @static @@ -22392,7 +22392,7 @@ function normalizePattern(pattern) { * object is given, it takes precedence over `_.templateSettings` values. * * **Note:** In the development build `_.template` utilizes - * [sourceURLs](https://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) + * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) * for easier debugging. * * For more information on precompiling templates see @@ -22490,7 +22490,7 @@ function normalizePattern(pattern) { */ function template(string, options, guard) { // Based on John Resig's `tmpl` implementation - // (https://ejohn.org/blog/javascript-micro-templating/) + // (http://ejohn.org/blog/javascript-micro-templating/) // and Laura Doktorova's doT.js (https://github.com/olado/doT). var settings = lodash.templateSettings; @@ -24803,7 +24803,7 @@ function normalizePattern(pattern) { if (true) { // Expose Lodash on the global object to prevent errors when Lodash is // loaded by a script tag in the presence of an AMD loader. - // See https://requirejs.org/docs/errors.html#mismatch for more details. + // See http://requirejs.org/docs/errors.html#mismatch for more details. // Use `_.noConflict` to remove Lodash from the global object. root._ = _; @@ -25339,7 +25339,7 @@ module.exports = {}; /***/ (function(module, exports, __webpack_require__) { "use strict"; -// YAML error class. https://stackoverflow.com/questions/8458984 +// YAML error class. http://stackoverflow.com/questions/8458984 // @@ -25393,7 +25393,7 @@ module.exports = YAMLException; // It is not described in the YAML specification. // // This schema is based on standard YAML's Core schema and includes most of -// extra types described at YAML tag repository. (https://yaml.org/type/) +// extra types described at YAML tag repository. (http://yaml.org/type/) @@ -26253,12 +26253,12 @@ class Hash { // letter as it can. if (!( // The spec has very restricted productions for algorithms. - // http://www.w3.org/TR/CSP2/#source-list-syntax + // https://www.w3.org/TR/CSP2/#source-list-syntax SPEC_ALGORITHMS.some(x => x === this.algorithm) && // Usually, if someone insists on using a "different" base64, we // leave it as-is, since there's multiple standards, and the // specified is not a URL-safe variant. - // http://www.w3.org/TR/CSP2/#base64_value + // https://www.w3.org/TR/CSP2/#base64_value this.digest.match(BASE64_REGEX) && // Option syntax is strictly visual chars. // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-option-expression @@ -27174,7 +27174,7 @@ Signature._oldVersionDetect = function (obj) { // Public domain. // // Implementation derived from TweetNaCl version 20140427. -// See for details: https://tweetnacl.cr.yp.to/ +// See for details: http://tweetnacl.cr.yp.to/ var gf = function(init) { var i, r = new Float64Array(16); @@ -34116,7 +34116,7 @@ Glob.prototype._stat2 = function (f, abs, er, stat, cb) { "use strict"; // Standard YAML's Failsafe schema. -// https://www.yaml.org/spec/1.2/spec.html#id2802346 +// http://www.yaml.org/spec/1.2/spec.html#id2802346 @@ -38108,7 +38108,7 @@ class PackageRequest { // this is so the returned package response uses the overridden name. ie. if the // package's actual name is `bar`, but it's been specified in the manifest like: - // "foo": "https://foo.com/bar.tar.gz" + // "foo": "http://foo.com/bar.tar.gz" // then we use the foo name data.name = name; return data; @@ -40464,7 +40464,7 @@ module.exports = function(det, rec, confidence, name, lang) { "use strict"; // Standard YAML's Core schema. -// https://www.yaml.org/spec/1.2/spec.html#id2804923 +// http://www.yaml.org/spec/1.2/spec.html#id2804923 // // NOTE: JS-YAML does not support schema-specific tag resolution restrictions. // So, Core schema has no distinctions from JSON schema is JS-YAML. @@ -40489,7 +40489,7 @@ module.exports = new Schema({ "use strict"; // Standard YAML's JSON schema. -// https://www.yaml.org/spec/1.2/spec.html#id2803231 +// http://www.yaml.org/spec/1.2/spec.html#id2803231 // // NOTE: JS-YAML does not support schema-specific tag resolution restrictions. // So, this schema is not such strict as defined in the YAML specification. @@ -48647,7 +48647,7 @@ const aliases = (0, (_map || _load_map()).default)({ const ignore = ['npm', // we'll never satisfy this for obvious reasons 'teleport', // a module bundler used by some modules 'rhino', // once a target for older modules -'cordovaDependencies', // https://bit.ly/2tkUePg +'cordovaDependencies', // http://bit.ly/2tkUePg 'parcel']; function testEngine(name, range, versions, looseSemver) { @@ -52993,7 +52993,7 @@ module.exports = !__webpack_require__(51) && !__webpack_require__(112)(function /* 239 */ /***/ (function(module, exports) { -// fast apply, https://jsperf.lnkit.com/fast-apply/5 +// fast apply, http://jsperf.lnkit.com/fast-apply/5 module.exports = function (fn, args, that) { var un = that === undefined; switch (args.length) { @@ -53897,10 +53897,10 @@ function useColors() { return false; } - // is webkit? https://stackoverflow.com/a/16459606/376773 + // is webkit? http://stackoverflow.com/a/16459606/376773 // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632 return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) || - // is firebug? https://stackoverflow.com/a/398120/376773 + // is firebug? http://stackoverflow.com/a/398120/376773 (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) || // is firefox >= v31? // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages @@ -64544,7 +64544,7 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact } } else if (indentStatus === 0) { // Special case: block sequences are allowed to have same indentation level as the parent. - // https://www.yaml.org/spec/1.2/spec.html#id2799784 + // http://www.yaml.org/spec/1.2/spec.html#id2799784 hasContent = allowBlockCollections && readBlockSequence(state, blockIndent); } } @@ -80191,7 +80191,7 @@ convert.hsv.hsl = function (hsv) { return [h, sl * 100, l * 100]; }; -// https://dev.w3.org/csswg/css-color/#hwb-to-rgb +// http://dev.w3.org/csswg/css-color/#hwb-to-rgb convert.hwb.rgb = function (hwb) { var h = hwb[0] / 360; var wh = hwb[1] / 100; @@ -82305,7 +82305,7 @@ module.exports = (str, opts) => { const hasRelativeProtocol = str.startsWith('//'); // Prepend protocol - str = prependHttp(str.trim()).replace(/^\/\//, 'https://'); + str = prependHttp(str.trim()).replace(/^\/\//, 'http://'); const urlObj = url.parse(str); @@ -89448,7 +89448,7 @@ Ajv.ValidationError = errorClasses.Validation; Ajv.MissingRefError = errorClasses.MissingRef; Ajv.$dataMetaSchema = $dataMetaSchema; -var META_SCHEMA_ID = 'https://json-schema.org/draft-06/schema'; +var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema'; var META_IGNORE_OPTIONS = [ 'removeAdditional', 'useDefaults', 'coerceTypes' ]; var META_SUPPORT_DATA = ['/properties']; @@ -89862,7 +89862,7 @@ function addDraft6MetaSchema(self) { var metaSchema = __webpack_require__(502); if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA); self.addMetaSchema(metaSchema, META_SCHEMA_ID, true); - self._refs['https://json-schema.org/schema'] = META_SCHEMA_ID; + self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID; } @@ -90116,9 +90116,9 @@ function formats(mode) { formats.fast = { - // date: https://tools.ietf.org/html/rfc3339#section-5.6 + // date: http://tools.ietf.org/html/rfc3339#section-5.6 date: /^\d\d\d\d-[0-1]\d-[0-3]\d$/, - // date-time: https://tools.ietf.org/html/rfc3339#section-5.6 + // date-time: http://tools.ietf.org/html/rfc3339#section-5.6 time: /^[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i, 'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i, // uri: https://github.com/mafintosh/is-my-json-valid/blob/master/formats.js @@ -90127,21 +90127,21 @@ formats.fast = { 'uri-template': URITEMPLATE, url: URL, // email (sources from jsen validator): - // https://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address#answer-8829363 + // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address#answer-8829363 // http://www.w3.org/TR/html5/forms.html#valid-e-mail-address (search for 'willful violation') email: /^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i, hostname: HOSTNAME, // optimized https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9780596802837/ch07s16.html ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/, - // optimized https://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses + // optimized http://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i, regex: regex, - // uuid: https://tools.ietf.org/html/rfc4122 + // uuid: http://tools.ietf.org/html/rfc4122 uuid: UUID, // JSON-pointer: https://tools.ietf.org/html/rfc6901 // uri fragment: https://tools.ietf.org/html/rfc3986#appendix-A 'json-pointer': JSON_POINTER, - // relative JSON-pointer: https://tools.ietf.org/html/draft-luff-relative-json-pointer-00 + // relative JSON-pointer: http://tools.ietf.org/html/draft-luff-relative-json-pointer-00 'relative-json-pointer': RELATIVE_JSON_POINTER }; @@ -90166,7 +90166,7 @@ formats.full = { function date(str) { - // full-date from https://tools.ietf.org/html/rfc3339#section-5.6 + // full-date from http://tools.ietf.org/html/rfc3339#section-5.6 var matches = str.match(DATE); if (!matches) return false; @@ -90190,7 +90190,7 @@ function time(str, full) { var DATE_TIME_SEPARATOR = /t|\s/i; function date_time(str) { - // https://tools.ietf.org/html/rfc3339#section-5.6 + // http://tools.ietf.org/html/rfc3339#section-5.6 var dateTime = str.split(DATE_TIME_SEPARATOR); return dateTime.length == 2 && date(dateTime[0]) && time(dateTime[1], true); } @@ -90205,7 +90205,7 @@ function hostname(str) { var NOT_URI_FRAGMENT = /\/|:/; function uri(str) { - // https://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "." + // http://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "." return NOT_URI_FRAGMENT.test(str) && URI.test(str); } @@ -93289,7 +93289,7 @@ function removeKeyword(keyword) { "use strict"; -var META_SCHEMA_ID = 'https://json-schema.org/draft-06/schema'; +var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema'; module.exports = function (ajv) { var defaultMeta = ajv._opts.defaultMeta; @@ -93329,13 +93329,13 @@ module.exports = function (ajv) { /* 501 */ /***/ (function(module, exports) { -module.exports = {"$schema":"https://json-schema.org/draft-06/schema#","$id":"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#","description":"Meta-schema for $data reference (JSON-schema extension proposal)","type":"object","required":["$data"],"properties":{"$data":{"type":"string","anyOf":[{"format":"relative-json-pointer"},{"format":"json-pointer"}]}},"additionalProperties":false} +module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#","description":"Meta-schema for $data reference (JSON-schema extension proposal)","type":"object","required":["$data"],"properties":{"$data":{"type":"string","anyOf":[{"format":"relative-json-pointer"},{"format":"json-pointer"}]}},"additionalProperties":false} /***/ }), /* 502 */ /***/ (function(module, exports) { -module.exports = {"$schema":"https://json-schema.org/draft-06/schema#","$id":"https://json-schema.org/draft-06/schema#","title":"Core schema meta-schema","definitions":{"schemaArray":{"type":"array","minItems":1,"items":{"$ref":"#"}},"nonNegativeInteger":{"type":"integer","minimum":0},"nonNegativeIntegerDefault0":{"allOf":[{"$ref":"#/definitions/nonNegativeInteger"},{"default":0}]},"simpleTypes":{"enum":["array","boolean","integer","null","number","object","string"]},"stringArray":{"type":"array","items":{"type":"string"},"uniqueItems":true,"default":[]}},"type":["object","boolean"],"properties":{"$id":{"type":"string","format":"uri-reference"},"$schema":{"type":"string","format":"uri"},"$ref":{"type":"string","format":"uri-reference"},"title":{"type":"string"},"description":{"type":"string"},"default":{},"examples":{"type":"array","items":{}},"multipleOf":{"type":"number","exclusiveMinimum":0},"maximum":{"type":"number"},"exclusiveMaximum":{"type":"number"},"minimum":{"type":"number"},"exclusiveMinimum":{"type":"number"},"maxLength":{"$ref":"#/definitions/nonNegativeInteger"},"minLength":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"pattern":{"type":"string","format":"regex"},"additionalItems":{"$ref":"#"},"items":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/schemaArray"}],"default":{}},"maxItems":{"$ref":"#/definitions/nonNegativeInteger"},"minItems":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"uniqueItems":{"type":"boolean","default":false},"contains":{"$ref":"#"},"maxProperties":{"$ref":"#/definitions/nonNegativeInteger"},"minProperties":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"required":{"$ref":"#/definitions/stringArray"},"additionalProperties":{"$ref":"#"},"definitions":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"properties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"patternProperties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"dependencies":{"type":"object","additionalProperties":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/stringArray"}]}},"propertyNames":{"$ref":"#"},"const":{},"enum":{"type":"array","minItems":1,"uniqueItems":true},"type":{"anyOf":[{"$ref":"#/definitions/simpleTypes"},{"type":"array","items":{"$ref":"#/definitions/simpleTypes"},"minItems":1,"uniqueItems":true}]},"format":{"type":"string"},"allOf":{"$ref":"#/definitions/schemaArray"},"anyOf":{"$ref":"#/definitions/schemaArray"},"oneOf":{"$ref":"#/definitions/schemaArray"},"not":{"$ref":"#"}},"default":{}} +module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"http://json-schema.org/draft-06/schema#","title":"Core schema meta-schema","definitions":{"schemaArray":{"type":"array","minItems":1,"items":{"$ref":"#"}},"nonNegativeInteger":{"type":"integer","minimum":0},"nonNegativeIntegerDefault0":{"allOf":[{"$ref":"#/definitions/nonNegativeInteger"},{"default":0}]},"simpleTypes":{"enum":["array","boolean","integer","null","number","object","string"]},"stringArray":{"type":"array","items":{"type":"string"},"uniqueItems":true,"default":[]}},"type":["object","boolean"],"properties":{"$id":{"type":"string","format":"uri-reference"},"$schema":{"type":"string","format":"uri"},"$ref":{"type":"string","format":"uri-reference"},"title":{"type":"string"},"description":{"type":"string"},"default":{},"examples":{"type":"array","items":{}},"multipleOf":{"type":"number","exclusiveMinimum":0},"maximum":{"type":"number"},"exclusiveMaximum":{"type":"number"},"minimum":{"type":"number"},"exclusiveMinimum":{"type":"number"},"maxLength":{"$ref":"#/definitions/nonNegativeInteger"},"minLength":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"pattern":{"type":"string","format":"regex"},"additionalItems":{"$ref":"#"},"items":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/schemaArray"}],"default":{}},"maxItems":{"$ref":"#/definitions/nonNegativeInteger"},"minItems":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"uniqueItems":{"type":"boolean","default":false},"contains":{"$ref":"#"},"maxProperties":{"$ref":"#/definitions/nonNegativeInteger"},"minProperties":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"required":{"$ref":"#/definitions/stringArray"},"additionalProperties":{"$ref":"#"},"definitions":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"properties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"patternProperties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"dependencies":{"type":"object","additionalProperties":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/stringArray"}]}},"propertyNames":{"$ref":"#"},"const":{},"enum":{"type":"array","minItems":1,"uniqueItems":true},"type":{"anyOf":[{"$ref":"#/definitions/simpleTypes"},{"type":"array","items":{"$ref":"#/definitions/simpleTypes"},"minItems":1,"uniqueItems":true}]},"format":{"type":"string"},"allOf":{"$ref":"#/definitions/schemaArray"},"anyOf":{"$ref":"#/definitions/schemaArray"},"oneOf":{"$ref":"#/definitions/schemaArray"},"not":{"$ref":"#"}},"default":{}} /***/ }), /* 503 */ @@ -94929,7 +94929,7 @@ function serial(list, iterator, callback) * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -95146,7 +95146,7 @@ var aws4 = exports, lru = __webpack_require__(523), credentialsCache = lru(1000) -// https://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html +// http://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html function hmac(key, string, encoding) { return crypto.createHmac('sha256', key).update(string, 'utf8').digest(encoding) @@ -95210,7 +95210,7 @@ RequestSigner.prototype.matchHost = function(host) { return hostParts } -// https://docs.aws.amazon.com/general/latest/gr/rande.html +// http://docs.aws.amazon.com/general/latest/gr/rande.html RequestSigner.prototype.isSingleRegion = function() { // Special case for S3 and SimpleDB in us-east-1 if (['s3', 'sdb'].indexOf(this.service) >= 0 && this.region === 'us-east-1') return true @@ -98473,7 +98473,7 @@ let publish = (() => { pkg.dist.integrity = ssri.fromData(buffer).toString(); const registry = String(config.getOption('registry')); - pkg.dist.tarball = url.resolve(registry, tbURI).replace(/^https:\/\//, 'https://'); + pkg.dist.tarball = url.resolve(registry, tbURI).replace(/^https:\/\//, 'http://'); // publish package try { @@ -105535,7 +105535,7 @@ class TarballResolver extends (_exoticResolver || _load_exoticResolver()).defaul } // full http url - if (pattern.startsWith('https://') || pattern.startsWith('https://')) { + if (pattern.startsWith('http://') || pattern.startsWith('https://')) { return true; } @@ -109733,7 +109733,7 @@ function buildGraph() { for (var len = models.length, i = 0; i < len; i++) { graph[models[i]] = { - // https://jsperf.com/1-vs-infinity + // http://jsperf.com/1-vs-infinity // micro-opt, but this is simple. distance: -1, parent: null @@ -113376,7 +113376,7 @@ FormData.prototype._lengthRetriever = function(value, callback) { } else if (value.hasOwnProperty('httpVersion')) { callback(null, +value.headers['content-length']); - // or request stream https://github.com/mikeal/request + // or request stream http://github.com/mikeal/request } else if (value.hasOwnProperty('httpModule')) { // wait till response come back value.on('response', function(response) { @@ -114282,61 +114282,61 @@ module.exports = gunzip /* 657 */ /***/ (function(module, exports) { -module.exports = {"$id":"afterRequest.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}} +module.exports = {"$id":"afterRequest.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}} /***/ }), /* 658 */ /***/ (function(module, exports) { -module.exports = {"$id":"beforeRequest.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}} +module.exports = {"$id":"beforeRequest.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}} /***/ }), /* 659 */ /***/ (function(module, exports) { -module.exports = {"$id":"browser.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}} +module.exports = {"$id":"browser.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}} /***/ }), /* 660 */ /***/ (function(module, exports) { -module.exports = {"$id":"cache.json#","$schema":"https://json-schema.org/draft-06/schema#","properties":{"beforeRequest":{"oneOf":[{"type":"null"},{"$ref":"beforeRequest.json#"}]},"afterRequest":{"oneOf":[{"type":"null"},{"$ref":"afterRequest.json#"}]},"comment":{"type":"string"}}} +module.exports = {"$id":"cache.json#","$schema":"http://json-schema.org/draft-06/schema#","properties":{"beforeRequest":{"oneOf":[{"type":"null"},{"$ref":"beforeRequest.json#"}]},"afterRequest":{"oneOf":[{"type":"null"},{"$ref":"afterRequest.json#"}]},"comment":{"type":"string"}}} /***/ }), /* 661 */ /***/ (function(module, exports) { -module.exports = {"$id":"content.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["size","mimeType"],"properties":{"size":{"type":"integer"},"compression":{"type":"integer"},"mimeType":{"type":"string"},"text":{"type":"string"},"encoding":{"type":"string"},"comment":{"type":"string"}}} +module.exports = {"$id":"content.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["size","mimeType"],"properties":{"size":{"type":"integer"},"compression":{"type":"integer"},"mimeType":{"type":"string"},"text":{"type":"string"},"encoding":{"type":"string"},"comment":{"type":"string"}}} /***/ }), /* 662 */ /***/ (function(module, exports) { -module.exports = {"$id":"cookie.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"path":{"type":"string"},"domain":{"type":"string"},"expires":{"type":["string","null"],"format":"date-time"},"httpOnly":{"type":"boolean"},"secure":{"type":"boolean"},"comment":{"type":"string"}}} +module.exports = {"$id":"cookie.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"path":{"type":"string"},"domain":{"type":"string"},"expires":{"type":["string","null"],"format":"date-time"},"httpOnly":{"type":"boolean"},"secure":{"type":"boolean"},"comment":{"type":"string"}}} /***/ }), /* 663 */ /***/ (function(module, exports) { -module.exports = {"$id":"creator.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}} +module.exports = {"$id":"creator.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}} /***/ }), /* 664 */ /***/ (function(module, exports) { -module.exports = {"$id":"entry.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","time","request","response","cache","timings"],"properties":{"pageref":{"type":"string"},"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"time":{"type":"number","min":0},"request":{"$ref":"request.json#"},"response":{"$ref":"response.json#"},"cache":{"$ref":"cache.json#"},"timings":{"$ref":"timings.json#"},"serverIPAddress":{"type":"string","oneOf":[{"format":"ipv4"},{"format":"ipv6"}]},"connection":{"type":"string"},"comment":{"type":"string"}}} +module.exports = {"$id":"entry.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","time","request","response","cache","timings"],"properties":{"pageref":{"type":"string"},"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"time":{"type":"number","min":0},"request":{"$ref":"request.json#"},"response":{"$ref":"response.json#"},"cache":{"$ref":"cache.json#"},"timings":{"$ref":"timings.json#"},"serverIPAddress":{"type":"string","oneOf":[{"format":"ipv4"},{"format":"ipv6"}]},"connection":{"type":"string"},"comment":{"type":"string"}}} /***/ }), /* 665 */ /***/ (function(module, exports) { -module.exports = {"$id":"har.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["log"],"properties":{"log":{"$ref":"log.json#"}}} +module.exports = {"$id":"har.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["log"],"properties":{"log":{"$ref":"log.json#"}}} /***/ }), /* 666 */ /***/ (function(module, exports) { -module.exports = {"$id":"header.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}} +module.exports = {"$id":"header.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}} /***/ }), /* 667 */ @@ -114371,49 +114371,49 @@ module.exports = { /* 668 */ /***/ (function(module, exports) { -module.exports = {"$id":"log.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["version","creator","entries"],"properties":{"version":{"type":"string"},"creator":{"$ref":"creator.json#"},"browser":{"$ref":"browser.json#"},"pages":{"type":"array","items":{"$ref":"page.json#"}},"entries":{"type":"array","items":{"$ref":"entry.json#"}},"comment":{"type":"string"}}} +module.exports = {"$id":"log.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["version","creator","entries"],"properties":{"version":{"type":"string"},"creator":{"$ref":"creator.json#"},"browser":{"$ref":"browser.json#"},"pages":{"type":"array","items":{"$ref":"page.json#"}},"entries":{"type":"array","items":{"$ref":"entry.json#"}},"comment":{"type":"string"}}} /***/ }), /* 669 */ /***/ (function(module, exports) { -module.exports = {"$id":"page.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","id","title","pageTimings"],"properties":{"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"id":{"type":"string","unique":true},"title":{"type":"string"},"pageTimings":{"$ref":"pageTimings.json#"},"comment":{"type":"string"}}} +module.exports = {"$id":"page.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","id","title","pageTimings"],"properties":{"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"id":{"type":"string","unique":true},"title":{"type":"string"},"pageTimings":{"$ref":"pageTimings.json#"},"comment":{"type":"string"}}} /***/ }), /* 670 */ /***/ (function(module, exports) { -module.exports = {"$id":"pageTimings.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","properties":{"onContentLoad":{"type":"number","min":-1},"onLoad":{"type":"number","min":-1},"comment":{"type":"string"}}} +module.exports = {"$id":"pageTimings.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","properties":{"onContentLoad":{"type":"number","min":-1},"onLoad":{"type":"number","min":-1},"comment":{"type":"string"}}} /***/ }), /* 671 */ /***/ (function(module, exports) { -module.exports = {"$id":"postData.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["mimeType"],"properties":{"mimeType":{"type":"string"},"text":{"type":"string"},"params":{"type":"array","required":["name"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"fileName":{"type":"string"},"contentType":{"type":"string"},"comment":{"type":"string"}}},"comment":{"type":"string"}}} +module.exports = {"$id":"postData.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["mimeType"],"properties":{"mimeType":{"type":"string"},"text":{"type":"string"},"params":{"type":"array","required":["name"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"fileName":{"type":"string"},"contentType":{"type":"string"},"comment":{"type":"string"}}},"comment":{"type":"string"}}} /***/ }), /* 672 */ /***/ (function(module, exports) { -module.exports = {"$id":"query.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}} +module.exports = {"$id":"query.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}} /***/ }), /* 673 */ /***/ (function(module, exports) { -module.exports = {"$id":"request.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["method","url","httpVersion","cookies","headers","queryString","headersSize","bodySize"],"properties":{"method":{"type":"string"},"url":{"type":"string","format":"uri"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"queryString":{"type":"array","items":{"$ref":"query.json#"}},"postData":{"$ref":"postData.json#"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}} +module.exports = {"$id":"request.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["method","url","httpVersion","cookies","headers","queryString","headersSize","bodySize"],"properties":{"method":{"type":"string"},"url":{"type":"string","format":"uri"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"queryString":{"type":"array","items":{"$ref":"query.json#"}},"postData":{"$ref":"postData.json#"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}} /***/ }), /* 674 */ /***/ (function(module, exports) { -module.exports = {"$id":"response.json#","$schema":"https://json-schema.org/draft-06/schema#","type":"object","required":["status","statusText","httpVersion","cookies","headers","content","redirectURL","headersSize","bodySize"],"properties":{"status":{"type":"integer"},"statusText":{"type":"string"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"content":{"$ref":"content.json#"},"redirectURL":{"type":"string"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}} +module.exports = {"$id":"response.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["status","statusText","httpVersion","cookies","headers","content","redirectURL","headersSize","bodySize"],"properties":{"status":{"type":"integer"},"statusText":{"type":"string"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"content":{"$ref":"content.json#"},"redirectURL":{"type":"string"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}} /***/ }), /* 675 */ /***/ (function(module, exports) { -module.exports = {"$id":"timings.json#","$schema":"https://json-schema.org/draft-06/schema#","required":["send","wait","receive"],"properties":{"dns":{"type":"number","min":-1},"connect":{"type":"number","min":-1},"blocked":{"type":"number","min":-1},"send":{"type":"number","min":-1},"wait":{"type":"number","min":-1},"receive":{"type":"number","min":-1},"ssl":{"type":"number","min":-1},"comment":{"type":"string"}}} +module.exports = {"$id":"timings.json#","$schema":"http://json-schema.org/draft-06/schema#","required":["send","wait","receive"],"properties":{"dns":{"type":"number","min":-1},"connect":{"type":"number","min":-1},"blocked":{"type":"number","min":-1},"send":{"type":"number","min":-1},"wait":{"type":"number","min":-1},"receive":{"type":"number","min":-1},"ssl":{"type":"number","min":-1},"comment":{"type":"string"}}} /***/ }), /* 676 */ @@ -120453,7 +120453,7 @@ module.exports = { // // After JIS X 0213 appeared, Shift_JIS-2004, EUC-JISX0213 and ISO2022-JP-2004 followed, with just changing the planes. // - // Overall, it seems that it's a mess :( https://www8.plala.or.jp/tkubota1/unicode-symbols-map2.html + // Overall, it seems that it's a mess :( http://www8.plala.or.jp/tkubota1/unicode-symbols-map2.html 'shiftjis': { type: '_dbcs', @@ -120484,8 +120484,8 @@ module.exports = { // == Chinese/GBK ========================================================== - // https://en.wikipedia.org/wiki/GBK - // We mostly implement W3C recommendation: http://www.w3.org/TR/encoding/#gbk-encoder + // http://en.wikipedia.org/wiki/GBK + // We mostly implement W3C recommendation: https://www.w3.org/TR/encoding/#gbk-encoder // Oldest GB2312 (1981, ~7600 chars) is a subset of CP936 'gb2312': 'cp936', @@ -120513,10 +120513,10 @@ module.exports = { 'isoir58': 'gbk', // GB18030 is an algorithmic extension of GBK. - // Main source: http://www.w3.org/TR/encoding/#gbk-encoder - // https://icu-project.org/docs/papers/gb18030.html - // https://source.icu-project.org/repos/icu/data/trunk/charset/data/xml/gb-18030-2000.xml - // https://www.khngai.com/chinese/charmap/tblgbk.php?page=0 + // Main source: https://www.w3.org/TR/encoding/#gbk-encoder + // http://icu-project.org/docs/papers/gb18030.html + // http://source.icu-project.org/repos/icu/data/trunk/charset/data/xml/gb-18030-2000.xml + // http://www.khngai.com/chinese/charmap/tblgbk.php?page=0 'gb18030': { type: '_dbcs', table: function() { return __webpack_require__(277).concat(__webpack_require__(396)) }, @@ -120550,10 +120550,10 @@ module.exports = { // == Big5/Taiwan/Hong Kong ================================================ // There are lots of tables for Big5 and cp950. Please see the following links for history: - // https://moztw.org/docs/big5/ https://www.haible.de/bruno/charsets/conversion-tables/Big5.html + // http://moztw.org/docs/big5/ http://www.haible.de/bruno/charsets/conversion-tables/Big5.html // Variations, in roughly number of defined chars: - // * Windows CP 950: Microsoft variant of Big5. Canonical: https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT - // * Windows CP 951: Microsoft variant of Big5-HKSCS-2001. Seems to be never public. https://me.abelcheung.org/articles/research/what-is-cp951/ + // * Windows CP 950: Microsoft variant of Big5. Canonical: http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT + // * Windows CP 951: Microsoft variant of Big5-HKSCS-2001. Seems to be never public. http://me.abelcheung.org/articles/research/what-is-cp951/ // * Big5-2003 (Taiwan standard) almost superset of cp950. // * Unicode-at-on (UAO) / Mozilla 1.8. Falling out of use on the Web. Not supported by other browsers. // * Big5-HKSCS (-2001, -2004, -2008). Hong Kong standard. @@ -120565,11 +120565,11 @@ module.exports = { // MS Internet Explorer switches from big5 to big5-hkscs when a patch applied. // Great discussion & recap of what's going on https://bugzilla.mozilla.org/show_bug.cgi?id=912470#c31 // In the encoder, it might make sense to support encoding old PUA mappings to Big5 bytes seq-s. - // Official spec: https://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/2003cmp_2008.txt - // https://www.ogcio.gov.hk/tc/business/tech_promotion/ccli/terms/doc/hkscs-2008-big5-iso.txt + // Official spec: http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/2003cmp_2008.txt + // http://www.ogcio.gov.hk/tc/business/tech_promotion/ccli/terms/doc/hkscs-2008-big5-iso.txt // - // Current understanding of how to deal with Big5(-HKSCS) is in the Encoding Standard, https://encoding.spec.whatwg.org/#big5-encoder - // Unicode mapping (https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT) is said to be wrong. + // Current understanding of how to deal with Big5(-HKSCS) is in the Encoding Standard, http://encoding.spec.whatwg.org/#big5-encoder + // Unicode mapping (http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT) is said to be wrong. 'windows950': 'cp950', 'ms950': 'cp950', @@ -121638,7 +121638,7 @@ Utf16BEDecoder.prototype.end = function() { // == UTF-16 codec ============================================================= // Decoder chooses automatically from UTF-16LE and UTF-16BE using BOM and space-based heuristic. // Defaults to UTF-16LE, as it's prevalent and default in Node. -// https://en.wikipedia.org/wiki/UTF-16 and https://encoding.spec.whatwg.org/#utf-16le +// http://en.wikipedia.org/wiki/UTF-16 and http://encoding.spec.whatwg.org/#utf-16le // Decoder default can be changed: iconv.decode(buf, 'utf16', {defaultEncoding: 'utf-16be'}); // Encoder uses UTF-16LE and prepends BOM (which can be overridden with addBOM: false). @@ -121757,7 +121757,7 @@ function detectEncoding(buf, defaultEncoding) { var Buffer = __webpack_require__(15).Buffer; // UTF-7 codec, according to https://tools.ietf.org/html/rfc2152 -// See also below a UTF-7-IMAP codec, according to https://tools.ietf.org/html/rfc3501#section-5.1.3 +// See also below a UTF-7-IMAP codec, according to http://tools.ietf.org/html/rfc3501#section-5.1.3 exports.utf7 = Utf7Codec; exports.unicode11utf7 = 'utf7'; // Alias UNICODE-1-1-UTF-7 @@ -121873,7 +121873,7 @@ Utf7Decoder.prototype.end = function() { // UTF-7-IMAP codec. -// RFC3501 Sec. 5.1.3 Modified UTF-7 (https://tools.ietf.org/html/rfc3501#section-5.1.3) +// RFC3501 Sec. 5.1.3 Modified UTF-7 (http://tools.ietf.org/html/rfc3501#section-5.1.3) // Differences: // * Base64 part is started by "&" instead of "+" // * Direct characters are 0x20-0x7E, except "&" (0x26) @@ -122822,7 +122822,7 @@ module.exports = x => { } // code points are derived from: - // https://www.unix.org/Public/UNIDATA/EastAsianWidth.txt + // http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt if ( x >= 0x1100 && ( x <= 0x115f || // Hangul Jamo @@ -122929,7 +122929,7 @@ module.exports = function isPosixBracket(str) { -// see https://jsperf.com/testing-value-is-primitive/7 +// see http://jsperf.com/testing-value-is-primitive/7 module.exports = function isPrimitive(value) { return value == null || (typeof value !== 'function' && typeof value !== 'object'); }; @@ -123035,7 +123035,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/** * JSONSchema Validator - Validates JavaScript objects using JSON Schemas - * (https://www.json.com/json-schema-proposal/) + * (http://www.json.com/json-schema-proposal/) * * Copyright (c) 2007 Kris Zyp SitePen (www.sitepen.com) * Licensed under the MIT (MIT-LICENSE.txt) license. @@ -124184,7 +124184,7 @@ module.exports = function (a, b) { * Build: `lodash modularize exports="npm" -o ./` * Copyright jQuery Foundation and other contributors * Released under MIT license - * Based on Underscore.js 1.8.3 + * Based on Underscore.js 1.8.3 * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors */ @@ -124229,7 +124229,7 @@ var arrayBufferTag = '[object ArrayBuffer]', /** * Used to match `RegExp` - * [syntax characters](https://ecma-international.org/ecma-262/6.0/#sec-patterns). + * [syntax characters](http://ecma-international.org/ecma-262/6.0/#sec-patterns). */ var reRegExpChar = /[\\^$.*+?()[\]{}|]/g; @@ -124488,7 +124488,7 @@ var hasOwnProperty = objectProto.hasOwnProperty; /** * Used to resolve the - * [`toStringTag`](https://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring) + * [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring) * of values. */ var objectToString = objectProto.toString; @@ -124924,7 +124924,7 @@ Stack.prototype.set = stackSet; /** * Assigns `value` to `key` of `object` if the existing value is not equivalent - * using [`SameValueZero`](https://ecma-international.org/ecma-262/6.0/#sec-samevaluezero) + * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero) * for equality comparisons. * * @private @@ -125563,7 +125563,7 @@ function toSource(func) { /** * Performs a - * [`SameValueZero`](https://ecma-international.org/ecma-262/6.0/#sec-samevaluezero) + * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero) * comparison between two values to determine if they are equivalent. * * @static @@ -125757,7 +125757,7 @@ function isFunction(value) { * Checks if `value` is a valid array-like length. * * **Note:** This function is loosely based on - * [`ToLength`](https://ecma-international.org/ecma-262/6.0/#sec-tolength). + * [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength). * * @static * @memberOf _ @@ -125787,7 +125787,7 @@ function isLength(value) { /** * Checks if `value` is the - * [language type](https://www.ecma-international.org/ecma-262/6.0/#sec-ecmascript-language-types) + * [language type](http://www.ecma-international.org/ecma-262/6.0/#sec-ecmascript-language-types) * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`) * * @static @@ -125896,7 +125896,7 @@ function isString(value) { * Creates an array of the own enumerable property names of `object`. * * **Note:** Non-object values are coerced to objects. See the - * [ES spec](https://ecma-international.org/ecma-262/6.0/#sec-object.keys) + * [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys) * for more details. * * @static @@ -125974,8 +125974,8 @@ module.exports = baseClone; /** * lodash 4.3.2 (Custom Build) * Build: `lodash modularize exports="npm" -o ./` - * Copyright 2012-2016 The Dojo Foundation - * Based on Underscore.js 1.8.3 + * Copyright 2012-2016 The Dojo Foundation + * Based on Underscore.js 1.8.3 * Copyright 2009-2016 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors * Available under MIT license */ @@ -126021,7 +126021,7 @@ module.exports = clone; * Build: `lodash modularize exports="npm" -o ./` * Copyright jQuery Foundation and other contributors * Released under MIT license - * Based on Underscore.js 1.8.3 + * Based on Underscore.js 1.8.3 * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors */ @@ -126043,7 +126043,7 @@ var dataViewTag = '[object DataView]'; /** * Used to match `RegExp` - * [syntax characters](https://ecma-international.org/ecma-262/7.0/#sec-patterns). + * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns). */ var reRegExpChar = /[\\^$.*+?()[\]{}|]/g; @@ -126079,7 +126079,7 @@ var reOptMod = rsModifier + '?', /** Used to match [string symbols](https://mathiasbynens.be/notes/javascript-unicode). */ var reUnicode = RegExp(rsFitz + '(?=' + rsFitz + ')|' + rsSymbol + rsSeq, 'g'); -/** Used to detect strings with [zero-width joiners or code points from the astral planes](https://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */ +/** Used to detect strings with [zero-width joiners or code points from the astral planes](http://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */ var reHasUnicode = RegExp('[' + rsZWJ + rsAstralRange + rsComboMarksRange + rsComboSymbolsRange + rsVarRange + ']'); /** Detect free variable `global` from Node.js. */ @@ -126309,7 +126309,7 @@ var hasOwnProperty = objectProto.hasOwnProperty; /** * Used to resolve the - * [`toStringTag`](https://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring) + * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring) * of values. */ var objectToString = objectProto.toString; @@ -126676,7 +126676,7 @@ function isFunction(value) { * Checks if `value` is a valid array-like length. * * **Note:** This method is loosely based on - * [`ToLength`](https://ecma-international.org/ecma-262/7.0/#sec-tolength). + * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength). * * @static * @memberOf _ @@ -126705,7 +126705,7 @@ function isLength(value) { /** * Checks if `value` is the - * [language type](https://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types) + * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types) * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`) * * @static @@ -126826,7 +126826,7 @@ function toArray(value) { * Creates an array of the own enumerable property names of `object`. * * **Note:** Non-object values are coerced to objects. See the - * [ES spec](https://ecma-international.org/ecma-262/7.0/#sec-object.keys) + * [ES spec](http://ecma-international.org/ecma-262/7.0/#sec-object.keys) * for more details. * * @static @@ -128150,7 +128150,7 @@ var trimSpaceRegex = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g; function stripColons (str) { var colonIndex = str.indexOf(':'); if (colonIndex > -1) { - // :emoji: (https://www.emoji-cheat-sheet.com/) + // :emoji: (http://www.emoji-cheat-sheet.com/) if (colonIndex === str.length - 1) { str = str.substring(0, colonIndex); return stripColons(str); @@ -128723,7 +128723,7 @@ function generateBase (httpMethod, base_uri, params) { // https://dev.twitter.com/docs/auth/creating-signature // Parameter normalization - // https://tools.ietf.org/html/rfc5849#section-3.4.1.3.2 + // http://tools.ietf.org/html/rfc5849#section-3.4.1.3.2 var normalized = map(params) // 1. First, the name and value of each parameter are encoded .map(function (p) { @@ -129367,7 +129367,7 @@ module.exports = (url, opts) => { return url; } - return url.replace(/^(?!(?:\w+:)?\/\/)/, opts.https ? 'https://' : 'https://'); + return url.replace(/^(?!(?:\w+:)?\/\/)/, opts.https ? 'https://' : 'http://'); }; @@ -131016,7 +131016,7 @@ function parse(str, opts) { var val = parts.length > 0 ? parts.join('=') : undefined; // missing `=` should be `null`: - // https://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters + // http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters val = val === undefined ? null : decodeComponent(val); formatter(decodeComponent(key), val, ret); @@ -131798,7 +131798,7 @@ function repeat(str, num) { /* 798 */ /***/ (function(module, exports) { -module.exports = {"name":"request-capture-har","version":"1.2.2","description":"Wrapper for request module that saves all traffic as a HAR file, useful for auto mocking a client","main":"request-capture-har.js","scripts":{"test":"semistandard","travis":"npm test && node request-capture-har.js"},"repository":{"type":"git","url":"git+https://github.com/paulirish/node-request-capture-har.git"},"keywords":["http","request","har"],"author":"Lars Thorup (https://github.com/larsthorup)","license":"MIT","bugs":{"url":"https://github.com/paulirish/node-request-capture-har/issues"},"homepage":"https://github.com/paulirish/node-request-capture-har#readme","files":["request-capture-har.js"],"devDependencies":{"semistandard":"^8.0.0"}} +module.exports = {"name":"request-capture-har","version":"1.2.2","description":"Wrapper for request module that saves all traffic as a HAR file, useful for auto mocking a client","main":"request-capture-har.js","scripts":{"test":"semistandard","travis":"npm test && node request-capture-har.js"},"repository":{"type":"git","url":"git+https://github.com/paulirish/node-request-capture-har.git"},"keywords":["http","request","har"],"author":"Lars Thorup (http://github.com/larsthorup)","license":"MIT","bugs":{"url":"https://github.com/paulirish/node-request-capture-har/issues"},"homepage":"https://github.com/paulirish/node-request-capture-har#readme","files":["request-capture-har.js"],"devDependencies":{"semistandard":"^8.0.0"}} /***/ }), /* 799 */ @@ -131959,7 +131959,7 @@ module.exports = HarWrapper; // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// https://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -132172,7 +132172,7 @@ Auth.prototype.digest = function (method, path, authHeader) { // - check challenge.stale (not necessarily?) // - increase nc (not necessarily?) // For reference: - // https://tools.ietf.org/html/rfc2617#section-3 + // http://tools.ietf.org/html/rfc2617#section-3 // https://github.com/bagder/curl/blob/master/lib/http_digest.c var self = this @@ -132331,7 +132331,7 @@ function uriInNoProxy (uri, noProxy) { function getProxyFromURI (uri) { // Decide the proper request proxy to use based on the request URI object and the // environmental variables (NO_PROXY, HTTP_PROXY, etc.) - // respect NO_PROXY environment variables (see: https://lynx.isc.org/current/breakout/lynx_help/keystrokes/environments.html) + // respect NO_PROXY environment variables (see: http://lynx.isc.org/current/breakout/lynx_help/keystrokes/environments.html) var noProxy = process.env.NO_PROXY || process.env.no_proxy || '' @@ -135218,7 +135218,7 @@ Request.prototype.init = function (options) { // DEPRECATED: Warning for users of the old Unix Sockets URL Scheme if (self.uri.protocol === 'unix:') { - return self.emit('error', new Error('`unix://` URL scheme is no longer supported. Please use the format `https://unix:SOCKET:PATH`')) + return self.emit('error', new Error('`unix://` URL scheme is no longer supported. Please use the format `http://unix:SOCKET:PATH`')) } // Support Unix Sockets @@ -143385,7 +143385,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - https://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -144545,7 +144545,7 @@ module.exports = function (x) { // https://github.com/nodejs/io.js/blob/cff7300a578be1b10001f2d967aaedc88aee6402/lib/readline.js#L1369 // code points are derived from: - // https://www.unix.org/Public/UNIDATA/EastAsianWidth.txt + // http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt if (x >= 0x1100 && ( x <= 0x115f || // Hangul Jamo 0x2329 === x || // LEFT-POINTING ANGLE BRACKET @@ -145471,7 +145471,7 @@ var /** * Random name generator based on crypto. - * Adapted from https://blog.tompawlak.org/how-to-generate-random-values-nodejs-javascript + * Adapted from http://blog.tompawlak.org/how-to-generate-random-values-nodejs-javascript * * @param {number} howMany * @returns {string} the generated random name @@ -146306,7 +146306,7 @@ var bytesToUuid = __webpack_require__(463); // **`v1()` - Generate time-based UUID** // // Inspired by https://github.com/LiosK/UUID.js -// and https://docs.python.org/library/uuid.html +// and http://docs.python.org/library/uuid.html var _nodeId; var _clockseq; diff --git a/resources/[cfx-default]/[system]/baseevents/fxmanifest.lua b/resources/[cfx-default]/[system]/baseevents/fxmanifest.lua index 65e1a4c..9f56c6a 100644 --- a/resources/[cfx-default]/[system]/baseevents/fxmanifest.lua +++ b/resources/[cfx-default]/[system]/baseevents/fxmanifest.lua @@ -10,5 +10,5 @@ client_script 'deathevents.lua' client_script 'vehiclechecker.lua' server_script 'server.lua' -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' \ No newline at end of file diff --git a/resources/[cfx-default]/[system]/blip_info/blip_info.lua b/resources/[cfx-default]/[system]/blip_info/blip_info.lua new file mode 100644 index 0000000..497559e --- /dev/null +++ b/resources/[cfx-default]/[system]/blip_info/blip_info.lua @@ -0,0 +1,234 @@ +local BLIP_INFO_DATA = {} + +--[[ + Default state for blip info +]] + +function ensureBlipInfo(blip) + if blip == nil then blip = 0 end + SetBlipAsMissionCreatorBlip(blip, true) + if not BLIP_INFO_DATA[blip] then BLIP_INFO_DATA[blip] = {} end + if not BLIP_INFO_DATA[blip].title then BLIP_INFO_DATA[blip].title = "" end + if not BLIP_INFO_DATA[blip].rockstarVerified then BLIP_INFO_DATA[blip].rockstarVerified = false end + if not BLIP_INFO_DATA[blip].info then BLIP_INFO_DATA[blip].info = {} end + if not BLIP_INFO_DATA[blip].money then BLIP_INFO_DATA[blip].money = "" end + if not BLIP_INFO_DATA[blip].rp then BLIP_INFO_DATA[blip].rp = "" end + if not BLIP_INFO_DATA[blip].dict then BLIP_INFO_DATA[blip].dict = "" end + if not BLIP_INFO_DATA[blip].tex then BLIP_INFO_DATA[blip].tex = "" end + return BLIP_INFO_DATA[blip] +end + +--[[ + Export functions, use these via an export pls +]] + +function ResetBlipInfo(blip) + BLIP_INFO_DATA[blip] = nil +end + +function SetBlipInfoTitle(blip, title, rockstarVerified) + local data = ensureBlipInfo(blip) + data.title = title or "" + data.rockstarVerified = rockstarVerified or false +end + +function SetBlipInfoImage(blip, dict, tex) + + RequestStreamedTextureDict(dict, 1) + while not HasStreamedTextureDictLoaded(dict) do + Wait(0) + end + + local data = ensureBlipInfo(blip) + data.dict = dict or "" + data.tex = tex or "" +end + +function SetBlipInfoEconomy(blip, rp, money) + local data = ensureBlipInfo(blip) + data.money = tostring(money) or "" + data.rp = tostring(rp) or "" +end + +function SetBlipInfo(blip, info) + local data = ensureBlipInfo(blip) + data.info = info +end + +function AddBlipInfoText(blip, leftText, rightText) + local data = ensureBlipInfo(blip) + if rightText then + table.insert(data.info, {1, leftText or "", rightText or ""}) + else + table.insert(data.info, {5, leftText or "", ""}) + end +end + +function AddBlipInfoName(blip, leftText, rightText) + local data = ensureBlipInfo(blip) + table.insert(data.info, {3, leftText or "", rightText or ""}) +end + +function AddBlipInfoHeader(blip, leftText, rightText) + local data = ensureBlipInfo(blip) + table.insert(data.info, {4, leftText or "", rightText or ""}) +end + +function AddBlipInfoIcon(blip, leftText, rightText, iconId, iconColor, checked) + local data = ensureBlipInfo(blip) + table.insert(data.info, {2, leftText or "", rightText or "", iconId or 0, iconColor or 0, checked or false}) +end + +--[[ + All that fancy decompiled stuff I've kinda figured out +]] + +local Display = 1 +function UpdateDisplay() + if PushScaleformMovieFunctionN("DISPLAY_DATA_SLOT") then + PushScaleformMovieFunctionParameterInt(Display) + PopScaleformMovieFunctionVoid() + end +end + +function SetColumnState(column, state) + if PushScaleformMovieFunctionN("SHOW_COLUMN") then + PushScaleformMovieFunctionParameterInt(column) + PushScaleformMovieFunctionParameterBool(state) + PopScaleformMovieFunctionVoid() + end +end + +function ShowDisplay(show) + SetColumnState(Display, show) +end + +function func_36(fParam0) + BeginTextCommandScaleformString(fParam0) + EndTextCommandScaleformString() +end + +function SetIcon(index, title, text, icon, iconColor, completed) + if PushScaleformMovieFunctionN("SET_DATA_SLOT") then + PushScaleformMovieFunctionParameterInt(Display) + PushScaleformMovieFunctionParameterInt(index) + PushScaleformMovieFunctionParameterInt(65) + PushScaleformMovieFunctionParameterInt(3) + PushScaleformMovieFunctionParameterInt(2) + PushScaleformMovieFunctionParameterInt(0) + PushScaleformMovieFunctionParameterInt(1) + func_36(title) + func_36(text) + PushScaleformMovieFunctionParameterInt(icon) + PushScaleformMovieFunctionParameterInt(iconColor) + PushScaleformMovieFunctionParameterBool(completed) + PopScaleformMovieFunctionVoid() + end +end + +function SetText(index, title, text, textType) + if PushScaleformMovieFunctionN("SET_DATA_SLOT") then + PushScaleformMovieFunctionParameterInt(Display) + PushScaleformMovieFunctionParameterInt(index) + PushScaleformMovieFunctionParameterInt(65) + PushScaleformMovieFunctionParameterInt(3) + PushScaleformMovieFunctionParameterInt(textType or 0) + PushScaleformMovieFunctionParameterInt(0) + PushScaleformMovieFunctionParameterInt(0) + func_36(title) + func_36(text) + PopScaleformMovieFunctionVoid() + end +end + +local _labels = 0 +local _entries = 0 +function ClearDisplay() + if PushScaleformMovieFunctionN("SET_DATA_SLOT_EMPTY") then + PushScaleformMovieFunctionParameterInt(Display) + end + PopScaleformMovieFunctionVoid() + _labels = 0 + _entries = 0 +end + +function _label(text) + local lbl = "LBL" .. _labels + AddTextEntry(lbl, text) + _labels = _labels + 1 + return lbl +end + +function SetTitle(title, rockstarVerified, rp, money, dict, tex) + if PushScaleformMovieFunctionN("SET_COLUMN_TITLE") then + PushScaleformMovieFunctionParameterInt(Display) + func_36("") + func_36(_label(title)) + PushScaleformMovieFunctionParameterInt(rockstarVerified) + PushScaleformMovieFunctionParameterString(dict) + PushScaleformMovieFunctionParameterString(tex) + PushScaleformMovieFunctionParameterInt(0) + PushScaleformMovieFunctionParameterInt(0) + if rp == "" then + PushScaleformMovieFunctionParameterBool(0) + else + func_36(_label(rp)) + end + if money == "" then + PushScaleformMovieFunctionParameterBool(0) + else + func_36(_label(money)) + end + end + PopScaleformMovieFunctionVoid() +end + +function AddText(title, desc, style) + SetText(_entries, _label(title), _label(desc), style or 1) + _entries = _entries + 1 +end + +function AddIcon(title, desc, icon, color, checked) + SetIcon(_entries, _label(title), _label(desc), icon, color, checked) + _entries = _entries + 1 +end + +Citizen.CreateThread(function() + local current_blip = nil + while true do + Wait(0) + if IsFrontendReadyForControl() then + local blip = DisableBlipNameForVar() + if IsHoveringOverMissionCreatorBlip() then + if DoesBlipExist(blip) then + if current_blip ~= blip then + current_blip = blip + if BLIP_INFO_DATA[blip] then + local data = ensureBlipInfo(blip) + TakeControlOfFrontend() + ClearDisplay() + SetTitle(data.title, data.rockstarVerified, data.rp, data.money, data.dict, data.tex) + for _, info in next, data.info do + if info[1] == 2 then + AddIcon(info[2], info[3], info[4], info[5], info[6]) + else + AddText(info[2], info[3], info[1]) + end + end + ShowDisplay(true) + UpdateDisplay() + ReleaseControlOfFrontend() + else + ShowDisplay(false) + end + end + end + else + if current_blip then + current_blip = nil + ShowDisplay(false) + end + end + end + end +end) diff --git a/resources/[cfx-default]/[system]/blip_info/fxmanifest.lua b/resources/[cfx-default]/[system]/blip_info/fxmanifest.lua new file mode 100644 index 0000000..6fab188 --- /dev/null +++ b/resources/[cfx-default]/[system]/blip_info/fxmanifest.lua @@ -0,0 +1,32 @@ +fx_version 'adamant' +game 'gta5' + +name 'Blip Info Utility' +author 'glitchdetector' +contact 'glitchdetector@gmail.com' +version '1.0.0' + +description 'Enables the ability to assign extra information for blips, visible when hovering over them in the pause menu map' +usage [[ + exports['blip_info']:ResetBlipInfo(blip) + exports['blip_info']:SetBlipInfo(blip, infoData) + exports['blip_info']:SetBlipInfoTitle(blip, title, rockstarVerified) + exports['blip_info']:SetBlipInfoImage(blip, dict, tex) + exports['blip_info']:SetBlipInfoEconomy(blip, rp, money) + exports['blip_info']:AddBlipInfoText(blip, leftText, rightText) + exports['blip_info']:AddBlipInfoName(blip, leftText, rightText) + exports['blip_info']:AddBlipInfoHeader(blip, leftText, rightText) + exports['blip_info']:AddBlipInfoIcon(blip, leftText, rightText, iconId, iconColor, checked) +]] + +client_script 'blip_info.lua' + +export 'ResetBlipInfo' +export 'SetBlipInfo' +export 'SetBlipInfoTitle' +export 'SetBlipInfoImage' +export 'SetBlipInfoEconomy' +export 'AddBlipInfoText' +export 'AddBlipInfoName' +export 'AddBlipInfoHeader' +export 'AddBlipInfoIcon' diff --git a/resources/[cfx-default]/[system]/blip_info/stream/arcade.ytd b/resources/[cfx-default]/[system]/blip_info/stream/arcade.ytd new file mode 100644 index 0000000..50f341f Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/arcade.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/banks.ytd b/resources/[cfx-default]/[system]/blip_info/stream/banks.ytd new file mode 100644 index 0000000..314d2da Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/banks.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/bars.ytd b/resources/[cfx-default]/[system]/blip_info/stream/bars.ytd new file mode 100644 index 0000000..1de54cc Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/bars.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/beanmachine.ytd b/resources/[cfx-default]/[system]/blip_info/stream/beanmachine.ytd new file mode 100644 index 0000000..9e7926e Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/beanmachine.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/carwash.ytd b/resources/[cfx-default]/[system]/blip_info/stream/carwash.ytd new file mode 100644 index 0000000..7b1b302 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/carwash.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/chicken.ytd b/resources/[cfx-default]/[system]/blip_info/stream/chicken.ytd new file mode 100644 index 0000000..55976a8 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/chicken.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/cityhall.ytd b/resources/[cfx-default]/[system]/blip_info/stream/cityhall.ytd new file mode 100644 index 0000000..6d12c9c Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/cityhall.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/clothing.ytd b/resources/[cfx-default]/[system]/blip_info/stream/clothing.ytd new file mode 100644 index 0000000..79c94a0 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/clothing.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/housing.ytd b/resources/[cfx-default]/[system]/blip_info/stream/housing.ytd new file mode 100644 index 0000000..b0f740f Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/housing.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/jobs.ytd b/resources/[cfx-default]/[system]/blip_info/stream/jobs.ytd new file mode 100644 index 0000000..5f1d5c7 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/jobs.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/mechanics.ytd b/resources/[cfx-default]/[system]/blip_info/stream/mechanics.ytd new file mode 100644 index 0000000..3671797 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/mechanics.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/mining.ytd b/resources/[cfx-default]/[system]/blip_info/stream/mining.ytd new file mode 100644 index 0000000..8df281a Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/mining.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/motels.ytd b/resources/[cfx-default]/[system]/blip_info/stream/motels.ytd new file mode 100644 index 0000000..6216174 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/motels.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/police.ytd b/resources/[cfx-default]/[system]/blip_info/stream/police.ytd new file mode 100644 index 0000000..a94bfa7 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/police.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/recycle.ytd b/resources/[cfx-default]/[system]/blip_info/stream/recycle.ytd new file mode 100644 index 0000000..cf085ad Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/recycle.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/shops.ytd b/resources/[cfx-default]/[system]/blip_info/stream/shops.ytd new file mode 100644 index 0000000..2d1db00 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/shops.ytd differ diff --git a/resources/[cfx-default]/[system]/blip_info/stream/world_blips.ytd b/resources/[cfx-default]/[system]/blip_info/stream/world_blips.ytd new file mode 100644 index 0000000..db7acb4 Binary files /dev/null and b/resources/[cfx-default]/[system]/blip_info/stream/world_blips.ytd differ diff --git a/resources/[cfx-default]/[system]/hardcap/fxmanifest.lua b/resources/[cfx-default]/[system]/hardcap/fxmanifest.lua index 5ca1f75..404ba06 100644 --- a/resources/[cfx-default]/[system]/hardcap/fxmanifest.lua +++ b/resources/[cfx-default]/[system]/hardcap/fxmanifest.lua @@ -9,6 +9,6 @@ repository 'https://github.com/citizenfx/cfx-server-data' client_script 'client.lua' server_script 'server.lua' -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5', 'rdr3' } rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' diff --git a/resources/[cfx-default]/[system]/rconlog/fxmanifest.lua b/resources/[cfx-default]/[system]/rconlog/fxmanifest.lua index d79ae34..96bc589 100644 --- a/resources/[cfx-default]/[system]/rconlog/fxmanifest.lua +++ b/resources/[cfx-default]/[system]/rconlog/fxmanifest.lua @@ -9,7 +9,7 @@ repository 'https://github.com/citizenfx/cfx-server-data' client_script 'rconlog_client.lua' server_script 'rconlog_server.lua' -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5', 'rdr3' } rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' diff --git a/resources/[cfx-default]/[system]/runcode/fxmanifest.lua b/resources/[cfx-default]/[system]/runcode/fxmanifest.lua index e3461e0..5a7369e 100644 --- a/resources/[cfx-default]/[system]/runcode/fxmanifest.lua +++ b/resources/[cfx-default]/[system]/runcode/fxmanifest.lua @@ -7,7 +7,7 @@ description 'Allows server owners to execute arbitrary server-side or client-sid repository 'https://github.com/citizenfx/cfx-server-data' game 'common' -fx_version 'cerulean' +fx_version 'adamant' client_script 'runcode_cl.lua' server_script 'runcode_sv.lua' diff --git a/resources/[cfx-default]/[system]/runcode/runcode_ui.lua b/resources/[cfx-default]/[system]/runcode/runcode_ui.lua index 1b75d1b..57bb0fd 100644 --- a/resources/[cfx-default]/[system]/runcode/runcode_ui.lua +++ b/resources/[cfx-default]/[system]/runcode/runcode_ui.lua @@ -6,7 +6,7 @@ AddEventHandler('runcode:openUi', function(options) openData = { type = 'open', options = options, - url = 'https://' .. GetCurrentServerEndpoint() .. '/' .. GetCurrentResourceName() .. '/', + url = 'http://' .. GetCurrentServerEndpoint() .. '/' .. GetCurrentResourceName() .. '/', res = GetCurrentResourceName() } diff --git a/resources/[cfx-default]/[system]/runcode/web/index.html b/resources/[cfx-default]/[system]/runcode/web/index.html index 05dce84..c615fca 100644 --- a/resources/[cfx-default]/[system]/runcode/web/index.html +++ b/resources/[cfx-default]/[system]/runcode/web/index.html @@ -317,7 +317,7 @@ document.querySelector('#passwordField').style.display = 'none'; document.querySelector('html').classList.add('in-nui'); - fetch(`https://${window.parent.GetParentResourceName()}/getOpenData`, { + fetch(`http://${window.parent.GetParentResourceName()}/getOpenData`, { method: 'POST', body: '{}' }).then(a => a.json()) diff --git a/resources/[cfx-default]/[system]/sessionmanager-rdr3/fxmanifest.lua b/resources/[cfx-default]/[system]/sessionmanager-rdr3/fxmanifest.lua index 6478a87..5e44544 100644 --- a/resources/[cfx-default]/[system]/sessionmanager-rdr3/fxmanifest.lua +++ b/resources/[cfx-default]/[system]/sessionmanager-rdr3/fxmanifest.lua @@ -6,7 +6,7 @@ author 'Cfx.re ' description 'Handles Social Club conductor session API for RedM. Do not disable.' repository 'https://github.com/citizenfx/cfx-server-data' -fx_version 'cerulean' +fx_version 'adamant' game 'rdr3' rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' diff --git a/resources/[cfx-default]/[system]/sessionmanager/fxmanifest.lua b/resources/[cfx-default]/[system]/sessionmanager/fxmanifest.lua index 83ddebd..d27630d 100644 --- a/resources/[cfx-default]/[system]/sessionmanager/fxmanifest.lua +++ b/resources/[cfx-default]/[system]/sessionmanager/fxmanifest.lua @@ -6,7 +6,7 @@ author 'Cfx.re ' description 'Handles the "host lock" for non-OneSync servers. Do not disable.' repository 'https://github.com/citizenfx/cfx-server-data' -fx_version 'cerulean' +fx_version 'adamant' games { 'gta4', 'gta5' } server_script 'server/host_lock.lua' diff --git a/resources/[cfx-default]/[test]/fivem/fxmanifest.lua b/resources/[cfx-default]/[test]/fivem/fxmanifest.lua index b0e5be5..74201da 100644 --- a/resources/[cfx-default]/[test]/fivem/fxmanifest.lua +++ b/resources/[cfx-default]/[test]/fivem/fxmanifest.lua @@ -7,7 +7,7 @@ description 'A compatibility resource to load basic-gamemode.' repository 'https://github.com/citizenfx/cfx-server-data' -- compatibility wrapper -fx_version 'cerulean' +fx_version 'adamant' game 'common' dependency 'basic-gamemode' diff --git a/resources/[custom_script]/2na_core/Client/main.lua b/resources/[custom_script]/2na_core/Client/main.lua index 56cd0ba..6091067 100644 --- a/resources/[custom_script]/2na_core/Client/main.lua +++ b/resources/[custom_script]/2na_core/Client/main.lua @@ -4,6 +4,7 @@ TwoNa.Framework = nil TwoNa.Game = {} TwoNa.Functions = TwoNaShared.Functions TwoNa.Types = TwoNaShared.Types +TwoNa.Config = Config TwoNa.TriggerServerCallback = function(name, payload, func) if not func then diff --git a/resources/[custom_script]/2na_core/Common/main.lua b/resources/[custom_script]/2na_core/Common/main.lua index d0ea419..afa6e85 100644 --- a/resources/[custom_script]/2na_core/Common/main.lua +++ b/resources/[custom_script]/2na_core/Common/main.lua @@ -24,14 +24,14 @@ end TwoNaShared.Functions.GetFramework = function() local availableFramework = nil - for k,v in ipairs(TwoNaShared.Types.Frameworks) do - if GetResourceState(v.ResourceName) == "starting" or GetResourceState(v.ResourceName) == "started" then + for k,v in ipairs(TwoNaShared.Types.Frameworks) do + if GetResourceState(v.ResourceName) ~= "missing" then availableFramework = v end end if not availableFramework then - TwoNaShared.Functions.Log("^1Intet understøttet framework fundet! Kontroller at framework-navnet ikke er ændret.^7") + TwoNaShared.Functions.Log("^1Could not find a supported framework! Please ensure that framework script name did not got change.^7") end return availableFramework @@ -41,13 +41,13 @@ TwoNaShared.Functions.GetDatabase = function() local availableDatabase = nil for k,v in ipairs(TwoNaShared.Types.Databases) do - if GetResourceState(v.ResourceName) == "starting" or GetResourceState(v.ResourceName) == "started" then + if GetResourceState(v.ResourceName) ~= "missing" then availableDatabase = v end end if not availableDatabase then - TwoNaShared.Functions.Log("^1Kunne ikke finde en understøttet database! Kontroller at database-scriptnavnet ikke er ændret.^7") + TwoNaShared.Functions.Log("^1Could not find a supported database! Please ensure that database script name did not got change.^7") end return availableDatabase diff --git a/resources/[custom_script]/2na_core/Server/main.lua b/resources/[custom_script]/2na_core/Server/main.lua index 36ffd36..fdf54aa 100644 --- a/resources/[custom_script]/2na_core/Server/main.lua +++ b/resources/[custom_script]/2na_core/Server/main.lua @@ -5,6 +5,7 @@ TwoNa.Framework = nil TwoNa.Functions = TwoNaShared.Functions TwoNa.Types = TwoNaShared.Types TwoNa.Vehicles = nil +TwoNa.Config = Config TwoNa.MySQL = { Async = {}, Sync = {} @@ -165,13 +166,17 @@ TwoNa.CreatePlayer = function(xPlayer) end player.getMoney = xPlayer.getMoney player.addBank = function(amount) - xPlayer.addAccountMoney('bank', amount) + xPlayer.addAccountMoney('bank', tonumber(amount)) + end + player.addMoney = function(amount) + xPlayer.addMoney(tonumber(amount)) end - player.addMoney = xPlayer.addMoney player.removeBank = function(amount) - xPlayer.removeAccountMoney('bank', amount) + xPlayer.removeAccountMoney('bank', tonumber(amount)) + end + player.removeMoney = function(amount) + xPlayer.removeMoney(tonumber(amount)) end - player.removeMoney = xPlayer.removeMoney elseif Config.Framework.Name == "QBCore" then player.name = xPlayer.PlayerData.charinfo.firstname .. " " .. xPlayer.PlayerData.charinfo.lastname player.accounts = { @@ -244,6 +249,28 @@ TwoNa.GetPlayerFromIdentifier = function(identifier) end end +TwoNa.GetPlayerFromCharacterIdentifier = function(charIdentifier) + local xPlayer = nil + if Config.Framework.Name == "ESX" then + for _, player in ipairs(TwoNa.Framework.GetExtendedPlayers()) do + if player.identifier == charIdentifier then + xPlayer = player + break + end + end + elseif Config.Framework.Name == "QBCore" then + for _, player in ipairs(TwoNa.Framework.Functions.GetPlayers()) do + player = TwoNa.Framework.Functions.GetPlayer(player) + if player.PlayerData.citizenid == charIdentifier then + xPlayer = player + end + end + + end + + return TwoNa.CreatePlayer(xPlayer) +end + TwoNa.GetAllVehicles = function(force) if TwoNa.Vehicles and not force then return TwoNa.Vehicles @@ -437,6 +464,20 @@ TwoNa.UpdateVehicleOwner = function(plate, target) end end +TwoNa.RegisterUsableItem = function(name, action) + if Config.Framework.Name == "ESX" then + TwoNa.Framework.RegisterUsableItem(name, function(source) + local xPlayer = TwoNa.Framework.GetPlayerFromId(source) + action(TwoNa.CreatePlayer(xPlayer), source) + end) + elseif Config.Framework.Name == 'QBCore' then + TwoNa.Framework.Functions.CreateUseableItem(name, function(source) + local xPlayer = TwoNa.Framework.Functions.GetPlayer(source) + action(TwoNa.CreatePlayer(xPlayer), source) + end) + end +end + TwoNa.CheckUpdate = function() PerformHttpRequest("https://api.github.com/repos/tunasayin/2na_core/releases/latest", function(errorCode, rawData, headers) if rawData ~= nil then diff --git a/resources/[custom_script]/2na_core/fxmanifest.lua b/resources/[custom_script]/2na_core/fxmanifest.lua index f98b722..5247d95 100644 --- a/resources/[custom_script]/2na_core/fxmanifest.lua +++ b/resources/[custom_script]/2na_core/fxmanifest.lua @@ -1,11 +1,11 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' author 'tunasayin' description 'Core script needed for almost all 2na scripts.' -version '0.2.8' +version '0.3.1' shared_scripts { 'Common/*.lua', diff --git a/resources/[custom_script]/Buty-CarWash/client.lua b/resources/[custom_script]/Buty-CarWash/client.lua index ffbc63c..658eb96 100644 --- a/resources/[custom_script]/Buty-CarWash/client.lua +++ b/resources/[custom_script]/Buty-CarWash/client.lua @@ -1,8 +1,8 @@ -if Configuration.FrameWork == 'esx' then +if Configuration.FrameWork == 'esx' then if Configuration.CoreFolderName == "" then Configuration.CoreFolderName = 'es_extended' end ESX = exports[Configuration.CoreFolderName]:getSharedObject() trigger = ESX.TriggerServerCallback -elseif Configuration.FrameWork == 'qbcore' then +elseif Configuration.FrameWork == 'qbcore' then if Configuration.CoreFolderName == "" then Configuration.CoreFolderName = 'qb-core' end QBCore = exports[Configuration.CoreFolderName]:GetCoreObject() trigger = QBCore.Functions.TriggerCallback @@ -11,7 +11,7 @@ end local Type = nil local fov_max = 90.0 local fov_min = 1.0 -local fov = (fov_max+fov_min)*0.5 +local fov = (fov_max + fov_min) * 0.5 local npccreated = {} local animDict = "weapons@first_person@aim_rng@generic@projectile@shared@core" local animDict2 = "mini@strip_club@private_dance@part3" @@ -30,19 +30,31 @@ RegisterNUICallback("exit", function(data) SetNuiFocus(false, false) SendNUIMessage({ type = "ui", - status = false, + status = false, }) else SetNuiFocus(false, false) SendNUIMessage({ type = "ui", - status = false, + status = false, }) end DisplayRadar(true) end) +local function createBlip(blip, label, image) + exports['blip_info']:SetBlipInfoTitle(blip, label, 0) + exports['blip_info']:SetBlipInfoImage(blip, "carwash", "carwash" .. image) + exports['blip_info']:AddBlipInfoName(blip, "Ejet af", "Staten") + exports['blip_info']:AddBlipInfoName(blip, "Type", "Vedligeholdelse") + exports['blip_info']:AddBlipInfoHeader(blip, "") + exports['blip_info']:AddBlipInfoHeader(blip, "") + exports['blip_info']:AddBlipInfoText(blip, "Beskidt bil? Look no further! Byens bedste bilvask.") + print('') +end + Citizen.CreateThread(function() + for i, v in ipairs(Locations) do carwash = AddBlipForCoord(v.Coord) SetBlipSprite(carwash, 100) @@ -52,8 +64,10 @@ Citizen.CreateThread(function() BeginTextCommandSetBlipName("STRING") AddTextComponentSubstringPlayerName("Bilvask") EndTextCommandSetBlipName(carwash) + createBlip(carwash, "Bilvask", i) end while true do + local ped = PlayerPedId() local pedcoord = GetEntityCoords(ped) vehicle = GetPlayersLastVehicle(ped) @@ -63,11 +77,12 @@ Citizen.CreateThread(function() if dist < 20 and not washing then esta = true sleep = 0 - DrawMarker(23, v.Coord.x,v.Coord.y,v.Coord.z - 0.50, 0.0, 0.0, 0.0, 0.0, 180.0, 0.0, 4.0, 4.0, 4.0, 10, 228, 255, 100,0, 1, 2, 0, 0) + DrawMarker(23, v.Coord.x, v.Coord.y, v.Coord.z - 0.50, 0.0, 0.0, 0.0, 0.0, 180.0, 0.0, 4.0, 4.0, 4.0, 10, + 228, 255, 100, 0, 1, 2, 0, 0) end if dist < 1.5 and IsPedInAnyVehicle(ped, false) and not washing then esta = true - hintToDisplay("~b~[E]~wu~ ~w~Vask køretøj", v.Coord) + hintToDisplay("~b~[E]~wu~ ~w~Vask køretøj", v.Coord) sleep = 0 local isDriving = IsPedInAnyVehicle(PlayerPedId(), false) local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) @@ -83,17 +98,18 @@ Citizen.CreateThread(function() Wait(500) DoScreenFadeIn(1000) local px, py, pz = table.unpack(GetEntityCoords(vehicle)) - local x, y, z = px + GetEntityForwardX(vehicle) * 1.3, py + GetEntityForwardY(vehicle) * 5.4, pz + 0.12 - camCoords = vector3(x, y, z) + local x, y, z = px + GetEntityForwardX(vehicle) * 1.3, py + GetEntityForwardY(vehicle) * 5.4, + pz + 0.12 + camCoords = vector3(x, y, z) local rx = GetEntityRotation(vehicle, 2) camRotation = rx + vector3(-2.0, 0.0, -132) cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", camCoords, camRotation, GetGameplayCamFov()) SetCamActive(cam, true) - RenderScriptCams(true, true, 3000, true, false) + RenderScriptCams(true, true, 3000, true, false) Wait(2600) SetNuiFocus(true, true) - SendNUIMessage({type = "ui",status = true}) - end + SendNUIMessage({ type = "ui", status = true }) + end end if not esta then sleep = 1000 @@ -101,7 +117,6 @@ Citizen.CreateThread(function() end Citizen.Wait(sleep) end - end) RegisterNUICallback("wash", function(data) @@ -111,41 +126,42 @@ RegisterNUICallback("wash", function(data) local price = Configuration.Prices[tonumber(Type)] local pedcoord = GetEntityCoords(ped) local vehcoord = GetEntityCoords(vehicle) - trigger('buty:getMoney', function (money) + trigger('buty:getMoney', function(money) if money then SendNotification("Du har betalt for din vask - Læn dig tilbage og vent på vasken er færdig") if Type == "1" then for _, location in ipairs(Locations) do local dist = #(pedcoord - location.Coord) if dist < 20 then - for _, npcData in ipairs(location.Npc['BASIC']) do - + for _, npcData in ipairs(location.Npc['BASIC']) do local modelHash = GetHashKey(npcData.model) RequestModel(modelHash) while not HasModelLoaded(modelHash) do Wait(1) end - + npcData.npc = CreatePed(5, modelHash, vehcoord.x, vehcoord.y + 4.5, vehcoord.z, 1, true, true) SetEntityInvincible(npcData.npc, true) SetBlockingOfNonTemporaryEvents(npcData.npc, true) - + local prop = CreateObject("prop_blox_spray", 0, 0, 0, true, true, true) - AttachEntityToEntity(prop, npcData.npc, GetPedBoneIndex(npcData.npc, 28422), 0.05, -0.05, -0.05, 260.0, 160.0, 0.0, 1, 1, 0, 1, 0, 1) - + AttachEntityToEntity(prop, npcData.npc, GetPedBoneIndex(npcData.npc, 28422), 0.05, -0.05, + -0.05, 260.0, 160.0, 0.0, 1, 1, 0, 1, 0, 1) + local px, py, pz = table.unpack(GetEntityCoords(vehicle)) - local x, y, z = px + GetEntityForwardX(vehicle) * 0.5, py + GetEntityForwardY(vehicle) * 9.9, pz + 2.82 - camCoords = vector3(x, y, z) + local x, y, z = px + GetEntityForwardX(vehicle) * 0.5, py + GetEntityForwardY(vehicle) * 9.9, + pz + 2.82 + camCoords = vector3(x, y, z) local rx = GetEntityRotation(vehicle, 2) camRotation = rx + vector3(-22.0, 0.0, -145) SetCamParams(cam, camCoords, camRotation, GetGameplayCamFov(), 3000) - + SetCamActive(cam, true) RenderScriptCams(true, true, 5000, true, false) - + while not HasAnimDictLoaded(animDict) do Citizen.Wait(100) end - TaskPlayAnim(npcData.npc, animDict, animName, 1.0, -1, -1, 50, 0, 0, 0, 0) - -- Progress(24000, "Spraying cleaning fluid...") + TaskPlayAnim(npcData.npc, animDict, animName, 1.0, -1, -1, 50, 0, 0, 0, 0) + -- Progress(24000, "Spraying cleaning fluid...") for i = 1, #npcData.steps do local boneIndex = GetEntityBoneIndexByName(vehicle, npcData.steps[i]) local Position = GetWorldPositionOfEntityBone(vehicle, boneIndex) @@ -156,14 +172,15 @@ RegisterNUICallback("wash", function(data) local heading = GetEntityHeading(npcData.npc) RequestNamedPtfxAsset(particleDict) while not HasNamedPtfxAssetLoaded(particleDict) do Citizen.Wait(100) end - + UseParticleFxAssetNextCall(particleDict) - local particleEffect = StartParticleFxLoopedOnEntity(particleName, prop, 0.2, 0.002, 0.0, 0.0, heading, 160.0, 6.0, false, false, false) + local particleEffect = StartParticleFxLoopedOnEntity(particleName, prop, 0.2, 0.002, 0.0, + 0.0, heading, 160.0, 6.0, false, false, false) Citizen.Wait(1000) local dirtLevel = GetVehicleDirtLevel(vehicle) SetVehicleDirtLevel(vehicle, dirtLevel - 1) end - + SetVehicleDirtLevel(vehicle, 14.0) FreezeEntityPosition(ped, false) FreezeEntityPosition(vehicle, false) @@ -182,37 +199,40 @@ RegisterNUICallback("wash", function(data) for _, location in ipairs(Locations) do local dist = #(pedcoord - location.Coord) if dist < 20 then - for _, npcData in ipairs(location.Npc['STANDARD']) do + for _, npcData in ipairs(location.Npc['STANDARD']) do for i = 1, 2 do local modelHash = GetHashKey(npcData.model) RequestModel(modelHash) while not HasModelLoaded(modelHash) do Wait(1) end - - npcData.npc = CreatePed(5, modelHash, vehcoord.x, vehcoord.y + 4.5, vehcoord.z, 1, true, true) + + npcData.npc = CreatePed(5, modelHash, vehcoord.x, vehcoord.y + 4.5, vehcoord.z, 1, true, + true) SetEntityInvincible(npcData.npc, true) SetBlockingOfNonTemporaryEvents(npcData.npc, true) - + if done == 0 then prop = CreateObject("prop_blox_spray", 0, 0, 0, true, true, true) - AttachEntityToEntity(prop, npcData.npc, GetPedBoneIndex(npcData.npc, 28422), 0.05, -0.05, -0.05, 260.0, 160.0, 0.0, 1, 1, 0, 1, 0, 1) + AttachEntityToEntity(prop, npcData.npc, GetPedBoneIndex(npcData.npc, 28422), 0.05, + -0.05, -0.05, 260.0, 160.0, 0.0, 1, 1, 0, 1, 0, 1) while not HasAnimDictLoaded(animDict) do Citizen.Wait(100) end - TaskPlayAnim(npcData.npc, animDict, animName, 1.0, -1, -1, 50, 0, 0, 0, 0) - -- Progress(24000, "Spraying cleaning fluid...") + TaskPlayAnim(npcData.npc, animDict, animName, 1.0, -1, -1, 50, 0, 0, 0, 0) + -- Progress(24000, "Spraying cleaning fluid...") local px, py, pz = table.unpack(GetEntityCoords(vehicle)) - local x, y, z = px + GetEntityForwardX(vehicle) * 0.5, py + GetEntityForwardY(vehicle) * 9.9, pz + 2.82 - camCoords = vector3(x, y, z) + local x, y, z = px + GetEntityForwardX(vehicle) * 0.5, + py + GetEntityForwardY(vehicle) * 9.9, pz + 2.82 + camCoords = vector3(x, y, z) local rx = GetEntityRotation(vehicle, 2) camRotation = rx + vector3(-22.0, 0.0, -145) SetCamParams(cam, camCoords, camRotation, GetGameplayCamFov(), 3000) - + SetCamActive(cam, true) - RenderScriptCams(true, true, 5000, true, false) + RenderScriptCams(true, true, 5000, true, false) elseif done == 1 then -- Progress(24000, "Carefully wiping the entire car bodywork") - end - + end + for i = 1, #npcData.steps do local boneIndex = GetEntityBoneIndexByName(vehicle, npcData.steps[i]) local Position = GetWorldPositionOfEntityBone(vehicle, boneIndex) @@ -224,32 +244,34 @@ RegisterNUICallback("wash", function(data) if done == 0 then RequestNamedPtfxAsset(particleDict) while not HasNamedPtfxAssetLoaded(particleDict) do Citizen.Wait(100) end - + UseParticleFxAssetNextCall(particleDict) - particleEffect = StartParticleFxLoopedOnEntity(particleName, prop, 0.2, 0.002, 0.0, 0.0, heading, 160.0, 6.0, false, false, false) + particleEffect = StartParticleFxLoopedOnEntity(particleName, prop, 0.2, 0.002, + 0.0, 0.0, heading, 160.0, 6.0, false, false, false) else TaskStartScenarioInPlace(npcData.npc, "WORLD_HUMAN_MAID_CLEAN", 0, true) end if i == #npcData.steps then local px, py, pz = table.unpack(GetEntityCoords(vehicle)) - local x, y, z = px + GetEntityForwardX(vehicle) * -9.5, py + GetEntityForwardY(vehicle) * -2.9, pz + 2.82 - camCoords = vector3(x, y, z) + local x, y, z = px + GetEntityForwardX(vehicle) * -9.5, + py + GetEntityForwardY(vehicle) * -2.9, pz + 2.82 + camCoords = vector3(x, y, z) local rx = GetEntityRotation(vehicle, 2) camRotation = rx + vector3(-22.0, 0.0, -35) SetCamParams(cam, camCoords, camRotation, GetGameplayCamFov(), 3000) - + SetCamActive(cam, true) - RenderScriptCams(true, true, 5000, true, false) + RenderScriptCams(true, true, 5000, true, false) end Citizen.Wait(1000) local dirtLevel = GetVehicleDirtLevel(vehicle) SetVehicleDirtLevel(vehicle, dirtLevel - 1) - end - TaskWanderStandard(npcData.npc, 10.0, 10) + end + TaskWanderStandard(npcData.npc, 10.0, 10) StopParticleFxLooped(particleName) ClearPedSecondaryTask(npcData.npc) - DeleteEntity(prop) - done = done + 1 + DeleteEntity(prop) + done = done + 1 end SetVehicleDirtLevel(vehicle, 14.0) FreezeEntityPosition(ped, false) @@ -266,48 +288,52 @@ RegisterNUICallback("wash", function(data) for _, location in ipairs(Locations) do local dist = #(pedcoord - location.Coord) if dist < 20 then - for _, npcData in ipairs(location.Npc['STANDARD']) do + for _, npcData in ipairs(location.Npc['STANDARD']) do for i = 1, 3 do local modelHash = GetHashKey(npcData.model) RequestModel(modelHash) while not HasModelLoaded(modelHash) do Wait(1) end - - npcData.npc = CreatePed(5, modelHash, vehcoord.x - 3.4, vehcoord.y + 4.5, vehcoord.z, 1, true, true) + + npcData.npc = CreatePed(5, modelHash, vehcoord.x - 3.4, vehcoord.y + 4.5, vehcoord.z, 1, + true, true) SetEntityInvincible(npcData.npc, true) SetBlockingOfNonTemporaryEvents(npcData.npc, true) - + if done == 0 then prop = CreateObject("prop_blox_spray", 0, 0, 0, true, true, true) - AttachEntityToEntity(prop, npcData.npc, GetPedBoneIndex(npcData.npc, 28422), 0.05, -0.05, -0.05, 260.0, 160.0, 0.0, 1, 1, 0, 1, 0, 1) + AttachEntityToEntity(prop, npcData.npc, GetPedBoneIndex(npcData.npc, 28422), 0.05, + -0.05, -0.05, 260.0, 160.0, 0.0, 1, 1, 0, 1, 0, 1) while not HasAnimDictLoaded(animDict) do Citizen.Wait(100) end - TaskPlayAnim(npcData.npc, animDict, animName, 1.0, -1, -1, 50, 0, 0, 0, 0) + TaskPlayAnim(npcData.npc, animDict, animName, 1.0, -1, -1, 50, 0, 0, 0, 0) local px, py, pz = table.unpack(GetEntityCoords(vehicle)) - local x, y, z = px + GetEntityForwardX(vehicle) * 0.5, py + GetEntityForwardY(vehicle) * 9.9, pz + 2.82 - camCoords = vector3(x, y, z) + local x, y, z = px + GetEntityForwardX(vehicle) * 0.5, + py + GetEntityForwardY(vehicle) * 9.9, pz + 2.82 + camCoords = vector3(x, y, z) local rx = GetEntityRotation(vehicle, 2) camRotation = rx + vector3(-22.0, 0.0, -145) SetCamParams(cam, camCoords, camRotation, GetGameplayCamFov(), 3000) - + SetCamActive(cam, true) - RenderScriptCams(true, true, 5000, true, false) - -- Progress(24000, "Spraying cleaning fluid...") + RenderScriptCams(true, true, 5000, true, false) + -- Progress(24000, "Spraying cleaning fluid...") elseif done == 1 then - -- Progress(24000, "Carefully wiping the entire car bodywork...") + -- Progress(24000, "Carefully wiping the entire car bodywork...") elseif done == 2 then local px, py, pz = table.unpack(GetEntityCoords(vehicle)) - local x, y, z = px + GetEntityForwardX(vehicle) * 0.5, py + GetEntityForwardY(vehicle) * 9.9, pz + 2.82 - camCoords = vector3(x, y, z) + local x, y, z = px + GetEntityForwardX(vehicle) * 0.5, + py + GetEntityForwardY(vehicle) * 9.9, pz + 2.82 + camCoords = vector3(x, y, z) local rx = GetEntityRotation(vehicle, 2) camRotation = rx + vector3(-22.0, 0.0, -145) SetCamParams(cam, camCoords, camRotation, GetGameplayCamFov(), 3000) - + SetCamActive(cam, true) - RenderScriptCams(true, true, 5000, true, false) - -- Progress(50000, "Doing a little dance to charge you more for the premium service...") - end - + RenderScriptCams(true, true, 5000, true, false) + -- Progress(50000, "Doing a little dance to charge you more for the premium service...") + end + for i = 1, #npcData.steps do local boneIndex = GetEntityBoneIndexByName(vehicle, npcData.steps[i]) local Position = GetWorldPositionOfEntityBone(vehicle, boneIndex) @@ -318,37 +344,39 @@ RegisterNUICallback("wash", function(data) local heading = GetEntityHeading(npcData.npc) if i == #npcData.steps then local px, py, pz = table.unpack(GetEntityCoords(vehicle)) - local x, y, z = px + GetEntityForwardX(vehicle) * -9.5, py + GetEntityForwardY(vehicle) * -2.9, pz + 2.82 - camCoords = vector3(x, y, z) + local x, y, z = px + GetEntityForwardX(vehicle) * -9.5, + py + GetEntityForwardY(vehicle) * -2.9, pz + 2.82 + camCoords = vector3(x, y, z) local rx = GetEntityRotation(vehicle, 2) camRotation = rx + vector3(-22.0, 0.0, -35) SetCamParams(cam, camCoords, camRotation, GetGameplayCamFov(), 3000) - + SetCamActive(cam, true) - RenderScriptCams(true, true, 5000, true, false) + RenderScriptCams(true, true, 5000, true, false) end if done == 0 then RequestNamedPtfxAsset(particleDict) while not HasNamedPtfxAssetLoaded(particleDict) do Citizen.Wait(100) end - + UseParticleFxAssetNextCall(particleDict) - particleEffect = StartParticleFxLoopedOnEntity(particleName, prop, 0.2, 0.002, 0.0, 0.0, heading, 160.0, 6.0, false, false, false) + particleEffect = StartParticleFxLoopedOnEntity(particleName, prop, 0.2, 0.002, + 0.0, 0.0, heading, 160.0, 6.0, false, false, false) Citizen.Wait(1000) elseif done == 1 then TaskStartScenarioInPlace(npcData.npc, "WORLD_HUMAN_MAID_CLEAN", 0, true) Citizen.Wait(1000) elseif done == 2 then AnimationInfinite("mini@repair", "fixing_a_player", npcData.npc) - Citizen.Wait(6000) + Citizen.Wait(6000) end local dirtLevel = GetVehicleDirtLevel(vehicle) SetVehicleDirtLevel(vehicle, dirtLevel - 1) - end - TaskWanderStandard(npcData.npc, 10.0, 10) + end + TaskWanderStandard(npcData.npc, 10.0, 10) StopParticleFxLooped(particleName) ClearPedSecondaryTask(npcData.npc) - DeleteEntity(prop) - done = done + 1 + DeleteEntity(prop) + done = done + 1 end FreezeEntityPosition(ped, false) FreezeEntityPosition(vehicle, false) @@ -371,7 +399,6 @@ RegisterNUICallback("wash", function(data) SendNotification("Du har ikke nok penge") end end, Type, price) - end) @@ -386,7 +413,7 @@ setblip = function(name, coords) AddTextComponentSubstringPlayerName(name) EndTextCommandSetBlipName(help) SetBlipRoute(help, true) - SetBlipRouteColour(help,29) + SetBlipRouteColour(help, 29) elseif name == "ends" then ends = AddBlipForCoord(coords[1], coords[2], coords[3]) SetBlipSprite(ends, 1) @@ -397,7 +424,7 @@ setblip = function(name, coords) AddTextComponentSubstringPlayerName(name) EndTextCommandSetBlipName(ends) SetBlipRoute(ends, true) - SetBlipRouteColour(ends,29) + SetBlipRouteColour(ends, 29) end end @@ -406,28 +433,28 @@ function EndCam() RenderScriptCams(false, true, 1000, true, false) DestroyCam(cam, false) - + cam = nil end -function hintToDisplay(text,coords) - local dist = Vdist(coords.x,coords.y,coords.z,GetEntityCoords(PlayerPedId(-1))) +function hintToDisplay(text, coords) + local dist = Vdist(coords.x, coords.y, coords.z, GetEntityCoords(PlayerPedId(-1))) if dist < 1.5 then - DrawText3Ds(coords.x,coords.y,coords.z + 1.05,text, 0, 0.1, 0.1,255) + DrawText3Ds(coords.x, coords.y, coords.z + 1.05, text, 0, 0.1, 0.1, 255) else - DrawText3Ds(coords.x,coords.y,coords.z + 1.05,text, 0, 0.1, 0.1,100) + DrawText3Ds(coords.x, coords.y, coords.z + 1.05, text, 0, 0.1, 0.1, 100) end end function DrawText3Ds(x, y, z, text) - SetTextScale(0.35, 0.35) + SetTextScale(0.35, 0.35) SetTextFont(4) SetTextProportional(1) SetTextColour(255, 255, 255, 215) SetTextEntry("STRING") SetTextCentre(true) AddTextComponentString(text) - SetDrawOrigin(x,y,z, 0) + SetDrawOrigin(x, y, z, 0) DrawText(0.0, 0.0) ClearDrawOrigin() end @@ -437,16 +464,16 @@ AnimationInfinite = function(anim, anim2, jugador) while not HasAnimDictLoaded(anim) do Citizen.Wait(0) end - TaskPlayAnim(jugador, anim , anim2 ,8.0, -8.0, -1, 1, 0, false, false, false ) + TaskPlayAnim(jugador, anim, anim2, 8.0, -8.0, -1, 1, 0, false, false, false) end LoadAnimDict = function(dict) - if not HasAnimDictLoaded(dict) then - RequestAnimDict(dict) - while not HasAnimDictLoaded(dict) do - Wait(1) - end - end + if not HasAnimDictLoaded(dict) then + RequestAnimDict(dict) + while not HasAnimDictLoaded(dict) do + Wait(1) + end + end end SendNotification = function(message) @@ -458,10 +485,9 @@ end -- Progress = function(time, text) -- exports['progressbar']:Progress({ --- time = time, --- text = text, +-- time = time, +-- text = text, -- color = "linear-gradient(20.5deg, #00E4FF 9.83%, rgba(172, 65, 222, 0) 93.95%)", -- color2 = "#00C1FF", -- }) -- end - diff --git a/resources/[custom_script]/Buty-CarWash/config.lua b/resources/[custom_script]/Buty-CarWash/config.lua index 8671247..f47507e 100644 --- a/resources/[custom_script]/Buty-CarWash/config.lua +++ b/resources/[custom_script]/Buty-CarWash/config.lua @@ -1,7 +1,10 @@ Configuration = { FrameWork = "qbcore", -- esx | qbcore + CoreFolderName = "qb-core", + Prices = {500, 1000, 1500}, + } Locations = { @@ -58,7 +61,9 @@ Locations = { }, { Name = "Bilvask", + Coord = vector3(-77.52, 6430.34, 31.04), + Npc = { ['BASIC'] = { { @@ -103,7 +108,9 @@ Locations = { }, { Name = "Bilvask", + Coord = vector3(1345.2, 3600.44, 34.24), + Npc = { ['BASIC'] = { { @@ -148,7 +155,9 @@ Locations = { }, { Name = "Bilvask", + Coord = vector3(-700.27, -947.79, 19.12), + Npc = { ['BASIC'] = { { diff --git a/resources/[custom_script]/Buty-CarWash/fxmanifest.lua b/resources/[custom_script]/Buty-CarWash/fxmanifest.lua index 52a8fe9..73de983 100644 --- a/resources/[custom_script]/Buty-CarWash/fxmanifest.lua +++ b/resources/[custom_script]/Buty-CarWash/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' author 'TreyTrey23' version 'V1.0' diff --git a/resources/[custom_script]/aty_crew/fxmanifest.lua b/resources/[custom_script]/aty_crew/fxmanifest.lua index 4b65404..a9d08c6 100644 --- a/resources/[custom_script]/aty_crew/fxmanifest.lua +++ b/resources/[custom_script]/aty_crew/fxmanifest.lua @@ -1,6 +1,6 @@ game 'gta5' author 'Atiysu & frosty' -fx_version 'cerulean' +fx_version 'adamant' lua54 'yes' shared_scripts { diff --git a/resources/[custom_script]/bbv-travel/fxmanifest.lua b/resources/[custom_script]/bbv-travel/fxmanifest.lua index 204ba56..7647cb2 100644 --- a/resources/[custom_script]/bbv-travel/fxmanifest.lua +++ b/resources/[custom_script]/bbv-travel/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' description 'travel' diff --git a/resources/[custom_script]/boii-chiphack/fxmanifest.lua b/resources/[custom_script]/boii-chiphack/fxmanifest.lua index b1f530b..0d63cf2 100644 --- a/resources/[custom_script]/boii-chiphack/fxmanifest.lua +++ b/resources/[custom_script]/boii-chiphack/fxmanifest.lua @@ -2,7 +2,7 @@ ---- BOII | DEVELOPMENT ---- ---------------------------------- -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' version 'V1.0' diff --git a/resources/[custom_script]/devyn-backitems/fxmanifest.lua b/resources/[custom_script]/devyn-backitems/fxmanifest.lua index 48adf36..9a94108 100644 --- a/resources/[custom_script]/devyn-backitems/fxmanifest.lua +++ b/resources/[custom_script]/devyn-backitems/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5' } version 'V1.0' diff --git a/resources/[custom_script]/generic_texture_renderer_gfx/fxmanifest.lua b/resources/[custom_script]/generic_texture_renderer_gfx/fxmanifest.lua index 404e8e5..5a14752 100644 --- a/resources/[custom_script]/generic_texture_renderer_gfx/fxmanifest.lua +++ b/resources/[custom_script]/generic_texture_renderer_gfx/fxmanifest.lua @@ -1,2 +1,2 @@ -fx_version 'cerulean' +fx_version 'adamant' game "gta5" \ No newline at end of file diff --git a/resources/[custom_script]/jerzys_billing/fxmanifest.lua b/resources/[custom_script]/jerzys_billing/fxmanifest.lua index fe704db..330eec7 100644 --- a/resources/[custom_script]/jerzys_billing/fxmanifest.lua +++ b/resources/[custom_script]/jerzys_billing/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game "gta5" version '1.0.0' diff --git a/resources/[custom_script]/keep-companion/fxmanifest.lua b/resources/[custom_script]/keep-companion/fxmanifest.lua index d7e9f44..b004580 100644 --- a/resources/[custom_script]/keep-companion/fxmanifest.lua +++ b/resources/[custom_script]/keep-companion/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5' } author "Swkeep#7049" diff --git a/resources/[custom_script]/keep-crafting/fxmanifest.lua b/resources/[custom_script]/keep-crafting/fxmanifest.lua index f9120f5..05de351 100644 --- a/resources/[custom_script]/keep-crafting/fxmanifest.lua +++ b/resources/[custom_script]/keep-crafting/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5' } author "Swkeep#7049" diff --git a/resources/[custom_script]/mb-chicken/fxmanifest.lua b/resources/[custom_script]/mb-chicken/fxmanifest.lua index 85acce1..0665d45 100644 --- a/resources/[custom_script]/mb-chicken/fxmanifest.lua +++ b/resources/[custom_script]/mb-chicken/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' client_scripts { diff --git a/resources/[custom_script]/ms-peds/fxmanifest.lua b/resources/[custom_script]/ms-peds/fxmanifest.lua index d5cefb7..b95fe8c 100644 --- a/resources/[custom_script]/ms-peds/fxmanifest.lua +++ b/resources/[custom_script]/ms-peds/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5' } version 'V1.0' diff --git a/resources/[custom_script]/nc-headbag/fxmanifest.lua b/resources/[custom_script]/nc-headbag/fxmanifest.lua index 9f23585..5c8e7f2 100644 --- a/resources/[custom_script]/nc-headbag/fxmanifest.lua +++ b/resources/[custom_script]/nc-headbag/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean'; +fx_version 'adamant'; games {"gta5"}; lua54 "yes"; diff --git a/resources/[custom_script]/okokTextUI/README.md b/resources/[custom_script]/okokTextUI/README.md new file mode 100644 index 0000000..ab96be3 --- /dev/null +++ b/resources/[custom_script]/okokTextUI/README.md @@ -0,0 +1,166 @@ +Hi, thank you for buying my script, I'm very grateful! + +If you need help contact me on discord: okok#3488 +Discord server: https://discord.gg/FauTgGRUku + +# To display a text UI + +exports['okokTextUI']:Open('[Key] Message', 'color', 'position') + +Colors: + - lightblue; + - lightgreen; + - lightred; + - lightgrey; + - darkblue; + - darkgreen; + - darkred; + - darkgrey. + +Positions: + - right; + - left. + +To make the text bold: exports['okokTextUI']:Open('[Key] Message', 'color', 'position') +To insert multiple lines/commands in a text UI: exports['okokTextUI']:Open('[Key] Message 1
[Key] Message 2', 'color', 'position') + +NOTE: 'color' and 'position' should be placed between '' + +# To hide a text UI + +exports['okokTextUI']:Close() + +How to add new colors: + +1. Open styles.css and add the following to the last line. + +/* Example Notification */ + +.example-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f11c"; + color: #color_code; +} + +.example { + background-color: rgba(20, 20, 20, 0.85); + color: #color_code; + padding: 5px 5px 5px 5px; +} + +.example-border { + border-left: 4px solid #color_code; +} + +/* Example */ + +.examplecolor-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #color_code; + font-size: 28px; +} + +.examplecolor { + background-color: rgba(240, 240, 240, 0.85); + color: #fff; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.examplecolor-border { + border-left: 4px solid #color_code; +} + +If you want to set if the background color is light or dark, simply change the background-color on .examplecolor: + - background-color: rgba(240, 240, 240, 1); /* LIGHT BACKGROUND */ + - background-color: rgba(20, 20, 20, 1); /* DARK BACKGROUND */ + + +2. Open scripts.js and add the following to the line 64. + +else if (event.data.color == 'examplecolor') { // Example Color + removeClass(); + $('#main').addClass('examplecolor-icon'); + $('#wrapper').addClass('examplecolor examplecolor-border'); +} + +3. In order to make esx_doorlock functional change the code of the function started in the line 69 (client.lua) and do the following: + +``` +Citizen.CreateThread(function() + local inZone = false + local locked = true + local hasAuth = false + local shown = false + local size, displayText = 1, _U('unlocked') + local color + + while true do + Citizen.Wait(0) + local letSleep = true + inZone = false + for k,v in ipairs(Config.DoorList) do + if v.distanceToPlayer and v.distanceToPlayer < 50 then + letSleep = false + + if v.doors then + for k2,v2 in ipairs(v.doors) do + FreezeEntityPosition(v2.object, v.locked) + end + else + FreezeEntityPosition(v.object, v.locked) + end + end + + if v.distanceToPlayer and v.distanceToPlayer < v.maxDistance then + inZone = true + + + if v.size then + size = v.size + end + if v.locked then + locked = true + else + locked = false + end + if v.isAuthorized then + hasAuth = true + elseif not v.isAuthorized then + hasAuth = false + end + + if IsControlJustReleased(0, 38) then + if v.isAuthorized then + v.locked = not v.locked + locked = v.locked + TriggerServerEvent('esx_doorlock:updateState', k, v.locked) -- broadcast new state of the door to everyone + shown = false + end + end + end + end + + if inZone and not shown then + shown = true + if locked and hasAuth then + exports['okokTextUI']:Open('[E] Locked', 'lightred', 'left') + elseif not locked and hasAuth then + exports['okokTextUI']:Open('[E] Unlocked', 'lightgreen', 'left') + elseif locked then + exports['okokTextUI']:Open('Locked', 'lightred', 'left') + else + exports['okokTextUI']:Open('Unlocked', 'lightgreen', 'left') + end + elseif not inZone and shown then + exports['okokTextUI']:Close() + shown = false + end + + if letSleep then + Citizen.Wait(500) + end + end +end) +``` \ No newline at end of file diff --git a/resources/[custom_script]/okokTextUI/client.lua b/resources/[custom_script]/okokTextUI/client.lua new file mode 100644 index 0000000..3602dce --- /dev/null +++ b/resources/[custom_script]/okokTextUI/client.lua @@ -0,0 +1,24 @@ +function Open(message, color, position) + SendNUIMessage({ + action = 'open', + message = message, + color = color, + position = position, + }) +end + +function Close() + SendNUIMessage({ + action = 'close' + }) +end + +RegisterNetEvent('okokTextUI:Open') +AddEventHandler('okokTextUI:Open', function(message, color, position) + Open(message, color, position) +end) + +RegisterNetEvent('okokTextUI:Close') +AddEventHandler('okokTextUI:Close', function() + Close() +end) \ No newline at end of file diff --git a/resources/[custom_script]/okokTextUI/fxmanifest.lua b/resources/[custom_script]/okokTextUI/fxmanifest.lua new file mode 100644 index 0000000..630ccf3 --- /dev/null +++ b/resources/[custom_script]/okokTextUI/fxmanifest.lua @@ -0,0 +1,20 @@ +fx_version 'adamant' + +game 'gta5' + +author 'okok' -- Discord: okok#3488 +description 'okokTextUI' +version '1.0' + +ui_page 'web/ui.html' + +client_scripts { + 'client.lua', +} + +files { + 'web/*.*' +} + +export 'Open' +export 'Close' \ No newline at end of file diff --git a/resources/[custom_script]/okokTextUI/web/scripts.js b/resources/[custom_script]/okokTextUI/web/scripts.js new file mode 100644 index 0000000..d58d6ac --- /dev/null +++ b/resources/[custom_script]/okokTextUI/web/scripts.js @@ -0,0 +1,90 @@ +played_sound = false +position = '' + +function removeClass() { + $("#main").removeClass(); + $("#wrapper").removeClass(); +} + +window.addEventListener('message', function(event) { + var sound = new Audio('sound.mp3'); + sound.volume = 0.5; + + if (event.data.action == 'open') { + position = event.data.position; + message = event.data.message; + + $('#message').html(message); + + if (position == 'right') { + $('#ui').css('left', ''); + $('#ui').css('right', '1%'); + $('#ui').removeClass('hideright'); + $('#ui').addClass('showright'); + } + if (position == 'left') { + $('#ui').css('right', ''); + $('#ui').css('left', '1%'); + $('#ui').removeClass('hideleft'); + $('#ui').addClass('showleft'); + } + + if (event.data.color == 'lightblue') { // Light Blue + removeClass(); + $('#main').addClass('lightblue-icon'); + $('#wrapper').addClass('lightblue lightblue-border'); + } else if (event.data.color == 'lightgreen') { // Light Green + removeClass(); + $('#main').addClass('lightgreen-icon'); + $('#wrapper').addClass('lightgreen lightgreen-border'); + } else if (event.data.color == 'lightred') { // Light Red + removeClass(); + $('#main').addClass('lightred-icon'); + $('#wrapper').addClass('lightred lightred-border'); + } else if (event.data.color == 'lightgrey') { // Light Red + removeClass(); + $('#main').addClass('lightgrey-icon'); + $('#wrapper').addClass('lightgrey lightgrey-border'); + } else if (event.data.color == 'darkblue') { // Dark Blue + removeClass(); + $('#main').addClass('darkblue-icon'); + $('#wrapper').addClass('darkblue darkblue-border'); + } else if (event.data.color == 'darkgreen') { // Dark Green + removeClass(); + $('#main').addClass('darkgreen-icon'); + $('#wrapper').addClass('darkgreen darkgreen-border'); + } else if (event.data.color == 'darkred') { // Dark Red + removeClass(); + $('#main').addClass('darkred-icon'); + $('#wrapper').addClass('darkred darkred-border'); + } else if (event.data.color == 'darkgrey') { // Dark Grey + removeClass(); + $('#main').addClass('darkgrey-icon'); + $('#wrapper').addClass('darkgrey darkgrey-border'); + } + + if (played_sound == false) { + sound.play(); + played_sound = true; + } + + } else if (event.data.action == 'close') { + + if (position == 'right') { + $('#ui').removeClass('hideleft'); + $('#ui').removeClass('showleft'); + $('#ui').removeClass('showright'); + $('#ui').addClass('hideright'); + } + + if (position == 'left') { + $('#ui').removeClass('hideright'); + $('#ui').removeClass('showright'); + $('#ui').removeClass('showleft'); + $('#ui').addClass('hideleft'); + } + } + + played_sound = false; +}) + diff --git a/resources/[custom_script]/okokTextUI/web/sound.mp3 b/resources/[custom_script]/okokTextUI/web/sound.mp3 new file mode 100644 index 0000000..d079479 Binary files /dev/null and b/resources/[custom_script]/okokTextUI/web/sound.mp3 differ diff --git a/resources/[custom_script]/okokTextUI/web/styles.css b/resources/[custom_script]/okokTextUI/web/styles.css new file mode 100644 index 0000000..6bce2cb --- /dev/null +++ b/resources/[custom_script]/okokTextUI/web/styles.css @@ -0,0 +1,268 @@ +@import url('https://fonts.googleapis.com/css?family=Poppins:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i&subset=devanagari,latin-ext'); + +html, body{ + font-family: 'Poppins', sans-serif; + overflow: hidden; +} + +@keyframes showright { + 0% { + transform: translateX(100%); + } + 40% { + transform: translateX(0%); + } + 80%, 100% { + opacity: 1; + transform: translateX(0px); + } +} + +.showright { + animation: showright 1s ease forwards; +} + +@keyframes hideright { + 0% { + transform: translateX(0px); + } + 40% { + transform: translateX(-5%); + } + 80%, 100% { + opacity: 0; + pointer-events: none; + transform: translateX(100%); + } +} + +.hideright { + animation: hideright 1s ease forwards; +} + +@keyframes showleft { + 0% { + transform: translateX(-100%); + } + 40% { + transform: translateX(0%); + } + 80%, 100% { + opacity: 1; + transform: translateX(0px); + } +} + +.showleft { + animation: showleft 1s ease forwards; +} + +@keyframes hideleft { + 0% { + transform: translateX(0px); + } + 40% { + transform: translateX(5%); + } + 80%, 100% { + opacity: 0; + pointer-events: none; + transform: translateX(-100%); + } +} + +.hideleft { + animation: hideleft 1s ease forwards; +} + + +#ui { + position: absolute; + top: 50%; +} + +#wrapper { + height: auto; + margin-bottom: 10px; + min-width: 275px; + margin: 0 0 8px 0; + border-radius: 10px; +} + +#main { + margin: 12px 16px 12px 56px; + position: relative; +} + +#main::before { + font-size: 24px; + top: calc(50% - 12px); + left: -40px; + line-height: 24px; + position: absolute; +} + +#message { + font-size: 16px; + font-weight: 600; +} + +/* Light Blue */ + +.lightblue-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #234799; + font-size: 28px; +} + +.lightblue { + background-color: rgba(240, 240, 240, 0.85); + color: #234799; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.lightblue-border { + border-left: 4px solid #234799; +} + +/* Light Green */ + +.lightgreen-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #20ab4d; + font-size: 28px; +} + +.lightgreen { + background-color: rgba(240, 240, 240, 0.85); + color: #20ab4d; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.lightgreen-border { + border-left: 4px solid #20ab4d; +} + +/* Light Red */ + +.lightred-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #dc3545; + font-size: 28px; +} + +.lightred { + background-color: rgba(240, 240, 240, 0.85); + color: #dc3545; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.lightred-border { + border-left: 4px solid #dc3545; +} + +/* Light Grey */ + +.lightgrey-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #646464; + font-size: 28px; +} + +.lightgrey { + background-color: rgba(240, 240, 240, 0.85); + color: #646464; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.lightgrey-border { + border-left: 4px solid #646464; +} + +/* Dark Blue */ + +.darkblue-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #2f83ff; + font-size: 28px; +} + +.darkblue { + background-color: rgba(20, 20, 20, 0.85); + color: #fff; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.darkblue-border { + border-left: 4px solid #2f83ff; +} + +/* Dark Green */ + +.darkgreen-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #47cf73; + font-size: 28px; +} + +.darkgreen { + background-color: rgba(20, 20, 20, 0.85); + color: #fff; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.darkgreen-border { + border-left: 4px solid #47cf73; +} + +/* Dark Red */ + +.darkred-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #dc3545; + font-size: 28px; +} + +.darkred { + background-color: rgba(20, 20, 20, 0.85); + color: #fff; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.darkred-border { + border-left: 4px solid #dc3545; +} + +/* Dark Grey */ + +.darkgrey-icon::before { + font-family: "Font Awesome 5 Free"; + content: "\f05a"; + color: #969696; + font-size: 28px; +} + +.darkgrey { + background-color: rgba(20, 20, 20, 0.85); + color: #fff; + padding: 5px 5px 5px 5px; + margin-bottom: 5px; +} + +.darkgrey-border { + border-left: 4px solid #969696; +} \ No newline at end of file diff --git a/resources/[custom_script]/okokTextUI/web/ui.html b/resources/[custom_script]/okokTextUI/web/ui.html new file mode 100644 index 0000000..37162e7 --- /dev/null +++ b/resources/[custom_script]/okokTextUI/web/ui.html @@ -0,0 +1,22 @@ + + + + + + + + + +
+
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/resources/[custom_script]/rcore_arcade/client/class/util.lua b/resources/[custom_script]/rcore_arcade/client/class/util.lua index e397851..7e42b56 100644 --- a/resources/[custom_script]/rcore_arcade/client/class/util.lua +++ b/resources/[custom_script]/rcore_arcade/client/class/util.lua @@ -149,6 +149,15 @@ function createBlip(name, blip, coords, options) BeginTextCommandSetBlipName("STRING") AddTextComponentString(name) EndTextCommandSetBlipName(ourBlip) + + exports['blip_info']:SetBlipInfoTitle(ourBlip, name, 0) + exports['blip_info']:SetBlipInfoImage(ourBlip, "arcade", "arcade") + exports['blip_info']:AddBlipInfoName(ourBlip, "Ejet af", "Staten") + exports['blip_info']:AddBlipInfoName(ourBlip, "Type", "Underholdning") + exports['blip_info']:AddBlipInfoHeader(ourBlip, "") + exports['blip_info']:AddBlipInfoHeader(ourBlip, "") + exports['blip_info']:AddBlipInfoText(ourBlip, "Kan du slå highscoren?") + return ourBlip end diff --git a/resources/[custom_script]/rcore_arcade/fxmanifest.lua b/resources/[custom_script]/rcore_arcade/fxmanifest.lua index 65958d9..b263eb2 100644 --- a/resources/[custom_script]/rcore_arcade/fxmanifest.lua +++ b/resources/[custom_script]/rcore_arcade/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5' } client_scripts { diff --git a/resources/[custom_script]/renzu_motels/fxmanifest.lua b/resources/[custom_script]/renzu_motels/fxmanifest.lua index 2123945..b3b6cb7 100644 --- a/resources/[custom_script]/renzu_motels/fxmanifest.lua +++ b/resources/[custom_script]/renzu_motels/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' lua54 'yes' game 'gta5' shared_scripts { diff --git a/resources/[custom_script]/rz-burgershot/client/main.lua b/resources/[custom_script]/rz-burgershot/client/main.lua index 3cff978..08df107 100644 --- a/resources/[custom_script]/rz-burgershot/client/main.lua +++ b/resources/[custom_script]/rz-burgershot/client/main.lua @@ -1122,7 +1122,7 @@ function BigPacketSell() end Citizen.CreateThread(function() - local blip = AddBlipForCoord(Config.Blip) + local blip = AddBlipForCoord(vector3(-1183.37, -884.14, 13.86)) SetBlipSprite(blip, 106) SetBlipDisplay(blip, 2) SetBlipScale(blip, 0.5) diff --git a/resources/[custom_script]/rz-burgershot/config.lua b/resources/[custom_script]/rz-burgershot/config.lua index 792be38..4b99e96 100644 --- a/resources/[custom_script]/rz-burgershot/config.lua +++ b/resources/[custom_script]/rz-burgershot/config.lua @@ -19,7 +19,6 @@ Config.CoffeeBag = { 'burgershot_coffee', 'burgershot_macaroon' } ---------Burger Shot Job Coords--------- -Config.Blip = vector3(-1183.37, -884.14, 13.86) Config.Duty = vector3(-1194.72, -900.11, 14.50) Config.Tray = vector3(-1193.90, -894.37, 14.0) Config.Tray2 = vector3(-1195.26, -892.42, 14.0) diff --git a/resources/[custom_script]/rz-burgershot/fxmanifest.lua b/resources/[custom_script]/rz-burgershot/fxmanifest.lua index 1e81f5b..97bbe87 100644 --- a/resources/[custom_script]/rz-burgershot/fxmanifest.lua +++ b/resources/[custom_script]/rz-burgershot/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' client_script { diff --git a/resources/[custom_script]/vstancer/fxmanifest.lua b/resources/[custom_script]/vstancer/fxmanifest.lua index de34e41..b0a003b 100644 --- a/resources/[custom_script]/vstancer/fxmanifest.lua +++ b/resources/[custom_script]/vstancer/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5' } --dependency 'MenuAPI' diff --git a/resources/[hp]/hp_carcontrol/fxmanifest.lua b/resources/[hp]/hp_carcontrol/fxmanifest.lua index a022f74..5984feb 100644 --- a/resources/[hp]/hp_carcontrol/fxmanifest.lua +++ b/resources/[hp]/hp_carcontrol/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' diff --git a/resources/[hp]/hp_charcreator/client/client.lua b/resources/[hp]/hp_charcreator/client/client.lua index e0fe6ac..e2a0fc1 100644 --- a/resources/[hp]/hp_charcreator/client/client.lua +++ b/resources/[hp]/hp_charcreator/client/client.lua @@ -394,6 +394,7 @@ function DeleteSkinCam(isCanceled) if Config.TeleportToNewSpawn then SetEntityCoords(PlayerPedId(), Config.afterCreateCharSpawn.x, Config.afterCreateCharSpawn.y, Config.afterCreateCharSpawn.z) SetEntityHeading(PlayerPedId(), Config.afterCreateCharSpawn.w) + TriggerServerEvent("hp_charcreator:server:tp") else SetEntityCoords(PlayerPedId(), lastCoords.x, lastCoords.y, lastCoords.z) SetEntityHeading(PlayerPedId(), lastCoords.w) diff --git a/resources/[hp]/hp_charcreator/config.lua b/resources/[hp]/hp_charcreator/config.lua index 1aba012..0fde750 100644 --- a/resources/[hp]/hp_charcreator/config.lua +++ b/resources/[hp]/hp_charcreator/config.lua @@ -57,8 +57,8 @@ Config.EnableHandsUpButtonUI = true -- Is there to be a button to raise hands on Config.HandsUpKey = 'x' -- Key JS (key.code) - https://www.toptal.com/developers/keycode Config.HandsUpAnimation = {'missminuteman_1ig_2', 'handsup_enter', 50} -Config.TeleportToNewSpawn = false -- whether the player should be teleported to the spawn point or their last location after creating a character -Config.creatingCharacterCoords = vector4(-1238.62, 104.94, 56.00, 159.28) -- this is where the player player will stand during character creation +Config.TeleportToNewSpawn = true -- whether the player should be teleported to the spawn point or their last location after creating a character +Config.creatingCharacterCoords = vector4(-914.48, -440.31, 141.54, 206.64) -- this is where the player player will stand during character creation Config.afterCreateCharSpawn = vector4(-255.93, -983.88, 30.22, 250.85) -- this is where the player will spawn after completing character creation Config.CharacterCreationPedAnimation = {"anim@heists@heist_corona@team_idles@male_a", "idle"} -- animation of the player during character creation diff --git a/resources/[hp]/hp_charcreator/fxmanifest.lua b/resources/[hp]/hp_charcreator/fxmanifest.lua index c67d58d..7744aba 100644 --- a/resources/[hp]/hp_charcreator/fxmanifest.lua +++ b/resources/[hp]/hp_charcreator/fxmanifest.lua @@ -1,6 +1,6 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' lua54 'yes' author 'vames™' diff --git a/resources/[hp]/hp_charcreator/server/server.lua b/resources/[hp]/hp_charcreator/server/server.lua index a3a5a35..c98202e 100644 --- a/resources/[hp]/hp_charcreator/server/server.lua +++ b/resources/[hp]/hp_charcreator/server/server.lua @@ -1,3 +1,5 @@ +local QBCoreF = exports['qb-core']:GetCoreObject() + QBCore = Config.CoreExport() if Config.AdminCommand.Enabled then QBCore.Commands.Add(Config.AdminCommand.Name, Config.AdminCommand.Help, { { @@ -17,3 +19,8 @@ QBCore.Functions.CreateCallback('hp_charcreator:getCurrentSkin', function(source cb(result[1].skin) end end) + +RegisterServerEvent("hp_multichar:playerConnected", function () + local src = source + SetPlayerRoutingBucket(src, 0) +end) \ No newline at end of file diff --git a/resources/[hp]/hp_cleanup/fxmanifest.lua b/resources/[hp]/hp_cleanup/fxmanifest.lua index a02646a..a9b8f98 100644 --- a/resources/[hp]/hp_cleanup/fxmanifest.lua +++ b/resources/[hp]/hp_cleanup/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' --description "Object Cleanup - Hyperion VRP" description "Object Cleanup - Hyperion QBCore" diff --git a/resources/[hp]/hp_explorer/fxmanifest.lua b/resources/[hp]/hp_explorer/fxmanifest.lua index c3343b8..9309ee3 100644 --- a/resources/[hp]/hp_explorer/fxmanifest.lua +++ b/resources/[hp]/hp_explorer/fxmanifest.lua @@ -8,7 +8,7 @@ download "https://github.com/glitchdetector/fivem-explorer" description "Hides stuff from the map until you discover it" -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' client_script 'config.lua' diff --git a/resources/[hp]/hp_fixes/client/blips.lua b/resources/[hp]/hp_fixes/client/blips.lua index 21bb365..7a97363 100644 --- a/resources/[hp]/hp_fixes/client/blips.lua +++ b/resources/[hp]/hp_fixes/client/blips.lua @@ -12,8 +12,10 @@ Citizen.CreateThread(function() SetBlipScale(info.blip, info.scale) SetBlipColour(info.blip, info.colour) SetBlipAsShortRange(info.blip, true) - BeginTextCommandSetBlipName("STRING") + BeginTextCommandSetBlipName("STRING") AddTextComponentString(info.title) EndTextCommandSetBlipName(info.blip) end -end) \ No newline at end of file +end) + +print(GetClockHours()..":"..GetClockMinutes()..":"..GetClockSeconds()) \ No newline at end of file diff --git a/resources/[hp]/hp_fixes/fxmanifest.lua b/resources/[hp]/hp_fixes/fxmanifest.lua index 89f7b2a..c36d3c5 100644 --- a/resources/[hp]/hp_fixes/fxmanifest.lua +++ b/resources/[hp]/hp_fixes/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' description 'Hyperion Fixes / Addons' @@ -11,6 +11,6 @@ client_scripts { 'client/**.lua' } --- server_scripts { --- 'server/**.lua' --- } \ No newline at end of file +server_scripts { + 'server/**.lua' +} \ No newline at end of file diff --git a/resources/[hp]/hp_garage/fxmanifest.lua b/resources/[hp]/hp_garage/fxmanifest.lua new file mode 100644 index 0000000..5f31d03 --- /dev/null +++ b/resources/[hp]/hp_garage/fxmanifest.lua @@ -0,0 +1,4 @@ +fx_version "adamant" +games { 'gta5' } + +this_is_a_map 'yes' diff --git a/resources/[hp]/hp_garage/stream/_manifest.ymf b/resources/[hp]/hp_garage/stream/_manifest.ymf new file mode 100644 index 0000000..66cb213 Binary files /dev/null and b/resources/[hp]/hp_garage/stream/_manifest.ymf differ diff --git a/resources/[hp]/hp_garage/stream/dt1_13_0.ybn b/resources/[hp]/hp_garage/stream/dt1_13_0.ybn new file mode 100644 index 0000000..f465bcc Binary files /dev/null and b/resources/[hp]/hp_garage/stream/dt1_13_0.ybn differ diff --git a/resources/[hp]/hp_garage/stream/dt1_13_build2+hidr.ytd b/resources/[hp]/hp_garage/stream/dt1_13_build2+hidr.ytd new file mode 100644 index 0000000..422e812 Binary files /dev/null and b/resources/[hp]/hp_garage/stream/dt1_13_build2+hidr.ytd differ diff --git a/resources/[hp]/hp_garage/stream/dt1_13_build2.ydr b/resources/[hp]/hp_garage/stream/dt1_13_build2.ydr new file mode 100644 index 0000000..a145e40 Binary files /dev/null and b/resources/[hp]/hp_garage/stream/dt1_13_build2.ydr differ diff --git a/resources/[hp]/hp_garage/stream/map1.ymap b/resources/[hp]/hp_garage/stream/map1.ymap new file mode 100644 index 0000000..ade1aec Binary files /dev/null and b/resources/[hp]/hp_garage/stream/map1.ymap differ diff --git a/resources/[hp]/hp_gv/client/client.lua b/resources/[hp]/hp_gv/client/client.lua index 74e2b02..ffb160d 100644 --- a/resources/[hp]/hp_gv/client/client.lua +++ b/resources/[hp]/hp_gv/client/client.lua @@ -31,7 +31,7 @@ local function ds() end local function spawnTargetMenu(x, y, z, h) - exports['qb-target']:AddBoxZone(currentVan, GetEntityCoords(ped), 1.5, 1.5 , { + exports['qb-target']:AddBoxZone(currentVan, GetEntityCoords(ped), 1.5, 1.5, { name = currentVan, heading = h, minZ = z - 1.0, @@ -44,14 +44,19 @@ local function spawnTargetMenu(x, y, z, h) num = 1, type = "client", icon = "fas fa-gun", - label = Config.Lang.Buy .. - " " .. activeItems[1].label .. " | " .. activeItems[1].price .. Config.Lang.Currency, + label = function() + if activeItems[1].iAmount > 0 then + return activeItems[1].label .. "\n" .. activeItems[1].price .. Config.Lang.Currency .. "\n\n" .. Config.Lang.Buy + else + return Config.Lang.SoldOut + end + end, action = function(entity) if IsPedAPlayer(entity) then return false end TriggerServerEvent('_hp_gv:server:_giveItem', 1) end, - canInteract = function(entity, distance, data) + canInteract = function(entity) if IsPedAPlayer(entity) then return false end return true end, @@ -60,14 +65,19 @@ local function spawnTargetMenu(x, y, z, h) num = 2, type = "client", icon = "fas fa-gun", - label = Config.Lang.Buy .. - " " .. activeItems[2].label .. " | " .. activeItems[2].price .. Config.Lang.Currency, + label = function() + if activeItems[2].iAmount > 0 then + return activeItems[2].label .. "\n" .. activeItems[2].price .. Config.Lang.Currency .. "\n\n" .. Config.Lang.Buy + else + return Config.Lang.SoldOut + end + end, action = function(entity) if IsPedAPlayer(entity) then return false end TriggerServerEvent('_hp_gv:server:_giveItem', 2) end, - canInteract = function(entity, distance, data) + canInteract = function(entity) if IsPedAPlayer(entity) then return false end return true end, @@ -78,10 +88,7 @@ local function spawnTargetMenu(x, y, z, h) end local function spawnProp(car) - local prop = "xm3_prop_xm3_crate_ammo_01a" - local model = GetHashKey(prop) - - object = CreateObject(model, 0, 0, 0, true, true, true) + object = CreateObject(GetHashKey("xm3_prop_xm3_crate_ammo_01a"), 0, 0, 0, true, true, true) AttachEntityToEntity(object, car, -1, 0, 0.0 - 1.2, 0.0 - 0.2, 0, 0, 0, false, false, false, false, 1, true) end @@ -128,12 +135,14 @@ local function addCar(x, y, z, h) Citizen.Wait(100) end - car = CreateVehicle(vehiclehash, x, y, z, h, true, false) + car = CreateVehicle(vehiclehash, x, y, z - 1, h, true, false) + -- Turn on Vehicle + SetVehicleEngineOn(car, true, true, false) SetVehicleOnGroundProperly(car) SetEntityInvincible(car, true) SetVehicleNumberPlateText(car, "GUN00VAN") - SetVehicleDoorsLocked(car, 2) + SetVehicleDoorsLocked(car, 7) SetVehicleDoorOpen(car, 2, true, true) SetVehicleDoorOpen(car, 3, true, true) @@ -146,32 +155,37 @@ local function addCar(x, y, z, h) addNPC(x, y, z) spawnTargetMenu(x, y, z, h) + + Wait(1000) + SoundVehicleHornThisFrame(car) + SetEntityLights(car, true) + Wait(100) + SoundVehicleHornThisFrame(car) + SetEntityLights(car, false) end) end RegisterNetEvent('_hp_gv:client:_spawnVan') -AddEventHandler('_hp_gv:client:_spawnVan', function(van) - activeVan = van - currentVan = "GunVan"..math.random(100000000, 999999999) +AddEventHandler('_hp_gv:client:_spawnVan', function() + activeVan = GlobalState.ActiveVan + currentVan = "GunVan" .. (activeVan*2) + activeItems = GlobalState.ActiveItems - if Config.perVanItems then - activeItems = Config.Gunvans.vehicles[activeVan].items - else - activeItems = Config.VanItems - end - - addCar(Config.Gunvans.vehicles[van].coords['x'], Config.Gunvans.vehicles[van].coords['y'], Config.Gunvans.vehicles[van].coords['z'], Config.Gunvans.vehicles[van].heading) + addCar(Config.Gunvans.vehicles[activeVan].coords['x'], Config.Gunvans.vehicles[activeVan].coords['y'], + Config.Gunvans.vehicles[activeVan].coords['z'], Config.Gunvans.vehicles[activeVan].heading) end) RegisterNetEvent('_hp_gv:client:_destroyVan') -AddEventHandler('_hp_gv:client:_destroyVan', function(van) +AddEventHandler('_hp_gv:client:_destroyVan', function() ds() end) -AddEventHandler('onResourceStop', function(resourceName) - if (GetCurrentResourceName() ~= resourceName) then - return - end - - ds() -end) +if Config.Debug then + AddEventHandler('onResourceStop', function(resourceName) + if (GetCurrentResourceName() ~= resourceName) then + return + end + + ds() + end) +end diff --git a/resources/[hp]/hp_gv/fxmanifest.lua b/resources/[hp]/hp_gv/fxmanifest.lua index 12a592e..2f21ce8 100644 --- a/resources/[hp]/hp_gv/fxmanifest.lua +++ b/resources/[hp]/hp_gv/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' description 'Hyperion Rebooted - Gun Van' diff --git a/resources/[hp]/hp_gv/server/server.lua b/resources/[hp]/hp_gv/server/server.lua index 6be9596..6d3180d 100644 --- a/resources/[hp]/hp_gv/server/server.lua +++ b/resources/[hp]/hp_gv/server/server.lua @@ -1,21 +1,22 @@ QBCore = exports['qb-core']:GetCoreObject() -local ActiveVan = -1 -local ActiveItems = {} -local LastVan = nil -local totalVans = #Config.Gunvans.vehicles - math.randomseed(os.time()) -local function firstLaunch() - if not LastVan then - LastVan = os.time() - end -end -firstLaunch() +GlobalState.ActiveVan = -1 +GlobalState.ActiveItems = {} +GlobalState.LastVan = os.time() +GlobalState.totalVans = #Config.Gunvans.vehicles ---Fordi laver du ActiveItems = Items, så laver den en REFERENCE istedet for at KOPIERE array'et over.... +-- Fordi laver du ActiveItems = Items, så laver den en REFERENCE istedet for at KOPIERE array'et over.... + +-- deepcopy(orig) +-- - Type: **Local function** +-- - Creates a deep copy of a table +-- - **Returns** a new table with the same values as the original +-- +-- **Parameters** +-- - **orig** = The table to copy local function deepcopy(orig) local orig_type = type(orig) local copy @@ -31,71 +32,102 @@ local function deepcopy(orig) return copy end --- #### Spawn Van + +-- Func: **spawnVan()** +-- - Type: **Local function** +-- - Spawns the van and sets the active items local function spawnVan() - if ActiveVan ~= -1 or Config.Debug then - LastVan = os.time() + if GlobalState.ActiveVan ~= -1 or Config.Debug then + GlobalState.LastVan = os.time() if Config.perVanItems then - ActiveItems = deepcopy(Config.Gunvans.vehicles[ActiveVan].items) + GlobalState.ActiveItems = deepcopy(Config.Gunvans.vehicles[GlobalState.ActiveVan].items) else - ActiveItems = deepcopy(Config.VanItems) + GlobalState.ActiveItems = deepcopy(Config.VanItems) end - print("Van spawned at Coordinates: " .. - Config.Gunvans.vehicles[ActiveVan].coords.x .. - " " .. Config.Gunvans.vehicles[ActiveVan].coords.y .. " " .. Config.Gunvans.vehicles[ActiveVan].coords.z) + local time = os.date("%X - %d/%m/%Y", GlobalState.LastVan) - TriggerClientEvent('_hp_gv:client:_spawnVan', -1, ActiveVan) + local x = Config.Gunvans.vehicles[GlobalState.ActiveVan].coords.x + local y = Config.Gunvans.vehicles[GlobalState.ActiveVan].coords.y + local z = Config.Gunvans.vehicles[GlobalState.ActiveVan].coords.z + print("At "..time.." a van spawned at Coordinates: " .. x .. " " .. y .. " " .. z) + + TriggerClientEvent('_hp_gv:client:_spawnVan', -1, GlobalState.ActiveVan) end end --- #### Delete Van + +-- Func: **deleteVan()** +-- - Type: **Local function** +-- - Trigger a countdown to delete the van after a certain amount of time local function deleteVan() Citizen.CreateThread(function() Citizen.Wait(Config.duration * 60000) - ActiveVan = -1 - ActiveItems = {} + GlobalState.ActiveVan = -1 + GlobalState.ActiveItems = {} TriggerClientEvent('_hp_gv:client:_destroyVan', -1) startCountdown() end) end +local function triggerVanSpawn() + GlobalState.ActiveVan = math.random(1, GlobalState.totalVans) + spawnVan() + deleteVan() +end --- #### Start Van countdown + +-- Func: **startCountdown()** +-- - Type: **Local function** +-- - Trigger a countdown to spawn a new van after a certain amount of time function startCountdown() Citizen.CreateThread(function() - Citizen.Wait(Config.minutesBetweenVans * 60000) - ActiveVan = math.random(1, totalVans) - spawnVan() - deleteVan() + Wait(10000) + if Config.SpawnDuringNight then + if GetClockHours() > 20 and GetClockHours() < 5 then + Citizen.Wait(Config.minutesBetweenVans * 60000) + triggerVanSpawn() + end + else + Citizen.Wait(Config.minutesBetweenVans * 60000) + triggerVanSpawn() + end end) - end -startCountdown() +-- startCountdown() --- #### Give Item + +-- GiveItem(src, item) +-- +-- src = Player source +-- +-- item = item index local function GiveItem(src, item) - if ActiveItems[item].iAmount <= 0 then - return Config.NotifyEmpty(src, ActiveItems[item].label) + if GlobalState.ActiveItems[item].iAmount <= 0 then + return Config.NotifyEmpty(src, GlobalState.ActiveItems[item].label) end local Player = QBCore.Functions.GetPlayer(src) - if Player.Functions.GetMoney('cash') < ActiveItems[item].price then - return Config.NotifyNoMoney(src, ActiveItems[item].label) + if Player.Functions.GetMoney('cash') < GlobalState.ActiveItems[item].price then + return Config.NotifyNoMoney(src, GlobalState.ActiveItems[item].label) end - Player.Functions.RemoveMoney('cash', ActiveItems[item].price, 'Gun Van') + Player.Functions.RemoveMoney('cash', GlobalState.ActiveItems[item].price, 'Gun Van') - Config.InventoryExport(src, ActiveItems[item].item, 1) - if ActiveItems[item].weaponType == "pistol" then - Config.InventoryExport(src, "pistol_ammo", ActiveItems[item].aAmount) + Config.InventoryExport(src, GlobalState.ActiveItems[item].item, 1) + + if GlobalState.ActiveItems[item].weaponType == "pistol" then + Config.InventoryExport(src, "pistol_ammo", GlobalState.ActiveItems[item].aAmount) end - if ActiveItems[item].triggerCops then + + if GlobalState.ActiveItems[item].triggerCops then Config.EmergencyTrigger() end - ActiveItems[item].iAmount = ActiveItems[item].iAmount - 1 - Config.Notify(src, ActiveItems[item].label) + + GlobalState.ActiveItems[item].iAmount = GlobalState.ActiveItems[item].iAmount - 1 + + Config.Notify(src, GlobalState.ActiveItems[item].label) end @@ -103,13 +135,13 @@ end if Config.Debug then QBCore.Commands.Add('gv', '', {}, false, function(source, args) TriggerClientEvent('_hp_gv:client:_destroyVan', -1) - ActiveVan = math.random(1, totalVans) + GlobalState.ActiveVan = math.random(1, GlobalState.totalVans) spawnVan() end, Config.Permission) QBCore.Commands.Add('dgv', '', {}, false, function(source, args) - ActiveVan = -1 - ActiveItems = {} + GlobalState.ActiveVan = -1 + GlobalState.ActiveItems = {} TriggerClientEvent('_hp_gv:client:_destroyVan', -1) end, Config.Permission) end @@ -121,7 +153,7 @@ AddEventHandler('_hp_gv:server:_giveItem', function(item) local playerPed = GetPlayerPed(src) local Player = QBCore.Functions.GetPlayer(source) local playerCoords = GetEntityCoords(playerPed) - local targetCoords = Config.Gunvans.vehicles[ActiveVan].coords + local targetCoords = Config.Gunvans.vehicles[GlobalState.ActiveVan].coords if #(playerCoords - targetCoords) > 5.5 then Config.LogHandler(Player.PlayerData.citizenid .. " " .. Config.Lang.OutsideRange) @@ -135,13 +167,11 @@ AddEventHandler('_hp_gv:server:_giveItem', function(item) return end - if ActiveVan ~= -1 or Config.Debug then + if GlobalState.ActiveVan ~= -1 or Config.Debug then GiveItem(src, item) else Config.LogHandler("GunVan | " .. Player.PlayerData.citizenid .. " " .. Config.Lang.OutsideBuyHours) - Config.LogHandler("GunVan | " .. - Config.Lang.TimeUntilNext .. - " " .. Config.minutesBetweenVans * 60 - (os.time() - LastVan) .. " " .. Config.Lang.Seconds) + Config.LogHandler("GunVan | " .. Config.Lang.TimeUntilNext .. " " .. Config.minutesBetweenVans * 60 - (os.time() - GlobalState.LastVan) .. " " .. Config.Lang.Seconds) return end end) diff --git a/resources/[hp]/hp_gv/shared/config.lua b/resources/[hp]/hp_gv/shared/config.lua index cb7bbdb..357caa5 100644 --- a/resources/[hp]/hp_gv/shared/config.lua +++ b/resources/[hp]/hp_gv/shared/config.lua @@ -9,6 +9,8 @@ Config.Debug = false -- If false, the resource will not spawn a Gun Van on resource-start. -- You'll have to wait until the server triggers a Gun Van spawn. +Config.SpawnDuringNight = true -- If true, the Gun Van will only be able to spawn during the night (8PM-5AM in-game timecycle). If false, it can spawn during the entire day. + Config.minutesBetweenVans = 180 -- This is the time between each Gun Van spawn. This is in minutes. Config.duration = 10 -- This is in minutes. This is the duration of the Gun Van event. After this time, the Gun Van will despawn. @@ -20,9 +22,10 @@ Config.duration = 10 -- This is in minutes. This is the duration of the Gun Van -- Recommended to keep true, to avoid players from cheating and buying items from a distance. Config.DropPlayer = false --- Permission for using the Gun Van commands. +-- Permission level for using the Gun Van commands. Config.Permission = "admin" +-- Server-side function. -- Function to trigger the emergency event. -- This is triggered, if "triggerCops" is set to true for the specific item. Config.EmergencyTrigger = function() @@ -35,18 +38,22 @@ Config.LogHandler = function(msg) print(msg) end +-- Server-side function. Config.NotifyEmpty = function(src, item) TriggerClientEvent('HudNotification', src, 'error', 'Gun Van', item.."? Jeg er sgu løbet tør makker....") end +-- Server-side function. Config.NotifyNoMoney = function(src, item) TriggerClientEvent('HudNotification', src, 'error', 'Gun Van', "Du har ikke råd til at købe en "..item..".") end +-- Server-side function. Config.Notify = function(src, item) TriggerClientEvent('HudNotification', src, 'success', 'Gun Van', 'Du købte en '..item) end +-- Client-side function. Config.InventoryExport = function(src, item, amount) -- Change this to your inventory system. exports['ps-inventory']:AddItem(src, item, amount, false, { serie = "722"..tostring(QBCore.Shared.RandomStr(2) .. QBCore.Shared.RandomInt(1) .. "GV" .. QBCore.Shared.RandomInt(3) .. QBCore.Shared.RandomStr(4))}) end @@ -152,401 +159,401 @@ Config.Gunvans = { } } }, - { - coords = vector3(-1269.17, -2661.21, 13.94), - heading = 329.6, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-1018.11, -2193.89, 8.98), - heading = 352.8, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-559.84, -1799.59, 22.61), - heading = 153.56, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-559.6, -1681.66, 19.31), - heading = 350.13, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-1083.81, -1671.52, 4.7), - heading = 126.03, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-1155.1, -1564.93, 4.43), - heading = 168.59, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-659.96, -735.03, 31.27), - heading = 327.81, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-1265.44, -820.3, 17.1), - heading = 252.0, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-2021.38, -362.03, 44.11), - heading = 208.51, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-1601.67, 3093.5, 32.57), - heading = 323.71, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-2166.33, 4284.34, 48.96), - heading = 332.96, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-598.55, 5349.68, 70.47), - heading = 7.98, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-678.79, 5797.2, 17.33), - heading = 64.67, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(-176.42, 6405.17, 31.86), - heading = 225.81, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(1539.5, 6335.8, 23.81), - heading = 241.77, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(2195.82, 5609.29, 53.33), - heading = 166.43, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(1969.08, 5178.88, 47.6), - heading = 334.39, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, - { - coords = vector3(1296.1, 4331.41, 38.24), - heading = 84.15, - items = { - { - label = "Pistol", -- Label of the item - item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua - weaponType = "pistol", -- Only used for ammo. Specify the type of gun. - iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? - aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. - price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. - triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger - }, - { - label = "Foldekniv", - item = "weapon_switchblade", - iAmount = 1, - price = 5000, - triggerCops = false - } - } - }, + -- { + -- coords = vector3(-1269.17, -2661.21, 13.94), + -- heading = 329.6, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-1018.11, -2193.89, 8.98), + -- heading = 352.8, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-559.84, -1799.59, 22.61), + -- heading = 153.56, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-559.6, -1681.66, 19.31), + -- heading = 350.13, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-1083.81, -1671.52, 4.7), + -- heading = 126.03, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-1155.1, -1564.93, 4.43), + -- heading = 168.59, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-659.96, -735.03, 31.27), + -- heading = 327.81, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-1265.44, -820.3, 17.1), + -- heading = 252.0, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-2021.38, -362.03, 44.11), + -- heading = 208.51, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-1601.67, 3093.5, 32.57), + -- heading = 323.71, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-2166.33, 4284.34, 48.96), + -- heading = 332.96, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-598.55, 5349.68, 70.47), + -- heading = 7.98, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-678.79, 5797.2, 17.33), + -- heading = 64.67, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(-176.42, 6405.17, 31.86), + -- heading = 225.81, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(1539.5, 6335.8, 23.81), + -- heading = 241.77, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(2195.82, 5609.29, 53.33), + -- heading = 166.43, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(1969.08, 5178.88, 47.6), + -- heading = 334.39, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, + -- { + -- coords = vector3(1296.1, 4331.41, 38.24), + -- heading = 84.15, + -- items = { + -- { + -- label = "Pistol", -- Label of the item + -- item = "weapon_pistol", -- Name of the item from QBCore/Shared/Items.lua + -- weaponType = "pistol", -- Only used for ammo. Specify the type of gun. + -- iAmount = 1, -- The amount of the item that the gunvan will have in stock. Should never be 0, for obvious reasons? + -- aAmount = math.random(1,4), -- The amount of ammo that the gunvan will give to the player on purchase, if you don't want to give ammo, remove this line. + -- price = 35000, -- The price of the item. Don't remove this, just set it to 0 if you want it to be free. + -- triggerCops = true -- If cops should be alerted about a suspicious activity. If not set, it won't trigger Config.EmergencyTrigger + -- }, + -- { + -- label = "Foldekniv", + -- item = "weapon_switchblade", + -- iAmount = 1, + -- price = 5000, + -- triggerCops = false + -- } + -- } + -- }, } } \ No newline at end of file diff --git a/resources/[hp]/hp_hud/assets/css/app.css b/resources/[hp]/hp_hud/assets/css/app.css index 6bfdd42..4460ef4 100644 --- a/resources/[hp]/hp_hud/assets/css/app.css +++ b/resources/[hp]/hp_hud/assets/css/app.css @@ -1760,11 +1760,13 @@ html { height: 30rem; width: 30rem; left: 100rem; - top: 33rem; + top: 22rem; overflow-y: auto; animation-name: zoomInRight; animation-duration: 1s; animation-fill-mode: both; + -webkit-mask-image: linear-gradient(180deg, #000 90%, transparent 100%); + mask-image: linear-gradient(180deg, #000 90%, transparent 100%); } .notification .border { position: relative; diff --git a/resources/[hp]/hp_hud/assets/css/app.scss b/resources/[hp]/hp_hud/assets/css/app.scss index cf10cbc..76eba67 100644 --- a/resources/[hp]/hp_hud/assets/css/app.scss +++ b/resources/[hp]/hp_hud/assets/css/app.scss @@ -2320,7 +2320,7 @@ html { height: 30rem; width: 30rem; left: 100rem; - top: 33rem; + top: 22rem; overflow-y: auto; -webkit-animation-name: zoomInRight; animation-name: zoomInRight; @@ -2328,6 +2328,8 @@ html { animation-duration: 1s; -webkit-animation-fill-mode: both; animation-fill-mode: both; + -webkit-mask-image: linear-gradient(180deg, #000 90%, transparent 100%); + mask-image: linear-gradient(180deg, #000 90%, transparent 100%); .border { position: relative; diff --git a/resources/[hp]/hp_hud/fxmanifest.lua b/resources/[hp]/hp_hud/fxmanifest.lua index 737110e..1808e6a 100644 --- a/resources/[hp]/hp_hud/fxmanifest.lua +++ b/resources/[hp]/hp_hud/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' version '1.0.0' diff --git a/resources/[hp]/hp_jobblips/fxmanifest.lua b/resources/[hp]/hp_jobblips/fxmanifest.lua index 978b2b7..337f5d5 100644 --- a/resources/[hp]/hp_jobblips/fxmanifest.lua +++ b/resources/[hp]/hp_jobblips/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' lua54 "yes" game "gta5" diff --git a/resources/[hp]/hp_loading/fxmanifest.lua b/resources/[hp]/hp_loading/fxmanifest.lua index c7ef025..c0718ad 100644 --- a/resources/[hp]/hp_loading/fxmanifest.lua +++ b/resources/[hp]/hp_loading/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' lua54 'yes' version '1.0' diff --git a/resources/[hp]/hp_loading/html/index.html b/resources/[hp]/hp_loading/html/index.html index e112af4..62b7f06 100644 --- a/resources/[hp]/hp_loading/html/index.html +++ b/resources/[hp]/hp_loading/html/index.html @@ -136,13 +136,10 @@ + diff --git a/resources/[standalone]/oxmysql/dist/build.js b/resources/[standalone]/oxmysql/dist/build.js index 83ae750..dbdc85c 100644 --- a/resources/[standalone]/oxmysql/dist/build.js +++ b/resources/[standalone]/oxmysql/dist/build.js @@ -11444,12 +11444,12 @@ var require_packet = __commonJS({ return this.buffer.slice(this.start, this.end); } dump() { - console.log( - [this.buffer.asciiSlice(this.start, this.end)], - this.buffer.slice(this.start, this.end), - this.length(), - this.sequenceId - ); + // console.log( + // [this.buffer.asciiSlice(this.start, this.end)], + // this.buffer.slice(this.start, this.end), + // this.length(), + // this.sequenceId + // ); } haveMoreData() { return this.end > this.offset; @@ -15125,11 +15125,11 @@ var require_client_handshake = __commonJS({ } sendCredentials(connection) { if (connection.config.debug) { - console.log( - "Sending handshake packet: flags:%d=(%s)", - this.clientFlags, - flagNames(this.clientFlags).join(", ") - ); + // console.log( + // "Sending handshake packet: flags:%d=(%s)", + // this.clientFlags, + // flagNames(this.clientFlags).join(", ") + // ); } this.user = connection.config.user; this.password = connection.config.password; @@ -15179,11 +15179,11 @@ var require_client_handshake = __commonJS({ }); this.handshake = Packets.Handshake.fromPacket(helloPacket); if (connection.config.debug) { - console.log( - "Server hello packet: capability flags:%d=(%s)", - this.handshake.capabilityFlags, - flagNames(this.handshake.capabilityFlags).join(", ") - ); + // console.log( + // "Server hello packet: capability flags:%d=(%s)", + // this.handshake.capabilityFlags, + // flagNames(this.handshake.capabilityFlags).join(", ") + // ); } connection.serverCapabilityFlags = this.handshake.capabilityFlags; connection.serverEncoding = CharsetToEncoding[this.handshake.characterSet]; @@ -15418,7 +15418,7 @@ var require_server_handshake = __commonJS({ if (connection.listeners("packet").length) { connection.emit("packet", packet.clone(), knownCommand, commandCode); } else if (!knownCommand) { - console.log("Unknown command:", commandCode); + // console.log("Unknown command:", commandCode); } return _ServerHandshake.prototype.dispatchCommands; } @@ -15768,19 +15768,15 @@ var require_helpers = __commonJS({ } catch (err) { highlightFn = /* @__PURE__ */ __name((text) => { if (!cardinalRecommended) { - console.log("For nicer debug output consider install cardinal@^2.0.0"); + // console.log("For nicer debug output consider install cardinal@^2.0.0"); cardinalRecommended = true; } return text; }, "highlightFn"); } function printDebugWithCode(msg, code) { - console.log(` - -${msg}: -`); - console.log(`${highlightFn(code)} -`); + // console.log(`${msg}:`); + // console.log(`${highlightFn(code)}`); } __name(printDebugWithCode, "printDebugWithCode"); exports2.printDebugWithCode = printDebugWithCode; @@ -16234,13 +16230,13 @@ var require_query2 = __commonJS({ } then() { const err = "You have tried to call .then(), .catch(), or invoked await on the result of query that is not a promise, which is a programming error. Try calling con.promise().query(), or require('mysql2/promise') instead of 'mysql2' for a promise-compatible version of the query interface. To learn how to use async/await or Promises check out documentation at https://www.npmjs.com/package/mysql2#using-promise-wrapper, or the mysql2 documentation at https://github.com/sidorares/node-mysql2/tree/master/documentation/en/Promise-Wrapper.md"; - console.log(err); + // console.log(err); throw new Error(err); } /* eslint no-unused-vars: ["error", { "argsIgnorePattern": "^_" }] */ start(_packet, connection) { if (connection.config.debug) { - console.log(" Sending query command: %s", this.sql); + // console.log("Sending query command: %s", this.sql); } this._connection = connection; this.options = Object.assign({}, connection.config, this._queryOptions); @@ -16305,9 +16301,7 @@ var require_query2 = __commonJS({ const rs = new Packets.ResultSetHeader(packet, connection); this._fieldCount = rs.fieldCount; if (connection.config.debug) { - console.log( - ` Resultset header received, expecting ${rs.fieldCount} column definition packets` - ); + // console.log(`Resultset header received, expecting ${rs.fieldCount} column definition packets`); } if (this._fieldCount === 0) { return this.doneInsert(rs); @@ -16379,10 +16373,10 @@ var require_query2 = __commonJS({ ); this._fields[this._resultIndex].push(field); if (connection.config.debug) { - console.log(" Column definition:"); - console.log(` name: ${field.name}`); - console.log(` type: ${field.columnType}`); - console.log(` flags: ${field.flags}`); + // console.log(" Column definition:"); + // console.log(` name: ${field.name}`); + // console.log(` type: ${field.columnType}`); + // console.log(` flags: ${field.flags}`); } } if (this._receivedFieldsCount === this._fieldCount) { @@ -17934,23 +17928,23 @@ var require_connection = __commonJS({ if (length < MAX_PACKET_LENGTH) { packet.writeHeader(this.sequenceId); if (this.config.debug) { - console.log( - `${this._internalId} ${this.connectionId} <== ${this._command._commandName}#${this._command.stateName()}(${[this.sequenceId, packet._name, packet.length()].join(",")})` - ); - console.log( - `${this._internalId} ${this.connectionId} <== ${packet.buffer.toString("hex")}` - ); + // console.log( + // `${this._internalId} ${this.connectionId} <== ${this._command._commandName}#${this._command.stateName()}(${[this.sequenceId, packet._name, packet.length()].join(",")})` + // ); + // console.log( + // `${this._internalId} ${this.connectionId} <== ${packet.buffer.toString("hex")}` + // ); } this._bumpSequenceId(1); this.write(packet.buffer); } else { if (this.config.debug) { - console.log( - `${this._internalId} ${this.connectionId} <== Writing large packet, raw content not written:` - ); - console.log( - `${this._internalId} ${this.connectionId} <== ${this._command._commandName}#${this._command.stateName()}(${[this.sequenceId, packet._name, packet.length()].join(",")})` - ); + // console.log( + // `${this._internalId} ${this.connectionId} <== Writing large packet, raw content not written:` + // ); + // console.log( + // `${this._internalId} ${this.connectionId} <== ${this._command._commandName}#${this._command.stateName()}(${[this.sequenceId, packet._name, packet.length()].join(",")})` + // ); } for (offset = 4; offset < 4 + length; offset += MAX_PACKET_LENGTH) { chunk = packet.buffer.slice(offset, offset + MAX_PACKET_LENGTH); @@ -17973,7 +17967,7 @@ var require_connection = __commonJS({ // 0.11+ environment startTLS(onSecure) { if (this.config.debug) { - console.log("Upgrading connection to TLS"); + // console.log("Upgrading connection to TLS"); } const secureContext = Tls.createSecureContext({ ca: this.config.ssl.ca, @@ -18041,15 +18035,15 @@ var require_connection = __commonJS({ } if (this.config.debug) { if (packet) { - console.log( - ` raw: ${packet.buffer.slice(packet.offset, packet.offset + packet.length()).toString("hex")}` - ); + // console.log( + // ` raw: ${packet.buffer.slice(packet.offset, packet.offset + packet.length()).toString("hex")}` + // ); console.trace(); const commandName = this._command ? this._command._commandName : "(no command)"; const stateName = this._command ? this._command.stateName() : "(no command)"; - console.log( - `${this._internalId} ${this.connectionId} ==> ${commandName}#${stateName}(${[packet.sequenceId, packet.type(), packet.length()].join(",")})` - ); + // console.log( + // `${this._internalId} ${this.connectionId} ==> ${commandName}#${stateName}(${[packet.sequenceId, packet.type(), packet.length()].join(",")})` + // ); } } if (!this._command) { @@ -18099,7 +18093,7 @@ var require_connection = __commonJS({ addCommand(cmd) { if (this.config.debug) { const commandName = cmd.constructor.name; - console.log(`Add command: ${commandName}`); + // console.log(`Add command: ${commandName}`); cmd._commandName = commandName; } if (!this._command) { @@ -26089,7 +26083,7 @@ var connectionOptions = (() => { try { options[key] = JSON.parse(value); } catch (err) { - console.log(`^3Failed to parse property ${key} in configuration (${err})!^0`); + // console.log(`^3Failed to parse property ${key} in configuration (${err})!^0`); } } } @@ -26314,10 +26308,7 @@ __name(profileBatchStatements, "profileBatchStatements"); var logStorage = {}; var logQuery = /* @__PURE__ */ __name((invokingResource, query, executionTime, parameters) => { if (executionTime >= mysql_slow_query_warning || mysql_debug && (!Array.isArray(mysql_debug) || mysql_debug.includes(invokingResource))) { - console.log( - `${dbVersion} ^3${invokingResource} took ${executionTime.toFixed(4)}ms to execute a query! -${query}${parameters ? ` ${JSON.stringify(parameters)}` : ""}^0` - ); + // console.log(`${dbVersion} ^3${invokingResource} took ${executionTime.toFixed(4)}ms to execute a query! ${query}${parameters ? ` ${JSON.stringify(parameters)}` : ""}^0`); } if (!mysql_ui) return; @@ -26338,7 +26329,7 @@ RegisterCommand( if (!mysql_ui) return; if (source2 < 1) { - console.log("^3This command cannot run server side^0"); + // console.log("^3This command cannot run server side^0"); return; } let totalQueries = 0; @@ -26440,7 +26431,7 @@ var rawQuery = /* @__PURE__ */ __name(async (type, invokingResource, query, para if (typeof err === "string") { if (err.includes("SCRIPT ERROR:")) return console.log(err); - console.log(`^1SCRIPT ERROR in invoking resource ${invokingResource}: ${err}^0`); + // console.log(`^1SCRIPT ERROR in invoking resource ${invokingResource}: ${err}^0`); } } } catch (err) { @@ -26562,7 +26553,7 @@ var rawExecute = /* @__PURE__ */ __name(async (invokingResource, query, paramete if (typeof err === "string") { if (err.includes("SCRIPT ERROR:")) return console.log(err); - console.log(`^1SCRIPT ERROR in invoking resource ${invokingResource}: ${err}^0`); + // console.log(`^1SCRIPT ERROR in invoking resource ${invokingResource}: ${err}^0`); } } } catch (err) { @@ -26659,7 +26650,7 @@ ${err.message}`; if (typeof err === "string") { if (err.includes("SCRIPT ERROR:")) return console.log(err); - console.log(`^1SCRIPT ERROR in invoking resource ${invokingResource}: ${err}^0`); + // console.log(`^1SCRIPT ERROR in invoking resource ${invokingResource}: ${err}^0`); } } }, "rawTransaction"); diff --git a/resources/[standalone]/oxmysql/fxmanifest.lua b/resources/[standalone]/oxmysql/fxmanifest.lua index cf0d4c5..ed83f44 100644 --- a/resources/[standalone]/oxmysql/fxmanifest.lua +++ b/resources/[standalone]/oxmysql/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'common' use_experimental_fxv2_oal 'yes' lua54 'yes' diff --git a/resources/[standalone]/polyzonehelper/fxmanifest.lua b/resources/[standalone]/polyzonehelper/fxmanifest.lua index fad388c..db5a605 100644 --- a/resources/[standalone]/polyzonehelper/fxmanifest.lua +++ b/resources/[standalone]/polyzonehelper/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5' } description 'Polyzone Helper' diff --git a/resources/[standalone]/progressbar/fxmanifest.lua b/resources/[standalone]/progressbar/fxmanifest.lua index 25323e5..0a87619 100644 --- a/resources/[standalone]/progressbar/fxmanifest.lua +++ b/resources/[standalone]/progressbar/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' description 'progressbar' diff --git a/resources/[standalone]/rpc/fxmanifest.lua b/resources/[standalone]/rpc/fxmanifest.lua index 29ed573..8261b78 100644 --- a/resources/[standalone]/rpc/fxmanifest.lua +++ b/resources/[standalone]/rpc/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' client_scripts { diff --git a/resources/[standalone]/rprogress/fxmanifest.lua b/resources/[standalone]/rprogress/fxmanifest.lua index 4d9f03c..0322fde 100644 --- a/resources/[standalone]/rprogress/fxmanifest.lua +++ b/resources/[standalone]/rprogress/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' description 'Radial Progress' diff --git a/resources/[standalone]/safecracker/fxmanifest.lua b/resources/[standalone]/safecracker/fxmanifest.lua index e8e263c..55a1d9c 100644 --- a/resources/[standalone]/safecracker/fxmanifest.lua +++ b/resources/[standalone]/safecracker/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' description 'Safecracker Minigame' diff --git a/resources/[standalone]/showcar/__resource.lua b/resources/[standalone]/showcar/__resource.lua new file mode 100644 index 0000000..5b1d52e --- /dev/null +++ b/resources/[standalone]/showcar/__resource.lua @@ -0,0 +1,10 @@ +resource_manifest_version "44febabe-d386-4d18-afbe-5e627f4af937" + +description "showcar" + +client_scripts { + "main.lua", + "config.lua" +} + +--作者DC 中汁龍#7777 \ No newline at end of file diff --git a/resources/[standalone]/showcar/fxmanifest.lua b/resources/[standalone]/showcar/fxmanifest.lua index a6e84f6..abca852 100644 --- a/resources/[standalone]/showcar/fxmanifest.lua +++ b/resources/[standalone]/showcar/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game "gta5" description "showcar" diff --git a/resources/[standalone]/vehcar/fxmanifest.lua b/resources/[standalone]/vehcar/fxmanifest.lua index 33ca89e..32a76ea 100644 --- a/resources/[standalone]/vehcar/fxmanifest.lua +++ b/resources/[standalone]/vehcar/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game "gta5" client_script('client/client.lua') diff --git a/resources/[standalone]/wk_wars2x/cl_utils.lua b/resources/[standalone]/wk_wars2x/cl_utils.lua index 7d358a9..5cec538 100644 --- a/resources/[standalone]/wk_wars2x/cl_utils.lua +++ b/resources/[standalone]/wk_wars2x/cl_utils.lua @@ -132,7 +132,7 @@ end -- Prints the given message to the client console function UTIL:Log( msg ) - -- print( "[Wraith ARS 2X]: " .. msg ) + print( "[Wraith ARS 2X]: " .. msg ) end -- Used to draw text to the screen, helpful for debugging issues diff --git a/resources/[standalone]/wk_wars2x/fxmanifest.lua b/resources/[standalone]/wk_wars2x/fxmanifest.lua index 13993a4..d516815 100644 --- a/resources/[standalone]/wk_wars2x/fxmanifest.lua +++ b/resources/[standalone]/wk_wars2x/fxmanifest.lua @@ -31,7 +31,7 @@ ---------------------------------------------------------------------------------------]]-- -- Define the FX Server version and game type -fx_version 'cerulean' +fx_version 'adamant' game "gta5" -- Define the resource metadata diff --git a/resources/[standalone]/xsound/fxmanifest.lua b/resources/[standalone]/xsound/fxmanifest.lua index 53ebf8d..01e696b 100644 --- a/resources/[standalone]/xsound/fxmanifest.lua +++ b/resources/[standalone]/xsound/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' games { 'gta5', 'rdr3' } rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' diff --git a/resources/[voice]/pma-voice/fxmanifest.lua b/resources/[voice]/pma-voice/fxmanifest.lua index 073bb0f..84f42a5 100644 --- a/resources/[voice]/pma-voice/fxmanifest.lua +++ b/resources/[voice]/pma-voice/fxmanifest.lua @@ -1,6 +1,6 @@ game 'common' -fx_version 'cerulean' +fx_version 'adamant' author 'AvarianKnight' description 'VOIP built using FiveM\'s built in mumble.' diff --git a/resources/[voice]/qb-radio/fxmanifest.lua b/resources/[voice]/qb-radio/fxmanifest.lua index 3691285..728b60b 100644 --- a/resources/[voice]/qb-radio/fxmanifest.lua +++ b/resources/[voice]/qb-radio/fxmanifest.lua @@ -1,4 +1,4 @@ -fx_version 'cerulean' +fx_version 'adamant' game 'gta5' description 'QB-Radio'