mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 19:49:41 +00:00
Code Issues Releases Wiki Activity

alchemy window layout

Browse source
This commit is contained in:
scrawl 2012-05-29 02:57:19 +02:00
parent 8c7cb6909d
commit 6945afe95b
2 changed files with 64 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
apps/openmw/mwgui/alchemywindow.cpp
View file

@ -128,6 +128,7 @@ namespace MWGui
{ {
ESM::ENAMstruct effect; ESM::ENAMstruct effect;
effect.effectID = mEffects[i].mEffectID; effect.effectID = mEffects[i].mEffectID;
effect.area = 0;
effect.range = ESM::RT_Self; effect.range = ESM::RT_Self;
effect.skill = mEffects[i].mSkill; effect.skill = mEffects[i].mSkill;
effect.attribute = mEffects[i].mAttribute; effect.attribute = mEffects[i].mAttribute;
@ -167,10 +168,51 @@ namespace MWGui
int random = rand() % names.size(); int random = rand() % names.size();
newPotion.model = "m\\misc_potion_" + names[random ] + "_01.nif"; newPotion.model = "m\\misc_potion_" + names[random ] + "_01.nif";
newPotion.icon = "m\\tx_potion_" + names[random ] + "_01.dds"; newPotion.icon = "m\\tx_potion_" + names[random ] + "_01.dds";
// check if a similiar potion record exists already
bool found = false;
std::string objectId;
typedef std::map<std::string, ESM::Potion> PotionMap;
PotionMap potions = MWBase::Environment::get().getWorld()->getStore().potions.list;
for (PotionMap::const_iterator it = potions.begin(); it != potions.end(); ++it)
{
if (found) break;
if (it->second.data.value == newPotion.data.value
&& it->second.data.weight == newPotion.data.weight
&& it->second.name == newPotion.name
&& it->second.effects.list.size() == newPotion.effects.list.size())
{
// check effects
for (unsigned int i=0; i < it->second.effects.list.size(); ++i)
{
const ESM::ENAMstruct& a = it->second.effects.list[i];
const ESM::ENAMstruct& b = newPotion.effects.list[i];
if (a.effectID == b.effectID
&& a.area == b.area
&& a.range == b.range
&& a.skill == b.skill
&& a.attribute == b.attribute
&& a.magnMin == b.magnMin
&& a.magnMax == b.magnMax
&& a.duration == b.duration)
{
found = true;
objectId = it->first;
break;
}
}
}
}
if (!found)
{
std::pair<std::string, const ESM::Potion*> result = MWBase::Environment::get().getWorld()->createRecord(newPotion); std::pair<std::string, const ESM::Potion*> result = MWBase::Environment::get().getWorld()->createRecord(newPotion);
objectId = result.first;
}
// create a reference and add it to player inventory // create a reference and add it to player inventory
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), result.first); MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), objectId);
MWWorld::ContainerStore& store = MWWorld::Class::get(mPtr).getContainerStore(mPtr); MWWorld::ContainerStore& store = MWWorld::Class::get(mPtr).getContainerStore(mPtr);
ref.getPtr().getRefData().setCount(1); ref.getPtr().getRefData().setCount(1);
store.add(ref.getPtr()); store.add(ref.getPtr());

