Skip to content

Commit bd10c76

Browse files
DewehDeweh
committed
Fix unlocked vehicles.
1 parent c2dec1e commit bd10c76

File tree

4 files changed

+30
-13
lines changed

4 files changed

+30
-13
lines changed

‎CP2077SaveEditor/Properties/Resources.Designer.cs

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CP2077SaveEditor/Properties/Resources.resx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,12 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121-
<data name="Facts" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\Resources\Facts.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
123-
</data>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
124121
<data name="ItemClasses" type="System.Resources.ResXFileRef, System.Windows.Forms">
125122
<value>..\Resources\ItemClasses.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
126123
</data>
@@ -154,4 +151,10 @@
154151
<data name="AppearancePaths" type="System.Resources.ResXFileRef, System.Windows.Forms">
155152
<value>..\Resources\AppearancePaths.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
156153
</data>
154+
<data name="Facts" type="System.Resources.ResXFileRef, System.Windows.Forms">
155+
<value>..\Resources\Facts.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
156+
</data>
157+
<data name="Vehicles" type="System.Resources.ResXFileRef, System.Windows.Forms">
158+
<value>..\Resources\Vehicles.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
159+
</data>
157160
</root>

‎CP2077SaveEditor/Resources/Vehicles.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
["Vehicle.v_standard25_thorton_colby_pickup_player","Vehicle.v_sportbike1_yaiba_kusanagi_tyger_player","Vehicle.v_sportbike1_yaiba_kusanagi_player","Vehicle.v_standard25_thorton_colby_pickup_02_player","Vehicle.v_standard25_mahir_supron_player","Vehicle.v_sport2_quadra_type66_02_player","Vehicle.v_standard3_thorton_mackinaw_player","Vehicle.v_standard3_chevalier_emperor_player","Vehicle.v_sport2_villefort_alvarado_valentinos_player","Vehicle.v_standard2_thorton_galena_nomad_player","Vehicle.v_sport1_quadra_turbo_r_player","Vehicle.v_sportbike2_arch_tyger_player","Vehicle.v_standard2_villefort_cortes_player","Vehicle.v_standard2_thorton_colby_player","Vehicle.v_sportbike2_arch_jackie_player","Vehicle.v_sport2_quadra_type66_player","Vehicle.v_sport2_mizutani_shion_nomad_player","Vehicle.v_sportbike3_brennan_apollo_nomad_player","Vehicle.v_standard25_villefort_columbus_player","Vehicle.v_sport1_herrera_outlaw_player","Vehicle.v_sport2_villefort_alvarado_player","Vehicle.v_sportbike2_arch_jackie_tuned_player","Vehicle.v_standard3_thorton_mackinaw_ncu_player","Vehicle.v_standard2_archer_quartz_player","Vehicle.v_sportbike3_brennan_apollo_player","Vehicle.v_standard2_thorton_galena_bobas_player","Vehicle.v_sport1_rayfield_caliburn_player","Vehicle.v_sport2_mizutani_shion_player","Vehicle.v_standard2_archer_hella_player","Vehicle.v_sport1_rayfield_caliburn_02_player","Vehicle.v_sport2_porsche_911turbo_player","Vehicle.v_sport2_mizutani_shion_nomad_02_player","Vehicle.v_sport2_quadra_type66_avenger_player","Vehicle.v_sport1_quadra_turbo_player","Vehicle.v_sport2_quadra_type66_nomad_player","Vehicle.v_standard25_thorton_colby_nomad_player","Vehicle.v_standard2_makigai_maimai_player","Vehicle.v_standard3_thorton_mackinaw_02_player","Vehicle.v_sport1_rayfield_aerondight_player","Vehicle.v_standard2_chevalier_thrax_player","Vehicle.v_sportbike2_arch_player","Vehicle.v_standard2_thorton_galena_player","Vehicle.v_sport2_quadra_type66_nomad_ncu_player","Vehicle.v_standard2_archer_bandit_player","Vehicle.v_standard2_villefort_cortes_delamain_player"]

‎CP2077SaveEditor/Views/Form1.cs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ await Task.Run(() =>
765765
var vehiclePS = (vehicleGarageComponentPS)ps.Entries.Where(x => x.Data is vehicleGarageComponentPS).FirstOrDefault().Data;
766766
var unlockedVehicles = new List<string>();
767767

768-
var vehicles = tdbService.GetRecords().Where(x => x.ResolvedText.StartsWith("Vehicle.") && x.ResolvedText.EndsWith("_player")).Select(x => x.ResolvedText);
768+
var vehicles = JsonConvert.DeserializeObject<List<string>>(CP2077SaveEditor.Properties.Resources.Vehicles);
769769

770770
if (vehiclePS != null)
771771
{
@@ -1348,8 +1348,10 @@ private void vehiclesListView_DoubleClick(object sender, EventArgs e)
13481348
var vehiclePS = (vehicleGarageComponentPS)ps.Entries.Where(x => x.Data is vehicleGarageComponentPS).FirstOrDefault().Data;
13491349
var unlockedVehicles = vehiclePS.UnlockedVehicleArray.Select(x => x.VehicleID.RecordID.ResolvedText);
13501350

1351-
foreach (var selectedItem in vehiclesListView.GetVirtualInfo().Items)
1351+
foreach (var selectedItem in vehiclesListView.SelectedVirtualItems())
13521352
{
1353+
selectedItem.Checked = !selectedItem.Checked;
1354+
13531355
if (selectedItem.Checked)
13541356
{
13551357
if (!unlockedVehicles.Contains(selectedItem.Text))
@@ -1364,18 +1366,20 @@ private void vehiclesListView_DoubleClick(object sender, EventArgs e)
13641366
{
13651367
if (unlockedVehicles.Contains(selectedItem.Text))
13661368
{
1367-
var list = vehiclePS.UnlockedVehicleArray.ToList();
1368-
foreach (var unlocked in vehiclePS.UnlockedVehicleArray)
1369+
var list = vehiclePS.UnlockedVehicleArray;
1370+
for(int i = 0; i < list.Count; i++)
13691371
{
1372+
var unlocked = list[i];
1373+
13701374
if (unlocked.VehicleID.RecordID.ResolvedText == selectedItem.Text)
13711375
{
13721376
list.Remove(unlocked);
1377+
break;
13731378
}
13741379
}
1375-
vehiclePS.UnlockedVehicleArray.Clear();
1376-
foreach (var itm in list)
1380+
foreach (var unlocked in vehiclePS.UnlockedVehicleArray)
13771381
{
1378-
vehiclePS.UnlockedVehicleArray.Add(itm);
1382+
13791383
}
13801384
}
13811385
}

0 commit comments

Comments
 (0)