Merge branch 'master' into releases
[rocksndiamonds.git] / src / conf_gfx.c
index 465277379ca25759f9a2bdfedb365e960aeaca5e..ce9e3f835fd782ca59feed67899a98b967972fa3 100644 (file)
@@ -1446,22 +1446,46 @@ struct ConfigInfo image_config[] =
   { "timegate_switch.active.ypos",             "15"                    },
   { "timegate_switch.active.frames",           "4"                     },
 
-  { "envelope_1",                              "RocksDC.pcx"           },
-  { "envelope_1.xpos",                         "4"                     },
-  { "envelope_1.ypos",                         "14"                    },
+  { "envelope_1",                              "RocksMore.pcx"         },
+  { "envelope_1.xpos",                         "0"                     },
+  { "envelope_1.ypos",                         "4"                     },
   { "envelope_1.frames",                       "1"                     },
-  { "envelope_2",                              "RocksDC.pcx"           },
-  { "envelope_2.xpos",                         "4"                     },
-  { "envelope_2.ypos",                         "14"                    },
+  { "envelope_1.collecting",                   "RocksMore.pcx"         },
+  { "envelope_1.collecting.xpos",              "5"                     },
+  { "envelope_1.collecting.ypos",              "4"                     },
+  { "envelope_1.collecting.frames",            "3"                     },
+  { "envelope_1.collecting.delay",             "2"                     },
+  { "envelope_1.collecting.anim_mode",         "linear"                },
+  { "envelope_2",                              "RocksMore.pcx"         },
+  { "envelope_2.xpos",                         "1"                     },
+  { "envelope_2.ypos",                         "4"                     },
   { "envelope_2.frames",                       "1"                     },
-  { "envelope_3",                              "RocksDC.pcx"           },
-  { "envelope_3.xpos",                         "4"                     },
-  { "envelope_3.ypos",                         "14"                    },
+  { "envelope_2.collecting",                   "RocksMore.pcx"         },
+  { "envelope_2.collecting.xpos",              "5"                     },
+  { "envelope_2.collecting.ypos",              "4"                     },
+  { "envelope_2.collecting.frames",            "3"                     },
+  { "envelope_2.collecting.delay",             "2"                     },
+  { "envelope_2.collecting.anim_mode",         "linear"                },
+  { "envelope_3",                              "RocksMore.pcx"         },
+  { "envelope_3.xpos",                         "2"                     },
+  { "envelope_3.ypos",                         "4"                     },
   { "envelope_3.frames",                       "1"                     },
-  { "envelope_4",                              "RocksDC.pcx"           },
-  { "envelope_4.xpos",                         "4"                     },
-  { "envelope_4.ypos",                         "14"                    },
+  { "envelope_3.collecting",                   "RocksMore.pcx"         },
+  { "envelope_3.collecting.xpos",              "5"                     },
+  { "envelope_3.collecting.ypos",              "4"                     },
+  { "envelope_3.collecting.frames",            "3"                     },
+  { "envelope_3.collecting.delay",             "2"                     },
+  { "envelope_3.collecting.anim_mode",         "linear"                },
+  { "envelope_4",                              "RocksMore.pcx"         },
+  { "envelope_4.xpos",                         "3"                     },
+  { "envelope_4.ypos",                         "4"                     },
   { "envelope_4.frames",                       "1"                     },
+  { "envelope_4.collecting",                   "RocksMore.pcx"         },
+  { "envelope_4.collecting.xpos",              "5"                     },
+  { "envelope_4.collecting.ypos",              "4"                     },
+  { "envelope_4.collecting.frames",            "3"                     },
+  { "envelope_4.collecting.delay",             "2"                     },
+  { "envelope_4.collecting.anim_mode",         "linear"                },
 
   { "sign_exclamation",                                "RocksDC.pcx"           },
   { "sign_exclamation.xpos",                   "5"                     },
