Skip to content

Commit

Permalink
Vault Cutscenes, Mineral Distribution Tweaks, Vault Generation started.
Browse files Browse the repository at this point in the history
  • Loading branch information
NeDether committed Oct 10, 2024
1 parent f2b1222 commit a1b51d2
Show file tree
Hide file tree
Showing 16 changed files with 321 additions and 19 deletions.
10 changes: 5 additions & 5 deletions MiningBeam.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bool MiningBeam::OnHit(Simulator::cSpaceToolData* pTool, const Vector3& position
const Simulator::PlanetID mario = Simulator::GetActivePlanetRecord()->GetID();
uint32_t greg = mario.internalValue;
RandomNumberGenerator rng(greg);
int abudnacne = rng.RandomInt(6)+1;
int abudnacne = rng.RandomInt(7);
for (int i = 0; i < power; i++) {
if (inventory->HasTool({ id("mineral_scanner1"), 0, 0 })) {
// App::ConsolePrintF("LOOOOOOL");
Expand Down Expand Up @@ -112,15 +112,15 @@ void MiningBeam::getPool(uint32_t seed, int k) {
string john = "spice1";
if (k == 0) {

int chud = rng.RandomInt(16);
int chud = rng.RandomInt(17);

if (chud >= 0 && chud <= 4) {
if (chud >= 0 && chud <= 5) {
john = "spice_mat_copper";
}
else if (chud >= 5 && chud <= 8) {
else if (chud >= 6 && chud <= 10) {
john = "spice_mat_titanium";
}
else if (chud >= 9 && chud <= 13) {
else if (chud >= 11 && chud <= 15) {
john = "spice_mat_gold";
}
else {
Expand Down
8 changes: 4 additions & 4 deletions MiningScanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ bool MiningScanner::OnSelect(cSpaceToolData* pTool)
const PlanetID mario = GetActivePlanetRecord()->GetID();
uint32_t greg = mario.internalValue;
Math::RandomNumberGenerator rng(greg);
int chud = rng.RandomInt(16);
if (chud >= 0 && chud <= 4) { //Copper
int chud = rng.RandomInt(17);
if (chud >= 0 && chud <= 5) { //Copper
// App::ConsolePrintF("your mineral is: copper");
gaksterrific.push_back(id("spice_mat_copper"));
}
else if (chud >= 5 && chud <= 8) { //Titanium
else if (chud >= 6 && chud <= 10) { //Titanium
// App::ConsolePrintF("your mineral is: titanium");
gaksterrific.push_back(id("spice_mat_titanium"));
}
else if (chud >= 9 && chud <= 13) { //Gold
else if (chud >= 11 && chud <= 15) { //Gold
// App::ConsolePrintF("your mineral is: gold");
gaksterrific.push_back(id("spice_mat_gold"));
}
Expand Down
8 changes: 8 additions & 0 deletions RattlerSpore.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@
</ClInclude>
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="VaultManager.h">
<SubType>
</SubType>
</ClInclude>
<ClInclude Include="ViewCrafts.h">
<SubType>
</SubType>
Expand Down Expand Up @@ -284,6 +288,10 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="VaultManager.cpp">
<SubType>
</SubType>
</ClCompile>
<ClCompile Include="ViewCrafts.cpp">
<SubType>
</SubType>
Expand Down
6 changes: 6 additions & 0 deletions RattlerSpore.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@
<ClInclude Include="SolSysResourcesCheat.h">
<Filter>RattlerSpore\Cheats</Filter>
</ClInclude>
<ClInclude Include="VaultManager.h">
<Filter>RattlerSpore\Function\Systems</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
Expand Down Expand Up @@ -201,6 +204,9 @@
<ClCompile Include="SolSysResourcesCheat.cpp">
<Filter>RattlerSpore\Cheats</Filter>
</ClCompile>
<ClCompile Include="VaultManager.cpp">
<Filter>RattlerSpore\Function\Systems</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="SdkPathConfig.props" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
0x00000000 An energy signature matching your fabricator radiates from this planet.
0x00000001 Something is showing up on the ship’s radar.
0x00000002 A mysterious structure! It appears to be constructed by the same race as the crashed ship in your home system. Scanning this might provide some useful data.
0x00000003 Scanning this building resulted in a latent
0x00000004
0x00000005
0x00000006
0x00000007
0x00000008
0x00000009
0x0000000A
0x0000000B
0x0000000C
0x0000000D
0x0000000E
0x0000000F
4 changes: 2 additions & 2 deletions SMFX/RattlerSpore/config.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Tue Oct 08 15:51:22 EDT 2024
lastTimeUsed=1728417082651
#Wed Oct 09 21:11:27 EDT 2024
lastTimeUsed=1728501792777
isReadOnly=false
sources="Spore (Game & Graphics)"
fixedTabPaths="layouts_atlas~\\rat_achievement.spui"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
particles particles-3452
alpha 0 0.5 0.2 0.1 0
size 9 3
life 1 -preroll 1
inject 1 -single 0.01
texture sg_blue_dot -draw additive
end

particles particles-3451
color (1, 0.85, 0.2)
alpha 0 1 0.8 0.6 0.4 0.2 0
size 10.4989996 13.3640003 16.4319992 19.5669994 22.6350002 25.5 28.0359993 30.1350002 31.7029991
rotate 0 0.3 -vary 1
life 1 -preroll 1
rate 7 -single 0.5
texture 0xCBBDB96B -draw additive
end

effect RSPORE_ufo_radar_incoming_ratal -rigid
particles particles-3452
particles particles-3451
sound -name ui_spg_generic_alert -ignoreLength
end

export RSPORE_ufo_radar_incoming_ratal
Binary file modified SMFX/RattlerSpore/layouts_atlas~/SolarSystemResource.spui
Binary file not shown.
14 changes: 14 additions & 0 deletions SMFX/RattlerSpore/scripts3~/config.trigger
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
sinclude "global.txt"
sinclude "test.txt"
sinclude "GGE2CLG.txt"
sinclude "CLG2CRG.txt"
sinclude "CRG2TRG.txt"
sinclude "TRG2CVG.txt"
sinclude "tribe.txt"
sinclude "cell.txt"
sinclude "civ.txt"
sinclude "creature.txt"
sinclude "space.txt"
sinclude "CVG2SPG.txt"
sinclude "GGEIntro.txt"
sinclude "rspore.txt"
109 changes: 109 additions & 0 deletions SMFX/RattlerSpore/scripts3~/rspore.trigger
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
#### RSPORE_VaultDetector ####

state RSPORE_VaultDetector
letterbox -on
pauseGame
mixevent space_cin_start 1
addActor "ufo" ufo
startcamera -target "ufo" -targetOffset (0, 0, 0) -ease -follow -offset 20 -noWait -duration .75
wait -secs .75
nextState RSPORE_VaultDetector2
end

state RSPORE_VaultDetector2
startEffect "detection" RSPORE_ufo_radar_incoming_ratal -target "ufo" -attached -noWait
wait -secs 2
nextState RSPORE_VaultDetector3
end

state RSPORE_VaultDetector3
startcamera -target "planet" -targetOffset (0, 0, 0) -ease -offset 8 -follow -duration 1.5 -noWait -anchored
wait -secs 1.5
nextState RSPORE_VaultDetector4
end

state RSPORE_VaultDetector4
pauseGame -screenEffect -pauseGraphics
wait -secs .135
nextState RSPORE_VaultDetector5
end

state RSPORE_VaultDetector5
text "SkibidiSkibdi" rspore-cutscenes!0x00000000
wait -secs 1
nextState SPG_MomentButtonSnap
end

#### RSPORE_VAULTCUT ####

state RSPORE_VAULTCUT
addActor "Rare" rare
addActor "ufo" ufo
toggleplumping "Rare" false
letterbox -on
mixevent space_cin_start 1
startEffect "detection" RSPORE_ufo_radar_incoming_ratal -target "ufo" -attached -noWait
startcamera -target "ufo" -targetOffset (0, 0, 0) -offset 7 -useFootprint -noWait -follow -duration .5 -ease
wait -secs 2
nextState RSPORE_VAULTCUTA1
end

state RSPORE_VAULTCUTA1
pauseGame -screenEffect -pauseGraphics
stopCamera
wait -secs .135
nextState RSPORE_VAULTCUTA2
end

state RSPORE_VAULTCUTA2
wait -secs 1
text "SPG_Rare2" rspore-cutscenes!0x00000001
nextState RSPORE_VAULTCUTA3
end

state RSPORE_VAULTCUTA3
wait -forNext
nextState RSPORE_VAULTCUTA4
end

state RSPORE_VAULTCUTA4
unpauseGame
text -hide
startEffect "radarMode" radarMode -noWait
startcamera -targetpos (0, 0, 0) -targetOffset (0, 0, 0) -noWait -duration .25 -anchored
wait -secs .25
nextState RSPORE_VAULTCUTA
startsound sfx_cin_spg_detect_object -escstop
end

state RSPORE_VAULTCUTA
startcamera -target "Rare" -targetOffset (0, 0, 0) -noWait -satellite -fov .9 -duration 3 -ease
nextState RSPORE_VAULTCUTB
wait -secs 3
end

state RSPORE_VAULTCUTB
startcamera -target "Rare" -targetOffset (0, 0, 0) -noWait -offset 7 -fov .5 -useRadius -duration 3 -ease
wait -secs 3
nextState RSPORE_VAULTCUTC
end

state RSPORE_VAULTCUTC
startcamera -target "Rare" -targetOffset (0, 0, 4) -noWait -offset 5 -pitch .15 -fov .7 -useRadius -duration 2 -ease
wait -secs 2
nextState RSPORE_VAULTCUT2
end

state RSPORE_VAULTCUT2
pauseGame -screenEffect -effect radarModeFreeze -pauseGraphics
stopCamera
wait -secs .135
nextState RSPORE_VAULTCUT3
end

state RSPORE_VAULTCUT3
wait -secs 1
text "SPG_Rare2" rspore-cutscenes!0x00000002
toggleplumping "Rare" true
nextState SPG_MomentButtonSnap
end
11 changes: 11 additions & 0 deletions SMFX/RattlerSpore/sporemaster/names.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ upgrade
placehappinessbooster
sysUILayout
plannerbudget
rspore
spice_mat_latticine
station
store-mining
spg_ice
RSPORE_ufo_radar_incoming_ratal
turret
zurgtastic
spg_uranium
Expand Down Expand Up @@ -130,6 +132,7 @@ rare-galacticobject9
ScanMenu
rare-galacticobject8
rattlerach
config
special
CreatureEdit
auto_Recipes_repairpotion
Expand All @@ -141,6 +144,7 @@ spice_drt_sulphide
cat
orbbardecor
toolForge
configRSPORE
spg_cargopas_mineral
graphics_atlas~ 0x31a44893
antimattermissile
Expand Down Expand Up @@ -175,6 +179,7 @@ auto_animations~_MaterialList
ra
zoo
auto_Recipes_placebiostabilizer
sg_blue_dot
ach_core_mine3
ach_core_mine2
auto_spacetrading~_spice_drt_kamacite
Expand Down Expand Up @@ -224,6 +229,7 @@ spice_mat_uranium
cat_terra
tool
catCombat
configEP1
iconZ
leTitle
cat_soc
Expand All @@ -240,6 +246,7 @@ rare-scientistscroll02
rare-scientistscroll03
rare-scientistscroll01
spacerares_storybook
empirecol
spacerares_jewel
spice_mat_cobalt
rare-scientistscroll10
Expand All @@ -263,6 +270,7 @@ employed
auto_Recipes_recipetemplate
spg_titanium
layouts_atlas~ 0x40464200
skibididopdopdop
ach_core_fab
auto_spacetools~_ach_core_cr1
city
Expand Down Expand Up @@ -290,6 +298,8 @@ auto_spacetrading~_spice_mat_serenidite
spg_nvidium
auto_Recipes_aoe_repair
auto_spacetrading~_spice_mat_uranium
scripts3~ 0x40890200
ui_spg_generic_alert
catslot
crafting
monolith
Expand Down Expand Up @@ -327,6 +337,7 @@ asteroid
mining_beam1
auto_AssetBrowserFeedItems_rspore_ach
cat_combat
rspore-cutscenes
auto_RecipeCategories_tool
population
auto_spacetrading~_spice_mat_quartz
Expand Down
10 changes: 5 additions & 5 deletions SolSysResourcesCheat.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "SolSysResourcesCheat.h"
#include "SolarSystemResources.h"

using namespace Simulator;
SolSysResourcesCheat::SolSysResourcesCheat()
{
}
Expand All @@ -15,10 +15,10 @@ SolSysResourcesCheat::~SolSysResourcesCheat()
void SolSysResourcesCheat::ParseLine(const ArgScript::Line& line)
{


SolarSystemResourcesA.OpenSysUI();


CinematicManager.PlayCinematic("RSPORE_VaultDetector", 0, 0, 0, 0, 0);
//CinematicManager.PlayCinematic("RSPORE_VAULTCUT", 0, 0, 0, 0, 0);
//This will not work until the SolarSystemResources is re-added to DLLMAIN
//SolarSystemResourcesA.OpenSysUI();
//SolarSystemResourcesA.LogSystem();


Expand Down
Loading

0 comments on commit a1b51d2

Please sign in to comment.