Revert "Merge branch 'main' into main"

This reverts commit 9208a3c, reversing changes made to 830370e.
k-kz · Jan 10, 2022 · a3a7a12 · a3a7a12
1 parent 9208a3c
commit a3a7a12
Show file tree

Hide file tree

Showing 10 changed files with 629 additions and 199 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,8 +13,8 @@ env:
   SOLUTION_NAME: XIVSlothCombo
   INTERNAL_NAME: XIVSlothCombo
   RELEASE_DIR: XIVSlothCombo\bin\Release\XIVSlothCombo
-  PERSONAL_PLUGIN_REPO: Codemned/MyDalamudPlugins
-  PR_PLUGIN_REPO: Codemned/MyDalamudPlugins
+  PERSONAL_PLUGIN_REPO: Nik-Potokar/MyDalamudPlugins
+  PR_PLUGIN_REPO: Nik-Potokar/MyDalamudPlugins
 
 jobs:
   build:
@@ -50,7 +50,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         repository: ${{ env.PERSONAL_PLUGIN_REPO }}
-        token: ${{ secrets.PAT }}
+        token: ${{ secrets.XIVCOMBO_TOKEN }}
     - uses: actions/download-artifact@v2
       with:
         name: PluginRepoZip

diff --git a/README.md b/README.md
@@ -1 +1,112 @@
-Personal use, no support will be given.
+# XIVSlothCombo - The Super Expanded XIVCombo
+
+[![Build](https://github.com/Nik-Potokar/XIVSlothCombo/actions/workflows/build.yml/badge.svg)](https://github.com/Nik-Potokar/XIVSlothCombo/actions/workflows/build.yml)
+# Have an issue or suggestion? Please post them [here](https://github.com/Nik-Potokar/XIVSlothCombo/issues). If something dosen't seem to be working please swap class or re-slot the skill.
+
+## How to install
+* Copy the Custom Repo Link `https://raw.githubusercontent.com/Nik-Potokar/MyDalamudPlugins/main/pluginmaster.json `
+* Open dalamud settings ingame
+* Paste the link into the Custom Plugin repositories
+* Install as normal from Dalamud Plugins window.
+## Our Features
+
+#### Disciples of Magic
+* Global Raise feature - Replaces Swiftcast with Raise/Resurrection/Verraise/Ascend/Egeiro when appropriate.
+
+#### Astrologian
+* Draw on play 
+* Minor arcana to crown play (On one button)
+* Benefic level sync feature
+* One button DPS feature (Malefic/Combust/Lucid dreaming)
+
+#### Bard
+* Wanderer's into Pitch Perfect Feature
+* Heavy Shot into Straight Shot Feature
+* Iron Jaws Feature
+* Burst Shot/Quick Nock into Apex Arrow
+
+#### Black Mage
+* One button Rotation Feature that changes skills depending on a stance with auto DoT included
+* Leylines feature
+* AoE Feature (Soon to be 1 button aswell)
+
+#### Dancer
+* Auto dance steps feature
+* Single procs on single button
+
+#### Dragoon
+* Single and AoE target combos
+
+#### Dark Knight
+* Auto Living Shadow Feature
+* Overcap Feature
+* Single and AoE target combos
+
+#### Gunbreaker
+* 1 Button Continuation Feature
+* Overcap features
+* Single target oGCDs combos on Main Combo
+* Single and AoE target combos
+
+#### Machinist
+* One Button rotation features
+* HeatBlast feature
+* Single and AoE target combos
+
+#### Monk
+* Basic rotation feature
+* Single and AoE target combos
+
+#### Ninja
+* One button rotation features
+* Mudra features
+* Single and AoE target combos
+
+#### Paladin
+* One button rotation features
+* Single and AoE target combos
+* Singe button oGCD feature
+
+#### Red Mage
+* 2 Button rotation feature (to balance manas)
+* Melee combo and finisher feature
+* Singe button oGCD feature
+
+#### Samurai
+* Single and AoE target combos
+
+#### Scholar
+* QoL Features
+* Fairy Feature (never forget Eos)
+
+#### Summoner
+* One button rotation for all the demi-summons (Single and AoE features)
+* One button egi rotation features for each egi (Single and AoE features)
+* Ruin III on Ruin IV when you don't have Further Ruin - never lose mobility even with combos enabled.
+* Never forget to ruin4 feature
+* So much other stuff - SMN currently has over 18 tweaks.
+
+#### Warrior
+* One button rotation(Storm's Eye/Path)
+* oGCDs added on main combo feature
+* Single and AoE target combos
+
+#### White Mage
+* Lily Features
+* Cure feature
+* One button DPS feature (Glare/Dia/Lucid dreaming)
+
+#### Reaper
+* Debuff features
+* Single and AoE target combos
+
+#### Sage
+* QoL Features
+* One button DPS feature (Dosis/EurekanDosis/Eukrasia)
+_________________________________________________________________________________________________________________________________________________________________________________
+
+We're building this as a side project but if you want something special added let us know.
+
+### Big Thanks to [attick](https://github.com/attickdoor), [daemitus](https://github.com/daemitus) for creating most of the original code, as well as [Grammernatzi](https://github.com/Grammernatzi) for providing us with a lot of extra tweaks. Please show them support for their original work <3 
+
+Brought to you by attick, Kami, Daemitus, Grammernatzi, Aki, Iaotle, Codemned, PrincessRTFM
diff --git a/XIVSlothCombo.json b/XIVSlothCombo.json
@@ -1,23 +1,23 @@
-    {
-        "Author": "Aki",
-        "Name": "XIVComboWayTooAkiiified",
-        "Punchline": "Edited XIVCombo for personal use",
-        "Description": "Lazy gamer xivcombo",
-        "InternalName": "XIVComboWayTooAkiiified",
-        "AssemblyVersion": "1.0.1.5",
-        "ApplicableVersion": "any",
-        "Tags": [
-            "XIV",
-            "Combo",
-            "aki"
-        ],
-        "DalamudApiLevel": 4,
-        "IconUrl": "https://i.loli.net/2021/10/17/Cw52y7Si6AzXJmB.gif",
-        "DownloadLinkInstall": "https://github.com/Nik-Potokar/XIVComboWayTooAkiiified/releases/download/FFXIV/Latest.rar",
-        "IsHide": false,
-        "IsTestingExclusive": false,
-        "DownloadLinkTesting": "https://github.com/Nik-Potokar/XIVComboWayTooAkiiified/releases/download/FFXIV/Latest.rar",
-        "DownloadLinkUpdate": "https://github.com/Nik-Potokar/XIVComboWayTooAkiiified/releases/download/FFXIV/Latest.rar",
-        "DownloadCount": 0,
-        "LastUpdated": "1634400029"
-    },
+    {
+        "Author": "Aki",
+        "Name": "XIVComboWayTooAkiiified",
+        "Punchline": "Edited XIVCombo for personal use",
+        "Description": "Lazy gamer xivcombo",
+        "InternalName": "XIVComboWayTooAkiiified",
+        "AssemblyVersion": "1.0.1.5",
+        "ApplicableVersion": "any",
+        "Tags": [
+            "XIV",
+            "Combo",
+            "aki"
+        ],
+        "DalamudApiLevel": 4,
+        "IconUrl": "https://i.loli.net/2021/10/17/Cw52y7Si6AzXJmB.gif",
+        "DownloadLinkInstall": "https://github.com/Nik-Potokar/XIVComboWayTooAkiiified/releases/download/FFXIV/Latest.rar",
+        "IsHide": false,
+        "IsTestingExclusive": false,
+        "DownloadLinkTesting": "https://github.com/Nik-Potokar/XIVComboWayTooAkiiified/releases/download/FFXIV/Latest.rar",
+        "DownloadLinkUpdate": "https://github.com/Nik-Potokar/XIVComboWayTooAkiiified/releases/download/FFXIV/Latest.rar",
+        "DownloadCount": 0,
+        "LastUpdated": "1634400029"
+    },