From 5e27942bd0bec349f046479ff1d1a19e00850a8a Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sun, 23 Feb 2014 18:25:41 +0100 Subject: [PATCH] Change over to new DZE_ForceNameTagsInTrader System --- SQF/dayz_code/compile/trader_enter.sqf | 15 ------- SQF/dayz_code/compile/trader_leave.sqf | 14 ------ SQF/dayz_code/init/compiles.sqf | 5 +-- .../DayZ_Epoch_1.Takistan/mission.sqm | 12 ++--- .../DayZ_Epoch_11.Chernarus/mission.sqm | 20 ++++----- .../DayZ_Epoch_12.isladuala/mission.sqm | 12 ++--- .../MPMissions/DayZ_Epoch_13.Tavi/mission.sqm | 16 +++---- .../DayZ_Epoch_16.Panthera2/mission.sqm | 44 +++++++++---------- .../DayZ_Epoch_17.Chernarus/mission.sqm | 12 ++--- .../MPMissions/DayZ_Epoch_18.Sara/mission.sqm | 12 ++--- .../DayZ_Epoch_19.FDF_Isle1_a/mission.sqm | 8 ++-- .../DayZ_Epoch_20.fapovo/mission.sqm | 24 +++++----- .../DayZ_Epoch_21.Caribou/mission.sqm | 36 +++++++-------- .../DayZ_Epoch_22.smd_sahrani_A2/mission.sqm | 16 +++---- .../DayZ_Epoch_23.cmr_ovaron/mission.sqm | 40 ++++++++--------- .../MPMissions/DayZ_Epoch_24.Napf/mission.sqm | 40 ++++++++--------- .../DayZ_Epoch_25.sauerland/mission.sqm | 28 ++++++------ 17 files changed, 161 insertions(+), 193 deletions(-) delete mode 100644 SQF/dayz_code/compile/trader_enter.sqf delete mode 100644 SQF/dayz_code/compile/trader_leave.sqf diff --git a/SQF/dayz_code/compile/trader_enter.sqf b/SQF/dayz_code/compile/trader_enter.sqf deleted file mode 100644 index e07d31256..000000000 --- a/SQF/dayz_code/compile/trader_enter.sqf +++ /dev/null @@ -1,15 +0,0 @@ -private ["_traderName","_showText"]; -_traderName = _this select 0; -_showText = _this select 1; - -if (_showText) then { - cutText [format [localize "STR_EPOCH_TRADER_ENTER", _traderName], "PLAIN DOWN"]; -}; - -if (DZE_ForceNameTagsInTrader) then { - player setVariable["DZE_display_name_tmp", (player getVariable "DZE_display_name")]; - player setVariable["DZE_display_name", true, true]; -}; - -canbuild = false; -inTraderCity = _traderName; \ No newline at end of file diff --git a/SQF/dayz_code/compile/trader_leave.sqf b/SQF/dayz_code/compile/trader_leave.sqf deleted file mode 100644 index ab3af3887..000000000 --- a/SQF/dayz_code/compile/trader_leave.sqf +++ /dev/null @@ -1,14 +0,0 @@ -private ["_traderName","_showText"]; -_traderName = _this select 0; -_showText = _this select 1; - -if (_showText) then { - cutText [format [localize "STR_EPOCH_TRADER_LEAVE", _traderName], "PLAIN DOWN"]; -}; - -if (DZE_ForceNameTagsInTrader) then { - player setVariable["DZE_display_name", (player getVariable "DZE_display_name_old"), true]; -}; - -canbuild = true; -inTraderCity = "Any"; \ No newline at end of file diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 3d109c54d..b751fcea9 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -127,10 +127,7 @@ if (!isDedicated) then { player_hasTools = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_hasTools.sqf"; player_checkItems = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_checkItems.sqf"; player_removeItems = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_removeItems.sqf"; - - // trader - trader_enter = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\trader_enter.sqf"; - trader_leave = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\trader_leave.sqf"; + //Trader ["Trader City Name",false,"enter"] - Trader City Name | Show Message | "enter" or "leave" player_traderCity = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_traderCity.sqf"; // combination of check and remove items diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm index 1afc67487..fda8558b5 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm @@ -1331,8 +1331,8 @@ class Mission age="UNKNOWN"; name="zone1"; expCond="(player distance zone1) < 100;"; - expActiv="[""trader city Khush"",true] spawn trader_enter;"; - expDesactiv="[""trader city Khush"",true] spawn trader_leave;"; + expActiv="[""trader city Khush"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Khush"",true,"leave"] spawn player_traderCity;"; class Effects { soundDet="arabian_market_1"; @@ -1349,8 +1349,8 @@ class Mission age="UNKNOWN"; name="zone2"; expCond="(player distance zone2) < 100;"; - expActiv="[""trader city Nur"",true] spawn trader_enter;"; - expDesactiv="[""trader city Nur"",true] spawn trader_leave;"; + expActiv="[""trader city Nur"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Nur"",true,"leave"] spawn player_traderCity;"; class Effects { soundDet="arabian_market_1"; @@ -1367,8 +1367,8 @@ class Mission age="UNKNOWN"; name="zone3"; expCond="(player distance zone3) < 100;"; - expActiv="[""trader city Garm"",true] spawn trader_enter;"; - expDesactiv="[""trader city Garm"",true] spawn trader_leave;"; + expActiv="[""trader city Garm"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Garm"",true,"leave"] spawn player_traderCity;"; class Effects { soundDet="arabian_market_1"; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm index e967b67c9..bdf806b25 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm @@ -1310,8 +1310,8 @@ class Mission age="UNKNOWN"; name="zonestary"; expCond="(player distance zonestary) < 100;"; - expActiv="[""trader city Stary"",true] spawn trader_enter;"; - expDesactiv="[""trader city Stary"",true] spawn trader_leave;"; + expActiv="[""trader city Stary"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Stary"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1327,8 +1327,8 @@ class Mission age="UNKNOWN"; name="zonebash"; expCond="(player distance zonebash) < 100;"; - expActiv="[""trader city Bash"",true] spawn trader_enter;"; - expDesactiv="[""trader city Bash"",true] spawn trader_leave;"; + expActiv="[""trader city Bash"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Bash"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1344,8 +1344,8 @@ class Mission age="UNKNOWN"; name="zoneklen"; expCond="(player distance zoneklen) < 100;"; - expActiv="[""trader city Klen"",true] spawn trader_enter;"; - expDesactiv="[""trader city Klen"",true] spawn trader_leave;"; + expActiv="[""trader city Klen"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Klen"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1361,8 +1361,8 @@ class Mission age="UNKNOWN"; name="zonebandit"; expCond="(player distance zonebandit) < 100;"; - expActiv="[""Bandit Trader"",false] spawn trader_enter;"; - expDesactiv="[""Bandit Trader"",false] spawn trader_leave;"; + expActiv="[""Bandit Trader"",false,"enter"] spawn player_traderCity;"; + expDesactiv="[""Bandit Trader"",false,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1378,8 +1378,8 @@ class Mission age="UNKNOWN"; name="zonehero"; expCond="(player distance zonehero) < 100;"; - expActiv="[""Hero Trader"",false] spawn trader_enter;"; - expDesactiv="[""Hero Trader"",false] spawn trader_leave;"; + expActiv="[""Hero Trader"",false,"enter"] spawn player_traderCity;"; + expDesactiv="[""Hero Trader"",false,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm index 9e4c5e846..64b79983a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm @@ -1357,8 +1357,8 @@ class Mission age="UNKNOWN"; name="zonenubak"; expCond="(player distance zonenubak) < 100;"; - expActiv="[""trader city Nubak"",true] spawn trader_enter;"; - expDesactiv="[""trader city Nubak"",true] spawn trader_leave;"; + expActiv="[""trader city Nubak"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Nubak"",true,"leave"] spawn player_traderCity;"; class Effects { soundDet="arabian_market_1"; @@ -1373,8 +1373,8 @@ class Mission age="UNKNOWN"; name="zonepinley"; expCond="(player distance zonepinley) < 100;"; - expActiv="[""trader city Pinley"",true] spawn trader_enter;"; - expDesactiv="[""trader city Pinley"",true] spawn trader_leave;"; + expActiv="[""trader city Pinley"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Pinley"",true,"leave"] spawn player_traderCity;"; class Effects { soundDet="arabian_market_1"; @@ -1389,8 +1389,8 @@ class Mission age="UNKNOWN"; name="zonecamara"; expCond="(player distance zonecamara) < 100;"; - expActiv="[""trader city Camara"",true] spawn trader_enter;"; - expDesactiv="[""trader city Camara"",true] spawn trader_leave;"; + expActiv="[""trader city Camara"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Camara"",true,"leave"] spawn player_traderCity;"; class Effects { soundDet="arabian_market_1"; diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm index 300e60c0e..cfe30934c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm @@ -1391,8 +1391,8 @@ class Mission age="UNKNOWN"; name="zonesabina"; expCond="(player distance zonesabina) < 40;"; - expActiv="[""trader city Sabina"",true] spawn trader_enter;"; - expDesactiv="[""trader city Sabina"",true] spawn trader_leave;"; + expActiv="[""trader city Sabina"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Sabina"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1408,8 +1408,8 @@ class Mission age="UNKNOWN"; name="zonelyep"; expCond="(player distance zonelyep) < 50;"; - expActiv="[""trader city Lyepestok"",true] spawn trader_enter;"; - expDesactiv="[""trader city Lyepestok"",true] spawn trader_leave;"; + expActiv="[""trader city Lyepestok"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Lyepestok"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1425,8 +1425,8 @@ class Mission age="UNKNOWN"; name="zonebilgrad"; expCond="(player distance zonebilgrad) < 50;"; - expActiv="[""trader city Bilgrad"",true] spawn trader_enter;"; - expDesactiv="[""trader city Bilgrad"",true] spawn trader_leave;"; + expActiv="[""trader city Bilgrad"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Bilgrad"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1442,8 +1442,8 @@ class Mission age="UNKNOWN"; name="zonebranibor"; expCond="(player distance zonebranibor) < 60;"; - expActiv="[""trader city Branibor"",true] spawn trader_enter;"; - expDesactiv="[""trader city Branibor"",true] spawn trader_leave;"; + expActiv="[""trader city Branibor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Branibor"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm index 9ec367a56..eb7ad3329 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm @@ -1358,8 +1358,8 @@ class Mission age="UNKNOWN"; name="TraderCity1"; expCond="(player distance TraderCity1) < 100; "; - expActiv="[""trader city Pikla"",true] spawn trader_enter;"; - expDesactiv="[""trader city Pikla"",true] spawn trader_leave;"; + expActiv="[""trader city Pikla"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Pikla"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1375,8 +1375,8 @@ class Mission age="UNKNOWN"; name="TraderCity2"; expCond="(player distance TraderCity2) < 100; "; - expActiv="[""trader city Selca"",true] spawn trader_enter;"; - expDesactiv="[""trader city Selca"",true] spawn trader_leave;"; + expActiv="[""trader city Selca"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Selca"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1392,8 +1392,8 @@ class Mission age="UNKNOWN"; name="HeroVendors"; expCond="(player distance HeroVendors) < 100; "; - expActiv="[""Hero Trader Camp"",true] spawn trader_enter;"; - expDesactiv="[""Hero Trader Camp"",true] spawn trader_leave;"; + expActiv="[""Hero Trader Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Hero Trader Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1409,8 +1409,8 @@ class Mission age="UNKNOWN"; name="WholeSaler1"; expCond="(player distance WholeSaler1) < 100; "; - expActiv="[""South's Wholesale"",true] spawn trader_enter;"; - expDesactiv="[""South's Wholesale"",true] spawn trader_leave;"; + expActiv="[""South's Wholesale"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""South's Wholesale"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1426,8 +1426,8 @@ class Mission age="UNKNOWN"; name="BanditTrader"; expCond="(player distance BanditTrader) < 100; "; - expActiv="[""Bandit Camp"",true] spawn trader_enter;"; - expDesactiv="[""Bandit Camp"",true] spawn trader_leave;"; + expActiv="[""Bandit Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Bandit Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1443,8 +1443,8 @@ class Mission age="UNKNOWN"; name="AWOLsAirField"; expCond="(player distance AWOLsAirField) < 100; "; - expActiv="[""AWOLs Airfield"",true] spawn trader_enter;"; - expDesactiv="[""AWOLs Airfield"",true] spawn trader_leave;"; + expActiv="[""AWOLs Airfield"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""AWOLs Airfield"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1460,8 +1460,8 @@ class Mission age="UNKNOWN"; name="Wholesaler2"; expCond="(player distance Wholesaler2) < 100; "; - expActiv="[""West's Wholesale"",true] spawn trader_enter;"; - expDesactiv="[""West's Wholesale"",true] spawn trader_leave;"; + expActiv="[""West's Wholesale"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""West's Wholesale"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1477,8 +1477,8 @@ class Mission age="UNKNOWN"; name="BoatVendor"; expCond="(player distance BoatVendor) < 100; "; - expActiv="[""Sams Boat Vendor"",true] spawn trader_enter;"; - expDesactiv="[""Sams Boat Vendor"",true] spawn trader_leave;"; + expActiv="[""Sams Boat Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Sams Boat Vendor"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1494,8 +1494,8 @@ class Mission age="UNKNOWN"; name="PlanicaTraders"; expCond="(player distance PlanicaTraders) < 100; "; - expActiv="[""trader city Planica"",true] spawn trader_enter;"; - expDesactiv="[""trader city Planica"",true] spawn trader_leave;"; + expActiv="[""trader city Planica"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Planica"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1511,8 +1511,8 @@ class Mission age="UNKNOWN"; name="MelloVehicleRepair"; expCond="(player distance MelloVehicleRepair) < 100; "; - expActiv="[""Mello"",true] spawn trader_enter;"; - expDesactiv="[""Mello"",true] spawn trader_leave;"; + expActiv="[""Mello"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Mello"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1528,8 +1528,8 @@ class Mission age="UNKNOWN"; name="BOAT12"; expCond="(player distance BOAT12) < 100; "; - expActiv="[""North Boat Vendor"",true] spawn trader_enter;"; - expDesactiv="[""North Boat Vendor"",true] spawn trader_leave;"; + expActiv="[""North Boat Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""North Boat Vendor"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/mission.sqm index cb88f14d6..4d4c25166 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/mission.sqm @@ -1305,8 +1305,8 @@ class Mission age="UNKNOWN"; name="zonebash"; expCond="(player distance zonebash) < 100;"; - expActiv="[""trader city Bash"",true] spawn trader_enter;"; - expDesactiv="[""trader city Bash"",true] spawn trader_leave;"; + expActiv="[""trader city Bash"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Bash"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1320,8 +1320,8 @@ class Mission age="UNKNOWN"; name="zoneklen"; expCond="(player distance zoneklen) < 100;"; - expActiv="[""trader city Klen"",true] spawn trader_enter;"; - expDesactiv="[""trader city Klen"",true] spawn trader_leave;"; + expActiv="[""trader city Klen"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Klen"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1335,8 +1335,8 @@ class Mission age="UNKNOWN"; name="zonestary"; expCond="(player distance zonestary) < 100;"; - expActiv="[""trader city Stary"",true] spawn trader_enter;"; - expDesactiv="[""trader city Stary"",true] spawn trader_leave;"; + expActiv="[""trader city Stary"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Stary"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_18.Sara/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_18.Sara/mission.sqm index 0549b14db..ab760b9c4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_18.Sara/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_18.Sara/mission.sqm @@ -1307,8 +1307,8 @@ class Mission age="UNKNOWN"; name="zone3"; expCond="(player distance zone3) < 100;"; - expActiv="[""trader city Corazol"",true] spawn trader_enter;"; - expDesactiv="[""trader city Corazol"",true] spawn trader_leave;"; + expActiv="[""trader city Corazol"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Corazol"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1324,8 +1324,8 @@ class Mission age="UNKNOWN"; name="zone2"; expCond="(player distance zone2) < 100;"; - expActiv="[""trader city Bag"",true] spawn trader_enter;"; - expDesactiv="[""trader city Bag"",true] spawn trader_leave;"; + expActiv="[""trader city Bag"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Bag"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1341,8 +1341,8 @@ class Mission age="UNKNOWN"; name="zone1"; expCond="(player distance zone1) < 100;"; - expActiv="[""trader city Ixel"",true] spawn trader_enter;"; - expDesactiv="[""trader city Ixel"",true] spawn trader_leave;"; + expActiv="[""trader city Ixel"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Ixel"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm index feaab686f..9aa243760 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm @@ -1291,8 +1291,8 @@ class Mission age="UNKNOWN"; name="zonebash"; expCond="(player distance zonebash) < 100;"; - expActiv="[""trader city Berezniki"",true] spawn trader_enter;"; - expDesactiv="[""trader city Berezniki"",true] spawn trader_leave;"; + expActiv="[""trader city Berezniki"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Berezniki"",true,"leave"] spawn player_traderCity;"; class Effects { soundDet="arabian_market_3"; @@ -1309,8 +1309,8 @@ class Mission age="UNKNOWN"; name="zoneklen"; expCond="(player distance zoneklen) < 100;"; - expActiv="[""trader city Jesco"",true] spawn trader_enter;"; - expDesactiv="[""trader city Jesco"",true] spawn trader_leave;"; + expActiv="[""trader city Jesco"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Jesco"",true,"leave"] spawn player_traderCity;"; class Effects { soundDet="arabian_market_3"; diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm index 62be8a1a3..37c58d049 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm @@ -1314,8 +1314,8 @@ class Mission age="UNKNOWN"; name="BanditVendor"; expCond="(player distance BanditVendor) < 100; "; - expActiv="[""Bandit Camp"",true] spawn trader_enter;"; - expDesactiv="[""Bandit Camp"",true] spawn trader_leave;"; + expActiv="[""Bandit Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Bandit Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1331,8 +1331,8 @@ class Mission age="UNKNOWN"; name="AirVehicleVendor"; expCond="(player distance AirVehicleVendor) < 100; "; - expActiv="[""AWOLs Air Vehicles"",true] spawn trader_enter;"; - expDesactiv="[""AWOLs Air Vehicles"",true] spawn trader_leave;"; + expActiv="[""AWOLs Air Vehicles"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""AWOLs Air Vehicles"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1348,8 +1348,8 @@ class Mission age="UNKNOWN"; name="TraderCity1"; expCond="(player distance TraderCity1) < 100; "; - expActiv="[""trader city Lixovo"",true] spawn trader_enter;"; - expDesactiv="[""trader city Lixovo"",true] spawn trader_leave;"; + expActiv="[""trader city Lixovo"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Lixovo"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1365,8 +1365,8 @@ class Mission age="UNKNOWN"; name="Wholesaler"; expCond="(player distance Wholesaler) < 100; "; - expActiv="[""Pauls Wholesale Camp"",true] spawn trader_enter;"; - expDesactiv="[""Pauls Wholesale Camp"",true] spawn trader_leave;"; + expActiv="[""Pauls Wholesale Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Pauls Wholesale Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1382,8 +1382,8 @@ class Mission age="UNKNOWN"; name="HeroVendor"; expCond="(player distance HeroVendor) < 100; "; - expActiv="[""Hero Camp"",true] spawn trader_enter;"; - expDesactiv="[""Hero Camp"",true] spawn trader_leave;"; + expActiv="[""Hero Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Hero Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1399,8 +1399,8 @@ class Mission age="UNKNOWN"; name="TraderCity2"; expCond="(player distance TraderCity2) < 100; "; - expActiv="[""trader city Didina"",true] spawn trader_enter;"; - expDesactiv="[""trader city Didina"",true] spawn trader_leave;"; + expActiv="[""trader city Didina"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Didina"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/mission.sqm index 5df49f8d3..a991563f8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/mission.sqm @@ -1338,8 +1338,8 @@ class Mission age="UNKNOWN"; name="ZoneRaven"; expCond="(player distance ZoneRaven) < 100;"; - expActiv="[""trader city Raven Rock"",true] spawn trader_enter;"; - expDesactiv="[""trader city Raven Rock"",true] spawn trader_leave;"; + expActiv="[""trader city Raven Rock"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Raven Rock"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1355,8 +1355,8 @@ class Mission age="UNKNOWN"; name="ZoneRaun"; expCond="(player distance ZoneRaun) < 100;"; - expActiv="[""trader city Raun"",true] spawn trader_enter;"; - expDesactiv="[""trader city Raun"",true] spawn trader_leave;"; + expActiv="[""trader city Raun"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Raun"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1372,8 +1372,8 @@ class Mission age="UNKNOWN"; name="ZoneHero"; expCond="(player distance ZoneHero) < 100;"; - expActiv="[""Hero Camp"",true] spawn trader_enter;"; - expDesactiv="[""Hero Camp"",true] spawn trader_leave;"; + expActiv="[""Hero Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Hero Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1389,8 +1389,8 @@ class Mission age="UNKNOWN"; name="ZoneSouthWholesale"; expCond="(player distance ZoneSouthWholesale) < 100;"; - expActiv="[""Wholesalers"",true] spawn trader_enter;"; - expDesactiv="[""Wholesalers"",true] spawn trader_leave;"; + expActiv="[""Wholesalers"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Wholesalers"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1406,8 +1406,8 @@ class Mission age="UNKNOWN"; name="ZoneAircraft"; expCond="(player distance ZoneAircraft) < 100;"; - expActiv="[""Airfield"",true] spawn trader_enter;"; - expDesactiv="[""Airfield"",true] spawn trader_leave;"; + expActiv="[""Airfield"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Airfield"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1423,8 +1423,8 @@ class Mission age="UNKNOWN"; name="ZoneBandit"; expCond="(player distance ZoneBandit) < 100;"; - expActiv="[""Bandit Camp"",true] spawn trader_enter;"; - expDesactiv="[""Bandit Camp"",true] spawn trader_leave;"; + expActiv="[""Bandit Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Bandit Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1440,8 +1440,8 @@ class Mission age="UNKNOWN"; name="ZoneNorthWholesale"; expCond="(player distance ZoneNorthWholesale) < 100;"; - expActiv="[""Wholesalers"",true] spawn trader_enter;"; - expDesactiv="[""Wholesalers"",true] spawn trader_leave;"; + expActiv="[""Wholesalers"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Wholesalers"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1457,8 +1457,8 @@ class Mission age="UNKNOWN"; name="ZoneBlackMarket"; expCond="(player distance ZoneBlackMarket) < 100;"; - expActiv="[""Black Market"",true] spawn trader_enter;"; - expDesactiv="[""Black Market"",true] spawn trader_leave;"; + expActiv="[""Black Market"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Black Market"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1474,8 +1474,8 @@ class Mission age="UNKNOWN"; name="ZoneBoat"; expCond="(player distance ZoneBoat) < 100;"; - expActiv="[""Boat Dealer"",true] spawn trader_enter;"; - expDesactiv="[""Boat Dealer"",true] spawn trader_leave;"; + expActiv="[""Boat Dealer"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Boat Dealer"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqm index c3666cd44..9268ff91a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqm @@ -1315,8 +1315,8 @@ class Mission age="UNKNOWN"; name="zone3"; expCond="(player distance zone3) < 100;"; - expActiv="[""trader city Corazol"",true] spawn trader_enter;"; - expDesactiv="[""trader city Corazol"",true] spawn trader_leave;"; + expActiv="[""trader city Corazol"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Corazol"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1332,8 +1332,8 @@ class Mission age="UNKNOWN"; name="zone2"; expCond="(player distance zone2) < 100;"; - expActiv="[""trader city Bag"",true] spawn trader_enter;"; - expDesactiv="[""trader city Bag"",true] spawn trader_leave;"; + expActiv="[""trader city Bag"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Bag"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1349,8 +1349,8 @@ class Mission age="UNKNOWN"; name="zone1"; expCond="(player distance zone1) < 100;"; - expActiv="[""trader city Ixel"",true] spawn trader_enter;"; - expDesactiv="[""trader city Ixel"",true] spawn trader_leave;"; + expActiv="[""trader city Ixel"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Ixel"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1364,8 +1364,8 @@ class Mission age="UNKNOWN"; name="bmarket"; expCond="(player distance bmarket) < 50;"; - expActiv="[""Black Market"",true] spawn trader_enter;"; - expDesactiv="[""Black Market"",true] spawn trader_leave;"; + expActiv="[""Black Market"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Black Market"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/mission.sqm index 7ffd6c0b4..c9fc2220b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/mission.sqm @@ -1349,8 +1349,8 @@ class Mission age="UNKNOWN"; name="TraderCity1"; expCond="(player distance TraderCity1) < 100; "; - expActiv="[""trader city Pikla"",true] spawn trader_enter;"; - expDesactiv="[""trader city Pikla"",true] spawn trader_leave;"; + expActiv="[""trader city Pikla"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Pikla"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1366,8 +1366,8 @@ class Mission age="UNKNOWN"; name="TraderCity2"; expCond="(player distance TraderCity2) < 100; "; - expActiv="[""trader city Selca"",true] spawn trader_enter;"; - expDesactiv="[""trader city Selca"",true] spawn trader_leave;"; + expActiv="[""trader city Selca"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Selca"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1383,8 +1383,8 @@ class Mission age="UNKNOWN"; name="HeroVendors"; expCond="(player distance HeroVendors) < 100; "; - expActiv="[""Hero Trader Camp"",true] spawn trader_enter;"; - expDesactiv="[""Hero Trader Camp"",true] spawn trader_leave;"; + expActiv="[""Hero Trader Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Hero Trader Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1400,8 +1400,8 @@ class Mission age="UNKNOWN"; name="WholeSaler1"; expCond="(player distance WholeSaler1) < 100; "; - expActiv="[""South's Wholesale"",true] spawn trader_enter;"; - expDesactiv="[""South's Wholesale"",true] spawn trader_leave;"; + expActiv="[""South's Wholesale"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""South's Wholesale"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1417,8 +1417,8 @@ class Mission age="UNKNOWN"; name="BanditTrader"; expCond="(player distance BanditTrader) < 100; "; - expActiv="[""Bandit Camp"",true] spawn trader_enter;"; - expDesactiv="[""Bandit Camp"",true] spawn trader_leave;"; + expActiv="[""Bandit Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Bandit Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1434,8 +1434,8 @@ class Mission age="UNKNOWN"; name="AWOLsAirField"; expCond="(player distance AWOLsAirField) < 100; "; - expActiv="[""AWOLs Airfield"",true] spawn trader_enter;"; - expDesactiv="[""AWOLs Airfield"",true] spawn trader_leave;"; + expActiv="[""AWOLs Airfield"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""AWOLs Airfield"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1451,8 +1451,8 @@ class Mission age="UNKNOWN"; name="Wholesaler2"; expCond="(player distance Wholesaler2) < 100; "; - expActiv="[""West's Wholesale"",true] spawn trader_enter;"; - expDesactiv="[""West's Wholesale"",true] spawn trader_leave;"; + expActiv="[""West's Wholesale"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""West's Wholesale"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1468,8 +1468,8 @@ class Mission age="UNKNOWN"; name="BoatVendor"; expCond="(player distance BoatVendor) < 100; "; - expActiv="[""Sams Boat Vendor"",true] spawn trader_enter;"; - expDesactiv="[""Sams Boat Vendor"",true] spawn trader_leave;"; + expActiv="[""Sams Boat Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Sams Boat Vendor"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1485,8 +1485,8 @@ class Mission age="UNKNOWN"; name="PlanicaTraders"; expCond="(player distance PlanicaTraders) < 100; "; - expActiv="[""trader city Planica"",true] spawn trader_enter;"; - expDesactiv="[""trader city Planica"",true] spawn trader_leave;"; + expActiv="[""trader city Planica"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Planica"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1502,8 +1502,8 @@ class Mission age="UNKNOWN"; name="PlanicaTraders_1"; expCond="(player distance PlanicaTraders) < 100; "; - expActiv="[""trader city Planica"",true] spawn trader_enter;"; - expDesactiv="[""trader city Planica"",true] spawn trader_leave;"; + expActiv="[""trader city Planica"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Planica"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_24.Napf/mission.sqm index e34632747..cf7c38e98 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/mission.sqm @@ -1344,8 +1344,8 @@ class Mission age="UNKNOWN"; name="Lenz"; expCond="(player distance Lenz) < 50;"; - expActiv="[""trader city Lenzburg"",true] spawn trader_enter;"; - expDesactiv="[""trader city Lenzburg"",true] spawn trader_leave;"; + expActiv="[""trader city Lenzburg"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Lenzburg"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1361,8 +1361,8 @@ class Mission age="UNKNOWN"; name="Emmen"; expCond="(player distance Emmen) < 100;"; - expActiv="[""trader city Emmen"",true] spawn trader_enter;"; - expDesactiv="[""trader city Emmen"",true] spawn trader_leave;"; + expActiv="[""trader city Emmen"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Emmen"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1378,8 +1378,8 @@ class Mission age="UNKNOWN"; name="Schratten"; expCond="(player distance Schratten) < 75;"; - expActiv="[""trader city Schratten"",true] spawn trader_enter;"; - expDesactiv="[""trader city Schratten"",true] spawn trader_leave;"; + expActiv="[""trader city Schratten"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Schratten"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1393,8 +1393,8 @@ class Mission age="UNKNOWN"; name="Bandit"; expCond="(player distance Bandit) < 50;"; - expActiv="[""Bandit Camp"",true] spawn trader_enter;"; - expDesactiv="[""Bandit Camp"",true] spawn trader_leave;"; + expActiv="[""Bandit Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Bandit Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1408,8 +1408,8 @@ class Mission age="UNKNOWN"; name="Hero"; expCond="(player distance Hero) < 50;"; - expActiv="[""Hero Vendor"",true] spawn trader_enter;"; - expDesactiv="[""Hero Vendor"",true] spawn trader_leave;"; + expActiv="[""Hero Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Hero Vendor"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1423,8 +1423,8 @@ class Mission age="UNKNOWN"; name="Wholesale1"; expCond="(player distance Wholesale1) < 50;"; - expActiv="[""West Wholesaler"",true] spawn trader_enter;"; - expDesactiv="[""West Wholesaler"",true] spawn trader_leave;"; + expActiv="[""West Wholesaler"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""West Wholesaler"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1438,8 +1438,8 @@ class Mission age="UNKNOWN"; name="Wholesaler"; expCond="(player distance Wholesaler) < 50;"; - expActiv="[""Wholesaler"",true] spawn trader_enter;"; - expDesactiv="[""Wholesaler"",true] spawn trader_leave;"; + expActiv="[""Wholesaler"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Wholesaler"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1453,8 +1453,8 @@ class Mission age="UNKNOWN"; name="Boat1"; expCond="(player distance boat1) < 50;"; - expActiv="[""Boat Vendor"",true] spawn trader_enter;"; - expDesactiv="[""Boat Vendor"",true] spawn trader_leave;"; + expActiv="[""Boat Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Boat Vendor"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1468,8 +1468,8 @@ class Mission age="UNKNOWN"; name="Boat2"; expCond="(player distance boat2) < 50;"; - expActiv="[""Boat Vendor"",true] spawn trader_enter;"; - expDesactiv="[""Boat Vendor"",true] spawn trader_leave;"; + expActiv="[""Boat Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Boat Vendor"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1483,8 +1483,8 @@ class Mission age="UNKNOWN"; name="AWOL"; expCond="(player distance awol) < 75;"; - expActiv="[""Aircraft Vendor"",true] spawn trader_enter;"; - expDesactiv="[""Aircraft Vendor"",true] spawn trader_leave;"; + expActiv="[""Aircraft Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Aircraft Vendor"",true,"leave"] spawn player_traderCity;"; class Effects { }; diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/mission.sqm index 01ab7e81f..a6a230658 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/mission.sqm @@ -1330,8 +1330,8 @@ class Mission age="UNKNOWN"; name="Seedorf"; expCond="(player distance Seedorf) < 100;"; - expActiv="[""Boat Vendor"",true] spawn trader_enter;"; - expDesactiv="[""Boat Vendor"",true] spawn trader_leave;"; + expActiv="[""Boat Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Boat Vendor"",true,"leave"] spawn player_traderCity;"; expActiv="TitleText[""Now Entering Trader City Seedorf"",""PLAIN DOWN""]; canbuild = false;"; expDesactiv="TitleText[""Now Leaving Trader City Seedorf"",""PLAIN DOWN""]; canbuild = true;"; class Effects @@ -1349,8 +1349,8 @@ class Mission age="UNKNOWN"; name="Oberdorf"; expCond="(player distance Oberdorf) < 100;"; - expActiv="[""trader city Oberdorf"",true] spawn trader_enter;"; - expDesactiv="[""trader city Oberdorf"",true] spawn trader_leave;"; + expActiv="[""trader city Oberdorf"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Oberdorf"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1366,8 +1366,8 @@ class Mission age="UNKNOWN"; name="Oberberg"; expCond="(player distance Oberberg) < 100;"; - expActiv="[""trader city Oberberg"",true] spawn trader_enter;"; - expDesactiv="[""trader city Oberberg"",true] spawn trader_leave;"; + expActiv="[""trader city Oberberg"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""trader city Oberberg"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1381,8 +1381,8 @@ class Mission age="UNKNOWN"; name="Bandit"; expCond="(player distance Bandit) < 50;"; - expActiv="[""Bandit Camp"",true] spawn trader_enter;"; - expDesactiv="[""Bandit Camp"",true] spawn trader_leave;"; + expActiv="[""Bandit Camp"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Bandit Camp"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1396,8 +1396,8 @@ class Mission age="UNKNOWN"; name="Hero"; expCond="(player distance Hero) < 50;"; - expActiv="[""Hero Vendor"",true] spawn trader_enter;"; - expDesactiv="[""Hero Vendor"",true] spawn trader_leave;"; + expActiv="[""Hero Vendor"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Hero Vendor"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1411,8 +1411,8 @@ class Mission age="UNKNOWN"; name="Wholesale1"; expCond="(player distance Wholesale1) < 50;"; - expActiv="[""Wholesaler"",true] spawn trader_enter;"; - expDesactiv="[""Wholesaler"",true] spawn trader_leave;"; + expActiv="[""Wholesaler"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Wholesaler"",true,"leave"] spawn player_traderCity;"; class Effects { }; @@ -1426,8 +1426,8 @@ class Mission age="UNKNOWN"; name="Wholesaler"; expCond="(player distance Wholesaler) < 50;"; - expActiv="[""Wholesaler"",true] spawn trader_enter;"; - expDesactiv="[""Wholesaler"",true] spawn trader_leave;"; + expActiv="[""Wholesaler"",true,"enter"] spawn player_traderCity;"; + expDesactiv="[""Wholesaler"",true,"leave"] spawn player_traderCity;"; class Effects { };