Major vehicle overhaul by DomT602 · Pull Request #640 · AsYetUntitled/Framework

DomT602 · 2020-03-26T19:49:15Z

Resolves #528.

Changes proposed in this pull request:

Massive overhaul of the vehicle system including setting up for the built in plate system ArmA provides
Also completes actions that were done in Removed PVAR EVH and replaced with remoteExecutedOwner #498 prior to move to SQL Custom
I have tested my changes and corrected any errors found

blackfisch

Looks mostly good, however there's some things bothering me :D

You make me do work, I'll make you work!

Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf

Altis_Life.Altis/dialog/function/fn_unimpound.sqf

altislife.sql

life_server/Functions/Systems/fn_spawnVehicle.sqf

life_server/Functions/Systems/fn_getVehicles.sqf

life_server/Functions/Systems/fn_vehicleCreate.sqf

life_server/Functions/Systems/fn_vehicleStore.sqf

Altis_Life.Altis/core/utils/fn_sideToString.sqf

life_server/Functions/Systems/fn_vehicleCreate.sqf

blackfisch · 2021-12-27T23:56:25Z

AL.ini


 [insertVehicle]
-SQL1_1 = INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear, damage) VALUES (?, ?, ?, ?, '1','1','[[],0]', ?, ?,'[]','[]')
+SQL1_1 = INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear) VALUES (?, ?, ?, ?, '1','1','[[],0]', ?, ?,'[]'); SELECT LAST_INSERT_ID()


Use a separate statement.

Suggested change

SQL1_1 = INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear) VALUES (?, ?, ?, ?, '1','1','[[],0]', ?, ?,'[]'); SELECT LAST_INSERT_ID()

SQL1_1 = INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear) VALUES (?, ?, ?, ?, '1','1','[[],0]', ?, ?,'[]')

SQL1_2 = SELECT LAST_INSERT_ID()

blackfisch · 2021-12-27T23:57:59Z

Altis_Life.Altis/core/actions/fn_buyLicense.sqf

 */
-private ["_type","_varName","_displayName","_sideFlag","_price"];
-_type = _this select 3;
+params ["", "", "", "_type"];


use extended syntax for type safety:

Suggested change

params ["", "", "", "_type"];

params ["", "", "", ["_type", "", [""]]];

blackfisch · 2021-12-27T23:59:12Z

Altis_Life.Altis/core/actions/fn_dropFishingNet.sqf

-private ["_fish","_type","_typeName"];
-if (!(vehicle player isKindOf "Ship")) exitWith {};
-_fish = (nearestObjects[getPos vehicle player,["Fish_Base_F"],20]);
+private _vehicle = vehicle player;


Suggested change

private _vehicle = vehicle player;

private _vehicle = objectParent player;

would be the nicer way. might have to check for isNull _vehicle tho

blackfisch · 2021-12-28T00:00:02Z

Altis_Life.Altis/core/actions/fn_gather.sqf

+    } count _resourceZones;

-    if (_zone != "") exitWith {};
+    if !(_zone isEqualTo "") exitWith {};


use new isNotEqualTo command

blackfisch · 2021-12-28T00:00:17Z

Altis_Life.Altis/core/actions/fn_gather.sqf


