Skip to content

Commit c6939e3

Browse files
MarioVieilledentMarioVieilledent
committed
More blocks, graphic correction
1 parent 509c901 commit c6939e3

24 files changed

+282
-161
lines changed

‎data/maps/map1.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

22

3-
4-
gg
5-
ggggdd
6-
ddddddgg ggg
3+
hh
4+
fhgg bb
5+
ggggdg h bb hf
6+
ddddddgg f p t ggg
77
ddddddddgg ggdddg
8-
ddddddddddgggggdddddd
9-
ssdddddddddddddddddddggggg
10-
sssdddddddddddddddddddddddggg
11-
ssssdddddddddddddddddddddddddggggg
8+
ddddddddddgwwwgdddddd hf
9+
ssddddddddddWWdddddddgggaa a
10+
sssdddddddddddddddddddddaaaaa
11+
ssssdddddddddddddddddddddaaadggggg
1212
sssssssssdddddddddddddddddddddddddgggg
1313
sssssssssddddddddddddddddddddddddddddd
1414
ssssssssssssssssssssssssssddddddddddddgggg g

‎data/ressources/defaultBackground.png

34.8 KB
Loading

‎data/ressources/defaultRessourcePack.png

-2.27 KB
Loading

‎data/ressources/templateRessourcePack.pdn

9.83 KB
Binary file not shown.

‎data/tables/ressources.json

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
{
2-
"g": { "name": "grass", "code": 1, "solid": true, "x": 0, "y": 0 },
3-
"d": { "name": "dirt", "code": 2, "solid": true, "x": 1, "y": 0 },
4-
"s": { "name": "stone", "code": 3, "solid": true, "x": 2, "y": 0 },
5-
"c": { "name": "chest_closed", "code": 4, "solid": false, "x": 0, "y": 1 },
6-
"C": { "name": "chest_open", "code": 5, "solid": false, "x": 1, "y": 1 }
2+
"g": { "name": "grass", "code": 1, "solid": true, "x": 0, "y": 0, "w": 1, "h": 1 },
3+
"d": { "name": "dirt", "code": 2, "solid": true, "x": 1, "y": 0, "w": 1, "h": 1 },
4+
"s": { "name": "stone", "code": 3, "solid": true, "x": 2, "y": 0, "w": 1, "h": 1 },
5+
"b": { "name": "brick", "code": 4, "solid": true, "x": 3, "y": 0, "w": 1, "h": 1 },
6+
"a": { "name": "sand", "code": 5, "solid": true, "x": 4, "y": 0, "w": 1, "h": 1 },
7+
"l": { "name": "glass", "code": 6, "solid": true, "x": 5, "y": 0, "w": 1, "h": 1 },
8+
"c": { "name": "chest_closed", "code": 4, "solid": false, "x": 0, "y": 1, "w": 1, "h": 1 },
9+
"C": { "name": "chest_open", "code": 5, "solid": false, "x": 1, "y": 1, "w": 1, "h": 1 },
10+
"h": { "name": "herbs", "code": 6, "solid": false, "x": 2, "y": 1, "w": 1, "h": 1 },
11+
"f": { "name": "flower", "code": 7, "solid": false, "x": 3, "y": 1, "w": 1, "h": 1 },
12+
"r": { "name": "grave_cross", "code": 8, "solid": false, "x": 4, "y": 1, "w": 1, "h": 1 },
13+
"W": { "name": "water", "code": 9, "solid": false, "x": 5, "y": 1, "w": 1, "h": 1 },
14+
"w": { "name": "water_top", "code": 10, "solid": false, "x": 6, "y": 1, "w": 1, "h": 1 },
15+
"P": { "name": "player_man", "code": 11, "solid": false, "x": 0, "y": 2, "w": 1, "h": 2 },
16+
"p": { "name": "player_woman", "code": 12, "solid": false, "x": 1, "y": 2, "w": 1, "h": 2 }
717
}

‎go.sum

