Merge branch 'master' into locationSave

Author: DomT602

.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. 

Altis_Life.Altis/config/Config_Master.hpp

@@ -145,6 +145,7 @@ class Life_Settings {
     vehicle_infiniteRepair[] = {false, false, true, false}; //Set to true for unlimited repairs with 1 toolkit. False will remove toolkit upon use. civilian, west, independent, east
     vehicleShop_rentalOnly[] = { "B_MRAP_01_hmg_F", "B_G_Offroad_01_armed_F", "B_Boat_Armed_01_minigun_F" }; //Vehicles that can only be rented and not purchased. (Last only for the session)
     vehicleShop_3D = false; //Add preview 3D inside Shop vehicle.       Default : False
+    vehicle_rentalReturn = false; //Can return rental vehicles to 'Store vehicle in garage', doesn't actually store it in garage.
 
     /* Vehicle Purchase Prices */
     vehicle_purchase_multiplier_CIVILIAN = 1; //Civilian Vehicle Buy Price = Config_Vehicle price * multiplier

Altis_Life.Altis/stringtable.xml

@@ -2552,7 +2552,19 @@
             <Italian>Il veicolo è in affitto e non può essere depositato in garage.</Italian>
             <Portuguese>Esse veículo é alugado e não pode ser armazenado na garagem.</Portuguese>
             <Polish>Pojazd wynajęty, nie możesz go schować w garażu.</Polish>
-			<Chinesesimp>载具是租赁的，不能存放在你的仓库里。</Chinesesimp>
+            <Chinesesimp>载具是租赁的，不能存放在你的仓库里。</Chinesesimp>
+        </Key>
+        <Key ID="STR_Garage_Store_NotPersistent2">
+            <Original>Thank you for returning the rental vehicle.</Original>
+            <Czech>Děkujeme za vrácení zapůjčeného vozidla.</Czech>
+            <Spanish>Gracias por devolver el vehículo de alquiler.</Spanish>
+            <Russian>Спасибо, что вернул автомобиль в аренду.</Russian>
+            <German>Vielen Dank für die Rückgabe des Mietwagens.</German>
+            <French>Nous vous remercions de nous avoir rendu le véhicule de location.</French>
+            <Italian>Grazie per aver restituito il veicolo a noleggio.</Italian>
+            <Portuguese>Obrigado por devolver o veículo alugado.</Portuguese>
+            <Polish>Dziękuję za zwrot wypożyczonego pojazdu.</Polish>
+            <Chinesesimp>感谢您归还租车。</Chinesesimp>
         </Key>
         <Key ID="STR_Garage_Store_NoOwnership">
             <Original>That vehicle doesn't belong to you therefor you cannot store it in your garage.</Original>

README.md

@@ -4,6 +4,8 @@ AsYetUntitled, formerly <b>Altis Life RPG</b> and <b>ARMARPGLIFE</b> is a rolepl
 
 This Github is not currently associated with any forums.
 
+![Validation](https://github.com/AsYetUntitled/Framework/workflows/Validation/badge.svg?branch=master)
+
 # Features:
 
   - Police, Civ and Medic roles 
@@ -24,10 +26,7 @@ Altis Life RPG by AsYetUntitled is licensed under a [Creative Commons Attributio
   - Releases (Stable Builds): https://github.com/AsYetUntitled/Framework/releases
 
 <p align="center">
-    <a href="https://travis-ci.org/AsYetUntitled/Framework">
-        <img src="https://api.travis-ci.org/AsYetUntitled/Framework.svg" alt="Build Status">
-    </a>
-       <a href="https://discord.gg/ajGUDSH">
+    <a href="https://discord.gg/ajGUDSH">
         <img src="https://img.shields.io/badge/Discord-Join%20chat%20→-738bd7.svg" alt="Join the chat at https://discord.gg/ajGUDSH">
     </a>
 </p>

life_hc/MySQL/Vehicles/fn_vehicleStore.sqf

@@ -68,7 +68,14 @@ if (_impound) exitWith {
 
 // not persistent so just do this!
 if (_vInfo isEqualTo []) exitWith {
-    [1,"STR_Garage_Store_NotPersistent",true] remoteExecCall ["life_fnc_broadcast",_ownerID];
+    if (LIFE_SETTINGS(getNumber,"vehicle_rentalReturn") isEqualTo 1) then {
+        [1,"STR_Garage_Store_NotPersistent2",true] remoteExecCall ["life_fnc_broadcast",_ownerID];
+        if (!isNil "_vehicle" && {!isNull _vehicle}) then {
+            deleteVehicle _vehicle;
+        };
+    } else {
+        [1,"STR_Garage_Store_NotPersistent",true] remoteExecCall ["life_fnc_broadcast",_ownerID];
+    };
     life_garage_store = false;
     _ownerID publicVariableClient "life_garage_store";
 };

life_server/Functions/Systems/fn_vehicleStore.sqf

@@ -67,7 +67,14 @@ if (_impound) exitWith {
 
 // not persistent so just do this!
 if (_vInfo isEqualTo []) exitWith {
-    [1,"STR_Garage_Store_NotPersistent",true] remoteExecCall ["life_fnc_broadcast",(owner _unit)];
+    if (LIFE_SETTINGS(getNumber,"vehicle_rentalReturn") isEqualTo 1) then {
+        [1,"STR_Garage_Store_NotPersistent2",true] remoteExecCall ["life_fnc_broadcast",(owner _unit)];
+        if (!isNil "_vehicle" && {!isNull _vehicle}) then {
+            deleteVehicle _vehicle;
+        };
+    } else {
+        [1,"STR_Garage_Store_NotPersistent",true] remoteExecCall ["life_fnc_broadcast",(owner _unit)];
+    };
     life_garage_store = false;
     (owner _unit) publicVariableClient "life_garage_store";
 };