Skip to content

Commit 462325b

Browse files
author
lofcz
committed
Rozšířena databáze předmětů
1 parent c57db13 commit 462325b

File tree

79 files changed

+502
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+502
-3
lines changed

‎SimplexRPGEngine/Engine source/DragonRise3.project.gmx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,12 @@
475475
</sprites>
476476
<sprites name="Materials">
477477
<sprite>sprites\sDustEffect</sprite>
478+
<sprite>sprites\sStickEffect</sprite>
478479
<sprite>sprites\sWoodEffect</sprite>
479480
<sprite>sprites\sMetalEffect</sprite>
480481
<sprite>sprites\sStoneEffect</sprite>
481482
<sprite>sprites\sLeafEffect</sprite>
483+
<sprite>sprites\sLianaEffect</sprite>
482484
<sprite>sprites\sFurEffect</sprite>
483485
<sprite>sprites\sGoldEffect</sprite>
484486
</sprites>
@@ -598,6 +600,10 @@
598600
<sprite>sprites\sTemp14</sprite>
599601
<sprite>sprites\sTemp15</sprite>
600602
<sprite>sprites\sTemp16</sprite>
603+
<sprite>sprites\sTemp17</sprite>
604+
<sprite>sprites\sTemp18</sprite>
605+
<sprite>sprites\sTemp19</sprite>
606+
<sprite>sprites\sTemp20</sprite>
601607
</sprites>
602608
<sprite>sprites\sprite242</sprite>
603609
<sprite>sprites\sBarrel</sprite>
@@ -1235,6 +1241,10 @@
12351241
<objects name="Misc">
12361242
<object>objects\oBone</object>
12371243
</objects>
1244+
<objects name="Scticks and lianas">
1245+
<object>objects\oStick</object>
1246+
<object>objects\oLiana</object>
1247+
</objects>
12381248
</objects>
12391249
<objects name="Gems">
12401250
<objects name="Junk">

‎SimplexRPGEngine/Engine source/objects/oLiana.object.gmx‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
2+
<object>
3+
<spriteName>sLianaEffect</spriteName>
4+
<solid>0</solid>
5+
<visible>-1</visible>
6+
<depth>0</depth>
7+
<persistent>0</persistent>
8+
<parentName>parItem</parentName>
9+
<maskName>&lt;undefined&gt;</maskName>
10+
<events>
11+
<event eventtype="0" enumb="0">
12+
<action>
13+
<libid>1</libid>
14+
<id>603</id>
15+
<kind>7</kind>
16+
<userelative>0</userelative>
17+
<isquestion>0</isquestion>
18+
<useapplyto>-1</useapplyto>
19+
<exetype>2</exetype>
20+
<functionname></functionname>
21+
<codestring></codestring>
22+
<whoName>self</whoName>
23+
<relative>0</relative>
24+
<isnot>0</isnot>
25+
<arguments>
26+
<argument>
27+
<kind>1</kind>
28+
<string>/// Initialize item
29+
30+
scrItemSetUp(0, 0, itemEnum.itemLiana);
31+
scrItemSetProperties(true, "Liána", "Dlouhý a ohebný úponek, mohl by se hodit jako improvizovaný provaz.", materialEnum.materialLiana, "", 1);
32+
scrItemSetOptions();
33+
scrItemSetUpFinalize();
34+
35+
</string>
36+
</argument>
37+
</arguments>
38+
</action>
39+
</event>
40+
<event eventtype="4" ename="oPlayer">
41+
<action>
42+
<libid>1</libid>
43+
<id>603</id>
44+
<kind>7</kind>
45+
<userelative>0</userelative>
46+
<isquestion>0</isquestion>
47+
<useapplyto>-1</useapplyto>
48+
<exetype>2</exetype>
49+
<functionname></functionname>
50+
<codestring></codestring>
51+
<whoName>self</whoName>
52+
<relative>0</relative>
53+
<isnot>0</isnot>
54+
<arguments>
55+
<argument>
56+
<kind>1</kind>
57+
<string>/// Loot
58+
59+
if (loot = 0)
60+
{
61+
if (inventoryPickUp())
62+
{
63+
audio_play_sound(sndWoodGet1,0,0);
64+
scrLog("+ Liána",c_white,sLianaEffect,0,0.5);
65+
}
66+
}
67+
</string>
68+
</argument>
69+
</arguments>
70+
</action>
71+
</event>
72+
<event eventtype="7" enumb="10">
73+
<action>
74+
<libid>1</libid>
75+
<id>603</id>
76+
<kind>7</kind>
77+
<userelative>0</userelative>
78+
<isquestion>0</isquestion>
79+
<useapplyto>-1</useapplyto>
80+
<exetype>2</exetype>
81+
<functionname></functionname>
82+
<codestring></codestring>
83+
<whoName>self</whoName>
84+
<relative>0</relative>
85+
<isnot>0</isnot>
86+
<arguments>
87+
<argument>
88+
<kind>1</kind>
89+
<string>/// After pick up
90+
91+
instance_destroy();
92+
93+
</string>
94+
</argument>
95+
</arguments>
96+
</action>
97+
</event>
98+
<event eventtype="8" enumb="0">
99+
<action>
100+
<libid>1</libid>
101+
<id>603</id>
102+
<kind>7</kind>
103+
<userelative>0</userelative>
104+
<isquestion>0</isquestion>
105+
<useapplyto>-1</useapplyto>
106+
<exetype>2</exetype>
107+
<functionname></functionname>
108+
<codestring></codestring>
109+
<whoName>self</whoName>
110+
<relative>0</relative>
111+
<isnot>0</isnot>
112+
<arguments>
113+
<argument>
114+
<kind>1</kind>
115+
<string>/// Draw item
116+
117+
itemDraw()
118+
</string>
119+
</argument>
120+
</arguments>
121+
</action>
122+
</event>
123+
</events>
124+
<PhysicsObject>0</PhysicsObject>
125+
<PhysicsObjectSensor>0</PhysicsObjectSensor>
126+
<PhysicsObjectShape>0</PhysicsObjectShape>
127+
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
128+
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
129+
<PhysicsObjectGroup>0</PhysicsObjectGroup>
130+
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
131+
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
132+
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
133+
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
134+
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
135+
<PhysicsShapePoints/>
136+
</object>

