Skip to content

Commit

Permalink
Remaining walls #712
Browse files Browse the repository at this point in the history
  • Loading branch information
@cxong
cxong committed May 26, 2024
1 parent d26fae3 commit 512160d
Show file tree
Hide file tree
Showing 5 changed files with 116 additions and 65 deletions.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/closet_fruit.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/closets.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.
30 changes: 20 additions & 10 deletions data/.wolf3d/N3Ddata.cdogscpn/map_objects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,16 +395,6 @@
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "cobble_moss",
"Pic": {
"Type": "Normal",
"Pic": "cobble_moss"
},
"Offset": [-8, -23],
"Health": 0,
"Flags": ["Outside", "OnWall"]
},
{
"Name": "wood_slime",
"Pic": {
Expand Down Expand Up @@ -465,6 +455,26 @@
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "closet_fruit",
"Pic": {
"Type": "Normal",
"Pic": "closet_fruit"
},
"Offset": [-8, -11],
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "closets",
"Pic": {
"Type": "Normal",
"Pic": "closets"
},
"Offset": [-8, -11],
"Health": 0,
"Flags": ["Inside", "OnWall"]
},
{
"Name": "lattice_broken",
"Pic": {
Expand Down
45 changes: 24 additions & 21 deletions data/.wolf3d/N3Ddata.cdogscpn/missions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@
"27": {
"Name": "wall",
"Type": "Wall",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"Style": "support",
"Mask": "ffff00ff",
"MaskAlt": "feff00ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -272,9 +272,9 @@
"28": {
"Name": "wall",
"Type": "Wall",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"Style": "support",
"Mask": "ffff00ff",
"MaskAlt": "feff00ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -284,9 +284,9 @@
"29": {
"Name": "wall",
"Type": "Wall",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"Style": "support",
"Mask": "ff0000ff",
"MaskAlt": "ff0000ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -308,9 +308,9 @@
"30": {
"Name": "wall",
"Type": "Wall",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"Style": "support",
"Mask": "ff0000ff",
"MaskAlt": "ff0000ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand All @@ -320,9 +320,9 @@
"31": {
"Name": "wall",
"Type": "Wall",
"Style": "wood2",
"Mask": "d9923cff",
"MaskAlt": "9c682aff",
"Style": "support",
"Mask": "ff00ffff",
"MaskAlt": "ff00ffff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
Expand Down Expand Up @@ -866,8 +866,7 @@
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"],
"StaticItems": [{
"MapObject": "no_sign",
"Positions": [[7, 8],
[1, 12]]
"Positions": [[1, 12]]
},
{
"MapObject": "bloodstain2",
Expand Down Expand Up @@ -898,10 +897,6 @@
"MapObject": "elevator_interior",
"Positions": [[7, 16]]
},
{
"MapObject": "cobble_moss",
"Positions": [[3, 8]]
},
{
"MapObject": "hitler_glass",
"Positions": [[1, 10]]
Expand Down Expand Up @@ -1152,6 +1147,14 @@
{
"MapObject": "green_relief",
"Positions": [[15, 6]]
},
{
"MapObject": "closet_fruit",
"Positions": [[3, 8]]
},
{
"MapObject": "closets",
"Positions": [[7, 8]]
}],
"StaticCharacters": [{
"Index": 0,
Expand Down
106 changes: 72 additions & 34 deletions src/cdogs/map_wolf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,7 @@ static void TryLoadWallObject(
}
break;
}
break;
case CWWALL_ELEVATOR: {
switch (map->type)
{
Expand Down Expand Up @@ -1640,66 +1641,103 @@ static void TryLoadWallObject(
break;
}
case CWWALL_PURPLE_BLOOD:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "bloodstain";
break;
case 2:
moName = "no_sign";
case CWMAPTYPE_N3D:
break;
case 3:
moName = "wall_goo2";
default:
switch (spearMission)
{
case 1:
moName = "bloodstain";
break;
case 2:
moName = "no_sign";
break;
case 3:
moName = "wall_goo2";
break;
}
break;
}
break;
case CWWALL_DIRTY_BRICK_2:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "cobble_moss";
case CWMAPTYPE_N3D:
moName = "closet_fruit";
break;
case 2:
moName = "jail_cell";
default:
switch (spearMission)
{
case 1:
moName = "cobble_moss";
break;
case 2:
moName = "jail_cell";
break;
}
break;
}
break;
case CWWALL_GREY_BRICK_3:
switch (spearMission)
switch (map->type)
{
case 2:
moName = "jail_cell_skeleton";
case CWMAPTYPE_N3D:
break;
case 3:
moName = "swastika_blue";
default:
switch (spearMission)
{
case 2:
moName = "jail_cell_skeleton";
break;
case 3:
moName = "swastika_blue";
break;
}
break;
}
break;
case CWWALL_GREY_BRICK_SIGN:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "no_sign";
break;
case 2:
moName = "no_sign";
case CWMAPTYPE_N3D:
moName = "closets";
break;
case 3:
moName = "skull_blue";
default:
switch (spearMission)
{
case 1:
moName = "no_sign";
break;
case 2:
moName = "no_sign";
break;
case 3:
moName = "skull_blue";
break;
}
break;
}
break;
case CWWALL_BROWN_WEAVE_BLOOD_2:
switch (spearMission)
switch (map->type)
{
case 1:
moName = "bloodstain";
break;
case 2:
moName = "skull_blue";
case CWMAPTYPE_N3D:
break;
case 3:
moName = "swastika_relief";
default:
switch (spearMission)
{
case 1:
moName = "bloodstain";
break;
case 2:
moName = "skull_blue";
break;
case 3:
moName = "swastika_relief";
break;
}
break;
}
break;
Expand Down

0 comments on commit 512160d

Please sign in to comment.