Skip to content

Commit 0111942

Browse files
wispbornewispborne
committed
Fixed shinies.
1 parent 47bd264 commit 0111942

File tree

19 files changed

+271
-125
lines changed

19 files changed

+271
-125
lines changed

‎.github/workflows/blacklist.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ banner.png$
1111
media/
1212
^release_checklist.md$
1313
docs/
14-
dokka/
14+
dokka/
15+
lib/

‎CHANGELOGS.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
Version 1.5.7
2+
3+
**MagicBounty**
4+
- Fixed bounties that use existing_target_memkey (by Numan).
5+
- Fixed shiny paintjobs not getting added due to vanilla wonkiness.
6+
7+
**MagicAchievements**
8+
- Increased "shiny" paintjob spawn rate to 1 in 25 (was 1 in 50).
9+
- "Shiny" paintjobs only show up in NPC fleets only and are permanent (cannot be removed/changed).
10+
- Paintjob UI on refit screen now makes sounds.
11+
- Removed perf impact of checking if there's a completed achievement to show a notification for.
12+
113
Version 1.5.6
214

315
**MagicCampaign**

‎MagicLib-Kotlin/MagicLib-Kotlin.iml‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,7 @@
1111
<orderEntry type="library" name="starfarer-api" level="project" />
1212
<orderEntry type="library" name="Vayra's Sector" level="project" />
1313
<orderEntry type="library" name="jars-ConsoleCommands" level="project" />
14-
<orderEntry type="module-library">
15-
<library>
16-
<CLASSES>
17-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib-2.8b/jars/LazyLib-Kotlin.jar!/" />
18-
</CLASSES>
19-
<JAVADOC />
20-
<SOURCES>
21-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib-2.8b/jars/LazyLib-Kotlin.jar!/" />
22-
</SOURCES>
23-
</library>
24-
</orderEntry>
25-
<orderEntry type="module-library">
26-
<library>
27-
<CLASSES>
28-
<root url="file://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib-2.8b/jars" />
29-
</CLASSES>
30-
<JAVADOC />
31-
<SOURCES>
32-
<root url="file://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib-2.8b/jars" />
33-
</SOURCES>
34-
<jarDirectory url="file://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib-2.8b/jars" recursive="false" />
35-
<jarDirectory url="file://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib-2.8b/jars" recursive="false" type="SOURCES" />
36-
</library>
37-
</orderEntry>
38-
<orderEntry type="module-library">
39-
<library>
40-
<CLASSES>
41-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/LazyLib-2.8b/jars/lib/Kotlin-Runtime.jar!/" />
42-
</CLASSES>
43-
<JAVADOC />
44-
<SOURCES />
45-
</library>
46-
</orderEntry>
14+
<orderEntry type="library" name="Kotlin-Runtime" level="project" />
15+
<orderEntry type="library" name="LazyLib" level="project" />
4716
</component>
4817
</module>

‎MagicLib.iml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<orderEntry type="module-library">
1111
<library>
1212
<CLASSES>
13-
<root url="file://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/Console Commands/jars" />
13+
<root url="file://$STARSECTOR_INSTALL_DIR$/mods/Console Commands/jars" />
1414
</CLASSES>
1515
<JAVADOC />
1616
<SOURCES>
17-
<root url="file://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/Console Commands/jars" />
17+
<root url="file://$STARSECTOR_INSTALL_DIR$/mods/Console Commands/jars" />
1818
</SOURCES>
19-
<jarDirectory url="file://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/Console Commands/jars" recursive="false" />
20-
<jarDirectory url="file://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/Console Commands/jars" recursive="false" type="SOURCES" />
19+
<jarDirectory url="file://$STARSECTOR_INSTALL_DIR$/mods/Console Commands/jars" recursive="false" />
20+
<jarDirectory url="file://$STARSECTOR_INSTALL_DIR$/mods/Console Commands/jars" recursive="false" type="SOURCES" />
2121
</library>
2222
</orderEntry>
2323
<orderEntry type="module" module-name="MagicLib-Kotlin" />
@@ -47,7 +47,7 @@
4747
<orderEntry type="module-library">
4848
<library>
4949
<CLASSES>
50-
<root url="jar://C:/Program Files (x86)/Fractal Softworks/Starsector/mods/zz GraphicsLib-1.9.0/jars/Graphics.jar!/" />
50+
<root url="jar://$STARSECTOR_INSTALL_DIR$/mods/zz GraphicsLib-1.9.0/jars/Graphics.jar!/" />
5151
</CLASSES>
5252
<JAVADOC />
5353
<SOURCES />
@@ -65,5 +65,17 @@
6565
</orderEntry>
6666
<orderEntry type="library" name="Kotlin-Runtime" level="project" />
6767
<orderEntry type="library" name="LazyLib" level="project" />
68+
<orderEntry type="module-library">
69+
<library>
70+
<CLASSES>
71+
<root url="file://$MODULE_DIR$/../MagicAchievementsVanillaPack/jars" />
72+
</CLASSES>
73+
<JAVADOC />
74+
<SOURCES>
75+
<root url="file://$MODULE_DIR$/../MagicAchievementsVanillaPack/src" />
76+
</SOURCES>
77+
<jarDirectory url="file://$MODULE_DIR$/../MagicAchievementsVanillaPack/jars" recursive="false" />
78+
</library>
79+
</orderEntry>
6880
</component>
6981
</module>

