Utils/MapEdit/resource.h

@@ -24,6 +24,7 @@
 #define IDD_LAYER_PLATFORM              183
 #define IDD_LAYER_TRIGGER               184
 #define IDD_LAYER_FX                    185
+#define IDD_LAYER_HAZARD                186
 #define IDC_TOOLBAR_COMBO               1018
 #define IDC_LAYERLIST_LIST              1019
 #define IDD_TILEBANK_UPDATE             1029
@@ -40,37 +41,70 @@
 #define IDC_LAYERLIST_DELETE            1057
 #define IDC_ADDLAYER_LIST               1058
 #define IDC_LAYERSHADE_EDITR0           1060
+#define IDC_LAYERSHADE_SHADER0          1060
 #define IDC_LAYERSHADE_EDITG0           1061
+#define IDC_LAYERSHADE_SHADEG0          1061
 #define IDC_LAYERSHADE_EDITB0           1062
+#define IDC_LAYERSHADE_SHADEB0          1062
 #define IDC_LAYERSHADE_EDITR1           1064
+#define IDC_LAYERSHADE_SHADER1          1064
 #define IDC_LAYERSHADE_EDITG1           1065
+#define IDC_LAYERSHADE_SHADEG1          1065
 #define IDC_LAYERSHADE_EDITB1           1066
+#define IDC_LAYERSHADE_SHADEB1          1066
 #define IDC_LAYERSHADE_COUNTEDIT        1074
+#define IDC_LAYERSHADE_SHADECOUNT       1074
 #define IDC_LAYERSHADE_COUNTTEXT        1075
 #define IDC_SPIN2                       1076
+#define IDC_LAYERSHADE_SHADECOUNT_SPIN  1076
+#define IDC_LAYERSHADE_COUNTTEXT2       1077
 #define IDC_LAYERCOLLISION_NORMAL       1078
+#define IDC_LAYERSHADE_POSTEXT          1078
+#define IDC_LAYERSHADE_XYTEXT0          1079
 #define IDD_ELEM_LIST                   1080
+#define IDC_LAYERSHADE_XYTEXT1          1080
 #define IDC_LAYERSHADE_EDITR2           1081
+#define IDC_LAYERSHADE_SHADER2          1081
 #define IDC_LAYERSHADE_EDITG2           1082
 #define IDC_LAYERCOLLISION_DAMAGE       1082
+#define IDC_LAYERSHADE_SHADEG2          1082
 #define IDC_LAYERSHADE_EDITB2           1083
 #define IDC_LAYERCOLLISION_SLIPPERY     1083
+#define IDC_LAYERSHADE_SHADEB2          1083
 #define IDC_LAYERCOLLISION_ELECTRIC     1084
+#define IDC_LAYERSHADE_XYTEXT2          1084
 #define IDC_LAYERCOLLISION_STICKY       1085
+#define IDC_LAYERSHADE_XYTEXT3          1085
 #define IDC_LAYERSHADE_TEXT7            1086
 #define IDC_LAYERCOLLISION_WATER        1086
 #define IDC_ACTOR_SPEED_TEXT            1086
 #define IDC_LAYERSHADE_EDITR3           1087
 #define IDC_LAYERCOLLISION_SOLID        1087
 #define IDC_ACTOR_SPEED                 1087
+#define IDC_LAYERSHADE_SHADER3          1087
 #define IDC_LAYERSHADE_EDITG3           1088
 #define IDC_LAYERCOLLISION_DEATH        1088
+#define IDC_LAYERSHADE_SHADEG3          1088
 #define IDC_LAYERSHADE_EDITB3           1089
+#define IDC_LAYERSHADE_SHADEB3          1089
+#define IDC_LAYERSHADE_TRANSTEXT        1090
+#define IDC_LAYERSHADE_GFXR0            1091
 #define IDC_ACTOR_SPEED_SPIN            1092
+#define IDC_LAYERSHADE_GFXG0            1092
+#define IDC_LAYERSHADE_GFXB0            1093
 #define IDC_ACTOR_PLAYER                1094
+#define IDC_LAYERSHADE_GFXR1            1094
+#define IDC_LAYERSHADE_GFXG1            1095
+#define IDC_LAYERSHADE_GFXB1            1096
 #define IDC_ACTOR_TURNRATE_TEXT         1097
 #define IDC_ACTOR_TURNRATE              1098
 #define IDC_ACTOR_TURNRATE_SPIN         1099
+#define IDC_LAYERSHADE_GFXR2            1101
+#define IDC_LAYERSHADE_GFXG2            1102
+#define IDC_LAYERSHADE_GFXB2            1103
+#define IDC_LAYERSHADE_GFXR3            1107
+#define IDC_LAYERSHADE_GFXG3            1108
+#define IDC_LAYERSHADE_GFXB3            1109
 #define IDC_ACTOR_HEALTH_TEXT           1112
 #define IDC_ACTOR_HEALTH                1113
 #define IDC_ACTOR_HEALTH_SPIN           1114
@@ -100,26 +134,63 @@
 #define IDC_TRIGGER_HEIGHT              1142
 #define IDC_TRIGGER_WIDTH_SPIN          1143
 #define IDC_FX_SPEED_TEXT               1144
