Merge branch 'master-ayu' into loadouts-change

Author: Jason2605

.github/CONTRIBUTING.md

@@ -5,7 +5,7 @@ Contributing to AsYetUntitled
 
 ## Guidelines
 
-1. **Don't break the build**: We have a simple continuous integration system setup with [Travis](https://travis-ci.org/AsYetUntitled/Framework). If your pull request does not pass then it will not be merged. Travis will only check your changes after you submit a pull request. 
+1. **Don't break the build**: We have a simple continuous integration system setup with [GitHub Actions](https://github.com/AsYetUntitled/Framework/actions). If your pull request does not pass then it will not be merged. GitHub Actions will only check your changes after you submit a pull request. 
 2. **Search before posting**: It is likely that what you have to say has already been said. Use the search function to see if someone else has already made a similar issue or pull request. 
 3. **Test, test, and test**: Test your changes thoroughly prior to submitting a pull request. If you were unable to test your changes then ask if someone else can test them for you in your pull request message. Take it a step further and test another person's pull request and report your result to them. 
 4. **Bug fixes over features**: New features may be cool, but ideally bug fixes and optimisations for existing features should be prioritised above implementing new features. 

.github/workflows/validate.yml

@@ -0,0 +1,25 @@
+name: Validation
+
+on:
+  push:
+    branches:
+    - 'master'
+    - 'v5.X.X'
+  pull_request:
+    branches:
+    - 'master'
+    - 'v5.X.X'
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+      with:
+        python-version: '3.6.10'
+    - name: Validate SQF
+      run: python ./tools/sqf_validator.py
+    - name: Validate Configs
+      run: python ./tools/config_style_checker.py

.travis.yml

