diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/StaticWeapons.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/StaticWeapons.hpp index 3d63b6d30..b6212a205 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/StaticWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/StaticWeapons.hpp @@ -174,7 +174,7 @@ class L2A1_Tripod_MG_Static_kit: CA_Magazine }; }; -class GMG_Tripod_MG_Static_kit: CA_Magazine +class GMG_Tripod_GrenadeLauncher_Static_kit: CA_Magazine { scope = 2; count = 1; @@ -191,7 +191,7 @@ class GMG_Tripod_MG_Static_kit: CA_Magazine text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; - create = "GMG_Tripod_MG_Static_DZ"; + create = "GMG_Tripod_GrenadeLauncher_Static_kit"; }; }; }; @@ -240,7 +240,7 @@ class MK19_TriPod_GrenadeLauncher_Static_kit: CA_Magazine }; }; -class GPMG_TriPod_GrenadeLauncher_Static_kit: CA_Magazine +class GPMG_TriPod_MG_Static_kit: CA_Magazine { scope = 2; count = 1; @@ -257,7 +257,7 @@ class GPMG_TriPod_GrenadeLauncher_Static_kit: CA_Magazine text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; - create = "GPMG_TriPod_GrenadeLauncher_Static_DZ"; + create = "GPMG_TriPod_MG_Static_kit"; }; }; }; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/StaticWeapons.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/StaticWeapons.hpp index bbb2b50ee..0a019aae5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/StaticWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/StaticWeapons.hpp @@ -122,7 +122,7 @@ class BAF_GMG_Tripod_D: GMG_TriPod { class assembleInfo; }; -class GMG_Tripod_MG_Static_DZ: BAF_GMG_Tripod_D { // GMG Minitripod +class GMG_Tripod_GrenadeLauncher_Static_DZ: BAF_GMG_Tripod_D { // GMG Minitripod side = 1; faction = "USMC"; class assembleInfo: assembleInfo { @@ -130,9 +130,9 @@ class GMG_Tripod_MG_Static_DZ: BAF_GMG_Tripod_D { // GMG Minitripod }; offset[] = {0,3,0}; nounderground = 0; - GhostPreview = "GMG_Tripod_MG_Static_DZ"; + GhostPreview = "GMG_Tripod_GrenadeLauncher_Static_DZ"; vehicleClass = "DayZ Epoch Static Weapons"; - removeoutput[] = {{"GMG_Tripod_MG_Static_kit",1}}; + removeoutput[] = {{"GMG_Tripod_GrenadeLauncher_Static_kit",1}}; }; class AGS_Ins; @@ -161,7 +161,7 @@ class BAF_GPMG_Minitripod_D: BAF_L2A1_ACOG_base { class assembleInfo; }; -class GPMG_TriPod_GrenadeLauncher_Static_DZ: BAF_GPMG_Minitripod_D { // GPMG Minitripod +class GPMG_TriPod_MG_Static_DZ: BAF_GPMG_Minitripod_D { // GPMG Minitripod side = 1; faction = "USMC"; class assembleInfo: assembleInfo { @@ -169,9 +169,9 @@ class GPMG_TriPod_GrenadeLauncher_Static_DZ: BAF_GPMG_Minitripod_D { // GPMG Min }; offset[] = {0,3,0}; nounderground = 0; - GhostPreview = "GPMG_TriPod_GrenadeLauncher_Static_DZ"; + GhostPreview = "GPMG_TriPod_MG_Static_DZ"; vehicleClass = "DayZ Epoch Static Weapons"; - removeoutput[] = {{"GPMG_TriPod_GrenadeLauncher_Static_kit",1}}; + removeoutput[] = {{"GPMG_TriPod_MG_Static_kit",1}}; }; class M119; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/StaticWeapons.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/StaticWeapons.hpp index e855d6569..b10b85a39 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/StaticWeapons.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/StaticWeapons.hpp @@ -34,7 +34,7 @@ class L2A1_Tripod_MG_Static_kit { weight = 32.5; }; -class GMG_Tripod_MG_Static_kit +class GMG_Tripod_GrenadeLauncher_Static_kit { weight = 29; }; @@ -46,7 +46,7 @@ class MK19_TriPod_GrenadeLauncher_Static_kit { weight = 35.3; }; -class GPMG_TriPod_GrenadeLauncher_Static_kit +class GPMG_TriPod_MG_Static_kit { weight = 25.7; }; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 7f8f6245e..702c8366e 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -8,7 +8,7 @@ DZE_modularDoors = ["Land_DZE_WoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_Garag DZE_modularDoors = DZE_modularDoors + DZE_LockedGates; DZE_LockedStorage = ["VaultStorageLocked","VaultStorage2Locked","LockboxStorageLocked","LockboxStorage2Locked","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","TallSafeLocked"]; DZE_UnLockedStorage = ["VaultStorage","VaultStorage2","LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2","TallSafe"]; -DZE_StaticWeapons = ["ZU23_AntiAir_Static_DZ","Igla_AntiAir_Launcher_Static_DZ","Rbs70_Launcher_Static_DZ","TOW_Tripod_Launcher_Static_DZ","Stinger_Tripod_Launcher_Static_DZ","SPG9_Launcher_Static_DZ","Metis_Launcher_Static_DZ","2b14_82mm_Mortar_Static_DZ","M252_Mortar_Static_DZ","SearchLight_Static_DZ","D30_Artillery_Static_DZ","M119_Artillery_Static_DZ","GPMG_TriPod_GrenadeLauncher_Static_DZ","MK19_TriPod_GrenadeLauncher_Static_DZ","AGS30_GrenadeLauncher_Static_DZ","GMG_Tripod_MG_Static_DZ","L2A1_Tripod_MG_Static_DZ","L2A1_MG_Static_DZ","KORD_MG_Static_DZ","KORD_Tripod_MG_Static_DZ","DSHKM_TriPod_MG_Static_DZ","DSHKM_MG_Static_DZ","M2_TriPod_MG_Static_DZ","M2_MG_Static_DZ","M240Nest_DZ"]; +DZE_StaticWeapons = ["ZU23_AntiAir_Static_DZ","Igla_AntiAir_Launcher_Static_DZ","Rbs70_Launcher_Static_DZ","TOW_Tripod_Launcher_Static_DZ","Stinger_Tripod_Launcher_Static_DZ","SPG9_Launcher_Static_DZ","Metis_Launcher_Static_DZ","2b14_82mm_Mortar_Static_DZ","M252_Mortar_Static_DZ","SearchLight_Static_DZ","D30_Artillery_Static_DZ","M119_Artillery_Static_DZ","GPMG_TriPod_MG_Static_DZ","MK19_TriPod_GrenadeLauncher_Static_DZ","AGS30_GrenadeLauncher_Static_DZ","GMG_Tripod_GrenadeLauncher_Static_DZ","L2A1_Tripod_MG_Static_DZ","L2A1_MG_Static_DZ","KORD_MG_Static_DZ","KORD_Tripod_MG_Static_DZ","DSHKM_TriPod_MG_Static_DZ","DSHKM_MG_Static_DZ","M2_TriPod_MG_Static_DZ","M2_MG_Static_DZ","M240Nest_DZ"]; DZE_isNewStorage = ["Generator_DZ","GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","WoodCrate2_DZ","OutHouse_DZ","StorageShed_DZ","StorageShed2_DZ","WoodShack_DZ","WoodShack2_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WorkBench_DZE","Advanced_WorkBench_DZ","CookTripod_DZ","Stoneoven_DZ","Commode_DZ","Wardrobe_DZ","Fridge_DZ","Washing_Machine_DZ","Server_Rack_DZ","ATM_DZ","Armchair_DZ","Sofa_DZ","Arcade_DZ","Vendmachine1_DZ","Vendmachine2_DZ","StorageCrate_DZ","CamoStorageCrate_DZ","StorageBarrelRed1_DZ","StorageBarrelRed2_DZ","StorageBarrelEpoch1_DZ","StorageBarrelEpoch2_DZ","StorageBarrelYellow1_DZ","StorageBarrelYellow2_DZ","StorageBarrelBlack1_DZ","StorageBarrelBlack2_DZ","StorageBarrelGreenDark1_DZ","StorageBarrelGreenDark2_DZ","StorageBarrelMilk1_DZ","StorageBarrelMilk2_DZ","StorageBarrelGreen1_DZ","StorageBarrelGreen2_DZ","StorageBarrelGreenRusty1_DZ","StorageBarrelGreenRusty2_DZ","Rabbit_Hutch_DZE","Chicken_Coop_DZE","Doghouse_DZE","Postbox_DZE","Wild_Bee_Hive_DZE","Cow_Stable_DZE","Goat_Stable_DZE","Sheep_Stable_DZE","Boar_Stable_DZE","VaultStorageBroken","VaultStorageBroken2","TallSafeBroken","LockboxStorageBroken","LockboxStorage2Broken","LockboxStorageWinterBroken","LockboxStorageWinter2Broken"]; DZE_Tents = ["TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","DesertTentStorage","DesertTentStorage0","DesertTentStorage1","DesertTentStorage2","DesertTentStorage3","DesertTentStorage4","TentStorageWinter","TentStorageWinter0","TentStorageWinter1","TentStorageWinter2","TentStorageWinter3","TentStorageWinter4","WinterDomeTentStorage","WinterDomeTentStorage0","WinterDomeTentStorage1","WinterDomeTentStorage2","WinterDomeTentStorage3","WinterDomeTentStorage4"]; DZE_Stashes = ["StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4"]; diff --git a/Server Files/SQL/update epoch 1.0.7 to 1.0.7.1.sql b/Server Files/SQL/update epoch 1.0.7 to 1.0.7.1.sql deleted file mode 100644 index 9379f0aa7..000000000 --- a/Server Files/SQL/update epoch 1.0.7 to 1.0.7.1.sql +++ /dev/null @@ -1,26 +0,0 @@ -UPDATE character_data SET Backpack = REPLACE(Backpack, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Backpack, '"Skin_gsc_cloth_loner_head_DZ"') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Inventory, '"Skin_gsc_cloth_loner_head_DZ"') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Inventory, '"Skin_gsc_cloth_loner_head_DZ"') > 0; -UPDATE character_data SET Model = "Survivor2_DZ" WHERE Model = "gsc_cloth_loner_head_DZ"; - -CREATE TABLE IF NOT EXISTS `garage` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `PlayerUID` varchar(20) NOT NULL DEFAULT '0', - `Name` varchar(50) NOT NULL DEFAULT '', - `DisplayName` varchar(50) NOT NULL DEFAULT '', - `Classname` varchar(50) DEFAULT NULL, - `Datestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP, - `DateStored` varchar(10) NOT NULL DEFAULT 'old', - `DateMaintained` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `CharacterID` bigint(20) unsigned NOT NULL DEFAULT '0', - `StorageCounts` varchar(30) NOT NULL DEFAULT '[0,0,0]', - `Inventory` mediumtext, - `Hitpoints` mediumtext, - `Fuel` double(13,5) NOT NULL DEFAULT '1.00000', - `Damage` double(13,5) NOT NULL DEFAULT '0.00000', - `Colour` varchar(50) NOT NULL, - `Colour2` varchar(50) NOT NULL, - `serverKey` varchar(10) NOT NULL DEFAULT 'old', - `ObjUID` varchar(20) NOT NULL DEFAULT 'old', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/Server Files/SQL/update epoch 1.0.7.1 to 1.0.8.sql b/Server Files/SQL/update epoch 1.0.7.1 to 1.0.8.sql new file mode 100644 index 000000000..5e4a8cc79 --- /dev/null +++ b/Server Files/SQL/update epoch 1.0.7.1 to 1.0.8.sql @@ -0,0 +1,10 @@ +UPDATE character_data SET Backpack = REPLACE(Backpack, '"GPMG_TriPod_GrenadeLauncher_Static_kit"', '"GPMG_TriPod_MG_Static_kit"') WHERE INSTR(Backpack, '"GPMG_TriPod_GrenadeLauncher_Static_kit"') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, '"GPMG_TriPod_GrenadeLauncher_Static_kit"', '"GPMG_TriPod_MG_Static_kit"') WHERE INSTR(Inventory, '"GPMG_TriPod_GrenadeLauncher_Static_kit"') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, '"GPMG_TriPod_GrenadeLauncher_Static_kit"', '"GPMG_TriPod_MG_Static_kit"') WHERE INSTR(Inventory, '"GPMG_TriPod_GrenadeLauncher_Static_kit"') > 0; + +UPDATE character_data SET Backpack = REPLACE(Backpack, '"GMG_Tripod_MG_Static_kit"', '"GMG_Tripod_GrenadeLauncher_Static_kit"') WHERE INSTR(Backpack, '"GMG_Tripod_MG_Static_kit"') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, '"GMG_Tripod_MG_Static_kit"', '"GMG_Tripod_GrenadeLauncher_Static_kit"') WHERE INSTR(Inventory, '"GMG_Tripod_MG_Static_kit"') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, '"GMG_Tripod_MG_Static_kit"', '"GMG_Tripod_GrenadeLauncher_Static_kit"') WHERE INSTR(Inventory, '"GMG_Tripod_MG_Static_kit"') > 0; + +UPDATE object_data SET Classname = 'GPMG_TriPod_MG_Static_DZ' WHERE Classname = 'GPMG_TriPod_GrenadeLauncher_Static_DZ'; +UPDATE object_data SET Classname = 'GMG_Tripod_GrenadeLauncher_Static_DZ' WHERE Classname = 'GMG_Tripod_MG_Static_DZ'; \ No newline at end of file