+27
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,45 @@
11
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
2+
github.com/ebitengine/purego v0.0.0-20220905075623-aeed57cda744/go.mod h1:Eh8I3yvknDYZeCuXH9kRNaPuHEwvXDCk378o9xszmHg=
23
github.com/ebitengine/purego v0.3.0 h1:BDv9pD98k6AuGNQf3IF41dDppGBOe0F4AofvhFtBXF4=
34
github.com/ebitengine/purego v0.3.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
45
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200707082815-5321531c36a2/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
6+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220806181222-55e207c401ad/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
57
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU=
68
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
79
github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
810
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
911
github.com/hajimehoshi/bitmapfont v1.3.0/go.mod h1:/Qb7yVjHYNUV4JdqNkPs6BSZwLjKqkZOMIp6jZD0KgE=
12+
github.com/hajimehoshi/bitmapfont/v2 v2.2.1/go.mod h1:wjrYAy8vKgj9JsFgnYAOK346/uvE22TlmqouzdnYIs0=
1013
github.com/hajimehoshi/ebiten v1.12.12 h1:JvmF1bXRa+t+/CcLWxrJCRsdjs2GyBYBSiFAfIqDFlI=
1114
github.com/hajimehoshi/ebiten v1.12.12/go.mod h1:1XI25ImVCDPJiXox4h9yK/CvN5sjDYnbF4oZcFzPXHw=
15+
github.com/hajimehoshi/ebiten/v2 v2.4.2 h1:uD1eIknc6ccxufYR81Oz0UMOvxqnj72kNI0LIOGNFPU=
16+
github.com/hajimehoshi/ebiten/v2 v2.4.2/go.mod h1:MQpHHrcrHbU9+y14Avp7Wpgfjd5qCUNvREyf4krTstE=
1217
github.com/hajimehoshi/ebiten/v2 v2.5.2 h1:/NPHsq2EdZ/4yRT6p+I8OHzXgWePl8NYgkg8P3VVdnQ=
1318
github.com/hajimehoshi/ebiten/v2 v2.5.2/go.mod h1:mnHSOVysTr/nUZrN1lBTRqhK4NG+T9NR3JsJP2rCppk=
1419
github.com/hajimehoshi/file2byteslice v0.0.0-20200812174855-0e5e8a80490e/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE=
20+
github.com/hajimehoshi/file2byteslice v0.0.0-20210813153925-5340248a8f41 h1:s01qIIRG7vN/5ndLwkDktjx44ulFk6apvAjVBYR50Yo=
21+
github.com/hajimehoshi/file2byteslice v0.0.0-20210813153925-5340248a8f41/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE=
1522
github.com/hajimehoshi/go-mp3 v0.3.1/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
23+
github.com/hajimehoshi/go-mp3 v0.3.3/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
1624
github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
1725
github.com/hajimehoshi/oto v0.6.8/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
26+
github.com/hajimehoshi/oto/v2 v2.3.0/go.mod h1:seWLbgHH7AyUMYKfKYT9pg7PhUu9/SisyJvNTT+ASQo=
1827
github.com/jakecoffman/cp v1.0.0/go.mod h1:JjY/Fp6d8E1CHnu74gWNnU0+b9VzEdUVPoJxg2PsTQg=
28+
github.com/jakecoffman/cp v1.2.1/go.mod h1:JjY/Fp6d8E1CHnu74gWNnU0+b9VzEdUVPoJxg2PsTQg=
29+
github.com/jezek/xgb v1.0.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
1930
github.com/jezek/xgb v1.1.0 h1:wnpxJzP1+rkbGclEkmwpVFQWpuE2PUGNUzP8SbfFobk=
2031
github.com/jezek/xgb v1.1.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
2132
github.com/jfreymuth/oggvorbis v1.0.1/go.mod h1:NqS+K+UXKje0FUYUPosyQ+XTVvjmVjps1aEZH1sumIk=
33+
github.com/jfreymuth/oggvorbis v1.0.4/go.mod h1:1U4pqWmghcoVsCJJ4fRBKv9peUJMBHixthRlBeD6uII=
2234
github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0=
35+
github.com/jfreymuth/vorbis v1.0.2/go.mod h1:DoftRo4AznKnShRl1GxiTFCseHr4zR9BN3TWXyuzrqQ=
2336
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
2437
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
2538
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
2639
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
40+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
2741
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
42+
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
2843
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
2944
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3045
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -38,28 +53,33 @@ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMx
3853
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
3954
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
4055
golang.org/x/image v0.0.0-20200801110659-972c09e46d76/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
56+
golang.org/x/image v0.0.0-20220722155232-062f8c9fd539/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
4157
golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=
4258
golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0=
4359
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
4460
golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
4561
golang.org/x/mobile v0.0.0-20210208171126-f462b3930c8f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
62+
golang.org/x/mobile v0.0.0-20220722155234-aaac322e2105/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ=
4663
golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c h1:Gk61ECugwEHL6IiyyNLXNzmu8XslmRP2dS0xjIYhbb4=
4764
golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY=
4865
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
4966
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
5067
golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
5168
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
69+
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
5270
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
5371
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
5472
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
5573
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
5674
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5775
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
5876
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
77+
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
5978
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
6079
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
6180
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6281
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
82+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6383
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6484
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
6585
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -70,9 +90,14 @@ golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7w
7090
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7191
golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7292
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
93+
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7394
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
95+
golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
96+
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
7497
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
98+
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
7599
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
100+
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
76101
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
77102
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
78103
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -81,6 +106,7 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
81106
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
82107
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
83108
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
109+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
84110
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
85111
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
86112
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
@@ -89,6 +115,7 @@ golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3
89115
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
90116
golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
91117
golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
118+
golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
92119
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
93120
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
94121
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎main.go

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
package main
22

