Skip to content

returns rental vehicles #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DomT602 merged 8 commits into from
Mar 25, 2020
Merged

returns rental vehicles #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9f3d7af
returns rental vehicles
that-edward Mar 19, 2020
a655fc8
Merge branch 'master' into returnRental
Jason2605 Mar 24, 2020
ff8d0f5
Merge branch 'master' into returnRental
DomT602 Mar 24, 2020
b61d294
Merge branch 'master' into returnRental
that-edward Mar 25, 2020
8b18d5b
Merge branch 'master' into returnRental
DomT602 Mar 25, 2020
2452bdf
Config option
that-edward Mar 25, 2020
9829780
Fix that weird mistake
that-edward Mar 25, 2020
647fecd
Naming conventions
that-edward Mar 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Altis_Life.Altis/config/Config_Master.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 13 additions & 1 deletion Altis_Life.Altis/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 8 additions & 1 deletion life_hc/MySQL/Vehicles/fn_vehicleStore.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down
9 changes: 8 additions & 1 deletion life_server/Functions/Systems/fn_vehicleStore.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down