Skip to content

Commit

Permalink
Combined Karzerfeste map commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Dec 21, 2024
1 parent 4cba91c commit d11f183
Show file tree
Hide file tree
Showing 37 changed files with 73,148 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
map_path: [example, tradeship, exodus, ministation, shaded_hills, away_sites_testing, modpack_testing, planets_testing]
map_path: [example, tradeship, exodus, ministation, shaded_hills, karzerfeste, away_sites_testing, modpack_testing, planets_testing]
steps:
- uses: actions/checkout@v3
- name: Setup Cache
Expand Down
44 changes: 44 additions & 0 deletions maps/karzerfeste/areas/_area.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/area/karzerfeste
name = "Burg Karzerfeste"
abstract_type = /area/karzerfeste
allow_xenoarchaeology_finds = FALSE
icon = 'maps/karzerfeste/areas/icons.dmi'
icon_state = "area"
base_turf = /turf/floor/rock/basalt
fishing_failure_prob = 5
fishing_results = list(
/mob/living/simple_animal/aquatic/fish = 10,
/mob/living/simple_animal/aquatic/fish/grump = 10,
/obj/item/mollusc = 5,
/obj/item/mollusc/barnacle/fished = 5,
/obj/item/mollusc/clam/fished/pearl = 3,
/obj/item/trash/mollusc_shell/clam = 1,
/obj/item/trash/mollusc_shell/barnacle = 1,
/obj/item/remains/mouse = 1,
/obj/item/remains/lizard = 1,
/obj/item/stick = 1,
/obj/item/trash/mollusc_shell = 1,
)
sound_env = GENERIC
ambience = list()

/area/karzerfeste/outside
name = "\improper Wilderness"
color = COLOR_GREEN
is_outside = OUTSIDE_YES
sound_env = PLAIN
ambience = list(
'sound/effects/wind/wind_2_1.ogg',
'sound/effects/wind/wind_2_2.ogg',
'sound/effects/wind/wind_3_1.ogg',
'sound/effects/wind/wind_4_1.ogg',
'sound/effects/wind/wind_4_2.ogg',
'sound/effects/wind/wind_5_1.ogg'
)
area_blurb_category = /area/karzerfeste/outside
interior_ambient_light_modifier = -0.3
area_flags = AREA_FLAG_EXTERNAL | AREA_FLAG_IS_BACKGROUND

/area/karzerfeste/outside/above
name = "\improper Heights"
color = COLOR_GRAY80
32 changes: 32 additions & 0 deletions maps/karzerfeste/areas/caves.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/area/karzerfeste/caves
name = "\improper Subterrain"
color = COLOR_GRAY40
is_outside = OUTSIDE_NO
ambience = list(
'sound/ambience/ambimine.ogg',
'sound/ambience/song_game.ogg'
)
area_blurb_category = /area/karzerfeste/caves
sound_env = CAVE
area_flags = AREA_FLAG_IS_BACKGROUND

/area/karzerfeste/outside/caves
name = "\improper Subterrain Chasm"
color = COLOR_GRAY80
sound_env = CAVE

/area/karzerfeste/caves/surface_east
name = "\improper Eastern Mountain Caverns"
color = COLOR_GRAY80

/area/karzerfeste/caves/surface_west
name = "\improper Western Mountain Caverns"
color = COLOR_GRAY80

/area/karzerfeste/caves/upper_east
name = "\improper Upper Eastern Caverns"
color = COLOR_GRAY80

/area/karzerfeste/caves/upper_west
name = "\improper Upper Western Caverns"
color = COLOR_GRAY40
Binary file added maps/karzerfeste/areas/icons.dmi
Binary file not shown.
59 changes: 59 additions & 0 deletions maps/karzerfeste/areas/keep.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/area/karzerfeste/keep
name = "\improper Keep Interior"
color = COLOR_GREEN_GRAY

/area/karzerfeste/keep/gatehouse
name = "\improper Eastern Gatehouse"
color = COLOR_BLUE_GRAY

/area/karzerfeste/keep/gatehouse/west
name = "\improper Western Gatehouse"
color = COLOR_BLUE_GRAY

/area/karzerfeste/keep/tower
name = "\improper Northwestern Tower"
color = COLOR_CIVIE_GREEN

/area/karzerfeste/keep/tower/two
name = "\improper Northeastern Tower"
color = COLOR_CIVIE_GREEN

/area/karzerfeste/keep/tower/three
name = "\improper Southwestern Tower"
color = COLOR_CIVIE_GREEN

/area/karzerfeste/keep/tower/four
name = "\improper Southeastern Tower"
color = COLOR_CIVIE_GREEN

/area/karzerfeste/outside/keep
name = "\improper Keep Exterior"
color = COLOR_GREEN

/area/karzerfeste/outside/keep/courtyard
name = "\improper Northern Courtyard"
color = COLOR_GREEN

