From 372d2c1da968f1ca14572e29b69149678b1ff044 Mon Sep 17 00:00:00 2001 From: Vittorio Romeo Date: Mon, 23 Sep 2013 00:24:47 +0200 Subject: [PATCH] Asset changes --- _RELEASE/Data/Tilesets/tilesetEnemy.json | 8 -------- _RELEASE/Data/Tilesets/tilesetPlayer.json | 8 -------- _RELEASE/Data/Tilesets/tsCharSmall.json | 12 ++++++++++++ _RELEASE/Data/assets.json | 9 ++++----- _RELEASE/Data/tilesetEnemy.png | Bin 200 -> 0 bytes _RELEASE/Data/tilesetPlayer.png | Bin 287 -> 0 bytes _RELEASE/Data/tsCharSmall.png | Bin 0 -> 601 bytes include/SSVBloodshed/OBAssets.h | 6 ++---- 8 files changed, 18 insertions(+), 25 deletions(-) delete mode 100755 _RELEASE/Data/Tilesets/tilesetEnemy.json delete mode 100755 _RELEASE/Data/Tilesets/tilesetPlayer.json create mode 100755 _RELEASE/Data/Tilesets/tsCharSmall.json delete mode 100644 _RELEASE/Data/tilesetEnemy.png delete mode 100644 _RELEASE/Data/tilesetPlayer.png create mode 100644 _RELEASE/Data/tsCharSmall.png diff --git a/_RELEASE/Data/Tilesets/tilesetEnemy.json b/_RELEASE/Data/Tilesets/tilesetEnemy.json deleted file mode 100755 index 1eec966..0000000 --- a/_RELEASE/Data/Tilesets/tilesetEnemy.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "tileSize": [10, 10], - - "labels": - [ - ["standO"] - ] -} \ No newline at end of file diff --git a/_RELEASE/Data/Tilesets/tilesetPlayer.json b/_RELEASE/Data/Tilesets/tilesetPlayer.json deleted file mode 100755 index bb5fa4a..0000000 --- a/_RELEASE/Data/Tilesets/tilesetPlayer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "tileSize": [10, 10], - - "labels": - [ - ["standO", "standD", "aimO", "aimD", "gunO", "gunD"] - ] -} \ No newline at end of file diff --git a/_RELEASE/Data/Tilesets/tsCharSmall.json b/_RELEASE/Data/Tilesets/tsCharSmall.json new file mode 100755 index 0000000..88dc9c5 --- /dev/null +++ b/_RELEASE/Data/Tilesets/tsCharSmall.json @@ -0,0 +1,12 @@ +{ + "tileSize": [10, 10], + + "labels": + [ + ["p1", "p1f", "p1g"], + ["p2", "p2f", "p2g"], + ["p3", "p3f", "p3g"], + ["p4", "p4f", "p4g"], + ["e1"] + ] +} \ No newline at end of file diff --git a/_RELEASE/Data/assets.json b/_RELEASE/Data/assets.json index 993189a..ed394e1 100755 --- a/_RELEASE/Data/assets.json +++ b/_RELEASE/Data/assets.json @@ -3,13 +3,12 @@ [ "tempHud.png", "limeStroked.png", - "tileset.png", - "tilesetPlayer.png", - "tilesetProjectiles.png", - "tilesetEnemy.png", + "tileset.png", + "tilesetProjectiles.png", "tilesetEnemyBig.png", "tilesetJuggernaut.png", - "tilesetGiant.png" + "tilesetGiant.png", + "tsCharSmall.png" ], "soundBuffers": [ diff --git a/_RELEASE/Data/tilesetEnemy.png b/_RELEASE/Data/tilesetEnemy.png deleted file mode 100644 index 11682f8fb780552ef69a992d143518758906b6e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W=!3HF^gw{O+Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#E~l6OQ`_J?L zWa#mhGe5t-zyDwM%x%RvdUx7{R`)dm!NDx8`}Iv-A66tgiCcX8DjcZjJY`q?|9^k) pZ%k%a$>FG+$x#~8IprWf!$(8Mbm?_v{6GsBJYD@<);T3K0RT%&MqvN| diff --git a/_RELEASE/Data/tilesetPlayer.png b/_RELEASE/Data/tilesetPlayer.png deleted file mode 100644 index 5aa9d3d6f5d6e8c0f0d7c9bfb7fae14de8429574..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|LP) zkiRx)POjm0)!4z*p<@2=5=Ez)Q}Yf%5n*W#(^%<)k8~g#Ukw4!T1#u~*GJgGtLS7f z&oTumx^|RuAX4k{_v$Mu-G%6pUJ4w1tVVFt-mG}TrNef*)3w^k<-lr;dw&N#w6$-A li15g;Ew>DPHbN2bPDNB8 zb~7$DE-^7j^FlWO00GrWL_t(oN9~reO2j}AhT{v^SO^wY7IHQ=B3K4|1Q82C4(<`| zC9bmwXk%lgy^!`^z_YQovh@*e&9~VJNp>%nOX41e{P2_A$;|w-vqMNQAeb&x5U7Nn zF-=6FTD&6euYl2Llozyxla5fB__4-Dp}At!WHQk-`&!7HO<;yJaoQ2KFkN?WH6((F zl!gBm#o_WOJfQcu36Is;>5<=|y1YM7!m2M9?+>reHCY>TbC77=my3=dCVs53mA_or zO;J`33kWBV%(;9T5_1i?gnHfjYNSeth!OCE(s20`9?*Zh-@d5$;iJ}2sjvO+hEF~1 zsn3(bKbJE(qWGF^b4VinOhuibBblFx(Y7RJU9l^XC0ikkookSeK-P7yrV@2q-8nWH zt^xlO^Z9%`_Zvl#8jr_%s-GY4{1m}yg^2!qUpvL~U2%1&QNdvt>i;QDT~5lLj_?$} zyiK}9!R&>Ar%B@m$yN!ISnT4*8k=#^*!aXG5z1b_Z~(EgU@ORQv8F}Z=mYsvR-L&2 zpzB?-HeA7NXya{1&60O!m%$a>h6OB_OBKg)Dm*KSyMo)$!bP-ei2_$}8`?nBxA0b5 ny_Mmrf-ATUYr_@XoGSPQ3T`Wg6t3E#00000NkvXXu0mjf7ds85 literal 0 HcmV?d00001 diff --git a/include/SSVBloodshed/OBAssets.h b/include/SSVBloodshed/OBAssets.h index 995cf75..e4a7030 100644 --- a/include/SSVBloodshed/OBAssets.h +++ b/include/SSVBloodshed/OBAssets.h @@ -20,18 +20,16 @@ namespace ob ssvs::MusicPlayer musicPlayer; ssvs::Tileset& tileset; - ssvs::Tileset& tilesetPlayer; + ssvs::Tileset& tsCharSmall; ssvs::Tileset& tilesetProjectiles; - ssvs::Tileset& tilesetEnemy; ssvs::Tileset& tilesetEnemyBig; ssvs::Tileset& tilesetJuggernaut; ssvs::Tileset& tilesetGiant; inline OBAssets() : tileset(assetManager.load("ts", "Data/Tilesets/tileset.json")), - tilesetPlayer(assetManager.load("tsPlayer", "Data/Tilesets/tilesetPlayer.json")), + tsCharSmall(assetManager.load("ts", "Data/Tilesets/tsCharSmall.json")), tilesetProjectiles(assetManager.load("tsProjectiles", "Data/Tilesets/tilesetProjectiles.json")), - tilesetEnemy(assetManager.load("tsEnemy", "Data/Tilesets/tilesetEnemy.json")), tilesetEnemyBig(assetManager.load("tsEnemyBig", "Data/Tilesets/tilesetEnemyBig.json")), tilesetJuggernaut(assetManager.load("tsJuggernaut", "Data/Tilesets/tilesetJuggernaut.json")), tilesetGiant(assetManager.load("tsGiant", "Data/Tilesets/tilesetGiant.json"))