Skip to content

Commit

Permalink
Merge branch 'Skua' of https://github.com/BrenoHenrike/Scripts into Skua
Browse files Browse the repository at this point in the history
  • Loading branch information
@wtffidy
wtffidy committed Jan 20, 2025
2 parents fee6a27 + 6fb4acc commit d9bbe0f
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 44 deletions.
10 changes: 10 additions & 0 deletions Story/0AllStories.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,14 @@
//cs_include Scripts/Nation/CoreNation.cs
//cs_include Scripts/Story/Nation/Bamboozle.cs
//cs_include Scripts/Story/Nation/CitadelRuins.cs
//cs_include Scripts/Story/Nation/DeleuzeTundra.cs
//cs_include Scripts/Story/Nation/Fiendshard.cs
//cs_include Scripts/Story/Nation/FiendPast.cs
//cs_include Scripts/Story/Nation/Originul.cs
//cs_include Scripts/Story/Nation/ShadowBlastArena.cs
//cs_include Scripts/Story/Nation/Tercessuinotlim.cs
//cs_include Scripts/Story/Nation/VoidRefuge.cs
//cs_include Scripts/Story/Nation/VoidChasm.cs

//cs_include Scripts/Story/QueenofMonsters/CoreQoM.cs
//cs_include Scripts/Story/QueenofMonsters/Extra/BrightOak.cs
Expand Down Expand Up @@ -253,12 +255,14 @@ public class AllStories
// Nation
public Bamboozle Bamboozle = new();
public CitadelRuins CitadelRuins = new();
public DeleuzeTundraStory DeleuzeTundra = new();
public FiendPast FiendPast = new();
public Fiendshard_Story Fiendshard_Story = new();
public Originul_Story Originul_Story = new();
public ShadowBlastArena ShadowBlastArena = new();
public Tercessuinotlim Tercessuinotlim = new();
public VoidRefuge VoidRefuge = new();
public VoidChasm VoidChasm = new();

// Queen of Monsters
public CoreQOM QOM => new();
Expand Down Expand Up @@ -526,6 +530,9 @@ public void CompleteAll()
CitadelRuins.DoAll();
Core.Logger($"Story: Citadel Ruins - Complete");

DeleuzeTundra.DeleuzeTundra();
Core.Logger($"Story: Deleuze Tundra - Complete");

Fiendshard_Story.Fiendshard_QuestlineP1();
Core.Logger($"Story: Fiendshard - Complete");

Expand All @@ -543,6 +550,9 @@ public void CompleteAll()

VoidRefuge.Storyline();
Core.Logger($"Story: Void Refuge - Complete");

VoidChasm.Storyline();
Core.Logger($"Story: Void Chasm - Complete");
#endregion

#region QoM
Expand Down
88 changes: 44 additions & 44 deletions scripts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1407,19 +1407,6 @@
"fileName": "Borgars.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Story/Borgars.cs"
},
{
"name": "deleuzetundra Story",
"description": "This will finish the deleuzetundra Story.",
"tags": [
"story",
"quest",
"deleuzetundra"
],
"path": "Story/DeleuzeTundra.cs",
"size": 3194,
"fileName": "DeleuzeTundra.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Story/DeleuzeTundra.cs"
},
{
"name": "Lair Story",
"description": "This will finish the Lair Story.",
Expand Down Expand Up @@ -1885,7 +1872,7 @@
"all"
],
"path": "Story/0AllStories.cs",
"size": 28547,
"size": 28922,
"fileName": "0AllStories.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Story/0AllStories.cs"
},
Expand Down Expand Up @@ -3919,6 +3906,35 @@
"fileName": "ShadowscytheMerge.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Nation/MergeShops/ShadowscytheMerge.cs"
},
{
"name": "Deleuze Tundra Merge",
"description": "This bot will farm the items belonging to the selected mode for the Deleuze Tundra Merge [2520] in /deleuzetundra",
"tags": [
"deleuze",
"tundra",
"merge",
"deleuzetundra",
"fiendish",
"bloodhunter",
"bow",
"oblivions",
"final",
"call",
"abyss",
"boiling",
"blood",
"awakened",
"fiend",
"naginata",
"bloodhunt",
"nul",
"contract"
],
"path": "Nation/MergeShops/DeleuzeTundraMerge.cs",
"size": 5366,
"fileName": "DeleuzeTundraMerge.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Nation/MergeShops/DeleuzeTundraMerge.cs"
},
{
"name": "Void Chasm Merge",
"description": "This bot will farm the items belonging to the selected mode for the Void Chasm Merge [2410] in /voidchasm",
Expand Down Expand Up @@ -4868,7 +4884,7 @@
"evovled void armor"
],
"path": "Nation/Various/EmpoweredNationItem.cs",
"size": 11093,
"size": 11130,
"fileName": "EmpoweredNationItem.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Nation/Various/EmpoweredNationItem.cs"
},
Expand Down Expand Up @@ -12153,6 +12169,19 @@
"fileName": "Fiendshard.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Story/Nation/Fiendshard.cs"
},
{
"name": "deleuzetundra Story",
"description": "This will finish the deleuzetundra Story.",
"tags": [
"story",
"quest",
"deleuzetundra"
],
"path": "Story/Nation/DeleuzeTundra.cs",
"size": 3194,
"fileName": "DeleuzeTundra.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Story/Nation/DeleuzeTundra.cs"
},
{
"name": "ShadowBlast Arena",
"description": "This will finish the ShadowBlast Arena quest.",
Expand Down Expand Up @@ -18785,35 +18814,6 @@
"fileName": "BloodMoonLycanMerge.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Other/MergeShops/BloodMoonLycanMerge.cs"
},
{
"name": "Deleuze Tundra Merge",
"description": "This bot will farm the items belonging to the selected mode for the Deleuze Tundra Merge [2520] in /deleuzetundra",
"tags": [
"deleuze",
"tundra",
"merge",
"deleuzetundra",
"fiendish",
"bloodhunter",
"bow",
"oblivions",
"final",
"call",
"abyss",
"boiling",
"blood",
"awakened",
"fiend",
"naginata",
"bloodhunt",
"nul",
"contract"
],
"path": "Other/MergeShops/DeleuzeTundraMerge.cs",
"size": 5366,
"fileName": "DeleuzeTundraMerge.cs",
"downloadUrl": "https://raw.githubusercontent.com/BrenoHenrike/Scripts/Skua/Other/MergeShops/DeleuzeTundraMerge.cs"
},
{
"name": "Djinn Gate Merge",
"description": "This bot will farm the items belonging to the selected mode for the Djinn Gate Merge [1511] in /djinngate",
Expand Down

0 comments on commit d9bbe0f

Please sign in to comment.