Skip to content

Commit

Permalink
Fixed mythic elements tables
Browse files Browse the repository at this point in the history
  • Loading branch information
@saif-ellafi
saif-ellafi committed Apr 8, 2023
1 parent 40b77f6 commit 4dc8335
Show file tree
Hide file tree
Showing 10 changed files with 313 additions and 49 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
### 2.8.1
* Enhancement: Added the tables for GUM Extended
* Bugfix: Adjusted window size for resizable panel
* Bugfix: Fixed incorrect resizable behavior for panels
* Bugfix: Better organized GUM tables
* Bugfix: Fixed accidentally broken mythic-2e random tables

### 2.8.0
* Enhancement: Included the rulesets for my Game Unfolding Machine homebrew
Expand Down
4 changes: 2 additions & 2 deletions module.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"ko-fi": "https://ko-fi.com/jeansenvaars"
}
],
"version": "2.8.0",
"version": "2.8.1",
"url": "https://github.com/saif-ellafi/foundryvtt-mythic-gme.git",
"manifest": "https://github.com/saif-ellafi/foundryvtt-mythic-gme/releases/latest/download/module.json",
"download": "https://github.com/saif-ellafi/foundryvtt-mythic-gme/releases/download/2.8.0/foundryvtt-mythic-gme_2.8.0.zip",
"download": "https://github.com/saif-ellafi/foundryvtt-mythic-gme/releases/download/2.8.1/foundryvtt-mythic-gme_2.8.1.zip",
"changelog": "https://github.com/saif-ellafi/foundryvtt-mythic-gme/blob/master/CHANGELOG.md",
"compatibility": {
"minimum": "10",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foundryvtt-mythic-gme",
"version": "2.8.0",
"version": "2.8.1",
"description": "A set of Macros and Random Tables for playing with the Mythic Game Master Emulator",
"main": "mythic-gme-tools.js",
"scripts": {
Expand Down
16 changes: 16 additions & 0 deletions packs/game-unfolding-machine.db
View file

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions src/app/panel-gum.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,27 @@ export default class GUMPanel extends MGMEPanel {
html.find("#gum_act_good").click(api.gumActionGood);
html.find("#gum_act_evil").click(api.gumActionEvil);

// GUM Extended

html.find("#gume_probe_world").click(api.gumeProberWorld);
html.find("#gume_probe_scene").click(api.gumeProberScene);
html.find("#gume_scene_kick").click(api.gumeSceneKicker);

html.find("#gume_interact_beh").click(api.gumeInteractionBehavior);
html.find("#gume_interact_cont").click(api.gumeInteractionContribution);
html.find("#gume_interact_req").click(api.gumeInteractionRequest);
html.find("#gume_interact_res").click(api.gumeInteractionResponse);

html.find("#gume_discovery_past").click(api.gumeDiscoveryPast);
html.find("#gume_discovery_future").click(api.gumeDiscoveryFuture);
html.find("#gume_discovery_clue").click(api.gumeDiscoveryClues);
html.find("#gume_discovery_reason").click(api.gumeDiscoveryReason);

html.find("#gume_enemy_event").click(api.gumeEnemyEvents);
html.find("#gume_enemy_feeling").click(api.gumeEnemyFeelings);
html.find("#gume_enemy_risk").click(api.gumeEnemyRisks);
html.find("#gume_enemy_threat").click(api.gumeEnemyThreats);

}

}
3 changes: 1 addition & 2 deletions src/app/panel-mythic-gme-2e.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ export default class MGME2ePanel extends MGMEPanel {
html.find("#mgme_el_cavern").click(api.mgmeCaverns);
html.find("#mgme_el_characters").click(api.mgmeCharacters);
html.find("#mgme_el_charcomb").click(api.mgmeCharacterCombat);
html.find("#mgme_el_charact").click(api.mgmeCharacters);
html.find("#mgme_el_charact").click(api.mgmeCharacterActions);
html.find("#mgme_el_charapp").click(api.mgmeCharacterAppearance);
html.find("#mgme_el_charback").click(api.mgmeCharacterBackground);
html.find("#mgme_el_charconv").click(api.mgmeCharacterConversation);
html.find("#mgme_el_chardesc").click(api.mgmeCharacterDescriptors);
html.find("#mgme_el_charid").click(api.mgmeCharacterIdentity);
Expand Down
124 changes: 124 additions & 0 deletions src/logic/gum-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,4 +404,128 @@ export default class GUMCore {
);
}

// GUM Extended scripts

static gumeProberWorld() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Prober World'},
'Brain Prober - World',
false
);
}

