SuperKamiGuru/foss-mmo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the kind of non-copper walls to inert

Browse source
This commit is contained in:
Juliana Sims 2024-05-24 12:00:17 -04:00
parent c4b308232f
commit 51bc034756
No known key found for this signature in database
GPG key ID: 2A00BD4B0090029E
5 changed files with 42 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/game/level.scm
View file

@ -66,7 +66,7 @@
(y (bytevector-u8-ref objects (+ i 1))) (y (bytevector-u8-ref objects (+ i 1)))
(id (bytevector-u8-ref objects (+ i 2))) (id (bytevector-u8-ref objects (+ i 2)))
(obj (match id (obj (match id
(1 (spawn ^wall x y 'brick)) (1 (spawn ^wall x y 'inert))
(2 (spawn ^wall x y 'copper)) (2 (spawn ^wall x y 'copper))
(3 (spawn ^player x y)) (3 (spawn ^player x y))
(4 (spawn ^exit x y)) (4 (spawn ^exit x y))

30
modules/game/levels/level-2.tmx
View file

@ -3,21 +3,21 @@
<tileset firstgid="1" source="tiles.tsx"/> <tileset firstgid="1" source="tiles.tsx"/>
<layer id="1" name="background" width="20" height="15"> <layer id="1" name="background" width="20" height="15">
<data encoding="csv"> <data encoding="csv">
23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 130,211,129,170,171,190,109,191,129,191,191,171,91,190,110,211,171,209,150,130,
23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 189,211,210,89,111,81,82,82,82,82,82,83,83,82,84,91,151,91,129,209,
23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, 211,209,209,171,111,105,24,24,24,24,24,24,24,24,86,210,89,130,191,170,
23,23,23,23,23,23,24,24,24,28,24,24,24,24,23,23,23,23,23,23, 170,209,91,170,111,105,24,24,24,28,24,24,24,24,86,131,129,129,170,131,
23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, 130,209,89,129,211,105,24,24,24,24,24,24,24,24,106,209,211,90,211,149,
23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, 111,89,191,151,151,105,24,24,24,24,24,24,24,24,106,131,150,151,91,149,
23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, 109,191,169,209,89,85,24,24,24,24,24,24,24,24,86,211,130,150,129,190,
23,23,23,23,23,23,23,23,23,23,24,23,23,23,23,23,23,23,23,23, 91,171,151,131,211,101,102,102,81,82,24,83,84,102,104,189,211,189,169,109,
23,23,23,23,23,23,23,23,23,24,24,24,23,23,23,23,23,23,23,23, 89,170,150,209,131,171,81,83,108,24,24,24,107,84,169,151,131,111,191,191,
23,23,23,23,23,23,23,24,24,24,24,24,24,23,23,23,23,23,23,23, 130,129,190,209,91,81,108,24,24,24,24,24,24,107,84,131,111,109,189,211,
23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, 171,190,149,189,211,105,24,24,24,24,24,24,24,24,106,131,129,89,90,170,
23,23,23,23,23,23,24,24,24,24,24,24,24,24,23,23,23,23,23,23, 191,170,91,169,210,105,24,24,24,24,24,24,24,24,86,129,211,110,191,129,
23,23,23,23,23,23,23,24,24,24,24,24,24,23,23,23,23,23,23,23, 130,149,129,109,171,101,88,24,24,24,24,24,24,87,104,111,169,190,110,150,
23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 149,129,89,129,111,190,101,102,102,102,103,102,102,104,91,90,211,190,151,169,
23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 150,111,131,210,151,151,130,211,111,210,90,90,130,150,190,109,129,90,190,169
</data> </data>
</layer> </layer>
<objectgroup id="2" name="objects"> <objectgroup id="2" name="objects">

16
modules/game/levels/level-3.tmx
View file

@ -3,8 +3,8 @@
<tileset firstgid="1" source="tiles.tsx"/> <tileset firstgid="1" source="tiles.tsx"/>
<layer id="1" name="background" width="20" height="15"> <layer id="1" name="background" width="20" height="15">
<data encoding="csv"> <data encoding="csv">
23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 170,130,151,211,150,151,171,110,190,91,91,189,171,111,130,150,170,150,210,150,
81,83,83,82,83,83,83,82,83,83,83,83,82,83,83,84,23,23,23,23, 81,83,83,82,83,83,83,82,83,83,83,83,82,83,83,84,131,89,169,109,
85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,81,82,82,84, 85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,81,82,82,84,
105,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,24,24,86, 105,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,24,24,86,
105,24,24,3,3,24,3,3,3,3,3,3,24,24,24,106,105,24,24,106, 105,24,24,3,3,24,3,3,3,3,3,3,24,24,24,106,105,24,24,106,
@ -12,12 +12,12 @@
85,24,24,24,24,24,24,3,3,3,3,3,24,24,24,24,24,24,24,106, 85,24,24,24,24,24,24,3,3,3,3,3,24,24,24,24,24,24,24,106,
85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,24,24,106, 85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,24,24,106,
85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,28,24,86, 85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,105,28,24,86,
105,24,24,24,24,24,24,24,24,24,24,24,24,24,81,104,105,24,24,86, 105,24,24,24,24,24,24,24,24,24,24,24,24,24,87,104,105,24,24,86,
105,24,3,3,24,61,61,66,24,24,24,24,24,24,106,23,105,24,24,86, 105,24,3,3,24,61,61,66,24,24,24,24,24,24,106,130,105,24,24,86,
85,24,24,24,24,24,24,64,61,61,24,3,3,24,86,23,101,102,102,104, 85,24,24,24,24,24,24,64,61,61,24,3,3,24,86,109,101,102,102,104,
101,103,103,102,102,102,103,102,103,103,102,102,102,102,104,23,23,23,23,23, 101,103,103,102,102,102,103,102,103,103,102,102,102,102,104,170,189,131,150,189,
23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 91,191,211,110,171,209,170,110,170,111,91,111,171,211,110,210,149,89,109,130,
23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 170,151,171,111,209,110,89,150,90,90,111,209,189,131,130,110,171,211,209,169
</data> </data>
</layer> </layer>
<objectgroup id="2" name="objects"> <objectgroup id="2" name="objects">

37
modules/game/levels/tiles.tsx
View file

@ -6,90 +6,85 @@
<property name="kind" value="copper"/> <property name="kind" value="copper"/>
</properties> </properties>
</tile> </tile>
<tile id="22" type="wall">
<properties>
<property name="kind" value="brick"/>
</properties>
</tile>
<tile id="27" type="exit"/> <tile id="27" type="exit"/>
<tile id="80" type="wall"> <tile id="80" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="81" type="wall"> <tile id="81" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="82" type="wall"> <tile id="82" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="83" type="wall"> <tile id="83" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="84" type="wall"> <tile id="84" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="85" type="wall"> <tile id="85" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="86" type="wall"> <tile id="86" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="87" type="wall"> <tile id="87" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="100" type="wall"> <tile id="100" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="101" type="wall"> <tile id="101" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="102" type="wall"> <tile id="102" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="103" type="wall"> <tile id="103" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="104" type="wall"> <tile id="104" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="105" type="wall"> <tile id="105" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="106" type="wall"> <tile id="106" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
<tile id="107" type="wall"> <tile id="107" type="wall">
<properties> <properties>
<property name="kind" value="brick"/> <property name="kind" value="inert"/>
</properties> </properties>
</tile> </tile>
</tileset> </tileset>

4
scripts/compile-map.scm
View file

@ -547,7 +547,7 @@ the default ORIENTATION value of 'orthogonal' is supported."
(y-loop (1+ y)))) (y-loop (1+ y))))
bv)) bv))
(define obj:wall:brick 1) (define obj:wall:inert 1)
(define obj:wall:copper 2) (define obj:wall:copper 2)
(define obj:player-spawn 3) (define obj:player-spawn 3)
(define obj:exit 4) (define obj:exit 4)
@ -579,7 +579,7 @@ the default ORIENTATION value of 'orthogonal' is supported."
(#f #f) (#f #f)
("wall" ("wall"
(match (assq-ref (tile-properties tile) 'kind) (match (assq-ref (tile-properties tile) 'kind)
("brick" (list x y obj:wall:brick)) ("inert" (list x y obj:wall:inert))
("copper" (list x y obj:wall:copper)) ("copper" (list x y obj:wall:copper))
(kind (error "unsupported wall kind" kind)))) (kind (error "unsupported wall kind" kind))))
("exit" (list x y obj:exit)) ("exit" (list x y obj:exit))