Skip to content

Commit 2976e2c

Browse files
armazacarmazac
committed
bugfixes
1 parent e9e2760 commit 2976e2c

23 files changed

Lines changed: 282 additions & 232 deletions

‎addons/overthrow_main/CfgGlasses.hpp‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
class CfgGlasses {
2+
class None;
3+
4+
class murshun_cigs_cig0: None {
5+
author = "Rebel / Facel";
6+
mass = 0.02;
7+
displayName = "Spliff";
8+
model = "\ot\models\cig0.p3d";
9+
picture = "\ot\ui\icons\gear_cig0_x_ca";
10+
identityTypes[]={};
11+
ot_shopignore = 1;
12+
};
13+
14+
class murshun_cigs_cig1: murshun_cigs_cig0 {
15+
author = "Rebel / Facel";
16+
displayName = "Spliff (Stage 1)";
17+
model = "\ot\models\cig1.p3d";
18+
picture = "\ot\ui\icons\gear_cig1_x_ca";
19+
};
20+
21+
class murshun_cigs_cig2: murshun_cigs_cig0 {
22+
author = "Rebel / Facel";
23+
displayName = "Spliff (Stage 2)";
24+
model = "\ot\models\cig2.p3d";
25+
picture = "\ot\ui\icons\gear_cig2_x_ca";
26+
};
27+
28+
class murshun_cigs_cig3: murshun_cigs_cig0 {
29+
author = "Rebel / Facel";
30+
displayName = "Spliff (Stage 3)";
31+
model = "\ot\models\cig3.p3d";
32+
picture = "\ot\ui\icons\gear_cig3_x_ca";
33+
};
34+
35+
class murshun_cigs_cig4: murshun_cigs_cig0 {
36+
author = "Rebel / Facel";
37+
displayName = "Spliff (Stage 4)";
38+
model = "\ot\models\cig4.p3d";
39+
picture = "\ot\ui\icons\gear_cig4_x_ca";
40+
};
41+
};

‎addons/overthrow_main/CfgMarkers.hpp‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
class CfgMarkers
2+
{
3+
class ot_Camp
4+
{
5+
name = "Camp";
6+
icon = "ot\ui\markers\camp.paa";
7+
color[] = {1, 0, 0, 1};
8+
size = 32;
9+
shadow = true;
10+
scope = 1;
11+
};
12+
class ot_Shop
13+
{
14+
name = "Shop";
15+
icon = "ot\ui\markers\shop.paa";
16+
color[] = {1, 0, 0, 1};
17+
size = 32;
18+
shadow = true;
19+
scope = 1;
20+
};
21+
class ot_Police
22+
{
23+
name = "Police";
24+
icon = "ot\ui\markers\police.paa";
25+
color[] = {1, 0, 0, 1};
26+
size = 32;
27+
shadow = true;
28+
scope = 1;
29+
};
30+
class ot_Anarchy
31+
{
32+
name = "Anarchy";
33+
icon = "ot\ui\markers\anarchy.paa";
34+
color[] = {1, 0, 0, 1};
35+
size = 32;
36+
shadow = true;
37+
scope = 1;
38+
};
39+
class ot_Warehouse
40+
{
41+
name = "Warehouse";
42+
icon = "ot\ui\markers\warehouse.paa";
43+
color[] = {1, 0, 0, 1};
44+
size = 32;
45+
shadow = true;
46+
scope = 1;
47+
};
48+
class ot_Business
49+
{
50+
name = "Business";
51+
icon = "ot\ui\markers\business.paa";
52+
color[] = {1, 0, 0, 1};
53+
size = 32;
54+
shadow = true;
55+
scope = 1;
56+
};
57+
class ot_Factory
58+
{
59+
name = "Factory";
60+
icon = "ot\ui\markers\factory.paa";
61+
color[] = {1, 0, 0, 1};
62+
size = 32;
63+
shadow = true;
64+
scope = 1;
65+
};
66+
class flag_Malden
67+
{
68+
name = "Malden";
69+
icon = "ot\flags\flag_malden.paa";
70+
color[] = {1, 1, 1, 1};
71+
size = 32;
72+
shadow = true;
73+
scope = 1;
74+
};
75+
};

‎addons/overthrow_main/CfgSounds.hpp‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
class CfgSounds
2+
{
3+
sounds[] = {};
4+
5+
class ot_unwrap
6+
{
7+
sound[] = {"\ot\sounds\murshun_cigs_unwrap.ogg", 2, 1, 15};
8+
titles[] = {};
9+
};
10+
class murshun_cigs_matches_01
11+
{
12+
sound[] = {"\ot\sounds\murshun_cigs_matches_01.ogg", 2, 1, 15};
13+
titles[] = {};
14+
};
15+
class murshun_cigs_lighter_01
16+
{
17+
sound[] = {"\ot\sounds\murshun_cigs_lighter_01.ogg", 2, 1, 15};
18+
titles[] = {};
19+
};
20+
};