static gumeProberScene() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Prober Scene'},
'Brain Prober - Scene',
false
);
}

static gumeSceneKicker() {
MGMEOracleUtils._mgmeMultipleTableOracle([
{name: 'GUM-E Scene Kicker A', key: 'What PCs could find'},
{name: 'GUM-E Scene Kicker B', key: 'is'}
],
'Scene Kicker',
false
);
}

static gumeInteractionBehavior() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Interaction Behavior'},
'NPC Interaction - Behavior',
false
);
}

static gumeInteractionContribution() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Interaction Contribution'},
'NPC Interaction - Contribution',
false
);
}

static gumeInteractionRequest() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Interaction Request'},
'NPC Interaction - Request',
false
);
}

static gumeInteractionResponse() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Interaction Response'},
'NPC Interaction - Response',
false
);
}

static gumeDiscoveryClues() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Discovery Clues'},
'Plot Discovery - Clues & info',
false
);
}

static gumeDiscoveryFuture() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Discovery Future'},
'Plot Discovery - Future actions',
false
);
}

static gumeDiscoveryPast() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Discovery Past'},
'Plot Discovery - Past deeds',
false
);
}

static gumeDiscoveryReason() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Discovery Reason'},
'Plot Discovery - Reasons',
false
);
}

static gumeEnemyEvents() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Enemy Events'},
'Enemy Actions - Recent events',
false
);
}

static gumeEnemyFeelings() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Enemy Feelings'},
'Enemy Actions - Feelings & insights',
false
);
}

static gumeEnemyRisks() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Enemy Risks'},
'Enemy Actions - Risks',
false
);
}

static gumeEnemyThreats() {
MGMEOracleUtils._mgmeSimpleTableOracle(
{name: 'GUM-E Enemy Threats'},
'Enemy Actions - Threats',
false
);
}

}
148 changes: 106 additions & 42 deletions src/mgme-macros.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,6 @@ import GUMCore from "./logic/gum-core";
import MGMECore2e from "./logic/mgme-core-2e";