@@ -3278,11 +3302,6 @@ struct ConfigInfo image_config[] =
   { "font.text_1.PREVIEW.y",                   "160"                   },
   { "font.text_1.PREVIEW.width",               "16"                    },
   { "font.text_1.PREVIEW.height",              "16"                    },
-  { "font.text_1.PLAYING",                     "RocksFontEM.pcx"       },
-  { "font.text_1.PLAYING.x",                   "0"                     },
-  { "font.text_1.PLAYING.y",                   "160"                   },
-  { "font.text_1.PLAYING.width",               "16"                    },
-  { "font.text_1.PLAYING.height",              "16"                    },
   { "font.text_1.SCORES",                      "RocksFontMedium.pcx"   },
   { "font.text_1.SCORES.x",                    "0"                     },
   { "font.text_1.SCORES.y",                    "480"                   },
@@ -3308,11 +3327,6 @@ struct ConfigInfo image_config[] =
   { "font.text_2.PREVIEW.y",                   "160"                   },
   { "font.text_2.PREVIEW.width",               "16"                    },
   { "font.text_2.PREVIEW.height",              "16"                    },
-  { "font.text_2.PLAYING",                     "RocksFontEM.pcx"       },
-  { "font.text_2.PLAYING.x",                   "0"                     },
-  { "font.text_2.PLAYING.y",                   "160"                   },
-  { "font.text_2.PLAYING.width",               "16"                    },
-  { "font.text_2.PLAYING.height",              "16"                    },
   { "font.text_2.SCORES",                      "RocksFontBig.pcx"      },
   { "font.text_2.SCORES.x",                    "0"                     },
   { "font.text_2.SCORES.y",                    "320"                   },
@@ -3338,11 +3352,6 @@ struct ConfigInfo image_config[] =
   { "font.text_3.PREVIEW.y",                   "160"                   },
   { "font.text_3.PREVIEW.width",               "16"                    },
   { "font.text_3.PREVIEW.height",              "16"                    },
-  { "font.text_3.PLAYING",                     "RocksFontEM.pcx"       },
-  { "font.text_3.PLAYING.x",                   "0"                     },
-  { "font.text_3.PLAYING.y",                   "160"                   },
-  { "font.text_3.PLAYING.width",               "16"                    },
-  { "font.text_3.PLAYING.height",              "16"                    },
   { "font.text_3.SCORES",                      "RocksFontMedium.pcx"   },
   { "font.text_3.SCORES.x",                    "0"                     },
   { "font.text_3.SCORES.y",                    "480"                   },
@@ -3363,11 +3372,6 @@ struct ConfigInfo image_config[] =
   { "font.text_4.LEVELS.y",                    "480"                   },
   { "font.text_4.LEVELS.width",                        "16"                    },
   { "font.text_4.LEVELS.height",               "32"                    },
-  { "font.text_4.PLAYING",                     "RocksFontEM.pcx"       },
-  { "font.text_4.PLAYING.x",                   "0"                     },
-  { "font.text_4.PLAYING.y",                   "160"                   },
-  { "font.text_4.PLAYING.width",               "16"                    },
-  { "font.text_4.PLAYING.height",              "16"                    },
   { "font.text_4.SCORES",                      "RocksFontMedium.pcx"   },
   { "font.text_4.SCORES.x",                    "0"                     },
   { "font.text_4.SCORES.y",                    "480"                   },
@@ -3379,6 +3383,27 @@ struct ConfigInfo image_config[] =
   { "font.text_4.active.SCORES.width",         "16"                    },
   { "font.text_4.active.SCORES.height",                "32"                    },
 
