Merge pull request #28 from JiroCab/experimental

1.7.3

Author: JiroCab

.github/workflows/autoMainRelease.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Release rename
         run:
-          mv build/libs/Nyfalis-but-a-jar.jar build/libs/${{ github.event.repository.name }}-${{ steps.version.outputs.prop }}.jar
+          mv build/libs/Olupis-but-a-jar.jar build/libs/${{ github.event.repository.name }}-${{ steps.version.outputs.prop }}.jar
 
       - name: Upload built jar file
         uses: actions/upload-artifact@v4

.github/workflows/deploy.yml

@@ -12,10 +12,11 @@ jobs:
       - name: Set up PATH
         run: echo "${ANDROID_HOME}/build-tools/34.0.0" >> $GITHUB_PATH
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - name: Set up JDK 18
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 18
+          distribution: temurin
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.gitignore

@@ -154,3 +154,4 @@ gradle-app.setting
 .DS_Store
 Thumbs.db
 android/libs/
+.fuse_hidden*

assets-raw/RushieWashie/bat-helper-icon.png

@@ -1,8 +1,31 @@
 == Olupis Major change log ==
 https://github.com/JiroCab/Olupis
-Last updated on 18/09/2024 (+8utc) by Jirocab/RushieWashie
+Last updated on 12/12/2024 (+8utc) by Jirocab/RushieWashie
 
-= Version 1-7-1 () =
+= Version 1-7-3 () =
+    + Sprites updated: repairPin, oreAlco, oreCobalt
+    + Blocks added: deliveryTerminal, rustedMetal, slopDeep, fortifiedRadiator, inductionSmelter, coreRelic, coreVestige, 5x5Turret base, alternateArticulator, emulsiveSlop
+    + Units added: dipteara, shade, reapre, lexington, crusader, luridiblatta, nyctalus
+    + Added: Modes to core to allowing subsystems like extra unit production and weapons on higher tiers
+    + Added: Option to hide bat helpers in the core database for regular players
+    ~ Balance: Aero tree, minor hp nerf, t1 gets a minor visual change, striker dps buff
+    ~ Balance: Bats tree, major weapon & stats reworks to better fit its gimmicks
+    ~ Balance: Air units of enemy waves now get assigned random Ais with different
+    ~ Balance: Roach tree, minor armor buff
+    ~ Balance: Carrier Tree, added bars to show build progress & unit count, changed pdl sound
+    ~ BugFix: lubricant using oil's bar colour
+    ~ BugFix: Fixed weird replicator placement behaviour
+    ~ BugFix: Repair pins' effects not being displayed properly
+    ~ BugFIx?: Improved displayed build time for units (may still be off, rushie no math)
+    ~ All units now show their build cost respective to their constructs
+    ~ Renamed t2 & above cores, porcupine, adaptiveFabricator
+    ~ alternateArticulator now requires power to make t2s
+    ~ Bug Fix: unable to unlock other planets despite reaching requirements
+    ~ Improved Moss spreading code (Wmf)
+    - removed version 1-7-2
+
+
+= Version 1-7-1 (2f4a776) = https://github.com/JiroCab/Nyfalis/tree/2f4a776761d1fb33f289f0d0fcfa6f48f643e9d5
     - Fixed replicators being unusable in regular sandbox
     - Fixed Save info dialog on new installs
     - Added a button to import the music mod within settings

assets-raw/RushieWashie/test saves/Nyfalis 1-4 all blocks.msav

@@ -14,10 +14,10 @@ main: "olupis.NyfalisMain"
 #the mod description as seen in the mod dialog
 description: "(\u26A0Work in progress\u26A0)\n Yet another planet mod \nThat does it's best to give the player(s) a bit of something new,\n with a minor hint of what the base game has to offer, focus on RTS controls, and pain on top"
 
-subtitle: "Yet another planet mod, v1.7.1"
+subtitle: "Yet another planet mod, v1.7.3"
 
 #the mod version
-version: 1.7.1
+version: 1.7.3
 
 #the minimum game build required to run this mod
 minGameVersion: 136

assets-raw/RushieWashie/test saves/Nyfalis 1.5 all blocks.msav

@@ -24,7 +24,7 @@
 import olupis.input.NyfalisShaders;
 import olupis.input.ui.*;
 import olupis.world.EnvUpdater;
-import olupis.world.blocks.misc.Replicator;
+import olupis.world.blocks.unit.Replicator;
 import olupis.world.entities.packets.NyfalisSyncOtherSettingsPacket;
 import olupis.world.planets.NyfalisTechTree;
 
@@ -33,13 +33,11 @@
 import static olupis.content.NyfalisPlanets.*;
 
 public class NyfalisMain extends Mod{
-
     public static NyfalisSounds soundHandler = new NyfalisSounds();
     public static LimitedLauncherSelect sectorSelect;
     public static NyfalisLogicDialog logicDialog;
     public NyfalisSettingsDialog nyfalisSettings;
     public static boolean shownWarning = false;
-    public static TextureRegionDrawable gayerPanel = (TextureRegionDrawable) Tex.whiteui;
 
     @Override
     public void loadContent(){
@@ -88,7 +86,7 @@ public NyfalisMain(){
             Time.run(0.5f * Time.toSeconds, NyfalisMain::sandBoxCheck);
 
             //Clean up of the old system of banning stuff
-            unlockPlanets();
+            NyfalisPlanets.unlockPlanets();
 
             if(state.isCampaign() && NyfalisPlanets.isNyfalianPlanet(state.getPlanet())){
                 if(state.rules.blockWhitelist) state.rules.blockWhitelist = false;
@@ -242,8 +240,8 @@ public void init() {
         nyfalisSettings = new NyfalisSettingsDialog();
         if(!headless){
 
-            gayerPanel = (TextureRegionDrawable) Tex.whiteui;
-            gayerPanel = (TextureRegionDrawable) gayerPanel.tint(Pal.darkerGray);
+            NyfalisColors.infoPanel = (TextureRegionDrawable) Tex.whiteui;
+            NyfalisColors.infoPanel = (TextureRegionDrawable) NyfalisColors.infoPanel.tint(Pal.darkerGray);
 
             logicDialog = new NyfalisLogicDialog();
             sectorSelect = new LimitedLauncherSelect();
@@ -253,26 +251,5 @@ public void init() {
 
     }
 
-    public void unlockPlanets(){
-        if(nyfalis.unlocked() && spelta.unlocked()) return;
-        if(nyfalis.unlocked()){
-            for (Sector s : nyfalis.sectors) {
-                if (s.unlocked() || (s.preset != null && s.preset.unlocked())) {
-                    nyfalis.quietUnlock();
-                    nyfalis.alwaysUnlocked = true;
-                    break;
-                }
-            }
-        }
-        if(spelta.unlocked()){
-            for (Sector s : spelta.sectors) {
-                if (s.unlocked() || (s.preset != null && s.preset.unlocked())) {
-                    nyfalis.quietUnlock();
-                    nyfalis.alwaysUnlocked = true;
-                    break;
-                }
-            }
-        }
-    }
 
 }