Skip to content

Commit

Permalink
Rozšířena databáze předmětů
Browse files Browse the repository at this point in the history
  • Loading branch information
lofcz committed Nov 8, 2016
1 parent c57db13 commit 462325b
Show file tree
Hide file tree
Showing 79 changed files with 502 additions and 3 deletions.
10 changes: 10 additions & 0 deletions SimplexRPGEngine/Engine source/DragonRise3.project.gmx
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,12 @@
</sprites>
<sprites name="Materials">
<sprite>sprites\sDustEffect</sprite>
<sprite>sprites\sStickEffect</sprite>
<sprite>sprites\sWoodEffect</sprite>
<sprite>sprites\sMetalEffect</sprite>
<sprite>sprites\sStoneEffect</sprite>
<sprite>sprites\sLeafEffect</sprite>
<sprite>sprites\sLianaEffect</sprite>
<sprite>sprites\sFurEffect</sprite>
<sprite>sprites\sGoldEffect</sprite>
</sprites>
Expand Down Expand Up @@ -598,6 +600,10 @@
<sprite>sprites\sTemp14</sprite>
<sprite>sprites\sTemp15</sprite>
<sprite>sprites\sTemp16</sprite>
<sprite>sprites\sTemp17</sprite>
<sprite>sprites\sTemp18</sprite>
<sprite>sprites\sTemp19</sprite>
<sprite>sprites\sTemp20</sprite>
</sprites>
<sprite>sprites\sprite242</sprite>
<sprite>sprites\sBarrel</sprite>
Expand Down Expand Up @@ -1235,6 +1241,10 @@
<objects name="Misc">
<object>objects\oBone</object>
</objects>
<objects name="Scticks and lianas">
<object>objects\oStick</object>
<object>objects\oLiana</object>
</objects>
</objects>
<objects name="Gems">
<objects name="Junk">
Expand Down
136 changes: 136 additions & 0 deletions SimplexRPGEngine/Engine source/objects/oLiana.object.gmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>sLianaEffect</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>parItem</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<event eventtype="0" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// Initialize item

scrItemSetUp(0, 0, itemEnum.itemLiana);
scrItemSetProperties(true, "Liána", "Dlouhý a ohebný úponek, mohl by se hodit jako improvizovaný provaz.", materialEnum.materialLiana, "", 1);
scrItemSetOptions();
scrItemSetUpFinalize();

</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="4" ename="oPlayer">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// Loot

if (loot = 0)
{
if (inventoryPickUp())
{
audio_play_sound(sndWoodGet1,0,0);
scrLog("+ Liána",c_white,sLianaEffect,0,0.5);
}
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="7" enumb="10">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// After pick up

instance_destroy();

</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="8" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// Draw item

itemDraw()
</string>
</argument>
</arguments>
</action>
</event>
</events>
<PhysicsObject>0</PhysicsObject>
<PhysicsObjectSensor>0</PhysicsObjectSensor>
<PhysicsObjectShape>0</PhysicsObjectShape>
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
<PhysicsObjectGroup>0</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints/>
</object>
136 changes: 136 additions & 0 deletions SimplexRPGEngine/Engine source/objects/oStick.object.gmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>sStickEffect</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>parItem</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<event eventtype="0" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// Initialize item

scrItemSetUp(0, 0, itemEnum.itemStick);
scrItemSetProperties(true, "Dřevěná tyč", "Mírně pružná, funkční tyč. Může posloužit k výrobě zbraní a nástrojů, či k rozdělání ohně.", materialEnum.materialWood, "", 1);
scrItemSetOptions();
scrItemSetUpFinalize();

</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="4" ename="oPlayer">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// Loot

if (loot = 0)
{
if (inventoryPickUp())
{
audio_play_sound(sndWoodGet1,0,0);
scrLog("+ Dřevěná tyč",c_white,sStickEffect,0,0.5);
}
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="7" enumb="10">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// After pick up

instance_destroy();

</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="8" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>/// Draw item

itemDraw()
</string>
</argument>
</arguments>
</action>
</event>
</events>
<PhysicsObject>0</PhysicsObject>
<PhysicsObjectSensor>0</PhysicsObjectSensor>
<PhysicsObjectShape>0</PhysicsObjectShape>
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
<PhysicsObjectGroup>0</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints/>
</object>
5 changes: 5 additions & 0 deletions SimplexRPGEngine/Engine source/rooms/mapTest.room.gmx
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,11 @@
<instance objName="oRat" x="1648" y="896" name="inst_15C5E85A" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="oRat" x="1792" y="816" name="inst_13E97342" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="oRat" x="1760" y="1024" name="inst_BCD3C213" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="oStick" x="848" y="1328" name="inst_2963B4FE" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="oStick" x="848" y="1360" name="inst_48D96CF7" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="oStick" x="848" y="1392" name="inst_9A2D390A" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="oLiana" x="896" y="1328" name="inst_090BD100" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="oLiana" x="896" y="1376" name="inst_84BEE2FD" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
</instances>
<tiles>
<tile bgName="bcgShd1" x="1600" y="1712" w="32" h="32" xo="32" yo="0" id="10006696" name="inst_AC26E277" depth="1000001" locked="0" colour="4294967295" scaleX="1" scaleY="1"/>
Expand Down
6 changes: 4 additions & 2 deletions SimplexRPGEngine/Engine source/scripts/itemDbEnum.gml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

enum materialEnum
{
materialNone, materialPearl, materialMetal, materialWood, materialHerb, materialStone, materialGolde, materialFur, materialBone
materialNone, materialPearl, materialMetal, materialWood, materialHerb, materialStone, materialGolde, materialFur, materialBone, materialLiana
};

enum itemEnum
Expand Down Expand Up @@ -70,5 +70,7 @@ itemGem14,
itemGemQuest1,
itemPouch,
itemFurRabbit,
itemBone
itemBone,
itemStick,
itemLiana
};
2 changes: 1 addition & 1 deletion SimplexRPGEngine/Engine source/scripts/scrSimpleAiStep.gml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ if (x != xprevious) || (y != yprevious) {image_speed = 0.15; }
else
{
image_speed = 0;

if (image_index > 12 && image_index < 15) {image_index = 12;}
if (image_index > 0 && image_index < 3.9) {image_index = 0;}
if (image_index > 9 && image_index < 11.9) {image_index = 9;}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 462325b

Please sign in to comment.