Skip to content

Commit

Permalink
bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@armazac
armazac committed Jun 25, 2017
1 parent e9e2760 commit 2976e2c
Show file tree
Hide file tree
Showing 23 changed files with 282 additions and 232 deletions.
41 changes: 41 additions & 0 deletions addons/overthrow_main/CfgGlasses.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
class CfgGlasses {
class None;

class murshun_cigs_cig0: None {
author = "Rebel / Facel";
mass = 0.02;
displayName = "Spliff";
model = "\ot\models\cig0.p3d";
picture = "\ot\ui\icons\gear_cig0_x_ca";
identityTypes[]={};
ot_shopignore = 1;
};

class murshun_cigs_cig1: murshun_cigs_cig0 {
author = "Rebel / Facel";
displayName = "Spliff (Stage 1)";
model = "\ot\models\cig1.p3d";
picture = "\ot\ui\icons\gear_cig1_x_ca";
};

class murshun_cigs_cig2: murshun_cigs_cig0 {
author = "Rebel / Facel";
displayName = "Spliff (Stage 2)";
model = "\ot\models\cig2.p3d";
picture = "\ot\ui\icons\gear_cig2_x_ca";
};

class murshun_cigs_cig3: murshun_cigs_cig0 {
author = "Rebel / Facel";
displayName = "Spliff (Stage 3)";
model = "\ot\models\cig3.p3d";
picture = "\ot\ui\icons\gear_cig3_x_ca";
};

class murshun_cigs_cig4: murshun_cigs_cig0 {
author = "Rebel / Facel";
displayName = "Spliff (Stage 4)";
model = "\ot\models\cig4.p3d";
picture = "\ot\ui\icons\gear_cig4_x_ca";
};
};
75 changes: 75 additions & 0 deletions addons/overthrow_main/CfgMarkers.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
class CfgMarkers
{
class ot_Camp
{
name = "Camp";
icon = "ot\ui\markers\camp.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Shop
{
name = "Shop";
icon = "ot\ui\markers\shop.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Police
{
name = "Police";
icon = "ot\ui\markers\police.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Anarchy
{
name = "Anarchy";
icon = "ot\ui\markers\anarchy.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Warehouse
{
name = "Warehouse";
icon = "ot\ui\markers\warehouse.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Business
{
name = "Business";
icon = "ot\ui\markers\business.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Factory
{
name = "Factory";
icon = "ot\ui\markers\factory.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class flag_Malden
{
name = "Malden";
icon = "ot\flags\flag_malden.paa";
color[] = {1, 1, 1, 1};
size = 32;
shadow = true;
scope = 1;
};
};
20 changes: 20 additions & 0 deletions addons/overthrow_main/CfgSounds.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
class CfgSounds
{
sounds[] = {};

class ot_unwrap
{
sound[] = {"\ot\sounds\murshun_cigs_unwrap.ogg", 2, 1, 15};
titles[] = {};
};
class murshun_cigs_matches_01
{
sound[] = {"\ot\sounds\murshun_cigs_matches_01.ogg", 2, 1, 15};
titles[] = {};
};
class murshun_cigs_lighter_01
{
sound[] = {"\ot\sounds\murshun_cigs_lighter_01.ogg", 2, 1, 15};
titles[] = {};
};
};
11 changes: 10 additions & 1 deletion addons/overthrow_main/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#define MACRO_SALVAGEWRECK \
class ACE_Actions { \
class ACE_MainActions { \
class OT_Remove { \
condition = "!([player] call ace_repair_fnc_isInRepairFacility) and (_target call OT_fnc_hasOwner) and ((call OT_fnc_playerIsGeneral) or (_target call OT_fnc_playerIsOwner))"; \
displayName = "Remove"; \
statement = "deleteVehicle _target"; \
} \
class OT_Salvage { \
condition = "((damage _target) > 0.99 and ""ToolKit"" in (items player)) or [player] call ace_repair_fnc_isInRepairFacility"; \
displayName = "Salvage"; \
Expand Down Expand Up @@ -60,7 +65,7 @@ class CfgVehicles {
class CAManBase: Man {
class ACE_Actions {
class OT_HeadActions {
condition = "(!isplayer _target) and !(side _target == west)";
condition = "(alive _target) and (!isplayer _target) and !(side _target == west)";
selection = "pilot";
distance = 20;
displayName = "Talk";
Expand Down Expand Up @@ -207,6 +212,10 @@ class CfgVehicles {
};

//Shops (Malden)
class i_Shop_02_b_base_f : House_F {
ot_isShop = 1;
ot_template = '[]';
};
class Land_i_Shop_02_V3_F: House_F {
ot_isShop = 1;
ot_template = '[]';
Expand Down
2 changes: 1 addition & 1 deletion addons/overthrow_main/campaign/missions/Overthrow.Malden/initVar.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ OT_startCameraPos = [2717.66,7298.14,15];
OT_startCameraTarget = [3016.03,7171.53,0];

//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)
OT_economyVersion = 1;
OT_economyVersion = 2;
OT_NATOversion = 1;
OT_CRIMversion = 1;

Expand Down
4 changes: 2 additions & 2 deletions addons/overthrow_main/campaign/missions/Overthrow.Malden/mission.sqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class EditorData
};
class LayerIndexProvider
{
nextID=459;
nextID=464;
};
class Camera
{
Expand Down Expand Up @@ -507,7 +507,7 @@ class Mission
{
class Intel
{
briefingName="Overthrow.Altis";
briefingName="Overthrow.Malden";
resistanceWest=0;
startWeather=0.29173625;
startWind=0;
Expand Down
3 changes: 1 addition & 2 deletions addons/overthrow_main/campaign/missions/Overthrow.Tanoa/data/objectives.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ OT_objectiveData = [
[[3870.23,13412.4,0],"The Vehicle Range",300],
[[3939.27,13915,0],"The Camp Remnants",250],
[[3166.18,11038.8,0],"Belfort Naval Base",500],
[[5216.9,3656.3,0],"Chemical Plant",600],
[[7689.13,4191.38,0],"Le Port Base",300]
[[5216.9,3656.3,0],"Chemical Plant",600]
];
OT_NATO_HQ = "Tuvanaka Airbase";
OT_NATO_priority = ["Tuvanaka Airbase","Comms Alpha","96FM Georgetown","Comms Whiskey","Lijnhaven","Blue Pearl industrial port","Nani","Belfort","Tuvanaka"];
Expand Down
2 changes: 1 addition & 1 deletion addons/overthrow_main/campaign/missions/Overthrow.Tanoa/initVar.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ OT_startCameraTarget = [1420,535,5.8];

//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)
OT_economyVersion = 13;
OT_NATOversion = 8;
OT_NATOversion = 9;
OT_CRIMversion = 1;

OT_faction_NATO = "BLU_T_F";
Expand Down
143 changes: 4 additions & 139 deletions addons/overthrow_main/config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class CfgPatches
};
requiredVersion=REQUIRED_VERSION;
VERSION_CONFIG;
units[] = {"OT_GanjaItem","OT_BlowItem","OT_SpliffItem"};
units[] = {"OT_GanjaItem","OT_BlowItem"};
weapons[] = {"OT_Ganja","OT_Blow"};
};
};
Expand Down Expand Up @@ -122,82 +122,6 @@ class CfgMissions
};
};

class CfgMarkers
{
class ot_Camp
{
name = "Camp";
icon = "ot\ui\markers\camp.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Shop
{
name = "Shop";
icon = "ot\ui\markers\shop.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Police
{
name = "Police";
icon = "ot\ui\markers\police.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Anarchy
{
name = "Anarchy";
icon = "ot\ui\markers\anarchy.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Warehouse
{
name = "Warehouse";
icon = "ot\ui\markers\warehouse.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Business
{
name = "Business";
icon = "ot\ui\markers\business.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class ot_Factory
{
name = "Factory";
icon = "ot\ui\markers\factory.paa";
color[] = {1, 0, 0, 1};
size = 32;
shadow = true;
scope = 1;
};
class flag_Malden
{
name = "Malden";
icon = "ot\flags\flag_malden.paa";
color[] = {1, 1, 1, 1};
size = 32;
shadow = true;
scope = 1;
};
};

class CfgWorlds
{
class Tanoa
Expand All @@ -210,68 +134,9 @@ class CfgWorlds
};
};

class CfgGlasses {
class None;

class murshun_cigs_cig0: None {
author = "Rebel / Facel";
mass = 0.02;
displayName = "Spliff";
model = "\ot\models\cig0.p3d";
picture = "\ot\ui\icons\gear_cig0_x_ca";
identityTypes[]={};
};

class murshun_cigs_cig1: murshun_cigs_cig0 {
author = "Rebel / Facel";
displayName = "Spliff (Stage 1)";
model = "\ot\models\cig1.p3d";
picture = "\ot\ui\icons\gear_cig1_x_ca";
};

class murshun_cigs_cig2: murshun_cigs_cig0 {
author = "Rebel / Facel";
displayName = "Spliff (Stage 2)";
model = "\ot\models\cig2.p3d";
picture = "\ot\ui\icons\gear_cig2_x_ca";
};

class murshun_cigs_cig3: murshun_cigs_cig0 {
author = "Rebel / Facel";
displayName = "Spliff (Stage 3)";
model = "\ot\models\cig3.p3d";
picture = "\ot\ui\icons\gear_cig3_x_ca";
};

class murshun_cigs_cig4: murshun_cigs_cig0 {
author = "Rebel / Facel";
displayName = "Spliff (Stage 4)";
model = "\ot\models\cig4.p3d";
picture = "\ot\ui\icons\gear_cig4_x_ca";
};
};

class CfgSounds
{
sounds[] = {};

class ot_unwrap
{
sound[] = {"\ot\sounds\murshun_cigs_unwrap.ogg", 2, 1, 15};
titles[] = {};
};
class murshun_cigs_matches_01
{
sound[] = {"\ot\sounds\murshun_cigs_matches_01.ogg", 2, 1, 15};
titles[] = {};
};
class murshun_cigs_lighter_01
{
sound[] = {"\ot\sounds\murshun_cigs_lighter_01.ogg", 2, 1, 15};
titles[] = {};
};
};

#include "CfgMarkers.hpp"
#include "CfgGlasses.hpp"
#include "CfgSounds.hpp"
#include "CfgSettings.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
Expand Down
Loading

0 comments on commit 2976e2c

Please sign in to comment.