Skip to content

Commit

Permalink
ren next
Browse files Browse the repository at this point in the history
  • Loading branch information
@cryham
cryham committed May 22, 2024
1 parent c250795 commit 39456d5
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 31 deletions.
75 changes: 52 additions & 23 deletions config/collections.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
| if 1 - finish all collects, also requires time, at least for lowest prize, or quicker
| prizes
| 0 only gold 🥇 1 gold,silver 🥇🥈 2 gold,silver,bronze (default, max) 🥇🥈🥉
| factor - time added for lower prize silver, and 2x that for bronze
| next - time added for lower prize silver, and 2x that for bronze
| higher value will make it easier to get lower prizes
<pass needed="1" time="6" prizes="2" factor="2" />
<pass needed="1" time="6" prizes="2" next="2" />
| e.g. ^ means: < 6 sec gold, < 8 sec silver, < 10 sec bronze, >= 10 sec won't pass
<track name=".." >
Expand All @@ -71,30 +71,30 @@
<collection name="#60B0FFStunt Rally one" ver="1" difficulty="2" type="0" groups="1"
descr="The first, easy, original collection on Stunt Rally logo track. Each letter except river l, has just one gem, including the floating loop.">
<cartype names="Gravel|Asphalt|Extreme" />
<pass time="1:55" factor="20" />
<pass time="1:55" next="20" />
<track name="TestC12-SR" />
</collection>

<collection name="#20FF20Stunt Rally more" ver="1" difficulty="3" type="1" groups="3"
descr="Collection on Stunt Rally logo track. Endurance type with many more gems to collect. Each letter except river l, has few gems, including the floating loop. Gems are also on terrain, rocks or in water.">
<cartype names="Gravel|Asphalt|Hovercraft|Hover|Drone" />
<pass time="6:46" factor="30" />
<pass time="6:45" next="30" />
<track name="TestC12-SR" />
</collection>

<collection name="#F0F020Stunt Rally hard" ver="1" difficulty="5" type="3" groups="4"
descr="Hard Stunt Rally track collection. Gems placed in difficult to get places, but not that high.">
<cartype names="Hover|Drone" />
<sim boost="3" />
<pass time="4:45" factor="30" />
<pass time="4:45" next="30" />
<track name="TestC12-SR" />
</collection>

<collection name="#FF8020Stunt Rally extreme" ver="1" difficulty="6" type="3" groups="8"
descr="Extreme Stunt Rally track collection. Highest locations for gems. Requires flying to get on top. Use any nearby hill to jump off high in direction towards gem.">
<cartype names="Hover|Drone" />
<sim boost="3" />
<pass time="4:05" factor="40" />
<pass time="4:05" next="40" />
<track name="TestC12-SR" />
</collection>

Expand All @@ -103,100 +103,118 @@ descr="Extreme Stunt Rally track collection. Highest locations for gems. Require
descr="Easy collection with terrain cars for places on top of rocky hills in desert.">
<cartype names="Terrain" />
<sim boost="0" rewind="0" />
<pass time="2:35" next="10" />
<track name="Des1-Dunes" />
</collection>

<collection name="#90E0E0Loops #FF8030in air" ver="1" difficulty="5" type="3" groups="1"
descr="Tricky collection of gems in air below loops top, needs falling down from middle or other place. Moving camera view to side makes it much easier.">
<cartype names="Gravel" />
<sim boost="0" />
<pass time="3:20" next="30" />
<track name="Sav3-Loops" />
</collection>

<collection name="Rocky jungle gems" ver="1" difficulty="4" type="1" groups="1"
descr="Difficult to get place for cars in tricky, rocky dips in jungle, and few on hills. Careful for damage and use rewind to get back.">
<cartype names="Gravel" />
<sim boost="0" />
<pass time="2:35" next="10" />
<track name="Jng3-Rocky" />
</collection>

<collection name="Savanna Hills" ver="1" difficulty="3" type="1" groups="2"
descr="Gems located around a nice savannah terrain, mostly on hill tops.">
<car names="Terrain|Gravel" />
<sim boost="2" />
<pass time="5:10" next="30" />
<track name="Sav4-Hills" />
</collection>
<collection name="#C0E070Hills #FF6030in air" ver="1" difficulty="7" type="3" groups="1"
descr="Difficult to collect gems, located on top of or below all balloons. Using fastest drone you can jump off from terrain and fly to anywhere. It's a matter of aim and patience at that high speed though.">
<car names="Q3|R2" />
<sim boost="3" damage="1" />
<pass time="33:00" factor="360" />
<pass time="33:00" next="360" />
<track name="Sav4-Hills" />
</collection>