@@ -0,0 +1,352 @@
+[Default]
+
+Version = 1
+;; Used incase there is ever a breaking change, or to inform user in log about a new feature.
+
+Strip Chars = ";[]"
+;; List of characters to strip out
+Strip Chars Mode = 0
+;; 0 = Strip Bad Chars, 1 = Strip + Log Bad Chars, 2 = Return Error & Log Bad Chars
+;;     Note: Logging on works when sending data to database.
+
+Input SQF Parser = false
+;; Expermential
+;;   If enabled will use SQF Array Parser instead of : seperator for values
+;;   i.e   0:SQL:UpdatePlayer:["Joe",[1,2,0],0.22333,"PlayerBackpack",-3]
+;;   Advantage is that you don't need to strip : seperator from user inputted values
+
+[resetLifeVehicles]
+SQL1_1 = CALL resetLifeVehicles
+
+[deleteOldHouses]
+SQL1_1 = CALL deleteOldHouses
+
+[deleteDeadVehicles]
+SQL1_1 = CALL deleteDeadVehicles
+
+[deleteOldGangs]
+SQL1_1 = CALL deleteOldGangs
+
+[deleteOldContainers]
+SQL1_1 = CALL deleteOldContainers
+
+
+
+[checkPlayerExists]
+SQL1_1 = SELECT pid, name FROM players WHERE pid = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2-STRING
+
+[selectName]
+SQL1_1 = SELECT name FROM players WHERE pid = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING
+
+[insertNewPlayer]
+SQL1_1 = INSERT INTO players (pid, name, cash, bankacc, aliases, cop_licenses, med_licenses, civ_licenses, civ_gear, cop_gear, med_gear) VALUES (?, ?, ?, ?, ?,'[]','[]','[]','[]','[]','[]')
+SQL1_INPUTS = 1, 2, 3, 4, 5
+
+[selectWest]
+SQL1_1 = SELECT pid, name, cash, bankacc, adminlevel, donorlevel, cop_licenses, coplevel, cop_gear, blacklist, cop_stats, playtime FROM players WHERE pid = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2-STRING, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
+
+[selectCiv]
+SQL1_1 = SELECT pid, name, cash, bankacc, adminlevel, donorlevel, civ_licenses, arrested, civ_gear, civ_stats, civ_alive, civ_position, playtime FROM players WHERE pid = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2-STRING, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
+
+[selectIndep]
+SQL1_1 = SELECT pid, name, cash, bankacc, adminlevel, donorlevel, med_licenses, mediclevel, med_gear, med_stats, playtime FROM players WHERE pid = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2-STRING, 3, 4, 5, 6, 7, 8, 9, 10, 11
+
+[updateWest]
+SQL1_1 = UPDATE players SET name = ?, cash = ?, bankacc = ?, cop_gear = ?, cop_licenses = ?, cop_stats = ?, playtime = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2, 3, 4, 5, 6, 7, 8
+
+[updateCiv]
+SQL1_1 = UPDATE players SET name = ?, cash = ?, bankacc = ?, civ_licenses = ?, civ_gear = ?, arrested = ?, civ_stats = ?, civ_alive = ?, civ_position = ?, playtime = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
+
+[updateIndep]
+SQL1_1 = UPDATE players SET name = ?, cash = ?, bankacc = ?, med_licenses = ?, med_gear = ?, med_stats = ?, playtime = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2, 3, 4, 5, 6, 7, 8
+
+[updateCash]
+SQL1_1 = UPDATE players SET cash = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateBank]
+SQL1_1 = UPDATE players SET bankacc = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateWestLicenses]
+SQL1_1 = UPDATE players SET cop_licenses = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateCivLicenses]
+SQL1_1 = UPDATE players SET civ_licenses = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateIndepLicenses]
+SQL1_1 = UPDATE players SET med_licenses = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateWestGear]
+SQL1_1 = UPDATE players SET cop_gear = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateCivGear]
+SQL1_1 = UPDATE players SET civ_gear = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateIndepGear]
+SQL1_1 = UPDATE players SET med_gear = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateCivPosition]
+SQL1_1 = UPDATE players SET civ_alive = ?, civ_position = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2, 3
+
+[updateCivAlive]
+SQL1_1 = UPDATE players SET civ_alive = '0' WHERE civ_alive = '1'
+
+[updateArrested]
+SQL1_1 = UPDATE players SET arrested = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateCashAndBank]
+SQL1_1 = UPDATE players SET cash = ?, bankacc = ? WHERE pid = ?
+SQL1_INPUTS = 1, 2, 3
+
+
+
+[selectPlayerGang]
+SQL1_1 = SELECT id, owner, name, maxmembers, bank, members FROM gangs WHERE active = '1' AND members LIKE ?
+SQL1_INPUTS = 1
+OUTPUT = 1, 2-STRING, 3-STRING, 4, 5, 6
+
+[selectGangID]
+SQL1_1 = SELECT id FROM gangs WHERE name = ? AND active = '1'
+SQL1_INPUTS = 1
+
+[selectGangIDFromMembers]
+SQL1_1 = SELECT id FROM gangs WHERE members LIKE ? AND active = '1'
+SQL1_INPUTS = 1
+
+[selectGangIDFromOwner]
+SQL1_1 = SELECT id FROM gangs WHERE owner = ? AND active = '1'
+SQL1_INPUTS = 1
+
+[selectInactiveGang]
+SQL1_1 = SELECT id, active FROM gangs WHERE name = ? AND active = '0'
+SQL1_INPUTS = 1
+
+[updateGang]
+SQL1_1 = UPDATE gangs SET active = '1', owner = ?, members = ? WHERE id = ?
+SQL1_INPUTS = 1, 2, 3
+
+[updateGang1]
+SQL1_1 = UPDATE gangs SET bank = ?, maxmembers = ?, owner = ? WHERE id = ?
+SQL1_INPUTS = 1, 2, 3, 4
+
+[updateGangBank]
+SQL1_1 = UPDATE gangs SET bank = ? WHERE id = ?
+SQL1_INPUTS = 1, 2
+
+[updateGangMembers]
+SQL1_1 = UPDATE gangs SET members = ? WHERE id = ?
+SQL1_INPUTS = 1, 2
+
+[updateGangMaxmembers]
+SQL1_1 = UPDATE gangs SET maxmembers = ? WHERE id = ?
+SQL1_INPUTS = 1, 2
+
+[updateGangOwner]
+SQL1_1 = UPDATE gangs SET owner = ? WHERE id = ?
+SQL1_INPUTS = 1, 2
+
+[insertGang]
+SQL1_1 = INSERT INTO gangs (owner, name, members) VALUES (?, ?, ?)
+SQL1_INPUTS = 1, 2, 3
+
+[deleteGang]
+SQL1_1 = UPDATE gangs SET active = '0' WHERE id = ?
+SQL1_INPUTS = 1
+
+
+
+[insertHouse]
+SQL1_1 = INSERT INTO houses (pid, pos, owned) VALUES (?, ?, '1')
+SQL1_INPUTS = 1, 2
+
+[selectHouseID]
+SQL1_1 = SELECT id FROM houses WHERE pos = ? AND pid = ? AND owned = '1'
+SQL1_INPUTS = 1, 2
+
+[selectAllHouses]
+SQL1_1 = SELECT COUNT(*) FROM houses WHERE owned = '1'
+
+[selectPlayerHouses]
+SQL1_1 = SELECT houses.id, houses.pid, houses.pos, players.name, houses.garage FROM houses INNER JOIN players WHERE houses.owned = '1' AND houses.pid = players.pid LIMIT ?, 10
+SQL1_INPUTS = 1
+OUTPUT = 1, 2-STRING, 3, 4-STRING, 5
+
+[selectHousePositions]
+SQL1_1 = SELECT pid, pos FROM houses WHERE pid = ? AND owned = '1'
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2
+
+[updateHouseTrunk]
+SQL1_1 = UPDATE containers SET inventory = ? WHERE id = ?
+SQL1_INPUTS = 1, 2
+
+[deleteHouse]
+SQL1_1 = UPDATE houses SET owned = '0', pos = '[]' WHERE pid = ? AND pos = ? AND owned = '1'
+SQL1_INPUTS = 1, 2
+
+[deleteHouse1]
+SQL1_1 = UPDATE houses SET owned = '0', pos = '[]' WHERE id = ?
+SQL1_INPUTS = 1
+
+[updateGarage]
+SQL1_1 = UPDATE houses SET garage = ? WHERE pid = ? AND pos = ?
+SQL1_INPUTS = 1, 2, 3
+
+[selectContainerPositions]
+SQL1_1 = SELECT pid, pos FROM containers WHERE pid = ? AND owned = '1'
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2
+
+[selectContainers]
+SQL1_1 = SELECT pid, pos, classname, inventory, gear, dir, id FROM containers WHERE pid = ? AND owned = '1'
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2, 3-STRING, 4, 5, 6, 7
+
+[selectContainerID]
+SQL1_1 = SELECT id FROM containers WHERE pos = ? AND pid = ? AND owned = '1'
+SQL1_INPUTS = 1, 2
+
+[insertContainer]
+SQL1_1 = INSERT INTO containers (pid, pos, classname, inventory, gear, owned, dir) VALUES (?, ?, ?, '[[],0]', '[]', '1', ?)
+SQL1_INPUTS = 1, 2, 3, 4
+
+[updateContainer]
+SQL1_1 = UPDATE containers SET gear = ? WHERE id = ?
+SQL1_INPUTS = 1, 2
+
+[deleteContainer]
+SQL1_1 = UPDATE containers SET owned = '0', pos = '[]' WHERE pid = ? AND pos = ? AND owned = '1'
+SQL1_INPUTS = 1, 2
+
+[deleteContainer1]
+SQL1_1 = UPDATE containers SET owned = '0', pos = '[]' WHERE id = ?
+SQL1_INPUTS = 1
+
+
+
+
+[selectVehicles]
+SQL1_1 = SELECT id, side, classname, type, pid, alive, active, plate, color FROM vehicles WHERE pid = ? AND alive = '1' AND active = '0' AND side = ? AND type = ?
+SQL1_INPUTS = 1, 2, 3
+OUTPUT = 1, 2-STRING, 3-STRING, 4-STRING, 5-STRING, 6, 7, 8, 9
+
+[selectVehiclesMore]
+SQL1_1 = SELECT id, side, classname, type, pid, alive, active, plate, color, inventory, gear, fuel, damage, blacklist FROM vehicles WHERE id = ? AND pid = ?
+SQL1_INPUTS = 1, 2
+OUTPUT = 1, 2-STRING, 3-STRING, 4-STRING, 5-STRING, 6, 7, 8, 9, 10, 11, 12, 13, 14
+
+[updateVehicle]
+SQL1_1 = UPDATE vehicles SET active = '1' WHERE pid = ? AND id = ?
+SQL1_INPUTS = 1, 2
+
+[updateVehicleBlacklist]
+SQL1_1 = UPDATE vehicles SET blacklist = '0' WHERE id = ? AND pid = ?
+SQL1_INPUTS = 1, 2
+
+[updateVehicleBlacklistPlate]
+SQL1_1 = UPDATE vehicles SET blacklist = '1' WHERE pid = ? AND plate = ?
+SQL1_INPUTS = 1, 2
+
+[updateVehicleFuel]
+SQL1_1 = UPDATE vehicles SET active = '0', fuel = ?, damage = ? WHERE pid = ? AND plate = ?
+SQL1_INPUTS = 1, 2, 3, 4
+
+[updateVehicleAll]
+SQL1_1 = UPDATE vehicles SET active = '0', inventory = ?, gear = ?, fuel = ?, damage = ? WHERE pid = ? AND plate = ?
+SQL1_INPUTS = 1, 2, 3, 4, 5, 6
+
+[updateVehicleGear]
+SQL1_1 = UPDATE vehicles SET gear = ? WHERE pid = ? AND plate = ?
+SQL1_INPUTS = 1, 2, 3
+
+[updateVehicleTrunk]
+SQL1_1 = UPDATE vehicles SET inventory = ? WHERE pid = ? AND plate = ?
+SQL1_INPUTS = 1, 2, 3
+
+[insertVehicle]
+SQL1_1 = INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear, damage) VALUES (?, ?, ?, ?, '1','1','[[],0]', ?, ?,'[]','[]')
+SQL1_INPUTS = 1, 2, 3, 4, 5, 6
+
+[deleteVehicle]
+SQL1_1 = UPDATE vehicles SET alive = '0' WHERE pid = ? AND plate = ?
+SQL1_INPUTS = 1, 2
+
+[deleteVehicleID]
+SQL1_1 = UPDATE vehicles SET alive = '0' WHERE pid = ? AND id = ?
+SQL1_INPUTS = 1, 2
+
+[cleanupVehicle]
+SQL1_1 = UPDATE vehicles SET active = '0', fuel = ? WHERE pid = ? AND plate = ?
+SQL1_INPUTS = 1, 2, 3
+
+
+[selectWanted]
+SQL1_1 = SELECT wantedID, wantedName, wantedCrimes, wantedBounty FROM wanted WHERE active = '1' AND wantedID = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2-STRING, 3, 4
+
+[selectWantedID]
+SQL1_1 = SELECT wantedID FROM wanted WHERE wantedID = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING
+
+[selectWantedCrimes]
+SQL1_1 = SELECT wantedCrimes, wantedBounty FROM wanted WHERE wantedID = ?
+SQL1_INPUTS = 1
+
+[selectWantedActive]
+SQL1_1 = SELECT wantedCrimes, wantedBounty FROM wanted WHERE active = '1' AND wantedID = ?
+SQL1_INPUTS = 1
+
+[selectWantedActiveID]
+SQL1_1 = SELECT wantedID, wantedName FROM wanted WHERE active = '1' AND wantedID in (?)
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2-STRING
+
+[selectWantedBounty]
+SQL1_1 = SELECT wantedID, wantedName, wantedBounty FROM wanted WHERE active = '1' AND wantedID = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING, 2-STRING, 3
+
+[selectWantedName]
+SQL1_1 = SELECT wantedName FROM wanted WHERE wantedID = ?
+SQL1_INPUTS = 1
+OUTPUT = 1-STRING
+
+[insertWanted]
+SQL1_1 = INSERT INTO wanted (wantedID, wantedName, wantedCrimes, wantedBounty, active) VALUES (?, ?, ?, ?, '1')
+SQL1_INPUTS = 1, 2, 3, 4
+
+[updateWanted]
+SQL1_1 = UPDATE wanted SET wantedCrimes = ?, wantedBounty = wantedBounty + ?, active = '1' WHERE wantedID = ?
+SQL1_INPUTS = 1, 2, 3
+
+[updateWantedName]
+SQL1_1 = UPDATE wanted SET wantedName = ? WHERE wantedID = ?
+SQL1_INPUTS = 1, 2
+
+[deleteWanted]
+SQL1_1 = UPDATE wanted SET active = '0', wantedCrimes = '[]', wantedBounty = 0 WHERE wantedID = ?
+SQL1_INPUTS = 1