-
Notifications
You must be signed in to change notification settings - Fork 736
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add cargo eden attributes #4780
Merged
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
dedce4f
Add cargo eden attributes
kymckay 1c741a2
Limit cargo size attribute to physics objects
kymckay 9b08a76
Add cargo size and space public API
kymckay c1fe0cb
Deprecate cargo makeLoadable module
kymckay 6169af9
Fix vehicles being loadable with crew inside
kymckay de4ed43
Revert "Fix vehicles being loadable with crew inside"
kymckay 1c5cf54
Fix duplicate actions added with cargo API
kymckay c04a639
Fix JIP compatibility of cargo public API
kymckay f98448e
Optimize cargo API functions
kymckay 40a8005
Remove locality option from public functions
kymckay 0cdbc5c
Merge branch 'master' into edenCargo
PabstMirror d17838e
Linter cleanup
PabstMirror 9633773
Fix merge problems, make paradrop safer
PabstMirror 61b4586
Merge branch 'master' into edenCargo
PabstMirror File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#define GET_NUMBER(config,default) (if (isNumber (config)) then {getNumber (config)} else {default}) | ||
|
||
class Cfg3DEN { | ||
class Object { | ||
class AttributeCategories { | ||
class ace_attributes { | ||
class Attributes { | ||
class GVAR(space) { | ||
displayName = CSTRING(space_edenName); | ||
tooltip = CSTRING(space_edenDesc); | ||
property = QGVAR(space); | ||
control = "Edit"; | ||
|
||
expression = QUOTE(_this setVariable [ARR_3('%s',_value,true)];); | ||
defaultValue = QUOTE(GET_NUMBER(configFile >> 'CfgVehicles' >> typeOf _this >> QQGVAR(space),-1)); | ||
|
||
validate = "number"; | ||
condition = "objectHasInventoryCargo"; | ||
typeName = "NUMBER"; | ||
}; | ||
class GVAR(size) { | ||
displayName = CSTRING(size_edenName); | ||
tooltip = CSTRING(size_edenDesc); | ||
property = QGVAR(size); | ||
control = "Edit"; | ||
|
||
// Expression only runs on the server, must handle actions for all machines and future JIPs (Why BI?!) | ||
expression = QUOTE(_this setVariable [ARR_3('%s',_value,true)]; [QQGVAR(EdenObjectInit),_this] call CBA_fnc_globalEventJIP;); | ||
defaultValue = QUOTE(GET_NUMBER(configFile >> 'CfgVehicles' >> typeOf _this >> QQGVAR(size),-1)); | ||
|
||
validate = "number"; | ||
condition = "1-objectBrain"; | ||
typeName = "NUMBER"; | ||
}; | ||
}; | ||
}; | ||
}; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just realised there's a missing
ARR_2
here that I must have added on my local version after committing. Rest assured, that's not what was making theinitObject
call fail to work.