From 3962dcfa75900f3aa0ad98036896bd678faa1cd4 Mon Sep 17 00:00:00 2001 From: He-Man Date: Sat, 19 May 2018 18:25:25 +0200 Subject: [PATCH] Price + Sort + Spawn + Cleanup --- Sources/epoch_config/Configs/CfgEpochClient.hpp | 6 ------ Sources/epoch_config/Configs/CfgItemSort.hpp | 3 +++ Sources/epoch_config/Configs/CfgPricing.hpp | 13 +++++++++++++ Sources/epoch_server_settings/config.cpp | 1 + .../epoch_server_settings/configs/CfgLootTable.h | 2 ++ .../configs/CfgLootTable_CUP.h | 2 ++ .../configs/CfgLootTable_MAD.h | 2 ++ .../configs/CfgLootTable_MADCUP.h | 2 ++ 8 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgEpochClient.hpp b/Sources/epoch_config/Configs/CfgEpochClient.hpp index d52811ab..9e1450a5 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient.hpp @@ -233,12 +233,6 @@ class CfgEpochClient "KitCinderHalfFloor", // Item is Upgradeable, but you can remove it here to make it also Craftable "KitCinderFloor", // Item is Upgradeable, but you can remove it here to make it also Craftable "KitCinderTower" // Item is Upgradeable, but you can remove it here to make it also Craftable -// "KitSolarCharger", // Supress for 1.1.0 !!! -// "KitSolarChargerXL", // Supress for 1.1.0 !!! -// "BaseCam", // Supress for 1.1.0 !!! -// "BaseCamTerminal", // Supress for 1.1.0 !!! -// "KitSnowman", // Supress for 1.1.0 !!! -// "KitPlyThirdWall_EPOCH" // Supress for 1.1.0 !!! }; VehicleRepairs[] = { // {Hitpoint, dmg to repair, dmg to replace, mat to repair, mat to replace} {"HitHull",0.33,0.66,"ItemScraps","ItemCorrugated"}, diff --git a/Sources/epoch_config/Configs/CfgItemSort.hpp b/Sources/epoch_config/Configs/CfgItemSort.hpp index 928a186d..005e8cba 100644 --- a/Sources/epoch_config/Configs/CfgItemSort.hpp +++ b/Sources/epoch_config/Configs/CfgItemSort.hpp @@ -435,6 +435,8 @@ class CfgItemSort "H_F3_EPOCH", "H_F4_EPOCH", "H_F5_EPOCH", + "thor_mask_epoch", + "iron_mask_epoch", "wolf_mask_epoch", "pkin_mask_epoch", "clown_mask_epoch", @@ -1408,6 +1410,7 @@ class CfgItemSort "O_Heli_Transport_04_box_EPOCH", "O_Heli_Transport_04_covered_EPOCH", "B_Heli_Light_01_EPOCH", + "uh1h_Epoch", "B_Heli_Light_01_armed_F", "B_Heli_Transport_01_EPOCH", diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index a089aeba..00ec2f43 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -4628,6 +4628,11 @@ class CfgPricing class O_Truck_03_covered_EPOCH2: O_Truck_03_covered_EPOCH {}; class O_Truck_03_covered_EPOCH3: O_Truck_03_covered_EPOCH {}; class O_Truck_03_covered_EPOCH4: O_Truck_03_covered_EPOCH {}; + class uh1h_Epoch + { + price = 22500; + tax = 0.9; + }; class O_Heli_Light_02_unarmed_EPOCH { price = 25000; @@ -5946,6 +5951,14 @@ class CfgPricing { price = 5; }; + class thor_mask_epoch + { + price = 30; + }; + class iron_mask_epoch + { + price = 30; + }; class hockey_mask_epoch { price = 30; diff --git a/Sources/epoch_server_settings/config.cpp b/Sources/epoch_server_settings/config.cpp index ad1f4785..2d55bfae 100644 --- a/Sources/epoch_server_settings/config.cpp +++ b/Sources/epoch_server_settings/config.cpp @@ -229,6 +229,7 @@ class CfgEpoch {"O_Heli_Transport_04_box_EPOCH",1}, {"O_Heli_Transport_04_covered_EPOCH",1}, {"B_Heli_Transport_03_unarmed_EPOCH",1}, + {"uh1h_Epoch",1}, {"jetski_epoch",7}, {"MBK_01_EPOCH",2}, {"hoverboard_epoch_1",1}, diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index cae2f106..1ed06ced 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -1629,6 +1629,8 @@ class CfgLootTable { { "H_92_EPOCH", "item" }, 1 }, { { "H_104_EPOCH", "item" }, 1 }, { { "H_105_EPOCH", "item" }, 1 }, + { { "thor_mask_epoch", "item" }, 1, }, + { { "iron_mask_epoch", "item" }, 1, }, { { "wolf_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october { { "pkin_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october { { "clown_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h index 1fa8fdf0..d583c834 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h @@ -2176,6 +2176,8 @@ class CfgLootTable_CUP { { "H_92_EPOCH", "item" }, 1 }, { { "H_104_EPOCH", "item" }, 1 }, { { "H_105_EPOCH", "item" }, 1 }, + { { "thor_mask_epoch", "item" }, 1, }, + { { "iron_mask_epoch", "item" }, 1, }, { { "wolf_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october { { "pkin_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october { { "clown_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h index a6d297a0..c570c8f8 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h @@ -1619,6 +1619,8 @@ class CfgLootTable_MAD { { "H_92_EPOCH", "item" }, 1 }, { { "H_104_EPOCH", "item" }, 1 }, { { "H_105_EPOCH", "item" }, 1 }, + { { "thor_mask_epoch", "item" }, 1, }, + { { "iron_mask_epoch", "item" }, 1, }, { { "wolf_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october { { "pkin_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october { { "clown_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h index 9fa9fa57..21488664 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h @@ -2184,6 +2184,8 @@ class CfgLootTable_MADCUP { { "H_92_EPOCH", "item" }, 1 }, { { "H_104_EPOCH", "item" }, 1 }, { { "H_105_EPOCH", "item" }, 1 }, + { { "thor_mask_epoch", "item" }, 1, }, + { { "iron_mask_epoch", "item" }, 1, }, { { "wolf_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october { { "pkin_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october { { "clown_mask_epoch", "item" }, 1, {"getDate", 1, "==", 10} }, // only available in october