+#define IDC_TRIGGER_TARGET              1144
+#define IDC_TRIGGER_TARGETX             1145
 #define IDC_FX_SIZE_TEXT                1146
+#define IDC_TRIGGER_TARGETX_SPIN        1146
 #define IDC_FX_WIDTH                    1147
+#define IDC_TRIGGER_TARGETY             1147
 #define IDC_FX_HEIGHT                   1148
 #define IDC_FX_WIDTH_SPIN               1149
 #define IDC_FX_HEIGHT_SPIN              1150
 #define IDC_FX_SPEED                    1151
 #define IDC_FX_SPEED_SPIN               1152
-#define IDC_LAYERSHADE_BACKGFX0         1153
-#define IDC_LAYERSHADE_SPIN0            1154
-#define IDC_LAYERSHADE_BACKGFX1         1155
-#define IDC_LAYERSHADE_MOVE0            1156
-#define IDC_LAYERSHADE_SCALE0           1157
-#define IDC_LAYERSHADE_COLOR0           1158
-#define IDC_LAYERSHADE_SPIN1            1159
-#define IDC_LAYERSHADE_MOVE1            1160
-#define IDC_LAYERSHADE_SCALE1           1161
-#define IDC_LAYERSHADE_TRANS0           1162
-#define IDC_LAYERSHADE_COLOR1           1163
 #define IDC_TRIGGER_HEIGHT_SPIN         1163
-#define IDC_LAYERSHADE_TRANS1           1164
+#define IDC_TRIGGER_TARGETY_SPIN        1164
+#define IDC_HAZARD_SPEED_TEXT           1169
+#define IDC_HAZARD_TURNRATE_TEXT        1170
+#define IDC_HAZARD_HEALTH_TEXT          1171
+#define IDC_HAZARD_ATTACK_TEXT          1172
+#define IDC_HAZARD_SPEED                1173
+#define IDC_HAZARD_TURNRATE             1174
+#define IDC_HAZARD_HEALTH               1175
+#define IDC_HAZARD_ATTACK               1176
+#define IDC_HAZARD_SPEED_SPIN           1177
+#define IDC_HAZARD_TURNRATE_SPIN        1178
+#define IDC_HAZARD_HEALTH_SPIN          1179
+#define IDC_HAZARD_ATTACK_SPIN          1180
+#define IDC_HAZARD_COLLISION            1181
+#define IDC_HAZARD_RESPAWN_TEXT         1182
+#define IDC_HAZARD_RESPAWN              1183
+#define IDC_LAYERSHADE_GFX_CURRENT      1183
+#define IDC_HAZARD_RESPAWN_SPIN         1184
+#define IDC_LAYERSHADE_GFX_CURRENT_SPIN 1184
+#define IDC_LAYERSHADE_GFX_LIST         1186
+#define IDC_LAYERSHADE_GFX_GOTO         1190
+#define IDC_LAYERSHADE_GFX_DELETE       1191
+#define IDC_LAYERSHADE_GFX_X0           1192
+#define IDC_LAYERSHADE_GFX_SPIN_X0      1193
+#define IDC_LAYERSHADE_GFX_Y0           1194
+#define IDC_LAYERSHADE_GFX_SPIN_Y0      1195
+#define IDC_LAYERSHADE_GFX_X1           1196
+#define IDC_LAYERSHADE_GFX_SPIN_X1      1197
+#define IDC_LAYERSHADE_GFX_Y1           1198
+#define IDC_LAYERSHADE_GFX_SPIN_Y1      1199
+#define IDC_LAYERSHADE_GFX_X2           1200
+#define IDC_LAYERSHADE_GFX_SPIN_X2      1201
+#define IDC_LAYERSHADE_GFX_Y2           1202
+#define IDC_LAYERSHADE_GFX_SPIN_Y2      1203
+#define IDC_LAYERSHADE_GFX_X3           1204
+#define IDC_LAYERSHADE_GFX_SPIN_X3      1205
+#define IDC_LAYERSHADE_GFX_Y3           1206
+#define IDC_LAYERSHADE_GFX_SPIN_Y3      1207
+#define IDC_LAYERSHADE_GFX_TRANSLIST    1208
+#define IDC_LAYERSHADE_GFX_X            1209
+#define IDC_LAYERSHADE_GFX_NEW          1210
+#define IDC_LAYERSHADE_GFX_XSPIN        1211
+#define IDC_LAYERSHADE_GFX_Y            1212
+#define IDC_LAYERSHADE_GFX_YSPIN        1213
+#define IDC_LAYERSHADE_DEF_LIST         1214
 #define ID_TOOLBAR_TILEPALETTE          32774
 #define ID_TOOLBAR_PARAMBAR             32783
 #define ID_TOGGLE_SUBVIEW               32785
@@ -145,7 +216,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        180
 #define _APS_NEXT_COMMAND_VALUE         32801
-#define _APS_NEXT_CONTROL_VALUE         1164
+#define _APS_NEXT_CONTROL_VALUE         1215
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif