Merge pull request #369 from agateau/add-old-f1

Add the BRGP42
agateau · Jul 24, 2023 · 90b4921 · 90b4921
2 parents a8cc848 + a48858b
commit 90b4921
Show file tree

Hide file tree

Showing 25 changed files with 95 additions and 2 deletions.
diff --git a/.changes/unreleased/Added-20230723-223347.yaml b/.changes/unreleased/Added-20230723-223347.yaml
@@ -0,0 +1,4 @@
+kind: Added
+body: 'Pixel Wheels got a new vehicle: the BRGP42, an old F1 inspired from the Lola
+  Mk4.'
+time: 2023-07-23T22:33:47.129344816+02:00
diff --git a/android/assets/po/bn.po b/android/assets/po/bn.po
@@ -578,6 +578,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr ""
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/de.po b/android/assets/po/de.po
@@ -569,6 +569,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/eo.po b/android/assets/po/eo.po
@@ -574,6 +574,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/es.po b/android/assets/po/es.po
@@ -575,6 +575,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/eu.po b/android/assets/po/eu.po
@@ -576,6 +576,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/fr.po b/android/assets/po/fr.po
@@ -570,6 +570,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/hu.po b/android/assets/po/hu.po
@@ -573,6 +573,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/it_IT.po b/android/assets/po/it_IT.po
@@ -569,6 +569,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/messages.pot b/android/assets/po/messages.pot
@@ -563,6 +563,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr ""
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/nl.po b/android/assets/po/nl.po
@@ -574,6 +574,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/pl.po b/android/assets/po/pl.po
@@ -577,6 +577,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/ru.po b/android/assets/po/ru.po
@@ -573,6 +573,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Мирамар"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/sv.po b/android/assets/po/sv.po
@@ -574,6 +574,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/tr.po b/android/assets/po/tr.po
@@ -567,6 +567,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr "Miramar"
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/po/zh_CN.po b/android/assets/po/zh_CN.po
@@ -572,6 +572,11 @@ msgctxt "vehicle"
 msgid "Miramar"
 msgstr ""
 
+#: android/assets/vehicles/old-f1.xml:1
+msgctxt "vehicle"
+msgid "BRGP42"
+msgstr ""
+
 #: android/assets/vehicles/pickup.xml:1
 msgctxt "vehicle"
 msgid "Pickup"

diff --git a/android/assets/vehicles/old-f1.xml b/android/assets/vehicles/old-f1.xml
@@ -0,0 +1,8 @@
+<vehicle speed="0.95" name="BRGP42" width="23" height="55">
+    <main image="old-f1"/>
+    <shapes>
+        <octogon corner="6" width="16" height="55"/>
+    </shapes>
+    <axle y="47" width="28" steer="1" tireSize="THIN"/>
+    <axle y="11" width="30" tireSize="THIN"/>
+</vehicle>
diff --git a/core/assets-src/sprites/tires/THIN-splash.anim.ase b/core/assets-src/sprites/tires/THIN-splash.anim.ase
diff --git a/core/assets-src/sprites/tires/THIN.still.ase b/core/assets-src/sprites/tires/THIN.still.ase
diff --git a/core/assets-src/sprites/vehicles/old-f1.ase b/core/assets-src/sprites/vehicles/old-f1.ase
diff --git a/core/src/com/agateau/pixelwheels/Assets.java b/core/src/com/agateau/pixelwheels/Assets.java
@@ -68,6 +68,7 @@ public class Assets implements TextureRegionProvider {
         "jeep",
         "miramar",
         "bigfoot",
+        "old-f1",
     };
 
     public static final String MENU_MUSIC_ID = "menu";

diff --git a/core/src/com/agateau/pixelwheels/RewardManagerSetup.java b/core/src/com/agateau/pixelwheels/RewardManagerSetup.java
@@ -144,6 +144,10 @@ static void createVehicleRules(RewardManager rewardManager, Assets assets) {
                 Reward.get(assets.findVehicleDefById("miramar")),
                 new ChampionshipRankRewardRule(assets.findChampionshipById("city"), 1));
 
+        rewardManager.addRule(
+                Reward.get(assets.findVehicleDefById("old-f1")),
+                new ChampionshipRankRewardRule(assets.findChampionshipById("city"), 0));
+
         // Unlock all remaining vehicles
         for (VehicleDef vehicleDef : assets.vehicleDefs) {
             Reward reward = Reward.get(vehicleDef);

diff --git a/core/src/com/agateau/pixelwheels/utils/BodyRegionDrawer.java b/core/src/com/agateau/pixelwheels/utils/BodyRegionDrawer.java
@@ -28,7 +28,7 @@
 /** Helper class to draw a TextureRegion for a Box2D Body */
 public class BodyRegionDrawer {
     public static final float SHADOW_ALPHA = 0.35f;
-    public static final float SHADOW_OFFSET_PX = 6;
+    public static final float SHADOW_OFFSET_PX = 3;
     private static final int Z_MAX_SHADOW_OFFSET_PX = 30;
     private static final int SCALE_MAX_SHADOW_OFFSET_PX = 30;
     private Batch mBatch;

diff --git a/core/src/com/agateau/pixelwheels/vehicledef/AxleDef.java b/core/src/com/agateau/pixelwheels/vehicledef/AxleDef.java
@@ -29,6 +29,7 @@ public class AxleDef {
     private static final float SPLASH_FRAME_DURATION = 0.04f;
 
     public enum TireSize {
+        THIN(0.2f),
         NORMAL(0.2f),
         LARGE(0.2f),
         HUGE(0.05f);

diff --git a/docs/vehicles.md b/docs/vehicles.md
@@ -26,6 +26,6 @@
             - `x`, `y`: the shape bottom-left corner. Defaults to centered if not set.
     - `<axle>`: An axle linking two wheels. Can (should!) appear multiple times.
         - `y`: y position.
-        - `width`: width.
+        - `width`: width from wheel center to wheel center.
         - `steer`: a float indicating if the wheels can be used to steer. 0 means no steering. 1 means steering in the selected direction, -1 means steering in the opposite direction (useful for steering rear wheels). Defaults to 0.
         - `tireSize`: the size of the tires on this axle. Must be one of the values of the `AxleDef.TireSize` enum. Defaults to NORMAL.