Skip to content

Commit c97a464

Browse files
author
lofcz
committed
Přidány collectibles
- Šípy odpadlují výbušné sudy - Přidán tréninkový panák
1 parent 97cb89c commit c97a464

24 files changed

+460
-55
lines changed

‎SimplexRPGEngine/Engine source/Configs/Default.config.gmx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@
435435
<option_showprogress>1</option_showprogress>
436436
<option_sizeable>True</option_sizeable>
437437
<option_stayontop>false</option_stayontop>
438-
<option_sync_vertex>2147483648</option_sync_vertex>
438+
<option_sync_vertex>0</option_sync_vertex>
439439
<option_textureGroup0_border>2</option_textureGroup0_border>
440440
<option_textureGroup0_nocropping>0</option_textureGroup0_nocropping>
441441
<option_textureGroup0_parent>&lt;none&gt;</option_textureGroup0_parent>
@@ -485,7 +485,7 @@
485485
<option_use_new_audio>True</option_use_new_audio>
486486
<option_variableerrors>False</option_variableerrors>
487487
<option_version>100</option_version>
488-
<option_version_build>1</option_version_build>
488+
<option_version_build>6</option_version_build>
489489
<option_version_company>SimplexTeam</option_version_company>
490490
<option_version_copyright>2015 Matěj Štágl</option_version_copyright>
491491
<option_version_description></option_version_description>
@@ -561,7 +561,7 @@
561561
<option_winUAP_wide_logo>Configs\Default\WindowsUAP\logos\WideLogo.scale-100.png</option_winUAP_wide_logo>
562562
<option_windowcolor>clBlack</option_windowcolor>
563563
<option_windows_alternate_sync_method>False</option_windows_alternate_sync_method>
564-
<option_windows_build_version>1</option_windows_build_version>
564+
<option_windows_build_version>6</option_windows_build_version>
565565
<option_windows_company_info>SimplexTeam</option_windows_company_info>
566566
<option_windows_copyright_info>2015 Matěj Štágl</option_windows_copyright_info>
567567
<option_windows_create_textures_on_demand>True</option_windows_create_textures_on_demand>

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,9 @@
366366
<sprite>sprites\sButterfly</sprite>
367367
<sprite>sprites\sRat</sprite>
368368
</sprites>
369+
<sprites name=" Misc">
370+
<sprite>sprites\sCombatDummy</sprite>
371+
</sprites>
369372
</sprites>
370373
<sprites name="Environment">
371374
<sprites name="Trees">
@@ -741,7 +744,6 @@
741744
<sprite>sprites\sBarrel</sprite>
742745
<sprite>sprites\sprite244</sprite>
743746
<sprite>sprites\sEmoticons</sprite>
744-
<sprite>sprites\sprite270</sprite>
745747
<sprite>sprites\sprite272</sprite>
746748
<sprite>sprites\sSpawner</sprite>
747749
<sprite>sprites\sArrow</sprite>
@@ -855,6 +857,7 @@
855857
</scripts>
856858
<scripts name="Misc">
857859
<script>scripts\scrWordwrap.gml</script>
860+
<script>scripts\scrArray2DTo1D.gml</script>
858861
<script>scripts\scrSetParamsArray.gml</script>
859862
<script>scripts\scrChooseFromArray.gml</script>
860863
<script>scripts\secToSteps.gml</script>
@@ -974,6 +977,7 @@
974977
<script>scripts\itemAddSlotDescription.gml</script>
975978
<script>scripts\scrCreateItem.gml</script>
976979
<script>scripts\scrItemInstantiate.gml</script>
980+
<script>scripts\scrItemCollectibleSetUp.gml</script>
977981
<script>scripts\scrValueIndex.gml</script>
978982
</scripts>
979983
<scripts name="Equipment">
@@ -1203,6 +1207,10 @@
12031207
<script>scripts\scrGameWorldSpawnerSpawnCutscene.gml</script>
12041208
<script>scripts\scrGameWorldSpawnersSpawnAll.gml</script>
12051209
</scripts>
1210+
<scripts name="Collectibles">
1211+
<script>scripts\scrCollectibleDefine.gml</script>
1212+
<script>scripts\scrCollectibleUnlock.gml</script>
1213+
</scripts>
12061214
</scripts>
12071215
</scripts>
12081216
<shaders name="shaders">
@@ -1268,9 +1276,13 @@
12681276
<object>objects\oEnemySlime</object>
12691277
<object>objects\oSlimePart</object>
12701278
</objects>
1271-
<object>objects\oEnemyImp</object>
1279+
<objects name="Imp">
1280+
<object>objects\oEnemyImp</object>
1281+
</objects>
1282+
<objects name="Dummy">
1283+
<object>objects\oCombatDummy</object>
1284+
</objects>
12721285
<object>objects\parEnemy</object>
1273-
<object>objects\oEnemySpawner</object>
12741286
</objects>
12751287
<objects name="NPCs">
12761288
<object>objects\oTestNPC</object>
@@ -1549,7 +1561,8 @@
15491561
</objects>
15501562
</objects>
15511563
<objects name="Collectibles">
1552-
<object>objects\oCollectible1Kvejk</object>
1564+
<object>objects\oCollectibleItem1Kvejk</object>
1565+
<object>objects\parCollectible</object>
15531566
</objects>
15541567
</objects>
15551568
<objects name="Environment">
@@ -1568,6 +1581,7 @@
15681581
<object>objects\oTeleport</object>
15691582
<object>objects\oFence</object>
15701583
<object>objects\oAltar</object>
1584+
<object>objects\oEnemySpawner</object>
15711585
</objects>
15721586
<objects name="Containers">
15731587
<object>objects\oChest</object>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,33 @@ saveTimerMax = saveTimer;
5656
<string>/// Free memory
5757

