From cc616d4085f042bffaa91f1d4baca343b5a07496 Mon Sep 17 00:00:00 2001 From: xolatile Date: Thu, 6 Jun 2024 02:42:07 -0400 Subject: [PATCH] Added crossbow and pickaxe... --- game/equipment/main_hand/light_crossbow.png | Bin 0 -> 741 bytes game/equipment/main_hand/pickaxe.png | Bin 0 -> 581 bytes source/equipment.ads | 4 +++- source/unit.ads | 32 +++++++++++++++------------- 4 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 game/equipment/main_hand/light_crossbow.png create mode 100644 game/equipment/main_hand/pickaxe.png diff --git a/game/equipment/main_hand/light_crossbow.png b/game/equipment/main_hand/light_crossbow.png new file mode 100644 index 0000000000000000000000000000000000000000..f807896de1ea677c3f136e325fadb02048e12bc9 GIT binary patch literal 741 zcmVRJFc5@WE+;?=lfn{$VsHrF6chp}oMTZ4Tndu{ zA?SXvezC}4BwpwKsGzwqiJ_Mks@1&_y40NMchC`NlMBE1RsrayFpNOAwu2Ji}_s>UmfJy-Aw zBTz`=pN7?5^@rH-xr$@MDt3NvdJ`K)vEV}&uy_3^L?opA^z24d_0x8 z^UvxBq&8rQ{8{~g)CR1P|JXO5{yn8sD1fS}f^*JT(Qpl@nLBXl{Mr40R6}Fw{7)U= z6{hX6{@~8J(Knqb4OlyWmie?5gzix6o;|%C$qL8K|_QPLI@#*5JCtcgb+dq z`AmA3hU&TwWm%fKu7f+3NLin+>pB2{JC*l0#X?mv=hFJv7}5HG^H;lclv=NU`EDEj zxay0>17ct5bJYe+dS1YtN=N}*zRTo#{qvt1u@N95P}QjR-KF&@F|yVN^y<9_@VpXh z;e#!3Yy42|^H1Kkk@4J9uK#6;Opbbe?;P-x902^qVMyOS=bSTDRfRFySd7^9N9*mS z04{&u?|_tg{T#LaS)LaVkzlP2v1Q~n>-BRiZI6nyd zq;mNs&4}DFCi?+vnGtiuc-Id&JPK3m{I?S09Y5eORhYw!$Q@(K^9E*XX2cR3Ac#nq z^u*a>W(2(oLI@#*Y{3s$d;fsB+4TMai+8}<`v+`d1gyP(z|w4X|A19SfLEAT)6w?Z zANSaKswZ%r@pbPV*W;n7@K}BJ`E)i?;H2&Uz!rqRxL9`>@(XVm?8e>Q-H3I$t Xdo?ZMp}2cW00000NkvXXu0mjf2nAtT literal 0 HcmV?d00001 diff --git a/game/equipment/main_hand/pickaxe.png b/game/equipment/main_hand/pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..3895412af457c1a84a7e218d03c7bd9baa29fae9 GIT binary patch literal 581 zcmV-L0=oT)P)Dn_091BhZHinxtut|6{?u zj}#S0kz`Bc69E7?F+=E$s=7X3Gc))0W2mvJzWUP|vWTATPagq8Ouk%IR-Hs_5t&Vf z*nI2J{&MyrI7Z!VnNRD`o(PD#TSa6NktOll@NT~qk{pkFw+8?KU>?9cfO!D(0OkSA z1DFRe4`3d^JOCi_@X;HWnjcPn?3)NCQiPLR4KWkBP8J (new string'("Spiked Staff"), main_hand, (2, 0, 0, 0, 0, 0), faction.neutral, effect.none), maul => (new string'("Maul"), main_hand, (1, 0, 0, 0, 0, 0), faction.neutral, effect.none), sledge_hammer => (new string'("Sledge Hammer"), main_hand, (2, 0, 0, 0, 0, 0), faction.neutral, effect.none), + pickaxe => (new string'("Pickaxe"), main_hand, (1, 0, 0, 0, 0, 0), faction.neutral, effect.none), + light_crossbow => (new string'("Light Crossbow"), main_hand, (2, 0, 0, 0, 0, 7), faction.neutral, effect.none), magenta_dress => (new string'("Magenta Dress"), full_body, (0, 0, 0, 0, 0, 0), faction.neutral, effect.none), lime_dress => (new string'("Lime Dress"), full_body, (0, 0, 0, 0, 0, 0), faction.neutral, effect.none), pink_dress => (new string'("Pink Dress"), full_body, (0, 0, 0, 0, 0, 0), faction.neutral, effect.none), diff --git a/source/unit.ads b/source/unit.ads index 6310a26..94d2aa5 100644 --- a/source/unit.ads +++ b/source/unit.ads @@ -64,29 +64,29 @@ package unit is dwarf_villager => (new string'("Villager"), faction.dwarf, (2, 1, 1, 1, 2, 1), 2, 1, 1, ( equipment.grey_tunic, equipment.none, equipment.none, equipment.none, equipment.none, equipment.none, equipment.club, equipment.none)), - dwarf_miner => (new string'("Miner"), faction.dwarf, (2, 1, 1, 1, 2, 1), 2, 1, 1, ( -- todo + dwarf_miner => (new string'("Miner"), faction.dwarf, (2, 1, 1, 1, 2, 1), 2, 1, 1, ( equipment.grey_tunic, equipment.none, equipment.none, equipment.fur_gauntlets, - equipment.fur_greaves, equipment.none, equipment.none, equipment.none)), - dwarf_blacksmith => (new string'("Blacksmith"), faction.dwarf, (2, 1, 1, 1, 2, 1), 3, 1, 2, ( -- todo + equipment.fur_greaves, equipment.none, equipment.pickaxe, equipment.none)), + dwarf_blacksmith => (new string'("Blacksmith"), faction.dwarf, (2, 1, 1, 1, 2, 1), 3, 1, 2, ( equipment.grey_tunic, equipment.leather_helmet, equipment.none, equipment.leather_gauntlets, equipment.leather_greaves, equipment.none, equipment.sledge_hammer, equipment.none)), - dwarf_hunter => (new string'("Hunter"), faction.dwarf, (2, 1, 1, 1, 2, 1), 3, 2, 2, ( -- todo + dwarf_hunter => (new string'("Hunter"), faction.dwarf, (2, 1, 1, 1, 2, 1), 3, 2, 2, ( equipment.grey_tunic, equipment.none, equipment.leather_chestplate, equipment.fur_gauntlets, equipment.fur_greaves, equipment.none, equipment.wooden_bow, equipment.none)), - dwarf_bowman => (new string'("Bowman"), faction.dwarf, (2, 1, 1, 1, 2, 1), 5, 3, 2, ( -- todo + dwarf_bowman => (new string'("Bowman"), faction.dwarf, (2, 1, 1, 1, 2, 1), 5, 3, 2, ( equipment.blue_tunic, equipment.leather_helmet, equipment.iron_chestplate, equipment.none, equipment.leather_greaves, equipment.none, equipment.iron_bow, equipment.none)), - dwarf_warrior => (new string'("Warrior"), faction.dwarf, (2, 1, 1, 1, 2, 1), 7, 3, 3, ( -- todo + dwarf_warrior => (new string'("Warrior"), faction.dwarf, (2, 1, 1, 1, 2, 1), 7, 3, 3, ( equipment.blue_tunic, equipment.leather_helmet, equipment.iron_chestplate, equipment.leather_gauntlets, equipment.leather_greaves, equipment.none, equipment.iron_mace, equipment.wooden_shield)), - dwarf_axeman => (new string'("Axeman"), faction.dwarf, (2, 1, 1, 1, 2, 1), 7, 3, 3, ( -- todo + dwarf_axeman => (new string'("Axeman"), faction.dwarf, (2, 1, 1, 1, 2, 1), 7, 3, 3, ( equipment.blue_tunic, equipment.leather_helmet, equipment.iron_chestplate, equipment.leather_gauntlets, equipment.leather_greaves, equipment.none, equipment.iron_axe, equipment.wooden_shield)), - dwarf_crossbowman => (new string'("Crossbowman"), faction.dwarf, (2, 1, 1, 2, 2, 1), 7, 5, 3, ( -- todo - equipment.blue_tunic, equipment.iron_helmet, equipment.iron_chestplate, equipment.none, - equipment.leather_greaves, equipment.none, equipment.none, equipment.none)), + dwarf_crossbowman => (new string'("Crossbowman"), faction.dwarf, (2, 1, 1, 2, 2, 1), 7, 5, 3, ( + equipment.blue_tunic, equipment.iron_helmet, equipment.iron_chestplate, equipment.leather_gauntlets, + equipment.leather_greaves, equipment.none, equipment.light_crossbow, equipment.none)), dwarf_berserker => (new string'("Berserker"), faction.dwarf, (3, 2, 1, 3, 3, 1), 7, 3, 5, ( - equipment.blue_tunic, equipment.none, equipment.none, equipment.leather_gauntlets, + equipment.blue_pants, equipment.none, equipment.none, equipment.leather_gauntlets, equipment.leather_greaves, equipment.none, equipment.iron_axe, equipment.none)), dwarf_guard => (new string'("Guard"), faction.dwarf, (2, 3, 1, 3, 2, 1), 17, 5, 3, ( equipment.cyan_tunic, equipment.iron_helmet, equipment.iron_chestplate, equipment.leather_gauntlets, @@ -94,9 +94,9 @@ package unit is dwarf_elite_guard => (new string'("Elite Guard"), faction.dwarf, (3, 3, 1, 3, 2, 1), 23, 7, 2, ( equipment.cyan_tunic, equipment.mithril_helmet, equipment.mithril_chestplate, equipment.steel_gauntlets, equipment.steel_greaves, equipment.none, equipment.mithril_spear, equipment.steel_shield)), - dwarf_war_druid => (new string'("War Druid"), faction.dwarf, (1, 1, 3, 1, 1, 1), 23, 3, 0, ( -- todo - equipment.black_robe, equipment.black_hood, equipment.none, equipment.none, - equipment.none, equipment.none, equipment.staff, equipment.none)), + dwarf_war_druid => (new string'("War Druid"), faction.dwarf, (1, 1, 3, 1, 1, 1), 23, 3, 0, ( + equipment.black_robe, equipment.black_hood, equipment.mithril_chestplate, equipment.none, + equipment.none, equipment.none, equipment.staff_of_earth, equipment.none)), dwarf_pig_rider => (new string'("Pig Rider"), faction.dwarf, others => <>), -- todo dwarf_boar_rider => (new string'("Boar Rider"), faction.dwarf, others => <>), -- todo dwarf_giant_mole_rider => (new string'("Giant Mole Rider"), faction.dwarf, others => <>), -- todo @@ -104,7 +104,9 @@ package unit is dwarf_knight => (new string'("Knight"), faction.dwarf, (5, 3, 2, 3, 3, 1), 29, 7, 13, ( -- todo equipment.cyan_robe, equipment.mithril_helmet, equipment.mithril_chestplate, equipment.mithril_gauntlets, equipment.mithril_greaves, equipment.none, equipment.mithril_battleaxe, equipment.mithril_shield)), - dwarf_flag_carrier => (new string'("Flag Carrier"), faction.dwarf, others => <>) -- todo + dwarf_flag_carrier => (new string'("Flag Carrier"), faction.dwarf, (5, 3, 2, 3, 5, 1), 29, 13, 0, ( + equipment.cyan_robe, equipment.mithril_helmet, equipment.mithril_chestplate, equipment.mithril_gauntlets, + equipment.mithril_greaves, equipment.none, equipment.mithril_mace, equipment.mithril_shield)) ); base : array (faction.fairy .. faction.imp) of core.sprite;