Skip to content

Commit

Permalink
Merge pull request #5361 from ARF-SS13/update-map-config
Browse files Browse the repository at this point in the history 
Update map config
  • Loading branch information
@Kilmented
Kilmented committed Sep 23, 2024
2 parents 0fe3cae + f383a3d commit a7f7c8b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 90 deletions.
8 changes: 4 additions & 4 deletions _maps/pahrump-everything.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"Linkage" : "Cross",
"Name": "Lower Yuma",
"Force X": 1,
"Force Y": 1,
"Force Z": -1
"Force Y": 2,
"Force Z": 0
},

{
Expand All @@ -50,7 +50,7 @@
"Force West": 1,
"Name": "New Boston",
"Force X": 1,
"Force Y": 1,
"Force Y": 2,
"Force Z": 1
},

Expand All @@ -63,7 +63,7 @@
"Above": true,
"Name": "New Boston - Upper",
"Force X": 1,
"Force Y": 1,
"Force Y": 2,
"Force Z": 2
}
],
Expand Down
88 changes: 2 additions & 86 deletions code/modules/mapping/map_config.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// Config actually from the JSON - should default to Box
var/map_name = "Yuma"
var/map_path = "map_files/Nash_and_Texarkana"
var/map_file = list("Dungeons.dmm", "Texarkana_underground.dmm", "Nash_and_Texarkana.dmm", "Nash_and_Texarkana-Upper.dmm", "Nash_and_Texarkana-Upper-2.dmm", "Redwater.dmm", "Redwater-Upper.dmm", "Ashdown.dmm", "Garland-City.dmm", "Newboston.dmm", "Newboston-Upper.dmm")
var/map_file = list("Dungeons.dmm", "Texarkana_underground.dmm", "Newboston.dmm", "Newboston-Upper.dmm")
var/list/added_jobs = list() //Overrides the "none" faction using job name
var/list/removed_jobs = list() //Removes the "none" faction using job name - can also use #all# (case sensitive)

Expand All @@ -39,94 +39,10 @@
ZTRAIT_DOWN = -1,
ZTRAIT_NOPARALLAX = 1,
ZTRAIT_LINKAGE = CROSSLINKED,
Z_FORCE_X = 2,
Z_FORCE_X = 1,
Z_FORCE_Y = 2,
Z_FORCE_Z = 0
),
list(
ZTRAIT_GRAVITY = 1,
ZTRAIT_BASETURF = /turf/open/indestructible/ground/inside/mountain,
ZTRAIT_STATION = 1,
ZTRAIT_UP = 1,
ZTRAIT_DOWN = -1,
ZTRAIT_NOPARALLAX = 1,
ZTRAIT_LINKAGE = CROSSLINKED,
Z_FORCE_X = 2,
Z_FORCE_Y = 2,
Z_FORCE_Z = 1,
),
list(
ZTRAIT_GRAVITY = 1,
ZTRAIT_BASETURF = /turf/open/transparent/openspace,
ZTRAIT_UP = 1,
ZTRAIT_DOWN = -1,
ZTRAIT_NOPARALLAX = 1,
ZTRAIT_LINKAGE = CROSSLINKED,
Z_FORCE_X = 2,
Z_FORCE_Y = 2,
Z_FORCE_Z = 2,
),
list(
ZTRAIT_GRAVITY = 1,
ZTRAIT_BASETURF = /turf/open/transparent/openspace,
ZTRAIT_DOWN = -1,
ZTRAIT_NOPARALLAX = 1,
ZTRAIT_LINKAGE = CROSSLINKED,
ZTRAIT_ABOVE = 1,
Z_FORCE_X = 2,
Z_FORCE_Y = 2,
Z_FORCE_Z = 3
),
list(
ZTRAIT_GRAVITY = 1,
ZTRAIT_BASETURF = /turf/open/indestructible/ground/inside/mountain,
ZTRAIT_STATION = 1,
ZTRAIT_UP = 1,
ZTRAIT_DOWN = -1,
ZTRAIT_NOPARALLAX = 1,
ZTRAIT_LINKAGE = CROSSLINKED,
Z_FORCE_SOUTH = 1,
Z_FORCE_X = 2,
Z_FORCE_Y = 1,
Z_FORCE_Z = 1
),
list(
ZTRAIT_GRAVITY = 1,
ZTRAIT_BASETURF = /turf/open/transparent/openspace,
ZTRAIT_UP = 1,
ZTRAIT_DOWN = -1,
ZTRAIT_NOPARALLAX = 1,
ZTRAIT_LINKAGE = CROSSLINKED,
Z_FORCE_X = 2,
Z_FORCE_Y = 1,
Z_FORCE_Z = 2
),
list(
ZTRAIT_GRAVITY = 1,
ZTRAIT_BASETURF = /turf/open/indestructible/ground/inside/mountain,
ZTRAIT_STATION = 1,
ZTRAIT_UP = 1,
ZTRAIT_DOWN = -1,
ZTRAIT_NOPARALLAX = 1,
ZTRAIT_LINKAGE = CROSSLINKED,
Z_FORCE_NORTH = 1,
Z_FORCE_X = 2,
Z_FORCE_Y = 3,
Z_FORCE_Z = 1
),
list(
ZTRAIT_GRAVITY = 1,
ZTRAIT_BASETURF = /turf/open/indestructible/ground/inside/mountain,
ZTRAIT_STATION = 1,
ZTRAIT_UP = 1,
ZTRAIT_DOWN = -1,
ZTRAIT_NOPARALLAX = 1,
ZTRAIT_LINKAGE = CROSSLINKED,
Z_FORCE_EAST = 1,
Z_FORCE_X = 3,
Z_FORCE_Y = 2,
Z_FORCE_Z = 1
),
list(
ZTRAIT_GRAVITY = 1,
ZTRAIT_BASETURF = /turf/open/indestructible/ground/inside/mountain,
Expand Down

0 comments on commit a7f7c8b

Please sign in to comment.