‎SimplexRPGEngine/Engine source/objects/oStick.object.gmx‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
2+
<object>
3+
<spriteName>sStickEffect</spriteName>
4+
<solid>0</solid>
5+
<visible>-1</visible>
6+
<depth>0</depth>
7+
<persistent>0</persistent>
8+
<parentName>parItem</parentName>
9+
<maskName>&lt;undefined&gt;</maskName>
10+
<events>
11+
<event eventtype="0" enumb="0">
12+
<action>
13+
<libid>1</libid>
14+
<id>603</id>
15+
<kind>7</kind>
16+
<userelative>0</userelative>
17+
<isquestion>0</isquestion>
18+
<useapplyto>-1</useapplyto>
19+
<exetype>2</exetype>
20+
<functionname></functionname>
21+
<codestring></codestring>
22+
<whoName>self</whoName>
23+
<relative>0</relative>
24+
<isnot>0</isnot>
25+
<arguments>
26+
<argument>
27+
<kind>1</kind>
28+
<string>/// Initialize item
29+
30+
scrItemSetUp(0, 0, itemEnum.itemStick);
31+
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);
32+
scrItemSetOptions();
33+
scrItemSetUpFinalize();
34+
35+
</string>
36+
</argument>
37+
</arguments>
38+
</action>
39+
</event>
40+
<event eventtype="4" ename="oPlayer">
41+
<action>
42+
<libid>1</libid>
43+
<id>603</id>
44+
<kind>7</kind>
45+
<userelative>0</userelative>
46+
<isquestion>0</isquestion>
47+
<useapplyto>-1</useapplyto>
48+
<exetype>2</exetype>
49+
<functionname></functionname>
50+
<codestring></codestring>
51+
<whoName>self</whoName>
52+
<relative>0</relative>
53+
<isnot>0</isnot>
54+
<arguments>
55+
<argument>
56+
<kind>1</kind>
57+
<string>/// Loot
58+
59+
if (loot = 0)
60+
{
61+
if (inventoryPickUp())
62+
{
63+
audio_play_sound(sndWoodGet1,0,0);
64+
scrLog("+ Dřevěná tyč",c_white,sStickEffect,0,0.5);
65+
}
66+
}
67+
</string>
68+
</argument>
69+
</arguments>
70+
</action>
71+
</event>
72+
<event eventtype="7" enumb="10">
73+
<action>
74+
<libid>1</libid>
75+
<id>603</id>
76+
<kind>7</kind>
77+
<userelative>0</userelative>
78+
<isquestion>0</isquestion>
79+
<useapplyto>-1</useapplyto>
80+
<exetype>2</exetype>
81+
<functionname></functionname>
82+
<codestring></codestring>
83+
<whoName>self</whoName>
84+
<relative>0</relative>
85+
<isnot>0</isnot>
86+
<arguments>
87+
<argument>
88+
<kind>1</kind>
89+
<string>/// After pick up
90+
91+
instance_destroy();
92+
93+
</string>
94+
</argument>
95+
</arguments>
96+
</action>
97+
</event>
98+
<event eventtype="8" enumb="0">
99+
<action>
100+
<libid>1</libid>
101+
<id>603</id>
102+
<kind>7</kind>
103+
<userelative>0</userelative>
104+
<isquestion>0</isquestion>
105+
<useapplyto>-1</useapplyto>
106+
<exetype>2</exetype>
107+
<functionname></functionname>
108+
<codestring></codestring>
109+
<whoName>self</whoName>
110+
<relative>0</relative>
111+
<isnot>0</isnot>
112+
<arguments>
113+
<argument>
114+
<kind>1</kind>
115+
<string>/// Draw item
116+
117+
itemDraw()
118+
</string>
119+
</argument>
120+
</arguments>
121+
</action>
122+
</event>
123+
</events>
124+
<PhysicsObject>0</PhysicsObject>
125+
<PhysicsObjectSensor>0</PhysicsObjectSensor>
126+
<PhysicsObjectShape>0</PhysicsObjectShape>
127+
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
128+
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
129+
<PhysicsObjectGroup>0</PhysicsObjectGroup>
130+
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
131+
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
132+
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
133+
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
134+
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
135+
<PhysicsShapePoints/>
136+
</object>

