not as fresh...

ariogato · Jan 3, 2018 · 8134182 · 8134182
1 parent e695c97
commit 8134182
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 24 deletions.
diff --git a/Koramu/Koramu.vcxproj b/Koramu/Koramu.vcxproj
@@ -283,9 +283,7 @@
     <Xml Include="xmlFiles\save.xml">
       <SubType>Designer</SubType>
     </Xml>
-    <Xml Include="xmlFiles\scripts.xml">
-      <SubType>Designer</SubType>
-    </Xml>
+    <Xml Include="xmlFiles\scripts.xml" />
     <Xml Include="xmlFiles\states.xml">
       <SubType>Designer</SubType>
     </Xml>
@@ -301,14 +299,10 @@
     <None Include="Scripts\Buttons\buttonResume.lua" />
     <None Include="Scripts\Buttons\buttonSave.lua" />
     <None Include="Scripts\default.lua" />
-    <None Include="Scripts\Doors\door1.lua" />
-    <None Include="Scripts\Doors\door2.lua" />
     <None Include="Scripts\Inventory\itemList.lua" />
     <None Include="Scripts\Inventory\Items\topHat.lua" />
     <None Include="Scripts\Misc\koramu.lua" />
     <None Include="Scripts\Objects\player.lua" />
-    <None Include="Scripts\Quests\prologue\firstDoNothingQuest.lua" />
-    <None Include="Scripts\Quests\prologue\notebookEntry1.lua" />
     <None Include="Scripts\test\npc1.lua" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/Koramu/Koramu.vcxproj.filters b/Koramu/Koramu.vcxproj.filters
@@ -522,15 +522,15 @@
     <Xml Include="xmlFiles\collisionRects.xml">
       <Filter>xmlFiles</Filter>
     </Xml>
-    <Xml Include="xmlFiles\scripts.xml">
-      <Filter>xmlFiles</Filter>
-    </Xml>
     <Xml Include="xmlFiles\quests.xml">
       <Filter>xmlFiles</Filter>
     </Xml>
     <Xml Include="xmlFiles\save.xml">
       <Filter>xmlFiles</Filter>
     </Xml>
+    <Xml Include="xmlFiles\scripts.xml">
+      <Filter>xmlFiles</Filter>
+    </Xml>
   </ItemGroup>
   <ItemGroup>
     <None Include="ClassDiagram.cd" />
@@ -573,17 +573,5 @@
     <None Include="Scripts\Inventory\itemList.lua">
       <Filter>Lua Skripts\Inventory</Filter>
     </None>
-    <None Include="Scripts\Quests\prologue\notebookEntry1.lua">
-      <Filter>Lua Skripts\Quests\prologue</Filter>
-    </None>
-    <None Include="Scripts\Quests\prologue\firstDoNothingQuest.lua">
-      <Filter>Lua Skripts\Quests\prologue</Filter>
-    </None>
-    <None Include="Scripts\Doors\door2.lua">
-      <Filter>Lua Skripts\Doors</Filter>
-    </None>
-    <None Include="Scripts\Doors\door1.lua">
-      <Filter>Lua Skripts\Doors</Filter>
-    </None>
   </ItemGroup>
 </Project>
diff --git a/Koramu/xmlFiles/quests.xml b/Koramu/xmlFiles/quests.xml
@@ -2,7 +2,6 @@
 
 <quests>
   <mainQuest id="prologue">
-    <partQuest id="firstDoNothingQuest"/>
-    <partQuest id="notebookEntry1"/>
+    <partQuest id="FirstDoNothingQuest"/>
   </mainQuest>
 </quests>
diff --git a/Koramu/xmlFiles/scripts.xml b/Koramu/xmlFiles/scripts.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<scripts>
+  <!--Ein Default Skript für GameObjects ohne eigenes Skript (wegen getScriptFromId)-->
+  <script id="default" path="Scripts/default.lua"/>
+
+  <!--Player-->
+  <script id="player" path="Scripts/Objects/player.lua"/>
+
+  <!--Objects-->
+  <script id="test" path="Scripts/test/npc1.lua"/>
+
+  <!--Buttons MenuState-->
+  <script id="buttonPlay" path="Scripts/Buttons/buttonPlay.lua"/>
+  <script id="buttonHowtoplay" path="Scripts/Buttons/buttonHowToPlay.lua"/>
+  <script id="buttonExit" path="Scripts/Buttons/buttonExit.lua"/>
+  <script id="buttonResize" path="Scripts/Buttons/buttonResize.lua"/>
+
+  <!--Buttons PauseState-->
+  <script id="buttonResume" path="Scripts/Buttons/buttonResume.lua"/>
+  <script id="buttonSave" path="Scripts/Buttons/buttonSave.lua"/>
+  <script id="buttonMainMenu" path="Scripts/Buttons/buttonMainMenu.lua"/>
+
+  <!--Quests-->
+  <!--mainQuest: prologue-->
+
+  <!--Items-->
+  <script id="itemList" path="Scripts/Inventory/itemList.lua"/>
+  <script id="topHat" path="Scripts/Inventory/Items/topHat.lua"/>
+
+  <!--Misc-->
+  <script id="koramu" path="Scripts/Misc/koramu.lua"/>
+
+</scripts>