Skip to content

Commit

Permalink
trying to fix stuff (got rando compat while i was waiting!)
Browse files Browse the repository at this point in the history
  • Loading branch information
RepeatGitHub committed May 22, 2024
1 parent b1f55f2 commit f8cf9a6
Show file tree
Hide file tree
Showing 4 changed files with 197 additions and 37 deletions.
45 changes: 45 additions & 0 deletions Dialog/English.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,56 @@
# Regular name stuff
modname_VinkiMod= Vinki's Ascent
VinkiMod_Funny= Vinki's Ascent - Maps
VinkiMod_Funny_PebblesTrip= Visiting Your Rival
SkinModHelper_Player__Vinki_Scug= Vinki

# Settings
VinkiMod_GraffitiButton= Use Graffiti
VinkiMod_MasterSwitch= Disable Mod
VinkiMod_HideIfNotVinki= Graffiti Display Settings
modoptions_vinkimod_HideIfNotVinki_All= All Characters
modoptions_vinkimod_HideIfNotVinki_VinkiOnly= Vinki Only
VinkiMod_ResetCurrentSaveButton= Reset Current Save Menu
VinkiMod_AreYouSure= Are you sure?

# Funny randomizer stuff
RANDOHEART_ADJ_44=Sick
RANDOHEART_ADJ_COUNT=45
RANDOHEART_NOUN_41=Kick
RANDOHEART_NOUN_42=Rainpod
RANDOHEART_NOUN_43=Slugcat
RANDOHEART_NOUN_COUNT=44
RANDOHEART_PLURALNOUN_41=Kicks
RANDOHEART_PLURALNOUN_42=Rainpods
RANDOHEART_PLURALNOUN_43=Slugcats
RANDOHEART_PLURALNOUN_COUNT=44
RANDOHEART_VERB_28=Swim
RANDOHEART_VERB_29=Skate
RANDOHEART_VERB_COUNT=30
RANDOHEART_VERBED_28=Swim
RANDOHEART_VERBED_29=Skate
RANDOHEART_VERBED_COUNT=30
RANDOHEART_FILEEXTENSION_9=yaml
RANDOHEART_FILEEXTENSION_COUNT=10
RANDOHEART_WORST_25=not gonna give you up
RANDOHEART_WORST_26=having a bad day
RANDOHEART_WORST_COUNT=27
RANDOHEART_IMPOSSIBLE_9=THAT'S A PUMBER
RANDOHEART_IMPOSSIBLE_11=GRUH
RANDOHEART_IMPOSSIBLE_12=:hunterglee:
RANDOHEART_IMPOSSIBLE_13=THAT'S NOT TUBULAR
RANDOHEART_IMPOSSIBLE_COUNT=14
RANDOHEART_THEOPHONE_18=robot yaoi fanfics ao3
RANDOHEART_THEOPHONE_19=where to find cool sunglasses
RANDOHEART_THEOPHONE_19=what the hell are soap shoes
RANDOHEART_THEOPHONE_COUNT+=21
RANDOHEART_FRUIT_9=Neuron
RANDOHEART_FRUIT_10=Bluefruit
RANDOHEART_FRUIT_11=Eggbug
RANDOHEART_FRUIT_12=Popcorn
RANDOHEART_FRUIT_COUNT=13
RANDOHEART_WAVEDASHING_42=Vandalism
RANDOHEART_WAVEDASHING_43=Rail-Grinding
RANDOHEART_WAVEDASHING_44=Skill Issues
RANDOHEART_WAVEDASHING_45=Vandalism
RANDOHEART_WAVEDASHING_COUNT=46
43 changes: 38 additions & 5 deletions Source/GraffitiIndicator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,54 @@ public GraffitiIndicator() {
AddTag(Tags.Persistent);
}

