Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add mucilage (slime) #3590

Merged
merged 45 commits into from Sep 15, 2022
Merged

Add mucilage (slime) #3590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b34544b
Initial attempt at slime
Oliveriver Jul 20, 2022
08061a7
More implementation
Oliveriver Jul 23, 2022
39d0f39
Cooldown and more changes
Oliveriver Jul 23, 2022
e5fcbc9
Merge branch 'master' into slime
Oliveriver Aug 15, 2022
2142081
Fix disappearing clouds and reduce jet constant
Oliveriver Aug 15, 2022
c9b4f16
Display agents panel correctly, eject based on orientation, add trans…
Oliveriver Aug 15, 2022
73fe570
Some cleanup
Oliveriver Aug 15, 2022
4750477
More fixes and cleanup
Oliveriver Aug 15, 2022
f079fc2
Fix saving bugs and minor balancing
Oliveriver Aug 15, 2022
85b4ee1
Mucilage clouds now decay
Oliveriver Aug 16, 2022
9029438
Appease linter
Oliveriver Aug 16, 2022
bcbf52a
Fix retention of extra speed
Oliveriver Aug 17, 2022
adc7cda
Merge branch 'master' into slime
Oliveriver Aug 19, 2022
06265ec
Adjust some constants
Oliveriver Aug 19, 2022
ccc6757
Some review comments
Oliveriver Aug 19, 2022
e9d9c35
Fix quite a crucial typo...
Oliveriver Aug 24, 2022
1c8989a
Change to checking IsAgent and removing gathering
Oliveriver Aug 24, 2022
776291b
Merge branch 'master' into slime
Oliveriver Aug 29, 2022
caa9f7b
Add icon, model, demo sound and more robust process approach
Oliveriver Aug 29, 2022
3d9a8b7
Appease linter!
Oliveriver Aug 29, 2022
6caef13
Remaining TODOs, besides new sound and icons
Oliveriver Aug 29, 2022
3ad647a
Some fixes and review comments
Oliveriver Aug 30, 2022
4d1366a
Move as much as possible to SlimeJetComponent
Oliveriver Aug 30, 2022
dae0687
Add missing texture
Oliveriver Aug 30, 2022
e393fbf
(Temporary?) save fix
Oliveriver Aug 30, 2022
cd4e666
Change digestibility and fix save issue...maybe
Oliveriver Sep 2, 2022
d2e4e86
Fix saving issue properly and attempt to fix animation
Oliveriver Sep 2, 2022
cd5e14c
Replace sound effect
Oliveriver Sep 6, 2022
0620599
Merge branch 'master' into slime
Oliveriver Sep 12, 2022
378b24c
Fix indentation
Oliveriver Sep 12, 2022
5f91dfd
More review changes
Oliveriver Sep 12, 2022
3560ca7
Remove animation workaround...because apparently it just worked anyway?
Oliveriver Sep 12, 2022
2fb38ff
Merge branch 'master' into slime
hhyyrylainen Sep 15, 2022
db15488
Improved spelling of "incentivize"
hhyyrylainen Sep 15, 2022
7dd7bc1
Got the mucilage bar parts fixed
hhyyrylainen Sep 15, 2022
fbc97ad
Fixed incorrect comment spacing in Constants.cs
hhyyrylainen Sep 15, 2022
f9ebbfd
Put isAlwaysUseful back to oxytoxy
hhyyrylainen Sep 15, 2022
b089888
Fixed duplicate button order values for the slime jet
hhyyrylainen Sep 15, 2022
91c269a
Set oxytoxy to not be always useful as that shows the oxytoxy bar always
hhyyrylainen Sep 15, 2022
dcfeef2
Changed logic for checking if any in a list of compounds is useful
hhyyrylainen Sep 15, 2022
0087f65
Added a new Compound property to make cloud types non-absorbable
hhyyrylainen Sep 15, 2022
d3e4323
Make the AI a bit smarter about the non-digestible compounds and adde…
hhyyrylainen Sep 15, 2022
9cbb1d2
Fixed the compounds panel animation not working
hhyyrylainen Sep 15, 2022
f507983
Margin changes godot made automatically
hhyyrylainen Sep 15, 2022
3667c3d
Fixed secrete slime button being focusable and pressing it not working
hhyyrylainen Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Thrive.csproj
View file
Open in desktop
Expand Up @@ -332,6 +332,7 @@
<Compile Include="src\microbe_stage\CompoundCloudPlane.cs" />
<Compile Include="src\microbe_stage\MicrobeSystem.cs" />
<Compile Include="src\microbe_stage\organelle_components\CiliaComponent.cs" />
<Compile Include="src\microbe_stage\organelle_components\SlimeJetComponent.cs" />
<Compile Include="src\microbe_stage\organelle_components\EmptyOrganelleComponent.cs" />
<Compile Include="src\microbe_stage\PatchMapNameGenerator.cs" />
<Compile Include="src\microbe_stage\editor\BarHelper.cs" />
Expand Down
3 changes: 3 additions & 0 deletions Thrive.sln.DotSettings
View file
Open in desktop
Expand Up @@ -505,6 +505,7 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Absorbable/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=abyssopelagic/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Adjacencies/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=adjacencies/@EntryIndexedValue">True</s:Boolean>
Expand Down Expand Up @@ -576,6 +577,8 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=hyperthreading/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Hyyryl_00E4inen/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ICESHELF/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=incentivize/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=incentivizes/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=inplace/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=janky/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=joypad/@EntryIndexedValue">True</s:Boolean>
Expand Down
3 changes: 3 additions & 0 deletions assets/models/organelles/SlimeJet.anim
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions assets/models/organelles/SlimeJet.glb
View file
Open in desktop
Git LFS file not shown