Skip to content

E-Tank Multiplier Customization #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blkerby merged 7 commits into from
Aug 14, 2026
+228 −84
Merged

E-Tank Multiplier Customization #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
518776c
E-Tank Multiplier Customization
aquanight Aug 6, 2026
2f28b0e
In-game and UI implementation
aquanight Aug 8, 2026
7b7bffa
Fix tests/formatting
aquanight Aug 8, 2026
8623204
Add to seed details
aquanight Aug 8, 2026
2fd2fff
Formatting again
aquanight Aug 8, 2026
a727674
Rename ammoSize/multiplier to pickupSize
blkerby Aug 14, 2026
0a7bc92
fix capitalization in pickup size modal
blkerby Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion rust/data/presets/full-settings/Community Race Season 5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4284,6 +4284,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -4882,4 +4884,4 @@
"disable_bluesuit": false,
"enable_major_glitches": false
}
}
}
4 changes: 3 additions & 1 deletion rust/data/presets/full-settings/Default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4284,6 +4284,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -4794,4 +4796,4 @@
"savestate": "No",
"random_seed": null
}
}
}
4 changes: 3 additions & 1 deletion rust/data/presets/full-settings/Mentor Tournament.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4284,6 +4284,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -4882,4 +4884,4 @@
"disable_bluesuit": false,
"enable_major_glitches": false
}
}
}
4 changes: 3 additions & 1 deletion rust/data/presets/full-settings/Summer Series Expert Challenge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4284,6 +4284,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -4794,4 +4796,4 @@
"disable_bluesuit": false,
"enable_major_glitches": false
}
}
}
4 changes: 3 additions & 1 deletion rust/data/presets/item-progression/Challenge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -308,4 +310,4 @@
"priority": "No"
}
]
}
}
4 changes: 3 additions & 1 deletion rust/data/presets/item-progression/Desolate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -239,4 +241,4 @@
{"item": "Varia", "priority": "No"},
{"item": "Gravity", "priority": "No"}
]
}
}
4 changes: 3 additions & 1 deletion rust/data/presets/item-progression/Normal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -307,4 +309,4 @@
"priority": "No"
}
]
}
}
4 changes: 3 additions & 1 deletion rust/data/presets/item-progression/Technical.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -308,4 +310,4 @@
"priority": "No"
}
]
}
}
4 changes: 3 additions & 1 deletion rust/data/presets/item-progression/Tricky.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"missile_size": 5,
"super_size": 5,
"powerbomb_size": 5,
"etank_size": 1,
"reserve_size": 1,
"item_pool": [
{
"item": "Missile",
Expand Down Expand Up @@ -308,4 +310,4 @@
"priority": "No"
}
]
}
}
13 changes: 10 additions & 3 deletions rust/maprando-logic/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ impl GlobalState {
missile_size: u16,
super_size: u16,
powerbomb_size: u16,
etank_size: u8,
reserve_size: u8,
tech: &[bool],
) {
self.inventory.items[item as usize] = true;
Expand Down Expand Up @@ -83,16 +85,21 @@ impl GlobalState {
self.inventory.max_power_bombs = new_max_power_bombs;
}
Item::ETank => {
self.inventory.max_energy = std::cmp::min(1499, self.inventory.max_energy + 100);
self.inventory.max_energy = std::cmp::min(
1499,
self.inventory.max_energy + (100 * etank_size as Capacity),
);
if !tech[game_data.manage_reserves_tech_idx] {
self.inventory.max_reserves =
Capacity::min(self.inventory.max_reserves, self.inventory.max_energy);
}
}
Item::ReserveTank => {
self.inventory.collectible_reserve_tanks += 1;
self.inventory.max_reserves =
std::cmp::min(400, self.inventory.collectible_reserve_tanks * 100);
self.inventory.max_reserves = std::cmp::min(
400,
self.inventory.collectible_reserve_tanks * (100 * reserve_size as Capacity),
);
if !tech[game_data.manage_reserves_tech_idx] {
self.inventory.max_reserves =
Capacity::min(self.inventory.max_reserves, self.inventory.max_energy);
Expand Down
4 changes: 4 additions & 0 deletions rust/maprando-web/src/randomize_helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ pub struct SeedHeaderTemplate<'a> {
missile_size: i32,
super_size: i32,
powerbomb_size: i32,
etank_size: i32,
reserve_size: i32,
difficulty: &'a DifficultyConfig,
quality_of_life_preset: String,
supers_double: bool,
Expand Down Expand Up @@ -442,6 +444,8 @@ pub fn render_seed(
missile_size: seed_data.settings.item_progression_settings.missile_size as i32,
super_size: seed_data.settings.item_progression_settings.super_size as i32,
powerbomb_size: seed_data.settings.item_progression_settings.powerbomb_size as i32,
etank_size: seed_data.settings.item_progression_settings.etank_size as i32,
reserve_size: seed_data.settings.item_progression_settings.reserve_size as i32,
filler_items: seed_data
.settings
.item_progression_settings
Expand Down
18 changes: 0 additions & 18 deletions rust/maprando-web/templates/generate/help/progression/ammo_size.html
View file
Open in desktop

This file was deleted.

18 changes: 18 additions & 0 deletions rust/maprando-web/templates/generate/help/progression/pickup_size.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<div class="modal" id="pickupSizeModal" tabindex="-1" data-parent-modal="itemProgressionModal">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5">Pickup sizes</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<p>This setting affects the size of ammo and energy expansions.</p>
<p>The default is 5 Missiles, Supers, and Power Bombs per pickup and 1 E-Tank and Reserve Tank per pickup.</p>
<p>In all cases, the in-game ammo capacity will be capped at 999 Missiles, 99 Supers, and 99 Power Bombs, while energy and reserve capacity are capped at 1499 Energy and 400 Reserve Energy.</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
36 changes: 27 additions & 9 deletions rust/maprando-web/templates/generate/item_progression.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,35 +220,53 @@ <h2 class="accordion-header">
<div class="col-lg-12">
<div class="card">
<div class="card-header px-2">
<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#ammoSizeModal">
<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#pickupSizeModal">
<i class="bi bi-question-circle"></i>
</button>
<label for="preset">Ammo size</label>
<label for="preset">Pickup sizes</label>
</div>
<div class="card-body">
<div class="form-group row m-2">
<label class="col-lg-3 col-form-label text-end" for="ammo_size_Missile">Missiles per pack</label>
<label class="col-lg-3 col-form-label text-end" for="pickupSizeMissile">Missiles per pickup</label>
<span class="itemIcon itemIconMissile"></span>
<div class="col-lg-2">
<input type="text" class="form-control" name="ammo_size_Missile" id="ammoSizeMissile"
<input type="text" class="form-control" name="pickup_size_Missile" id="pickupSizeMissile"
value="0" onchange="itemPoolChanged()">
</div>
</div>

<div class="form-group row m-2">
<label class="col-lg-3 col-form-label text-end" for="ammo_size_Super">Super Missiles per pack</label>
<label class="col-lg-3 col-form-label text-end" for="pickupSizeSuper">Supers per pickup</label>
<span class="itemIcon itemIconSuper"></span>
<div class="col-lg-2">
<input type="text" class="form-control" name="ammo_size_Super" id="ammoSizeSuper"
<input type="text" class="form-control" name="pickup_size_Super" id="pickupSizeSuper"
value="0" onchange="itemPoolChanged()">
</div>
</div>

<div class="form-group row m-2">
<label class="col-lg-3 col-form-label text-end" for="ammo_size_PowerBomb">Power Bombs per pack</label>
<label class="col-lg-3 col-form-label text-end" for="pickupSizePowerBomb">Power Bombs per pickup</label>
<span class="itemIcon itemIconPowerBomb"></span>
<div class="col-lg-2">
<input type="text" class="form-control" name="ammo_size_PowerBomb" id="ammoSizePowerBomb"
<input type="text" class="form-control" name="pickup_size_PowerBomb" id="pickupSizePowerBomb"
value="0" onchange="itemPoolChanged()">
</div>
</div>

<div class="form-group row m-2">
<label class="col-lg-3 col-form-label text-end" for="pickupSizeETank">E-Tanks per pickup</label>
<span class="itemIcon itemIconETank"></span>
<div class="col-lg-2">
<input type="text" class="form-control" name="pickup_size_ETank" id="pickupSizeETank"
value="0" onchange="itemPoolChanged()">
</div>
</div>

<div class="form-group row m-2">
<label class="col-lg-3 col-form-label text-end" for="pickupSizeReserveTank">Reserve Tanks per pickup</label>
<span class="itemIcon itemIconReserveTank"></span>
<div class="col-lg-2">
<input type="text" class="form-control" name="pickup_size_ReserveTank" id="pickupSizeReserveTank"
value="0" onchange="itemPoolChanged()">
</div>
</div>
Expand Down Expand Up @@ -518,7 +536,7 @@ <h2 class="accordion-header">
{% include "help/progression/random_tank.html" %}
{% include "help/progression/spazer_before_plasma.html" %}
{% include "help/progression/ammo_collect_fraction.html" %}
{% include "help/progression/ammo_size.html" %}
{% include "help/progression/pickup_size.html" %}
{% include "help/progression/item_pool.html" %}
{% include "help/progression/stop_item_placement_early.html" %}
{% include "help/progression/starting_items.html" %}
Expand Down
Loading
Loading