40
files/mygui/openmw_alchemy_window_layout.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 600 500" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 410" name="_Main">
<Widget type="TextBox" skin="SandText" position="8 8 60 24"> <Widget type="TextBox" skin="SandText" position="8 8 60 24">
<Property key="Caption" value="#{sName}"/> <Property key="Caption" value="#{sName}"/>
@ -10,73 +10,73 @@
<Widget type="EditBox" skin="MW_TextEdit" position="76 8 250 24" name="NameEdit"/> <Widget type="EditBox" skin="MW_TextEdit" position="76 8 250 24" name="NameEdit"/>
<Widget type="TextBox" skin="SandText" position="8 40 140 24"> <Widget type="TextBox" skin="SandText" position="270 40 140 24">
<Property key="Caption" value="#{sApparatus}"/> <Property key="Caption" value="#{sApparatus}"/>
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
</Widget> </Widget>
<!-- Apparatus bar --> <!-- Apparatus bar -->
<Widget type="Widget" skin="" position="8 66 230 50"> <Widget type="Widget" skin="" position="270 66 230 50">
<Widget type="Widget" skin="MW_Box" position="0 0 50 50"> <Widget type="Widget" skin="MW_Box" position="0 0 50 50">
<Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" name="Apparatus1"/> <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Apparatus1"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="60 0 50 50"> <Widget type="Widget" skin="MW_Box" position="60 0 50 50">
<Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" name="Apparatus2"/> <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Apparatus2"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="120 0 50 50"> <Widget type="Widget" skin="MW_Box" position="120 0 50 50">
<Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" name="Apparatus3"/> <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Apparatus3"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="180 0 50 50"> <Widget type="Widget" skin="MW_Box" position="180 0 50 50">
<Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" name="Apparatus4"/> <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Apparatus4"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="8 124 140 24"> <Widget type="TextBox" skin="SandText" position="8 40 140 24">
<Property key="Caption" value="#{sIngredients}"/> <Property key="Caption" value="#{sIngredients}"/>
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
</Widget> </Widget>
<!-- Used ingredients bar --> <!-- Used ingredients bar -->
<Widget type="Widget" skin="" position="8 150 230 50"> <Widget type="Widget" skin="" position="8 66 230 50">
<Widget type="Widget" skin="MW_Box" position="0 0 50 50"> <Widget type="Widget" skin="MW_Box" position="0 0 50 50">
<Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" name="Ingredient1"/> <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Ingredient1"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="60 0 50 50"> <Widget type="Widget" skin="MW_Box" position="60 0 50 50">
<Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" name="Ingredient2"/> <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Ingredient2"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="120 0 50 50"> <Widget type="Widget" skin="MW_Box" position="120 0 50 50">
<Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" name="Ingredient3"/> <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Ingredient3"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="180 0 50 50"> <Widget type="Widget" skin="MW_Box" position="180 0 50 50">
<Widget type="ImageBox" skin="ImageBox" position="4 4 42 42" name="Ingredient4"/> <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Ingredient4"/>
</Widget> </Widget>
</Widget> </Widget>
<!-- Available ingredients --> <!-- Available ingredients -->
<Widget type="Widget" skin="MW_Box" position="8 206 300 218" name="box" align="Left Top Stretch"> <Widget type="Widget" skin="MW_Box" position="8 126 247 238" name="box" align="Left Top Stretch">
<Widget type="ScrollView" skin="MW_ScrollViewH" position="4 4 292 210" name="ItemView" align="Left Top Stretch"> <Widget type="ScrollView" skin="MW_ScrollViewH" position="4 4 239 220" name="ItemView" align="Left Top Stretch">
<Property key="CanvasAlign" value="Left Top"/> <Property key="CanvasAlign" value="Left Top"/>
<Widget type="Button" skin="" name="Items" position="0 0 292 210" name="Items" align="Left Top Stretch"/> <Widget type="Button" skin="" name="Items" position="0 0 239 220" name="Items" align="Left Top Stretch"/>
</Widget> </Widget>
</Widget> </Widget>
<!-- Created effects --> <!-- Created effects -->
<Widget type="TextBox" skin="SandText" position="314 38 200 24"> <Widget type="TextBox" skin="SandText" position="270 123 200 24">
<Property key="Caption" value="#{sCreatedEffects}"/> <Property key="Caption" value="#{sCreatedEffects}"/>
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="314 64 270 200"> <Widget type="Widget" skin="MW_Box" position="270 149 270 214">
<Widget type="Widget" skin="" position="4 4 262 192" name="CreatedEffects"/> <Widget type="Widget" skin="" position="4 4 262 204" name="CreatedEffects"/>
</Widget> </Widget>
<!-- Buttons --> <!-- Buttons -->
<Widget type="Widget" skin="" position="314 270 200 24"> <Widget type="Widget" skin="" position="270 370 270 24">
<Widget type="Button" skin="MW_Button" position="0 0 60 24" name="CreateButton"> <Widget type="Button" skin="MW_Button" position="0 0 60 24" name="CreateButton">
<Property key="Caption" value="#{sCreate}"/> <Property key="Caption" value="#{sCreate}"/>
</Widget> </Widget>