Merge pull request #15 from JiroCab/experimental

1.6 release

Author: JiroCab

README.md

@@ -0,0 +1 @@
+msch
x��1�0E]�X��@ϒ�1���I\�I+nO*==�����\(38�{��lA�Z��Q�ݱ.ѰC��~�TZ��w�@��hV%c�V‚A�ߢ=ˌ�d��h�dpz��Ijk��HǍ���p���5/Z

assets/bundles/bundle.properties

@@ -1,8 +1,40 @@
 == Olupis Major change log ==
 https://github.com/JiroCab/Olupis
-Last updated on 25/09/2023 (+8utc) by Jirocab/RushieWashie
+Last updated on 21/11/2023 (+8utc) by Jirocab/RushieWashie
 
-= Beta 1-5 () =
+= Version 1-6 () =
+    + Support/Ammo limited units have ammo visual indicators
+    + Made planets be hidden until a sector is unlocked for it
+    + Weather added: acidRain, mossMist
+    + Blocks added: glowBloom, luminiteBoulder, obliterator, navalConstruct
+    + Maps added: vakinyaDesert, mossyRavine, gardeniorTemple
+    + Units added: supella
+    ~ Maps updated: forestOfHope, sanctuary, dormantCell
+    ~ Added in-map credits for the maps above
+    ~ Sprites updated: olupis-tree, moss-tree, rustElectrolyzer, ironConveyor, ironBridge, phantom, rustedBridge, bay, mite
+    ~ Sprites Contributed by kapzduke: pipeJuntion, pipeRouter, ironPipe, leadPipe, WindMill, Corroder, rustyDrill, displacementPump, ironPump, rustyPump, rustElectrolyzer, iron (item), rustyIron (item) [https://github.com/kapzduke]
+    ~ Sprites Contributed by Otamamori: supella, phantom
+    ~ Renamed "Biomatter" -> "Planty Mush"
+    ~ Maps Contributed MrApple: vakinyaDesert, muddyLakes
+    ~ improved shadows of various props, mossyRavine, gardeniorTemple
+    ~ buffed shredder & dissolver
+    ~ Pipes has been reworked, made better for longer distance in exchange for lower capacity
+    ~ Conveyor & Bridges speed increased, from half of serpulo counterparts to about 70-75%~
+    ~ Crusader now have a wip weapon
+    ~ Gnats & Phorid now have crawler like weapons along side healing turret
+    ~ Porter can be command to "deploy" preventing Bay's movement and rally zoners to commanded position
+    ~ Moved hydroMill to post-cobalt
+    ~ Units and unit production now costs copper instead of silicon for t1
+    ~ constructs can now output to payload
+    ~ Improved Shredder's bullet's detection
+    ~ Improved Tech tree, new player experience, buildSpeed
+    ~ Bug Fix: Unable to reach other sector due to a bug with mindustry not selecting the proper launch core (allowed launch schematic) [https://github.com/JiroCab/Olupis/issues/12]
+    ~ Bug Fix: Constructs not spawning units on maps without cores despite being on the wave team
+    ~ Bug Fix: AmmoLifeTime units not properly removed in multiplayer
+    ~ Bug Fix: Embryo Timing out if it has no a parent (for waves)
+    ~ Internal: Expanded Credits
+
+= Version 1-5 (9128c69) = https://github.com/JiroCab/Olupis/tree/9128c69cd59afeb49ec9c0d403352f2efbc41f38
     + Added more music from the Terra Nil Soundtrack by Meydän
     + Maps added: sanctuary, dorment-cell, forest-of-hope
     + Units added: aero, striker, venom, phorid, phantom, banshee, embryo, bay, blitz
@@ -13,17 +45,17 @@ Last updated on 25/09/2023 (+8utc) by Jirocab/RushieWashie
     ~ Updated and made load disclaimer taggable
     ~ Bug fix: all cores except remnant can be chosen to be launched
     ~ Internal: Deprecated taurus using MendTurret, uses PowerTurret instead
-	~ Internal: Turrets moved out of NyfalisBlocks.java and into NyfalisTurrets.java
-	~ Internal: PowerUnitTurret extends ItemUnitTurret instead of PowerTurret
-	~ Internal: Vaguely sorted classes of block types
-	~ Internal: toxopid updated (3.0.0 -> 3.2.0)
+    ~ Internal: Turrets moved out of NyfalisBlocks.java and into NyfalisTurrets.java
+    ~ Internal: PowerUnitTurret extends ItemUnitTurret instead of PowerTurret
+    ~ Internal: Vaguely sorted classes of block types
+    ~ Internal: toxopid updated (3.0.0 -> 3.2.0)
     ~ Improve Planet rules, Custom unit Ai, Tech tree, Core database and Fx
     ~ Sprites Contributed by Remington Thomas: rustyIron, venom, bay, blitz, crusader
     ~ Given coreRelic, coreShrine, coreTemple a weapon
     --  Blocks removed: mendFieldProjector
     --  Deprecated DirectionalMendProjector and made into legacyBlock
 
-= Beta 1-4 (e898d42) = https://github.com/JiroCab/Olupis/tree/e898d42d0b490a209939e90e4b9c7ae1a641b884
+= Version 1-4 (e898d42) = https://github.com/JiroCab/Olupis/tree/e898d42d0b490a209939e90e4b9c7ae1a641b884
     ~ !! Rebranded to `Nyfalis`
     ~ Mod browser Visible, w/ in game Wip disclaimer
 
@@ -53,21 +85,21 @@ Last updated on 25/09/2023 (+8utc) by Jirocab/RushieWashie
     -- removed `pinkTree`duplicate that was a floor named "pink-mossy-water
     -- Internal: removed `NoIconFix()`and used proper `-full` & similar (WMF Industry)
 
-= Beta 1-3 (01b8973) = https://github.com/JiroCab/Olupis/tree/01b8973727ccff584c453dd5cbe52a7e3a999117
+= Version 1-3 (01b8973) = https://github.com/JiroCab/Olupis/tree/01b8973727ccff584c453dd5cbe52a7e3a999117
     + Added Placeholder1 for the two planets
     + Olupis Tech tree now takes a items from all 3 planet's sectors
-	+ Added Raw Files of certain sprites (.aseprite & .ase Contributed by NightmarishWolf)
+    + Added Raw Files of certain sprites (.aseprite & .ase Contributed by NightmarishWolf)
     + Added Mod options to turn off invasive features
-	+ Added an option for Green team to have the corroded icon
-	+ Added Code play music via overriding the game music Seq (wip)
+    + Added an option for Green team to have the corroded icon
+    + Added Code play music via overriding the game music Seq (wip)
     + World tiles added - pinkGrass, pinkGrassWater, pinkShrubs, pinkTree
     + Units added - zoner
     + Blocks added - shredder, fortifiedTank, fortifiedCanister, mendFieldProjector, taurus, rustyPump, iron junction,  rustyScrapWall, rustyScrapWallLarge, rustyScrapWallHuge, rustyScrapWallGigantic
-	~ Units Sprites updated - gnat
+    ~ Units Sprites updated - gnat
     ~ Sprites Updated - iron, corroder, rustyIronConveyor, ironConveyor, cobaltConveyor, pipeBridge, pipeRouter, coreRemnant, windmill, garden, coreRemnant, ironWall, ironWallLarge, rustyWall, rustyWallLarge, rustyWallHuge, rustyWallGigantic
     ~ Fixed certain blocks not having / improper Ui Icons
-	~ Fixed windMills generating light
-	~ Fixed steam being used as coolant by Serpulo turrets
+    ~ Fixed windMills generating light
+    ~ Fixed steam being used as coolant by Serpulo turrets
     ~ Updated README.md
     ~ Updated Olupis TechTree
     ~ Updated bundle.properties
@@ -76,11 +108,11 @@ Last updated on 25/09/2023 (+8utc) by Jirocab/RushieWashie
     ~ Made some of Serpulo's items included in Olupis planets' items, will be whitelisting Olupis blocks instead & ban-hide other blocks
     ~ updated debug button export map for changes above
     ~ Packages changed 'com.jirocab.planets' to 'olupis' (Name was not final when orginal packages made and changing it now while it's early)
-	~ Bumped required Mindustry Version in build.gradle [v140.4 -> v141]
+    ~ Bumped required Mindustry Version in build.gradle [v140.4 -> v141]
     -- Removed rustyPipe Variants (No easy way to add variants)
 
 
-= Beta 1-2 (867d438) == https://github.com/JiroCab/Olupis/tree/867d438c8352ab358ad6c0cf5062fce78c26652c
+= Version 1-2 (867d438) == https://github.com/JiroCab/Olupis/tree/867d438c8352ab358ad6c0cf5062fce78c26652c
 	+ Debug button to set a map's planet/block set to be olupis, disabled by default [settings > sound > olupis-debug]
 	+ "Space" sound can be turned off [settings > sound > olupis-space]
 	+ units added - gnat, mite, firefly, porter
@@ -104,7 +136,7 @@ Last updated on 25/09/2023 (+8utc) by Jirocab/RushieWashie
 	-- Internal blocks removed - treeStump, bigBoulder
 
 
-= Beta 1-1a/1-1 (4e9861a) == https://github.com/JiroCab/Olupis/commit/4e9861a9fa6cd088c677e1f7b3f44afa10a85c3b
+= Version 1-1a/1-1 (4e9861a) == https://github.com/JiroCab/Olupis/commit/4e9861a9fa6cd088c677e1f7b3f44afa10a85c3b
 	+ Blocks Sets - garden, bioMatterPress, unitReplicator, unitReplicatorSmall, rustElectrolyzer, steamBoilder, steamHood, hydrochloricGraphitePress, ironSieve, rustyIronConveyor, ironConveyor, cobaltConveyor, ironRouter, rustyPipe, ironPipe, pipeRouter, wire, wireBridge, superConductors, windMills, hydroMill, steamDrill, hydroElectricDrill, displacementPump, massDisplacementPump, ironPump, oilSeparator, architonnerre, architronito, rustyWall, rustyWallLarge, rustyWallHuge, rustyWallGigantic, ironWall, ironWallLarge, coreRemnant, coreVestige, coreRelic, coreShrine, coreTemple, fortifiedVault, fortifiedContainer, fortifiedMessageBlock
 	+ World tiles - redSand, redDune, redSandWater, greenShrubsIrregular,  mossyStoneWall, mossierStoneWall, mossiestStoneWall, mossStone, frozenGrass, yellowGrass, yellowTree, yellowBush, yellowShrubs, yellowShrubsIrregular,  mossyStone, mossierStone, mossiestStone, mossStoneWall, oreIron, oreIronWall, oreCobalt, OreCobaltWall, olupisTree, bush, mossyBoulder, mossTree , treeStump,
 	+ Items - condensedBiomatter, rustyIron, iron, cobalt

assets/maps/forest-of-hope.msav

@@ -1,22 +1,23 @@
 #the mod name as displayed in-game
 displayName: "Nyfalis (Olupis)"
+# TODO: fix identity crisis
 
 #the internal name of your mod
 name: "olupis"
 
 #your name
-author: "RushieWashie, Remington Thomas, Ethanol10, Siede, WMF Industries"
+author: "Programming:\nRushieWashie, Siede, WMF Industries \n---------------------\nSprites:\nRushieWashie, Remington Thomas, Ethanol10, kapzduke\n---------------------\nMaps:\nRushieWashie, MrApple, Remington Thomas "
 
 #the fully qualified main class of the mod
 main: "olupis.NyfalisMain"
 
 #the mod description as seen in the mod dialog
-description: "(\u26A0Work in progress\u26A0) Yet another planet mod "
+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 and pain on top"
 
-subtitle: "Yet another planet mod, v1.5"
+subtitle: "Yet another planet mod, v1.6"
 
 #the mod version
-version: 1.5
+version: 1.6
 
 #the minimum game build required to run this mod
 minGameVersion: 136

assets/maps/lushy-river-complex.msav

@@ -14,6 +14,7 @@
 import mindustry.gen.Icon;
 import mindustry.mod.Mod;
 import mindustry.type.Planet;
+import mindustry.type.Sector;
 import mindustry.ui.Styles;
 import mindustry.ui.dialogs.BaseDialog;
 import mindustry.world.Block;
@@ -42,13 +43,14 @@ public void loadContent(){
         NyfalisBlocks.LoadWorldTiles();
         NyfalisBlocks.LoadBlocks();
         NyfalisSchematic.LoadSchematics();
+        NyfalisAttributeWeather.loadWeather();
         NyfalisPlanets.LoadPlanets();
         NyfalisSectors.LoadSectors();
         NyfalisSounds.LoadMusic();
 
         NyfalisPlanets.PostLoadPlanet();
         NyfalisTechTree.load();
-        NyfalisAttribute.AddAttributes();
+        NyfalisAttributeWeather.AddAttributes();
         NyfalisUnits.PostLoadUnits();
 
         Log.info("OwO, Nyfalis (Olupis) content Loaded! Hope you enjoy nya~");
@@ -61,6 +63,7 @@ public NyfalisMain(){
                 /*Hiding blocks w/o banning them mainly for custom games */
                 state.rules.hiddenBuildItems.addAll(NyfalisItemsLiquid.nyfalisOnlyItems);
             });
+            unlockPlanets();
             if(headless)return;
 
             //debug and if someone needs to convert a map and said map does not have the Nyfalis Block set / testing
@@ -69,6 +72,9 @@ public NyfalisMain(){
         });
 
         if(headless)return;
+        Events.on(EventType.UnlockEvent.class, event -> unlockPlanets());
+        Events.on(EventType.SectorCaptureEvent.class, event -> unlockPlanets());
+
         Events.on(ClientLoadEvent.class, e -> {
             NyfalisBlocks.NyfalisBlocksPlacementFix();
             NyfalisSettingsDialog.AddNyfalisSoundSettings();
@@ -128,6 +134,7 @@ public static void buildDebugUI(Group group){
     public void init() {
         nyfalisSettings = new NyfalisSettingsDialog();
         logicDialog = new NyfalisLogicDialog();
+        unlockPlanets();
     }
 
     public static void disclaimerDialog(){
@@ -160,4 +167,26 @@ public static void disclaimerDialog(){
         dialog.show();
     }
 
+    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;
+                }
+            }
+        }
+    }
+
 }