<collection name="SBridge terrain" ver="1" difficulty="3" type="1" groups="1"
descr="Gems located on terrain tops, and in bumpy places. Endurance type, careful for damage, no rewind.">
<cartype names="Gravel" />
<sim boost="2" damage="1" rewind="0" />
<pass time="5:20" next="30" />
<track name="Des4-SBridge" />
</collection>

<collection name="#D0D040LowJumps terrain" ver="1" difficulty="3" type="1" groups="1"
descr="Gems located on terrain tops collecting with hovercraft.">
<cartype names="Hovercraft" />
<sim boost="1" />
<pass time="2:43" next="10" />
<track name="Des5-LowJumps" />
</collection>

<collection name="#FFC040HighJumps nearby" ver="1" difficulty="3" type="1" groups="1"
descr="Gems are on side of jumps, requiring to jump slightly to side to collect them. Rewind makes it quicker to get all from each place.">
<cartype names="Hover" />
<sim boost="3" />
<pass time="2:08" next="15" />
<track name="Des6-HighJumps" />
</collection>

<collection name="#F0F0B0Technical floating" ver="1" difficulty="4" type="1" groups="1"
descr="Desert gems floating in air, requiring to jump off from road or nearby terrain slope to get them.">
<cartype names="Hover" />
<sim boost="3" />
<pass time="4:05" next="30" />
<track name="Des8-Technical" />
</collection>

<collection name="HighMadness river" ver="1" difficulty="3" type="1" groups="1"
descr="Gems located in river, lake and on hills.">
<cartype names="Terrain|Extreme" />
<sim boost="3" />
<pass time="6:20" next="30" />
<track name="Sav7-HighMadness" />
</collection>

<collection name="Jungle fun hideout" ver="1" difficulty="4" type="0" groups="1"
descr="Jungle fun track with hidden gems.">
<cartype names="Terrain|Extreme" />
<sim boost="2" />
<pass time="7:20" next="30" />
<track name="Jng6-Fun" />
</collection>

<collection name="Bumpy hilly bike trip" ver="1" difficulty="4" type="1" groups="1"
descr="Mud Bumps track with lots of gems in various places. Many on top of hills, some in dips, few in flat places near slopes.">
<car names="BE" />
<sim boost="3" />
<pass time="11:00" next="40" />
<track name="Mud2-Bumps" />
</collection>

<collection name="Jungle temple hideout" ver="1" difficulty="3" type="1" groups="1"
descr="Small but dense jungle track with hidden gems.">
<cartype names="Terrain|Extreme|Gravel" />
<sim boost="3" />
<pass time="2:35" next="10" />
<track name="Jng11-Temple" />
</collection>

<collection name="Jungle temple treasure" ver="1" difficulty="5" type="3" groups="2"
descr="Small but dense jungle track with hidden gems.">
<cartype names="Hover|Drone" />
<sim boost="3" />
<pass time="1:50" factor="20" />
<pass time="1:50" next="20" />
<track name="Jng11-Temple" />
</collection>

<collection name="Mad Mntn Dark" ver="1" difficulty="5" type="3" groups="3"
descr="Mad Mntn track in dark with heavy rain. Difficult places for gems, many on hexrock platforms and on top of caves or hills. But with Spaceship it's easier and softer to navigate here.">
<cartype names="Spaceship" />
<sim boost="3" damage="1" />
<pass time="5:25" factor="30" />
<pass time="5:25" next="30" />
<track name="For9-MadMntnDark" />
</collection>

Expand All @@ -217,6 +235,7 @@ descr="Plenty of gems on canyon hills, few under bridges and on platforms for lo
descr="Gems located on hill tops and on few small islands, in almost dark.">
<cartype names="Hovercraft" />
<sim boost="1" />
<pass time="2:30" next="10" />
<track name="Vlc1-Dark" />
</collection>

Expand Down Expand Up @@ -246,31 +265,41 @@ descr="Small set of gems on high pillars away from start of Hole track, on horiz
<track name="Sav13-Hole" />
</collection>

<collection name="HighPeaks lakes" ver="1" difficulty="3" type="0" groups="1"
descr="High peaked mountain track. In each one of 4 lakes there are 2 gems to collect with hovercraft. Careful about damage on bridges.">
<cartype names="Hovercraft" />
<sim boost="2" />
<pass time="5:10" next="30" />
<track name="For12-HighPeaks" />
</collection>

