Skip to content

Commit 9ccfb62

Browse files
authored
Merge pull request #155 from ArmaOverthrow/dev
0.7.5.0
2 parents 8123b78 + e9e2760 commit 9ccfb62

179 files changed

Lines changed: 11519 additions & 1809 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

addons/overthrow_main/CfgFunctions.hpp

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ class CfgFunctions
5959
class playerIsOwner {};
6060
class playerIsGeneral {};
6161
class playerIsAtWarehouse {};
62+
class playerIsAtHardwareStore {};
6263
class tutorial {};
6364
class influence {};
6465
class influenceSilent {};
@@ -67,6 +68,8 @@ class CfgFunctions
6768
class getPlayerHome {};
6869
class generalIsOnline {};
6970
class doConversation {};
71+
class givePlayerWaypoint {};
72+
class clearPlayerWaypoint {};
7073
};
7174

7275
class Interaction
@@ -106,6 +109,8 @@ class CfgFunctions
106109
class notifyStart {};
107110
class progressBar {};
108111
class getAssignedKey {};
112+
class formatTime {};
113+
class notifyAndLog {};
109114
};
110115

111116
class Dialogs
@@ -135,6 +140,10 @@ class CfgFunctions
135140
class characterSheetDialog {};
136141
class manageRecruitsDialog {};
137142
class loadoutDialog {};
143+
class buyHardwareDialog {};
144+
class sellHardwareDialog {};
145+
class jobsDialog {};
146+
class craftDialog {};
138147
};
139148

140149
class Display
@@ -145,6 +154,9 @@ class CfgFunctions
145154
class showMemberInfo {};
146155
class showBusinessInfo {};
147156
class refreshEmployees {};
157+
class displayJobDetails {};
158+
class displayCraftItem {};
159+
class factoryRefresh {};
148160
};
149161

150162
/*
@@ -159,6 +171,8 @@ class CfgFunctions
159171
/* Main Menu */
160172
class salvageWreck {};
161173
class buyBuilding {};
174+
class buyBusiness {};
175+
class manageArea {};
162176
class fastTravel {};
163177
class talkToCiv {};
164178
class recruitCiv {};
@@ -191,12 +205,12 @@ class CfgFunctions
191205
class sellAll {};
192206

193207
/* Gun Dealer */
194-
class getLocalMission {};
195208
class getMission {};
196209

197210
/* Factory */
198-
class factoryRefresh {};
199-
class factorySet {};
211+
class factoryQueueAdd {};
212+
class factoryQueueRemove {};
213+
class factoryQueueRemoveAll {};
200214

201215
/* Resistance Screen */
202216
class makeGeneral {};
@@ -206,6 +220,9 @@ class CfgFunctions
206220
class hireEmployee {};
207221
class fireEmployee {};
208222

223+
/* Jobs */
224+
class setJobWaypoint {};
225+
209226
/* Safe */
210227
class safePutMoney {};
211228
class safeTakeMoney {};
@@ -219,12 +236,23 @@ class CfgFunctions
219236
class takeStuff {};
220237

221238
/* Other */
239+
class craft {};
222240
class recruitSoldier {};
223241
class recruitSquad {};
224242
class addGarrison {};
225243
class addPolice {};
226244
class lockVehicle {};
227245
class reverseEngineer {};
246+
class playSound {};
247+
};
248+
class SelfActions
249+
{
250+
file = "\ot\functions\actions\self";
251+
/* Spliffs */
252+
class startSpliff {};
253+
class stopSpliff {};
254+
class smokeAnimation {};
255+
class smokePuffs {};
228256
};
229257

230258
/*
@@ -319,6 +347,7 @@ class CfgFunctions
319347
file = "\ot\functions\inventory";
320348
class takeFromCargoContainers {};
321349
class hasFromCargoContainers {};
350+
class anythingGetName {};
322351
class weaponGetName {};
323352
class magazineGetName {};
324353
class vehicleGetName {};
@@ -454,6 +483,18 @@ class CfgFunctions
454483
class NATOMortar {};
455484
};
456485

486+
class CRIM
487+
{
488+
file = "\ot\functions\factions\CRIM";
489+
class formOrJoinGang {};
490+
};
491+
492+
class GUER
493+
{
494+
file = "\ot\functions\factions\GUER";
495+
class jobSystem {};
496+
};
497+
457498
class Buildings
458499
{
459500
file = "\ot\functions\buildings";
@@ -473,6 +514,7 @@ class CfgFunctions
473514
file = "\ot\functions\integration";
474515
class initTFAR {};
475516
class advancedTowingInit {};
517+
class detectItems {};
476518
};
477519
};
478520
};
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
class CfgMagazines {
2+
class DemoCharge_Remote_Mag;
3+
class IEDUrbanSmall_Remote_Mag {
4+
ot_craftable = 1;
5+
ot_craftQuantity = 1;
6+
ot_craftRecipe = "[[""NLAW_F"",1],[""ACE_Cellphone"",1]]"
7+
}
8+
class IEDLandSmall_Remote_Mag {
9+
ot_craftable = 1;
10+
ot_craftQuantity = 1;
11+
ot_craftRecipe = "[[""NLAW_F"",1],[""ACE_Cellphone"",1]]"
12+
}
13+
class IEDUrbanBig_Remote_Mag {
14+
ot_craftable = 1;
15+
ot_craftQuantity = 1;
16+
ot_craftRecipe = "[[""NLAW_F"",4],[""ACE_Cellphone"",1]]"
17+
}
18+
class IEDLandBig_Remote_Mag {
19+
ot_craftable = 1;
20+
ot_craftQuantity = 1;
21+
ot_craftRecipe = "[[""NLAW_F"",4],[""ACE_Cellphone"",1]]"
22+
}
23+
}

0 commit comments

Comments
 (0)