Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

item interaction fixes

Browse Source 
Allow eating of all seeds
Fixed no effect from nanite injector, nanite cream, nanite pills, iodide
pills
Provide feedback when attempting to use morphine when you dont need it.

NOTE:
when using Default as parent class InteractAction defaults to ammo
repack = 0
interactActions 1,2 ,6,7,8,9 are all do the same thing via
_unifiedInteract function
This commit is contained in:
vbawol 2017-10-20 08:06:36 -05:00
parent 2148634c58
commit 760547789f
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_code/compile/EPOCH_consumeItem.sqf
View File

@ -408,6 +408,8 @@ switch _interactOption do {
[format["Used %1 on yourself",_item call EPOCH_itemDisplayName], 5] call Epoch_message;
};
};
} else {
[format["%1 is not needed at this time",_item call EPOCH_itemDisplayName], 5] call Epoch_message;
};
};

33
Sources/epoch_config/Configs/CfgItemInteractions.hpp
View File

@ -908,14 +908,25 @@ class CfgItemInteractions
};
class ItemCanvas : Default {};
class ItemSeedBag : Default {};
class SeedPacket_GoldenSeal : Default {};
class SeedPacket_Hemp : Default {};
class SeedPacket_Poppy : Default {};
class SeedPacket_Pumpkin : Default {
interactActions[] = {{"EAT","[1,[['Immunity',1],['Toxicity',-1],['Stamina',15],['Hunger',100]],'ItemSeedBag'] call EPOCH_consumeItem;"}};
class SeedPacket_GoldenSeal : Food_base {
interactAttributes[] = {{"Toxicity",-1}};
interactReturnOnUse = "ItemSeedBag";
};
class SeedPacket_Sunflower : Default {
interactActions[] = {{"EAT","[1,[['Immunity',1],['Toxicity',-2],['Stamina',30],['Hunger',100]],'ItemSeedBag'] call EPOCH_consumeItem;"}};
class SeedPacket_Hemp : Food_base {
interactAttributes[] = {{"Immunity",1},{"Stamina",30},{"Hunger",100}};
interactReturnOnUse = "ItemSeedBag";
};
class SeedPacket_Poppy : Food_base {
interactAttributes[] = {{"Immunity",1},{"Stamina",30},{"Hunger",50}};
interactReturnOnUse = "ItemSeedBag";
};
class SeedPacket_Pumpkin : Food_base {
interactAttributes[] = {{"Immunity",1},{"Stamina",30},{"Hunger",100}};
interactReturnOnUse = "ItemSeedBag";
};
class SeedPacket_Sunflower : Food_base {
interactAttributes[] = {{"Immunity",1},{"Toxicity",-2},{"Stamina",30},{"Hunger",100}};
interactReturnOnUse = "ItemSeedBag";
};
class ItemBakedBeans : Food_TinCan_base
{
@ -988,22 +999,22 @@ class CfgItemInteractions
// todo should reduce hunger downtick for a duration, if too much is taken causes bowel issues?
interactAttributes[] = {{"Thirst",-20},{"Hunger",25},{"BloodP",-1}};
};
class nanite_cream_epoch : Default
class nanite_cream_epoch : Food_base
{
interactText = "USE";
interactAttributes[] = {{"Radiation",-25},{"Soiled",20},{"Toxicity",5},{"Immunity",5}};
};
class nanite_gun_epoch : Default
class nanite_gun_epoch : Food_base
{
interactText = "USE";
interactAttributes[] = {{"Radiation",-100},{"Toxicity",5},{"Immunity",5}};
};
class nanite_pills_epoch : Default
class nanite_pills_epoch : Food_base
{
interactText = "USE";
interactAttributes[] = {{"Radiation",-10},{"Thirst",-50},{"Toxicity",5},{"Immunity",5}};
};
class iodide_pills_epoch : Default
class iodide_pills_epoch : Food_base
{
interactText = "USE";
interactAttributes[] = {{"Radiation",-15},{"Thirst",-50},{"Immunity",5}};