‎SimplexRPGEngine/Engine source/rooms/mapTest.room.gmx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,11 @@
465465
<instance objName="oRat" x="1648" y="896" name="inst_15C5E85A" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
466466
<instance objName="oRat" x="1792" y="816" name="inst_13E97342" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
467467
<instance objName="oRat" x="1760" y="1024" name="inst_BCD3C213" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
468+
<instance objName="oStick" x="848" y="1328" name="inst_2963B4FE" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
469+
<instance objName="oStick" x="848" y="1360" name="inst_48D96CF7" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
470+
<instance objName="oStick" x="848" y="1392" name="inst_9A2D390A" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
471+
<instance objName="oLiana" x="896" y="1328" name="inst_090BD100" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
472+
<instance objName="oLiana" x="896" y="1376" name="inst_84BEE2FD" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
468473
</instances>
469474
<tiles>
470475
<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"/>

‎SimplexRPGEngine/Engine source/scripts/itemDbEnum.gml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
enum materialEnum
44
{
5-
materialNone, materialPearl, materialMetal, materialWood, materialHerb, materialStone, materialGolde, materialFur, materialBone
5+
materialNone, materialPearl, materialMetal, materialWood, materialHerb, materialStone, materialGolde, materialFur, materialBone, materialLiana
66
};
77

88
enum itemEnum
@@ -70,5 +70,7 @@ itemGem14,
7070
itemGemQuest1,
7171
itemPouch,
7272
itemFurRabbit,
73-
itemBone
73+
itemBone,
74+
itemStick,
75+
itemLiana
7476
};

‎SimplexRPGEngine/Engine source/scripts/scrSimpleAiStep.gml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ if (x != xprevious) || (y != yprevious) {image_speed = 0.15; }
106106
else
107107
{
108108
image_speed = 0;
109-
109+
110110
if (image_index > 12 && image_index < 15) {image_index = 12;}
111111
if (image_index > 0 && image_index < 3.9) {image_index = 0;}
112112
if (image_index > 9 && image_index < 11.9) {image_index = 9;}

‎SimplexRPGEngine/Engine source/sprites/images/sLianaEffect_0.png‎

490 Bytes

‎SimplexRPGEngine/Engine source/sprites/images/sLianaEffect_1.png‎

491 Bytes

‎SimplexRPGEngine/Engine source/sprites/images/sLianaEffect_10.png‎

367 Bytes

‎SimplexRPGEngine/Engine source/sprites/images/sLianaEffect_11.png‎

410 Bytes

0 commit comments

Comments
 (0)