From c97a46477c5ae23c963f4c41658a7734dfbd9acc Mon Sep 17 00:00:00 2001 From: lofcz Date: Sat, 31 Dec 2016 01:29:30 +0100 Subject: [PATCH] =?UTF-8?q?P=C5=99id=C3=A1ny=20collectibles=20-=20=C5=A0?= =?UTF-8?q?=C3=ADpy=20odpadluj=C3=AD=20v=C3=BDbu=C5=A1n=C3=A9=20sudy=20-?= =?UTF-8?q?=20P=C5=99id=C3=A1n=20tr=C3=A9ninkov=C3=BD=20pan=C3=A1k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Engine source/Configs/Default.config.gmx | 6 +- .../Engine source/DragonRise3.project.gmx | 22 ++- .../objects/oBarrelExplosive.object.gmx | 27 ++++ .../objects/oCollectibleItem1Kvejk.object.gmx | 49 +++++++ .../objects/oCombatDummy.object.gmx | 129 ++++++++++++++++++ .../objects/oStatusMenu.object.gmx | 124 ++++++++++++++++- ...k.object.gmx => parCollectible.object.gmx} | 18 +-- .../Engine source/rooms/mapTest.room.gmx | 18 +-- .../Engine source/scripts/inventoryDraw.gml | 2 +- .../Engine source/scripts/plainInitEnums.gml | 5 + .../Engine source/scripts/scrArray2DTo1D.gml | 12 ++ .../scripts/scrCollectibleDefine.gml | 19 +++ .../scripts/scrCollectibleUnlock.gml | 10 ++ .../scripts/scrItemCollectibleSetUp.gml | 21 +++ .../sprites/images/sCombatDummy_0.png | Bin 0 -> 1708 bytes .../sprites/images/sCombatDummy_1.png | Bin 0 -> 1700 bytes .../sprites/images/sCombatDummy_2.png | Bin 0 -> 1257 bytes .../sprites/images/sCombatDummy_3.png | Bin 0 -> 1585 bytes .../sprites/images/sCombatDummy_4.png | Bin 0 -> 1763 bytes .../sprites/images/sInventoryTitle_0.png | Bin 1530 -> 1313 bytes .../sprites/images/sInventoryTitle_4.png | Bin 0 -> 1378 bytes .../sprites/sCombatDummy.sprite.gmx | 29 ++++ .../sprites/sInventoryTitle.sprite.gmx | 1 + .../sprites/sprite270.sprite.gmx | 23 ---- 24 files changed, 460 insertions(+), 55 deletions(-) create mode 100644 SimplexRPGEngine/Engine source/objects/oCollectibleItem1Kvejk.object.gmx create mode 100644 SimplexRPGEngine/Engine source/objects/oCombatDummy.object.gmx rename SimplexRPGEngine/Engine source/objects/{oCollectible1Kvejk.object.gmx => parCollectible.object.gmx} (87%) create mode 100644 SimplexRPGEngine/Engine source/scripts/scrArray2DTo1D.gml create mode 100644 SimplexRPGEngine/Engine source/scripts/scrCollectibleDefine.gml create mode 100644 SimplexRPGEngine/Engine source/scripts/scrCollectibleUnlock.gml create mode 100644 SimplexRPGEngine/Engine source/scripts/scrItemCollectibleSetUp.gml create mode 100644 SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_0.png create mode 100644 SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_1.png create mode 100644 SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_2.png create mode 100644 SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_3.png create mode 100644 SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_4.png create mode 100644 SimplexRPGEngine/Engine source/sprites/images/sInventoryTitle_4.png create mode 100644 SimplexRPGEngine/Engine source/sprites/sCombatDummy.sprite.gmx delete mode 100644 SimplexRPGEngine/Engine source/sprites/sprite270.sprite.gmx diff --git a/SimplexRPGEngine/Engine source/Configs/Default.config.gmx b/SimplexRPGEngine/Engine source/Configs/Default.config.gmx index 683cf368..2dbf2521 100644 --- a/SimplexRPGEngine/Engine source/Configs/Default.config.gmx +++ b/SimplexRPGEngine/Engine source/Configs/Default.config.gmx @@ -435,7 +435,7 @@ 1 True false - 2147483648 + 0 2 0 <none> @@ -485,7 +485,7 @@ True False 100 - 1 + 6 SimplexTeam 2015 Matěj Štágl @@ -561,7 +561,7 @@ Configs\Default\WindowsUAP\logos\WideLogo.scale-100.png clBlack False - 1 + 6 SimplexTeam 2015 Matěj Štágl True diff --git a/SimplexRPGEngine/Engine source/DragonRise3.project.gmx b/SimplexRPGEngine/Engine source/DragonRise3.project.gmx index c054d4c9..8c1dceb7 100644 --- a/SimplexRPGEngine/Engine source/DragonRise3.project.gmx +++ b/SimplexRPGEngine/Engine source/DragonRise3.project.gmx @@ -366,6 +366,9 @@ sprites\sButterfly sprites\sRat + + sprites\sCombatDummy + @@ -741,7 +744,6 @@ sprites\sBarrel sprites\sprite244 sprites\sEmoticons - sprites\sprite270 sprites\sprite272 sprites\sSpawner sprites\sArrow @@ -855,6 +857,7 @@ + @@ -974,6 +977,7 @@ + @@ -1203,6 +1207,10 @@ + + + + @@ -1268,9 +1276,13 @@ objects\oEnemySlime objects\oSlimePart - objects\oEnemyImp + + objects\oEnemyImp + + + objects\oCombatDummy + objects\parEnemy - objects\oEnemySpawner objects\oTestNPC @@ -1549,7 +1561,8 @@ - objects\oCollectible1Kvejk + objects\oCollectibleItem1Kvejk + objects\parCollectible @@ -1568,6 +1581,7 @@ objects\oTeleport objects\oFence objects\oAltar + objects\oEnemySpawner objects\oChest diff --git a/SimplexRPGEngine/Engine source/objects/oBarrelExplosive.object.gmx b/SimplexRPGEngine/Engine source/objects/oBarrelExplosive.object.gmx index 0b203b1b..0ac34215 100644 --- a/SimplexRPGEngine/Engine source/objects/oBarrelExplosive.object.gmx +++ b/SimplexRPGEngine/Engine source/objects/oBarrelExplosive.object.gmx @@ -56,6 +56,33 @@ saveTimerMax = saveTimer; /// Free memory part_system_destroy(Sname); + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// Explode + +hp = 0; +scrGoreExplodeDropShards(irandom_range(3, 5), 8); + diff --git a/SimplexRPGEngine/Engine source/objects/oCollectibleItem1Kvejk.object.gmx b/SimplexRPGEngine/Engine source/objects/oCollectibleItem1Kvejk.object.gmx new file mode 100644 index 00000000..52f7b503 --- /dev/null +++ b/SimplexRPGEngine/Engine source/objects/oCollectibleItem1Kvejk.object.gmx @@ -0,0 +1,49 @@ + + + sRelic1 + 0 + -1 + 0 + 0 + parCollectible + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// Set up + +scrItemCollectibleSetUp(itemEnum.itemCollectible1, 0, collectibleEnum.item); + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/SimplexRPGEngine/Engine source/objects/oCombatDummy.object.gmx b/SimplexRPGEngine/Engine source/objects/oCombatDummy.object.gmx new file mode 100644 index 00000000..1a46ad2d --- /dev/null +++ b/SimplexRPGEngine/Engine source/objects/oCombatDummy.object.gmx @@ -0,0 +1,129 @@ + + + sCombatDummy + 0 + -1 + -20 + 0 + parSolid + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// Set up + +event_inherited(); +image_speed = 0; +hit = false; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// Hit + +hit = true; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// Stop animation + +hit = false; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// Draw self + +if (hit) {image_speed = 0.3;} +else {image_speed = 0;} + +draw_self(); + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/SimplexRPGEngine/Engine source/objects/oStatusMenu.object.gmx b/SimplexRPGEngine/Engine source/objects/oStatusMenu.object.gmx index 7873f431..66ac08f3 100644 --- a/SimplexRPGEngine/Engine source/objects/oStatusMenu.object.gmx +++ b/SimplexRPGEngine/Engine source/objects/oStatusMenu.object.gmx @@ -42,8 +42,10 @@ prevHit = 0; prevHit2 = 0; push = 0; pushValue = 0; - - +lastIndexOver = 0; +indexAlpha = 0; +textAlpha = 0; +drawMode = 0; skillIndexName[1] = "Řemesla"; skillIndexName[2] = "Výřečnost"; @@ -51,6 +53,14 @@ skillIndexName[3] = "Čarodějnictví"; skillIndexName[4] = "Zlodějina"; skillIndexName[5] = "Zbraně"; +cName[0] = "Předměty"; +cName[1] = "Knihy"; +cName[2] = "Fragmenty minulosti"; +cName[3] = "Ocenění"; + +cNameSelected = 0; + + xoffset = 10; yoffset = 0; @@ -63,7 +73,17 @@ for(i = 0; i < celkem_vlastnosti; i++) incHealth = 5; incMana = 3; -drawMode = 0; + +for (var j = 0; j < 4; j++) + { + for (var i = 0; i < 40; i++) + { + collectibleUnlocked[j, i] = false; + collectibleIndex[j, i] = 86; + collectibleCaption[j, i] = ""; + } + } +scrCollectibleDefine(collectibleEnum.item, 0, "Kvejkova soška", "Vzpomínka na všumělce, který stál u zrodu Simplexu. Kvejk je programátor, herní designer, hudební skladatel a bůh ví, co ještě.", "bonusové zlato +1%"); @@ -214,6 +234,9 @@ alg(); c1 = c_white; c2 = c_white; +c3 = c_white; +t = "[Sbírka]"; +if (drawMode == 1) {t = "[-> Sbírka]";} if (mouse_in(view_xview + 400 - (sW / 2) - string_width("< Magie") - 16, view_xview + 400 - (sW / 2) - 16, view_yview + 10, view_yview + 24)) { @@ -242,10 +265,24 @@ if (mouse_in(view_xview + 400 + (sW / 2) + 16, view_xview + 400 + (sW / 2) + 16 } } +if (mouse_in(view_xview + 730, view_xview + 730 + string_width(t), view_yview + 10, view_yview + 24)) + { + c3 = c_lime; + + if (mouse_check_button_pressed(mb_left)) + { + if (drawMode == 0) {drawMode = 1;} + else {drawMode = 0;} + } + } clr(c1, -1); draw_text(view_xview + 400 - (sW / 2) - string_width("< Magie") - 16, view_yview + 4, "< Magie"); clr(c2, -1); draw_text(view_xview + 400 + (sW / 2) + 16, view_yview + 4, "Talenty >"); +clr(c3, -1); +alg("center", fntPixelSmall); +draw_text(view_xview + 750, view_yview + 15, t); +alg(); clr(c_white, -1); fnt(); @@ -531,6 +568,87 @@ draw_text_colored(xx + xoffset, yy + yoffset + 96, "Šance na kritický úder: " fnt(fntPixelSmall); draw_text_colored(xx + xoffset + 16, yy + yoffset + 128, "- Kritické poškození: " + string(round(oPlayer.vlastnost[vlastnost_kriticka_nasobic] * 100)) + "%"); fnt(); } +if (drawMode == 1) + { + xx = view_xview + 160; + yy = view_yview + 128; + indexOver = -1; + + // Navigation + for (var i = 0; i < array_length_1d(cName); i++) + { + var text = cName[i]; + var color = c_white; + + if (cNameSelected == i) {text = "> " + cName[i]; color = c_yellow;} + + clr(color, -1); + draw_text(view_xview + 10, view_yview + 30 + (i * 20), text); + } + + if (keyboard_check_pressed(vk_down)) {if (cNameSelected < array_length_1d(cName) - 1) {cNameSelected++;} else {cNameSelected = 0;} indexAlpha = 0; textAlpha = 0;} + if (keyboard_check_pressed(vk_up)) {if (cNameSelected > 0) {cNameSelected--;} else {cNameSelected = array_length_1d(cName) - 1;} indexAlpha = 0; textAlpha = 0;} + + + // Collectibles + for (var i = 0; i < 4; i++) + { + for (var j = 0; j < 10; j++) + { + var index = scrArray2DTo1D(j, i, 10); + var color = c_yellow; + + if (mouse_in(xx, xx + 32, yy, yy + 32) && collectibleUnlocked[cNameSelected, index]) + { + color = c_lime; + lastIndexOver = index; + indexOver = index; + } + + if (!collectibleUnlocked[cNameSelected, index]) + { + clr(c_gray, activatedAlpha / 3); + draw_roundrect(xx, yy, xx + 32, yy + 32, false); + clr(c_gray, activatedAlpha / 2); + draw_roundrect(xx, yy, xx + 32, yy + 32, true); + + clr(c_white, activatedAlpha / 4 * 3); + draw_text(xx + 13, yy + 5, "?"); + } + else + { + clr(color, activatedAlpha / 3); + draw_roundrect(xx, yy, xx + 32, yy + 32, false); + clr(color, activatedAlpha / 2); + draw_roundrect(xx, yy, xx + 32, yy + 32, true); + + clr(c_white, activatedAlpha); + draw_sprite(sTestItem, collectibleIndex[cNameSelected, index], xx + 18, yy + 16); + } + + xx += 48; + } + xx = view_xview + 160; + yy += 48; + } + + if (indexOver != -1) {indexAlpha = lerp(indexAlpha, 1, 0.1); if (indexAlpha > 0.2) {textAlpha = lin(textAlpha, 1, 0.05);}} + else {indexAlpha = lerp(indexAlpha, 0, 0.1); textAlpha = lerp(indexAlpha, 0, 0.1);} + + if (indexAlpha > 0.02 || textAlpha > 0.02) + { + alg("center", fntPixelHuge); + clr(c_white, min(activatedAlpha, indexAlpha)); + draw_text(view_xview + 400, view_yview + 330, collectibleCaption[cNameSelected, lastIndexOver]); + alg(); + fnt(fntPixel); + clr(c_white, min(activatedAlpha, textAlpha)); + draw_text_colored(view_xview + 20, view_yview + 360, collectibleText[cNameSelected, lastIndexOver]); + h = string_height(collectibleText[cNameSelected, lastIndexOver]); + fnt(fntPixelSmall); + draw_text_colour(view_xview + 20, view_yview + 360 + h, "Odkaz: " + collectibleFooter[cNameSelected, lastIndexOver], c_yellow, c_yellow, c_yellow, c_yellow, min(activatedAlpha, textAlpha)); + } + } } diff --git a/SimplexRPGEngine/Engine source/objects/oCollectible1Kvejk.object.gmx b/SimplexRPGEngine/Engine source/objects/parCollectible.object.gmx similarity index 87% rename from SimplexRPGEngine/Engine source/objects/oCollectible1Kvejk.object.gmx rename to SimplexRPGEngine/Engine source/objects/parCollectible.object.gmx index 2beb1dc6..6f6def3a 100644 --- a/SimplexRPGEngine/Engine source/objects/oCollectible1Kvejk.object.gmx +++ b/SimplexRPGEngine/Engine source/objects/parCollectible.object.gmx @@ -1,6 +1,6 @@ - sRelic1 + <undefined> 0 -1 0 @@ -8,7 +8,7 @@ <undefined> <undefined> - + 1 603 @@ -25,16 +25,9 @@ 1 - idd = itemEnum.itemCollectible1; -tempSpr = sprite_index; -sprite_index = sTestItem; -image_index = idd - 1; -image_speed = 0; + /// Stupid GM -itm_info_head = "[Kvejkova soška]"; -itm_stackable = false; -itm_number = 1; -itm_effect = rarity_token; +itm_info_head = "[" + oStatusMenu.collectibleCaption[type, idd2] + "]"; @@ -61,8 +54,9 @@ itm_effect = rarity_token; audio_play_sound(sndRindPickup, 0, 0); scrLog(-1, -1, -1, 0, 0.2); +scrCollectibleUnlock(type, idd2); +if (type == 0) {stateAddEntry("Nový předmět byl přidán do sbírky!", c_yellow);} instance_destroy(); - diff --git a/SimplexRPGEngine/Engine source/rooms/mapTest.room.gmx b/SimplexRPGEngine/Engine source/rooms/mapTest.room.gmx index a4127bc1..42b2f6c4 100644 --- a/SimplexRPGEngine/Engine source/rooms/mapTest.room.gmx +++ b/SimplexRPGEngine/Engine source/rooms/mapTest.room.gmx @@ -88,7 +88,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -389,8 +389,8 @@ - - + + @@ -399,8 +399,8 @@ - - + + @@ -514,7 +514,6 @@ - @@ -523,7 +522,8 @@ - + + diff --git a/SimplexRPGEngine/Engine source/scripts/inventoryDraw.gml b/SimplexRPGEngine/Engine source/scripts/inventoryDraw.gml index 58e91167..3981ef37 100644 --- a/SimplexRPGEngine/Engine source/scripts/inventoryDraw.gml +++ b/SimplexRPGEngine/Engine source/scripts/inventoryDraw.gml @@ -17,7 +17,7 @@ else {c_a = 0;} // Draw header clr(); fnt(fntPixelHuge); -draw_sprite(sInventoryTitle, 0, x, y); +draw_sprite(sInventoryTitle, 4, x, y); alg("center"); draw_text(x + 144, y + 14, inventory_title); fnt(fntPixelSmall); diff --git a/SimplexRPGEngine/Engine source/scripts/plainInitEnums.gml b/SimplexRPGEngine/Engine source/scripts/plainInitEnums.gml index 719c6394..5346fb84 100644 --- a/SimplexRPGEngine/Engine source/scripts/plainInitEnums.gml +++ b/SimplexRPGEngine/Engine source/scripts/plainInitEnums.gml @@ -60,3 +60,8 @@ enum equipmentEnum { weapon }; + +enum collectibleEnum +{ +item, book, fragment, achievement +} diff --git a/SimplexRPGEngine/Engine source/scripts/scrArray2DTo1D.gml b/SimplexRPGEngine/Engine source/scripts/scrArray2DTo1D.gml new file mode 100644 index 00000000..2bf354a9 --- /dev/null +++ b/SimplexRPGEngine/Engine source/scripts/scrArray2DTo1D.gml @@ -0,0 +1,12 @@ +/// scrArray2DTo1D(x, y, ylenght) + +var xx, yy, yl; +xx = 0; +yy = 0; +yl = 1; + +if (argument_count > 0) {xx = argument[0];} +if (argument_count > 1) {yy = argument[1];} +if (argument_count > 2) {yl = argument[2];} + +return (xx + (yy * yl)); diff --git a/SimplexRPGEngine/Engine source/scripts/scrCollectibleDefine.gml b/SimplexRPGEngine/Engine source/scripts/scrCollectibleDefine.gml new file mode 100644 index 00000000..a9c81ec7 --- /dev/null +++ b/SimplexRPGEngine/Engine source/scripts/scrCollectibleDefine.gml @@ -0,0 +1,19 @@ +/// scrCollectibleDefine(type, index, caption, body, footer) + +var i, c, b, f, t; +i = 0; +c = ""; +b = ""; +f = ""; +t = collectibleEnum.item; + +if (argument_count > 0) {t = argument[0];} +if (argument_count > 1) {i = argument[1];} +if (argument_count > 2) {c = argument[2];} +if (argument_count > 3) {b = argument[3];} +if (argument_count > 4) {f = argument[4];} + +oStatusMenu.collectibleCaption[t, i] = c; +oStatusMenu.collectibleText[t, i] = scrWordwrap(b, 700, fntPixel); +oStatusMenu.collectibleFooter[t, i] = f; + diff --git a/SimplexRPGEngine/Engine source/scripts/scrCollectibleUnlock.gml b/SimplexRPGEngine/Engine source/scripts/scrCollectibleUnlock.gml new file mode 100644 index 00000000..4bf18f3b --- /dev/null +++ b/SimplexRPGEngine/Engine source/scripts/scrCollectibleUnlock.gml @@ -0,0 +1,10 @@ +/// scrCollectibleUnlock(type, index) + +var t, i; +i = 0; +t = 0; + +if (argument_count > 0) {i = argument[0];} +if (argument_count > 1) {t = argument[1];} + +oStatusMenu.collectibleUnlocked[t, i] = true; diff --git a/SimplexRPGEngine/Engine source/scripts/scrItemCollectibleSetUp.gml b/SimplexRPGEngine/Engine source/scripts/scrItemCollectibleSetUp.gml new file mode 100644 index 00000000..1a09c6ad --- /dev/null +++ b/SimplexRPGEngine/Engine source/scripts/scrItemCollectibleSetUp.gml @@ -0,0 +1,21 @@ +/// scrItemCollectibleSetUp(itemID, collectibleID, type) + +idd = itemEnum.itemCollectible1; +idd2 = 0; +tempSpr = sprite_index; +type = 0; + +if (argument_count > 0) {idd = argument[0];} +if (argument_count > 1) {idd2 = argument[1];} +if (argument_count > 2) {type = argument[2];} + +sprite_index = sTestItem; +image_index = idd - 1; +image_speed = 0; + +itm_info_head = "" +itm_stackable = false; +itm_number = 1; +itm_effect = rarity_legendary; +alarm[0] = 1; + diff --git a/SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_0.png b/SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_0.png new file mode 100644 index 0000000000000000000000000000000000000000..3e68a5ad3c38a6c4bbc04fd8a64df76aa1d9f89c GIT binary patch literal 1708 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 literal 0 HcmV?d00001 diff --git a/SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_3.png b/SimplexRPGEngine/Engine source/sprites/images/sCombatDummy_3.png new file mode 100644 index 0000000000000000000000000000000000000000..f7cfd76232669b9e138b53932fa792f3112a06f2 GIT binary patch literal 1585 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 FV1nHcMHB!4 literal 0 HcmV?d00001 diff --git a/SimplexRPGEngine/Engine source/sprites/images/sInventoryTitle_0.png b/SimplexRPGEngine/Engine source/sprites/images/sInventoryTitle_0.png index f0ccb2a755b2d9e8a35f6ebf879242eff32163ad..d0da5980369321004f2cad203b5f1708325dfb6d 100644 GIT binary patch literal 1313 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 P00000NkvXXu0mjf_%hu! diff --git a/SimplexRPGEngine/Engine source/sprites/images/sInventoryTitle_4.png b/SimplexRPGEngine/Engine source/sprites/images/sInventoryTitle_4.png new file mode 100644 index 0000000000000000000000000000000000000000..b21dca252cd871dec75758a045cf7732f56ef92b GIT binary patch literal 1378 zcmV-o1)chdP);R~RzsWS($9XX zXg=IdV+1MYS2UbmP%@p+aOw#mid&V>5&N^mMKkM==<$Zmg##M+d1dGcs`P_ERLN0B(}Eh>G?(7@ zQzp+g^5MiL{*Z3wqrCw=O&NJY|6kpwSR2Ii_Y~XLU1&n>!J`352%-TYk9@nlqXxvk1rt1mM*~70 z`HuP5WI&^1G$7=Ww~BY&fZn44y-t2Xv2K0f(SRfb(SYpcs}`Y3-JoDwJ-gs-H6WF~ z?9T}dsLNkM%e)_2zfZjG#a+ArRE$8N^*e(ukFW&t>!I3!N>9NM2!uBJZl1F97yZD< z&g~z=+hjn{Kk1ZFB~X+L^rU>2wX5AQH^yBOx1t}bp|Api0&e*D*&{9 zn+9X=)4zxZR5b_Yb zO$MaHgBlRe1Z3hs>!Sf755c=&K#N1b7?5rOp!JbQ9)fqlfbv|e0qOiRDv#$)MkWrl zKJv&z@U9q8j^`SX_s)<3wZTK{Bab`;@2&x{Ex^Kq$M9%C$hXEX_-O0D;a%m6?=hwW zYd~xh)MPW%-QMuoR;lezgomySs11Ex-3~7J(n2$xR|f{fwxI6H2)0{Z=eGjaoxhB3 z?Rsrlf7`3wmf^W`kBjmSypIKJCS&a663=q?ljPaCSk-bV9?aS3+Vy>v>$P_#=_1 zC@KY2Z9;w=w0>i)J6~(j5&x8u%P*8%d`yo`prNUh<9$%8X;TetnoD2%S(j%i@9Xn4 zZo}9|jf<{907*qoM6N<$f^-w1$N&HU literal 0 HcmV?d00001 diff --git a/SimplexRPGEngine/Engine source/sprites/sCombatDummy.sprite.gmx b/SimplexRPGEngine/Engine source/sprites/sCombatDummy.sprite.gmx new file mode 100644 index 00000000..1cec22b1 --- /dev/null +++ b/SimplexRPGEngine/Engine source/sprites/sCombatDummy.sprite.gmx @@ -0,0 +1,29 @@ + + + 0 + 32 + 32 + 0 + 0 + -1 + 0 + 2 + 61 + 5 + 59 + 0 + 0 + + 0 + + 0 + 64 + 64 + + images\sCombatDummy_0.png + images\sCombatDummy_1.png + images\sCombatDummy_2.png + images\sCombatDummy_3.png + images\sCombatDummy_4.png + + diff --git a/SimplexRPGEngine/Engine source/sprites/sInventoryTitle.sprite.gmx b/SimplexRPGEngine/Engine source/sprites/sInventoryTitle.sprite.gmx index 7510e324..0b5f84d6 100644 --- a/SimplexRPGEngine/Engine source/sprites/sInventoryTitle.sprite.gmx +++ b/SimplexRPGEngine/Engine source/sprites/sInventoryTitle.sprite.gmx @@ -24,5 +24,6 @@ images\sInventoryTitle_1.png images\sInventoryTitle_2.png images\sInventoryTitle_3.png + images\sInventoryTitle_4.png diff --git a/SimplexRPGEngine/Engine source/sprites/sprite270.sprite.gmx b/SimplexRPGEngine/Engine source/sprites/sprite270.sprite.gmx deleted file mode 100644 index e9127f29..00000000 --- a/SimplexRPGEngine/Engine source/sprites/sprite270.sprite.gmx +++ /dev/null @@ -1,23 +0,0 @@ - - - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - 0 - - 0 - 32 - 32 - -