/area/karzerfeste/outside/keep/above
name = "\improper Keep Heights"
color = COLOR_GREEN

/area/karzerfeste/outside/keep/gatehouse
name = "\improper Upper Gatehouse"
color = COLOR_BLUE_GRAY

/area/karzerfeste/outside/keep/tower
name = "\improper Upper Northwestern Tower"
color = COLOR_BLUE_GRAY

/area/karzerfeste/outside/keep/tower/two
name = "\improper Upper Northeastern Tower"
color = COLOR_BLUE_GRAY

/area/karzerfeste/outside/keep/tower/three
name = "\improper Upper Southwestern Tower"
color = COLOR_BLUE_GRAY

/area/karzerfeste/outside/keep/tower/four
name = "\improper Upper Southeastern Tower"
color = COLOR_BLUE_GRAY
4 changes: 4 additions & 0 deletions maps/karzerfeste/areas/road.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/area/karzerfeste/outside/road
name = "\improper South Road"
color = COLOR_CYAN

47 changes: 47 additions & 0 deletions maps/karzerfeste/areas/ward.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/area/karzerfeste/ward
name = "\improper Karzerfeste Outer Ward"
color = COLOR_BRONZE

/area/karzerfeste/ward/wall
name = "\improper Western Outer Wall"
color = COLOR_BROWN

/area/karzerfeste/ward/wall/two
name = "\improper Southwestern Outer Wall"
color = COLOR_BROWN

/area/karzerfeste/ward/wall/three
name = "\improper Central Outer Wall"
color = COLOR_BROWN

/area/karzerfeste/ward/wall/four
name = "\improper Eastern Outer Wall"
color = COLOR_BROWN

/area/karzerfeste/ward/shrine
name = "\improper Western Shrine"
color = COLOR_BLUE

/area/karzerfeste/ward/shrine/east
name = "\improper Eastern Shrine"
color = COLOR_CYAN_BLUE

/area/karzerfeste/outside/ward
name = "\improper Karzerfest Outer Ward"
color = COLOR_BROWN

/area/karzerfeste/outside/ward/wall
name = "\improper Upper Western Outer Wall"
color = COLOR_BROWN

/area/karzerfeste/outside/ward/wall/two
name = "\improper Upper Southwestern Outer Wall"
color = COLOR_BROWN

/area/karzerfeste/outside/ward/wall/three
name = "\improper Upper Central Outer Wall"
color = COLOR_BROWN

/area/karzerfeste/outside/ward/wall/four
name = "\improper Upper Eastern Outer Wall"
color = COLOR_BROWN
45 changes: 45 additions & 0 deletions maps/karzerfeste/jobs/_job.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/datum/map/karzerfeste
id_hud_icons = 'maps/karzerfeste/jobs/icons.dmi'
default_job_type = /datum/job/karzerfeste/local/traveller
allowed_jobs = list(
/datum/job/karzerfeste/guild/master,
/datum/job/karzerfeste/guild/clerk,
/datum/job/karzerfeste/guild/adventurer,
/datum/job/karzerfeste/guild/greenhorn,
/datum/job/karzerfeste/guild/armorer,
/datum/job/karzerfeste/guild/merchant,
/datum/job/karzerfeste/keep/cook,
/datum/job/karzerfeste/keep/builder,
/datum/job/karzerfeste/keep/servant,
/datum/job/karzerfeste/keep/inn,
/datum/job/karzerfeste/local/traveller,
/datum/job/karzerfeste/local/forester,
/datum/job/karzerfeste/local/miner,
/datum/job/karzerfeste/local/farmer,
/datum/job/karzerfeste/shrine/keeper,
/datum/job/karzerfeste/shrine/attendant,
/datum/job/karzerfeste/shrine/cleric,
/datum/job/karzerfeste/shrine/gravekeeper,
/datum/job/karzerfeste/kingdom/representative,
/datum/job/karzerfeste/kingdom/honor_guard,
/datum/job/karzerfeste/steppe/representative,
/datum/job/karzerfeste/steppe/honor_guard
)

/decl/department/karzerfeste
abstract_type = /decl/department/karzerfeste
noun = "faction"
noun_adj = "faction"
announce_channel = null

/datum/job/karzerfeste
abstract_type = /datum/job/karzerfeste
min_skill = list()
// if you consider adding something like literacy to this list to make it rarer/more exclusive
// consider making the higher levels cost more points instead
max_skill = list(
SKILL_CHEMISTRY = SKILL_BASIC, // this is the domain of the herbalist
)
skill_points = 20
spawn_positions = 1
total_positions = 1
59 changes: 59 additions & 0 deletions maps/karzerfeste/jobs/guild.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/decl/department/karzerfeste/guild
name = "Adventurer's Guild"
colour = "#57513c"
display_color = "#807858"
display_priority = 5