<collection name="Hairpin tops" ver="1" difficulty="3" type="0" groups="1"
descr="Canyon Hairpins track with gems on the very top of those hairpin hills.">
<cartype names="Gravel|Asphalt" />
<sim boost="1" />
<pass time="4:10" next="10" />
<track name="Can1-Hairpins" />
</collection>

<collection name="Castle #80C0F0towers" ver="1" difficulty="2" type="0" groups="1"
descr="Forest Castle track with gems close to road and on top towers.">
<cartype names="Gravel|Asphalt" />
<sim boost="2" />
<pass time="2:35" next="10" />
<track name="For13-Castle" />
</collection>
<collection name="Castle #FFD020candles" ver="1" difficulty="4" type="3" groups="3"
descr="Forest Castle track with gems on the very top towers, and tricky ones located after drop below usually in the middle of tower walls.">
<cartype names="Gravel|Asphalt" />
<sim boost="2" />
<pass time="7:00" factor="30" />
<pass time="7:00" next="30" />
<track name="For13-Castle" />
</collection>
<collection name="Castle #F04040chandeliers" ver="1" difficulty="5" type="3" groups="4"
descr="Castle track with 3 floating sets of 6 gems and 1 higher, forming big chandeliers in air. Needs some rewinding to catch them right when falling.">
<cartype names="Hover" />
<sim boost="2" />
<pass time="4:25" factor="30" />
<pass time="4:25" next="30" />
<track name="For13-Castle" />
</collection>

Expand All @@ -295,51 +324,51 @@ descr="Mostly on slippery icy hills. No problem with boost.">
descr="Very long exploration, for gems in various terrain places, some harder to get.">
<cartype names="Hover|Spaceship|Drone" />
<sim boost="3" />
<pass time="17:00" factor="60" />
<pass time="17:00" next="60" />
<track name="Uni7-GlassStairs" />
</collection>
<collection name="GlassStairs #F09010hard" ver="1" difficulty="5" type="3" groups="2"
descr="Difficult, extensive collection of various gems. Few suspended in air, some on top of loops and pipes.">
<cartype names="Hover|Spaceship|Drone" />
<sim boost="3" />
<pass time="14:00" factor="30" />
<pass time="14:00" next="30" />
<track name="Uni7-GlassStairs" />
</collection>
<collection name="GlassStairs #F060B0Extreme" ver="1" difficulty="6" type="3" groups="16"
descr="Many gems in extremely difficult locations. Hidden under glass pipes or suspended above.">
<cartype names="Hover|Spaceship" />
<sim boost="3" />
<pass time="33:00" factor="360" />
<pass time="33:00" next="360" />
<track name="Uni7-GlassStairs" />
</collection>
<collection name="GlassStairs #2090FFcrystal harvest" ver="1" difficulty="4" type="3" groups="8"
descr="Collecting crystals from hexagonal formations in suspended places.">
<cartype names="Hover|Spaceship" />
<sim boost="3" />
<pass time="6:55" factor="30" />
<pass time="6:55" next="30" />
<track name="Uni7-GlassStairs" />
</collection>
<collection name="GlassStairs #A0B0C0structure repairs" ver="1" difficulty="3" type="3" groups="4"
descr="GlassStairs track, visiting places on buildings. Gems with not an easy way to get to them.">
<cartype names="Spaceship" />
<sim boost="1" />
<pass time="4:40" factor="20" />
<pass time="4:40" next="20" />
<track name="Uni7-GlassStairs" />
</collection>

<collection name="#B0A0D0Satellite visits" ver="1" difficulty="2" type="0" groups="1"
descr="Easy collection, each satellite antenna (near road) has a gem, usually in front.">
<cartype names="Extreme" />
<sim boost="3" />
<pass time="2:05" factor="10" />
<pass time="2:05" next="10" />
<track name="Sur7-UaraHills" />
</collection>

<collection name="Crystal Islands" ver="1" difficulty="4" type="3" groups="1"
descr="Crystal gems in somewhat hidden places on islands.">
<cartype names="Hover|Spaceship" />
<sim boost="2" />
<pass time="8:50" factor="30" />
<pass time="8:50" next="30" />
<track name="Cry5-CrystalIslands" />
</collection>

