From 7fc31940798dc270c6721959e94c8f70eab4d3b1 Mon Sep 17 00:00:00 2001 From: GammelJAN Date: Tue, 12 May 2020 10:23:01 +0200 Subject: [PATCH] lololol --- core/assets/sprites/firewizard.png | Bin 0 -> 24580 bytes core/assets/sprites/potion.png | Bin 1557 -> 1235 bytes .../dungeoncrawler/control/Controller.java | 4 ++-- .../model/DungeonGenerator.java | 7 ++++--- .../com/dungeoncrawler/view/EntitySprite.java | 2 ++ .../com/dungeoncrawler/view/MapGenerator.java | 14 ++++++++++---- .../desktop/DesktopLauncher.java | 2 +- 7 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 core/assets/sprites/firewizard.png diff --git a/core/assets/sprites/firewizard.png b/core/assets/sprites/firewizard.png new file mode 100644 index 0000000000000000000000000000000000000000..b908b5706bbf633912feb5155c21dadfd132a87f GIT binary patch literal 24580 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 literal 0 HcmV?d00001 diff --git a/core/assets/sprites/potion.png b/core/assets/sprites/potion.png index d7f9da1ce4a0f6eaca2201e25c13c6b1135ae1b4..f5a0c27a5089078314bbc1e4a3f9e8e084b343a3 100644 GIT binary patch delta 1153 zcmV-{1b+LK4ATjaB!7fyLqkwWLqi~Na&Km7Y-IodD3N`UJxIeq9K~N#ON&$->>#3$ zp*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rj(Mi!oO8j3^ zXc6PVaX;SOd)&PPgl3hgX3qqmYL<~s#Kl~GRSdo&fG|SvV}C?qrk>0!X5l%$?&0I> zU5saWpZjz4DFu@OK9P8i>4rtTK|Hf*>74h8Bdjbb#OK8023?T&k?XR{Z=6dG3p_Jo zWYhD+5n{2_#c~(3vY`@B6Gs(QqkJLfvch?bvs$gQ_C5Iv!v$?6!*!a&NMH#`q#!~@ z9TikzAx5i4ihqeT?Z-X*LykX1E}2{vFmf!Q1{IRy2mgcL-I~RzNjE7R2Ldm){V@sz zcY#*Jw!e>UyLAHipMfi_SO_S^aCw~H~NklbqlX^S)i#Tz*jv_uwsqZgD3O0QN5xOfQUFUyrNZHcTA>|)X;O5Fq3a`B% zHUwj5k7A#M1nb3qGw;pp0DyyogM)*Eg988njISm@f7S|c&KF;AK2GYctzx`Y@##T+9?R7-nJ8& znNAyhC(SZF2m}ZQgV`vK*KKQ{*OdJ4hlk^d@3PW5dGn_B%{HC zAb(X!k}mvn@OhXd3H|o~@`s~BSS3^xC+Y-Al}iMJ;yr<}$3_5E)>RjvvIj|DB!w`7 zuo77e0HJCNBJnyLr`ma>y|jq$Em(*Q$*Jt?vOY-K2$d+bq9tiLu%tjfQ5vMm1fo&Z zYOrW1LYg|FjfNI$fOJpq^*`>Z50vT<*nexI004JSk4vqosM%HqHm&oJQ4lECM)SDw z{NH+<=A19SUw@jEL@QlIU8CxWtkjS(T1QqawB2qe+GtP`CB-7DT}VF%#Je(vwW@2;af-riZ=Ke^$i(r#ehz}6*3+rx&SLi2Lp-up#HJFAu|`!s z(;GflyAd2D|9%S8r~v>__XA}p0uE34+r-u%TTRD+=&TfI5KsgT4h{|u4jtkzkjya) T>}0#W00000NkvXXu0mjfvvL(k delta 1505 zcmV<71s?j-36%_xB!7izLqkwWLqi~Na&Km7Y-IodD3N`UJxIe)6opSyOGT;Z7c=mzuY2mH zx{LBG@4i2)SIL_U@QK88OgAjz4dR(iOXs{#9A+g+AwDM_H|T=Ik6f2se&bwpSm2pq zBa@mZ4ik&T4wgHZl?;`5nmD4U8s!UFmle)ioYhK=weHDZ7|LraX|B^6K^#j+APEsN zYAB-u3sKrNQh!XO=sf1(A9nmna>?W>gOOtaRj800KlmT~o~>D!nsk#wF(B|_+aIGq za2IISZTtJ!wwot_{~5T_+Wu+-nEfQZ-qs>VK>s#yaoyJBJ>YT&7<|$tLvkcPEul~V z-p}Zpa=^eX(6i>wt#yvm2OvYUTD}1e4uP>EWv_d@yGy%sZvXbQ=Jx{_gK~rQ(j}$< z000JJOGiWi&H&B;&Pa>7H~;_u32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rf1py8m zHH!zYRg>!hCw~L%NklB*L=5<-0Cuq+3)%@_y)u_3$d)f&AbFnmW55Fd95(^q1hfx+v&Nmy zG+X-FhylMdfHr}bi_nm7M;%hxj{zT)kY&FW&;YPlueW%Sy_%IRm)CWq6U;zS6nD>~ z(EwUni`B}2RroTQ7`Z zs{@IEpqJguyWQ@)*y|mKK%AYPHqf_0R=(OG6!2aI^(UL-kW+Ytrxqatg~C)&(u~_Z zh?{+6gY{Iw5^{oL&Lm0K8{MRVgcwbzoVb)1 z`KsVq;~B9*5etG8dks5A9UIjOjj_msEPv&|ok%c`SYfO3oLFrbF&RjbWO()PFx$Ei z1l$K*c_VijX;HCbWND%I`(?lrH&$p~I2D2~1q8pD$u3M#J?u4iAqk!hTuye#_jE*I zJgBfQyK`;z=m8{2GQ4_xm~Cy2{HzcwL|G5KNP*eE_W`p^^L_6ot0kYXglxwo@PC^Y zR?T4~5~md?`sZ&bpPhGPw;wJBPIpF7W*9!_E6quc)^Y$e+bh^l8`nT7B~&^ouLDHI zkw|#Glo6Xs8%if`lyF7}Qi_aRIXD(;=OUqZuh&$HAl*BFO<#DNsq>CE@EK4De(@t# zg6(C^*^jQAJkOs20G`I$$L-L3+Ij|L5M?$Tml2JRWP?NKWkJ^8CIIaT+S8};xhEg { frames[1]++; } + System.out.println(die); + sprites[0].setRegion(regions[0][0][frames[1]]); updateFlip(); } diff --git a/core/src/com/dungeoncrawler/view/MapGenerator.java b/core/src/com/dungeoncrawler/view/MapGenerator.java index c6d0669..cb84458 100644 --- a/core/src/com/dungeoncrawler/view/MapGenerator.java +++ b/core/src/com/dungeoncrawler/view/MapGenerator.java @@ -27,8 +27,9 @@ public class MapGenerator { TextureRegion[][][] allTiles; TextureRegion[][] splitTiles; Texture torchT; - Texture sword; + Texture amulet; Texture key; + Texture potion; public MapGenerator(Texture[] tiles){ allTiles = new TextureRegion[7][][]; @@ -37,8 +38,9 @@ public class MapGenerator { allTiles[i] = TextureRegion.split(tiles[i], 48, 48); } torchT = new Texture("sprites/torch.png"); - sword = new Texture("sprites/amulet.png"); + amulet = new Texture("sprites/amulet.png"); key = new Texture("sprites/key.png"); + potion = new Texture("sprites/potion.png"); } public Map generateMap(Dungeon d){ @@ -333,9 +335,13 @@ public class MapGenerator { case 0: itemSprite = new AnimatedObject(key, 48, 48); break; - + + case 1: + itemSprite = new AnimatedObject(potion, 48, 48); + break; + case 2: - itemSprite = new AnimatedObject(sword, 48, 48); + itemSprite = new AnimatedObject(amulet, 48, 48); break; } diff --git a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java index a4ee41e..9a956a0 100644 --- a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java +++ b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java @@ -17,4 +17,4 @@ public class DesktopLauncher { //config.addIcon("logo.png", Files.FileType.Internale); new LwjglApplication(new Controller(), config); } -} +} \ No newline at end of file