Skip to content

Commit

Permalink
Merge branch 'develop' into macos-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@backwardsEric
backwardsEric committed Nov 27, 2024
2 parents 695c647 + 3d2b2d7 commit 8adb092
Show file tree
Hide file tree
Showing 9 changed files with 205 additions and 233 deletions.
206 changes: 177 additions & 29 deletions lib/edit/BaseitemDefinitions.jsonc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16328,8 +16328,12 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 3,
"cost": 5,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 1,
"rarity": 1
Expand All @@ -16353,8 +16357,12 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 4,
"cost": 6,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 2,
"rarity": 1
Expand All @@ -16378,8 +16386,12 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 5,
"cost": 7,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 4,
"rarity": 1
Expand All @@ -16403,8 +16415,12 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 6,
"cost": 8,
"allocations": [
{
"depth": 1,
"rarity": 8
},
{
"depth": 6,
"rarity": 1
Expand All @@ -16428,8 +16444,12 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 7,
"cost": 9,
"allocations": [
{
"depth": 1,
"rarity": 8
},
{
"depth": 8,
"rarity": 1
Expand All @@ -16453,8 +16473,12 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 8,
"cost": 10,
"allocations": [
{
"depth": 1,
"rarity": 8
},
{
"depth": 10,
"rarity": 1
Expand All @@ -16478,11 +16502,19 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 9,
"cost": 22,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 12,
"rarity": 1
"rarity": 2
}
]
},
Expand All @@ -16503,11 +16535,19 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 10,
"cost": 24,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 14,
"rarity": 1
"rarity": 2
}
]
},
Expand All @@ -16528,8 +16568,16 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 12,
"cost": 16,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 16,
"rarity": 1
Expand All @@ -16553,8 +16601,16 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 14,
"cost": 17,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 18,
"rarity": 1
Expand All @@ -16578,8 +16634,16 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 16,
"cost": 18,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 20,
"rarity": 1
Expand All @@ -16603,11 +16667,23 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 18,
"cost": 40,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 20,
"rarity": 3
},
{
"depth": 22,
"rarity": 1
"rarity": 2
}
]
},
Expand All @@ -16628,11 +16704,23 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 20,
"cost": 48,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 20,
"rarity": 3
},
{
"depth": 24,
"rarity": 1
"rarity": 2
}
]
},
Expand All @@ -16653,11 +16741,23 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 24,
"cost": 52,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 20,
"rarity": 3
},
{
"depth": 26,
"rarity": 1
"rarity": 2
}
]
},
Expand All @@ -16678,11 +16778,23 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 28,
"cost": 56,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 20,
"rarity": 3
},
{
"depth": 28,
"rarity": 1
"rarity": 2
}
]
},
Expand All @@ -16703,11 +16815,23 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 32,
"cost": 64,
"allocations": [
{
"depth": 1,
"rarity": 10
},
{
"depth": 10,
"rarity": 5
},
{
"depth": 20,
"rarity": 3
},
{
"depth": 30,
"rarity": 1
"rarity": 2
}
]
},
Expand All @@ -16728,11 +16852,23 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 40,
"cost": 120,
"allocations": [
{
"depth": 32,
"rarity": 1
"depth": 1,
"rarity": 12
},
{
"depth": 10,
"rarity": 6
},
{
"depth": 20,
"rarity": 4
},
{
"depth": 40,
"rarity": 3
}
]
},
Expand All @@ -16753,11 +16889,23 @@
"parameter_value": 0,
"level": 1,
"weight": 0,
"cost": 80,
"cost": 160,
"allocations": [
{
"depth": 34,
"rarity": 1
"depth": 1,
"rarity": 12
},
{
"depth": 10,
"rarity": 6
},
{
"depth": 20,
"rarity": 4
},
{
"depth": 50,
"rarity": 3
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions src/floor/fixed-map-generator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,7 @@ static void parse_qtw_D(PlayerType *player_ptr, qtwg_type *qtwg_ptr, char *s)
} else if (item_index) {
ItemEntity item(item_index);
if (item.bi_key.tval() == ItemKindType::GOLD) {
const auto offset = BaseitemList::get_instance().lookup_gold_offset(item_index);
item = floor.make_gold(offset);
item = floor.make_gold(item.bi_key);
}

ItemMagicApplier(player_ptr, &item, floor.base_level, AM_NO_FIXED_ART | AM_GOOD).execute();
Expand Down
4 changes: 2 additions & 2 deletions src/monster-floor/monster-death.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ static void drop_items_golds(PlayerType *player_ptr, MonsterDeath *md_ptr, int d
ItemEntity item;
if (md_ptr->do_gold && (!md_ptr->do_item || one_in_(2))) {
const auto &monrace = monraces.get_monrace(md_ptr->m_ptr->r_idx);
const auto offset = BaseitemMonraceService::lookup_specific_gold_drop_offset(monrace.drop_flags);
item = floor.make_gold(offset);
const auto bi_key = BaseitemMonraceService::lookup_fixed_gold_drop(monrace.drop_flags);
item = floor.make_gold(bi_key);
dump_gold++;
} else {
if (!make_object(player_ptr, &item, md_ptr->mo_mode)) {
Expand Down
Loading

0 comments on commit 8adb092

Please sign in to comment.