diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | graphics/items/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | graphics/items/Makefile.am | 9 | ||||
| -rw-r--r-- | graphics/sprites/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | graphics/sprites/Makefile.am | 124 |
6 files changed, 100 insertions, 72 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e60bfe30..2d2aa82f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,9 @@ ADD_SUBDIRECTORY(maps) ADD_SUBDIRECTORY(sfx) SET(FILES - equipment.xml + equipment.xml items.xml + monsters.xml ) -INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR})
\ No newline at end of file +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}) diff --git a/Makefile.am b/Makefile.am index ed080d08..e15630cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,8 @@ tmwdatadir = $(pkgdatadir)/data tmwdata_DATA = \ equipment.xml \ - items.xml + items.xml \ + monsters.xml EXTRA_DIST = \ - $(tmwdata_DATA)
\ No newline at end of file + $(tmwdata_DATA) diff --git a/graphics/items/CMakeLists.txt b/graphics/items/CMakeLists.txt index ff5f3e79..7756ed24 100644 --- a/graphics/items/CMakeLists.txt +++ b/graphics/items/CMakeLists.txt @@ -9,8 +9,10 @@ SET(FILES armor-hands-minergloves.png armor-hands-scarabarmlet.png armor-hands-wintergloves.png + armor-head-antlerhat.png armor-head-axehat.png armor-head-bandana.png + armor-head-christmastree.png armor-head-circlet.png armor-head-eyepatch.png armor-head-fancyhat.png @@ -19,6 +21,8 @@ SET(FILES armor-head-minershat.png armor-head-piratehat.png armor-head-pumpkinhelmet.png + armor-head-rangerhat.png + armor-head-santabeardhat.png armor-head-santahat.png armor-head-silkheadband.png armor-head-standardheadband.png @@ -53,6 +57,7 @@ SET(FILES generic-rawlog.png generic-redhint.png generic-redscorpionstinger.png + generic-redstocking.png generic-scorpionstinger.png generic-smallmushroom.png generic-tealhint.png @@ -128,4 +133,4 @@ SET(FILES weapon-thrown-bonedarts.png ) -INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/items)
\ No newline at end of file +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/items) diff --git a/graphics/items/Makefile.am b/graphics/items/Makefile.am index 56c3aecb..4ec02637 100644 --- a/graphics/items/Makefile.am +++ b/graphics/items/Makefile.am @@ -4,15 +4,17 @@ itemsdir = $(pkgdatadir)/data/graphics/items items_DATA = armor-chest-cottonshirt.png \ armor-chest-desertshirt.png \ armor-chest-leathershirt.png \ - armor-chest-tnecksweater.png \ - armor-chest-vnecksweater.png \ + armor-chest-tnecksweater.png \ + armor-chest-vnecksweater.png \ armor-feet-boots.png \ armor-hands-leathergloves.png \ armor-hands-minergloves.png \ armor-hands-scarabarmlet.png \ armor-hands-wintergloves.png \ + armor-head-antlerhat.png \ armor-head-axehat.png \ armor-head-bandana.png \ + armor-head-christmastree.png \ armor-head-circlet.png \ armor-head-eyepatch.png \ armor-head-fancyhat.png \ @@ -21,6 +23,8 @@ items_DATA = armor-chest-cottonshirt.png \ armor-head-minershat.png \ armor-head-piratehat.png \ armor-head-pumpkinhelmet.png \ + armor-head-rangerhat.png \ + armor-head-santabeardhat.png \ armor-head-santahat.png \ armor-head-silkheadband.png \ armor-head-standardheadband.png \ @@ -55,6 +59,7 @@ items_DATA = armor-chest-cottonshirt.png \ generic-rawlog.png \ generic-redhint.png \ generic-redscorpionstinger.png \ + generic-redstocking.png \ generic-scorpionstinger.png \ generic-smallmushroom.png \ generic-tealhint.png \ diff --git a/graphics/sprites/CMakeLists.txt b/graphics/sprites/CMakeLists.txt index 68702d43..bbdea080 100644 --- a/graphics/sprites/CMakeLists.txt +++ b/graphics/sprites/CMakeLists.txt @@ -1,8 +1,8 @@ SET(FILES - chest-leather-male.png - chest-leather-male.xml - chest-leather-female.png - chest-leather-female.xml + chest-leather-male.png + chest-leather-male.xml + chest-leather-female.png + chest-leather-female.xml chest-tnecksweater-male.png chest-tnecksweater-male.xml chest-tnecksweater-female.png @@ -11,8 +11,8 @@ SET(FILES chest-vnecksweater-male.xml chest-vnecksweater-female.png chest-vnecksweater-female.xml - emotions.png - error.png + emotions.png + error.png hairstyle1.png hairstyle1.xml hairstyle2.png @@ -27,6 +27,14 @@ SET(FILES hairstyle6.xml hairstyle7.png hairstyle7.xml + head-antlerhat.png + head-antlerhat.xml + head-christmastree.xml + head-christmastreehat.png + head-rangerhat.png + head-rangerhat.xml + head-santabeardhat.png + head-santabeardhat.xml item001.png item001.xml item002.png @@ -122,4 +130,4 @@ SET(FILES weapon-scythe.xml ) -INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprites)
\ No newline at end of file +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprites) diff --git a/graphics/sprites/Makefile.am b/graphics/sprites/Makefile.am index 466d58ea..2b066272 100644 --- a/graphics/sprites/Makefile.am +++ b/graphics/sprites/Makefile.am @@ -2,20 +2,20 @@ spritesdir = $(pkgdatadir)/data/graphics/sprites sprites_DATA = \ - chest-leather-male.png \ - chest-leather-male.xml \ + chest-leather-male.png \ + chest-leather-male.xml \ chest-leather-female.png \ chest-leather-female.xml \ - chest-tnecksweater-male.png \ - chest-tnecksweater-male.xml \ - chest-tnecksweater-female.png \ - chest-tnecksweater-female.xml \ - chest-vnecksweater-male.png \ - chest-vnecksweater-male.xml \ - chest-vnecksweater-female.png \ - chest-vnecksweater-female.xml \ + chest-tnecksweater-male.png \ + chest-tnecksweater-male.xml \ + chest-tnecksweater-female.png \ + chest-tnecksweater-female.xml \ + chest-vnecksweater-male.png \ + chest-vnecksweater-male.xml \ + chest-vnecksweater-female.png \ + chest-vnecksweater-female.xml \ emotions.png \ - error.xml \ + error.xml \ hairstyle1.png \ hairstyle1.xml \ hairstyle2.png \ @@ -30,6 +30,14 @@ sprites_DATA = \ hairstyle6.xml \ hairstyle7.png \ hairstyle7.xml \ + head-antlerhat.png \ + head-antlerhat.xml \ + head-christmastree.xml \ + head-christmastreehat.png \ + head-rangerhat.png \ + head-rangerhat.xml \ + head-santabeardhat.png \ + head-santabeardhat.xml \ item001.png \ item001.xml \ item002.png \ @@ -64,52 +72,52 @@ sprites_DATA = \ item017.xml \ item018.png \ item018.xml \ - monster-bat.png \ - monster-bat.xml \ - monster-flower.png \ - monster-flower.xml \ - monster-fluffy.png \ - monster-fluffy.xml \ - monster-ghost-pumpkin.png \ - monster-ghost-pumpkin.xml \ - monster-goblin-fire.png \ - monster-goblin-fire.xml \ - monster-maggot-giant.png \ - monster-maggot-giant.xml \ - monster-maggot.png \ - monster-maggot.xml \ - monster-mushroom-red.png \ - monster-mushroom-red.xml \ - monster-mushroom-spiky.png \ - monster-mushroom-spiky.xml \ - monster-pinkie.png \ - monster-pinkie.xml \ - monster-scorpion-black.png \ - monster-scorpion-black.xml \ - monster-scorpion-red.png \ - monster-scorpion-red.xml \ - monster-scorpion.png \ - monster-scorpion.xml \ - monster-skull-fire.png \ - monster-skull-fire.xml \ - monster-skull-poison.png \ - monster-skull-poison.xml \ - monster-slime-green.png \ - monster-slime-green.xml \ - monster-slime-red.png \ - monster-slime-red.xml \ - monster-slime-rudolph.png \ - monster-slime-rudolph.xml \ - monster-slime-santa.png \ - monster-slime-santa.xml \ - monster-slime-yellow.png \ - monster-slime-yellow.xml \ - monster-snake-cave.png \ - monster-snake-cave.xml \ - monster-snake.png \ - monster-snake.xml \ - monster-spider.png \ - monster-spider.xml \ + monster-bat.png \ + monster-bat.xml \ + monster-flower.png \ + monster-flower.xml \ + monster-fluffy.png \ + monster-fluffy.xml \ + monster-ghost-pumpkin.png \ + monster-ghost-pumpkin.xml \ + monster-goblin-fire.png \ + monster-goblin-fire.xml \ + monster-maggot-giant.png \ + monster-maggot-giant.xml \ + monster-maggot.png \ + monster-maggot.xml \ + monster-mushroom-red.png \ + monster-mushroom-red.xml \ + monster-mushroom-spiky.png \ + monster-mushroom-spiky.xml \ + monster-pinkie.png \ + monster-pinkie.xml \ + monster-scorpion-black.png \ + monster-scorpion-black.xml \ + monster-scorpion-red.png \ + monster-scorpion-red.xml \ + monster-scorpion.png \ + monster-scorpion.xml \ + monster-skull-fire.png \ + monster-skull-fire.xml \ + monster-skull-poison.png \ + monster-skull-poison.xml \ + monster-slime-green.png \ + monster-slime-green.xml \ + monster-slime-red.png \ + monster-slime-red.xml \ + monster-slime-rudolph.png \ + monster-slime-rudolph.xml \ + monster-slime-santa.png \ + monster-slime-santa.xml \ + monster-slime-yellow.png \ + monster-slime-yellow.xml \ + monster-snake-cave.png \ + monster-snake-cave.xml \ + monster-snake.png \ + monster-snake.xml \ + monster-spider.png \ + monster-spider.xml \ npcs.png \ npc.xml \ player_female_base.png \ @@ -125,4 +133,4 @@ sprites_DATA = \ weapon-scythe.xml EXTRA_DIST = \ - $(sprites_DATA)
\ No newline at end of file + $(sprites_DATA) |