//public override void Update() {
// base.Update();
public override void Update() {
base.Update();
//
// // thank u extended variants
// if (Collider != null && CollideAll<Solid>().Any(solid => solid.Depth < (Depths.FGTerrain + Depths.FGDecals) / 2)) {
// Depth = Depths.FakeWalls - 1;
// } else {
// Depth = (Depths.FGTerrain + Depths.FGDecals) / 2;
// }
//}
Player self = null;
Logger.Log(LogLevel.Warn,"VinkiModa","aaaa");
if (Scene.Tracker.GetEntity<Player>()!=null) {
self = Scene.Tracker.GetEntity<Player>();
Logger.Log(LogLevel.Warn,"VinkiModc","cccc");
}
VinkiModModule.Session.vinkiRenderIt[0]=0;
if (VinkiModModule.isGraffitiUser()&&self!=null) {
if (!VinkiModModule.Session.sessionStuffLoaded) {
if (Array.IndexOf(VinkiModModule.hasArtSpots,self.SceneAs<Level>().Session.Area.SID+"_"+self.SceneAs<Level>().Session.Area.Mode.ToString())!=-1) {
VinkiModModule.Session.sessionArtSpots=VinkiModModule.artSpots[Array.IndexOf(VinkiModModule.hasArtSpots,self.SceneAs<Level>().Session.Area.SID+"_"+self.SceneAs<Level>().Session.Area.Mode.ToString())];
}
VinkiModModule.Session.sessionStuffLoaded=true;
}
if (VinkiModModule.Session.sessionArtSpots.Length>0&&VinkiModModule.SaveData.settingsArtChanged.Length>=VinkiModModule.textureNamespaces.Length) {
for (var a=0;a<VinkiModModule.Session.sessionArtSpots.Length;a++) {
if (!VinkiModModule.SaveData.settingsArtChanged[VinkiModModule.Session.sessionArtSpots[a][4]]) {
// collision
int[] wh = [8,12];

//thank u snippy for the self?.Dead part
if (!(self?.Dead??true)&&self.X+wh[0]>VinkiModModule.Session.sessionArtSpots[a][0]&&self.X<VinkiModModule.Session.sessionArtSpots[a][0]+VinkiModModule.Session.sessionArtSpots[a][2]&&self.Y+wh[1]>VinkiModModule.Session.sessionArtSpots[a][1]&&self.Y<VinkiModModule.Session.sessionArtSpots[a][1]+VinkiModModule.Session.sessionArtSpots[a][3]) {
// [0/1 toggle for GraffitiIndicator, player x, player y, type of indicator]
VinkiModModule.Session.vinkiRenderIt = [1,Convert.ToInt16(self.X)+0,Convert.ToInt16(self.Y)+0,VinkiModModule.Session.vinkiRenderIt[3]+0];
if (VinkiModModule.Settings.GraffitiButton.Pressed) {
VinkiModModule.doGraffiti(VinkiModModule.Session.sessionArtSpots[a][4]);
}
Logger.Log(LogLevel.Warn,"vinkibutonpres",VinkiModModule.Session.vinkiRenderIt[1].ToString());
a=VinkiModModule.Session.sessionArtSpots.Length;
}
}
}
}
Logger.Log(LogLevel.Warn,"VinkiModb",VinkiModModule.Session.vinkiRenderIt[2].ToString());
}
}