export default class MGMEMacroAPI {
static mgmeIncreaseChaos = MGMECore.mgmeIncreaseChaos;
static mgmeDecreaseChaos = MGMECore.mgmeDecreaseChaos;
static mgmeCheckChaos = MGMECore.mgmeCheckChaos;
static mgmeFateChart = MGMECore.mgmeFateChart;
static mgmeRandomEvent = MGMECore.mgmeRandomEvent;
static mgmeFocusCheck = MGMECore.mgmeFocusCheck;
static mgmeSceneAlteration = MGMECore.mgmeSceneAlteration;

static mgmeComplexQuestion = MGMEVariations1.mgmeComplexQuestion;
static mgmeBackstoryGenerator = MGMEVariations1.mgmeBackstoryGenerator;

static mgmeFateCheck = MGMEVariations2.mgmeFateCheck;
static mgmeEventCheck = MGMEVariations2.mgmeEventCheck;
static mgmeDetailDescriptionCheck = MGMEVariations2.mgmeDetailDescriptionCheck;
static mgmeDetailActionCheck = MGMEVariations2.mgmeDetailActionCheck;
static mgmeStatisticCheck = MGMEVariations2.mgmeStatisticCheck;
static mgmeBehaviorCheck = MGMEVariations2.mgmeBehaviorCheck;
static mgmeDetailCheck = MGMEVariations2.mgmeDetailCheck;

static mgmeRngLocCrafterPPShift = MGMECrafterSeries.mgmeRngLocCrafterPPShift;
static mgmeRngLocCrafter = MGMECrafterSeries.mgmeRngLocCrafter;

static mgmeDealCard = MGMECards.mgmeDealCard;

static mgmeExportChatToJournal = MGMEChatExtras.mgmeExportChatToJournal;
static mgmeFormattedChat = MGMEChatExtras.mgmeFormattedChat;
static mgmeExternalRollTable = MGMEChatExtras.mgmeExternalRollTable;
static mgmeFlavoredRollTable = MGMEChatExtras.mgmeFlavoredRollTable;

static mgmeOracleBuilder = MGMEOracleBuilder.mgmeOracleBuilder;
static mgmePrepareCustomOracleQuestion = MGMEOracleBuilder.mgmePrepareCustomOracleQuestion;

static mgmeRenderNPCsList = MGMEChatExtras.mgmeRenderNPCsList;
static mgmeRollNPCsList = MGMEChatExtras.mgmeRollNPCsList;
static mgmeRenderThreadsList = MGMEChatExtras.mgmeRenderThreadsList;
static mgmeRollThreadsList = MGMEChatExtras.mgmeRollThreadsList;

static mgmeRenderNPCsList2e = MGMECore2e.mgmeRenderNPCsList2e;
static mgmeRollNPCsList2e = MGMECore2e.mgmeRollNPCsList2e;
static mgmeRenderThreadsList2e = MGMECore2e.mgmeRenderThreadsList2e;
static mgmeRollThreadsList2e = MGMECore2e.mgmeRollThreadsList2e;

static mgmeLaunchPanel() {
if (game.settings.get('mythic-gme-tools', 'panelPermission') === 'onlygm' && !game.user.isGM) {
Expand Down Expand Up @@ -87,7 +46,7 @@ export default class MGMEMacroAPI {
winWidth = 420;
resizable = true;
break;
}
}
case 'mgme_vars1': {
win = new MGMEVars1Panel();
break;
Expand Down Expand Up @@ -123,6 +82,93 @@ export default class MGMEMacroAPI {
api.win = win;
}

static mgmeIncreaseChaos = MGMECore.mgmeIncreaseChaos;
static mgmeDecreaseChaos = MGMECore.mgmeDecreaseChaos;
static mgmeCheckChaos = MGMECore.mgmeCheckChaos;
static mgmeFateChart = MGMECore.mgmeFateChart;
static mgmeRandomEvent = MGMECore.mgmeRandomEvent;
static mgmeFocusCheck = MGMECore.mgmeFocusCheck;
static mgmeSceneAlteration = MGMECore.mgmeSceneAlteration;

static mgmeComplexQuestion = MGMEVariations1.mgmeComplexQuestion;
static mgmeBackstoryGenerator = MGMEVariations1.mgmeBackstoryGenerator;

static mgmeFateCheck = MGMEVariations2.mgmeFateCheck;
static mgmeEventCheck = MGMEVariations2.mgmeEventCheck;
static mgmeDetailDescriptionCheck = MGMEVariations2.mgmeDetailDescriptionCheck;
static mgmeDetailActionCheck = MGMEVariations2.mgmeDetailActionCheck;
static mgmeStatisticCheck = MGMEVariations2.mgmeStatisticCheck;
static mgmeBehaviorCheck = MGMEVariations2.mgmeBehaviorCheck;
static mgmeDetailCheck = MGMEVariations2.mgmeDetailCheck;

static mgmeRngLocCrafterPPShift = MGMECrafterSeries.mgmeRngLocCrafterPPShift;
static mgmeRngLocCrafter = MGMECrafterSeries.mgmeRngLocCrafter;

static mgmeDealCard = MGMECards.mgmeDealCard;

static mgmeExportChatToJournal = MGMEChatExtras.mgmeExportChatToJournal;
static mgmeFormattedChat = MGMEChatExtras.mgmeFormattedChat;
static mgmeExternalRollTable = MGMEChatExtras.mgmeExternalRollTable;
static mgmeFlavoredRollTable = MGMEChatExtras.mgmeFlavoredRollTable;

static mgmeOracleBuilder = MGMEOracleBuilder.mgmeOracleBuilder;
static mgmePrepareCustomOracleQuestion = MGMEOracleBuilder.mgmePrepareCustomOracleQuestion;

static mgmeRenderNPCsList = MGMEChatExtras.mgmeRenderNPCsList;
static mgmeRollNPCsList = MGMEChatExtras.mgmeRollNPCsList;
static mgmeRenderThreadsList = MGMEChatExtras.mgmeRenderThreadsList;
static mgmeRollThreadsList = MGMEChatExtras.mgmeRollThreadsList;

static mgmeRenderNPCsList2e = MGMECore2e.mgmeRenderNPCsList2e;
static mgmeRollNPCsList2e = MGMECore2e.mgmeRollNPCsList2e;
static mgmeRenderThreadsList2e = MGMECore2e.mgmeRenderThreadsList2e;
static mgmeRollThreadsList2e = MGMECore2e.mgmeRollThreadsList2e;

static mgmeAdvTone = MGMECore2e.mgmeAdvTone;
static mgmeAlienSpecies = MGMECore2e.mgmeAlienSpecies;
static mgmeAnimalActions = MGMECore2e.mgmeAnimalActions;
static mgmeArmyDescriptors = MGMECore2e.mgmeArmyDescriptors;
static mgmeCaverns = MGMECore2e.mgmeCaverns;
static mgmeCharacters = MGMECore2e.mgmeCharacters;
static mgmeCharacterCombat = MGMECore2e.mgmeCharacterCombat;
static mgmeCharacterActions = MGMECore2e.mgmeCharacterActions;
static mgmeCharacterAppearance = MGMECore2e.mgmeCharacterAppearance;
static mgmeCharacterConversation = MGMECore2e.mgmeCharacterConversation;
static mgmeCharacterDescriptors = MGMECore2e.mgmeCharacterDescriptors;
static mgmeCharacterIdentity = MGMECore2e.mgmeCharacterIdentity;
static mgmeCharacterMotivations = MGMECore2e.mgmeCharacterMotivations;
static mgmeCharacterPersonality = MGMECore2e.mgmeCharacterPersonality;
static mgmeCharacterSkills = MGMECore2e.mgmeCharacterSkills;
static mgmeCharacterTraits = MGMECore2e.mgmeCharacterTraits;
static mgmeCityDescriptors = MGMECore2e.mgmeCityDescriptors;
static mgmeCivilizationDescriptors = MGMECore2e.mgmeCivilizationDescriptors;
static mgmeCreatureAbilities = MGMECore2e.mgmeCreatureAbilities;
static mgmeCreatureDescriptors = MGMECore2e.mgmeCreatureDescriptors;
static mgmeCrypticMessage = MGMECore2e.mgmeCrypticMessage;
static mgmeCurses = MGMECore2e.mgmeCurses;
static mgmeDomicile = MGMECore2e.mgmeDomicile;
static mgmeDungeonDescriptors = MGMECore2e.mgmeDungeonDescriptors;
static mgmeDungeonTraps = MGMECore2e.mgmeDungeonTraps;
static mgmeForestDescriptors = MGMECore2e.mgmeForestDescriptors;
static mgmeGods = MGMECore2e.mgmeGods;
static mgmeLegends = MGMECore2e.mgmeLegends;
static mgmeLocations = MGMECore2e.mgmeLocations;
static mgmeMagicItem = MGMECore2e.mgmeMagicItem;
static mgmeMutationDescriptors = MGMECore2e.mgmeMutationDescriptors;
static mgmeNames = MGMECore2e.mgmeNames;
static mgmeNobleHouse = MGMECore2e.mgmeNobleHouse;
static mgmeObjects = MGMECore2e.mgmeObjects;
static mgmePlotTwists = MGMECore2e.mgmePlotTwists;
static mgmePowers = MGMECore2e.mgmePowers;
static mgmeScavengingResults = MGMECore2e.mgmeScavengingResults;
static mgmeSmells = MGMECore2e.mgmeSmells;
static mgmeSounds = MGMECore2e.mgmeSounds;
static mgmeSpellEffects = MGMECore2e.mgmeSpellEffects;
static mgmeStarshipDescriptors = MGMECore2e.mgmeStarshipDescriptors;
static mgmeTerrainDescriptors = MGMECore2e.mgmeTerrainDescriptors;
static mgmeUndeadDescriptors = MGMECore2e.mgmeUndeadDescriptors;
static mgmeVisions = MGMECore2e.mgmeVisions;

static pumScenePrompt = PUMCore.pumScenePrompt;
static pumExpectationChecker = PUMCore.pumExpectationChecker;
static pumChallenge = PUMCore.pumChallenge;
Expand Down Expand Up @@ -217,4 +263,22 @@ export default class MGMEMacroAPI {
static gumSceneDesign = GUMCore.gumSceneDesign;
static gumChallenge = GUMCore.gumChallenge;

// GUM Extended

static gumeProberWorld = GUMCore.gumeProberWorld;
static gumeProberScene = GUMCore.gumeProberScene;
static gumeSceneKicker = GUMCore.gumeSceneKicker;
static gumeInteractionBehavior = GUMCore.gumeInteractionBehavior;
static gumeInteractionContribution = GUMCore.gumeInteractionContribution;
static gumeInteractionRequest = GUMCore.gumeInteractionRequest;
static gumeInteractionResponse = GUMCore.gumeInteractionResponse;
static gumeDiscoveryClues = GUMCore.gumeDiscoveryClues;
static gumeDiscoveryFuture = GUMCore.gumeDiscoveryFuture;
static gumeDiscoveryPast = GUMCore.gumeDiscoveryPast;
static gumeDiscoveryReason = GUMCore.gumeDiscoveryReason;
static gumeEnemyEvents = GUMCore.gumeEnemyEvents;
static gumeEnemyFeelings = GUMCore.gumeEnemyFeelings;
static gumeEnemyRisks = GUMCore.gumeEnemyRisks;
static gumeEnemyThreats = GUMCore.gumeEnemyThreats;

}
Loading

0 comments on commit 4dc8335

Please sign in to comment.