@@ -53,6 +53,8 @@ class ManualWorld(World):
53
53
item_name_to_item = item_name_to_item
54
54
item_name_groups = item_name_groups
55
55
56
+ filler_item_name = filler_item_name
57
+
56
58
item_counts = {}
57
59
start_inventory = {}
58
60
@@ -63,7 +65,7 @@ class ManualWorld(World):
63
65
victory_names = victory_names
64
66
65
67
def get_filler_item_name (self ) -> str :
66
- return hook_get_filler_item_name (self , self .multiworld , self .player ) or filler_item_name
68
+ return hook_get_filler_item_name (self , self .multiworld , self .player ) or self . filler_item_name
67
69
68
70
def interpret_slot_data (self , slot_data : dict [str , any ]):
69
71
#this is called by tools like UT
@@ -108,7 +110,7 @@ def create_items(self):
108
110
# victory gets placed via place_locked_item at the victory location in create_regions
109
111
if name == "__Victory__" : continue
110
112
# the game.json filler item name is added to the item lookup, so skip it until it's potentially needed later
111
- if name == filler_item_name : continue
113
+ if name == filler_item_name : continue # intentionally using the Game.py filler_item_name here because it's a non-Items item
112
114
113
115
item = self .item_name_to_item [name ]
114
116
item_count = int (item .get ("count" , 1 ))
@@ -357,10 +359,8 @@ def adjust_filler_items(self, item_pool, traps):
357
359
extra_item = self .create_item (self .random .choice (traps ))
358
360
item_pool .append (extra_item )
359
361
360
- filler_name_to_add = self .get_filler_item_name ()
361
-
362
362
for _ in range (0 , filler_count ):
363
- extra_item = self .create_item (filler_name_to_add )
363
+ extra_item = self .create_item (self . get_filler_item_name () )
364
364
item_pool .append (extra_item )
365
365
elif extras < 0 :
366
366
logging .warning (f"{ self .game } has more items than locations. { abs (extras )} non-progression items will be removed at random." )
0 commit comments