v1.4++

adjust object position(simple objects)
nabeky · Feb 22, 2019 · 25c63b9 · 25c63b9
1 parent 33b1a01
commit 25c63b9
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 34 deletions.
diff --git a/config.cpp b/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		lootbox_version = "v1.40 (13-02-2019)";
+		lootbox_version = "v1.40 (06-01-2019)";
 		requiredAddons[] = {"exile_client","exile_assets","exile_server_config","a3_dms"};
 		author[]= {"nabek"};
 	};

diff --git a/config.sqf b/config.sqf
@@ -432,7 +432,7 @@ LB_LootGroups = [
 	12:Strange-objects(0-x)
 	13:Flaming-objects(0-x)
 	14:Fire places(0-x)
-	15:Vehicle count
+	15:Spawn Vehicle count
 	16:Vehicle type[] *Cliche:air/tank/army > spawn radius(20m)
 	17:Loot groups(array)
 	*/
@@ -448,7 +448,7 @@ LB_LocationLoot = [
 		0,				// 9:
 		0,				// 10:
 		0.2,			// 11:
-		5,				// 12:
+		10,				// 12:
 		0,				// 13:
 		1,				// 14:
 		4,				// 15:
@@ -505,7 +505,7 @@ LB_LocationLoot = [
 		0,				// 9:
 		0,				// 10:
 		0.2,			// 11:
-		5,				// 12:
+		8,				// 12:
 		0,				// 13:
 		1,				// 14:
 		4,				// 15:
@@ -562,7 +562,7 @@ LB_LocationLoot = [
 		3,				// 9:
 		1,				// 10:
 		0.7,			// 11:
-		2,				// 12:
+		10,				// 12:
 		2,				// 13:
 		0,				// 14:
 		3,				// 15:
@@ -581,7 +581,7 @@ LB_LocationLoot = [
 		3,				// 9:
 		1,				// 10:
 		0.7,			// 11:
-		2,				// 12:
+		10,				// 12:
 		2,				// 13:
 		0,				// 14:
 		3,				// 15:
@@ -810,25 +810,27 @@ LB_StrangeObjs = [
 	["Land_Tyre_F",1,false,false],					// tyre
 	["Land_CratesWooden_F",2,false,false],			// wooden box
 	["Land_Sacks_heap_F",2,false,false],			// sucks
-	["Land_Wreck_Skodovka_F",3,false,false],		// wreck vehicles
-	["Land_Wreck_CarDismantled_F",3,false,false],	//
-	["Land_Wreck_Truck_F",3,false,false],			//
-	["Land_Wreck_Car2_F",3,false,false],			//
-	["Land_Wreck_Car3_F",3,false,false],			//
-	["Land_Wreck_Hunter_F",3,false,false],			//
-	["Land_Wreck_Van_F",3,false,false],				//
-	["Land_Wreck_Offroad_F",3,false,false],			//
-	["Land_Wreck_Offroad2_F",3,false,false],		//
-	["Land_Wreck_UAZ_F",3,false,false],				//
-	["Land_Wreck_Ural_F",3,false,false],			//
-	["Land_Wreck_Truck_dropside_F",3,false,false],	//
-	["Land_Wreck_BMP2_F",3,false,false],			//
-	["Land_Wreck_HMMWV_F",3,false,false],			//
-	["Land_Wreck_BRDM2_F",3,false,false],			//
-	["Land_Wreck_Slammer_F",3,false,false],			//
-	["Land_Wreck_Heli_Attack_02_F",5,false,false],	//
-	["Land_UWreck_Heli_Attack_02_F",5,false,false],	//
-	["Land_UWreck_MV22_F",5,false,false],			//
+
+	// wreck vehicles
+	["Land_Wreck_Skodovka_F",3,false,false],
+	["Land_Wreck_CarDismantled_F",3,false,false],
+	["Land_Wreck_Truck_F",3,false,false],
+	["Land_Wreck_Car2_F",3,false,false],
+	["Land_Wreck_Car3_F",3,false,false],
+	["Land_Wreck_Hunter_F",3,false,false],
+	["Land_Wreck_Van_F",3,false,false],
+	["Land_Wreck_Offroad_F",3,false,false],
+	["Land_Wreck_Offroad2_F",3,false,false],
+	["Land_Wreck_UAZ_F",3,false,false],
+	["Land_Wreck_Ural_F",3,false,false],
+	["Land_Wreck_Truck_dropside_F",3,false,false],
+	["Land_Wreck_BMP2_F",3,false,false],
+	["Land_Wreck_HMMWV_F",3,false,false],
+	["Land_Wreck_BRDM2_F",3,false,false],
+	["Land_Wreck_Slammer_F",3,false,false],
+	["Land_Wreck_Heli_Attack_02_F",5,false,false],
+	["Land_UWreck_Heli_Attack_02_F",5,false,false],
+	["Land_UWreck_MV22_F",5,false,false],
 
 	// DLC objects
 	["Oil_Spill_F",3,true,false],					// oil spill(DLC:cart)
@@ -1022,13 +1024,17 @@ LB_Maptext = [
 	(22) Broodcast messages
 
 	*broodcastting(system chat)
+	*repeat the list
 	
 	*/
 LB_Bcmessage = [
 	"* Hello everyone! ;-)",
 	"* Welcome to SABA-MISO Exile Server ;-)",
-	"* Information http://blog.ahh.jp/?page_id=14360",
-	"* Discord Ch. https://discord.gg/b4FT278"
+	"* [PR] FaminyMart : Convenience Stores",
+	"* No Ero-books, No Life.",
+	"* [PR] FOWA-Type89 Rifle, Made in Japan.",
+	"* Yellow Duck is Danger!",
+	"* [PR] TOKYO 2020 Olympics."
 /* SAMPLE
 	"* Hello everyone! ;-)",
 	"* Welcome to Exile Server ;-)",
@@ -1038,7 +1044,7 @@ LB_Bcmessage = [
 	"* Donate https://www.paypal.com"
 */
 ];
-LB_BcmessageTime = 180;	// 1line message post time(seconds)
+LB_BcmessageTime = 300;	// 1line message post time(seconds)
 
 /*=============================
 	(23) Bandit city

diff --git a/functions/putSimpleobj.sqf b/functions/putSimpleobj.sqf
@@ -2,17 +2,19 @@
 	1:object class name
 	2:position(ASL)
 	3:angle
+	4:Z relative(= model center-position)
 	
 	return:
 	-
 */
-private ["_className","_pos","_spawned","_temp","_tpos","_vectorDirUp","_model","_vehicle","_angle"];
+private ["_className","_pos","_spawned","_temp","_tpos","_vectorDirUp","_model","_vehicle","_angle","_z_rel"];
 
 _this call
 {
 	_className = param[0,""];
 	_pos = param[1,[0,0,0]];
 	_angle = param[2,nil];
+	_z_rel = param[3,0];
 };
 if(isnil"_angle")then{
 	_angle = floor(random 360);
@@ -26,10 +28,9 @@ _model = getModelInfo _temp select 1;
 deleteVehicle _temp;
 
 if((count _pos) > 2)then{
-	_vehicle = createSimpleObject [_model, _pos];
-}else{
-	_vehicle = createSimpleObject [_model, _tpos];
+	_tpos = [_pos select 0,_pos select 1,(_pos select 2)+_z_rel];
 };
+_vehicle = createSimpleObject [_model, _tpos];
 if!(isNil"_vehicle")then{
 	_vehicle setVectorDirAndUp _vectorDirUp;
 };

diff --git a/putBoxes.sqf b/putBoxes.sqf
@@ -1013,7 +1013,7 @@ if(count _C_rndexileobj > 0)then{
 		_angle = _x select 2;
 		// Clean water
 		if(_spawn_w > 0 and _className isEqualTo "Land_WaterCooler_01_new_F")then{
-			[_className,AGLToASL(_pos),_angle]call LB_fnc_putSimpleobj;
+			[_className,AGLToASL(_pos),_angle,0.5]call LB_fnc_putSimpleobj;
 			_spawn_w = _spawn_w - 1;
 			_ok = true;
 		};
@@ -1088,7 +1088,7 @@ if(count _C_rndexileobj > 0)then{
 			if(random 1 > 0.7)then{
 				// so bad..
 				//["BloodPool_01_Large_New_F",AGLToASL(_pos)] call LB_fnc_putSimpleobj;
-				["Land_HumanSkull_F",AGLToASL(_pos),_angle] call LB_fnc_putSimpleobj;
+				["Land_HumanSkull_F",AGLToASL(_pos),_angle,0.1] call LB_fnc_putSimpleobj;
 				[format["LB_REOBJ%1",_cnt],[_pos select 0,_pos select 1],"hd_unknown","",0.3,""] call LB_fnc_marker;
 			};
 		};