Commit 3af01658a1a423850f7fd02a1d3c02dc054517f5

Authored by DarkGod
1 parent 1a779714

Addons can now load additional stores data

... ... @@ -632,6 +632,7 @@ Campaign: %s]]):format(
632 632 end
633 633
634 634 function _M:getStore(def)
  635 + print("[STORE] Grabbing", def)
635 636 return Store.stores_def[def]:clone()
636 637 end
637 638
... ...
... ... @@ -26,7 +26,7 @@ module(..., package.seeall, class.inherit(Store))
26 26 _M.stores_def = {}
27 27
28 28 function _M:loadStores(f)
29   - self.stores_def = self:loadList(f)
  29 + self:loadList(f, nil, self.stores_def)
30 30 end
31 31
32 32 function _M:init(t, no_default)
... ...
... ... @@ -11,3 +11,5 @@
11 11
12 12 * kill a huge worm => get a new stair to a worm hole
13 13 * levers on a level => open a trap door to a vault
  14 +
  15 +* push event: Lina Reverse !
... ...
... ... @@ -37,11 +37,21 @@
37 37 <property name="display" value="t"/>
38 38 </properties>
39 39 </tile>
  40 + <tile id="69">
  41 + <properties>
  42 + <property name="display" value="]"/>
  43 + </properties>
  44 + </tile>
40 45 <tile id="72">
41 46 <properties>
42 47 <property name="display" value="~"/>
43 48 </properties>
44 49 </tile>
  50 + <tile id="81">
  51 + <properties>
  52 + <property name="display" value="^"/>
  53 + </properties>
  54 + </tile>
45 55 <tile id="117">
46 56 <properties>
47 57 <property name="display" value="^"/>
... ... @@ -148,6 +158,11 @@
148 158 <property name="display" value="#"/>
149 159 </properties>
150 160 </tile>
  161 + <tile id="2">
  162 + <properties>
  163 + <property name="display" value="~"/>
  164 + </properties>
  165 + </tile>
151 166 <tile id="4">
152 167 <properties>
153 168 <property name="display" value="3"/>
... ... @@ -183,110 +198,17 @@
183 198 <property name="display" value="'"/>
184 199 </properties>
185 200 </tile>
  201 + <tile id="35">
  202 + <properties>
  203 + <property name="display" value="+"/>
  204 + </properties>
  205 + </tile>
186 206 </tileset>
187 207 <layer name="Terrain" width="50" height="50">
188 208 <data encoding="base64" compression="zlib">
189   - eJzt2EtOAzEMBuCwrdRVD1CJS3DdbjkAh+DNkt6AHWLJDo2UCMuKnd/2JJMKKllD23TkbxxnMhxSSofOcTMgehusjl2OEY4dGNxxJoGeA3X1yF/KIeJoWSKGMxDS+Og1sTq0cy75XCmBOK4bgVpGOz7I5yVX6SVZyrVAHXwNkRzlvN/k75qDRsugWSyO2lqoOZb3R+FzyVFetzk0izQ/NYe0pmt9zh1aP6O1oA5q8Tgsa8kRHGcxUIvFgdaC58+jh6NYPpPeHx5DcdDf1RzUaHHQvuF9gjos9ZActRqhDt77iEP63juvtDlW63NtvSoGq8MayLyK9kjr3m65d0t7J68DWX/RPUpkT+hdrySPZY8Vcdzn40PS79Ujwzqv1grrHh8xzOx4CzhGWJbcXvLxOR+/gJw1Q82xJzGiPtZAnwf3aU6L9/8Ma3mse2aPAXmujVhq+5tWj/PxiAFxUEv0GiIOWkPUYHVYLJLjMef9lI+vFYe1Fh6Hty49ewN1bLke93SMtPw7MMdsFtSxtaXliTpm8VgcM1usjpall+lUiajD4kG97w4HtUQca5m89Til3zm2liPqv3RHsczs4PNHG9faS27lKLmXPtQsdNzWfa7lxi214M8pMztqnta+aQYHkicammFUn69l4TW6dMca+8S/6rgb5PgBYjdSQA==
  209 + eJzt2c0NwyAMBeBs0jGyAQOwa4epskoPvTQSsvgzfrYTwuGpqtQgf7GBQ/dt2/ZMAiBv5u9zdUjycoqV40OyHDbGKzq4ntoa3g7UHl8OW4OHg65ZWncGxx3uwCc50HPlnRkMHItlPUcmd3XUvkvnKrfvNO68mRxnvhlHaVYkDst565n7qztG7jvvfT6zA2Xyrh1l8a4bZfGumZ7Dx40diL5c2cHxPM0RHBwae8TKoX0flhxSX3pWSQ05R0g+a7Ui+6Th6E36X4bU5WVAZ7T++I/2vGg6WgbqoPNjlTjo4NZKzwO09ayzZqj1RBKkJa2z5dDwaPSEmkqOlqc2N/Q59D5q1YzqjcZ8oh0tm9Y+Q1l6+iTtJecZpCMy1u2ZPe57QFu030FrxldWVp6RH0fSBak=
190 210 </data>
191 211 </layer>
192   - <objectgroup name="addSpot" width="50" height="50">
193   - <object name="portal" x="1030" y="230" width="18" height="18">
194   - <properties>
195   - <property name="subtype" value="&quot;portal&quot;"/>
196   - <property name="type" value="&quot;portal&quot;"/>
197   - </properties>
198   - </object>
199   - <object name="portal" x="1253" y="262" width="18" height="18">
200   - <properties>
201   - <property name="subtype" value="&quot;portal&quot;"/>
202   - <property name="type" value="&quot;portal&quot;"/>
203   - </properties>
204   - </object>
205   - <object name="portal" x="1223" y="486" width="18" height="18">
206   - <properties>
207   - <property name="subtype" value="&quot;portal&quot;"/>
208   - <property name="type" value="&quot;portal&quot;"/>
209   - </properties>
210   - </object>
211   - <object name="portal" x="1031" y="485" width="18" height="18">
212   - <properties>
213   - <property name="subtype" value="&quot;portal&quot;"/>
214   - <property name="type" value="&quot;portal&quot;"/>
215   - </properties>
216   - </object>
217   - <object name="POP" x="1127" y="360" width="18" height="18">
218   - <properties>
219   - <property name="subtype" value="&quot;arena&quot;"/>
220   - <property name="type" value="&quot;quest&quot;"/>
221   - </properties>
222   - </object>
223   - <object name="POP" x="901" y="390" width="18" height="18">
224   - <properties>
225   - <property name="subtype" value="&quot;outside-arena&quot;"/>
226   - <property name="type" value="&quot;quest&quot;"/>
227   - </properties>
228   - </object>
229   - <object name="rhaloren" x="489" y="1001" width="176" height="144">
230   - <properties>
231   - <property name="subtype" value="&quot;rhaloren&quot;"/>
232   - <property name="type" value="&quot;arrival&quot;"/>
233   - </properties>
234   - </object>
235   - <object name="ziguranth" x="900" y="520" width="52" height="49">
236   - <properties>
237   - <property name="subtype" value="&quot;ziguranth&quot;"/>
238   - <property name="type" value="&quot;arrival&quot;"/>
239   - </properties>
240   - </object>
241   - <object name="ziguranth" x="772" y="232" width="52" height="49">
242   - <properties>
243   - <property name="subtype" value="&quot;ziguranth&quot;"/>
244   - <property name="type" value="&quot;arrival&quot;"/>
245   - </properties>
246   - </object>
247   - <object name="ziguranth" x="293" y="421" width="52" height="49">
248   - <properties>
249   - <property name="subtype" value="&quot;ziguranth&quot;"/>
250   - <property name="type" value="&quot;arrival&quot;"/>
251   - </properties>
252   - </object>
253   - <object name="ziguranth" x="325" y="965" width="52" height="49">
254   - <properties>
255   - <property name="subtype" value="&quot;ziguranth&quot;"/>
256   - <property name="type" value="&quot;arrival&quot;"/>
257   - </properties>
258   - </object>
259   - <object name="ziguranth" x="583" y="679" width="52" height="49">
260   - <properties>
261   - <property name="subtype" value="&quot;ziguranth&quot;"/>
262   - <property name="type" value="&quot;arrival&quot;"/>
263   - </properties>
264   - </object>
265   - <object name="ziguranth" x="933" y="1127" width="52" height="49">
266   - <properties>
267   - <property name="subtype" value="&quot;ziguranth&quot;"/>
268   - <property name="type" value="&quot;arrival&quot;"/>
269   - </properties>
270   - </object>
271   - <object name="ziguranth" x="996" y="741" width="52" height="49">
272   - <properties>
273   - <property name="subtype" value="&quot;ziguranth&quot;"/>
274   - <property name="type" value="&quot;arrival&quot;"/>
275   - </properties>
276   - </object>
277   - <object name="POP" x="933" y="391" width="18" height="18">
278   - <properties>
279   - <property name="subtype" value="&quot;sealed-gate&quot;"/>
280   - <property name="type" value="&quot;quest&quot;"/>
281   - </properties>
282   - </object>
283   - </objectgroup>
284   - <objectgroup name="Actor" width="50" height="50">
285   - <object name="Myssil" x="616" y="165" width="17" height="19">
286   - <properties>
287   - <property name="display" value="@"/>
288   - <property name="value" value="&quot;PROTECTOR_MYSSIL&quot;"/>
289   - </properties>
290   - </object>
291   - </objectgroup>
  212 + <objectgroup name="addSpot" width="50" height="50"/>
  213 + <objectgroup name="Actor" width="50" height="50"/>
292 214 </map>
... ...