trying out interop and extended variants

Author: RepeatGitHub

Source/Variants/AlwaysPressGraffitiButton.cs

@@ -0,0 +1,36 @@
+using System;
+using Celeste;
+using Celeste.Mod.VinkiMod;
+using ExtendedVariants.Module;
+using MonoMod.Utils;
+using On.Celeste;
+
+namespace ExtendedVariants.Variants;
+
+public class AlwaysPressGraffitiButton : AbstractExtendedVariant
+{
+    public override void Load()
+    {
+        VinkiModModule.Session.AlwaysGrafButton=true;
+    }
+
+    public override void Unload()
+    {
+        VinkiModModule.Session.AlwaysGrafButton=false;
+    }
+
+    public override Type GetVariantType()
+    {
+        return typeof(bool);
+    }
+
+    public override object GetDefaultVariantValue()
+    {
+        return false;
+    }
+
+    public override object ConvertLegacyVariantValue(int value)
+    {
+        return value != 0;
+    }
+}

Source/VinkiMod.csproj

@@ -14,6 +14,7 @@
     <ItemGroup>
         <Reference Include="./lib/SkinModHelperPlus.dll" Private="false" />
         <Reference Include="./lib/Procedurline.dll" Private="false" />
+        <Reference Include="./lib/ExtendedVariantMode.dll" Private="false" />
         <Reference Include="$(CelestePrefix)\YamlDotNet.dll">
             <Private>false</Private>
         </Reference>

Source/VinkiModInterop.cs

@@ -0,0 +1,17 @@
+using Celeste.Mod.VinkiMod;
+using ExtendedVariants.Variants;
+using MonoMod.ModInterop;
+using System;
+using System.Linq;
+
+namespace VinkiMod.Module {
+    // A class providing some methods that can be called from Lua cutscenes, by doing:
+    // local luaCutscenesUtils = require("#ExtendedVariants.Module.LuaCutscenesUtils")
+    // luaCutscenesUtils.TriggerIntegerVariant(...)
+    [ModExportName("VinkiMod")]
+    public static class VinkiModInterop {
+        public static void AddGraffitiCharacter(string characterID) {
+            VinkiModModule.graffitiUsers=VinkiModModule.graffitiUsers.Append(characterID).ToArray();
+        }
+    }
+}

Source/VinkiModModule.cs

@@ -14,10 +14,12 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using MonoMod.Cil;
+using VinkiMod.Module;
 
 namespace Celeste.Mod.VinkiMod;
 
 public class VinkiModModule : EverestModule {
+        //ExtendedVariants.Module.ExtendedVariantsModule.Variant=ExtendedVariants.Variants.AlwaysPressGraffitiButton;
 
     public static VinkiModModule Instance;// { get; private set; }
 
@@ -30,6 +32,8 @@ public class VinkiModModule : EverestModule {
     public override Type SaveDataType => typeof(VinkiModSaveData);
     public static VinkiModSaveData SaveData => (VinkiModSaveData) Instance._SaveData;
 
+    public static String[] graffitiUsers = ["Vinki_Scug"];
+
     //but here's the :hunterglee: (the constants)
     public static String[] textureNamespaces = [
         "scenery/car/body","decals/1-forsakencity/big_sign_b","decals/1-forsakencity/camping_medium","decals/1-forsakencity/hanging_sign","decals/1-forsakencity/big_sign_e",//0-4
@@ -77,6 +81,7 @@ public VinkiModModule() {
     }
     private static List<ILHook> hooks = new List<ILHook>();
     public override void Load() {
+        typeof(VinkiModInterop).ModInterop();
         if (!Settings.MasterSwitch) {
             Everest.Events.Level.OnTransitionTo += triggerVinkiGUI1;
             Everest.Events.Level.OnEnter += triggerVinkiGUI2;
@@ -172,7 +177,7 @@ public static void vinkiButtonPress(On.Celeste.Player.orig_Update orig, Player s
         orig(self);
         // Then, the graffiti indicator is turned off.
         Session.vinkiRenderIt[0]=0;
-        if (SkinModHelperModule.GetPlayerSkinName(-1)=="Vinki_Scug") {
+        if (Array.IndexOf(graffitiUsers,SkinModHelperModule.GetPlayerSkinName(-1))!=-1) {
             if (!Session.sessionStuffLoaded) {
                 if (Array.IndexOf(hasArtSpots,self.SceneAs<Level>().Session.Area.SID+"_"+self.SceneAs<Level>().Session.Area.Mode.ToString())!=-1) {
                     Session.sessionArtSpots=artSpots[Array.IndexOf(hasArtSpots,self.SceneAs<Level>().Session.Area.SID+"_"+self.SceneAs<Level>().Session.Area.Mode.ToString())];
@@ -200,7 +205,7 @@ public static void vinkiButtonPress(On.Celeste.Player.orig_Update orig, Player s
     }
     // but here's the graffiti indicator
     private static void vinkiRenderer(Level self) {
-        if (SkinModHelperModule.GetPlayerSkinName(-1)=="Vinki_Scug") {
+        if (Array.IndexOf(graffitiUsers,SkinModHelperModule.GetPlayerSkinName(-1))!=-1) {
             // If Vinki's Skin is enabled, it adds these entities to the level first.
             self.Add(new GraffitiIndicator());
             // Also, if you're playing Prologue, the intro car's depth is set to 2. (I think.)
@@ -249,7 +254,7 @@ private static void DrawManipulator(ILContext ctx) {
     private static MTexture TextureReplacer(MTexture tex) {
         var among = -1;
         // Check if the player is ingame
-        if (SaveData!=null&&(SkinModHelperModule.GetPlayerSkinName(-1)=="Vinki_Scug"||Settings.HideIfNotVinki==0)) {
+        if (SaveData!=null&&(Array.IndexOf(graffitiUsers,SkinModHelperModule.GetPlayerSkinName(-1))!=-1||Settings.HideIfNotVinki==0)) {
             // If so, check if the settingsArtChanged.length is equal to or more than textureNamespaces.Length to prevent errors
             if (SaveData.settingsArtChanged.Length>=textureNamespaces.Length) {
                 // If so, check each textureNamespace to see if it's changed in the save data.

Source/VinkiModSession.cs

@@ -6,4 +6,5 @@ public class VinkiModSession : EverestModuleSession {
     public int[][] sessionArtSpots = [];
     public bool sessionStuffLoaded = false;
     public int[] vinkiRenderIt = [0,0,0,0,-1];
+    public bool AlwaysGrafButton = false;
 }