diff --git a/data/editor/generic_unhookable.rules b/data/editor/generic_unhookable.rules index 035b35d55..e6673d9cd 100644 --- a/data/editor/generic_unhookable.rules +++ b/data/editor/generic_unhookable.rules @@ -95,6 +95,206 @@ Random 32 Index 34 YFLIP XFLIP Random 32 +#random 2x2 +Index 3 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +Index 5 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +#random 3x3 +Index 80 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos 0 2 FULL +Pos 1 2 FULL +Pos 2 2 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 3 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +#random 3x2 +Index 67 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +NewRun + +#Remove overlaps +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -2 -2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -1 -2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 0 -2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 1 -2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 2 -2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -2 -1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -1 -1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 0 -1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 1 -1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 2 -1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -2 0 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -1 0 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 1 0 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 2 0 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -2 1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -1 1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 0 1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 1 1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 2 1 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -2 2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos -1 2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 0 2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 1 2 INDEX 3 OR 5 OR 80 OR 67 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 +Pos 2 2 INDEX 3 OR 5 OR 80 OR 67 + +NewRun + +#Fill tiles +Index 4 +Pos -1 0 INDEX 3 +Index 19 +Pos 0 -1 INDEX 3 +Index 20 +Pos -1 -1 INDEX 3 + +Index 6 +Pos -1 0 INDEX 5 +Index 21 +Pos 0 -1 INDEX 5 +Index 22 +Pos -1 -1 INDEX 5 + +Index 81 +Pos -1 0 INDEX 80 +Index 82 +Pos -2 0 INDEX 80 +Index 96 +Pos 0 -1 INDEX 80 +Index 97 +Pos -1 -1 INDEX 80 +Index 98 +Pos -2 -1 INDEX 80 +Index 112 +Pos 0 -2 INDEX 80 +Index 113 +Pos -1 -2 INDEX 80 +Index 114 +Pos -2 -2 INDEX 80 + +Index 68 +Pos -1 0 INDEX 67 +Index 69 +Pos -2 0 INDEX 67 +Index 83 +Pos 0 -1 INDEX 67 +Index 84 +Pos -1 -1 INDEX 67 +Index 85 +Pos -2 -1 INDEX 67 + + + [Random Gold] Index 23 @@ -192,7 +392,207 @@ Random 32 Index 41 YFLIP XFLIP Random 32 -[Random Copper] +#random 2x2 +Index 10 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +Index 12 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +#random 3x3 +Index 87 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos 0 2 FULL +Pos 1 2 FULL +Pos 2 2 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 3 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +#random 3x2 +Index 74 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +NewRun + +#Remove overlaps +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -2 -2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -1 -2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 0 -2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 1 -2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 2 -2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -2 -1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -1 -1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 0 -1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 1 -1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 2 -1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -2 0 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -1 0 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 1 0 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 2 0 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -2 1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -1 1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 0 1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 1 1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 2 1 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -2 2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos -1 2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 0 2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 1 2 INDEX 10 OR 12 OR 87 OR 74 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 +Pos 2 2 INDEX 10 OR 12 OR 87 OR 74 + +NewRun + +#Fill tiles +Index 11 +Pos -1 0 INDEX 10 +Index 26 +Pos 0 -1 INDEX 10 +Index 27 +Pos -1 -1 INDEX 10 + +Index 13 +Pos -1 0 INDEX 12 +Index 28 +Pos 0 -1 INDEX 12 +Index 29 +Pos -1 -1 INDEX 12 + +Index 88 +Pos -1 0 INDEX 87 +Index 89 +Pos -2 0 INDEX 87 +Index 103 +Pos 0 -1 INDEX 87 +Index 104 +Pos -1 -1 INDEX 87 +Index 105 +Pos -2 -1 INDEX 87 +Index 119 +Pos 0 -2 INDEX 87 +Index 120 +Pos -1 -2 INDEX 87 +Index 121 +Pos -2 -2 INDEX 87 + +Index 75 +Pos -1 0 INDEX 74 +Index 76 +Pos -2 0 INDEX 74 +Index 90 +Pos 0 -1 INDEX 74 +Index 91 +Pos -1 -1 INDEX 74 +Index 92 +Pos -2 -1 INDEX 74 + + + +[Random Bronze] Index 144 @@ -289,6 +689,206 @@ Random 32 Index 162 YFLIP XFLIP Random 32 +#random 2x2 +Index 131 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +Index 133 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +#random 3x3 +Index 208 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos 0 2 FULL +Pos 1 2 FULL +Pos 2 2 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 3 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +#random 3x2 +Index 195 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +NewRun + +#Remove overlaps +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -2 -2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -1 -2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 0 -2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 1 -2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 2 -2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -2 -1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -1 -1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 0 -1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 1 -1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 2 -1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -2 0 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -1 0 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 1 0 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 2 0 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -2 1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -1 1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 0 1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 1 1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 2 1 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -2 2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos -1 2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 0 2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 1 2 INDEX 131 OR 133 OR 208 OR 195 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 +Pos 2 2 INDEX 131 OR 133 OR 208 OR 195 + +NewRun + +#Fill tiles +Index 132 +Pos -1 0 INDEX 131 +Index 147 +Pos 0 -1 INDEX 131 +Index 148 +Pos -1 -1 INDEX 131 + +Index 134 +Pos -1 0 INDEX 133 +Index 149 +Pos 0 -1 INDEX 133 +Index 150 +Pos -1 -1 INDEX 133 + +Index 209 +Pos -1 0 INDEX 208 +Index 210 +Pos -2 0 INDEX 208 +Index 224 +Pos 0 -1 INDEX 208 +Index 225 +Pos -1 -1 INDEX 208 +Index 226 +Pos -2 -1 INDEX 208 +Index 240 +Pos 0 -2 INDEX 208 +Index 241 +Pos -1 -2 INDEX 208 +Index 242 +Pos -2 -2 INDEX 208 + +Index 196 +Pos -1 0 INDEX 195 +Index 197 +Pos -2 0 INDEX 195 +Index 211 +Pos 0 -1 INDEX 195 +Index 212 +Pos -1 -1 INDEX 195 +Index 213 +Pos -2 -1 INDEX 195 + + + [Silver/Gold-Mix] #Silver @@ -485,6 +1085,8 @@ Random 64 Index 41 YFLIP XFLIP Random 64 + + [Copper/Silver-Mix] #Copper @@ -681,6 +1283,8 @@ Random 64 Index 34 YFLIP XFLIP Random 64 + + [Gold/Copper-Mix] #Gold @@ -877,6 +1481,8 @@ Random 64 Index 162 YFLIP XFLIP Random 64 + + [Mix All] #Silver @@ -1169,4 +1775,4 @@ Index 162 YFLIP Random 96 Index 162 YFLIP XFLIP -Random 96 \ No newline at end of file +Random 96 diff --git a/data/editor/generic_unhookable_0.7.rules b/data/editor/generic_unhookable_0.7.rules index fc223be4b..d7e6d6237 100644 --- a/data/editor/generic_unhookable_0.7.rules +++ b/data/editor/generic_unhookable_0.7.rules @@ -119,6 +119,230 @@ Random 40 Index 54 YFLIP XFLIP Random 40 +#random 2x2 +Index 3 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +Index 5 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +#random 3x3 +Index 80 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos 0 2 FULL +Pos 1 2 FULL +Pos 2 2 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 3 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +#random 3x2 +Index 67 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 100 + +Index 99 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 100 + +NewRun + +#Remove overlaps +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -2 -2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -1 -2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 0 -2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 1 -2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 2 -2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -2 -1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -1 -1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 0 -1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 1 -1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 2 -1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -2 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -1 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 1 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 2 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -2 1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -1 1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 0 1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 1 1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 2 1 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -2 2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos -1 2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 0 2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 1 2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +Index 16 +Pos 0 0 INDEX 3 OR 5 OR 80 OR 67 OR 99 +Pos 2 2 INDEX 3 OR 5 OR 80 OR 67 OR 99 + +NewRun + +#Fill tiles +Index 4 +Pos -1 0 INDEX 3 +Index 19 +Pos 0 -1 INDEX 3 +Index 20 +Pos -1 -1 INDEX 3 + +Index 6 +Pos -1 0 INDEX 5 +Index 21 +Pos 0 -1 INDEX 5 +Index 22 +Pos -1 -1 INDEX 5 + +Index 81 +Pos -1 0 INDEX 80 +Index 82 +Pos -2 0 INDEX 80 +Index 96 +Pos 0 -1 INDEX 80 +Index 97 +Pos -1 -1 INDEX 80 +Index 98 +Pos -2 -1 INDEX 80 +Index 112 +Pos 0 -2 INDEX 80 +Index 113 +Pos -1 -2 INDEX 80 +Index 114 +Pos -2 -2 INDEX 80 + +Index 68 +Pos -1 0 INDEX 67 +Index 69 +Pos -2 0 INDEX 67 +Index 83 +Pos 0 -1 INDEX 67 +Index 84 +Pos -1 -1 INDEX 67 +Index 85 +Pos -2 -1 INDEX 67 + +Index 100 +Pos -1 0 INDEX 99 +Index 101 +Pos -2 0 INDEX 99 +Index 115 +Pos 0 -1 INDEX 99 +Index 116 +Pos -1 -1 INDEX 99 +Index 117 +Pos -2 -1 INDEX 99 + + + [Random Gold] Index 23 @@ -240,7 +464,231 @@ Random 40 Index 61 YFLIP XFLIP Random 40 -[Random Copper] +#random 2x2 +Index 10 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +Index 12 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +#random 3x3 +Index 87 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos 0 2 FULL +Pos 1 2 FULL +Pos 2 2 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 3 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +#random 3x2 +Index 74 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 100 + +Index 106 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 100 + +NewRun + +#Remove overlaps +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -2 -2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -1 -2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 0 -2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 1 -2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 2 -2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -2 -1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -1 -1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 0 -1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 1 -1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 2 -1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -2 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -1 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 1 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 2 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -2 1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -1 1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 0 1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 1 1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 2 1 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -2 2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos -1 2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 0 2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 1 2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +Index 23 +Pos 0 0 INDEX 10 OR 12 OR 87 OR 74 OR 106 +Pos 2 2 INDEX 10 OR 12 OR 87 OR 74 OR 106 + +NewRun + +#Fill tiles +Index 11 +Pos -1 0 INDEX 10 +Index 26 +Pos 0 -1 INDEX 10 +Index 27 +Pos -1 -1 INDEX 10 + +Index 13 +Pos -1 0 INDEX 12 +Index 28 +Pos 0 -1 INDEX 12 +Index 29 +Pos -1 -1 INDEX 12 + +Index 88 +Pos -1 0 INDEX 87 +Index 89 +Pos -2 0 INDEX 87 +Index 103 +Pos 0 -1 INDEX 87 +Index 104 +Pos -1 -1 INDEX 87 +Index 105 +Pos -2 -1 INDEX 87 +Index 119 +Pos 0 -2 INDEX 87 +Index 120 +Pos -1 -2 INDEX 87 +Index 121 +Pos -2 -2 INDEX 87 + +Index 75 +Pos -1 0 INDEX 74 +Index 76 +Pos -2 0 INDEX 74 +Index 90 +Pos 0 -1 INDEX 74 +Index 91 +Pos -1 -1 INDEX 74 +Index 92 +Pos -2 -1 INDEX 74 + +Index 107 +Pos -1 0 INDEX 106 +Index 108 +Pos -2 0 INDEX 106 +Index 122 +Pos 0 -1 INDEX 106 +Index 123 +Pos -1 -1 INDEX 106 +Index 124 +Pos -2 -1 INDEX 106 + + + +[Random Bronze] Index 144 @@ -361,6 +809,230 @@ Random 40 Index 182 YFLIP XFLIP Random 40 +#random 2x2 +Index 131 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +Index 133 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 +Random 50 + +#random 3x3 +Index 208 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos 0 2 FULL +Pos 1 2 FULL +Pos 2 2 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 3 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 75 + +#random 3x2 +Index 195 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 100 + +Index 227 +Pos 0 0 FULL +Pos 1 0 FULL +Pos 2 0 FULL +Pos 0 1 FULL +Pos 1 1 FULL +Pos 2 1 FULL +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 3 0 NOTINDEX -1 +Random 100 + +NewRun + +#Remove overlaps +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -2 -2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -1 -2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 0 -2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 1 -2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 2 -2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -2 -1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -1 -1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 0 -1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 1 -1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 2 -1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -2 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -1 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 1 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 2 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -2 1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -1 1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 0 1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 1 1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 2 1 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -2 2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos -1 2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 0 2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 1 2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +Index 144 +Pos 0 0 INDEX 131 OR 133 OR 208 OR 195 OR 227 +Pos 2 2 INDEX 131 OR 133 OR 208 OR 195 OR 227 + +NewRun + +#Fill tiles +Index 132 +Pos -1 0 INDEX 131 +Index 147 +Pos 0 -1 INDEX 131 +Index 148 +Pos -1 -1 INDEX 131 + +Index 134 +Pos -1 0 INDEX 133 +Index 149 +Pos 0 -1 INDEX 133 +Index 150 +Pos -1 -1 INDEX 133 + +Index 209 +Pos -1 0 INDEX 208 +Index 210 +Pos -2 0 INDEX 208 +Index 224 +Pos 0 -1 INDEX 208 +Index 225 +Pos -1 -1 INDEX 208 +Index 226 +Pos -2 -1 INDEX 208 +Index 240 +Pos 0 -2 INDEX 208 +Index 241 +Pos -1 -2 INDEX 208 +Index 242 +Pos -2 -2 INDEX 208 + +Index 196 +Pos -1 0 INDEX 195 +Index 197 +Pos -2 0 INDEX 195 +Index 211 +Pos 0 -1 INDEX 195 +Index 212 +Pos -1 -1 INDEX 195 +Index 213 +Pos -2 -1 INDEX 195 + +Index 228 +Pos -1 0 INDEX 227 +Index 229 +Pos -2 0 INDEX 227 +Index 243 +Pos 0 -1 INDEX 227 +Index 244 +Pos -1 -1 INDEX 227 +Index 245 +Pos -2 -1 INDEX 227 + + + [Silver/Gold-Mix] #Silver @@ -605,6 +1277,8 @@ Random 80 Index 61 YFLIP XFLIP Random 80 + + [Copper/Silver-Mix] #Copper @@ -849,6 +1523,8 @@ Random 80 Index 54 YFLIP XFLIP Random 80 + + [Gold/Copper-Mix] #Gold @@ -1093,6 +1769,8 @@ Random 80 Index 182 YFLIP XFLIP Random 80 + + [Mix All] #Silver @@ -1457,4 +2135,4 @@ Index 182 YFLIP Random 120 Index 182 YFLIP XFLIP -Random 120 \ No newline at end of file +Random 120 diff --git a/data/editor/grass_main.rules b/data/editor/grass_main.rules index a14c16505..320f1cc1e 100644 --- a/data/editor/grass_main.rules +++ b/data/editor/grass_main.rules @@ -90,22 +90,42 @@ NewRun #random bones Index 2 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 3 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 66 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 67 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 68 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 NewRun @@ -116,10 +136,50 @@ Pos 0 0 INDEX 1 Pos 1 0 INDEX 1 Pos 0 1 INDEX 1 Pos 1 1 INDEX 1 +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 0 NOTINDEX -1 Random 300 NewRun +#Remove overlaps +Index 1 +Pos 0 0 INDEX 64 +Pos -1 -1 INDEX 64 + +Index 1 +Pos 0 0 INDEX 64 +Pos 0 -1 INDEX 64 + +Index 1 +Pos 0 0 INDEX 64 +Pos 1 -1 INDEX 64 + +Index 1 +Pos 0 0 INDEX 64 +Pos -1 0 INDEX 64 + +Index 1 +Pos 0 0 INDEX 64 +Pos 1 0 INDEX 64 + +Index 1 +Pos 0 0 INDEX 64 +Pos -1 1 INDEX 64 + +Index 1 +Pos 0 0 INDEX 64 +Pos 0 1 INDEX 64 + +Index 1 +Pos 0 0 INDEX 64 +Pos 1 1 INDEX 64 + +NewRun + +#Fill bones Index 65 Pos -1 0 INDEX 64 Index 80 @@ -197,24 +257,46 @@ NewRun #random bones Index 29 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 150 Index 42 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 150 Index 43 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 150 Index 44 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 150 Index 45 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 150 + + [Freeze] Index 110 diff --git a/data/editor/grass_main_0.7.rules b/data/editor/grass_main_0.7.rules index d2a2ade5e..45899f9c2 100644 --- a/data/editor/grass_main_0.7.rules +++ b/data/editor/grass_main_0.7.rules @@ -39,14 +39,9 @@ Pos 1 0 EMPTY #inside corner top-right Index 54 -Pos 0 -1 FULL -Pos 0 1 FULL -Pos -1 0 FULL -Pos 1 0 FULL -Pos -1 -1 FULL Pos -1 1 EMPTY -Pos 1 -1 FULL -Pos 1 1 FULL +Pos -1 0 FULL +Pos 0 1 FULL #inside corner top-left Index 53 @@ -54,7 +49,7 @@ Pos 1 1 EMPTY Pos 1 0 FULL Pos 0 1 FULL -#single gras +#single tile Index 84 Pos -1 0 EMPTY Pos 0 -1 EMPTY @@ -383,26 +378,50 @@ NewRun #random bones Index 2 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 3 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 66 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 67 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 68 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 Index 83 Pos 0 0 INDEX 1 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 250 NewRun @@ -413,6 +432,10 @@ Pos 0 0 INDEX 1 Pos 1 0 INDEX 1 Pos 0 1 INDEX 1 Pos 1 1 INDEX 1 +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 1 NOTINDEX -1 Random 500 Index 69 @@ -420,10 +443,28 @@ Pos 0 0 INDEX 1 Pos 1 0 INDEX 1 Pos 0 1 INDEX 1 Pos 1 1 INDEX 1 +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 1 NOTINDEX -1 Random 500 NewRun +Index 1 +Pos 0 0 INDEX 64 OR 69 +Pos -1 0 INDEX 64 OR 69 + +Index 1 +Pos 0 0 INDEX 64 OR 69 +Pos -1 -1 INDEX 64 OR 69 + +Index 1 +Pos 0 0 INDEX 64 OR 69 +Pos 0 -1 INDEX 64 OR 69 + +NewRun + Index 65 Pos -1 0 INDEX 64 Index 80 @@ -439,6 +480,7 @@ Index 86 Pos -1 -1 INDEX 69 + [Cave] Index 13 @@ -507,26 +549,50 @@ NewRun #random bones Index 29 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 200 Index 42 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 200 Index 43 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 200 Index 44 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 200 Index 45 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 200 Index 61 Pos 0 0 INDEX 13 +Pos 0 1 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 1 0 NOTINDEX -1 +Pos -1 0 NOTINDEX -1 Random 200 NewRun @@ -537,6 +603,10 @@ Pos 0 0 INDEX 13 Pos 1 0 INDEX 13 Pos 0 1 INDEX 13 Pos 1 1 INDEX 13 +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 1 NOTINDEX -1 Random 400 Index 46 @@ -544,10 +614,28 @@ Pos 0 0 INDEX 13 Pos 1 0 INDEX 13 Pos 0 1 INDEX 13 Pos 1 1 INDEX 13 +Pos -1 0 NOTINDEX -1 +Pos 0 -1 NOTINDEX -1 +Pos 0 2 NOTINDEX -1 +Pos 2 1 NOTINDEX -1 Random 400 NewRun +Index 1 +Pos 0 0 INDEX 14 OR 46 +Pos -1 0 INDEX 14 OR 46 + +Index 1 +Pos 0 0 INDEX 14 OR 46 +Pos -1 -1 INDEX 14 OR 46 + +Index 1 +Pos 0 0 INDEX 14 OR 46 +Pos 0 -1 INDEX 14 OR 46 + +NewRun + Index 15 Pos -1 0 INDEX 14 Index 30 @@ -560,5 +648,4 @@ Pos -1 0 INDEX 46 Index 62 Pos 0 -1 INDEX 46 Index 63 -Pos -1 -1 INDEX 46 - +Pos -1 -1 INDEX 46 \ No newline at end of file diff --git a/src/game/editor/auto_map.cpp b/src/game/editor/auto_map.cpp index 5448b1265..873309ad0 100644 --- a/src/game/editor/auto_map.cpp +++ b/src/game/editor/auto_map.cpp @@ -119,11 +119,17 @@ void CAutoMapper::Load(const char* pTileName) if(!str_comp(aValue, "EMPTY")) { - Value = CPosRule::EMPTY; + Value = CPosRule::INDEX; + CIndexInfo NewIndexInfo = {0, 0}; + NewIndexList.add(NewIndexInfo); } else if(!str_comp(aValue, "FULL")) { - Value = CPosRule::FULL; + Value = CPosRule::NOTINDEX; + CIndexInfo NewIndexInfo1 = {0, 0}; + CIndexInfo NewIndexInfo2 = {-1, 0}; + NewIndexList.add(NewIndexInfo1); + NewIndexList.add(NewIndexInfo2); } else if(!str_comp(aValue, "INDEX") || !str_comp(aValue, "NOTINDEX")) { @@ -240,7 +246,9 @@ void CAutoMapper::Load(const char* pTileName) if(!Found && m_lConfigs[g].m_aRuns[h].m_aIndexRules[i].m_DefaultRule) { array NewIndexList; - CPosRule NewPosRule = {0, 0, CPosRule::FULL, NewIndexList}; + CIndexInfo NewIndexInfo = {0, 0}; + NewIndexList.add(NewIndexInfo); + CPosRule NewPosRule = {0, 0, CPosRule::NOTINDEX, NewIndexList}; m_lConfigs[g].m_aRuns[h].m_aIndexRules[i].m_aRules.add(NewPosRule); } } @@ -287,7 +295,6 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID) } // auto map - int MaxIndex = pLayer->m_Width*pLayer->m_Height; for(int y = 0; y < pLayer->m_Height; y++) for(int x = 0; x < pLayer->m_Width; x++) { @@ -300,42 +307,38 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID) for(int j = 0; j < pRun->m_aIndexRules[i].m_aRules.size() && RespectRules; ++j) { CPosRule *pRule = &pRun->m_aIndexRules[i].m_aRules[j]; - int CheckIndex = (y+pRule->m_Y)*pLayer->m_Width+(x+pRule->m_X); + + int CheckIndex, CheckFlags; + int CheckX = x + pRule->m_X; + int CheckY = y + pRule->m_Y; + if(CheckX >= 0 && CheckX < pLayer->m_Width && CheckY >= 0 && CheckY < pLayer->m_Height) { + int CheckTile = CheckY * pLayer->m_Width + CheckX; + CheckIndex = pLayer->m_pTiles[CheckTile].m_Index; + CheckFlags = pLayer->m_pTiles[CheckTile].m_Flags; + } else { + CheckIndex = -1; + CheckFlags = 0; + } - if(CheckIndex < 0 || CheckIndex >= MaxIndex) - RespectRules = false; - else + if(pRule->m_Value == CPosRule::INDEX) { - if(pRule->m_Value == CPosRule::EMPTY) - { - if(pLayer->m_pTiles[CheckIndex].m_Index > 0) - RespectRules = false; + bool PosRuleTest = false; + for(int i = 0; i < pRule->m_aIndexList.size(); ++i) { + if(CheckIndex == pRule->m_aIndexList[i].m_ID && (!pRule->m_aIndexList[i].m_Flag || CheckFlags == pRule->m_aIndexList[i].m_Flag)) + PosRuleTest = true; } - else if(pRule->m_Value == CPosRule::FULL) - { - if(pLayer->m_pTiles[CheckIndex].m_Index == 0) - RespectRules = false; - } - else if(pRule->m_Value == CPosRule::INDEX) - { - bool PosRuleTest = false; - for(int i = 0; i < pRule->m_aIndexList.size(); ++i) { - if(pLayer->m_pTiles[CheckIndex].m_Index == pRule->m_aIndexList[i].m_ID && (!pRule->m_aIndexList[i].m_Flag || pLayer->m_pTiles[CheckIndex].m_Flags == pRule->m_aIndexList[i].m_Flag)) - PosRuleTest = true; - } - if(!PosRuleTest) - RespectRules = false; - } - else if(pRule->m_Value == CPosRule::NOTINDEX) - { - bool PosRuleTest = true; - for(int i = 0; i < pRule->m_aIndexList.size(); ++i) { - if(pLayer->m_pTiles[CheckIndex].m_Index == pRule->m_aIndexList[i].m_ID && (!pRule->m_aIndexList[i].m_Flag || pLayer->m_pTiles[CheckIndex].m_Flags == pRule->m_aIndexList[i].m_Flag)) - PosRuleTest = false; - } - if(!PosRuleTest) - RespectRules = false; + if(!PosRuleTest) + RespectRules = false; + } + else if(pRule->m_Value == CPosRule::NOTINDEX) + { + bool PosRuleTest = true; + for(int i = 0; i < pRule->m_aIndexList.size(); ++i) { + if(CheckIndex == pRule->m_aIndexList[i].m_ID && (!pRule->m_aIndexList[i].m_Flag || CheckFlags == pRule->m_aIndexList[i].m_Flag)) + PosRuleTest = false; } + if(!PosRuleTest) + RespectRules = false; } } diff --git a/src/game/editor/auto_map.h b/src/game/editor/auto_map.h index 78700abb4..2f5a00a01 100644 --- a/src/game/editor/auto_map.h +++ b/src/game/editor/auto_map.h @@ -21,8 +21,6 @@ class CAutoMapper enum { NORULE=0, - EMPTY, - FULL, INDEX, NOTINDEX };