-if (_requiredItem != "") then {
-    _valItem = missionNamespace getVariable "life_inv_" + _requiredItem;
+if !(_requiredItem isEqualTo "") then {


use new isNotEqualTo command

blackfisch · 2021-12-28T00:22:08Z

Altis_Life.Altis/core/functions/fn_stripDownPlayer.sqf

+} count (assignedItems player);

-if (hmd player != "") then {
+if !(hmd player isEqualTo "") then {


use new isNotEqualTo command

blackfisch · 2021-12-28T00:23:00Z

Altis_Life.Altis/core/pmenu/fn_keyGive.sqf

+private _owners = _vehicle getVariable "vehicle_info_owners";
+private _insertedIndex = _owners pushBackUnique [_uid,_unit getVariable ["realname",name _unit]];
+
+if (_insertedIndex != -1) then {


use new isNotEqualTo command

blackfisch · 2021-12-28T00:25:03Z

Altis_Life.Altis/core/vehicle/fn_colorVehicle.sqf

+};
+
+private _textureArray = M_CONFIG(getArray,"LifeCfgVehicles",_className,"textures");
+private _colorIndex = _textureArray findIf {_x select 0 == _colorName};


blackfisch · 2021-12-28T00:27:33Z

life_server/Functions/Systems/fn_chopShopSell.sqf

+];
+
+//Error checks
+if (isNull _vehicle || isNull _unit) exitWith  {


Suggested change

if (isNull _vehicle || isNull _unit) exitWith {

if (isNull _vehicle || {isNull _unit}) exitWith {

life_server/Functions/Systems/fn_vehicleCreate.sqf

Initial vehicle work

afe905f

DomT602 self-assigned this Mar 26, 2020

DomT602 added 6.0.0 bug-fix For pull requests that fix a bug or other issue. enhancement For pull requests and issues that suggest an improvement to an existing feature. In Progress labels Mar 26, 2020

Vehicle format

4e27721

blackfisch suggested changes Mar 26, 2020

View reviewed changes

More changes

a89c50b

DomT602 changed the title ~~Initial vehicle work~~ Major vehicle overhaul Mar 26, 2020

DomT602 added 20 commits March 26, 2020 21:40

Further work

8c5b027

Adding prefix

97143e7

Further fixes, sideToString, BE Filter update, default plate prefix

4e6f1ed

Illegal use of tabs

41c57b9

Missing query and loop change

88436d3

Config option for unique plates

b24e4bf

Tab and cleanup

81b672a

Different method of returning vehicle ID

11b6870

Copy'n'Pasta

a15a7e0

Local var

09318f0

Colours to strings and cleanup

c92ac4c

Optimisation of other vehicle files

cfe5a4e

Remove tab

ff3665f

Cleanup

cecf7f2

Default colour, few optimisations

5187ba5

Remove life_fnc_requestClientID and associated TON function

4e0f8a4

Remove life_impound_inUse

2f9fff3

Couple of fixes

56d3328

Small changes

4e8c637

Resolve conflicts

de47bbf

DomT602 and others added 11 commits April 14, 2020 11:54

Merge branch 'master' into vehicleOverhaul

9af0a8c

Move to utils folder

7a3b13e

Missing space

259329d

Resolve conflicts

fa9faab

Further fixes

8347060

Remove old file

a1f348f

Resolve conflicts

3d08029

Final fixes

30ec65f

Update life_hc

298f8c5

Wrong macro path

607ed00

use prefix when checking plate

e74a11b

DomT602 removed the In Progress label Apr 25, 2020

DomT602 requested a review from BoGuu April 25, 2020 16:19

Casperento reviewed May 4, 2020

View reviewed changes

Altis_Life.Altis/core/utils/fn_sideToString.sqf Show resolved Hide resolved

DomT602 added 2 commits December 27, 2021 23:16

SQM edits for garages

8957a91

Fix inserting into DB

547b31c

blackfisch suggested changes Dec 27, 2021

View reviewed changes

life_server/Functions/Systems/fn_vehicleCreate.sqf Show resolved Hide resolved

life_server/Functions/Systems/fn_vehicleCreate.sqf Outdated Show resolved Hide resolved

Default value and cleanup

77e6b49

blackfisch suggested changes Dec 28, 2021

View reviewed changes

DomT602 and others added 6 commits December 28, 2021 00:55

Merge branch 'master' into vehicleOverhaul

98d72be

Review and match HC

d597dc8

Oops

226d6d6

Final changes

9c4ad3e

Swap

1c5124b

Var name change

899d2cc

	SQL1_1 = INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear) VALUES (?, ?, ?, ?, '1','1','[[],0]', ?, ?,'[]'); SELECT LAST_INSERT_ID()
	SQL1_1 = INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear) VALUES (?, ?, ?, ?, '1','1','[[],0]', ?, ?,'[]')
	SQL1_2 = SELECT LAST_INSERT_ID()

	params ["", "", "", "_type"];
	params ["", "", "", ["_type", "", [""]]];

	private _vehicle = vehicle player;
	private _vehicle = objectParent player;

	if (isNull _vehicle \|\| isNull _unit) exitWith {
	if (isNull _vehicle \|\| {isNull _unit}) exitWith {

Conversation

DomT602 commented Mar 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes proposed in this pull request:

Uh oh!

blackfisch left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DomT602 commented Mar 26, 2020 •

edited

Loading