/datum/job/karzerfeste/guild
abstract_type = /datum/job/karzerfeste/guild
department_types = list(/decl/department/karzerfeste/guild)
selection_color = "#807858"

/datum/job/karzerfeste/guild/master
title = "Guildmaster"
alt_titles = list("Guildmistress")
outfit_type = /decl/outfit/job/karzerfeste/guild/master
head_position = TRUE
selection_color = "#6d5f43"

/obj/abstract/landmark/start/karzerfeste/guildmaster
name = "Guildmaster"

/datum/job/karzerfeste/guild/clerk
title = "Guild Clerk"
outfit_type = /decl/outfit/job/karzerfeste/guild/clerk

/obj/abstract/landmark/start/karzerfeste/guild_clerk
name = "Guild Clerk"

/datum/job/karzerfeste/guild/adventurer
title = "Adventurer"
outfit_type = /decl/outfit/job/karzerfeste/adventurer

/obj/abstract/landmark/start/karzerfeste/adventurer
name = "Adventurer"

/datum/job/karzerfeste/guild/greenhorn
title = "Greenhorn Adventurer"
outfit_type = /decl/outfit/job/karzerfeste/adventurer/greenhorn

/obj/abstract/landmark/start/karzerfeste/greenhorn_adventurer
name = "Greenhorn Adventurer"

// Maybe appraiser instead?
/datum/job/karzerfeste/guild/armorer
title = "Guild Armorer"
outfit_type = /decl/outfit/job/karzerfeste/guild/armorer

/obj/abstract/landmark/start/karzerfeste/armorer
name = "Guild Armorer"

// Cargo guy, commands the cargo boat
// Also works as an appraiser? Sells stuff upriver for locals and adventurers
// Do they need deckhands/cargo techs?
/datum/job/karzerfeste/guild/merchant
title = "Guild Merchant"
outfit_type = /decl/outfit/job/karzerfeste/guild/merchant

/obj/abstract/landmark/start/karzerfeste/guild_merchant
name = "Guild Merchant"
Binary file added maps/karzerfeste/jobs/icons.dmi
Binary file not shown.
40 changes: 40 additions & 0 deletions maps/karzerfeste/jobs/keep.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/decl/department/karzerfeste/keep
name = "Keep Staff"
colour = "#524226"
display_color = "#81683c"
display_priority = 4

/datum/job/karzerfeste/keep
abstract_type = /datum/job/karzerfeste/keep
department_types = list(/decl/department/karzerfeste/keep)
selection_color = "#81683c"

/datum/job/karzerfeste/keep/cook
title = "Keep Cook"
outfit_type = /decl/outfit/job/karzerfeste/cook

/obj/abstract/landmark/start/karzerfeste/cook
name = "Keep Cook"

/datum/job/karzerfeste/keep/builder
title = "Keep Builder"
outfit_type = /decl/outfit/job/karzerfeste/builder

/obj/abstract/landmark/start/karzerfeste/builder
name = "Keep Builder"

/datum/job/karzerfeste/keep/inn
title = "Innkeeper"
outfit_type = /decl/outfit/job/karzerfeste/innkeeper
head_position = TRUE
selection_color = "#634f2e"

/obj/abstract/landmark/start/karzerfeste/innkeeper
name = "Innkeeper"

/datum/job/karzerfeste/keep/servant
title = "Keep Servant"
outfit_type = /decl/outfit/job/karzerfeste/servant

/obj/abstract/landmark/start/karzerfeste/servant
name = "Keep Servant"
27 changes: 27 additions & 0 deletions maps/karzerfeste/jobs/kingdom.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/decl/department/karzerfete/kingdom
name = "Splinter Kingdom Emissaries"
colour = "#584068"
display_color = "#8965a1"
display_priority = 1

/datum/job/karzerfeste/kingdom
abstract_type = /datum/job/karzerfeste/kingdom
department_types = list(/decl/department/karzerfete/kingdom)

/datum/job/karzerfeste/kingdom/representative
title = "Kingdom Representative"
alt_titles = list("Baron", "Baroness") // too Lifeweb? Shooting for Dwarf Fortress
outfit_type = /decl/outfit/job/karzerfeste/kingdom/representative
selection_color = "#584068"
head_position = TRUE

/obj/abstract/landmark/start/karzerfeste/kingdom_representative
name = "Kingdom Representative"

/datum/job/karzerfeste/kingdom/honor_guard
title = "Kingdom Honor Guard"
outfit_type = /decl/outfit/job/karzerfeste/kingdom/honor_guard
selection_color = "#8965a1"

/obj/abstract/landmark/start/karzerfeste/kingdom_honor_guard
name = "Kingdom Honor Guard"
Loading

0 comments on commit d11f183

Please sign in to comment.