public override void Render() {
base.Render();

//Logger.Log(LogLevel.Warn,"VinkiMod",VinkiModModule.Session.vinkiRenderIt[2].ToString());
if (VinkiModModule.Session.vinkiRenderIt[0]!=0) {
GFX.Gui["vinki/graffiti-icon_"+VinkiModModule.Session.vinkiRenderIt[3]].Draw(new Microsoft.Xna.Framework.Vector2 (VinkiModModule.Session.vinkiRenderIt[1]-2,VinkiModModule.Session.vinkiRenderIt[2]-27));
}
Expand Down
33 changes: 1 addition & 32 deletions Source/VinkiModModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,42 +169,11 @@ private static void graffitiSetup(Session session) {
// }
//}
}

public static void vinkiButtonPress(On.Celeste.Player.orig_Update orig, Player self) {
// Before anything, the original Update function runs.
orig(self);
// Then, the graffiti indicator is turned off.
Session.vinkiRenderIt[0]=0;
if (isGraffitiUser()) {
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())];
}
Session.sessionStuffLoaded=true;
}
if (Session.sessionArtSpots.Length>0&&SaveData.settingsArtChanged.Length>=textureNamespaces.Length) {
for (var a=0;a<Session.sessionArtSpots.Length;a++) {
if (!SaveData.settingsArtChanged[Session.sessionArtSpots[a][4]]) {
// collision
int[] wh = [8,12];
int[] pxy = [0,0];
if (!(self?.Dead??true)) {//thank u snippy for this
pxy=[Convert.ToInt16(self.X),Convert.ToInt16(self.Y)];
}

if (!(self?.Dead??true)&&self.X+wh[0]>Session.sessionArtSpots[a][0]&&self.X<Session.sessionArtSpots[a][0]+Session.sessionArtSpots[a][2]&&self.Y+wh[1]>Session.sessionArtSpots[a][1]&&self.Y<Session.sessionArtSpots[a][1]+Session.sessionArtSpots[a][3]) {
// [0/1 toggle for GraffitiIndicator, player x, player y, type of indicator]
Session.vinkiRenderIt = [1,pxy[0]+0,pxy[1]+0,Session.vinkiRenderIt[3]+0];
if (Settings.GraffitiButton.Pressed) {
doGraffiti(Session.sessionArtSpots[a][4]);
}
Logger.Log(LogLevel.Warn,"vinkibutonpres",Session.vinkiRenderIt[1].ToString());
a=Session.sessionArtSpots.Length;
}
}
}
}
}

}
// but here's the graffiti indicator
private static void vinkiRenderer(Level self) {
Expand Down
113 changes: 113 additions & 0 deletions rando.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
Rulesets:
- Name: vinki_a
LongName: Vinki's Challenge (Easy)
RepeatRooms: false
EnterUnknown: false
Variants: false
Lights: Hubs
Darkness: Never
Algorithm: Endless
Length: Short
Dashes: One
Difficulty: Normal
DifficultyEagerness: Medium
Strawberries: High
Lives: 1
- Name: vinki_b
LongName: Vinki's Challenge (Easyish)
RepeatRooms: false
EnterUnknown: false
Variants: false
Lights: Hubs
Darkness: Never
Algorithm: Endless
Length: Medium
Dashes: One
Difficulty: Normal
DifficultyEagerness: Medium
Strawberries: Low
Lives: 1
- Name: vinki_c
LongName: Vinki's Challenge (Normal)
RepeatRooms: false
EnterUnknown: false
Variants: false
Lights: Hubs
Darkness: Never
Algorithm: Endless
Length: Medium
Dashes: One
Difficulty: Hard
DifficultyEagerness: Medium
Strawberries: None
Lives: 1
- Name: vinki_d
LongName: Vinki's Challenge (Hard)
RepeatRooms: false
EnterUnknown: false
Variants: false
Lights: Hubs
Darkness: Never
Algorithm: Endless
Length: Long
Dashes: One
Difficulty: Expert
DifficultyEagerness: Medium
Strawberries: None
Lives: 1
- Name: vinki_e
LongName: Vinki's Challenge (Harder)
RepeatRooms: false
EnterUnknown: false
Variants: false
Lights: Hubs
Darkness: Never
Algorithm: Endless
Length: Long
Dashes: One
Difficulty: Expert
DifficultyEagerness: Medium
Strawberries: None
Lives: 1
- Name: vinki_f
LongName: Vinki's Challenge (Expert)
RepeatRooms: false
EnterUnknown: false
Variants: false
Lights: Off
Darkness: Never
Algorithm: Endless
Length: Long
Dashes: One
Difficulty: Expert
DifficultyEagerness: Medium
Strawberries: None
Lives: 1
- Name: vinki_g
LongName: Vinki's Challenge (Master)
RepeatRooms: false
EnterUnknown: false
Variants: false
Lights: Off
Darkness: Never
Algorithm: Endless
Length: Long
Dashes: One
Difficulty: Expert
DifficultyEagerness: High
Strawberries: None
Lives: 1
- Name: vinki_h
LongName: Vinki's Challenge (Grandmaster)
RepeatRooms: false
EnterUnknown: false
Variants: false
Lights: Off
Darkness: Never
Algorithm: Endless
Length: Enormous
Dashes: One
Difficulty: Master
DifficultyEagerness: High
Strawberries: None
Lives: 1

0 comments on commit f8cf9a6

Please sign in to comment.