3-
import "gopherLand2/src/instance"
3+
import (
4+
"fmt"
5+
"gopherLand2/src/localInstance"
6+
"gopherLand2/src/serverInstance"
7+
"os"
8+
)
49

510
func main() {
6-
instance.StartInstance()
11+
args := os.Args
12+
13+
if len(args) == 1 {
14+
localInstance.StartInstance()
15+
} else if len(args) == 2 && args[1] == "server" {
16+
serverInstance.StartInstance()
17+
} else {
18+
fmt.Println("Wrong arguments provided.")
19+
}
720
}

‎src/game/entity/entity.go

-11
This file was deleted.

‎src/game/entity/item.go

-5
This file was deleted.

‎src/game/game.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,16 @@ func (g *Game) RunPlayer() {
4949
for {
5050
action = <-g.Channel
5151
if action == "left" {
52-
g.Player[0].Pos.X -= 0.5
52+
g.Player[0].Pos.X -= 0.3
5353
}
5454
if action == "right" {
55-
g.Player[0].Pos.X += 0.5
55+
g.Player[0].Pos.X += 0.3
56+
}
57+
if action == "up" {
58+
g.Player[0].Pos.Y -= 0.3
59+
}
60+
if action == "down" {
61+
g.Player[0].Pos.Y += 0.3
5662
}
5763
}
5864
}

‎src/game/ressources/block.go

-12
This file was deleted.

‎src/game/ressources/element.go

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package ressources
2+
3+
import "github.com/hajimehoshi/ebiten/v2"
4+
5+
// A block
6+
type Element struct {
7+
Name string `json:"name"` // Name
8+
Code int `json:"code"` // Unique code
9+
X int `json:"x"` // X position in the ressourcePack
10+
Y int `json:"y"` // Y position in the ressourcePack
11+
W int `json:"w"` // Width (number of blocks taken by element going right)
12+
H int `json:"h"` // Height (number of blocks taken by element going down)
13+
Img *ebiten.Image
14+
}

‎src/game/ressources/ressources.go

+20-17
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,52 @@ import (
1212

1313
// Ressources are the description of all single ressources
1414
type Ressources struct {
15-
Blocks map[string]Block `json:"blocks"`
16-
RessourcePack *ebiten.Image
15+
Elements map[string]Element `json:"blocks"`
16+
RessourcePack *ebiten.Image
17+
BackgroundImage *ebiten.Image
1718
}
1819

1920
func New(size int) Ressources {
2021
r := Ressources{
21-
Blocks: map[string]Block{},
22-
RessourcePack: loadRessourcePack(),
22+
Elements: map[string]Element{},
23+
RessourcePack: loadImage("data/ressources/defaultRessourcePack.png"),
24+
BackgroundImage: loadImage("data/ressources/defaultBackground.png"),
2325
}
2426

25-
r.loadRessources(size)
27+
r.loadElements(size)
2628

2729
return r
2830
}
2931

30-
func loadRessourcePack() *ebiten.Image {
31-
img, _, err := ebitenutil.NewImageFromFile("data/ressources/defaultRessourcePack.png")
32+
func loadImage(path string) *ebiten.Image {
33+
img, _, err := ebitenutil.NewImageFromFile(path)
3234
if err != nil {
3335
log.Println(err)
3436
}
3537
return img
3638
}
3739

38-
func (r *Ressources) loadRessources(size int) {
40+
func (r *Ressources) loadElements(size int) {
3941
data, err := os.ReadFile("data/tables/ressources.json")
4042
if err != nil {
4143
panic(err)
4244
}
4345

44-
err = json.Unmarshal(data, &r.Blocks)
46+
err = json.Unmarshal(data, &r.Elements)
4547
if err != nil {
4648
panic(err)
4749
}
4850

49-
for k := range r.Blocks {
50-
block, ok := r.Blocks[k]
51+
for k := range r.Elements {
52+
elem, ok := r.Elements[k]
5153
if ok {
52-
block.Img = r.RessourcePack.SubImage(image.Rect(
53-
size*r.Blocks[k].X,
54-
size*r.Blocks[k].Y,
55-
size*(r.Blocks[k].X+1),
56-
size*(r.Blocks[k].Y+1))).(*ebiten.Image)
57-
r.Blocks[k] = block
54+
elem.Img = r.RessourcePack.SubImage(image.Rect(
55+
size*elem.X,
56+
size*elem.Y,
57+
size*elem.X+size*elem.W,
58+
size*elem.Y+size*elem.H)).(*ebiten.Image)
59+
60+
r.Elements[k] = elem
5861
}
5962
}
6063
}

‎src/instance/gameWindow/gameWindow.go

-59
This file was deleted.

0 commit comments

Comments
 (0)