From: Holger Schemel Date: Sat, 1 Apr 2006 14:48:22 +0000 (+0200) Subject: rnd-20060401-1-src X-Git-Tag: 3.2.0^2~40 X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=ab5c6efd336beb5933a525507a7f0744b196c3e3 rnd-20060401-1-src * added use of "Insert" and "Delete" keys to navigate element list in level editor to start of custom elements or start of group elements * added virtual elements to access CE value and CE score of elements: - "CE value of triggering element" - "CE score of triggering element" - "CE value of current element" - "CE score of current element" --- diff --git a/ChangeLog b/ChangeLog index dffa241a..3c54da87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-04-01 + * added use of "Insert" and "Delete" keys to navigate element list in + level editor to start of custom elements or start of group elements + * added virtual elements to access CE value and CE score of elements: + - "CE value of triggering element" + - "CE score of triggering element" + - "CE value of current element" + - "CE score of current element" + 2006-03-30 * fixed "grass" to "sand" in older EM levels (up to file version V4) diff --git a/src/conf_e2g.c b/src/conf_e2g.c index 63bb9bc3..f2aaf759 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -2813,6 +2813,18 @@ element_to_graphic[] = EL_TRIGGER_CE_VALUE, -1, -1, FALSE, IMG_TRIGGER_CE_VALUE }, + { + EL_TRIGGER_CE_SCORE, -1, -1, FALSE, + IMG_TRIGGER_CE_SCORE + }, + { + EL_CURRENT_CE_VALUE, -1, -1, FALSE, + IMG_CURRENT_CE_VALUE + }, + { + EL_CURRENT_CE_SCORE, -1, -1, FALSE, + IMG_CURRENT_CE_SCORE + }, { EL_EMC_KEY_5, -1, -1, FALSE, IMG_EMC_KEY_5 diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 96f2b537..a328b198 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -3446,9 +3446,24 @@ struct ConfigInfo image_config[] = { "trigger_ce_value", "RocksDC.pcx" }, { "trigger_ce_value.xpos", "15" }, - { "trigger_ce_value.ypos", "15" }, + { "trigger_ce_value.ypos", "11" }, { "trigger_ce_value.frames", "1" }, + { "trigger_ce_score", "RocksDC.pcx" }, + { "trigger_ce_score.xpos", "15" }, + { "trigger_ce_score.ypos", "12" }, + { "trigger_ce_score.frames", "1" }, + + { "current_ce_value", "RocksDC.pcx" }, + { "current_ce_value.xpos", "14" }, + { "current_ce_value.ypos", "11" }, + { "current_ce_value.frames", "1" }, + + { "current_ce_score", "RocksDC.pcx" }, + { "current_ce_score.xpos", "14" }, + { "current_ce_score.ypos", "12" }, + { "current_ce_score.frames", "1" }, + { "emc_key_5", "RocksEMC.pcx" }, { "emc_key_5.xpos", "0" }, { "emc_key_5.ypos", "5" }, diff --git a/src/conf_gfx.h b/src/conf_gfx.h index 196b9271..bd62cc0b 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -715,835 +715,838 @@ #define IMG_TRIGGER_ELEMENT 694 #define IMG_TRIGGER_PLAYER 695 #define IMG_TRIGGER_CE_VALUE 696 -#define IMG_EMC_KEY_5 697 -#define IMG_EMC_KEY_6 698 -#define IMG_EMC_KEY_7 699 -#define IMG_EMC_KEY_8 700 -#define IMG_EMC_GATE_5 701 -#define IMG_EMC_GATE_6 702 -#define IMG_EMC_GATE_7 703 -#define IMG_EMC_GATE_8 704 -#define IMG_EMC_GATE_5_GRAY 705 -#define IMG_EMC_GATE_5_GRAY_EDITOR 706 -#define IMG_EMC_GATE_5_GRAY_ACTIVE 707 -#define IMG_EMC_GATE_6_GRAY 708 -#define IMG_EMC_GATE_6_GRAY_EDITOR 709 -#define IMG_EMC_GATE_6_GRAY_ACTIVE 710 -#define IMG_EMC_GATE_7_GRAY 711 -#define IMG_EMC_GATE_7_GRAY_EDITOR 712 -#define IMG_EMC_GATE_7_GRAY_ACTIVE 713 -#define IMG_EMC_GATE_8_GRAY 714 -#define IMG_EMC_GATE_8_GRAY_EDITOR 715 -#define IMG_EMC_GATE_8_GRAY_ACTIVE 716 -#define IMG_EMC_ANDROID 717 -#define IMG_EMC_ANDROID_SHRINKING_UPLEFT 718 -#define IMG_EMC_ANDROID_GROWING_DOWNRIGHT 719 -#define IMG_EMC_ANDROID_SHRINKING_DOWNLEFT 720 -#define IMG_EMC_ANDROID_GROWING_UPRIGHT 721 -#define IMG_EMC_ANDROID_SHRINKING_UPRIGHT 722 -#define IMG_EMC_ANDROID_GROWING_DOWNLEFT 723 -#define IMG_EMC_ANDROID_SHRINKING_DOWNRIGHT 724 -#define IMG_EMC_ANDROID_GROWING_UPLEFT 725 -#define IMG_EMC_GRASS 726 -#define IMG_EMC_GRASS_CRUMBLED 727 -#define IMG_EMC_GRASS_DIGGING_LEFT 728 -#define IMG_EMC_GRASS_DIGGING_RIGHT 729 -#define IMG_EMC_GRASS_DIGGING_UP 730 -#define IMG_EMC_GRASS_DIGGING_DOWN 731 -#define IMG_EMC_GRASS_DIGGING_LEFT_CRUMBLED 732 -#define IMG_EMC_GRASS_DIGGING_RIGHT_CRUMBLED 733 -#define IMG_EMC_GRASS_DIGGING_UP_CRUMBLED 734 -#define IMG_EMC_GRASS_DIGGING_DOWN_CRUMBLED 735 -#define IMG_EMC_MAGIC_BALL 736 -#define IMG_EMC_MAGIC_BALL_ACTIVE 737 -#define IMG_EMC_MAGIC_BALL_DROPPING 738 -#define IMG_EMC_MAGIC_BALL_SWITCH 739 -#define IMG_EMC_MAGIC_BALL_SWITCH_ACTIVE 740 -#define IMG_EMC_SPRING_BUMPER 741 -#define IMG_EMC_SPRING_BUMPER_ACTIVE 742 -#define IMG_EMC_PLANT 743 -#define IMG_EMC_PLANT_CRUMBLED 744 -#define IMG_EMC_LENSES 745 -#define IMG_EMC_MAGNIFIER 746 -#define IMG_EMC_WALL_9 747 -#define IMG_EMC_WALL_10 748 -#define IMG_EMC_WALL_11 749 -#define IMG_EMC_WALL_12 750 -#define IMG_EMC_WALL_13 751 -#define IMG_EMC_WALL_14 752 -#define IMG_EMC_WALL_15 753 -#define IMG_EMC_WALL_16 754 -#define IMG_EMC_WALL_SLIPPERY_1 755 -#define IMG_EMC_WALL_SLIPPERY_2 756 -#define IMG_EMC_WALL_SLIPPERY_3 757 -#define IMG_EMC_WALL_SLIPPERY_4 758 -#define IMG_EMC_FAKE_GRASS 759 -#define IMG_EMC_FAKE_GRASS_CRUMBLED 760 -#define IMG_EMC_FAKE_GRASS_ACTIVE 761 -#define IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED 762 -#define IMG_EMC_FAKE_GRASS_EDITOR 763 -#define IMG_EMC_FAKE_ACID 764 -#define IMG_EMC_DRIPPER 765 -#define IMG_EMC_DRIPPER_EDITOR 766 -#define IMG_EMC_DRIPPER_ACTIVE 767 -#define IMG_CHAR_SPACE 768 -#define IMG_CHAR_EXCLAM 769 -#define IMG_CHAR_QUOTEDBL 770 -#define IMG_CHAR_NUMBERSIGN 771 -#define IMG_CHAR_DOLLAR 772 -#define IMG_CHAR_PERCENT 773 -#define IMG_CHAR_AMPERSAND 774 -#define IMG_CHAR_APOSTROPHE 775 -#define IMG_CHAR_PARENLEFT 776 -#define IMG_CHAR_PARENRIGHT 777 -#define IMG_CHAR_ASTERISK 778 -#define IMG_CHAR_PLUS 779 -#define IMG_CHAR_COMMA 780 -#define IMG_CHAR_MINUS 781 -#define IMG_CHAR_PERIOD 782 -#define IMG_CHAR_SLASH 783 -#define IMG_CHAR_0 784 -#define IMG_CHAR_1 785 -#define IMG_CHAR_2 786 -#define IMG_CHAR_3 787 -#define IMG_CHAR_4 788 -#define IMG_CHAR_5 789 -#define IMG_CHAR_6 790 -#define IMG_CHAR_7 791 -#define IMG_CHAR_8 792 -#define IMG_CHAR_9 793 -#define IMG_CHAR_COLON 794 -#define IMG_CHAR_SEMICOLON 795 -#define IMG_CHAR_LESS 796 -#define IMG_CHAR_EQUAL 797 -#define IMG_CHAR_GREATER 798 -#define IMG_CHAR_QUESTION 799 -#define IMG_CHAR_AT 800 -#define IMG_CHAR_A 801 -#define IMG_CHAR_B 802 -#define IMG_CHAR_C 803 -#define IMG_CHAR_D 804 -#define IMG_CHAR_E 805 -#define IMG_CHAR_F 806 -#define IMG_CHAR_G 807 -#define IMG_CHAR_H 808 -#define IMG_CHAR_I 809 -#define IMG_CHAR_J 810 -#define IMG_CHAR_K 811 -#define IMG_CHAR_L 812 -#define IMG_CHAR_M 813 -#define IMG_CHAR_N 814 -#define IMG_CHAR_O 815 -#define IMG_CHAR_P 816 -#define IMG_CHAR_Q 817 -#define IMG_CHAR_R 818 -#define IMG_CHAR_S 819 -#define IMG_CHAR_T 820 -#define IMG_CHAR_U 821 -#define IMG_CHAR_V 822 -#define IMG_CHAR_W 823 -#define IMG_CHAR_X 824 -#define IMG_CHAR_Y 825 -#define IMG_CHAR_Z 826 -#define IMG_CHAR_BRACKETLEFT 827 -#define IMG_CHAR_BACKSLASH 828 -#define IMG_CHAR_BRACKETRIGHT 829 -#define IMG_CHAR_ASCIICIRCUM 830 -#define IMG_CHAR_UNDERSCORE 831 -#define IMG_CHAR_COPYRIGHT 832 -#define IMG_CHAR_AUMLAUT 833 -#define IMG_CHAR_OUMLAUT 834 -#define IMG_CHAR_UUMLAUT 835 -#define IMG_CHAR_DEGREE 836 -#define IMG_CHAR_TRADEMARK 837 -#define IMG_CHAR_CURSOR 838 -#define IMG_CUSTOM_1 839 -#define IMG_CUSTOM_1_EDITOR 840 -#define IMG_CUSTOM_2 841 -#define IMG_CUSTOM_2_EDITOR 842 -#define IMG_CUSTOM_3 843 -#define IMG_CUSTOM_3_EDITOR 844 -#define IMG_CUSTOM_4 845 -#define IMG_CUSTOM_4_EDITOR 846 -#define IMG_CUSTOM_5 847 -#define IMG_CUSTOM_5_EDITOR 848 -#define IMG_CUSTOM_6 849 -#define IMG_CUSTOM_6_EDITOR 850 -#define IMG_CUSTOM_7 851 -#define IMG_CUSTOM_7_EDITOR 852 -#define IMG_CUSTOM_8 853 -#define IMG_CUSTOM_8_EDITOR 854 -#define IMG_CUSTOM_9 855 -#define IMG_CUSTOM_9_EDITOR 856 -#define IMG_CUSTOM_10 857 -#define IMG_CUSTOM_10_EDITOR 858 -#define IMG_CUSTOM_11 859 -#define IMG_CUSTOM_11_EDITOR 860 -#define IMG_CUSTOM_12 861 -#define IMG_CUSTOM_12_EDITOR 862 -#define IMG_CUSTOM_13 863 -#define IMG_CUSTOM_13_EDITOR 864 -#define IMG_CUSTOM_14 865 -#define IMG_CUSTOM_14_EDITOR 866 -#define IMG_CUSTOM_15 867 -#define IMG_CUSTOM_15_EDITOR 868 -#define IMG_CUSTOM_16 869 -#define IMG_CUSTOM_16_EDITOR 870 -#define IMG_CUSTOM_17 871 -#define IMG_CUSTOM_17_EDITOR 872 -#define IMG_CUSTOM_18 873 -#define IMG_CUSTOM_18_EDITOR 874 -#define IMG_CUSTOM_19 875 -#define IMG_CUSTOM_19_EDITOR 876 -#define IMG_CUSTOM_20 877 -#define IMG_CUSTOM_20_EDITOR 878 -#define IMG_CUSTOM_21 879 -#define IMG_CUSTOM_21_EDITOR 880 -#define IMG_CUSTOM_22 881 -#define IMG_CUSTOM_22_EDITOR 882 -#define IMG_CUSTOM_23 883 -#define IMG_CUSTOM_23_EDITOR 884 -#define IMG_CUSTOM_24 885 -#define IMG_CUSTOM_24_EDITOR 886 -#define IMG_CUSTOM_25 887 -#define IMG_CUSTOM_25_EDITOR 888 -#define IMG_CUSTOM_26 889 -#define IMG_CUSTOM_26_EDITOR 890 -#define IMG_CUSTOM_27 891 -#define IMG_CUSTOM_27_EDITOR 892 -#define IMG_CUSTOM_28 893 -#define IMG_CUSTOM_28_EDITOR 894 -#define IMG_CUSTOM_29 895 -#define IMG_CUSTOM_29_EDITOR 896 -#define IMG_CUSTOM_30 897 -#define IMG_CUSTOM_30_EDITOR 898 -#define IMG_CUSTOM_31 899 -#define IMG_CUSTOM_31_EDITOR 900 -#define IMG_CUSTOM_32 901 -#define IMG_CUSTOM_32_EDITOR 902 -#define IMG_CUSTOM_33 903 -#define IMG_CUSTOM_33_EDITOR 904 -#define IMG_CUSTOM_34 905 -#define IMG_CUSTOM_34_EDITOR 906 -#define IMG_CUSTOM_35 907 -#define IMG_CUSTOM_35_EDITOR 908 -#define IMG_CUSTOM_36 909 -#define IMG_CUSTOM_36_EDITOR 910 -#define IMG_CUSTOM_37 911 -#define IMG_CUSTOM_37_EDITOR 912 -#define IMG_CUSTOM_38 913 -#define IMG_CUSTOM_38_EDITOR 914 -#define IMG_CUSTOM_39 915 -#define IMG_CUSTOM_39_EDITOR 916 -#define IMG_CUSTOM_40 917 -#define IMG_CUSTOM_40_EDITOR 918 -#define IMG_CUSTOM_41 919 -#define IMG_CUSTOM_41_EDITOR 920 -#define IMG_CUSTOM_42 921 -#define IMG_CUSTOM_42_EDITOR 922 -#define IMG_CUSTOM_43 923 -#define IMG_CUSTOM_43_EDITOR 924 -#define IMG_CUSTOM_44 925 -#define IMG_CUSTOM_44_EDITOR 926 -#define IMG_CUSTOM_45 927 -#define IMG_CUSTOM_45_EDITOR 928 -#define IMG_CUSTOM_46 929 -#define IMG_CUSTOM_46_EDITOR 930 -#define IMG_CUSTOM_47 931 -#define IMG_CUSTOM_47_EDITOR 932 -#define IMG_CUSTOM_48 933 -#define IMG_CUSTOM_48_EDITOR 934 -#define IMG_CUSTOM_49 935 -#define IMG_CUSTOM_49_EDITOR 936 -#define IMG_CUSTOM_50 937 -#define IMG_CUSTOM_50_EDITOR 938 -#define IMG_CUSTOM_51 939 -#define IMG_CUSTOM_51_EDITOR 940 -#define IMG_CUSTOM_52 941 -#define IMG_CUSTOM_52_EDITOR 942 -#define IMG_CUSTOM_53 943 -#define IMG_CUSTOM_53_EDITOR 944 -#define IMG_CUSTOM_54 945 -#define IMG_CUSTOM_54_EDITOR 946 -#define IMG_CUSTOM_55 947 -#define IMG_CUSTOM_55_EDITOR 948 -#define IMG_CUSTOM_56 949 -#define IMG_CUSTOM_56_EDITOR 950 -#define IMG_CUSTOM_57 951 -#define IMG_CUSTOM_57_EDITOR 952 -#define IMG_CUSTOM_58 953 -#define IMG_CUSTOM_58_EDITOR 954 -#define IMG_CUSTOM_59 955 -#define IMG_CUSTOM_59_EDITOR 956 -#define IMG_CUSTOM_60 957 -#define IMG_CUSTOM_60_EDITOR 958 -#define IMG_CUSTOM_61 959 -#define IMG_CUSTOM_61_EDITOR 960 -#define IMG_CUSTOM_62 961 -#define IMG_CUSTOM_62_EDITOR 962 -#define IMG_CUSTOM_63 963 -#define IMG_CUSTOM_63_EDITOR 964 -#define IMG_CUSTOM_64 965 -#define IMG_CUSTOM_64_EDITOR 966 -#define IMG_CUSTOM_65 967 -#define IMG_CUSTOM_65_EDITOR 968 -#define IMG_CUSTOM_66 969 -#define IMG_CUSTOM_66_EDITOR 970 -#define IMG_CUSTOM_67 971 -#define IMG_CUSTOM_67_EDITOR 972 -#define IMG_CUSTOM_68 973 -#define IMG_CUSTOM_68_EDITOR 974 -#define IMG_CUSTOM_69 975 -#define IMG_CUSTOM_69_EDITOR 976 -#define IMG_CUSTOM_70 977 -#define IMG_CUSTOM_70_EDITOR 978 -#define IMG_CUSTOM_71 979 -#define IMG_CUSTOM_71_EDITOR 980 -#define IMG_CUSTOM_72 981 -#define IMG_CUSTOM_72_EDITOR 982 -#define IMG_CUSTOM_73 983 -#define IMG_CUSTOM_73_EDITOR 984 -#define IMG_CUSTOM_74 985 -#define IMG_CUSTOM_74_EDITOR 986 -#define IMG_CUSTOM_75 987 -#define IMG_CUSTOM_75_EDITOR 988 -#define IMG_CUSTOM_76 989 -#define IMG_CUSTOM_76_EDITOR 990 -#define IMG_CUSTOM_77 991 -#define IMG_CUSTOM_77_EDITOR 992 -#define IMG_CUSTOM_78 993 -#define IMG_CUSTOM_78_EDITOR 994 -#define IMG_CUSTOM_79 995 -#define IMG_CUSTOM_79_EDITOR 996 -#define IMG_CUSTOM_80 997 -#define IMG_CUSTOM_80_EDITOR 998 -#define IMG_CUSTOM_81 999 -#define IMG_CUSTOM_81_EDITOR 1000 -#define IMG_CUSTOM_82 1001 -#define IMG_CUSTOM_82_EDITOR 1002 -#define IMG_CUSTOM_83 1003 -#define IMG_CUSTOM_83_EDITOR 1004 -#define IMG_CUSTOM_84 1005 -#define IMG_CUSTOM_84_EDITOR 1006 -#define IMG_CUSTOM_85 1007 -#define IMG_CUSTOM_85_EDITOR 1008 -#define IMG_CUSTOM_86 1009 -#define IMG_CUSTOM_86_EDITOR 1010 -#define IMG_CUSTOM_87 1011 -#define IMG_CUSTOM_87_EDITOR 1012 -#define IMG_CUSTOM_88 1013 -#define IMG_CUSTOM_88_EDITOR 1014 -#define IMG_CUSTOM_89 1015 -#define IMG_CUSTOM_89_EDITOR 1016 -#define IMG_CUSTOM_90 1017 -#define IMG_CUSTOM_90_EDITOR 1018 -#define IMG_CUSTOM_91 1019 -#define IMG_CUSTOM_91_EDITOR 1020 -#define IMG_CUSTOM_92 1021 -#define IMG_CUSTOM_92_EDITOR 1022 -#define IMG_CUSTOM_93 1023 -#define IMG_CUSTOM_93_EDITOR 1024 -#define IMG_CUSTOM_94 1025 -#define IMG_CUSTOM_94_EDITOR 1026 -#define IMG_CUSTOM_95 1027 -#define IMG_CUSTOM_95_EDITOR 1028 -#define IMG_CUSTOM_96 1029 -#define IMG_CUSTOM_96_EDITOR 1030 -#define IMG_CUSTOM_97 1031 -#define IMG_CUSTOM_97_EDITOR 1032 -#define IMG_CUSTOM_98 1033 -#define IMG_CUSTOM_98_EDITOR 1034 -#define IMG_CUSTOM_99 1035 -#define IMG_CUSTOM_99_EDITOR 1036 -#define IMG_CUSTOM_100 1037 -#define IMG_CUSTOM_100_EDITOR 1038 -#define IMG_CUSTOM_101 1039 -#define IMG_CUSTOM_101_EDITOR 1040 -#define IMG_CUSTOM_102 1041 -#define IMG_CUSTOM_102_EDITOR 1042 -#define IMG_CUSTOM_103 1043 -#define IMG_CUSTOM_103_EDITOR 1044 -#define IMG_CUSTOM_104 1045 -#define IMG_CUSTOM_104_EDITOR 1046 -#define IMG_CUSTOM_105 1047 -#define IMG_CUSTOM_105_EDITOR 1048 -#define IMG_CUSTOM_106 1049 -#define IMG_CUSTOM_106_EDITOR 1050 -#define IMG_CUSTOM_107 1051 -#define IMG_CUSTOM_107_EDITOR 1052 -#define IMG_CUSTOM_108 1053 -#define IMG_CUSTOM_108_EDITOR 1054 -#define IMG_CUSTOM_109 1055 -#define IMG_CUSTOM_109_EDITOR 1056 -#define IMG_CUSTOM_110 1057 -#define IMG_CUSTOM_110_EDITOR 1058 -#define IMG_CUSTOM_111 1059 -#define IMG_CUSTOM_111_EDITOR 1060 -#define IMG_CUSTOM_112 1061 -#define IMG_CUSTOM_112_EDITOR 1062 -#define IMG_CUSTOM_113 1063 -#define IMG_CUSTOM_113_EDITOR 1064 -#define IMG_CUSTOM_114 1065 -#define IMG_CUSTOM_114_EDITOR 1066 -#define IMG_CUSTOM_115 1067 -#define IMG_CUSTOM_115_EDITOR 1068 -#define IMG_CUSTOM_116 1069 -#define IMG_CUSTOM_116_EDITOR 1070 -#define IMG_CUSTOM_117 1071 -#define IMG_CUSTOM_117_EDITOR 1072 -#define IMG_CUSTOM_118 1073 -#define IMG_CUSTOM_118_EDITOR 1074 -#define IMG_CUSTOM_119 1075 -#define IMG_CUSTOM_119_EDITOR 1076 -#define IMG_CUSTOM_120 1077 -#define IMG_CUSTOM_120_EDITOR 1078 -#define IMG_CUSTOM_121 1079 -#define IMG_CUSTOM_121_EDITOR 1080 -#define IMG_CUSTOM_122 1081 -#define IMG_CUSTOM_122_EDITOR 1082 -#define IMG_CUSTOM_123 1083 -#define IMG_CUSTOM_123_EDITOR 1084 -#define IMG_CUSTOM_124 1085 -#define IMG_CUSTOM_124_EDITOR 1086 -#define IMG_CUSTOM_125 1087 -#define IMG_CUSTOM_125_EDITOR 1088 -#define IMG_CUSTOM_126 1089 -#define IMG_CUSTOM_126_EDITOR 1090 -#define IMG_CUSTOM_127 1091 -#define IMG_CUSTOM_127_EDITOR 1092 -#define IMG_CUSTOM_128 1093 -#define IMG_CUSTOM_128_EDITOR 1094 -#define IMG_CUSTOM_129 1095 -#define IMG_CUSTOM_129_EDITOR 1096 -#define IMG_CUSTOM_130 1097 -#define IMG_CUSTOM_130_EDITOR 1098 -#define IMG_CUSTOM_131 1099 -#define IMG_CUSTOM_131_EDITOR 1100 -#define IMG_CUSTOM_132 1101 -#define IMG_CUSTOM_132_EDITOR 1102 -#define IMG_CUSTOM_133 1103 -#define IMG_CUSTOM_133_EDITOR 1104 -#define IMG_CUSTOM_134 1105 -#define IMG_CUSTOM_134_EDITOR 1106 -#define IMG_CUSTOM_135 1107 -#define IMG_CUSTOM_135_EDITOR 1108 -#define IMG_CUSTOM_136 1109 -#define IMG_CUSTOM_136_EDITOR 1110 -#define IMG_CUSTOM_137 1111 -#define IMG_CUSTOM_137_EDITOR 1112 -#define IMG_CUSTOM_138 1113 -#define IMG_CUSTOM_138_EDITOR 1114 -#define IMG_CUSTOM_139 1115 -#define IMG_CUSTOM_139_EDITOR 1116 -#define IMG_CUSTOM_140 1117 -#define IMG_CUSTOM_140_EDITOR 1118 -#define IMG_CUSTOM_141 1119 -#define IMG_CUSTOM_141_EDITOR 1120 -#define IMG_CUSTOM_142 1121 -#define IMG_CUSTOM_142_EDITOR 1122 -#define IMG_CUSTOM_143 1123 -#define IMG_CUSTOM_143_EDITOR 1124 -#define IMG_CUSTOM_144 1125 -#define IMG_CUSTOM_144_EDITOR 1126 -#define IMG_CUSTOM_145 1127 -#define IMG_CUSTOM_145_EDITOR 1128 -#define IMG_CUSTOM_146 1129 -#define IMG_CUSTOM_146_EDITOR 1130 -#define IMG_CUSTOM_147 1131 -#define IMG_CUSTOM_147_EDITOR 1132 -#define IMG_CUSTOM_148 1133 -#define IMG_CUSTOM_148_EDITOR 1134 -#define IMG_CUSTOM_149 1135 -#define IMG_CUSTOM_149_EDITOR 1136 -#define IMG_CUSTOM_150 1137 -#define IMG_CUSTOM_150_EDITOR 1138 -#define IMG_CUSTOM_151 1139 -#define IMG_CUSTOM_151_EDITOR 1140 -#define IMG_CUSTOM_152 1141 -#define IMG_CUSTOM_152_EDITOR 1142 -#define IMG_CUSTOM_153 1143 -#define IMG_CUSTOM_153_EDITOR 1144 -#define IMG_CUSTOM_154 1145 -#define IMG_CUSTOM_154_EDITOR 1146 -#define IMG_CUSTOM_155 1147 -#define IMG_CUSTOM_155_EDITOR 1148 -#define IMG_CUSTOM_156 1149 -#define IMG_CUSTOM_156_EDITOR 1150 -#define IMG_CUSTOM_157 1151 -#define IMG_CUSTOM_157_EDITOR 1152 -#define IMG_CUSTOM_158 1153 -#define IMG_CUSTOM_158_EDITOR 1154 -#define IMG_CUSTOM_159 1155 -#define IMG_CUSTOM_159_EDITOR 1156 -#define IMG_CUSTOM_160 1157 -#define IMG_CUSTOM_160_EDITOR 1158 -#define IMG_CUSTOM_161 1159 -#define IMG_CUSTOM_161_EDITOR 1160 -#define IMG_CUSTOM_162 1161 -#define IMG_CUSTOM_162_EDITOR 1162 -#define IMG_CUSTOM_163 1163 -#define IMG_CUSTOM_163_EDITOR 1164 -#define IMG_CUSTOM_164 1165 -#define IMG_CUSTOM_164_EDITOR 1166 -#define IMG_CUSTOM_165 1167 -#define IMG_CUSTOM_165_EDITOR 1168 -#define IMG_CUSTOM_166 1169 -#define IMG_CUSTOM_166_EDITOR 1170 -#define IMG_CUSTOM_167 1171 -#define IMG_CUSTOM_167_EDITOR 1172 -#define IMG_CUSTOM_168 1173 -#define IMG_CUSTOM_168_EDITOR 1174 -#define IMG_CUSTOM_169 1175 -#define IMG_CUSTOM_169_EDITOR 1176 -#define IMG_CUSTOM_170 1177 -#define IMG_CUSTOM_170_EDITOR 1178 -#define IMG_CUSTOM_171 1179 -#define IMG_CUSTOM_171_EDITOR 1180 -#define IMG_CUSTOM_172 1181 -#define IMG_CUSTOM_172_EDITOR 1182 -#define IMG_CUSTOM_173 1183 -#define IMG_CUSTOM_173_EDITOR 1184 -#define IMG_CUSTOM_174 1185 -#define IMG_CUSTOM_174_EDITOR 1186 -#define IMG_CUSTOM_175 1187 -#define IMG_CUSTOM_175_EDITOR 1188 -#define IMG_CUSTOM_176 1189 -#define IMG_CUSTOM_176_EDITOR 1190 -#define IMG_CUSTOM_177 1191 -#define IMG_CUSTOM_177_EDITOR 1192 -#define IMG_CUSTOM_178 1193 -#define IMG_CUSTOM_178_EDITOR 1194 -#define IMG_CUSTOM_179 1195 -#define IMG_CUSTOM_179_EDITOR 1196 -#define IMG_CUSTOM_180 1197 -#define IMG_CUSTOM_180_EDITOR 1198 -#define IMG_CUSTOM_181 1199 -#define IMG_CUSTOM_181_EDITOR 1200 -#define IMG_CUSTOM_182 1201 -#define IMG_CUSTOM_182_EDITOR 1202 -#define IMG_CUSTOM_183 1203 -#define IMG_CUSTOM_183_EDITOR 1204 -#define IMG_CUSTOM_184 1205 -#define IMG_CUSTOM_184_EDITOR 1206 -#define IMG_CUSTOM_185 1207 -#define IMG_CUSTOM_185_EDITOR 1208 -#define IMG_CUSTOM_186 1209 -#define IMG_CUSTOM_186_EDITOR 1210 -#define IMG_CUSTOM_187 1211 -#define IMG_CUSTOM_187_EDITOR 1212 -#define IMG_CUSTOM_188 1213 -#define IMG_CUSTOM_188_EDITOR 1214 -#define IMG_CUSTOM_189 1215 -#define IMG_CUSTOM_189_EDITOR 1216 -#define IMG_CUSTOM_190 1217 -#define IMG_CUSTOM_190_EDITOR 1218 -#define IMG_CUSTOM_191 1219 -#define IMG_CUSTOM_191_EDITOR 1220 -#define IMG_CUSTOM_192 1221 -#define IMG_CUSTOM_192_EDITOR 1222 -#define IMG_CUSTOM_193 1223 -#define IMG_CUSTOM_193_EDITOR 1224 -#define IMG_CUSTOM_194 1225 -#define IMG_CUSTOM_194_EDITOR 1226 -#define IMG_CUSTOM_195 1227 -#define IMG_CUSTOM_195_EDITOR 1228 -#define IMG_CUSTOM_196 1229 -#define IMG_CUSTOM_196_EDITOR 1230 -#define IMG_CUSTOM_197 1231 -#define IMG_CUSTOM_197_EDITOR 1232 -#define IMG_CUSTOM_198 1233 -#define IMG_CUSTOM_198_EDITOR 1234 -#define IMG_CUSTOM_199 1235 -#define IMG_CUSTOM_199_EDITOR 1236 -#define IMG_CUSTOM_200 1237 -#define IMG_CUSTOM_200_EDITOR 1238 -#define IMG_CUSTOM_201 1239 -#define IMG_CUSTOM_201_EDITOR 1240 -#define IMG_CUSTOM_202 1241 -#define IMG_CUSTOM_202_EDITOR 1242 -#define IMG_CUSTOM_203 1243 -#define IMG_CUSTOM_203_EDITOR 1244 -#define IMG_CUSTOM_204 1245 -#define IMG_CUSTOM_204_EDITOR 1246 -#define IMG_CUSTOM_205 1247 -#define IMG_CUSTOM_205_EDITOR 1248 -#define IMG_CUSTOM_206 1249 -#define IMG_CUSTOM_206_EDITOR 1250 -#define IMG_CUSTOM_207 1251 -#define IMG_CUSTOM_207_EDITOR 1252 -#define IMG_CUSTOM_208 1253 -#define IMG_CUSTOM_208_EDITOR 1254 -#define IMG_CUSTOM_209 1255 -#define IMG_CUSTOM_209_EDITOR 1256 -#define IMG_CUSTOM_210 1257 -#define IMG_CUSTOM_210_EDITOR 1258 -#define IMG_CUSTOM_211 1259 -#define IMG_CUSTOM_211_EDITOR 1260 -#define IMG_CUSTOM_212 1261 -#define IMG_CUSTOM_212_EDITOR 1262 -#define IMG_CUSTOM_213 1263 -#define IMG_CUSTOM_213_EDITOR 1264 -#define IMG_CUSTOM_214 1265 -#define IMG_CUSTOM_214_EDITOR 1266 -#define IMG_CUSTOM_215 1267 -#define IMG_CUSTOM_215_EDITOR 1268 -#define IMG_CUSTOM_216 1269 -#define IMG_CUSTOM_216_EDITOR 1270 -#define IMG_CUSTOM_217 1271 -#define IMG_CUSTOM_217_EDITOR 1272 -#define IMG_CUSTOM_218 1273 -#define IMG_CUSTOM_218_EDITOR 1274 -#define IMG_CUSTOM_219 1275 -#define IMG_CUSTOM_219_EDITOR 1276 -#define IMG_CUSTOM_220 1277 -#define IMG_CUSTOM_220_EDITOR 1278 -#define IMG_CUSTOM_221 1279 -#define IMG_CUSTOM_221_EDITOR 1280 -#define IMG_CUSTOM_222 1281 -#define IMG_CUSTOM_222_EDITOR 1282 -#define IMG_CUSTOM_223 1283 -#define IMG_CUSTOM_223_EDITOR 1284 -#define IMG_CUSTOM_224 1285 -#define IMG_CUSTOM_224_EDITOR 1286 -#define IMG_CUSTOM_225 1287 -#define IMG_CUSTOM_225_EDITOR 1288 -#define IMG_CUSTOM_226 1289 -#define IMG_CUSTOM_226_EDITOR 1290 -#define IMG_CUSTOM_227 1291 -#define IMG_CUSTOM_227_EDITOR 1292 -#define IMG_CUSTOM_228 1293 -#define IMG_CUSTOM_228_EDITOR 1294 -#define IMG_CUSTOM_229 1295 -#define IMG_CUSTOM_229_EDITOR 1296 -#define IMG_CUSTOM_230 1297 -#define IMG_CUSTOM_230_EDITOR 1298 -#define IMG_CUSTOM_231 1299 -#define IMG_CUSTOM_231_EDITOR 1300 -#define IMG_CUSTOM_232 1301 -#define IMG_CUSTOM_232_EDITOR 1302 -#define IMG_CUSTOM_233 1303 -#define IMG_CUSTOM_233_EDITOR 1304 -#define IMG_CUSTOM_234 1305 -#define IMG_CUSTOM_234_EDITOR 1306 -#define IMG_CUSTOM_235 1307 -#define IMG_CUSTOM_235_EDITOR 1308 -#define IMG_CUSTOM_236 1309 -#define IMG_CUSTOM_236_EDITOR 1310 -#define IMG_CUSTOM_237 1311 -#define IMG_CUSTOM_237_EDITOR 1312 -#define IMG_CUSTOM_238 1313 -#define IMG_CUSTOM_238_EDITOR 1314 -#define IMG_CUSTOM_239 1315 -#define IMG_CUSTOM_239_EDITOR 1316 -#define IMG_CUSTOM_240 1317 -#define IMG_CUSTOM_240_EDITOR 1318 -#define IMG_CUSTOM_241 1319 -#define IMG_CUSTOM_241_EDITOR 1320 -#define IMG_CUSTOM_242 1321 -#define IMG_CUSTOM_242_EDITOR 1322 -#define IMG_CUSTOM_243 1323 -#define IMG_CUSTOM_243_EDITOR 1324 -#define IMG_CUSTOM_244 1325 -#define IMG_CUSTOM_244_EDITOR 1326 -#define IMG_CUSTOM_245 1327 -#define IMG_CUSTOM_245_EDITOR 1328 -#define IMG_CUSTOM_246 1329 -#define IMG_CUSTOM_246_EDITOR 1330 -#define IMG_CUSTOM_247 1331 -#define IMG_CUSTOM_247_EDITOR 1332 -#define IMG_CUSTOM_248 1333 -#define IMG_CUSTOM_248_EDITOR 1334 -#define IMG_CUSTOM_249 1335 -#define IMG_CUSTOM_249_EDITOR 1336 -#define IMG_CUSTOM_250 1337 -#define IMG_CUSTOM_250_EDITOR 1338 -#define IMG_CUSTOM_251 1339 -#define IMG_CUSTOM_251_EDITOR 1340 -#define IMG_CUSTOM_252 1341 -#define IMG_CUSTOM_252_EDITOR 1342 -#define IMG_CUSTOM_253 1343 -#define IMG_CUSTOM_253_EDITOR 1344 -#define IMG_CUSTOM_254 1345 -#define IMG_CUSTOM_254_EDITOR 1346 -#define IMG_CUSTOM_255 1347 -#define IMG_CUSTOM_255_EDITOR 1348 -#define IMG_CUSTOM_256 1349 -#define IMG_CUSTOM_256_EDITOR 1350 -#define IMG_GROUP_1 1351 -#define IMG_GROUP_1_EDITOR 1352 -#define IMG_GROUP_2 1353 -#define IMG_GROUP_2_EDITOR 1354 -#define IMG_GROUP_3 1355 -#define IMG_GROUP_3_EDITOR 1356 -#define IMG_GROUP_4 1357 -#define IMG_GROUP_4_EDITOR 1358 -#define IMG_GROUP_5 1359 -#define IMG_GROUP_5_EDITOR 1360 -#define IMG_GROUP_6 1361 -#define IMG_GROUP_6_EDITOR 1362 -#define IMG_GROUP_7 1363 -#define IMG_GROUP_7_EDITOR 1364 -#define IMG_GROUP_8 1365 -#define IMG_GROUP_8_EDITOR 1366 -#define IMG_GROUP_9 1367 -#define IMG_GROUP_9_EDITOR 1368 -#define IMG_GROUP_10 1369 -#define IMG_GROUP_10_EDITOR 1370 -#define IMG_GROUP_11 1371 -#define IMG_GROUP_11_EDITOR 1372 -#define IMG_GROUP_12 1373 -#define IMG_GROUP_12_EDITOR 1374 -#define IMG_GROUP_13 1375 -#define IMG_GROUP_13_EDITOR 1376 -#define IMG_GROUP_14 1377 -#define IMG_GROUP_14_EDITOR 1378 -#define IMG_GROUP_15 1379 -#define IMG_GROUP_15_EDITOR 1380 -#define IMG_GROUP_16 1381 -#define IMG_GROUP_16_EDITOR 1382 -#define IMG_GROUP_17 1383 -#define IMG_GROUP_17_EDITOR 1384 -#define IMG_GROUP_18 1385 -#define IMG_GROUP_18_EDITOR 1386 -#define IMG_GROUP_19 1387 -#define IMG_GROUP_19_EDITOR 1388 -#define IMG_GROUP_20 1389 -#define IMG_GROUP_20_EDITOR 1390 -#define IMG_GROUP_21 1391 -#define IMG_GROUP_21_EDITOR 1392 -#define IMG_GROUP_22 1393 -#define IMG_GROUP_22_EDITOR 1394 -#define IMG_GROUP_23 1395 -#define IMG_GROUP_23_EDITOR 1396 -#define IMG_GROUP_24 1397 -#define IMG_GROUP_24_EDITOR 1398 -#define IMG_GROUP_25 1399 -#define IMG_GROUP_25_EDITOR 1400 -#define IMG_GROUP_26 1401 -#define IMG_GROUP_26_EDITOR 1402 -#define IMG_GROUP_27 1403 -#define IMG_GROUP_27_EDITOR 1404 -#define IMG_GROUP_28 1405 -#define IMG_GROUP_28_EDITOR 1406 -#define IMG_GROUP_29 1407 -#define IMG_GROUP_29_EDITOR 1408 -#define IMG_GROUP_30 1409 -#define IMG_GROUP_30_EDITOR 1410 -#define IMG_GROUP_31 1411 -#define IMG_GROUP_31_EDITOR 1412 -#define IMG_GROUP_32 1413 -#define IMG_GROUP_32_EDITOR 1414 -#define IMG_EMC_OBJECT 1415 -#define IMG_EMC_SPRITE 1416 -#define IMG_TOON_1 1417 -#define IMG_TOON_2 1418 -#define IMG_TOON_3 1419 -#define IMG_TOON_4 1420 -#define IMG_TOON_5 1421 -#define IMG_TOON_6 1422 -#define IMG_TOON_7 1423 -#define IMG_TOON_8 1424 -#define IMG_TOON_9 1425 -#define IMG_TOON_10 1426 -#define IMG_TOON_11 1427 -#define IMG_TOON_12 1428 -#define IMG_TOON_13 1429 -#define IMG_TOON_14 1430 -#define IMG_TOON_15 1431 -#define IMG_TOON_16 1432 -#define IMG_TOON_17 1433 -#define IMG_TOON_18 1434 -#define IMG_TOON_19 1435 -#define IMG_TOON_20 1436 -#define IMG_MENU_CALIBRATE_RED 1437 -#define IMG_MENU_CALIBRATE_BLUE 1438 -#define IMG_MENU_CALIBRATE_YELLOW 1439 -#define IMG_MENU_BUTTON 1440 -#define IMG_MENU_BUTTON_ACTIVE 1441 -#define IMG_MENU_BUTTON_LEFT 1442 -#define IMG_MENU_BUTTON_LEFT_ACTIVE 1443 -#define IMG_MENU_BUTTON_RIGHT 1444 -#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1445 -#define IMG_MENU_BUTTON_UP 1446 -#define IMG_MENU_BUTTON_UP_ACTIVE 1447 -#define IMG_MENU_BUTTON_DOWN 1448 -#define IMG_MENU_BUTTON_DOWN_ACTIVE 1449 -#define IMG_MENU_BUTTON_ENTER_MENU 1450 -#define IMG_MENU_BUTTON_ENTER_MENU_ACTIVE 1451 -#define IMG_MENU_BUTTON_LEAVE_MENU 1452 -#define IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE 1453 -#define IMG_MENU_SCROLLBAR 1454 -#define IMG_MENU_SCROLLBAR_ACTIVE 1455 -#define IMG_FONT_INITIAL_1 1456 -#define IMG_FONT_INITIAL_2 1457 -#define IMG_FONT_INITIAL_3 1458 -#define IMG_FONT_INITIAL_4 1459 -#define IMG_FONT_TITLE_1 1460 -#define IMG_FONT_TITLE_2 1461 -#define IMG_FONT_MENU_1 1462 -#define IMG_FONT_MENU_2 1463 -#define IMG_FONT_TEXT_1 1464 -#define IMG_FONT_TEXT_1_LEVELS 1465 -#define IMG_FONT_TEXT_1_PREVIEW 1466 -#define IMG_FONT_TEXT_1_SCORES 1467 -#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1468 -#define IMG_FONT_TEXT_2 1469 -#define IMG_FONT_TEXT_2_LEVELS 1470 -#define IMG_FONT_TEXT_2_PREVIEW 1471 -#define IMG_FONT_TEXT_2_SCORES 1472 -#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1473 -#define IMG_FONT_TEXT_3 1474 -#define IMG_FONT_TEXT_3_LEVELS 1475 -#define IMG_FONT_TEXT_3_PREVIEW 1476 -#define IMG_FONT_TEXT_3_SCORES 1477 -#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1478 -#define IMG_FONT_TEXT_4 1479 -#define IMG_FONT_TEXT_4_LEVELS 1480 -#define IMG_FONT_TEXT_4_SCORES 1481 -#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1482 -#define IMG_FONT_ENVELOPE_1 1483 -#define IMG_FONT_ENVELOPE_2 1484 -#define IMG_FONT_ENVELOPE_3 1485 -#define IMG_FONT_ENVELOPE_4 1486 -#define IMG_FONT_INPUT_1 1487 -#define IMG_FONT_INPUT_1_MAIN 1488 -#define IMG_FONT_INPUT_1_ACTIVE 1489 -#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1490 -#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1491 -#define IMG_FONT_INPUT_2 1492 -#define IMG_FONT_INPUT_2_ACTIVE 1493 -#define IMG_FONT_OPTION_OFF 1494 -#define IMG_FONT_OPTION_ON 1495 -#define IMG_FONT_VALUE_1 1496 -#define IMG_FONT_VALUE_2 1497 -#define IMG_FONT_VALUE_OLD 1498 -#define IMG_FONT_LEVEL_NUMBER 1499 -#define IMG_FONT_TAPE_RECORDER 1500 -#define IMG_FONT_GAME_INFO 1501 -#define IMG_GLOBAL_BORDER 1502 -#define IMG_GLOBAL_DOOR 1503 -#define IMG_EDITOR_ELEMENT_BORDER 1504 -#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1505 -#define IMG_EDITOR_CASCADE_LIST 1506 -#define IMG_EDITOR_CASCADE_LIST_ACTIVE 1507 -#define IMG_BACKGROUND_ENVELOPE_1 1508 -#define IMG_BACKGROUND_ENVELOPE_2 1509 -#define IMG_BACKGROUND_ENVELOPE_3 1510 -#define IMG_BACKGROUND_ENVELOPE_4 1511 -#define IMG_BACKGROUND 1512 -#define IMG_BACKGROUND_MAIN 1513 -#define IMG_BACKGROUND_LEVELS 1514 -#define IMG_BACKGROUND_SCORES 1515 -#define IMG_BACKGROUND_EDITOR 1516 -#define IMG_BACKGROUND_INFO 1517 -#define IMG_BACKGROUND_INFO_ELEMENTS 1518 -#define IMG_BACKGROUND_INFO_MUSIC 1519 -#define IMG_BACKGROUND_INFO_CREDITS 1520 -#define IMG_BACKGROUND_INFO_PROGRAM 1521 -#define IMG_BACKGROUND_INFO_LEVELSET 1522 -#define IMG_BACKGROUND_SETUP 1523 -#define IMG_BACKGROUND_DOOR 1524 +#define IMG_TRIGGER_CE_SCORE 697 +#define IMG_CURRENT_CE_VALUE 698 +#define IMG_CURRENT_CE_SCORE 699 +#define IMG_EMC_KEY_5 700 +#define IMG_EMC_KEY_6 701 +#define IMG_EMC_KEY_7 702 +#define IMG_EMC_KEY_8 703 +#define IMG_EMC_GATE_5 704 +#define IMG_EMC_GATE_6 705 +#define IMG_EMC_GATE_7 706 +#define IMG_EMC_GATE_8 707 +#define IMG_EMC_GATE_5_GRAY 708 +#define IMG_EMC_GATE_5_GRAY_EDITOR 709 +#define IMG_EMC_GATE_5_GRAY_ACTIVE 710 +#define IMG_EMC_GATE_6_GRAY 711 +#define IMG_EMC_GATE_6_GRAY_EDITOR 712 +#define IMG_EMC_GATE_6_GRAY_ACTIVE 713 +#define IMG_EMC_GATE_7_GRAY 714 +#define IMG_EMC_GATE_7_GRAY_EDITOR 715 +#define IMG_EMC_GATE_7_GRAY_ACTIVE 716 +#define IMG_EMC_GATE_8_GRAY 717 +#define IMG_EMC_GATE_8_GRAY_EDITOR 718 +#define IMG_EMC_GATE_8_GRAY_ACTIVE 719 +#define IMG_EMC_ANDROID 720 +#define IMG_EMC_ANDROID_SHRINKING_UPLEFT 721 +#define IMG_EMC_ANDROID_GROWING_DOWNRIGHT 722 +#define IMG_EMC_ANDROID_SHRINKING_DOWNLEFT 723 +#define IMG_EMC_ANDROID_GROWING_UPRIGHT 724 +#define IMG_EMC_ANDROID_SHRINKING_UPRIGHT 725 +#define IMG_EMC_ANDROID_GROWING_DOWNLEFT 726 +#define IMG_EMC_ANDROID_SHRINKING_DOWNRIGHT 727 +#define IMG_EMC_ANDROID_GROWING_UPLEFT 728 +#define IMG_EMC_GRASS 729 +#define IMG_EMC_GRASS_CRUMBLED 730 +#define IMG_EMC_GRASS_DIGGING_LEFT 731 +#define IMG_EMC_GRASS_DIGGING_RIGHT 732 +#define IMG_EMC_GRASS_DIGGING_UP 733 +#define IMG_EMC_GRASS_DIGGING_DOWN 734 +#define IMG_EMC_GRASS_DIGGING_LEFT_CRUMBLED 735 +#define IMG_EMC_GRASS_DIGGING_RIGHT_CRUMBLED 736 +#define IMG_EMC_GRASS_DIGGING_UP_CRUMBLED 737 +#define IMG_EMC_GRASS_DIGGING_DOWN_CRUMBLED 738 +#define IMG_EMC_MAGIC_BALL 739 +#define IMG_EMC_MAGIC_BALL_ACTIVE 740 +#define IMG_EMC_MAGIC_BALL_DROPPING 741 +#define IMG_EMC_MAGIC_BALL_SWITCH 742 +#define IMG_EMC_MAGIC_BALL_SWITCH_ACTIVE 743 +#define IMG_EMC_SPRING_BUMPER 744 +#define IMG_EMC_SPRING_BUMPER_ACTIVE 745 +#define IMG_EMC_PLANT 746 +#define IMG_EMC_PLANT_CRUMBLED 747 +#define IMG_EMC_LENSES 748 +#define IMG_EMC_MAGNIFIER 749 +#define IMG_EMC_WALL_9 750 +#define IMG_EMC_WALL_10 751 +#define IMG_EMC_WALL_11 752 +#define IMG_EMC_WALL_12 753 +#define IMG_EMC_WALL_13 754 +#define IMG_EMC_WALL_14 755 +#define IMG_EMC_WALL_15 756 +#define IMG_EMC_WALL_16 757 +#define IMG_EMC_WALL_SLIPPERY_1 758 +#define IMG_EMC_WALL_SLIPPERY_2 759 +#define IMG_EMC_WALL_SLIPPERY_3 760 +#define IMG_EMC_WALL_SLIPPERY_4 761 +#define IMG_EMC_FAKE_GRASS 762 +#define IMG_EMC_FAKE_GRASS_CRUMBLED 763 +#define IMG_EMC_FAKE_GRASS_ACTIVE 764 +#define IMG_EMC_FAKE_GRASS_ACTIVE_CRUMBLED 765 +#define IMG_EMC_FAKE_GRASS_EDITOR 766 +#define IMG_EMC_FAKE_ACID 767 +#define IMG_EMC_DRIPPER 768 +#define IMG_EMC_DRIPPER_EDITOR 769 +#define IMG_EMC_DRIPPER_ACTIVE 770 +#define IMG_CHAR_SPACE 771 +#define IMG_CHAR_EXCLAM 772 +#define IMG_CHAR_QUOTEDBL 773 +#define IMG_CHAR_NUMBERSIGN 774 +#define IMG_CHAR_DOLLAR 775 +#define IMG_CHAR_PERCENT 776 +#define IMG_CHAR_AMPERSAND 777 +#define IMG_CHAR_APOSTROPHE 778 +#define IMG_CHAR_PARENLEFT 779 +#define IMG_CHAR_PARENRIGHT 780 +#define IMG_CHAR_ASTERISK 781 +#define IMG_CHAR_PLUS 782 +#define IMG_CHAR_COMMA 783 +#define IMG_CHAR_MINUS 784 +#define IMG_CHAR_PERIOD 785 +#define IMG_CHAR_SLASH 786 +#define IMG_CHAR_0 787 +#define IMG_CHAR_1 788 +#define IMG_CHAR_2 789 +#define IMG_CHAR_3 790 +#define IMG_CHAR_4 791 +#define IMG_CHAR_5 792 +#define IMG_CHAR_6 793 +#define IMG_CHAR_7 794 +#define IMG_CHAR_8 795 +#define IMG_CHAR_9 796 +#define IMG_CHAR_COLON 797 +#define IMG_CHAR_SEMICOLON 798 +#define IMG_CHAR_LESS 799 +#define IMG_CHAR_EQUAL 800 +#define IMG_CHAR_GREATER 801 +#define IMG_CHAR_QUESTION 802 +#define IMG_CHAR_AT 803 +#define IMG_CHAR_A 804 +#define IMG_CHAR_B 805 +#define IMG_CHAR_C 806 +#define IMG_CHAR_D 807 +#define IMG_CHAR_E 808 +#define IMG_CHAR_F 809 +#define IMG_CHAR_G 810 +#define IMG_CHAR_H 811 +#define IMG_CHAR_I 812 +#define IMG_CHAR_J 813 +#define IMG_CHAR_K 814 +#define IMG_CHAR_L 815 +#define IMG_CHAR_M 816 +#define IMG_CHAR_N 817 +#define IMG_CHAR_O 818 +#define IMG_CHAR_P 819 +#define IMG_CHAR_Q 820 +#define IMG_CHAR_R 821 +#define IMG_CHAR_S 822 +#define IMG_CHAR_T 823 +#define IMG_CHAR_U 824 +#define IMG_CHAR_V 825 +#define IMG_CHAR_W 826 +#define IMG_CHAR_X 827 +#define IMG_CHAR_Y 828 +#define IMG_CHAR_Z 829 +#define IMG_CHAR_BRACKETLEFT 830 +#define IMG_CHAR_BACKSLASH 831 +#define IMG_CHAR_BRACKETRIGHT 832 +#define IMG_CHAR_ASCIICIRCUM 833 +#define IMG_CHAR_UNDERSCORE 834 +#define IMG_CHAR_COPYRIGHT 835 +#define IMG_CHAR_AUMLAUT 836 +#define IMG_CHAR_OUMLAUT 837 +#define IMG_CHAR_UUMLAUT 838 +#define IMG_CHAR_DEGREE 839 +#define IMG_CHAR_TRADEMARK 840 +#define IMG_CHAR_CURSOR 841 +#define IMG_CUSTOM_1 842 +#define IMG_CUSTOM_1_EDITOR 843 +#define IMG_CUSTOM_2 844 +#define IMG_CUSTOM_2_EDITOR 845 +#define IMG_CUSTOM_3 846 +#define IMG_CUSTOM_3_EDITOR 847 +#define IMG_CUSTOM_4 848 +#define IMG_CUSTOM_4_EDITOR 849 +#define IMG_CUSTOM_5 850 +#define IMG_CUSTOM_5_EDITOR 851 +#define IMG_CUSTOM_6 852 +#define IMG_CUSTOM_6_EDITOR 853 +#define IMG_CUSTOM_7 854 +#define IMG_CUSTOM_7_EDITOR 855 +#define IMG_CUSTOM_8 856 +#define IMG_CUSTOM_8_EDITOR 857 +#define IMG_CUSTOM_9 858 +#define IMG_CUSTOM_9_EDITOR 859 +#define IMG_CUSTOM_10 860 +#define IMG_CUSTOM_10_EDITOR 861 +#define IMG_CUSTOM_11 862 +#define IMG_CUSTOM_11_EDITOR 863 +#define IMG_CUSTOM_12 864 +#define IMG_CUSTOM_12_EDITOR 865 +#define IMG_CUSTOM_13 866 +#define IMG_CUSTOM_13_EDITOR 867 +#define IMG_CUSTOM_14 868 +#define IMG_CUSTOM_14_EDITOR 869 +#define IMG_CUSTOM_15 870 +#define IMG_CUSTOM_15_EDITOR 871 +#define IMG_CUSTOM_16 872 +#define IMG_CUSTOM_16_EDITOR 873 +#define IMG_CUSTOM_17 874 +#define IMG_CUSTOM_17_EDITOR 875 +#define IMG_CUSTOM_18 876 +#define IMG_CUSTOM_18_EDITOR 877 +#define IMG_CUSTOM_19 878 +#define IMG_CUSTOM_19_EDITOR 879 +#define IMG_CUSTOM_20 880 +#define IMG_CUSTOM_20_EDITOR 881 +#define IMG_CUSTOM_21 882 +#define IMG_CUSTOM_21_EDITOR 883 +#define IMG_CUSTOM_22 884 +#define IMG_CUSTOM_22_EDITOR 885 +#define IMG_CUSTOM_23 886 +#define IMG_CUSTOM_23_EDITOR 887 +#define IMG_CUSTOM_24 888 +#define IMG_CUSTOM_24_EDITOR 889 +#define IMG_CUSTOM_25 890 +#define IMG_CUSTOM_25_EDITOR 891 +#define IMG_CUSTOM_26 892 +#define IMG_CUSTOM_26_EDITOR 893 +#define IMG_CUSTOM_27 894 +#define IMG_CUSTOM_27_EDITOR 895 +#define IMG_CUSTOM_28 896 +#define IMG_CUSTOM_28_EDITOR 897 +#define IMG_CUSTOM_29 898 +#define IMG_CUSTOM_29_EDITOR 899 +#define IMG_CUSTOM_30 900 +#define IMG_CUSTOM_30_EDITOR 901 +#define IMG_CUSTOM_31 902 +#define IMG_CUSTOM_31_EDITOR 903 +#define IMG_CUSTOM_32 904 +#define IMG_CUSTOM_32_EDITOR 905 +#define IMG_CUSTOM_33 906 +#define IMG_CUSTOM_33_EDITOR 907 +#define IMG_CUSTOM_34 908 +#define IMG_CUSTOM_34_EDITOR 909 +#define IMG_CUSTOM_35 910 +#define IMG_CUSTOM_35_EDITOR 911 +#define IMG_CUSTOM_36 912 +#define IMG_CUSTOM_36_EDITOR 913 +#define IMG_CUSTOM_37 914 +#define IMG_CUSTOM_37_EDITOR 915 +#define IMG_CUSTOM_38 916 +#define IMG_CUSTOM_38_EDITOR 917 +#define IMG_CUSTOM_39 918 +#define IMG_CUSTOM_39_EDITOR 919 +#define IMG_CUSTOM_40 920 +#define IMG_CUSTOM_40_EDITOR 921 +#define IMG_CUSTOM_41 922 +#define IMG_CUSTOM_41_EDITOR 923 +#define IMG_CUSTOM_42 924 +#define IMG_CUSTOM_42_EDITOR 925 +#define IMG_CUSTOM_43 926 +#define IMG_CUSTOM_43_EDITOR 927 +#define IMG_CUSTOM_44 928 +#define IMG_CUSTOM_44_EDITOR 929 +#define IMG_CUSTOM_45 930 +#define IMG_CUSTOM_45_EDITOR 931 +#define IMG_CUSTOM_46 932 +#define IMG_CUSTOM_46_EDITOR 933 +#define IMG_CUSTOM_47 934 +#define IMG_CUSTOM_47_EDITOR 935 +#define IMG_CUSTOM_48 936 +#define IMG_CUSTOM_48_EDITOR 937 +#define IMG_CUSTOM_49 938 +#define IMG_CUSTOM_49_EDITOR 939 +#define IMG_CUSTOM_50 940 +#define IMG_CUSTOM_50_EDITOR 941 +#define IMG_CUSTOM_51 942 +#define IMG_CUSTOM_51_EDITOR 943 +#define IMG_CUSTOM_52 944 +#define IMG_CUSTOM_52_EDITOR 945 +#define IMG_CUSTOM_53 946 +#define IMG_CUSTOM_53_EDITOR 947 +#define IMG_CUSTOM_54 948 +#define IMG_CUSTOM_54_EDITOR 949 +#define IMG_CUSTOM_55 950 +#define IMG_CUSTOM_55_EDITOR 951 +#define IMG_CUSTOM_56 952 +#define IMG_CUSTOM_56_EDITOR 953 +#define IMG_CUSTOM_57 954 +#define IMG_CUSTOM_57_EDITOR 955 +#define IMG_CUSTOM_58 956 +#define IMG_CUSTOM_58_EDITOR 957 +#define IMG_CUSTOM_59 958 +#define IMG_CUSTOM_59_EDITOR 959 +#define IMG_CUSTOM_60 960 +#define IMG_CUSTOM_60_EDITOR 961 +#define IMG_CUSTOM_61 962 +#define IMG_CUSTOM_61_EDITOR 963 +#define IMG_CUSTOM_62 964 +#define IMG_CUSTOM_62_EDITOR 965 +#define IMG_CUSTOM_63 966 +#define IMG_CUSTOM_63_EDITOR 967 +#define IMG_CUSTOM_64 968 +#define IMG_CUSTOM_64_EDITOR 969 +#define IMG_CUSTOM_65 970 +#define IMG_CUSTOM_65_EDITOR 971 +#define IMG_CUSTOM_66 972 +#define IMG_CUSTOM_66_EDITOR 973 +#define IMG_CUSTOM_67 974 +#define IMG_CUSTOM_67_EDITOR 975 +#define IMG_CUSTOM_68 976 +#define IMG_CUSTOM_68_EDITOR 977 +#define IMG_CUSTOM_69 978 +#define IMG_CUSTOM_69_EDITOR 979 +#define IMG_CUSTOM_70 980 +#define IMG_CUSTOM_70_EDITOR 981 +#define IMG_CUSTOM_71 982 +#define IMG_CUSTOM_71_EDITOR 983 +#define IMG_CUSTOM_72 984 +#define IMG_CUSTOM_72_EDITOR 985 +#define IMG_CUSTOM_73 986 +#define IMG_CUSTOM_73_EDITOR 987 +#define IMG_CUSTOM_74 988 +#define IMG_CUSTOM_74_EDITOR 989 +#define IMG_CUSTOM_75 990 +#define IMG_CUSTOM_75_EDITOR 991 +#define IMG_CUSTOM_76 992 +#define IMG_CUSTOM_76_EDITOR 993 +#define IMG_CUSTOM_77 994 +#define IMG_CUSTOM_77_EDITOR 995 +#define IMG_CUSTOM_78 996 +#define IMG_CUSTOM_78_EDITOR 997 +#define IMG_CUSTOM_79 998 +#define IMG_CUSTOM_79_EDITOR 999 +#define IMG_CUSTOM_80 1000 +#define IMG_CUSTOM_80_EDITOR 1001 +#define IMG_CUSTOM_81 1002 +#define IMG_CUSTOM_81_EDITOR 1003 +#define IMG_CUSTOM_82 1004 +#define IMG_CUSTOM_82_EDITOR 1005 +#define IMG_CUSTOM_83 1006 +#define IMG_CUSTOM_83_EDITOR 1007 +#define IMG_CUSTOM_84 1008 +#define IMG_CUSTOM_84_EDITOR 1009 +#define IMG_CUSTOM_85 1010 +#define IMG_CUSTOM_85_EDITOR 1011 +#define IMG_CUSTOM_86 1012 +#define IMG_CUSTOM_86_EDITOR 1013 +#define IMG_CUSTOM_87 1014 +#define IMG_CUSTOM_87_EDITOR 1015 +#define IMG_CUSTOM_88 1016 +#define IMG_CUSTOM_88_EDITOR 1017 +#define IMG_CUSTOM_89 1018 +#define IMG_CUSTOM_89_EDITOR 1019 +#define IMG_CUSTOM_90 1020 +#define IMG_CUSTOM_90_EDITOR 1021 +#define IMG_CUSTOM_91 1022 +#define IMG_CUSTOM_91_EDITOR 1023 +#define IMG_CUSTOM_92 1024 +#define IMG_CUSTOM_92_EDITOR 1025 +#define IMG_CUSTOM_93 1026 +#define IMG_CUSTOM_93_EDITOR 1027 +#define IMG_CUSTOM_94 1028 +#define IMG_CUSTOM_94_EDITOR 1029 +#define IMG_CUSTOM_95 1030 +#define IMG_CUSTOM_95_EDITOR 1031 +#define IMG_CUSTOM_96 1032 +#define IMG_CUSTOM_96_EDITOR 1033 +#define IMG_CUSTOM_97 1034 +#define IMG_CUSTOM_97_EDITOR 1035 +#define IMG_CUSTOM_98 1036 +#define IMG_CUSTOM_98_EDITOR 1037 +#define IMG_CUSTOM_99 1038 +#define IMG_CUSTOM_99_EDITOR 1039 +#define IMG_CUSTOM_100 1040 +#define IMG_CUSTOM_100_EDITOR 1041 +#define IMG_CUSTOM_101 1042 +#define IMG_CUSTOM_101_EDITOR 1043 +#define IMG_CUSTOM_102 1044 +#define IMG_CUSTOM_102_EDITOR 1045 +#define IMG_CUSTOM_103 1046 +#define IMG_CUSTOM_103_EDITOR 1047 +#define IMG_CUSTOM_104 1048 +#define IMG_CUSTOM_104_EDITOR 1049 +#define IMG_CUSTOM_105 1050 +#define IMG_CUSTOM_105_EDITOR 1051 +#define IMG_CUSTOM_106 1052 +#define IMG_CUSTOM_106_EDITOR 1053 +#define IMG_CUSTOM_107 1054 +#define IMG_CUSTOM_107_EDITOR 1055 +#define IMG_CUSTOM_108 1056 +#define IMG_CUSTOM_108_EDITOR 1057 +#define IMG_CUSTOM_109 1058 +#define IMG_CUSTOM_109_EDITOR 1059 +#define IMG_CUSTOM_110 1060 +#define IMG_CUSTOM_110_EDITOR 1061 +#define IMG_CUSTOM_111 1062 +#define IMG_CUSTOM_111_EDITOR 1063 +#define IMG_CUSTOM_112 1064 +#define IMG_CUSTOM_112_EDITOR 1065 +#define IMG_CUSTOM_113 1066 +#define IMG_CUSTOM_113_EDITOR 1067 +#define IMG_CUSTOM_114 1068 +#define IMG_CUSTOM_114_EDITOR 1069 +#define IMG_CUSTOM_115 1070 +#define IMG_CUSTOM_115_EDITOR 1071 +#define IMG_CUSTOM_116 1072 +#define IMG_CUSTOM_116_EDITOR 1073 +#define IMG_CUSTOM_117 1074 +#define IMG_CUSTOM_117_EDITOR 1075 +#define IMG_CUSTOM_118 1076 +#define IMG_CUSTOM_118_EDITOR 1077 +#define IMG_CUSTOM_119 1078 +#define IMG_CUSTOM_119_EDITOR 1079 +#define IMG_CUSTOM_120 1080 +#define IMG_CUSTOM_120_EDITOR 1081 +#define IMG_CUSTOM_121 1082 +#define IMG_CUSTOM_121_EDITOR 1083 +#define IMG_CUSTOM_122 1084 +#define IMG_CUSTOM_122_EDITOR 1085 +#define IMG_CUSTOM_123 1086 +#define IMG_CUSTOM_123_EDITOR 1087 +#define IMG_CUSTOM_124 1088 +#define IMG_CUSTOM_124_EDITOR 1089 +#define IMG_CUSTOM_125 1090 +#define IMG_CUSTOM_125_EDITOR 1091 +#define IMG_CUSTOM_126 1092 +#define IMG_CUSTOM_126_EDITOR 1093 +#define IMG_CUSTOM_127 1094 +#define IMG_CUSTOM_127_EDITOR 1095 +#define IMG_CUSTOM_128 1096 +#define IMG_CUSTOM_128_EDITOR 1097 +#define IMG_CUSTOM_129 1098 +#define IMG_CUSTOM_129_EDITOR 1099 +#define IMG_CUSTOM_130 1100 +#define IMG_CUSTOM_130_EDITOR 1101 +#define IMG_CUSTOM_131 1102 +#define IMG_CUSTOM_131_EDITOR 1103 +#define IMG_CUSTOM_132 1104 +#define IMG_CUSTOM_132_EDITOR 1105 +#define IMG_CUSTOM_133 1106 +#define IMG_CUSTOM_133_EDITOR 1107 +#define IMG_CUSTOM_134 1108 +#define IMG_CUSTOM_134_EDITOR 1109 +#define IMG_CUSTOM_135 1110 +#define IMG_CUSTOM_135_EDITOR 1111 +#define IMG_CUSTOM_136 1112 +#define IMG_CUSTOM_136_EDITOR 1113 +#define IMG_CUSTOM_137 1114 +#define IMG_CUSTOM_137_EDITOR 1115 +#define IMG_CUSTOM_138 1116 +#define IMG_CUSTOM_138_EDITOR 1117 +#define IMG_CUSTOM_139 1118 +#define IMG_CUSTOM_139_EDITOR 1119 +#define IMG_CUSTOM_140 1120 +#define IMG_CUSTOM_140_EDITOR 1121 +#define IMG_CUSTOM_141 1122 +#define IMG_CUSTOM_141_EDITOR 1123 +#define IMG_CUSTOM_142 1124 +#define IMG_CUSTOM_142_EDITOR 1125 +#define IMG_CUSTOM_143 1126 +#define IMG_CUSTOM_143_EDITOR 1127 +#define IMG_CUSTOM_144 1128 +#define IMG_CUSTOM_144_EDITOR 1129 +#define IMG_CUSTOM_145 1130 +#define IMG_CUSTOM_145_EDITOR 1131 +#define IMG_CUSTOM_146 1132 +#define IMG_CUSTOM_146_EDITOR 1133 +#define IMG_CUSTOM_147 1134 +#define IMG_CUSTOM_147_EDITOR 1135 +#define IMG_CUSTOM_148 1136 +#define IMG_CUSTOM_148_EDITOR 1137 +#define IMG_CUSTOM_149 1138 +#define IMG_CUSTOM_149_EDITOR 1139 +#define IMG_CUSTOM_150 1140 +#define IMG_CUSTOM_150_EDITOR 1141 +#define IMG_CUSTOM_151 1142 +#define IMG_CUSTOM_151_EDITOR 1143 +#define IMG_CUSTOM_152 1144 +#define IMG_CUSTOM_152_EDITOR 1145 +#define IMG_CUSTOM_153 1146 +#define IMG_CUSTOM_153_EDITOR 1147 +#define IMG_CUSTOM_154 1148 +#define IMG_CUSTOM_154_EDITOR 1149 +#define IMG_CUSTOM_155 1150 +#define IMG_CUSTOM_155_EDITOR 1151 +#define IMG_CUSTOM_156 1152 +#define IMG_CUSTOM_156_EDITOR 1153 +#define IMG_CUSTOM_157 1154 +#define IMG_CUSTOM_157_EDITOR 1155 +#define IMG_CUSTOM_158 1156 +#define IMG_CUSTOM_158_EDITOR 1157 +#define IMG_CUSTOM_159 1158 +#define IMG_CUSTOM_159_EDITOR 1159 +#define IMG_CUSTOM_160 1160 +#define IMG_CUSTOM_160_EDITOR 1161 +#define IMG_CUSTOM_161 1162 +#define IMG_CUSTOM_161_EDITOR 1163 +#define IMG_CUSTOM_162 1164 +#define IMG_CUSTOM_162_EDITOR 1165 +#define IMG_CUSTOM_163 1166 +#define IMG_CUSTOM_163_EDITOR 1167 +#define IMG_CUSTOM_164 1168 +#define IMG_CUSTOM_164_EDITOR 1169 +#define IMG_CUSTOM_165 1170 +#define IMG_CUSTOM_165_EDITOR 1171 +#define IMG_CUSTOM_166 1172 +#define IMG_CUSTOM_166_EDITOR 1173 +#define IMG_CUSTOM_167 1174 +#define IMG_CUSTOM_167_EDITOR 1175 +#define IMG_CUSTOM_168 1176 +#define IMG_CUSTOM_168_EDITOR 1177 +#define IMG_CUSTOM_169 1178 +#define IMG_CUSTOM_169_EDITOR 1179 +#define IMG_CUSTOM_170 1180 +#define IMG_CUSTOM_170_EDITOR 1181 +#define IMG_CUSTOM_171 1182 +#define IMG_CUSTOM_171_EDITOR 1183 +#define IMG_CUSTOM_172 1184 +#define IMG_CUSTOM_172_EDITOR 1185 +#define IMG_CUSTOM_173 1186 +#define IMG_CUSTOM_173_EDITOR 1187 +#define IMG_CUSTOM_174 1188 +#define IMG_CUSTOM_174_EDITOR 1189 +#define IMG_CUSTOM_175 1190 +#define IMG_CUSTOM_175_EDITOR 1191 +#define IMG_CUSTOM_176 1192 +#define IMG_CUSTOM_176_EDITOR 1193 +#define IMG_CUSTOM_177 1194 +#define IMG_CUSTOM_177_EDITOR 1195 +#define IMG_CUSTOM_178 1196 +#define IMG_CUSTOM_178_EDITOR 1197 +#define IMG_CUSTOM_179 1198 +#define IMG_CUSTOM_179_EDITOR 1199 +#define IMG_CUSTOM_180 1200 +#define IMG_CUSTOM_180_EDITOR 1201 +#define IMG_CUSTOM_181 1202 +#define IMG_CUSTOM_181_EDITOR 1203 +#define IMG_CUSTOM_182 1204 +#define IMG_CUSTOM_182_EDITOR 1205 +#define IMG_CUSTOM_183 1206 +#define IMG_CUSTOM_183_EDITOR 1207 +#define IMG_CUSTOM_184 1208 +#define IMG_CUSTOM_184_EDITOR 1209 +#define IMG_CUSTOM_185 1210 +#define IMG_CUSTOM_185_EDITOR 1211 +#define IMG_CUSTOM_186 1212 +#define IMG_CUSTOM_186_EDITOR 1213 +#define IMG_CUSTOM_187 1214 +#define IMG_CUSTOM_187_EDITOR 1215 +#define IMG_CUSTOM_188 1216 +#define IMG_CUSTOM_188_EDITOR 1217 +#define IMG_CUSTOM_189 1218 +#define IMG_CUSTOM_189_EDITOR 1219 +#define IMG_CUSTOM_190 1220 +#define IMG_CUSTOM_190_EDITOR 1221 +#define IMG_CUSTOM_191 1222 +#define IMG_CUSTOM_191_EDITOR 1223 +#define IMG_CUSTOM_192 1224 +#define IMG_CUSTOM_192_EDITOR 1225 +#define IMG_CUSTOM_193 1226 +#define IMG_CUSTOM_193_EDITOR 1227 +#define IMG_CUSTOM_194 1228 +#define IMG_CUSTOM_194_EDITOR 1229 +#define IMG_CUSTOM_195 1230 +#define IMG_CUSTOM_195_EDITOR 1231 +#define IMG_CUSTOM_196 1232 +#define IMG_CUSTOM_196_EDITOR 1233 +#define IMG_CUSTOM_197 1234 +#define IMG_CUSTOM_197_EDITOR 1235 +#define IMG_CUSTOM_198 1236 +#define IMG_CUSTOM_198_EDITOR 1237 +#define IMG_CUSTOM_199 1238 +#define IMG_CUSTOM_199_EDITOR 1239 +#define IMG_CUSTOM_200 1240 +#define IMG_CUSTOM_200_EDITOR 1241 +#define IMG_CUSTOM_201 1242 +#define IMG_CUSTOM_201_EDITOR 1243 +#define IMG_CUSTOM_202 1244 +#define IMG_CUSTOM_202_EDITOR 1245 +#define IMG_CUSTOM_203 1246 +#define IMG_CUSTOM_203_EDITOR 1247 +#define IMG_CUSTOM_204 1248 +#define IMG_CUSTOM_204_EDITOR 1249 +#define IMG_CUSTOM_205 1250 +#define IMG_CUSTOM_205_EDITOR 1251 +#define IMG_CUSTOM_206 1252 +#define IMG_CUSTOM_206_EDITOR 1253 +#define IMG_CUSTOM_207 1254 +#define IMG_CUSTOM_207_EDITOR 1255 +#define IMG_CUSTOM_208 1256 +#define IMG_CUSTOM_208_EDITOR 1257 +#define IMG_CUSTOM_209 1258 +#define IMG_CUSTOM_209_EDITOR 1259 +#define IMG_CUSTOM_210 1260 +#define IMG_CUSTOM_210_EDITOR 1261 +#define IMG_CUSTOM_211 1262 +#define IMG_CUSTOM_211_EDITOR 1263 +#define IMG_CUSTOM_212 1264 +#define IMG_CUSTOM_212_EDITOR 1265 +#define IMG_CUSTOM_213 1266 +#define IMG_CUSTOM_213_EDITOR 1267 +#define IMG_CUSTOM_214 1268 +#define IMG_CUSTOM_214_EDITOR 1269 +#define IMG_CUSTOM_215 1270 +#define IMG_CUSTOM_215_EDITOR 1271 +#define IMG_CUSTOM_216 1272 +#define IMG_CUSTOM_216_EDITOR 1273 +#define IMG_CUSTOM_217 1274 +#define IMG_CUSTOM_217_EDITOR 1275 +#define IMG_CUSTOM_218 1276 +#define IMG_CUSTOM_218_EDITOR 1277 +#define IMG_CUSTOM_219 1278 +#define IMG_CUSTOM_219_EDITOR 1279 +#define IMG_CUSTOM_220 1280 +#define IMG_CUSTOM_220_EDITOR 1281 +#define IMG_CUSTOM_221 1282 +#define IMG_CUSTOM_221_EDITOR 1283 +#define IMG_CUSTOM_222 1284 +#define IMG_CUSTOM_222_EDITOR 1285 +#define IMG_CUSTOM_223 1286 +#define IMG_CUSTOM_223_EDITOR 1287 +#define IMG_CUSTOM_224 1288 +#define IMG_CUSTOM_224_EDITOR 1289 +#define IMG_CUSTOM_225 1290 +#define IMG_CUSTOM_225_EDITOR 1291 +#define IMG_CUSTOM_226 1292 +#define IMG_CUSTOM_226_EDITOR 1293 +#define IMG_CUSTOM_227 1294 +#define IMG_CUSTOM_227_EDITOR 1295 +#define IMG_CUSTOM_228 1296 +#define IMG_CUSTOM_228_EDITOR 1297 +#define IMG_CUSTOM_229 1298 +#define IMG_CUSTOM_229_EDITOR 1299 +#define IMG_CUSTOM_230 1300 +#define IMG_CUSTOM_230_EDITOR 1301 +#define IMG_CUSTOM_231 1302 +#define IMG_CUSTOM_231_EDITOR 1303 +#define IMG_CUSTOM_232 1304 +#define IMG_CUSTOM_232_EDITOR 1305 +#define IMG_CUSTOM_233 1306 +#define IMG_CUSTOM_233_EDITOR 1307 +#define IMG_CUSTOM_234 1308 +#define IMG_CUSTOM_234_EDITOR 1309 +#define IMG_CUSTOM_235 1310 +#define IMG_CUSTOM_235_EDITOR 1311 +#define IMG_CUSTOM_236 1312 +#define IMG_CUSTOM_236_EDITOR 1313 +#define IMG_CUSTOM_237 1314 +#define IMG_CUSTOM_237_EDITOR 1315 +#define IMG_CUSTOM_238 1316 +#define IMG_CUSTOM_238_EDITOR 1317 +#define IMG_CUSTOM_239 1318 +#define IMG_CUSTOM_239_EDITOR 1319 +#define IMG_CUSTOM_240 1320 +#define IMG_CUSTOM_240_EDITOR 1321 +#define IMG_CUSTOM_241 1322 +#define IMG_CUSTOM_241_EDITOR 1323 +#define IMG_CUSTOM_242 1324 +#define IMG_CUSTOM_242_EDITOR 1325 +#define IMG_CUSTOM_243 1326 +#define IMG_CUSTOM_243_EDITOR 1327 +#define IMG_CUSTOM_244 1328 +#define IMG_CUSTOM_244_EDITOR 1329 +#define IMG_CUSTOM_245 1330 +#define IMG_CUSTOM_245_EDITOR 1331 +#define IMG_CUSTOM_246 1332 +#define IMG_CUSTOM_246_EDITOR 1333 +#define IMG_CUSTOM_247 1334 +#define IMG_CUSTOM_247_EDITOR 1335 +#define IMG_CUSTOM_248 1336 +#define IMG_CUSTOM_248_EDITOR 1337 +#define IMG_CUSTOM_249 1338 +#define IMG_CUSTOM_249_EDITOR 1339 +#define IMG_CUSTOM_250 1340 +#define IMG_CUSTOM_250_EDITOR 1341 +#define IMG_CUSTOM_251 1342 +#define IMG_CUSTOM_251_EDITOR 1343 +#define IMG_CUSTOM_252 1344 +#define IMG_CUSTOM_252_EDITOR 1345 +#define IMG_CUSTOM_253 1346 +#define IMG_CUSTOM_253_EDITOR 1347 +#define IMG_CUSTOM_254 1348 +#define IMG_CUSTOM_254_EDITOR 1349 +#define IMG_CUSTOM_255 1350 +#define IMG_CUSTOM_255_EDITOR 1351 +#define IMG_CUSTOM_256 1352 +#define IMG_CUSTOM_256_EDITOR 1353 +#define IMG_GROUP_1 1354 +#define IMG_GROUP_1_EDITOR 1355 +#define IMG_GROUP_2 1356 +#define IMG_GROUP_2_EDITOR 1357 +#define IMG_GROUP_3 1358 +#define IMG_GROUP_3_EDITOR 1359 +#define IMG_GROUP_4 1360 +#define IMG_GROUP_4_EDITOR 1361 +#define IMG_GROUP_5 1362 +#define IMG_GROUP_5_EDITOR 1363 +#define IMG_GROUP_6 1364 +#define IMG_GROUP_6_EDITOR 1365 +#define IMG_GROUP_7 1366 +#define IMG_GROUP_7_EDITOR 1367 +#define IMG_GROUP_8 1368 +#define IMG_GROUP_8_EDITOR 1369 +#define IMG_GROUP_9 1370 +#define IMG_GROUP_9_EDITOR 1371 +#define IMG_GROUP_10 1372 +#define IMG_GROUP_10_EDITOR 1373 +#define IMG_GROUP_11 1374 +#define IMG_GROUP_11_EDITOR 1375 +#define IMG_GROUP_12 1376 +#define IMG_GROUP_12_EDITOR 1377 +#define IMG_GROUP_13 1378 +#define IMG_GROUP_13_EDITOR 1379 +#define IMG_GROUP_14 1380 +#define IMG_GROUP_14_EDITOR 1381 +#define IMG_GROUP_15 1382 +#define IMG_GROUP_15_EDITOR 1383 +#define IMG_GROUP_16 1384 +#define IMG_GROUP_16_EDITOR 1385 +#define IMG_GROUP_17 1386 +#define IMG_GROUP_17_EDITOR 1387 +#define IMG_GROUP_18 1388 +#define IMG_GROUP_18_EDITOR 1389 +#define IMG_GROUP_19 1390 +#define IMG_GROUP_19_EDITOR 1391 +#define IMG_GROUP_20 1392 +#define IMG_GROUP_20_EDITOR 1393 +#define IMG_GROUP_21 1394 +#define IMG_GROUP_21_EDITOR 1395 +#define IMG_GROUP_22 1396 +#define IMG_GROUP_22_EDITOR 1397 +#define IMG_GROUP_23 1398 +#define IMG_GROUP_23_EDITOR 1399 +#define IMG_GROUP_24 1400 +#define IMG_GROUP_24_EDITOR 1401 +#define IMG_GROUP_25 1402 +#define IMG_GROUP_25_EDITOR 1403 +#define IMG_GROUP_26 1404 +#define IMG_GROUP_26_EDITOR 1405 +#define IMG_GROUP_27 1406 +#define IMG_GROUP_27_EDITOR 1407 +#define IMG_GROUP_28 1408 +#define IMG_GROUP_28_EDITOR 1409 +#define IMG_GROUP_29 1410 +#define IMG_GROUP_29_EDITOR 1411 +#define IMG_GROUP_30 1412 +#define IMG_GROUP_30_EDITOR 1413 +#define IMG_GROUP_31 1414 +#define IMG_GROUP_31_EDITOR 1415 +#define IMG_GROUP_32 1416 +#define IMG_GROUP_32_EDITOR 1417 +#define IMG_EMC_OBJECT 1418 +#define IMG_EMC_SPRITE 1419 +#define IMG_TOON_1 1420 +#define IMG_TOON_2 1421 +#define IMG_TOON_3 1422 +#define IMG_TOON_4 1423 +#define IMG_TOON_5 1424 +#define IMG_TOON_6 1425 +#define IMG_TOON_7 1426 +#define IMG_TOON_8 1427 +#define IMG_TOON_9 1428 +#define IMG_TOON_10 1429 +#define IMG_TOON_11 1430 +#define IMG_TOON_12 1431 +#define IMG_TOON_13 1432 +#define IMG_TOON_14 1433 +#define IMG_TOON_15 1434 +#define IMG_TOON_16 1435 +#define IMG_TOON_17 1436 +#define IMG_TOON_18 1437 +#define IMG_TOON_19 1438 +#define IMG_TOON_20 1439 +#define IMG_MENU_CALIBRATE_RED 1440 +#define IMG_MENU_CALIBRATE_BLUE 1441 +#define IMG_MENU_CALIBRATE_YELLOW 1442 +#define IMG_MENU_BUTTON 1443 +#define IMG_MENU_BUTTON_ACTIVE 1444 +#define IMG_MENU_BUTTON_LEFT 1445 +#define IMG_MENU_BUTTON_LEFT_ACTIVE 1446 +#define IMG_MENU_BUTTON_RIGHT 1447 +#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1448 +#define IMG_MENU_BUTTON_UP 1449 +#define IMG_MENU_BUTTON_UP_ACTIVE 1450 +#define IMG_MENU_BUTTON_DOWN 1451 +#define IMG_MENU_BUTTON_DOWN_ACTIVE 1452 +#define IMG_MENU_BUTTON_ENTER_MENU 1453 +#define IMG_MENU_BUTTON_ENTER_MENU_ACTIVE 1454 +#define IMG_MENU_BUTTON_LEAVE_MENU 1455 +#define IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE 1456 +#define IMG_MENU_SCROLLBAR 1457 +#define IMG_MENU_SCROLLBAR_ACTIVE 1458 +#define IMG_FONT_INITIAL_1 1459 +#define IMG_FONT_INITIAL_2 1460 +#define IMG_FONT_INITIAL_3 1461 +#define IMG_FONT_INITIAL_4 1462 +#define IMG_FONT_TITLE_1 1463 +#define IMG_FONT_TITLE_2 1464 +#define IMG_FONT_MENU_1 1465 +#define IMG_FONT_MENU_2 1466 +#define IMG_FONT_TEXT_1 1467 +#define IMG_FONT_TEXT_1_LEVELS 1468 +#define IMG_FONT_TEXT_1_PREVIEW 1469 +#define IMG_FONT_TEXT_1_SCORES 1470 +#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1471 +#define IMG_FONT_TEXT_2 1472 +#define IMG_FONT_TEXT_2_LEVELS 1473 +#define IMG_FONT_TEXT_2_PREVIEW 1474 +#define IMG_FONT_TEXT_2_SCORES 1475 +#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1476 +#define IMG_FONT_TEXT_3 1477 +#define IMG_FONT_TEXT_3_LEVELS 1478 +#define IMG_FONT_TEXT_3_PREVIEW 1479 +#define IMG_FONT_TEXT_3_SCORES 1480 +#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1481 +#define IMG_FONT_TEXT_4 1482 +#define IMG_FONT_TEXT_4_LEVELS 1483 +#define IMG_FONT_TEXT_4_SCORES 1484 +#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1485 +#define IMG_FONT_ENVELOPE_1 1486 +#define IMG_FONT_ENVELOPE_2 1487 +#define IMG_FONT_ENVELOPE_3 1488 +#define IMG_FONT_ENVELOPE_4 1489 +#define IMG_FONT_INPUT_1 1490 +#define IMG_FONT_INPUT_1_MAIN 1491 +#define IMG_FONT_INPUT_1_ACTIVE 1492 +#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1493 +#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1494 +#define IMG_FONT_INPUT_2 1495 +#define IMG_FONT_INPUT_2_ACTIVE 1496 +#define IMG_FONT_OPTION_OFF 1497 +#define IMG_FONT_OPTION_ON 1498 +#define IMG_FONT_VALUE_1 1499 +#define IMG_FONT_VALUE_2 1500 +#define IMG_FONT_VALUE_OLD 1501 +#define IMG_FONT_LEVEL_NUMBER 1502 +#define IMG_FONT_TAPE_RECORDER 1503 +#define IMG_FONT_GAME_INFO 1504 +#define IMG_GLOBAL_BORDER 1505 +#define IMG_GLOBAL_DOOR 1506 +#define IMG_EDITOR_ELEMENT_BORDER 1507 +#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1508 +#define IMG_EDITOR_CASCADE_LIST 1509 +#define IMG_EDITOR_CASCADE_LIST_ACTIVE 1510 +#define IMG_BACKGROUND_ENVELOPE_1 1511 +#define IMG_BACKGROUND_ENVELOPE_2 1512 +#define IMG_BACKGROUND_ENVELOPE_3 1513 +#define IMG_BACKGROUND_ENVELOPE_4 1514 +#define IMG_BACKGROUND 1515 +#define IMG_BACKGROUND_MAIN 1516 +#define IMG_BACKGROUND_LEVELS 1517 +#define IMG_BACKGROUND_SCORES 1518 +#define IMG_BACKGROUND_EDITOR 1519 +#define IMG_BACKGROUND_INFO 1520 +#define IMG_BACKGROUND_INFO_ELEMENTS 1521 +#define IMG_BACKGROUND_INFO_MUSIC 1522 +#define IMG_BACKGROUND_INFO_CREDITS 1523 +#define IMG_BACKGROUND_INFO_PROGRAM 1524 +#define IMG_BACKGROUND_INFO_LEVELSET 1525 +#define IMG_BACKGROUND_SETUP 1526 +#define IMG_BACKGROUND_DOOR 1527 -#define NUM_IMAGE_FILES 1525 +#define NUM_IMAGE_FILES 1528 #endif /* CONF_GFX_H */ diff --git a/src/conftime.h b/src/conftime.h index 5b576141..a6a060fa 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2006-03-30 15:40]" +#define COMPILE_DATE_STRING "[2006-04-01 16:03]" diff --git a/src/editor.c b/src/editor.c index 086fae01..9e29e561 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1751,8 +1751,6 @@ static struct ValueTextInfo options_action_arg_number[] = { CA_ARG_4, "4" }, { CA_ARG_5, "5" }, { CA_ARG_10, "10" }, - { CA_ARG_100, "100" }, - { CA_ARG_1000, "1000" }, { CA_ARG_UNDEFINED, " " }, { CA_ARG_NUMBER_MIN, "min" }, { CA_ARG_NUMBER_MAX, "max" }, @@ -1767,11 +1765,13 @@ static struct ValueTextInfo options_action_arg_number[] = { CA_ARG_NUMBER_LEVEL_GEMS, "gems" }, { CA_ARG_NUMBER_LEVEL_SCORE, "score" }, { CA_ARG_UNDEFINED, " " }, - { CA_ARG_ELEMENT_CV_HEADLINE, "[CE value" }, - { CA_ARG_ELEMENT_CV_HEADLINE, " of" }, - { CA_ARG_ELEMENT_CV_HEADLINE, " element]" }, + { CA_ARG_ELEMENT_CV_HEADLINE, "[CE value]" }, { CA_ARG_ELEMENT_CV_TARGET, "target" }, { CA_ARG_ELEMENT_CV_TRIGGER, "trigger" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_ELEMENT_CS_HEADLINE, "[CE score]" }, + { CA_ARG_ELEMENT_CS_TARGET, "target" }, + { CA_ARG_ELEMENT_CS_TRIGGER, "trigger" }, { -1, NULL } }; @@ -1786,8 +1786,6 @@ static struct ValueTextInfo options_action_arg_value[] = { CA_ARG_4, "4" }, { CA_ARG_5, "5" }, { CA_ARG_10, "10" }, - { CA_ARG_100, "100" }, - { CA_ARG_1000, "1000" }, { CA_ARG_UNDEFINED, " " }, { CA_ARG_NUMBER_MIN, "min" }, { CA_ARG_NUMBER_MAX, "max" }, @@ -1802,12 +1800,14 @@ static struct ValueTextInfo options_action_arg_value[] = { CA_ARG_NUMBER_LEVEL_GEMS, "gems" }, { CA_ARG_NUMBER_LEVEL_SCORE, "score" }, { CA_ARG_UNDEFINED, " " }, - { CA_ARG_ELEMENT_CV_HEADLINE, "[CE value" }, - { CA_ARG_ELEMENT_CV_HEADLINE, " of" }, - { CA_ARG_ELEMENT_CV_HEADLINE, " element]" }, + { CA_ARG_ELEMENT_CV_HEADLINE, "[CE value]" }, { CA_ARG_ELEMENT_CV_TARGET, "target" }, { CA_ARG_ELEMENT_CV_TRIGGER, "trigger" }, { CA_ARG_UNDEFINED, " " }, + { CA_ARG_ELEMENT_CS_HEADLINE, "[CE score]" }, + { CA_ARG_ELEMENT_CS_TARGET, "target" }, + { CA_ARG_ELEMENT_CS_TRIGGER, "trigger" }, + { CA_ARG_UNDEFINED, " " }, { CA_ARG_ELEMENT_NR_HEADLINE, "[element]" }, { CA_ARG_ELEMENT_NR_TARGET, "target" }, { CA_ARG_ELEMENT_NR_TRIGGER, "trigger" }, @@ -4221,7 +4221,12 @@ static int editor_el_custom[] = EL_TRIGGER_PLAYER, EL_TRIGGER_ELEMENT, EL_TRIGGER_CE_VALUE, - EL_EMPTY + EL_TRIGGER_CE_SCORE, + + EL_EMPTY, + EL_EMPTY, + EL_CURRENT_CE_VALUE, + EL_CURRENT_CE_SCORE }; static int *editor_hl_custom_ptr = editor_hl_custom; static int *editor_el_custom_ptr = editor_el_custom; @@ -9932,6 +9937,37 @@ void HandleLevelEditorKeyInput(Key key) break; + case KSYM_Insert: + case KSYM_Delete: + for (i = 0; i < num_editor_elements; i++) + { + int e = editor_elements[i]; + + if ((key == KSYM_Insert && + (e == EL_INTERNAL_CASCADE_CE || + e == EL_INTERNAL_CASCADE_CE_ACTIVE)) || + (key == KSYM_Delete && + (e == EL_INTERNAL_CASCADE_GE || + e == EL_INTERNAL_CASCADE_GE_ACTIVE))) + break; + } + + if (i < num_editor_elements) + { + element_shift = i; + + if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS) + element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS; + + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL], + GDI_SCROLLBAR_ITEM_POSITION, + element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END); + + ModifyEditorElementList(); + } + + break; + case KSYM_Escape: if (edit_mode == ED_MODE_DRAWING) { diff --git a/src/game.c b/src/game.c index bf69d768..9aab37fc 100644 --- a/src/game.c +++ b/src/game.c @@ -142,13 +142,15 @@ RND(element_info[e].move_delay_random)) #define GET_MAX_MOVE_DELAY(e) ( (element_info[e].move_delay_fixed) + \ (element_info[e].move_delay_random)) -#define GET_NEW_CUSTOM_VALUE(e) ( (element_info[e].ce_value_fixed_initial) +\ +#define GET_NEW_CE_VALUE(e) ( (element_info[e].ce_value_fixed_initial) +\ RND(element_info[e].ce_value_random_initial)) +#define GET_CE_SCORE(e) ( (element_info[e].collect_score)) #define GET_CHANGE_DELAY(c) ( ((c)->delay_fixed * (c)->delay_frames) + \ RND((c)->delay_random * (c)->delay_frames)) #define GET_CE_DELAY_VALUE(c) ( ((c)->delay_fixed) + \ RND((c)->delay_random)) + #if 1 #define GET_VALID_RUNTIME_ELEMENT(e) \ ((e) >= NUM_RUNTIME_ELEMENTS ? EL_UNKNOWN : (e)) @@ -157,10 +159,13 @@ ((e) >= NUM_FILE_ELEMENTS ? EL_UNKNOWN : (e)) #endif -#define GET_TARGET_ELEMENT(e, ch) \ - ((e) == EL_TRIGGER_PLAYER ? (ch)->actual_trigger_player : \ - (e) == EL_TRIGGER_ELEMENT ? (ch)->actual_trigger_element : \ - (e) == EL_TRIGGER_CE_VALUE ? (ch)->actual_trigger_ce_value : (e)) +#define GET_TARGET_ELEMENT(e, ch, cv, cs) \ + ((e) == EL_TRIGGER_PLAYER ? (ch)->actual_trigger_player : \ + (e) == EL_TRIGGER_ELEMENT ? (ch)->actual_trigger_element : \ + (e) == EL_TRIGGER_CE_VALUE ? (ch)->actual_trigger_ce_value : \ + (e) == EL_TRIGGER_CE_SCORE ? (ch)->actual_trigger_ce_score : \ + (e) == EL_CURRENT_CE_VALUE ? (cv) : \ + (e) == EL_CURRENT_CE_SCORE ? (cs) : (e)) #define CAN_GROW_INTO(e) \ ((e) == EL_SAND || (IS_DIGGABLE(e) && level.grow_into_diggable)) @@ -1114,7 +1119,7 @@ static void InitField(int x, int y, boolean init_game) #if USE_NEW_CUSTOM_VALUE if (!element_info[element].use_last_ce_value || init_game) - CustomValue[x][y] = GET_NEW_CUSTOM_VALUE(Feld[x][y]); + CustomValue[x][y] = GET_NEW_CE_VALUE(Feld[x][y]); #endif } #else @@ -1156,7 +1161,7 @@ static void InitField(int x, int y, boolean init_game) #if USE_NEW_CUSTOM_VALUE #if 1 - CustomValue[x][y] = GET_NEW_CUSTOM_VALUE(Feld[x][y]); + CustomValue[x][y] = GET_NEW_CE_VALUE(Feld[x][y]); #else CustomValue[x][y] = element_info[Feld[x][y]].custom_value_initial; #endif @@ -1646,6 +1651,7 @@ static void InitGameEngine() ei->change_page[j].actual_trigger_player = EL_PLAYER_1; ei->change_page[j].actual_trigger_side = CH_SIDE_NONE; ei->change_page[j].actual_trigger_ce_value = 0; + ei->change_page[j].actual_trigger_ce_score = 0; } } @@ -7844,6 +7850,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) { struct ElementInfo *ei = &element_info[element]; struct ElementChangeInfo *change = &ei->change_page[page]; + int target_element = change->target_element; int action_type = change->action_type; int action_mode = change->action_mode; int action_arg = change->action_arg; @@ -7882,8 +7889,8 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) action_type == CA_SET_LEVEL_GEMS ? 999 : action_type == CA_SET_LEVEL_TIME ? 9999 : action_type == CA_SET_LEVEL_SCORE ? 99999 : - action_type == CA_SET_CE_SCORE ? 9999 : action_type == CA_SET_CE_VALUE ? 9999 : + action_type == CA_SET_CE_SCORE ? 9999 : CA_ARG_MAX); int action_arg_number_reset = @@ -7891,12 +7898,12 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) action_type == CA_SET_LEVEL_GEMS ? level.gems_needed : action_type == CA_SET_LEVEL_TIME ? level.time : action_type == CA_SET_LEVEL_SCORE ? 0 : - action_type == CA_SET_CE_SCORE ? 0 : #if 1 - action_type == CA_SET_CE_VALUE ? GET_NEW_CUSTOM_VALUE(element) : + action_type == CA_SET_CE_VALUE ? GET_NEW_CE_VALUE(element) : #else action_type == CA_SET_CE_VALUE ? ei->custom_value_initial : #endif + action_type == CA_SET_CE_SCORE ? 0 : 0); int action_arg_number = @@ -7907,18 +7914,20 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) action_arg == CA_ARG_NUMBER_MIN ? action_arg_number_min : action_arg == CA_ARG_NUMBER_MAX ? action_arg_number_max : action_arg == CA_ARG_NUMBER_RESET ? action_arg_number_reset : - action_arg == CA_ARG_NUMBER_CE_SCORE ? ei->collect_score : #if USE_NEW_CUSTOM_VALUE action_arg == CA_ARG_NUMBER_CE_VALUE ? CustomValue[x][y] : #else action_arg == CA_ARG_NUMBER_CE_VALUE ? ei->custom_value_initial : #endif + action_arg == CA_ARG_NUMBER_CE_SCORE ? ei->collect_score : action_arg == CA_ARG_NUMBER_CE_DELAY ? GET_CE_DELAY_VALUE(change) : action_arg == CA_ARG_NUMBER_LEVEL_TIME ? level_time_value : action_arg == CA_ARG_NUMBER_LEVEL_GEMS ? local_player->gems_still_needed : action_arg == CA_ARG_NUMBER_LEVEL_SCORE ? local_player->score : - action_arg == CA_ARG_ELEMENT_CV_TARGET ? GET_NEW_CUSTOM_VALUE(change->target_element) : + action_arg == CA_ARG_ELEMENT_CV_TARGET ? GET_NEW_CE_VALUE(target_element): action_arg == CA_ARG_ELEMENT_CV_TRIGGER ? change->actual_trigger_ce_value: + action_arg == CA_ARG_ELEMENT_CS_TARGET ? GET_CE_SCORE(target_element) : + action_arg == CA_ARG_ELEMENT_CS_TRIGGER ? change->actual_trigger_ce_score: action_arg == CA_ARG_ELEMENT_NR_TARGET ? change->target_element : action_arg == CA_ARG_ELEMENT_NR_TRIGGER ? change->actual_trigger_element : -1); @@ -7927,8 +7936,8 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) (action_type == CA_SET_LEVEL_GEMS ? local_player->gems_still_needed : action_type == CA_SET_LEVEL_TIME ? TimeLeft : action_type == CA_SET_LEVEL_SCORE ? local_player->score : - action_type == CA_SET_CE_SCORE ? ei->collect_score : action_type == CA_SET_CE_VALUE ? CustomValue[x][y] : + action_type == CA_SET_CE_SCORE ? ei->collect_score : 0); int action_arg_number_new = @@ -8189,13 +8198,6 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) /* ---------- CE actions ---------------------------------------------- */ - case CA_SET_CE_SCORE: - { - ei->collect_score = action_arg_number_new; - - break; - } - case CA_SET_CE_VALUE: { #if USE_NEW_CUSTOM_VALUE @@ -8225,6 +8227,13 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) break; } + case CA_SET_CE_SCORE: + { + ei->collect_score = action_arg_number_new; + + break; + } + /* ---------- engine actions ------------------------------------------ */ case CA_SET_ENGINE_SCAN_MODE: @@ -8325,7 +8334,10 @@ static void CreateElementFromChange(int x, int y, int element) static boolean ChangeElement(int x, int y, int element, int page) { - struct ElementChangeInfo *change = &element_info[element].change_page[page]; + struct ElementInfo *ei = &element_info[element]; + struct ElementChangeInfo *change = &ei->change_page[page]; + int ce_value = CustomValue[x][y]; + int ce_score = ei->collect_score; int target_element; int old_element = Feld[x][y]; @@ -8340,6 +8352,7 @@ static boolean ChangeElement(int x, int y, int element, int page) change->actual_trigger_player = EL_PLAYER_1; change->actual_trigger_side = CH_SIDE_NONE; change->actual_trigger_ce_value = 0; + change->actual_trigger_ce_score = 0; } /* do not change elements more than a specified maximum number of changes */ @@ -8444,7 +8457,8 @@ static boolean ChangeElement(int x, int y, int element, int page) ChangeEvent[ex][ey] = ChangeEvent[x][y]; content_element = change->target_content.e[xx][yy]; - target_element = GET_TARGET_ELEMENT(content_element, change); + target_element = GET_TARGET_ELEMENT(content_element, change, + ce_value, ce_score); CreateElementFromChange(ex, ey, target_element); @@ -8465,7 +8479,8 @@ static boolean ChangeElement(int x, int y, int element, int page) } else { - target_element = GET_TARGET_ELEMENT(change->target_element, change); + target_element = GET_TARGET_ELEMENT(change->target_element, change, + ce_value, ce_score); if (element == EL_DIAGONAL_GROWING || element == EL_DIAGONAL_SHRINKING) @@ -8699,6 +8714,7 @@ static boolean CheckTriggeredElementChangeExt(int trigger_x, int trigger_y, change->actual_trigger_player = EL_PLAYER_1 + log_2(trigger_player); change->actual_trigger_side = trigger_side; change->actual_trigger_ce_value = CustomValue[trigger_x][trigger_y]; + change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element); if ((change->can_change && !change_done) || change->has_action) { @@ -8803,6 +8819,7 @@ static boolean CheckElementChangeExt(int x, int y, change->actual_trigger_player = EL_PLAYER_1 + log_2(trigger_player); change->actual_trigger_side = trigger_side; change->actual_trigger_ce_value = CustomValue[x][y]; + change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element); /* special case: trigger element not at (x,y) position for some events */ if (check_trigger_element) @@ -8825,6 +8842,7 @@ static boolean CheckElementChangeExt(int x, int y, int yy = y + move_xy[MV_DIR_OPPOSITE(trigger_side)].dy; change->actual_trigger_ce_value = CustomValue[xx][yy]; + change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element); } if (change->can_change && !change_done) diff --git a/src/main.c b/src/main.c index ec2ec514..e264863c 100644 --- a/src/main.c +++ b/src/main.c @@ -3654,6 +3654,21 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "trigger", "CE value of element triggering change" }, + { + "trigger_ce_score", + "trigger", + "CE score of element triggering change" + }, + { + "current_ce_value", + "current", + "CE value of current element" + }, + { + "current_ce_score", + "current", + "CE score of current element" + }, { "yamyam.left", "yamyam", diff --git a/src/main.h b/src/main.h index 5e22d27a..31740d33 100644 --- a/src/main.h +++ b/src/main.h @@ -381,13 +381,16 @@ #define CA_ARG_ELEMENT_RESET (CA_ARG_ELEMENT + 0) #define CA_ARG_ELEMENT_TARGET (CA_ARG_ELEMENT + 1) #define CA_ARG_ELEMENT_TRIGGER (CA_ARG_ELEMENT + 2) -#define CA_ARG_ELEMENT_HEADLINE (CA_ARG_ELEMENT + 998) +#define CA_ARG_ELEMENT_HEADLINE (CA_ARG_ELEMENT + 997) #define CA_ARG_ELEMENT_CV_TARGET (CA_ARG_ELEMENT_TARGET) #define CA_ARG_ELEMENT_CV_TRIGGER (CA_ARG_ELEMENT_TRIGGER) #define CA_ARG_ELEMENT_CV_HEADLINE (CA_ARG_ELEMENT_HEADLINE) #define CA_ARG_ELEMENT_NR_TARGET (CA_ARG_ELEMENT + 3) #define CA_ARG_ELEMENT_NR_TRIGGER (CA_ARG_ELEMENT + 4) -#define CA_ARG_ELEMENT_NR_HEADLINE (CA_ARG_ELEMENT + 999) +#define CA_ARG_ELEMENT_NR_HEADLINE (CA_ARG_ELEMENT + 998) +#define CA_ARG_ELEMENT_CS_TARGET (CA_ARG_ELEMENT + 5) +#define CA_ARG_ELEMENT_CS_TRIGGER (CA_ARG_ELEMENT + 6) +#define CA_ARG_ELEMENT_CS_HEADLINE (CA_ARG_ELEMENT + 999) #define CA_ARG_SPEED 13000 #define CA_ARG_SPEED_NOT_MOVING (CA_ARG_SPEED + STEPSIZE_NOT_MOVING) #define CA_ARG_SPEED_VERY_SLOW (CA_ARG_SPEED + STEPSIZE_VERY_SLOW) @@ -1265,13 +1268,16 @@ #define EL_EMC_DRIPPER 704 #define EL_TRIGGER_CE_VALUE 705 +#define EL_TRIGGER_CE_SCORE 706 +#define EL_CURRENT_CE_VALUE 707 +#define EL_CURRENT_CE_SCORE 708 -#define EL_YAMYAM_LEFT 706 -#define EL_YAMYAM_RIGHT 707 -#define EL_YAMYAM_UP 708 -#define EL_YAMYAM_DOWN 709 +#define EL_YAMYAM_LEFT 709 +#define EL_YAMYAM_RIGHT 710 +#define EL_YAMYAM_UP 711 +#define EL_YAMYAM_DOWN 712 -#define NUM_FILE_ELEMENTS 710 +#define NUM_FILE_ELEMENTS 713 /* "real" (and therefore drawable) runtime elements */ @@ -1970,6 +1976,7 @@ struct ElementChangeInfo int actual_trigger_side; /* element side that triggered the change */ int actual_trigger_player; /* player which actually triggered change */ int actual_trigger_ce_value; /* CE value of element that triggered change */ + int actual_trigger_ce_score; /* CE score of element that triggered change */ boolean can_change_or_has_action; /* can_change | has_action */