‎addons/overthrow_main/CfgVehicles.hpp‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#define MACRO_SALVAGEWRECK \
22
class ACE_Actions { \
33
class ACE_MainActions { \
4+
class OT_Remove { \
5+
condition = "!([player] call ace_repair_fnc_isInRepairFacility) and (_target call OT_fnc_hasOwner) and ((call OT_fnc_playerIsGeneral) or (_target call OT_fnc_playerIsOwner))"; \
6+
displayName = "Remove"; \
7+
statement = "deleteVehicle _target"; \
8+
} \
49
class OT_Salvage { \
510
condition = "((damage _target) > 0.99 and ""ToolKit"" in (items player)) or [player] call ace_repair_fnc_isInRepairFacility"; \
611
displayName = "Salvage"; \
@@ -60,7 +65,7 @@ class CfgVehicles {
6065
class CAManBase: Man {
6166
class ACE_Actions {
6267
class OT_HeadActions {
63-
condition = "(!isplayer _target) and !(side _target == west)";
68+
condition = "(alive _target) and (!isplayer _target) and !(side _target == west)";
6469
selection = "pilot";
6570
distance = 20;
6671
displayName = "Talk";
@@ -207,6 +212,10 @@ class CfgVehicles {
207212
};
208213

209214
//Shops (Malden)
215+
class i_Shop_02_b_base_f : House_F {
216+
ot_isShop = 1;
217+
ot_template = '[]';
218+
};
210219
class Land_i_Shop_02_V3_F: House_F {
211220
ot_isShop = 1;
212221
ot_template = '[]';

‎addons/overthrow_main/campaign/missions/Overthrow.Malden/initVar.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ OT_startCameraPos = [2717.66,7298.14,15];
99
OT_startCameraTarget = [3016.03,7171.53,0];
1010

1111
//Used to control updates and persistent save compatability. When these numbers go up, that section will be reinitialized on load if required. (ie leave them alone)
12-
OT_economyVersion = 1;
12+
OT_economyVersion = 2;
1313
OT_NATOversion = 1;
1414
OT_CRIMversion = 1;
1515

‎addons/overthrow_main/campaign/missions/Overthrow.Malden/mission.sqm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class EditorData
1616
};
1717
class LayerIndexProvider
1818
{
19-
nextID=459;
19+
nextID=464;
2020
};
2121
class Camera
2222
{
@@ -507,7 +507,7 @@ class Mission
507507
{
508508
class Intel
509509
{
510-
briefingName="Overthrow.Altis";
510+
briefingName="Overthrow.Malden";
511511
resistanceWest=0;
512512
startWeather=0.29173625;
513513
startWind=0;

‎addons/overthrow_main/campaign/missions/Overthrow.Tanoa/data/objectives.sqf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ OT_objectiveData = [
66
[[3870.23,13412.4,0],"The Vehicle Range",300],
77
[[3939.27,13915,0],"The Camp Remnants",250],
88
[[3166.18,11038.8,0],"Belfort Naval Base",500],
9-
[[5216.9,3656.3,0],"Chemical Plant",600],
10-
[[7689.13,4191.38,0],"Le Port Base",300]
9+
[[5216.9,3656.3,0],"Chemical Plant",600]
1110
];
1211
OT_NATO_HQ = "Tuvanaka Airbase";
1312
OT_NATO_priority = ["Tuvanaka Airbase","Comms Alpha","96FM Georgetown","Comms Whiskey","Lijnhaven","Blue Pearl industrial port","Nani","Belfort","Tuvanaka"];

‎addons/overthrow_main/campaign/missions/Overthrow.Tanoa/initVar.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ OT_startCameraTarget = [1420,535,5.8];
1010

1111
//Used to control updates and persistent save compatability. When these numbers go up, that section will be reinitialized on load if required. (ie leave them alone)
1212
OT_economyVersion = 13;
13-
OT_NATOversion = 8;
13+
OT_NATOversion = 9;
1414
OT_CRIMversion = 1;
1515

1616
OT_faction_NATO = "BLU_T_F";

‎addons/overthrow_main/config.cpp‎

Lines changed: 4 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CfgPatches
2727
};
2828
requiredVersion=REQUIRED_VERSION;
2929
VERSION_CONFIG;
30-
units[] = {"OT_GanjaItem","OT_BlowItem","OT_SpliffItem"};
30+
units[] = {"OT_GanjaItem","OT_BlowItem"};
3131
weapons[] = {"OT_Ganja","OT_Blow"};
3232
};
3333
};
@@ -122,82 +122,6 @@ class CfgMissions
122122
};
123123
};
124124

125-
class CfgMarkers
126-
{
127-
class ot_Camp
128-
{
129-
name = "Camp";
130-
icon = "ot\ui\markers\camp.paa";
131-
color[] = {1, 0, 0, 1};
132-
size = 32;
133-
shadow = true;
134-
scope = 1;
135-
};
136-
class ot_Shop
137-
{
138-
name = "Shop";
139-
icon = "ot\ui\markers\shop.paa";
140-
color[] = {1, 0, 0, 1};
141-
size = 32;
142-
shadow = true;
143-
scope = 1;
144-
};
145-
class ot_Police
146-
{
147-
name = "Police";
148-
icon = "ot\ui\markers\police.paa";
149-
color[] = {1, 0, 0, 1};
150-
size = 32;
151-
shadow = true;
152-
scope = 1;
153-
};
154-
class ot_Anarchy
155-
{
156-
name = "Anarchy";
157-
icon = "ot\ui\markers\anarchy.paa";
158-
color[] = {1, 0, 0, 1};
159-
size = 32;
160-
shadow = true;
161-
scope = 1;
162-
};
163-
class ot_Warehouse
164-
{
165-
name = "Warehouse";
166-
icon = "ot\ui\markers\warehouse.paa";
167-
color[] = {1, 0, 0, 1};
168-
size = 32;
169-
shadow = true;
170-
scope = 1;
171-
};
172-
class ot_Business
173-
{
174-
name = "Business";
175-
icon = "ot\ui\markers\business.paa";
176-
color[] = {1, 0, 0, 1};
177-
size = 32;
178-
shadow = true;
179-
scope = 1;
180-
};
181-
class ot_Factory
182-
{
183-
name = "Factory";
184-
icon = "ot\ui\markers\factory.paa";
185-
color[] = {1, 0, 0, 1};
186-
size = 32;
187-
shadow = true;
188-
scope = 1;
189-
};
190-
class flag_Malden
191-
{
192-
name = "Malden";
193-
icon = "ot\flags\flag_malden.paa";
194-
color[] = {1, 1, 1, 1};
195-
size = 32;
196-
shadow = true;
197-
scope = 1;
198-
};
199-
};
200-
201125
class CfgWorlds
202126
{
203127
class Tanoa
@@ -210,68 +134,9 @@ class CfgWorlds
210134
};
211135
};
212136

213-
class CfgGlasses {
214-
class None;
215-
216-
class murshun_cigs_cig0: None {
217-
author = "Rebel / Facel";
218-
mass = 0.02;
219-
displayName = "Spliff";
220-
model = "\ot\models\cig0.p3d";
221-
picture = "\ot\ui\icons\gear_cig0_x_ca";
222-
identityTypes[]={};
223-
};
224-
225-
class murshun_cigs_cig1: murshun_cigs_cig0 {
226-
author = "Rebel / Facel";
227-
displayName = "Spliff (Stage 1)";
228-
model = "\ot\models\cig1.p3d";
229-
picture = "\ot\ui\icons\gear_cig1_x_ca";
230-
};
231-
232-
class murshun_cigs_cig2: murshun_cigs_cig0 {
233-
author = "Rebel / Facel";
234-
displayName = "Spliff (Stage 2)";
235-
model = "\ot\models\cig2.p3d";
236-
picture = "\ot\ui\icons\gear_cig2_x_ca";
237-
};
238-
239-
class murshun_cigs_cig3: murshun_cigs_cig0 {
240-
author = "Rebel / Facel";
241-
displayName = "Spliff (Stage 3)";
242-
model = "\ot\models\cig3.p3d";
243-
picture = "\ot\ui\icons\gear_cig3_x_ca";
244-
};
245-
246-
class murshun_cigs_cig4: murshun_cigs_cig0 {
247-
author = "Rebel / Facel";
248-
displayName = "Spliff (Stage 4)";
249-
model = "\ot\models\cig4.p3d";
250-
picture = "\ot\ui\icons\gear_cig4_x_ca";
251-
};
252-
};
253-
254-
class CfgSounds
255-
{
256-
sounds[] = {};
257-
258-
class ot_unwrap
259-
{
260-
sound[] = {"\ot\sounds\murshun_cigs_unwrap.ogg", 2, 1, 15};
261-
titles[] = {};
262-
};
263-
class murshun_cigs_matches_01
264-
{
265-
sound[] = {"\ot\sounds\murshun_cigs_matches_01.ogg", 2, 1, 15};
266-
titles[] = {};
267-
};
268-
class murshun_cigs_lighter_01
269-
{
270-
sound[] = {"\ot\sounds\murshun_cigs_lighter_01.ogg", 2, 1, 15};
271-
titles[] = {};
272-
};
273-
};
274-
137+
#include "CfgMarkers.hpp"
138+
#include "CfgGlasses.hpp"
139+
#include "CfgSounds.hpp"
275140
#include "CfgSettings.hpp"
276141
#include "CfgVehicles.hpp"
277142
#include "CfgWeapons.hpp"

0 commit comments

Comments
 (0)