Skip to content

Commit

Permalink
Přidány collectibles
Browse files Browse the repository at this point in the history
- Šípy odpadlují výbušné sudy
- Přidán tréninkový panák
  • Loading branch information
lofcz committed Dec 31, 2016
1 parent 97cb89c commit c97a464
Show file tree
Hide file tree
Showing 24 changed files with 460 additions and 55 deletions.
6 changes: 3 additions & 3 deletions SimplexRPGEngine/Engine source/Configs/Default.config.gmx
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
<option_showprogress>1</option_showprogress>
<option_sizeable>True</option_sizeable>
<option_stayontop>false</option_stayontop>
<option_sync_vertex>2147483648</option_sync_vertex>
<option_sync_vertex>0</option_sync_vertex>
<option_textureGroup0_border>2</option_textureGroup0_border>
<option_textureGroup0_nocropping>0</option_textureGroup0_nocropping>
<option_textureGroup0_parent>&lt;none&gt;</option_textureGroup0_parent>
Expand Down Expand Up @@ -485,7 +485,7 @@
<option_use_new_audio>True</option_use_new_audio>
<option_variableerrors>False</option_variableerrors>
<option_version>100</option_version>
<option_version_build>1</option_version_build>
<option_version_build>6</option_version_build>
<option_version_company>SimplexTeam</option_version_company>
<option_version_copyright>2015 Matěj Štágl</option_version_copyright>
<option_version_description></option_version_description>
Expand Down Expand Up @@ -561,7 +561,7 @@
<option_winUAP_wide_logo>Configs\Default\WindowsUAP\logos\WideLogo.scale-100.png</option_winUAP_wide_logo>
<option_windowcolor>clBlack</option_windowcolor>
<option_windows_alternate_sync_method>False</option_windows_alternate_sync_method>
<option_windows_build_version>1</option_windows_build_version>
<option_windows_build_version>6</option_windows_build_version>
<option_windows_company_info>SimplexTeam</option_windows_company_info>
<option_windows_copyright_info>2015 Matěj Štágl</option_windows_copyright_info>
<option_windows_create_textures_on_demand>True</option_windows_create_textures_on_demand>
Expand Down
22 changes: 18 additions & 4 deletions SimplexRPGEngine/Engine source/DragonRise3.project.gmx
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,9 @@
<sprite>sprites\sButterfly</sprite>
<sprite>sprites\sRat</sprite>
</sprites>
<sprites name=" Misc">
<sprite>sprites\sCombatDummy</sprite>
</sprites>
</sprites>
<sprites name="Environment">
<sprites name="Trees">
Expand Down Expand Up @@ -741,7 +744,6 @@
<sprite>sprites\sBarrel</sprite>
<sprite>sprites\sprite244</sprite>
<sprite>sprites\sEmoticons</sprite>
<sprite>sprites\sprite270</sprite>
<sprite>sprites\sprite272</sprite>
<sprite>sprites\sSpawner</sprite>
<sprite>sprites\sArrow</sprite>
Expand Down Expand Up @@ -855,6 +857,7 @@
</scripts>
<scripts name="Misc">
<script>scripts\scrWordwrap.gml</script>
<script>scripts\scrArray2DTo1D.gml</script>
<script>scripts\scrSetParamsArray.gml</script>
<script>scripts\scrChooseFromArray.gml</script>
<script>scripts\secToSteps.gml</script>
Expand Down Expand Up @@ -974,6 +977,7 @@
<script>scripts\itemAddSlotDescription.gml</script>
<script>scripts\scrCreateItem.gml</script>
<script>scripts\scrItemInstantiate.gml</script>
<script>scripts\scrItemCollectibleSetUp.gml</script>
<script>scripts\scrValueIndex.gml</script>
</scripts>
<scripts name="Equipment">
Expand Down Expand Up @@ -1203,6 +1207,10 @@
<script>scripts\scrGameWorldSpawnerSpawnCutscene.gml</script>
<script>scripts\scrGameWorldSpawnersSpawnAll.gml</script>
</scripts>
<scripts name="Collectibles">
<script>scripts\scrCollectibleDefine.gml</script>
<script>scripts\scrCollectibleUnlock.gml</script>
</scripts>
</scripts>
</scripts>
<shaders name="shaders">
Expand Down Expand Up @@ -1268,9 +1276,13 @@
<object>objects\oEnemySlime</object>
<object>objects\oSlimePart</object>
</objects>
<object>objects\oEnemyImp</object>
<objects name="Imp">
<object>objects\oEnemyImp</object>
</objects>
<objects name="Dummy">
<object>objects\oCombatDummy</object>
</objects>
<object>objects\parEnemy</object>
<object>objects\oEnemySpawner</object>
</objects>
<objects name="NPCs">
<object>objects\oTestNPC</object>
Expand Down Expand Up @@ -1549,7 +1561,8 @@
</objects>
</objects>
<objects name="Collectibles">
<object>objects\oCollectible1Kvejk</object>
<object>objects\oCollectibleItem1Kvejk</object>
<object>objects\parCollectible</object>
</objects>
</objects>
<objects name="Environment">
Expand All @@ -1568,6 +1581,7 @@
<object>objects\oTeleport</object>
<object>objects\oFence</object>
<object>objects\oAltar</object>
<object>objects\oEnemySpawner</object>
</objects>
<objects name="Containers">
<object>objects\oChest</object>
Expand Down
27 changes: 27 additions & 0 deletions SimplexRPGEngine/Engine source/objects/oBarrelExplosive.object.gmx
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,33 @@ saveTimerMax = saveTimer;
<string>/// Free memory

part_system_destroy(Sname);
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="4" ename="oProjectile">
<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>/// Explode

hp = 0;
scrGoreExplodeDropShards(irandom_range(3, 5), 8);

</string>
</argument>
</arguments>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>sRelic1</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>parCollectible</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>/// Set up

scrItemCollectibleSetUp(itemEnum.itemCollectible1, 0, collectibleEnum.item);
</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>
129 changes: 129 additions & 0 deletions SimplexRPGEngine/Engine source/objects/oCombatDummy.object.gmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>sCombatDummy</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>-20</depth>
<persistent>0</persistent>
<parentName>parSolid</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>/// Set up

event_inherited();
image_speed = 0;
hit = false;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="4" ename="oProjectile">
<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>/// Hit

hit = true;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="7" enumb="7">
<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>/// Stop animation

hit = false;
</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 self

if (hit) {image_speed = 0.3;}
else {image_speed = 0;}

draw_self();
</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>
Loading

0 comments on commit c97a464

Please sign in to comment.