Skip to content

Commit

Permalink
wood2 #712
Browse files Browse the repository at this point in the history
  • Loading branch information
@cxong
cxong committed May 18, 2024
1 parent 398f586 commit 753347f
Show file tree
Hide file tree
Showing 38 changed files with 120 additions and 79 deletions.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/closet.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed data/.wolf3d/N3Ddata.cdogscpn/graphics/lattice.png
View file
Binary file not shown.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/naamah_portrait.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/et.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/h.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/n.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/ne.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nw.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/o.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/s.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/se.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/st.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/sw.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/v.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/w.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/wt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/et.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/h.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/n.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/ne.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/nt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/nw.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/o.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/s.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/se.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/st.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/sw.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/v.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/w.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/wt.png
View file
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/x.png
View file
18 changes: 14 additions & 4 deletions data/.wolf3d/N3Ddata.cdogscpn/map_objects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,17 @@
},
"Offset": [-8, -11],
"Health": 0,
"Flags": ["Outside", "OnWall"]
"Flags": ["Inside", "OnWall"]
},
{
"Name": "naamah_portrait",
"Pic": {
"Type": "Normal",
"Pic": "naamah_portrait"
},
"Offset": [-8, -11],
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "eagle_portrait",
Expand Down Expand Up @@ -426,14 +436,14 @@
"Flags": ["OnWall"]
},
{
"Name": "lattice",
"Name": "closet",
"Pic": {
"Type": "Normal",
"Pic": "lattice"
"Pic": "closet"
},
"Offset": [-8, -11],
"Health": 0,
"Flags": ["OnWall"]
"Flags": ["Inside", "OnWall"]
},
{
"Name": "lattice_broken",
Expand Down
100 changes: 51 additions & 49 deletions data/.wolf3d/N3Ddata.cdogscpn/missions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
"15": {
"Name": "wall",
"Type": "Wall",
"Style": "bunker",
"Mask": "d2d1ceff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -116,8 +116,8 @@
"16": {
"Name": "wall",
"Type": "Wall",
"Style": "steel",
"Mask": "06e9fcff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -128,8 +128,8 @@
"17": {
"Name": "wall",
"Type": "Wall",
"Style": "steel",
"Mask": "06e9fcff",
"Style": "wood2",
"Mask": "5f4320ff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -152,9 +152,9 @@
"19": {
"Name": "wall",
"Type": "Wall",
"Style": "brick2",
"Mask": "fc2c04ff",
"MaskAlt": "9c682aff",
"Style": "greenstain",
"Mask": "fac079ff",
"MaskAlt": "ffba65ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -176,9 +176,9 @@
"20": {
"Name": "wall",
"Type": "Wall",
"Style": "brick2",
"Mask": "fc2c04ff",
"MaskAlt": "9c682aff",
"Style": "greenstain",
"Mask": "fac079ff",
"MaskAlt": "ffba65ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand Down Expand Up @@ -212,8 +212,8 @@
"23": {
"Name": "wall",
"Type": "Wall",
"Style": "plasteel",
"Mask": "ffffffff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -224,8 +224,8 @@
"24": {
"Name": "wall",
"Type": "Wall",
"Style": "plasteel",
"Mask": "ffffffff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand Down Expand Up @@ -260,8 +260,8 @@
"27": {
"Name": "wall",
"Type": "Wall",
"Style": "rock",
"Mask": "b801b6ff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -272,9 +272,9 @@
"28": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "ffffffff",
"MaskAlt": "008400ff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -284,9 +284,9 @@
"29": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "ffffffff",
"MaskAlt": "008400ff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -308,9 +308,9 @@
"30": {
"Name": "wall",
"Type": "Wall",
"Style": "cobble",
"Mask": "ffffffff",
"MaskAlt": "008400ff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -320,9 +320,9 @@
"31": {
"Name": "wall",
"Type": "Wall",
"Style": "rock",
"Mask": "f09c49ff",
"MaskAlt": "008400ff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -332,9 +332,9 @@
"32": {
"Name": "wall",
"Type": "Wall",
"Style": "rock",
"Mask": "f09c49ff",
"MaskAlt": "008400ff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -344,9 +344,9 @@
"33": {
"Name": "wall",
"Type": "Wall",
"Style": "rock",
"Mask": "f09c49ff",
"MaskAlt": "008400ff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -368,8 +368,8 @@
"35": {
"Name": "wall",
"Type": "Wall",
"Style": "plasteel",
"Mask": "ffffffff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
Expand All @@ -380,9 +380,9 @@
"36": {
"Name": "wall",
"Type": "Wall",
"Style": "brick",
"Mask": "060effff",
"MaskAlt": "008400ff",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand Down Expand Up @@ -867,8 +867,7 @@
"StaticItems": [{
"MapObject": "no_sign",
"Positions": [[7, 8],
[1, 12],
[11, 4]]
[1, 12]]
},
{
"MapObject": "bloodstain2",
Expand All @@ -891,14 +890,9 @@
"MapObject": "wall_vent",
"Positions": [[9, 10]]
},
{
"MapObject": "elevator_entrance",
"Positions": [[9, 4]]
},
{
"MapObject": "swastika_wreath",
"Positions": [[3, 6],
[9, 14]]
"Positions": [[9, 14]]
},
{
"MapObject": "coat_of_arms_flag",
Expand Down Expand Up @@ -1145,6 +1139,14 @@
{
"MapObject": "jail_cell_broken",
"Positions": [[7, 4]]
},
{
"MapObject": "closet",
"Positions": [[11, 4]]
},
{
"MapObject": "naamah_portrait",
"Positions": [[3, 6]]
}],
"StaticCharacters": [{
"Index": 0,
Expand Down
Loading

0 comments on commit 753347f

Please sign in to comment.