Skip to content

Commit

Permalink
collect xml more, incar arrows
Browse files Browse the repository at this point in the history
  • Loading branch information
cryham committed May 19, 2024
1 parent c858a47 commit 1fae2c0
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 14 deletions.
77 changes: 64 additions & 13 deletions config/collections.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,16 @@ descr="Difficult to get place for cars in tricky, rocky dips in jungle, and few
<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" />
<track name="Sav4-Hills" />
</collection>
<collection name="#C0E070Hills #FF6030in air" ver="1" difficulty="7" type="3" groups="1"
descr="Difficult gems on top of ballons with fast drone.">
descr="Difficult to collect gems, located on top of or below all ballons. 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" />
<sim boost="3" damage="1" />
<track name="Sav4-Hills" />
</collection>

Expand Down Expand Up @@ -225,21 +231,21 @@ descr="Hole track, with gems on top of hills, also on horizon.">
<sim boost="2" />
<track name="Sav13-Hole" />
</collection>
<collection name="Hole" ver="1" difficulty="4" type="4" groups="4"
descr="Collection of gems on high pillars away from start of Hole track, on horizon.">
<collection name="Hole pillars" ver="1" difficulty="3" type="2" groups="4"
descr="Small set of gems on high pillars away from start of Hole track, on horizon.">
<cartype names="Hover|Drone" />
<sim boost="2" />
<track name="Sav13-Hole" />
</collection>

<collection name="Hairpin tops" ver="1" difficulty="4" type="1" groups="1"
<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" />
<track name="Can1-Hairpins" />
</collection>

<collection name="Castle #FFD020towers" ver="1" difficulty="4" type="3" groups="1"
<collection name="Castle #80C0F0towers" ver="1" difficulty="3" type="1" groups="1"
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" />
Expand All @@ -251,6 +257,12 @@ descr="Forest Castle track with gems on the very top towers, and tricky ones loc
<sim boost="2" />
<track name="For13-Castle" />
</collection>
<collection name="Castle #FF3030chandeliers" 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" />
<track name="For13-Castle" />
</collection>

<collection name="Autumn Orange hills" ver="1" difficulty="3" type="1" groups="1"
descr="Rainy autumn track with gems on top of close hills. Few also inside, near trees.">
Expand All @@ -268,6 +280,38 @@ descr="Mostly on slippery icy hills. No problem with boost.">
<track name="Wnt17-FrozenGarden" />
</collection>


<collection name="GlassStairs terrain" ver="1" difficulty="2" type="1" groups="1"
descr="Gems in various terrain places, some hard to get.">
<cartype names="Hover|Spaceship|Drone" />
<sim boost="3" />
<track name="Uni7-GlassStairs" />
</collection>
<collection name="GlassStairs hard" 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" />
<track name="Uni7-GlassStairs" />
</collection>
<collection name="GlassStairs crystal extreme" ver="1" difficulty="6" type="3" groups="16"
descr="Few gems but in extremely difficult locations.">
<cartype names="Hover|Spaceship" />
<sim boost="3" />
<track name="Uni7-GlassStairs" />
</collection>
<collection name="GlassStairs crystal 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" />
<track name="Uni7-GlassStairs" />
</collection>
<collection name="GlassStairs structure 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="Hover|Spaceship" />
<sim boost="3" />
<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" />
Expand All @@ -276,8 +320,8 @@ descr="Easy collection, each satellite antenna (near road) has a gem, usually in
</collection>

<collection name="Crystal Islands" ver="1" difficulty="4" type="1" groups="1"
descr="Crystal Islands.">
<cartype names="Hovercraft" />
descr="Crystal gems in somewhat hidden places on Islands.">
<cartype names="Hover|Spaceship" />
<sim boost="2" />
<track name="Cry5-CrystalIslands" />
</collection>
Expand All @@ -286,36 +330,43 @@ descr="Crystal Islands.">
<!-- 🛠️ 3 Test fast -->
<!--========================================================================================================================-->

<collection name="#A0C000Temp test easy" ver="1" difficulty="0" type="4" groups="1"
<collection name="#80C000Temp test easy" ver="1" difficulty="0" type="4" groups="1"
descr="Easy test cars.">
<cartype names="Gravel|Asphalt|Extreme|Hovercraft|Hover|Drone" />
<pass time="6" needed="1" prize="2" factor="2" />
<track name="TestC6-Temp" />
</collection>

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

<collection name="#A0C000Temp test hard" ver="1" difficulty="3" type="4" groups="4"
<collection name="#80C000Temp test hard" ver="1" difficulty="3" type="4" groups="4"
descr="Easy test cars.">
<cartype names="Gravel|Asphalt|Extreme|Hovercraft|Hover|Drone" />
<pass time="15" needed="1" prize="2" factor="3" />
<track name="TestC6-Temp" />
</collection>


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

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

<collection name="#A0C0F0Terrains hover" ver="1" difficulty="3" type="4" groups="7"
descr="Terrains test track, with any hovering vehicle.">
<cartype names="Spaceship|Hover|Drone" />
<pass time="21" />
Expand Down
1 change: 1 addition & 0 deletions docs/Roadmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ collection: logic btn continue, restart, hid collected gems on start
3d cups, win particles, new best time hud show
ed Fields accel par, dir, teleport end

**fix** multiplayer
fix .car thrusters lights pos, boost count
Career hide or todo

Expand Down
11 changes: 10 additions & 1 deletion src/game/Hud_Arrow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,17 @@ void CHud::Arrow::Update(CarModel* carM, float time)
void CHud::Arrow::UpdateCol(CarModel* carM, float sc)
{
if (!node) return;
Vector3 pos = carM->ndMain->getPosition() + Vector3(0, 1.f, 0);
Vector3 pos = carM->ndMain->getPosition();
bool car = carM->fCam->TypeCar(); // incar
if (!car)
pos.y += 1.f; // up 3d

Vector3 dir = pos - posTo; // to gem
if (car)
{ auto z = carM->ndMain->getOrientation().xAxis(), y = carM->ndMain->getOrientation().yAxis();
pos -= z * 9.f + y * 0.3f; // in front
}

Real dist = dir.length();
dist = 1.5f - max(0.2f, min(1.0f, dist/30.f));
dir.normalise();
Expand Down

0 comments on commit 1fae2c0

Please sign in to comment.