+  { "font.envelope_1",                         "RocksFontEM.pcx"       },
+  { "font.envelope_1.x",                       "0"                     },
+  { "font.envelope_1.y",                       "160"                   },
+  { "font.envelope_1.width",                   "16"                    },
+  { "font.envelope_1.height",                  "16"                    },
+  { "font.envelope_2",                         "RocksFontEM.pcx"       },
+  { "font.envelope_2.x",                       "0"                     },
+  { "font.envelope_2.y",                       "160"                   },
+  { "font.envelope_2.width",                   "16"                    },
+  { "font.envelope_2.height",                  "16"                    },
+  { "font.envelope_3",                         "RocksFontEM.pcx"       },
+  { "font.envelope_3.x",                       "0"                     },
+  { "font.envelope_3.y",                       "160"                   },
+  { "font.envelope_3.width",                   "16"                    },
+  { "font.envelope_3.height",                  "16"                    },
+  { "font.envelope_4",                         "RocksFontEM.pcx"       },
+  { "font.envelope_4.x",                       "0"                     },
+  { "font.envelope_4.y",                       "160"                   },
+  { "font.envelope_4.width",                   "16"                    },
+  { "font.envelope_4.height",                  "16"                    },
+
   { "font.input_1",                            "RocksFontSmall.pcx"    },
   { "font.input_1.x",                          "0"                     },
   { "font.input_1.y",                          "210"                   },
@@ -3470,18 +3495,34 @@ struct ConfigInfo image_config[] =
   { "editor.element_border_input.xpos",                "0"                     },
   { "editor.element_border_input.ypos",                "0"                     },
 
-  { "game.envelope.background",                        "RocksScreen.pcx"       },
-  { "game.envelope.background.x",              "0"                     },
-  { "game.envelope.background.y",              "0"                     },
-  { "game.envelope.background.width",          "560"                   },
-  { "game.envelope.background.height",         "560"                   },
-  { "game.envelope.background.anim_mode",      "default"               },
-  { "game.envelope.background.draw_masked",    "false"                 },
-
-  { "game.envelope_1.background",              UNDEFINED_FILENAME      },
-  { "game.envelope_2.background",              UNDEFINED_FILENAME      },
-  { "game.envelope_3.background",              UNDEFINED_FILENAME      },
-  { "game.envelope_4.background",              UNDEFINED_FILENAME      },
+  { "background.envelope_1",                   "RocksScreen.pcx"       },
+  { "background.envelope_1.x",                 "0"                     },
+  { "background.envelope_1.y",                 "0"                     },
+  { "background.envelope_1.width",             "560"                   },
+  { "background.envelope_1.height",            "560"                   },
+  { "background.envelope_1.anim_mode",         "default"               },
+  { "background.envelope_1.draw_masked",       "false"                 },
+  { "background.envelope_2",                   "RocksScreen.pcx"       },
+  { "background.envelope_2.x",                 "0"                     },
+  { "background.envelope_2.y",                 "0"                     },
+  { "background.envelope_2.width",             "560"                   },
+  { "background.envelope_2.height",            "560"                   },
+  { "background.envelope_2.anim_mode",         "default"               },
+  { "background.envelope_2.draw_masked",       "false"                 },
+  { "background.envelope_3",                   "RocksScreen.pcx"       },
+  { "background.envelope_3.x",                 "0"                     },
+  { "background.envelope_3.y",                 "0"                     },
+  { "background.envelope_3.width",             "560"                   },
+  { "background.envelope_3.height",            "560"                   },
+  { "background.envelope_3.anim_mode",         "default"               },
+  { "background.envelope_3.draw_masked",       "false"                 },
+  { "background.envelope_4",                   "RocksScreen.pcx"       },
+  { "background.envelope_4.x",                 "0"                     },
+  { "background.envelope_4.y",                 "0"                     },
+  { "background.envelope_4.width",             "560"                   },
+  { "background.envelope_4.height",            "560"                   },
+  { "background.envelope_4.anim_mode",         "default"               },
+  { "background.envelope_4.draw_masked",       "false"                 },
 
   { "background",                              UNDEFINED_FILENAME      },
   { "background.MAIN",                         UNDEFINED_FILENAME      },