Skip to content

Commit

Permalink
Merge pull request #246 from MrPrimate/main
Browse files Browse the repository at this point in the history
v10 Support With Extras
  • Loading branch information
kandashi authored Nov 15, 2022
2 parents bc5e8bc + 808fd6e commit f2228e6
Show file tree
Hide file tree
Showing 14 changed files with 552 additions and 440 deletions.
25 changes: 24 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,27 @@ Fixed/updated all compendium items so they contain the macro in an Item Macro, t

## 0.4.07
Fixed for non-circular templates
Fixes for duplicate DF CE effects as the name would not match the aura-name
Fixes for duplicate DF CE effects as the name would not match the aura-name

## 0.4.20

v10 Support
Walls will now block again
Standardize on debounceCollate to help with state oscillation

# 0.4.21

New settings to apply/remove aura effects from hidden actors (not invisible). Defaults to true.

# 0.4.22

Duplicate macro removed.
Walls now block on templates again.

# 0.4.23

Some template auras would fail.

# 0.4.24

Handle cases of multiple GM's logged in.
4 changes: 3 additions & 1 deletion lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"ACTIVEAURAS.tabname": "Auras",
"ACTIVEAURAS.removeDead": "Remove Auras on death",
"ACTIVEAURAS.removeDeadHint": "On tokens reaching 0 hp, remove any auras they would provide, default on",
"ACTIVEAURAS.removeHiddenAuras": "Remove Auras on hidden tokens?",
"ACTIVEAURAS.removeHiddenAurasHint": "On tokens that are hidden, remove any auras they would provide, default on",
"ACTIVEAURAS.combatOnly" : "Auras in combat",
"ACTIVEAURAS.combatHint" : "Only check auras while a combat is active, this is for performance reasons and should be on unless you really need it off",
"ACTIVEAURAS.scrollingAura": "Disable scrolling text for auras",
Expand Down Expand Up @@ -46,4 +48,4 @@
"ACTIVEAURAS.RemoveLog":"ActiveAuras | Removed '{effectDataLabel}' from {tokenName}",
"ACTIVEAURAS.IgnoreSelfLog":"ActiveAuras | Ignoring '{effectDataLabel}' change {changeKey} to {actorName}",
"ACTIVEAURAS.SaveNotify": "${tokenName} passes the save against ${oldEffectDataLabel}"
}
}
46 changes: 25 additions & 21 deletions module.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{
"name": "ActiveAuras",
"id": "ActiveAuras",
"title": "Active-Auras",
"description": "Active-Auras",
"author": "Kandashi",
"authors": [],
"authors": [{
"name": "Kandashi"
}],
"url": "https://github.com/kandashi/Active-Auras",
"bugs": "https://github.com/kandashi/Active-Auras/issues",
"flags": {},
"version": "0.4.0",
"minimumCoreVersion": "9",
"compatibleCoreVersion": "9.242",
"version": "0.4.24",
"compatibility": {
"minimum": 10,
"verified": 10
},
"scripts": [
"src/aura.js",
"src/AAhelpers.js",
Expand Down Expand Up @@ -57,7 +60,7 @@
"name": "Active Auras Auras",
"label": "Active Auras Auras",
"path": "packs/AuraItems",
"entity": "Item",
"type": "Item",
"module": "ActiveAuras",
"private": false,
"system" : "dnd5e"
Expand All @@ -66,7 +69,7 @@
"name": "Active Auras Zone Actors",
"label": "Active Auras Zone Actors",
"path": "packs/ZoneActors",
"entity": "Actor",
"type": "Actor",
"system": "dnd5e",
"module": "ActiveAuras",
"private": false
Expand All @@ -75,23 +78,24 @@
"name": "Active Auras Macros",
"label": "Active Auras Macros",
"path": "packs/macros",
"entity": "Macro",
"type": "Macro",
"module": "ActiveAuras",
"private": false
}
],
"dependencies" : [
{
"name": "socketlib",
"manifest": "https://raw.githubusercontent.com/manuelVo/foundryvtt-socketlib/master/module.json"
},
{
"name": "lib-wrapper"
}
],
"relationships": {
"requires" : [
{
"id": "socketlib"
},
{
"id": "lib-wrapper"
}
]
},
"socket": true,
"manifest": "https://raw.githubusercontent.com/kandashi/Active-Auras/main/module.json",
"download": "https://github.com/kandashi/Active-Auras/archive/main.zip",
"manifest": "https://raw.githubusercontent.com/MrPrimate/Active-Auras/main/module.json",
"download": "https://github.com/MrPrimate/Active-Auras/archive/main.zip",
"protected": false,
"coreTranslation": false
}
}
28 changes: 14 additions & 14 deletions packs/AuraItems

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packs/ZoneActors
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"_id":"blnOhH5q6LWOSgYC","name":"Zone Effects","permission":{"default":0,"E4BVikjIkVl2lL2j":3},"type":"character","data":{"abilities":{"str":{"value":10,"proficient":0},"dex":{"value":10,"proficient":0},"con":{"value":10,"proficient":0},"int":{"value":10,"proficient":0},"wis":{"value":10,"proficient":0},"cha":{"value":10,"proficient":0}},"attributes":{"ac":{"value":10},"hp":{"value":10,"min":0,"max":10,"temp":null,"tempmax":null},"init":{"value":0,"bonus":0},"movement":{"burrow":0,"climb":0,"fly":0,"swim":0,"walk":30,"units":"ft","hover":false},"senses":{"darkvision":0,"blindsight":0,"tremorsense":0,"truesight":0,"units":"ft","special":""},"spellcasting":"int","death":{"success":0,"failure":0},"encumbrance":{"value":null,"max":null},"exhaustion":0,"inspiration":false},"details":{"biography":{"value":"","public":""},"alignment":"","race":"","background":"","xp":{"value":0,"min":0,"max":300},"appearance":"","trait":"","ideal":"","bond":"","flaw":""},"traits":{"size":"med","di":{"value":[],"custom":""},"dr":{"value":[],"custom":""},"dv":{"value":[],"custom":""},"ci":{"value":[],"custom":""},"languages":{"value":[],"custom":""},"weaponProf":{"value":[],"custom":""},"armorProf":{"value":[],"custom":""},"toolProf":{"value":[],"custom":""}},"currency":{"pp":0,"gp":0,"ep":0,"sp":0,"cp":0},"skills":{"acr":{"value":0,"ability":"dex"},"ani":{"value":0,"ability":"wis"},"arc":{"value":0,"ability":"int"},"ath":{"value":0,"ability":"str"},"dec":{"value":0,"ability":"cha"},"his":{"value":0,"ability":"int"},"ins":{"value":0,"ability":"wis"},"itm":{"value":0,"ability":"cha"},"inv":{"value":0,"ability":"int"},"med":{"value":0,"ability":"wis"},"nat":{"value":0,"ability":"int"},"prc":{"value":0,"ability":"wis"},"prf":{"value":0,"ability":"cha"},"per":{"value":0,"ability":"cha"},"rel":{"value":0,"ability":"int"},"slt":{"value":0,"ability":"dex"},"ste":{"value":0,"ability":"dex"},"sur":{"value":0,"ability":"wis"}},"spells":{"spell1":{"value":0,"override":null},"spell2":{"value":0,"override":null},"spell3":{"value":0,"override":null},"spell4":{"value":0,"override":null},"spell5":{"value":0,"override":null},"spell6":{"value":0,"override":null},"spell7":{"value":0,"override":null},"spell8":{"value":0,"override":null},"spell9":{"value":0,"override":null},"pact":{"value":0,"override":null}},"bonuses":{"mwak":{"attack":"","damage":""},"rwak":{"attack":"","damage":""},"msak":{"attack":"","damage":""},"rsak":{"attack":"","damage":""},"abilities":{"check":"","save":"","skill":""},"spell":{"dc":""}},"resources":{"primary":{"value":null,"max":null,"sr":false,"lr":false,"label":""},"secondary":{"value":null,"max":null,"sr":false,"lr":false,"label":""},"tertiary":{"value":null,"max":null,"sr":false,"lr":false,"label":""}}},"sort":100001,"flags":{},"token":{"flags":{},"name":"Zone Effects","displayName":0,"img":"icons/svg/mystery-man.svg","tint":null,"width":1,"height":1,"scale":1,"lockRotation":false,"rotation":0,"vision":true,"dimSight":30,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightAlpha":1,"lightAnimation":{"speed":5,"intensity":5},"actorId":"blnOhH5q6LWOSgYC","actorLink":true,"disposition":1,"displayBars":0,"bar1":{},"bar2":{},"randomImg":false},"items":[],"effects":[{"_id":"rmP4f6pWoK29nJ7F","flags":{"dae":{"macroRepeat":"none","specialDuration":["turnEnd"]},"ActiveAuras":{"isAura":true,"ignoreSelf":false,"hidden":false,"height":false,"alignment":"","type":"","aura":"None","radius":5,"save":"","savedc":null,"hostile":true,"onlyOnce":true,"time":"None"}},"changes":[{"key":"macro.execute","value":"\"AA DoT\" 1d6 fire","mode":0,"priority":20}],"disabled":false,"duration":{"startTime":null,"seconds":null,"rounds":null,"turns":null,"startRound":null,"startTurn":null},"icon":"icons/svg/aura.svg","label":"DAE Damge over time - edit effect value, requires DAE and Times Up","origin":"Actor.9n8trQy9SuvzNdMv","tint":""},{"_id":"sznrvl59zwvoQSPf","flags":{"dae":{"macroRepeat":"none"},"ActiveAuras":{"isAura":true,"ignoreSelf":false,"hidden":false,"height":false,"alignment":"","type":"","aura":"None","radius":5,"save":"","savedc":null,"hostile":false,"onlyOnce":false,"time":"None"}},"changes":[{"key":"data.attributes.movement.walk","value":0.5,"mode":1,"priority":20}],"disabled":false,"duration":{"startTime":null,"seconds":null,"rounds":null,"turns":null,"startRound":null,"startTurn":null},"icon":"icons/svg/aura.svg","label":"Slow Aura","origin":"Actor.9n8trQy9SuvzNdMv","tint":""},{"_id":"nrvryBcBA41UaSii","flags":{"dae":{"macroRepeat":"none","specialDuration":["turnEnd"]},"ActiveAuras":{"isAura":true,"ignoreSelf":false,"hidden":false,"height":false,"alignment":"","type":"","aura":"None","radius":5,"save":"","savedc":null,"hostile":true,"onlyOnce":true,"time":"None"}},"changes":[{"key":"macro.execute","value":"\"AA Cloudkill\" 15","mode":0,"priority":20}],"disabled":false,"duration":{"startTime":null,"seconds":null,"rounds":null,"turns":null,"startRound":null,"startTurn":null},"icon":"icons/svg/aura.svg","label":"Cloudkill (number in effect value is the DC) requires Times Up","origin":"Actor.9n8trQy9SuvzNdMv","tint":""}]}
{"_id":"blnOhH5q6LWOSgYC","name":"Zone Effects","type":"character","sort":100001,"flags":{},"items":[],"effects":[{"_id":"rmP4f6pWoK29nJ7F","flags":{"dae":{"macroRepeat":"none","specialDuration":["turnEnd"]},"ActiveAuras":{"isAura":true,"ignoreSelf":false,"hidden":false,"height":false,"alignment":"","type":"","aura":"None","radius":5,"save":"","savedc":null,"hostile":true,"onlyOnce":true,"time":"None"}},"changes":[{"key":"macro.execute","value":"\"AA DoT\" 1d6 fire","mode":0,"priority":20}],"disabled":false,"duration":{"startTime":null,"seconds":null,"rounds":null,"turns":null,"startRound":null,"startTurn":null,"combat":null},"icon":"icons/svg/aura.svg","label":"DAE Damge over time - edit effect value, requires DAE and Times Up","origin":"Actor.9n8trQy9SuvzNdMv","tint":null,"transfer":true},{"_id":"sznrvl59zwvoQSPf","flags":{"dae":{"macroRepeat":"none"},"ActiveAuras":{"isAura":true,"ignoreSelf":false,"hidden":false,"height":false,"alignment":"","type":"","aura":"None","radius":5,"save":"","savedc":null,"hostile":false,"onlyOnce":false,"time":"None"}},"changes":[{"key":"system.attributes.movement.walk","value":"0.5","mode":1,"priority":20}],"disabled":false,"duration":{"startTime":null,"seconds":null,"rounds":null,"turns":null,"startRound":null,"startTurn":null,"combat":null},"icon":"icons/svg/aura.svg","label":"Slow Aura","origin":"Actor.9n8trQy9SuvzNdMv","tint":null,"transfer":true},{"_id":"nrvryBcBA41UaSii","flags":{"dae":{"macroRepeat":"none","specialDuration":["turnEnd"]},"ActiveAuras":{"isAura":true,"ignoreSelf":false,"hidden":false,"height":false,"alignment":"","type":"","aura":"None","radius":5,"save":"","savedc":null,"hostile":true,"onlyOnce":true,"time":"None"}},"changes":[{"key":"macro.execute","value":"\"AA Cloudkill\" 15","mode":0,"priority":20}],"disabled":false,"duration":{"startTime":null,"seconds":null,"rounds":null,"turns":null,"startRound":null,"startTurn":null,"combat":null},"icon":"icons/svg/aura.svg","label":"Cloudkill (number in effect value is the DC) requires Times Up","origin":"Actor.9n8trQy9SuvzNdMv","tint":null,"transfer":true}],"system":{"abilities":{"str":{"value":10,"proficient":0,"bonuses":{"check":"","save":""}},"dex":{"value":10,"proficient":0,"bonuses":{"check":"","save":""}},"con":{"value":10,"proficient":0,"bonuses":{"check":"","save":""}},"int":{"value":10,"proficient":0,"bonuses":{"check":"","save":""}},"wis":{"value":10,"proficient":0,"bonuses":{"check":"","save":""}},"cha":{"value":10,"proficient":0,"bonuses":{"check":"","save":""}}},"attributes":{"ac":{"flat":10,"calc":"flat","formula":""},"hp":{"value":10,"min":0,"max":10,"temp":null,"tempmax":null},"init":{"value":0,"bonus":0},"movement":{"burrow":0,"climb":0,"fly":0,"swim":0,"walk":30,"units":"ft","hover":false},"attunement":{"max":3},"senses":{"darkvision":0,"blindsight":0,"tremorsense":0,"truesight":0,"units":"ft","special":""},"spellcasting":"int","death":{"success":0,"failure":0},"exhaustion":0,"inspiration":false,"encumbrance":{"value":null,"max":null}},"details":{"biography":{"value":"","public":""},"alignment":"","race":"","background":"","originalClass":"","xp":{"value":0,"min":0,"max":300},"appearance":"","trait":"","ideal":"","bond":"","flaw":""},"traits":{"size":"med","di":{"value":[],"custom":""},"dr":{"value":[],"custom":""},"dv":{"value":[],"custom":""},"ci":{"value":[],"custom":""},"languages":{"value":[],"custom":""},"weaponProf":{"value":[],"custom":""},"armorProf":{"value":[],"custom":""},"toolProf":{"value":[],"custom":""}},"currency":{"pp":0,"gp":0,"ep":0,"sp":0,"cp":0},"skills":{"acr":{"value":0,"ability":"dex","bonuses":{"check":"","passive":""}},"ani":{"value":0,"ability":"wis","bonuses":{"check":"","passive":""}},"arc":{"value":0,"ability":"int","bonuses":{"check":"","passive":""}},"ath":{"value":0,"ability":"str","bonuses":{"check":"","passive":""}},"dec":{"value":0,"ability":"cha","bonuses":{"check":"","passive":""}},"his":{"value":0,"ability":"int","bonuses":{"check":"","passive":""}},"ins":{"value":0,"ability":"wis","bonuses":{"check":"","passive":""}},"itm":{"value":0,"ability":"cha","bonuses":{"check":"","passive":""}},"inv":{"value":0,"ability":"int","bonuses":{"check":"","passive":""}},"med":{"value":0,"ability":"wis","bonuses":{"check":"","passive":""}},"nat":{"value":0,"ability":"int","bonuses":{"check":"","passive":""}},"prc":{"value":0,"ability":"wis","bonuses":{"check":"","passive":""}},"prf":{"value":0,"ability":"cha","bonuses":{"check":"","passive":""}},"per":{"value":0,"ability":"cha","bonuses":{"check":"","passive":""}},"rel":{"value":0,"ability":"int","bonuses":{"check":"","passive":""}},"slt":{"value":0,"ability":"dex","bonuses":{"check":"","passive":""}},"ste":{"value":0,"ability":"dex","bonuses":{"check":"","passive":""}},"sur":{"value":0,"ability":"wis","bonuses":{"check":"","passive":""}}},"spells":{"spell1":{"value":0,"override":null},"spell2":{"value":0,"override":null},"spell3":{"value":0,"override":null},"spell4":{"value":0,"override":null},"spell5":{"value":0,"override":null},"spell6":{"value":0,"override":null},"spell7":{"value":0,"override":null},"spell8":{"value":0,"override":null},"spell9":{"value":0,"override":null},"pact":{"value":0,"override":null}},"bonuses":{"mwak":{"attack":"","damage":""},"rwak":{"attack":"","damage":""},"msak":{"attack":"","damage":""},"rsak":{"attack":"","damage":""},"abilities":{"check":"","save":"","skill":""},"spell":{"dc":""}},"resources":{"primary":{"value":null,"max":null,"sr":false,"lr":false,"label":""},"secondary":{"value":null,"max":null,"sr":false,"lr":false,"label":""},"tertiary":{"value":null,"max":null,"sr":false,"lr":false,"label":""}}},"ownership":{"default":0,"E4BVikjIkVl2lL2j":3},"prototypeToken":{"flags":{},"name":"Zone Effects","displayName":0,"width":1,"height":1,"lockRotation":false,"rotation":0,"actorLink":true,"disposition":1,"displayBars":0,"bar1":{"attribute":"attributes.hp"},"bar2":{"attribute":null},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"alpha":1,"animation":{"speed":5,"intensity":5,"type":null,"reverse":false},"color":null,"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"icons/svg/mystery-man.svg","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":true,"range":30,"brightness":0,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"img":"icons/svg/mystery-man.svg","folder":null,"_stats":{"systemId":"dnd5e","systemVersion":"2.0.1","coreVersion":"10.283","createdTime":1662274930116,"modifiedTime":1662274930149,"lastModifiedBy":"GrX6tFOozYFBnDHq"}}
Loading

0 comments on commit f2228e6

Please sign in to comment.