5858
part_system_destroy(Sname);
59+
</string>
60+
</argument>
61+
</arguments>
62+
</action>
63+
</event>
64+
<event eventtype="4" ename="oProjectile">
65+
<action>
66+
<libid>1</libid>
67+
<id>603</id>
68+
<kind>7</kind>
69+
<userelative>0</userelative>
70+
<isquestion>0</isquestion>
71+
<useapplyto>-1</useapplyto>
72+
<exetype>2</exetype>
73+
<functionname></functionname>
74+
<codestring></codestring>
75+
<whoName>self</whoName>
76+
<relative>0</relative>
77+
<isnot>0</isnot>
78+
<arguments>
79+
<argument>
80+
<kind>1</kind>
81+
<string>/// Explode
82+
83+
hp = 0;
84+
scrGoreExplodeDropShards(irandom_range(3, 5), 8);
85+
5986
</string>
6087
</argument>
6188
</arguments>

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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>sRelic1</spriteName>
4+
<solid>0</solid>
5+
<visible>-1</visible>
6+
<depth>0</depth>
7+
<persistent>0</persistent>
8+
<parentName>parCollectible</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>/// Set up
29+
30+
scrItemCollectibleSetUp(itemEnum.itemCollectible1, 0, collectibleEnum.item);
31+
</string>
32+
</argument>
33+
</arguments>
34+
</action>
35+
</event>
36+
</events>
37+
<PhysicsObject>0</PhysicsObject>
38+
<PhysicsObjectSensor>0</PhysicsObjectSensor>
39+
<PhysicsObjectShape>0</PhysicsObjectShape>
40+
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
41+
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
42+
<PhysicsObjectGroup>0</PhysicsObjectGroup>
43+
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
44+
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
45+
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
46+
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
47+
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
48+
<PhysicsShapePoints/>
49+
</object>

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

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
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>sCombatDummy</spriteName>
4+
<solid>0</solid>
5+
<visible>-1</visible>
6+
<depth>-20</depth>
7+
<persistent>0</persistent>
8+
<parentName>parSolid</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>/// Set up
29+
30+
event_inherited();
31+
image_speed = 0;
32+
hit = false;
33+
</string>
34+
</argument>
35+
</arguments>
36+
</action>
37+
</event>
38+
<event eventtype="4" ename="oProjectile">
39+
<action>
40+
<libid>1</libid>
41+
<id>603</id>
42+
<kind>7</kind>
43+
<userelative>0</userelative>
44+
<isquestion>0</isquestion>
45+
<useapplyto>-1</useapplyto>
46+
<exetype>2</exetype>
47+
<functionname></functionname>
48+
<codestring></codestring>
49+
<whoName>self</whoName>
50+
<relative>0</relative>
51+
<isnot>0</isnot>
52+
<arguments>
53+
<argument>
54+
<kind>1</kind>
55+
<string>/// Hit
56+
57+
hit = true;
58+
</string>
59+
</argument>
60+
</arguments>
61+
</action>
62+
</event>
63+
<event eventtype="7" enumb="7">
64+
<action>
65+
<libid>1</libid>
66+
<id>603</id>
67+
<kind>7</kind>
68+
<userelative>0</userelative>
69+
<isquestion>0</isquestion>
70+
<useapplyto>-1</useapplyto>
71+
<exetype>2</exetype>
72+
<functionname></functionname>
73+
<codestring></codestring>
74+
<whoName>self</whoName>
75+
<relative>0</relative>
76+
<isnot>0</isnot>
77+
<arguments>
78+
<argument>
79+
<kind>1</kind>
80+
<string>/// Stop animation
81+
82+
hit = false;
83+
</string>
84+
</argument>
85+
</arguments>
86+
</action>
87+
</event>
88+
<event eventtype="8" enumb="0">
89+
<action>
90+
<libid>1</libid>
91+
<id>603</id>
92+
<kind>7</kind>
93+
<userelative>0</userelative>
94+
<isquestion>0</isquestion>
95+
<useapplyto>-1</useapplyto>
96+
<exetype>2</exetype>
97+
<functionname></functionname>
98+
<codestring></codestring>
99+
<whoName>self</whoName>
100+
<relative>0</relative>
101+
<isnot>0</isnot>
102+
<arguments>
103+
<argument>
104+
<kind>1</kind>
105+
<string>/// Draw self
106+
107+
if (hit) {image_speed = 0.3;}
108+
else {image_speed = 0;}
109+
110+
draw_self();
111+
</string>
112+
</argument>
113+
</arguments>
114+
</action>
115+
</event>
116+
</events>
117+
<PhysicsObject>0</PhysicsObject>
118+
<PhysicsObjectSensor>0</PhysicsObjectSensor>
119+
<PhysicsObjectShape>0</PhysicsObjectShape>
120+
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
121+
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
122+
<PhysicsObjectGroup>0</PhysicsObjectGroup>
123+
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
124+
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
125+
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
126+
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
127+
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
128+
<PhysicsShapePoints/>
129+
</object>

0 commit comments

Comments
 (0)