Skip to content

Commit

Permalink
Matches and lighter models.
Browse files Browse the repository at this point in the history
  • Loading branch information
rebelvg committed Dec 3, 2015
1 parent 428b897 commit 7d25eb9
Show file tree
Hide file tree
Showing 10 changed files with 92 additions and 18 deletions.
63 changes: 48 additions & 15 deletions addons/murshun_cigs/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ class CfgPatches
{
class murshun_cigs
{
units[] = {};
weapons[] = {};
units[] = {"murshun_cigs_matchesItem", "murshun_cigs_lighterItem"};
weapons[] = {"murshun_cigs_matches", "murshun_cigs_lighter"};
requiredVersion = 1;
requiredAddons[] = {"ace_common", "ace_interaction", "ace_interact_menu", "ewk_cigs"};
author[] = {"rebel"};
authorUrl = "http://podkolpakom.net/";
requiredAddons[] = {"ace_main", "ace_common", "ace_interaction", "ace_interact_menu", "ewk_cigs"};
version = "1.13";
};
};

Expand All @@ -25,7 +24,7 @@ class CfgVehicles
condition = "((goggles _player) in murshun_cigs_cigsArray) and (!(_player getVariable ['murshun_cigs_cigLitUp', false])) and ((_player getVariable ['murshun_cigs_cigTime', 0]) <= 330)";
statement = "[_player, _player] spawn murshun_cigs_fnc_start_cig";
showDisabled = 0;
exceptions[] = {"isNotInside"};
exceptions[] = {"isNotInside", "isNotSitting"};
icon = "murshun_cigs\logo.paa";
};
class murshun_cigs_stop_cig
Expand All @@ -34,7 +33,7 @@ class CfgVehicles
condition = "((goggles _player) in murshun_cigs_cigsArray) and ((_player getVariable ['murshun_cigs_cigLitUp', false]))";
statement = "[_player] spawn murshun_cigs_fnc_stop_cig";
showDisabled = 0;
exceptions[] = {"isNotInside"};
exceptions[] = {"isNotInside", "isNotSitting"};
icon = "murshun_cigs\logo.paa";
};
};
Expand All @@ -46,45 +45,79 @@ class CfgVehicles
class murshun_cigs_start_someones_cig
{
displayName = "Light His Cig Up";
condition = "((goggles _target) in murshun_cigs_cigsArray) and (!(_target getVariable ['murshun_cigs_cigLitUp', false])) and ((_target getVariable ['murshun_cigs_cigTime', 0]) <= 330) and (alive _target)";
condition = "((goggles _target) in murshun_cigs_cigsArray) and (!(_target getVariable ['murshun_cigs_cigLitUp', false])) and (alive _target)";
statement = "[_target, _player] spawn murshun_cigs_fnc_start_cig_MP";
showDisabled = 0;
icon = "murshun_cigs\logo.paa";
};
};
};
};

class Item_Base_F;

class murshun_cigs_matchesItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
displayName = "Matches";
author = "rebel / facel";
vehicleClass = "Items";

class TransportItems {
class murshun_cigs_matches {
name = "murshun_cigs_matches";
count = "1";
};
};
};

class murshun_cigs_lighterItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
displayName = "Lighter";
author = "rebel / facel";
vehicleClass = "Items";

class TransportItems {
class murshun_cigs_lighter {
name = "murshun_cigs_lighter";
count = "1";
};
};
};
};

class CfgWeapons {
class ACE_ItemCore;
class InventoryItem_Base_F;

class murshun_cigs_matches: ACE_ItemCore {
author = "rebel";
author = "rebel / facel";
scope = 2;
scopeCurator = 2;
displayName = "Matches";
descriptionShort = "Only 10 matches per box.";
model = "\A3\weapons_F\ammo\mag_univ.p3d";
model = "\murshun_cigs\matches.p3d";
picture = "\murshun_cigs\UI\gear_murshun_cigs_matches_x_ca";

class ItemInfo: InventoryItem_Base_F {
mass = 1;
model = "\A3\weapons_F\ammo\mag_univ.p3d";
model = "\murshun_cigs\matches.p3d";
};
};

class murshun_cigs_lighter: ACE_ItemCore {
author = "rebel";
author = "rebel / facel";
scope = 2;
scopeCurator = 2;
displayName = "Lighter";
descriptionShort = "Unlimited lighting possibilities.";
model = "\A3\weapons_F\ammo\mag_univ.p3d";
model = "\murshun_cigs\lighter.p3d";
picture = "\murshun_cigs\UI\gear_murshun_cigs_lighter_x_ca";

class ItemInfo: InventoryItem_Base_F {
mass = 1;
model = "\A3\weapons_F\ammo\mag_univ.p3d";
model = "\murshun_cigs\lighter.p3d";
};
};
};
Expand Down Expand Up @@ -155,7 +188,7 @@ class CfgFunctions
class murshun_cigs
{
file = "murshun_cigs\functions";
class init
class cigsInit
{
postInit = 1;
};
Expand Down
Binary file added addons/murshun_cigs/data/lighter.paa
Binary file not shown.
41 changes: 41 additions & 0 deletions addons/murshun_cigs/data/lighter.rvmat
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
class StageTI
{
texture="a3\characters_f\blufor\data\armor1_ti_ca.paa";
};
ambient[]={1,1,1,1};
diffuse[]={1,1,1,1};
forcedDiffuse[]={0,0,0,0};
emmisive[]={0,0,0,1};
specular[]={1,1,1,0};
specularPower=50;
PixelShaderID="NormalMapSpecularDIMap";
VertexShaderID="NormalMap";
class Stage0
{
texture="murshun_cigs\data\lighter.paa";
uvSource="tex";
};
class Stage1
{
texture="murshun_cigs\data\lighter_nohq.paa";
uvSource="tex";
class uvTransform
{
aside[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,1};
pos[]={0,0,0};
};
};
class Stage2
{
texture="murshun_cigs\data\lighter_smdi.paa";
uvSource="tex";
class uvTransform
{
aside[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,1};
pos[]={0,0,0};
};
};
Binary file added addons/murshun_cigs/data/lighter_nohq.paa
Binary file not shown.
Binary file added addons/murshun_cigs/data/lighter_smdi.paa
Binary file not shown.
Binary file added addons/murshun_cigs/data/matches.paa
Binary file not shown.
File renamed without changes.
Binary file added addons/murshun_cigs/lighter.p3d
Binary file not shown.
Binary file added addons/murshun_cigs/matches.p3d
Binary file not shown.
6 changes: 3 additions & 3 deletions mod.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name = "Murshun Cigs 1.12";
name = "Murshun Cigs 1.13";
picture = "murshun_cigs.paa";
actionName = "Website";
action = "http://podkolpakom.net/";
Expand All @@ -7,8 +7,8 @@ logo = "murshun_cigs.paa";
logoOver = "murshun_cigs.paa";
tooltip = "Murshun Cigs";
tooltipOwned = "";
overview = "Cigarette script turned into a mod";
author = "rebel";
overview = "Cigarette script turned into a mod.";
author = "rebel / facel";
overviewPicture = "murshun_cigs.paa";
overviewText = "Murshun Cigs";
overviewFootnote = "";

0 comments on commit 7d25eb9

Please sign in to comment.