Expand All @@ -350,37 +379,37 @@ descr="Crystal gems in somewhat hidden places on islands.">
<collection name="#80C000Temp test easy" ver="1" difficulty="0" type="4" groups="1"
descr="Easy test all. Times: less than 6 sec for gold, 8 silver, 10 bronze.">
<cartype names="Gravel|Asphalt|Extreme|Hovercraft|Hover|Drone" />
<pass time="6" needed="1" prize="2" factor="2" />
<pass time="6" needed="1" prize="2" next="2" />
<track name="TestC6-Temp" />
</collection>

<collection name="#80C000Temp test all" ver="1" difficulty="1" type="4" groups="3"
descr="Easy test cars.">
<cartype names="Asphalt|Hovercraft|Hover|Drone" />
<car names="U6" />
<pass time="26" needed="1" prize="2" factor="4" />
<pass time="26" needed="1" prize="2" next="4" />
<track name="TestC6-Temp" />
</collection>

<collection name="#80C000Temp test hard" ver="1" difficulty="3" type="4" groups="4"
descr="Easy test cars.">
<cartype names="Hover|Drone" />
<pass time="35" needed="0" prize="2" factor="5" />
<pass time="35" needed="0" prize="2" next="5" />
<track name="TestC6-Temp" />
</collection>


<collection name="#D0F060Circle easy" ver="1" difficulty="1" type="4" groups="7"
descr="Simple test.">
<cartype names="Hover" />
<pass time="10" needed="0" prize="2" factor="2" />
<pass time="10" needed="0" prize="2" next="2" />
<track name="TestC4-Ow" />
</collection>

<collection name="Test Hills" ver="1" difficulty="1" type="4" groups="7"
descr="Simple test terrain.">
<cartype names="Asphalt|Hover|Drone" />
<pass time="11" needed="1" prize="2" factor="2" />
<pass time="11" needed="1" prize="2" next="2" />
<track name="Test13-Hills" />
</collection>

Expand Down
2 changes: 1 addition & 1 deletion docs/Roadmap.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ new track(s) with^ add walls
----
### New game stuff✨

🏆 new [game Modes](https://stuntrally.tuxfamily.org/mantis/view.php?id=21): [Career](https://forum.freegamedev.net/viewtopic.php?f=79&t=5211), WIP Collection, 3d cup models
🏆 new [game Modes](https://stuntrally.tuxfamily.org/mantis/view.php?id=21): [Career](https://forum.freegamedev.net/viewtopic.php?f=79&t=5211)
Score for: drift (sliding on road), air time (jumps etc), hitting dynamic objects

🕹️ New **Game** elements:
Expand Down
2 changes: 1 addition & 1 deletion src/common/SceneCollects.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ void App::UpdCollects()
else
for (int p=0; p <= pp; ++p)
{
float t = col.time + (2-p) * col.factor;
float t = col.time + (2-p) * col.next;
bool pass = time < t;
if (pass)
prize = p;
Expand Down
8 changes: 4 additions & 4 deletions src/game/data/CollectXml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ bool CollectXml::LoadXml(std::string file, TracksIni* trks, bool check)
XMLElement* ePass = eCol->FirstChildElement("pass");
if (ePass)
{
a = ePass->Attribute("need"); if (a) c.need = s2i(a) > 0; // 0 infinite 1 timed
a = ePass->Attribute("time"); if (a) c.time = s2time(a);
a = ePass->Attribute("prizes"); if (a) c.prizes = s2i(a);
a = ePass->Attribute("factor"); if (a) c.factor = s2r(a);
a = ePass->Attribute("need"); if (a) c.need = s2i(a) > 0; // 0 infinite 1 timed
a = ePass->Attribute("time"); if (a) c.time = s2time(a);
a = ePass->Attribute("prizes"); if (a) c.prizes = s2i(a);
a = ePass->Attribute("next"); if (a) c.next = s2r(a);
}

// track
Expand Down
4 changes: 2 additions & 2 deletions src/game/data/CollectXml.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class Collection
// float length = 0.f; // stats for display
int type = 0; // gui tab
bool need =0; // 0 infinite 1 timed
float time = 0.f; // time for gold prize
float time = 0.f; // time for gold prize (less needed)
int prizes = 2; // 0 only gold 1 gold,silver 2 gold,silver,bronze
float factor = 1.f; // multiplier for silver,bronze points/pos prizes
float next = 1.f; // added time for silver, 2x for bronze

// Allowed type(s) or specific vehicle(s), 1 or more
CAllowed cars;
Expand Down

0 comments on commit 39456d5

Please sign in to comment.