summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJapa Illo2012-04-10 22:26:40 +0530
committerJapa Illo2012-04-10 22:26:40 +0530
commit172145fddc69b699ae678666c465cf1dc09ea7d9 (patch)
tree27e28dbe1643f1f1106ecf03c3d15c5d89d5dfc8
parentd1c87ec273ef5c928989437379943a9a71a1d4e0 (diff)
parent667ae8fb75b6d44b112abadc08b290d7c1ded10b (diff)
downloadstonesense-172145fddc69b699ae678666c465cf1dc09ea7d9.tar.gz
stonesense-172145fddc69b699ae678666c465cf1dc09ea7d9.tar.bz2
stonesense-172145fddc69b699ae678666c465cf1dc09ea7d9.tar.xz
Merge branch 'master' of https://github.com/Caldfir/stonesense
-rw-r--r--Creatures.cpp5
-rw-r--r--GUI.cpp10
-rw-r--r--GUI.h2
-rw-r--r--UserInput.cpp4
-rw-r--r--commonTypes.h2
-rw-r--r--resources/SSJobIcons.pngbin8011 -> 0 bytes
-rw-r--r--resources/creatures/large_256/Thumbs.dbbin129536 -> 163840 bytes
-rw-r--r--resources/creatures/large_256/dwarf.pngbin113517 -> 0 bytes
-rw-r--r--resources/creatures/large_256/dwarf.xml115
-rw-r--r--resources/creatures/large_256/dwarff.pngbin0 -> 245784 bytes
-rw-r--r--resources/creatures/large_256/dwarfm.pngbin0 -> 121063 bytes
11 files changed, 124 insertions, 14 deletions
diff --git a/Creatures.cpp b/Creatures.cpp
index 82eb801..0f5226a 100644
--- a/Creatures.cpp
+++ b/Creatures.cpp
@@ -281,6 +281,7 @@ void DrawCreature(int drawx, int drawy, t_unit* creature, Block * b){
unsigned int offsety = config.show_creature_names ? al_get_font_line_height(font) : 0;
sprite->draw_world(creature->x,creature->y, creature->z, b);
+
if(statusIcons.size())
{
for(int i = 0; i < statusIcons.size(); i++)
@@ -293,11 +294,11 @@ void DrawCreature(int drawx, int drawy, t_unit* creature, Block * b){
offsety += config.show_creature_moods ? 16 : 0;
- if(config.show_creature_jobs)
+ if(config.show_creature_professions)
{
unsigned int sheetx = 16 * (creature->profession % 7);
unsigned int sheety = 16 * (creature->profession / 7);
- al_draw_bitmap_region(IMGJobSheet, sheetx, sheety, 16, 16, drawx -8 + (SPRITEWIDTH*config.scale/2), drawy - (16 + WALLHEIGHT*config.scale + offsety), 0);
+ al_draw_bitmap_region(IMGProfSheet, sheetx, sheety, 16, 16, drawx -8 + (SPRITEWIDTH*config.scale/2), drawy - (16 + WALLHEIGHT*config.scale + offsety), 0);
}
}
diff --git a/GUI.cpp b/GUI.cpp
index 2dcf372..39da953 100644
--- a/GUI.cpp
+++ b/GUI.cpp
@@ -56,7 +56,7 @@ ALLEGRO_BITMAP* IMGObjectSheet;
ALLEGRO_BITMAP* IMGCreatureSheet;
ALLEGRO_BITMAP* IMGRampSheet;
ALLEGRO_BITMAP* IMGStatusSheet;
-ALLEGRO_BITMAP* IMGJobSheet;
+ALLEGRO_BITMAP* IMGProfSheet;
ALLEGRO_BITMAP* IMGBloodSheet;
ALLEGRO_BITMAP* IMGEngFloorSheet;
ALLEGRO_BITMAP* IMGEngLeftSheet;
@@ -1047,7 +1047,7 @@ void loadGraphicsFromDisk()
if(!load_from_path(p, "creatures.png", IMGCreatureSheet)) return;
if(!load_from_path(p, "ramps.png", IMGRampSheet)) return;
if(!load_from_path(p, "SSStatusIcons.png", IMGStatusSheet)) return;
- if(!load_from_path(p, "SSJobIcons.png", IMGJobSheet)) return;
+ if(!load_from_path(p, "SSProfIcons.png", IMGProfSheet)) return;
if(!load_from_path(p, "gibs.png", IMGBloodSheet)) return;
if(!load_from_path(p, "engravings_floor.png", IMGEngFloorSheet)) return;
if(!load_from_path(p, "engravings_left.png", IMGEngLeftSheet)) return;
@@ -1082,10 +1082,10 @@ void flushImgFiles()
al_destroy_bitmap(IMGStatusSheet);
IMGStatusSheet = 0;
}
- if(IMGJobSheet)
+ if(IMGProfSheet)
{
- al_destroy_bitmap(IMGJobSheet);
- IMGJobSheet = 0;
+ al_destroy_bitmap(IMGProfSheet);
+ IMGProfSheet = 0;
}
if(IMGEngFloorSheet)
{
diff --git a/GUI.h b/GUI.h
index e531c4b..0769dd7 100644
--- a/GUI.h
+++ b/GUI.h
@@ -49,7 +49,7 @@ extern ALLEGRO_BITMAP* IMGObjectSheet;
extern ALLEGRO_BITMAP* IMGCreatureSheet;
extern ALLEGRO_BITMAP* IMGRampSheet;
extern ALLEGRO_BITMAP* IMGStatusSheet;
-extern ALLEGRO_BITMAP* IMGJobSheet;
+extern ALLEGRO_BITMAP* IMGProfSheet;
extern ALLEGRO_BITMAP* IMGBloodSheet;
extern ALLEGRO_BITMAP* IMGEngFloorSheet;
extern ALLEGRO_BITMAP* IMGEngLeftSheet;
diff --git a/UserInput.cpp b/UserInput.cpp
index 7f5f735..96c31fb 100644
--- a/UserInput.cpp
+++ b/UserInput.cpp
@@ -232,8 +232,8 @@ void doKeys(int Key)
config.show_creature_moods = !config.show_creature_moods;
timeToReloadSegment = true;
}
- if(Key == ALLEGRO_KEY_J){
- config.show_creature_jobs = !config.show_creature_jobs;
+ if(Key == ALLEGRO_KEY_P){
+ config.show_creature_professions = !config.show_creature_professions;
timeToReloadSegment = true;
}
if(Key == ALLEGRO_KEY_C){
diff --git a/commonTypes.h b/commonTypes.h
index 1b804b1..40c7c7f 100644
--- a/commonTypes.h
+++ b/commonTypes.h
@@ -190,7 +190,7 @@ typedef struct
bool dayNightCycle;
bool show_creature_moods;
- bool show_creature_jobs;
+ bool show_creature_professions;
bool transparentScreenshots;
diff --git a/resources/SSJobIcons.png b/resources/SSJobIcons.png
deleted file mode 100644
index 2bd0880..0000000
--- a/resources/SSJobIcons.png
+++ /dev/null
Binary files differ
diff --git a/resources/creatures/large_256/Thumbs.db b/resources/creatures/large_256/Thumbs.db
index 8f566ae..5822522 100644
--- a/resources/creatures/large_256/Thumbs.db
+++ b/resources/creatures/large_256/Thumbs.db
Binary files differ
diff --git a/resources/creatures/large_256/dwarf.png b/resources/creatures/large_256/dwarf.png
deleted file mode 100644
index bd906ee..0000000
--- a/resources/creatures/large_256/dwarf.png
+++ /dev/null
Binary files differ
diff --git a/resources/creatures/large_256/dwarf.xml b/resources/creatures/large_256/dwarf.xml
index 8d5c892..ae360ef 100644
--- a/resources/creatures/large_256/dwarf.xml
+++ b/resources/creatures/large_256/dwarf.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<creatures>
-<creature gameID="DWARF" file="dwarf.png" >
+<creature gameID="DWARF" >
- <variant special="Military" >
+ <variant special="Military" sex="M" file="dwarfm.png" >
<!--rear pieces for shadowing between legs-->
<subsprite sheetIndex="148" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CAPE" color="equipment"/>
@@ -57,7 +57,116 @@
<subsprite sheetIndex="3" zoom="3" />
</variant>
- <variant special="Normal">
+ <variant special="Military" sex="F" file="dwarff.png" >
+
+ <!--rear pieces for shadowing between legs-->
+ <subsprite sheetIndex="148" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CAPE" color="equipment"/>
+ <subsprite sheetIndex="151" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CLOAK" color="equipment"/>
+
+ <subsprite sheetIndex="1" zoom="3" color="bodypart" bodypart="skin" />
+
+ <!--all the body clothes-->
+ <subsprite sheetIndex="80" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_THONG" color="equipment"/>
+ <subsprite sheetIndex="81" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_LEGGINGS" color="equipment"/>
+ <subsprite sheetIndex="20" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_SOCKS" color="equipment"/>
+ <subsprite sheetIndex="41" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_CHAUSSE" color="equipment"/>
+ <subsprite sheetIndex="22" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_SANDAL" color="equipment"/>
+ <subsprite sheetIndex="23" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_SHOES" color="equipment"/>
+ <subsprite sheetIndex="24" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_BOOTS_LOW" color="equipment"/>
+ <subsprite sheetIndex="45" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_BOOTS" color="equipment"/>
+ <subsprite sheetIndex="82" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_BRAIES" color="equipment"/>
+ <subsprite sheetIndex="83" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_PANTS" color="equipment"/>
+ <subsprite sheetIndex="84" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_LOINCLOTH" color="equipment"/>
+ <subsprite sheetIndex="65" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_GREAVES" color="equipment"/>
+ <subsprite sheetIndex="86" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_SKIRT_SHORT" color="equipment"/>
+ <subsprite sheetIndex="87" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_SKIRT" color="equipment"/>
+ <subsprite sheetIndex="88" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_SKIRT_LONG" color="equipment"/>
+ <subsprite sheetIndex="120" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_SHIRT" color="equipment"/>
+ <subsprite sheetIndex="121" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_VEST" color="equipment"/>
+ <subsprite sheetIndex="122" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_DRESS" color="equipment"/>
+ <subsprite sheetIndex="123" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_MAIL_SHIRT" color="equipment"/>
+ <subsprite sheetIndex="160" zoom="3" equipment_class="GLOVES" equipment_name="ITEM_GLOVES_GLOVES" color="equipment"/>
+ <subsprite sheetIndex="161" zoom="3" equipment_class="GLOVES" equipment_name="ITEM_GLOVES_MITTENS" color="equipment"/>
+ <subsprite sheetIndex="124" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_TUNIC" color="equipment"/>
+ <subsprite sheetIndex="125" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_TOGA" color="equipment"/>
+ <subsprite sheetIndex="126" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_LEATHER" color="equipment"/>
+ <subsprite sheetIndex="127" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_BREASTPLATE" color="equipment"/>
+ <subsprite sheetIndex="128" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CAPE" color="equipment"/>
+ <subsprite sheetIndex="129" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_COAT" color="equipment"/>
+ <subsprite sheetIndex="162" zoom="3" equipment_class="GLOVES" equipment_name="ITEM_GLOVES_GAUNTLETS" color="equipment"/>
+ <subsprite sheetIndex="130" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_ROBE" color="equipment"/>
+ <subsprite sheetIndex="131" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CLOAK" color="equipment"/>
+
+ <!--beard goes here - on top of clothes but below hats-->
+ <!--subsprite sheetIndex="2" zoom="3" color="bodypart" bodypart="hair" /-->
+
+ <!--subsprite sheetIndex="100" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_VEIL_HEAD" color="equipment"/-->
+ <!--subsprite sheetIndex="101" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_VEIL_FACE" color="equipment"/-->
+ <subsprite sheetIndex="182" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_SCARF_HEAD" color="equipment"/>
+ <subsprite sheetIndex="183" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_CAP" color="equipment"/>
+ <subsprite sheetIndex="184" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_MASK" color="equipment"/>
+ <!--subsprite sheetIndex="107" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_TURBAN" color="equipment"/-->
+ <subsprite sheetIndex="185" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_HELM" color="equipment"/>
+ <subsprite sheetIndex="186" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_HOOD" color="equipment"/>
+
+ <subsprite sheetIndex="3" zoom="3" />
+ </variant>
+
+ <variant special="Normal" sex="M" file="dwarfm.png" >
+ <!--rear pieces for shadowing between legs-->
+ <subsprite sheetIndex="148" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CAPE" color="equipment"/>
+ <subsprite sheetIndex="151" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CLOAK" color="equipment"/>
+
+ <subsprite sheetIndex="0" zoom="3" color="bodypart" bodypart="skin" />
+
+ <!--all the body clothes-->
+ <subsprite sheetIndex="60" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_THONG" color="equipment"/>
+ <subsprite sheetIndex="61" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_LEGGINGS" color="equipment"/>
+ <subsprite sheetIndex="20" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_SOCKS" color="equipment"/>
+ <subsprite sheetIndex="21" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_CHAUSSE" color="equipment"/>
+ <subsprite sheetIndex="22" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_SANDAL" color="equipment"/>
+ <subsprite sheetIndex="23" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_SHOES" color="equipment"/>
+ <subsprite sheetIndex="24" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_BOOTS_LOW" color="equipment"/>
+ <subsprite sheetIndex="25" zoom="3" equipment_class="SHOES" equipment_name="ITEM_SHOES_BOOTS" color="equipment"/>
+ <subsprite sheetIndex="62" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_BRAIES" color="equipment"/>
+ <subsprite sheetIndex="63" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_PANTS" color="equipment"/>
+ <subsprite sheetIndex="64" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_LOINCLOTH" color="equipment"/>
+ <subsprite sheetIndex="65" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_GREAVES" color="equipment"/>
+ <subsprite sheetIndex="66" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_SKIRT_SHORT" color="equipment"/>
+ <subsprite sheetIndex="67" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_SKIRT" color="equipment"/>
+ <subsprite sheetIndex="68" zoom="3" equipment_class="PANTS" equipment_name="ITEM_PANTS_SKIRT_LONG" color="equipment"/>
+ <subsprite sheetIndex="100" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_SHIRT" color="equipment"/>
+ <subsprite sheetIndex="101" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_VEST" color="equipment"/>
+ <subsprite sheetIndex="102" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_DRESS" color="equipment"/>
+ <subsprite sheetIndex="103" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_MAIL_SHIRT" color="equipment"/>
+ <subsprite sheetIndex="140" zoom="3" equipment_class="GLOVES" equipment_name="ITEM_GLOVES_GLOVES" color="equipment"/>
+ <subsprite sheetIndex="141" zoom="3" equipment_class="GLOVES" equipment_name="ITEM_GLOVES_MITTENS" color="equipment"/>
+ <subsprite sheetIndex="104" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_TUNIC" color="equipment"/>
+ <subsprite sheetIndex="105" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_TOGA" color="equipment"/>
+ <subsprite sheetIndex="106" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_LEATHER" color="equipment"/>
+ <subsprite sheetIndex="107" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_BREASTPLATE" color="equipment"/>
+ <subsprite sheetIndex="108" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CAPE" color="equipment"/>
+ <subsprite sheetIndex="109" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_COAT" color="equipment"/>
+ <subsprite sheetIndex="142" zoom="3" equipment_class="GLOVES" equipment_name="ITEM_GLOVES_GAUNTLETS" color="equipment"/>
+ <subsprite sheetIndex="110" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_ROBE" color="equipment"/>
+ <subsprite sheetIndex="111" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CLOAK" color="equipment"/>
+
+ <!--beard goes here - on top of clothes but below hats-->
+ <subsprite sheetIndex="2" zoom="3" color="bodypart" bodypart="hair" />
+
+ <!--subsprite sheetIndex="100" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_VEIL_HEAD" color="equipment"/-->
+ <!--subsprite sheetIndex="101" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_VEIL_FACE" color="equipment"/-->
+ <subsprite sheetIndex="182" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_SCARF_HEAD" color="equipment"/>
+ <subsprite sheetIndex="183" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_CAP" color="equipment"/>
+ <subsprite sheetIndex="184" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_MASK" color="equipment"/>
+ <!--subsprite sheetIndex="107" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_TURBAN" color="equipment"/-->
+ <subsprite sheetIndex="185" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_HELM" color="equipment"/>
+ <subsprite sheetIndex="186" zoom="3" equipment_class="HELM" equipment_name="ITEM_HELM_HOOD" color="equipment"/>
+
+ <subsprite sheetIndex="3" zoom="3" />
+ </variant>
+
+ <variant special="Normal" sex="F" file="dwarff.png" >
<!--rear pieces for shadowing between legs-->
<subsprite sheetIndex="148" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CAPE" color="equipment"/>
<subsprite sheetIndex="151" zoom="3" equipment_class="ARMOR" equipment_name="ITEM_ARMOR_CLOAK" color="equipment"/>
diff --git a/resources/creatures/large_256/dwarff.png b/resources/creatures/large_256/dwarff.png
new file mode 100644
index 0000000..1a856d9
--- /dev/null
+++ b/resources/creatures/large_256/dwarff.png
Binary files differ
diff --git a/resources/creatures/large_256/dwarfm.png b/resources/creatures/large_256/dwarfm.png
new file mode 100644
index 0000000..7fa586e
--- /dev/null
+++ b/resources/creatures/large_256/dwarfm.png
Binary files differ