Skip to content

Commit

Permalink
archipelago item trader
Browse files Browse the repository at this point in the history
  • Loading branch information
BrunoSupremo committed Jun 5, 2024
1 parent bdb2ee1 commit d16395d
Show file tree
Hide file tree
Showing 115 changed files with 1,248 additions and 269 deletions.
2 changes: 1 addition & 1 deletion archipelago_biome_server.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
archipelago_biome = {}
print("Archipelago Biome Mod version 23.3.23")
print("Archipelago Biome Mod version 24.6.5")

--[[
Expand Down
7 changes: 1 addition & 6 deletions components/cave/cave.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-- local log = radiant.log.create_logger('ArchipelagoCave')
local ArchipelagoCave = class()
local Point3 = _radiant.csg.Point3
local Cube3 = _radiant.csg.Cube3
Expand Down Expand Up @@ -37,9 +36,7 @@ function ArchipelagoCave:move_to_edge(location)
repeat
step = step +1
at_edge, side = self:edge_neighbor(location, step)
--code aligner comment because sublime can't understand repeat until identation ¬¬
until at_edge
--code aligner comment because sublime can't understand repeat until identation ¬¬

if step == 1 then
-- already at the edge
Expand Down Expand Up @@ -393,11 +390,9 @@ function ArchipelagoCave:populate_cave(location)

local undead_population = stonehearth.population:get_population('undead')
local skeleton_info = {
--comment align
tuning = 'archipelago_biome:monster_tuning:undead:cave_skeleton',
combat_leash_range = 16,
combat_leash_range = 32,
from_population = {
--comment align
role = 'skeleton',
min = 2,
max = 6,
Expand Down
28 changes: 25 additions & 3 deletions data/effects/cocobomb_effect/cocobomb_explosion_effect.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"tracks": {
"dust": {
"type": "cubemitter",
"cubemitter": "particles/dust_poof/purple_dust_poof.cubemitter.json",
"cubemitter": "/archipelago_biome/data/horde/particles/cocobomb/smoke_cubemitter.json",
"loop": false,
"start_time" : 650,
"end_time" : 4000,
"end_time" : 4300,
"transforms": {
"x":0,
"y":0,
Expand All @@ -21,7 +21,7 @@
"cubemitter": "/archipelago_biome/data/horde/particles/cocobomb/explosion_cubemitter.json",
"loop": false,
"start_time" : 0,
"end_time" : 1000,
"end_time" : 1150,
"transforms": {
"x":0,
"y":0,
Expand All @@ -30,6 +30,28 @@
"ry":0,
"rz":0
}
},
"sound": {
"type": "sound_effect",
"duration": 1000,
"start_time": 0,
"min_distance": 50,
"falloff": 3.6,
"volume": 100,
"track": {
"type": "one_of",
"items": [
"stonehearth:sounds:entling_mage_fire_01",
"stonehearth:sounds:entling_mage_fire_02",
"stonehearth:sounds:entling_mage_fire_03",
"stonehearth:sounds:entling_mage_fire_04",
"stonehearth:sounds:entling_mage_fire_05",
"stonehearth:sounds:entling_mage_fire_06",
"stonehearth:sounds:entling_mage_fire_07",
"stonehearth:sounds:entling_mage_fire_08",
"stonehearth:sounds:entling_mage_fire_09"
]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"max": 4,
"range": 5
},
"combat_leash_range": 15,
"combat_leash_range": 32,
"tuning": "archipelago_biome:monster_tuning:forest:easy_octopus"
},
"red_jellyfish": {
Expand All @@ -59,7 +59,7 @@
"max": 1,
"range": 5
},
"combat_leash_range": 15,
"combat_leash_range": 32,
"tuning": "archipelago_biome:monster_tuning:forest:insane_jellyfish"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"max": 4,
"range": 5
},
"combat_leash_range": 15,
"combat_leash_range": 32,
"tuning": "archipelago_biome:monster_tuning:forest:easy_octopus"
},
"red_octopus": {
Expand All @@ -59,7 +59,7 @@
"max": 1,
"range": 5
},
"combat_leash_range": 15,
"combat_leash_range": 32,
"tuning": "archipelago_biome:monster_tuning:forest:insane_octopus"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"max": 4,
"range": 5
},
"combat_leash_range": 15,
"combat_leash_range": 32,
"tuning": "archipelago_biome:monster_tuning:forest:easy_oyster"
},
"red_oyster": {
Expand All @@ -59,7 +59,7 @@
"max": 1,
"range": 5
},
"combat_leash_range": 15,
"combat_leash_range": 32,
"tuning": "archipelago_biome:monster_tuning:forest:insane_oyster"
}
}
Expand Down
7 changes: 7 additions & 0 deletions data/gm/campaigns/trader/arcs/caravan_shops_arc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"encounters": {
"archipelago_shop_1": "file(encounters/tier_1_shops/archipelago_shop_1.json)",
"archipelago_shop_2": "file(encounters/tier_2_shops/archipelago_shop_2.json)",
"archipelago_shop_3": "file(encounters/tier_3_shops/archipelago_shop_3.json)"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"type": "encounter",
"encounter_type": "shop",
"unique": true,
"in_edge": "archipelago_shop_1",
"shop_info": {
"name": "i18n(archipelago_biome:data.gm.campaigns.trader.arcs.encounters.tier_1_shops.archipelago_shop_1.name)",
"title": "i18n(archipelago_biome:data.gm.campaigns.trader.arcs.encounters.tier_1_shops.archipelago_shop_1.title)",
"inventory": {
"merchant_options":{
"max_wanted_items": 4,
"wanted_items": [
{
"material": "wood resource",
"price_factor": 1.5,
"max_quantity": 10,
"chance": 0.4
},
{
"material": "thread resource",
"price_factor": 1.7,
"max_quantity": 15,
"chance": 0.4
},
{
"material": "any fuel",
"price_factor": 1.45,
"max_quantity": 24,
"chance": 0.4
},
{
"material": "prepared_drink",
"price_factor": 1.2,
"max_quantity": 16,
"chance": 0.6
},
{
"material": "prepared_food",
"price_factor": 1.45,
"max_quantity": 12,
"chance": 0.6
}
]
},
"shopkeeper_level": 1,
"shopkeeper_gold": 150,
"overall_price_multiplier": 2,
"entries": [
{
"items_matching": {
"anything_with": {
"material": [
"archipelago_made"
]
}
},
"quantity": {
"min": 0,
"max": 1
},
"fine_item_chance": 0.1
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"out_edge": {
"type": "trigger_one",
"out_edges": [
{
"out_edge": "archipelago_shop_1",
"type": "weighted_edge",
"weight": 1
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"type": "encounter",
"encounter_type": "shop",
"unique": true,
"in_edge": "archipelago_shop_2",
"shop_info": {
"name": "i18n(archipelago_biome:data.gm.campaigns.trader.arcs.encounters.tier_2_shops.archipelago_shop_2.name)",
"title": "i18n(archipelago_biome:data.gm.campaigns.trader.arcs.encounters.tier_2_shops.archipelago_shop_2.title)",
"inventory": {
"merchant_options":{
"rarity_weights": {
"common": 4
},
"max_wanted_items": 5,
"wanted_items": [
{
"material": "armor",
"price_factor": 1.2,
"max_quantity": 12,
"chance": 0.4
},
{
"material": "wood resource",
"price_factor": 1.5,
"max_quantity": 10,
"chance": 0.4
},
{
"material": "thread resource",
"price_factor": 1.7,
"max_quantity": 15,
"chance": 0.4
},
{
"material": "any fuel",
"price_factor": 1.45,
"max_quantity": 24,
"chance": 0.4
},
{
"material": "prepared_drink",
"price_factor": 1.3,
"max_quantity": 16,
"chance": 0.5
},
{
"material": "prepared_food",
"price_factor": 1.65,
"max_quantity": 12,
"chance": 0.5
}
]
},
"shopkeeper_level": 2,
"shopkeeper_gold": 300,
"overall_price_multiplier": 2,
"entries": [
{
"items_matching": {
"anything_with": {
"material": [
"archipelago_made"
]
}
},
"quantity": {
"min": 0,
"max": 2
},
"fine_item_chance": 0.1
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"out_edge": {
"type": "trigger_one",
"out_edges": [
{
"out_edge": "archipelago_shop_2",
"type": "weighted_edge",
"weight": 1
}
]
}
}
Loading

0 comments on commit d16395d

Please sign in to comment.