‎data/campaign/rules.csv‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
id,trigger,conditions,script,text,options,notes
2-
"#RULESET_NAME MagicLib (bounties)",,,,,,
3-
magiclib_bountyboard_addevent,AddBarEvents,"ShouldShowMagicBountyBoard","AddBarEvent magiclib_bountyboard_selected ""Connect to the local unsanctioned bounty board."" ""A subroutine from your implant informs you that this establishment is broadcasting an informal job board.""",,,
4-
magiclib_bountyboard_selected,DialogOptionSelected,"$option == magiclib_bountyboard_selected","ShowMagicBountyBoardCmd",,,
2+
#RULESET_NAME MagicLib (bounties),,,,,,
3+
magiclib_bountyboard_addevent,AddBarEvents,ShouldShowMagicBountyBoard,"AddBarEvent magiclib_bountyboard_selected ""Connect to the local unsanctioned bounty board."" ""A subroutine from your implant informs you that this establishment is broadcasting an informal job board.""",,,
4+
magiclib_bountyboard_selected,DialogOptionSelected,$option == magiclib_bountyboard_selected,ShowMagicBountyBoardCmd,,,
55
magiclib_bountyCommText,OpenCommLink,"$entity.MagicLib_Bounty_target_hasReply score:1000
66
!$entity.ignorePlayerCommRequests","$entity.ignorePlayerCommRequests = true
77
MagicBountyCommsReplyCmd",,cutCommLinkNoText:Continue,
8-
#magiclib_test_bounty_completed,"magiclib_test_bounty_completed",,"BountyScriptExample",,,
9-
8+
,,,,,,
9+
magiclib_fleetencounter_shiny,BeginFleetEncounter,DoesFleetHaveShiny score:9999998,"FireBest BeginFleetEncounter
10+
AddText ""One of the ships displayed on sensors appears to have a non-standard paintjob.""
11+
Highlight ""paintjob""",,,
12+
,,,,,,
13+
#magiclib_test_bounty_completed,magiclib_test_bounty_completed,,BountyScriptExample,,,

‎data/config/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
}
6060
},
6161
"ruleCommandPackages": [
62-
"org.magiclib.bounty.rulecmd"
62+
"org.magiclib.bounty.rulecmd",
63+
"org.magiclib.paintjobs.rulecmd"
6364
]
6465
}

‎data/console/commands.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ command,class,tags,syntax,help
22
MagicLib_ListBounties,org.magiclib.bounty.console.ListBountiesCommand,"MagicLib,campaign",MagicLib_ListBounties [optionalBountyId],Lists bounties loaded on MagicLib's Bounty Board.
33
MagicLib_ListRequirements,org.magiclib.bounty.console.ListBountiesRequirementsCommand,"MagicLib,campaign",MagicLib_ListRequirements [optionalBountyId],Lists the currently active bounties loaded on MagicLib's Bounty Board. and their requirements to show up.
44
MagicLib_ResetBounty,org.magiclib.bounty.console.ResetBountyCommand,"MagicLib,campaign",MagicLib_ResetBounty <bountyId>,Resets a MagicLib bounty.
5+
MagicLib_ListPaintjobs,org.magiclib.paintjobs.console.ListPaintjobsCommand,"MagicLib,campaign",ListPaintjobsCommand,"List all paintjobs."
56
MagicLib_UnlockPaintjob,org.magiclib.paintjobs.console.UnlockPaintjobCommand,"MagicLib,campaign",MagicLib_UnlockPaintjob [all|<paintjobId>],"Use 'all' to unlock all paintjobs permanently, or specify an id. Run with no arguments to list all."

‎jars/MagicLib-Kotlin.jar‎

0 Bytes
Binary file not shown.

‎jars/MagicLib.jar‎

9.47 KB
Binary file not shown.

‎lib/hotswap-agent.jar‎

1.87 MB
Binary file not shown.

0 commit comments

Comments
 (0)