feat(halloween): disable fivem feature flag

MarlBnc · Nov 1, 2022 · ff53df0 · ff53df0
1 parent 5777e0a
commit ff53df0
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 75 deletions.
diff --git a/modules-prod.cfg b/modules-prod.cfg
@@ -32,7 +32,6 @@ start [vehicles-prod]
 setr feature_msb_baun 1
 setr feature_dlc2_luxury 1
 setr feature_dlc2_boat 0
-setr feature_halloween 1
 
 # Environment
 setr soz_core_environment production
diff --git a/modules-test.cfg b/modules-test.cfg
@@ -9,7 +9,6 @@ start [mapping-test]
 start [vehicles-test]
 
 # Features
-setr feature_halloween 1
 
 # Environment
 setr soz_core_environment test
diff --git a/modules.cfg b/modules.cfg
@@ -9,7 +9,6 @@ start [mapping-dev]
 start [vehicles-dev]
 
 # Features
-setr feature_halloween 1
 
 # Environment
 setr soz_core_environment development
diff --git a/resources/[soz]/soz-bank/client/main.lua b/resources/[soz]/soz-bank/client/main.lua
@@ -98,7 +98,7 @@ CreateThread(function()
                 QBCore.Functions.CreateBlip("bank_" .. bank, {name = "Banque", coords = coords, sprite = 108, color = 2})
             end
         end
-        local model = (GetConvarInt("feature_halloween", 0) == 1 and "u_f_m_drowned_01") or "ig_bankman"
+        local model = "ig_bankman"
         exports["qb-target"]:SpawnPed({
             {
                 model = model,

diff --git a/resources/[soz]/soz-core/src/client/job/ffs/ffs.restock.provider.ts b/resources/[soz]/soz-core/src/client/job/ffs/ffs.restock.provider.ts
@@ -58,17 +58,17 @@ export class FightForStyleRestockProvider {
             case ClothingBrand.PONSONBYS:
                 return {
                     garments: Object.values(LuxuryGarment),
-                    pedModel: isFeatureEnabled(Feature.Halloween) ? 'u_m_y_zombie_01' : 's_f_m_shop_high',
+                    pedModel: 's_f_m_shop_high',
                 };
             case ClothingBrand.SUBURBAN:
                 return {
                     garments: Object.values(Garment),
-                    pedModel: isFeatureEnabled(Feature.Halloween) ? 'u_m_y_zombie_01' : 's_f_y_shop_mid',
+                    pedModel: 's_f_y_shop_mid',
                 };
             case ClothingBrand.BINCO:
                 return {
                     garments: Object.values(Garment),
-                    pedModel: isFeatureEnabled(Feature.Halloween) ? 'u_m_y_zombie_01' : 's_f_y_shop_low',
+                    pedModel: 's_f_y_shop_low',
                 };
         }
     }

diff --git a/resources/[soz]/soz-core/src/client/job/lsmc/lsmc.pharmacy.provider.ts b/resources/[soz]/soz-core/src/client/job/lsmc/lsmc.pharmacy.provider.ts
@@ -12,7 +12,7 @@ export class LSMCPharmacyProvider {
 
     @Once(OnceStep.PlayerLoaded)
     public onPlayerLoaded() {
-        const model = isFeatureEnabled(Feature.Halloween) ? 'u_f_y_corpse_02' : 's_m_m_doctor_01';
+        const model = 's_m_m_doctor_01';
         this.targetFactory.createForPed({
             model: model,
             coords: { x: 356.64, y: -1419.74, z: 31.51, w: 57.62 },

diff --git a/resources/[soz]/soz-core/src/shared/features.ts b/resources/[soz]/soz-core/src/shared/features.ts
@@ -23,33 +23,33 @@ const FeatureConfig: Record<Feature, { [P in Environment]?: boolean }> = {
     },
     [Feature.Halloween]: {
         production: false,
-        development: true,
-        test: true,
+        development: false,
+        test: false,
     },
     [Feature.HalloweenReboot]: {
         production: false,
-        development: true,
-        test: true,
+        development: false,
+        test: false,
     },
     [Feature.HalloweenScenario1]: {
         production: false,
-        development: true,
-        test: true,
+        development: false,
+        test: false,
     },
     [Feature.HalloweenScenario2]: {
         production: false,
-        development: true,
-        test: true,
+        development: false,
+        test: false,
     },
     [Feature.HalloweenScenario3]: {
         production: false,
-        development: true,
-        test: true,
+        development: false,
+        test: false,
     },
     [Feature.HalloweenScenario4]: {
         production: false,
-        development: true,
-        test: true,
+        development: false,
+        test: false,
     },
 };
 

diff --git a/resources/[soz]/soz-driving-school/config.lua b/resources/[soz]/soz-driving-school/config.lua
@@ -11,15 +11,15 @@ Config.PlayerDefaultLocation = vector4(-806.57, -1344.53, 5.50, 150.0)
 
 Config.Peds = {
     ["instructor"] = {
-        modelHash = (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "cs_manuel",
+        modelHash = "cs_manuel",
         x = 0.0,
         y = 0.0,
         z = 0.0,
         rotation = 0.0,
         networkSync = true,
     },
     ["secretary"] = {
-        modelHash = (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "u_f_y_princess",
+        modelHash = "u_f_y_princess",
         x = -815.99,
         y = -1357.3,
         z = 5.15,

diff --git a/resources/[soz]/soz-shops/client/shops/barber.lua b/resources/[soz]/soz-shops/client/shops/barber.lua
@@ -190,5 +190,4 @@ function BarberShop:GenerateMenu()
 end
 
 --- Exports shop
-ShopContext["barber"] = BarberShop:new("Coiffeur", "barber", {sprite = 71, color = 0},
-                                       (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_f_m_fembarber")
+ShopContext["barber"] = BarberShop:new("Coiffeur", "barber", {sprite = 71, color = 0}, "s_f_m_fembarber")
diff --git a/resources/[soz]/soz-shops/client/shops/clothing.lua b/resources/[soz]/soz-shops/client/shops/clothing.lua
@@ -201,9 +201,6 @@ function ClothingShop:GenerateMenu(skipIntro)
 end
 
 --- Exports shop
-ShopContext["ponsonbys"] = ClothingShop:new("PONSONBYS", "ponsonbys", {sprite = 73, color = 26},
-                                            (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_f_m_shop_high")
-ShopContext["suburban"] = ClothingShop:new("SubUrban", "suburban", {sprite = 73, color = 29},
-                                           (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_f_y_shop_mid")
-ShopContext["binco"] = ClothingShop:new("Binco", "binco", {sprite = 73, color = 33},
-                                        (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_f_y_shop_low")
+ShopContext["ponsonbys"] = ClothingShop:new("PONSONBYS", "ponsonbys", {sprite = 73, color = 26}, "s_f_m_shop_high")
+ShopContext["suburban"] = ClothingShop:new("SubUrban", "suburban", {sprite = 73, color = 29}, "s_f_y_shop_mid")
+ShopContext["binco"] = ClothingShop:new("Binco", "binco", {sprite = 73, color = 33}, "s_f_y_shop_low")
diff --git a/resources/[soz]/soz-shops/client/shops/jewelry.lua b/resources/[soz]/soz-shops/client/shops/jewelry.lua
@@ -191,5 +191,4 @@ CreateThread(function()
 end)
 
 --- Exports shop
-ShopContext["jewelry"] = JewelryShop:new("Bijoutier", "jewelry", {sprite = 617, color = 0},
-                                         (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "u_m_m_jewelsec_01")
+ShopContext["jewelry"] = JewelryShop:new("Bijoutier", "jewelry", {sprite = 617, color = 0}, "u_m_m_jewelsec_01")
diff --git a/resources/[soz]/soz-shops/client/shops/supermarket.lua b/resources/[soz]/soz-shops/client/shops/supermarket.lua
@@ -41,18 +41,11 @@ function SupermarketShop:GenerateMenu()
 end
 
 --- Exports shop
-ShopContext["247supermarket-north"] = SupermarketShop:new("Superette", "247supermarket-north", {sprite = 52, color = 2},
-                                                          (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "ig_ashley")
-ShopContext["247supermarket-south"] = SupermarketShop:new("Superette", "247supermarket-south", {sprite = 52, color = 2},
-                                                          (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "cs_ashley")
-ShopContext["ltdgasoline-north"] = SupermarketShop:new("Superette", "ltdgasoline-north", {sprite = 52, color = 2},
-                                                       (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_m_m_autoshop_01")
-ShopContext["ltdgasoline-south"] = SupermarketShop:new("Superette", "ltdgasoline-south", {sprite = 52, color = 2},
-                                                       (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_m_m_autoshop_02")
-ShopContext["robsliquor-north"] = SupermarketShop:new("Superette", "robsliquor-north", {sprite = 52, color = 2},
-                                                      (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "a_m_m_genfat_02")
-ShopContext["robsliquor-south"] = SupermarketShop:new("Superette", "robsliquor-south", {sprite = 52, color = 2},
-                                                      (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "a_m_m_genfat_01")
-
-ShopContext["zkea"] = SupermarketShop:new("Zkea", "zkea", {sprite = 123, color = 69},
-                                          (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "ig_brad")
+ShopContext["247supermarket-north"] = SupermarketShop:new("Superette", "247supermarket-north", {sprite = 52, color = 2}, "ig_ashley")
+ShopContext["247supermarket-south"] = SupermarketShop:new("Superette", "247supermarket-south", {sprite = 52, color = 2}, "cs_ashley")
+ShopContext["ltdgasoline-north"] = SupermarketShop:new("Superette", "ltdgasoline-north", {sprite = 52, color = 2}, "s_m_m_autoshop_01")
+ShopContext["ltdgasoline-south"] = SupermarketShop:new("Superette", "ltdgasoline-south", {sprite = 52, color = 2}, "s_m_m_autoshop_02")
+ShopContext["robsliquor-north"] = SupermarketShop:new("Superette", "robsliquor-north", {sprite = 52, color = 2}, "a_m_m_genfat_02")
+ShopContext["robsliquor-south"] = SupermarketShop:new("Superette", "robsliquor-south", {sprite = 52, color = 2}, "a_m_m_genfat_01")
+
+ShopContext["zkea"] = SupermarketShop:new("Zkea", "zkea", {sprite = 123, color = 69}, "ig_brad")
diff --git a/resources/[soz]/soz-shops/client/shops/tattoo.lua b/resources/[soz]/soz-shops/client/shops/tattoo.lua
@@ -226,5 +226,4 @@ function TattooShop:DeleteCam()
 end
 
 --- Exports functions
-ShopContext["tattoo"] = TattooShop:new("Tatoueur", "tattoo", {sprite = 75, color = 1},
-                                       (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "u_m_y_tattoo_01")
+ShopContext["tattoo"] = TattooShop:new("Tatoueur", "tattoo", {sprite = 75, color = 1}, "u_m_y_tattoo_01")
diff --git a/resources/[soz]/soz-shops/client/shops/weapon.lua b/resources/[soz]/soz-shops/client/shops/weapon.lua
@@ -63,5 +63,4 @@ function WeaponShop:GenerateMenu()
 end
 
 --- Exports shop
-ShopContext["ammunation"] = WeaponShop:new("Ammu-Nation", "ammunation", {sprite = 110, color = 17},
-                                           (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_m_y_ammucity_01")
+ShopContext["ammunation"] = WeaponShop:new("Ammu-Nation", "ammunation", {sprite = 110, color = 17}, "s_m_y_ammucity_01")
diff --git a/resources/[soz]/soz-utils/client/halloween.lua b/resources/[soz]/soz-utils/client/halloween.lua
diff --git a/resources/[soz]/soz-vehicle/config/dealership.lua b/resources/[soz]/soz-vehicle/config/dealership.lua
@@ -32,7 +32,7 @@ Config.Dealerships = {
         licence = "car",
         blip = {name = "Concessionnaire Auto", coords = vector3(-45.67, -1098.34, 26.42), sprite = 225, color = 46},
         ped = {
-            model = (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_m_m_autoshop_01",
+            model = "s_m_m_autoshop_01",
             coords = vector4(-56.61, -1096.58, 25.42, 30.0),
             zone = {
                 center = vector3(-55.49, -1096.44, 26.92),
@@ -49,7 +49,7 @@ Config.Dealerships = {
         licence = nil,
         blip = {name = "Concessionnaire Vélo", coords = vector3(-1222.26, -1494.83, 4.34), sprite = 559, color = 46},
         ped = {
-            model = (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_m_m_autoshop_01",
+            model = "s_m_m_autoshop_01",
             coords = vector4(-1222.26, -1494.83, 3.34, 120.0),
             zone = {
                 center = vector3(-1223.7, -1495.49, 4.37),
@@ -66,7 +66,7 @@ Config.Dealerships = {
         licence = "motorcycle",
         blip = {name = "Concessionnaire Moto", coords = vector3(1224.79, 2727.25, 38.0), sprite = 522, color = 46},
         ped = {
-            model = (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_m_m_autoshop_01",
+            model = "s_m_m_autoshop_01",
             coords = vector4(1224.79, 2727.25, 37.0, 180.0),
             zone = {
                 center = vector3(1224.99, 2725.22, 38.0),
@@ -88,7 +88,7 @@ Config.Dealerships = {
             color = 46,
         },
         ped = {
-            model = (GetConvarInt("feature_halloween", 0) == 1 and "u_m_y_zombie_01") or "s_m_m_autoshop_02",
+            model = "s_m_m_autoshop_02",
             coords = vector4(1743.13, 3307.23, 40.22, 148.91),
             zone = {
                 center = vector3(1732.15, 3308.31, 41.22),