[Orxonox-commit 7064] r11682 - in code/branches/Presentation_HS17: . data/gui/layouts data/gui/scripts data/levels data/overlays src/modules
patricwi at orxonox.net
patricwi at orxonox.net
Sat Dec 16 13:44:42 CET 2017
Author: patricwi
Date: 2017-12-16 13:44:42 +0100 (Sat, 16 Dec 2017)
New Revision: 11682
Added:
code/branches/Presentation_HS17/data/gui/layouts/Dialog.layout
code/branches/Presentation_HS17/data/gui/scripts/Dialog.lua
code/branches/Presentation_HS17/data/levels/DialogShowcase.oxw
code/branches/Presentation_HS17/src/modules/dialog/
Removed:
code/branches/Presentation_HS17/data/gui/layouts/Dialogue.layout
code/branches/Presentation_HS17/data/gui/scripts/Dialogue.lua
code/branches/Presentation_HS17/data/levels/DialogueShowcase.oxw
code/branches/Presentation_HS17/src/modules/dialogue/
Modified:
code/branches/Presentation_HS17/
code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo
code/branches/Presentation_HS17/src/modules/CMakeLists.txt
Log:
dialog merged
Index: code/branches/Presentation_HS17
===================================================================
--- code/branches/Presentation_HS17 2017-12-16 12:32:02 UTC (rev 11681)
+++ code/branches/Presentation_HS17 2017-12-16 12:44:42 UTC (rev 11682)
Property changes on: code/branches/Presentation_HS17
___________________________________________________________________
Modified: svn:mergeinfo
## -3,6 +3,7 ##
/code/branches/AsteroidMining_HS17:11461-11678
/code/branches/BigShip_HS16:11213-11356
/code/branches/CampaignMap_HS17:11458-11680
+/code/branches/Dialog_HS17:11455-11681
/code/branches/Dialogue_FS17:11360-11450
/code/branches/FlappyOrx_HS17:11460-11677
/code/branches/HUD_HS16:11212-11353
Copied: code/branches/Presentation_HS17/data/gui/layouts/Dialog.layout (from rev 11681, code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout)
===================================================================
--- code/branches/Presentation_HS17/data/gui/layouts/Dialog.layout (rev 0)
+++ code/branches/Presentation_HS17/data/gui/layouts/Dialog.layout 2017-12-16 12:44:42 UTC (rev 11682)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="DefaultWindow" Name="orxonox/Dialog/Background" >
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+ <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialog/Options" >
+ <Property Name="Alpha" Value="0.8" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="HorzFormatting" Value="HorzCentred" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="VertFormatting" Value="TopAligned" />
+ <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
+
+ <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialog/Person" >
+ <Property Name="Alpha" Value="0.8" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="HorzFormatting" Value="LeftAligned" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="VertFormatting" Value="CentreAligned" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.05,0},{0.25,0},{0.15,0}}" />
+ </Window>
+
+ <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestionWrapper" >
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="HorzFormatting" Value="HorzCentred" />
+ <Property Name="VertFormatting" Value="TopAligned" />
+ <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.95,0},{0.45,0}}" />
+ <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/QuestionPane" >
+ <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
+ <Property Name="HorzStepSize" Value="0.005" />
+ <Property Name="VertStepSize" Value="0.005" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="HorzOverlapSize" Value="0.01" />
+ <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.997,0},{0.997,0}}" />
+ <Property Name="VertOverlapSize" Value="0.01" />
+ <Property Name="HorzScrollPosition" Value="0" />
+ <Property Name="VertScrollPosition" Value="0" />
+ <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialog/Question" >
+ <Property Name="Alpha" Value="0.8" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
+ <Property Name="VertFormatting" Value="CentreAligned" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+ </Window>
+ </Window>
+ </Window>
+
+ <Window Type="MenuWidgets/Listbox" Name="orxonox/AnsListbox" >
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.5,0},{0.95,0},{0.85,0}}" />
+ <Event Name="ItemSelectionChanged" Function="Dialog.answer_changed" />
+ </Window>
+
+ <Window Type="MenuWidgets/Button" Name="orxonox/SayButton" >
+ <Property Name="Text" Value="Say" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.425,0},{0.9,0},{0.575,0},{0.975,0}}" />
+ <Event Name="Clicked" Function="Dialog.Button_clicked"/>
+ </Window>
+ </Window>
+
+ </Window>
+</GUILayout>
\ No newline at end of file
Deleted: code/branches/Presentation_HS17/data/gui/layouts/Dialogue.layout
===================================================================
--- code/branches/Presentation_HS17/data/gui/layouts/Dialogue.layout 2017-12-16 12:32:02 UTC (rev 11681)
+++ code/branches/Presentation_HS17/data/gui/layouts/Dialogue.layout 2017-12-16 12:44:42 UTC (rev 11682)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
- <Window Type="DefaultWindow" Name="orxonox/Dialogue/Background" >
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialogue/Inventory" >
- <Property Name="Alpha" Value="0.8" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialogue/Wrapper" >
- <Property Name="TextColours" Value="FF4444FF" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
- </Window>
- </Window>
-
- </Window>
-</GUILayout>
\ No newline at end of file
Copied: code/branches/Presentation_HS17/data/gui/scripts/Dialog.lua (from rev 11681, code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua)
===================================================================
--- code/branches/Presentation_HS17/data/gui/scripts/Dialog.lua (rev 0)
+++ code/branches/Presentation_HS17/data/gui/scripts/Dialog.lua 2017-12-16 12:44:42 UTC (rev 11682)
@@ -0,0 +1,127 @@
+-- Dialog.lua
+
+local P = createMenuSheet("Dialog")
+
+P.wrapper = nil
+P.detailsWindows = {}
+P.showing = false
+P.choice = 0
+P.scrollbarWidth = 12
+
+function P.onLoad() --wird ausgefuert wenn Fenster geladen
+ P.wrapper = nil
+end
+
+function P.onShow() --wird ausgefuert wenn Dialogfenster gezeigt
+
+ orxonox.CommandExecutor:execute("setTimeFactor 0")
+ P.createDialog()
+ P.showing = true
+
+end
+
+function P.onHide() --aufgefuert wenn Fenster geschlossen wird
+ orxonox.CommandExecutor:execute("setTimeFactor 1")
+ P.showing = false
+ P.cleanup(true)
+end
+
+function P.createDialog() -- initiallisiert das Dialog Fenster, setzt Namen sowie die erste Frage mit enstprechenden Antworten
+
+ local manager = orxonox.DialogManager:getInstance()
+
+
+ local personfield = winMgr:getWindow("orxonox/Dialog/Person")
+ local person = manager:getPerson()
+ personfield:setText(person)
+
+ local questionfield = winMgr:getWindow("orxonox/Dialog/Question")
+ local question = manager:getQuestion()
+ questionfield:setText(question)
+
+ local listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
+ CEGUI.toListbox(listboxwindow):resetList()
+
+ local ansList = {}
+ local anssize = manager:getSize()
+
+ for index = 0, anssize -1, 1 do
+ table.insert(ansList, manager:getAnswer(index))
+ end
+
+ for k,v in pairs(ansList) do
+ item = CEGUI.createListboxTextItem(v)
+ item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ CEGUI.toListbox(listboxwindow):addItem(item)
+ end
+end
+
+function P.updateDialog() --updated den Dialog entsprechend der Ausgeaehlten option der letzten Frage, setzt Frage und Antwortmoeglichkeiten neu
+ local manager = orxonox.DialogManager:getInstance()
+ manager:update(P.choice)
+
+ local questionfield = winMgr:getWindow("orxonox/Dialog/Question")
+ local question = manager:getQuestion()
+ questionfield:setText(question)
+
+ local listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
+ listboxwindow:resetList()
+
+ local ansList = {}
+ local anssize = manager:getSize()
+
+ for index = 0, anssize -1, 1 do
+ table.insert(ansList, manager:getAnswer(index))
+ end
+
+ for k,v in pairs(ansList) do
+ item = CEGUI.createListboxTextItem(v)
+ item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ CEGUI.toListbox(listboxwindow):addItem(item)
+ end
+
+ P.choice = 0
+end
+
+function P.answer_changed(e) --wird aufgerufen falls Auswahl geaendert wird und setzt enstprechenden Indexparameter
+ listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
+ selection = listboxwindow:getFirstSelectedItem()
+ if selection ~= nil then
+ P.choice = listboxwindow:getItemIndex(selection)
+ else
+ P.choice = 0
+ end
+end
+
+
+function P.cleanup(destroyDetails) --loest Fenster wieder auf (!nicht selbst geschrieben, nur uebernommen, eventuell nicht noetiger code)
+
+ if P.wrapper ~= nil then
+ winMgr:destroyWindow(P.wrapper)
+ end
+
+ --Destroy details windows.
+ if destroyDetails == false then
+ return
+ end
+ for k,v in pairs(P.detailsWindows) do
+ if v ~= nil then
+ P.destroyDetailWindow(k)
+ end
+ end
+
+end
+
+
+
+function P.Button_clicked(e) --wird bei click auf say knopf ausgeloest, entscheidet ob Dialog schliesst oder updated und fuert entsprechen aus
+ local ending = orxonox.DialogManager:getInstance():endtest(P.choice)
+
+ if ending then
+ orxonox.CommandExecutor:execute("OrxonoxOverlay toggleVisibility Dialog")
+ else
+ P.updateDialog(index)
+ end
+end
+
+return P
Deleted: code/branches/Presentation_HS17/data/gui/scripts/Dialogue.lua
===================================================================
--- code/branches/Presentation_HS17/data/gui/scripts/Dialogue.lua 2017-12-16 12:32:02 UTC (rev 11681)
+++ code/branches/Presentation_HS17/data/gui/scripts/Dialogue.lua 2017-12-16 12:44:42 UTC (rev 11682)
@@ -1,144 +0,0 @@
-
--- Dialogue.lua
-
-local P = createMenuSheet("Dialogue")
-
-P.wrapper = nil
-P.detailsWindows = {}
-P.detailPickups = {}
-P.pickupsList = {}
-
-P.showing = false
-
--- Design parameters
-P.imageHeight = 50
-P.detailImageSize = 100
-P.textHeight = 30
-P.buttonWidth = 85
-
-function P.onLoad()
- P.wrapper = nil
- P.detailsWindows = {}
- P.detailPickups = {}
- P.pickupsList = {}
-end
-
-function P.onShow()
- orxonox.CommandExecutor:execute("setTimeFactor 0")
- P.createInventory()
- P.showing = true
-
-end
-
-function P.onHide()
- orxonox.CommandExecutor:execute("setTimeFactor 1")
- P.showing = false
- P.cleanup(true)
-end
-
-function P.update()
- P.updateInventory()
- if P.showing == false then
- return
- end
-
- -- Update opened detail windows.
-
-
- -- Update main inventory.
- P.cleanup(false)
- P.createInventory()
- -- TODO: Recover scrolling position
-
-end
-
-function P.createInventory()
-
- local pickupManager = orxonox.DialogueManager:getInstance()
-
- root = winMgr:getWindow("orxonox/Dialogue/Inventory")
- local question = orxonox.DialogueManager:getInstance():getquestion()
- root:setText(question)
- P.wrapper = winMgr:createWindow("MenuWidgets/ScrollablePane", "orxonox/Dialogue/Inventory/Wrapper")
- P.wrapper:setSize(CEGUI.UVector2(CEGUI.UDim(1,0),CEGUI.UDim(1,0)))
- root:addChildWindow(P.wrapper)
-
-
- detailsButton = winMgr:createWindow("MenuWidgets/Button", "/DetailsButton")
- local a1 = orxonox.DialogueManager:getInstance():getanswers1()
- detailsButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.25, (P.imageHeight-P.textHeight)/2)))
- detailsButton:setSize(CEGUI.UVector2(CEGUI.UDim(0.8, 0), CEGUI.UDim(0, P.textHeight)))
- detailsButton:setText(a1)
- orxonox.GUIManager:subscribeEventHelper(detailsButton, "Clicked", P.name ..".a1Button_clicked")
- P.wrapper:addChildWindow(detailsButton)
-
- a2Button = winMgr:createWindow("MenuWidgets/Button", "/a2Button")
- local a2 = orxonox.DialogueManager:getInstance():getanswers2()
- a2Button:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.4, (P.imageHeight-P.textHeight)/2)))
- a2Button:setSize(CEGUI.UVector2(CEGUI.UDim(0.8, 0), CEGUI.UDim(0, P.textHeight)))
- a2Button:setText(a2)
- orxonox.GUIManager:subscribeEventHelper(a2Button, "Clicked", P.name ..".a2Button_clicked")
- P.wrapper:addChildWindow(a2Button)
-
-
-end
-
-function P.updateInventory()
- local questionn = orxonox.DialogueManager:getInstance():getquestion()
- root:setText(questionn)
- local a1n = orxonox.DialogueManager:getInstance():getanswers1()
- detailsButton:setText(a1n)
- local a2n = orxonox.DialogueManager:getInstance():getanswers2()
- a2Button:setText(a2n)
-
-end
-
-
-function P.cleanup(destroyDetails)
-
- if P.wrapper ~= nil then
- winMgr:destroyWindow(P.wrapper)
- end
-
- --Destroy details windows.
- if destroyDetails == false then
- return
- end
- for k,v in pairs(P.detailsWindows) do
- if v ~= nil then
- P.destroyDetailWindow(k)
- end
- end
-
-end
-
-
-
-function P.a1Button_clicked(e)
- local ending = orxonox.DialogueManager:getInstance():theEnd()
-
- if ending then
- orxonox.CommandExecutor:execute("OrxonoxOverlay toggleVisibility Dialogue")
-
-
- else
- orxonox.DialogueManager:getInstance():a1clicked()
- P.update()
- end
-end
-
-function P.a2Button_clicked(e)
- local ending = orxonox.DialogueManager:getInstance():theEnd()
-
- if ending then
- orxonox.CommandExecutor:execute("OrxonoxOverlay toggleVisibility Dialogue")
-
-
- else
- orxonox.DialogueManager:getInstance():a2clicked()
- P.update()
- end
-
-end
-
-return P
Copied: code/branches/Presentation_HS17/data/levels/DialogShowcase.oxw (from rev 11681, code/branches/Dialog_HS17/data/levels/DialogShowcase.oxw)
===================================================================
--- code/branches/Presentation_HS17/data/levels/DialogShowcase.oxw (rev 0)
+++ code/branches/Presentation_HS17/data/levels/DialogShowcase.oxw 2017-12-16 12:44:42 UTC (rev 11682)
@@ -0,0 +1,131 @@
+<LevelInfo
+ name = "DialogShowase"
+ description = "A level to show and test the functionality of the Dialog module."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+ include("templates/HeavyCruiser.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipEscort.oxt")
+ include("templates/endurancetest_template.oxt")
+?>
+
+<Level>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+ <DistanceTrigger name="test" position="100,0,100" target="Pawn" distance=25 stayActive="true" />
+ <Backlight position="100,0,100" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
+
+ <Dialog name="Kurt" currentQuestionId="loop1">
+ <questions>
+ <Question Id="loop1" question="Wanna be looped?" >
+ <answerIds>
+ <AnswerId Id="yes"/>
+ <AnswerId Id="no"/>
+ <AnswerId Id="giveItToMe"/>
+ </answerIds>
+ </Question>
+ <Question Id="lorem" question="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." >
+ <answerIds>
+ <AnswerId Id="endIt"/>
+ </answerIds>
+ </Question>
+ <Question Id="loop2" question="Wanna be looped again?" >
+ <answerIds>
+ <AnswerId Id="yes"/>
+ <AnswerId Id="no"/>
+ <AnswerId Id="endIt"/>
+ </answerIds>
+ </Question>
+ <Question Id="ok" question="Guess not then"/>
+ </questions>
+ <answers>
+ <Answer Id="giveItToMe" answer="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." nextQuestionId="lorem"/>
+ <Answer Id="yes" answer="yeah loop me" nextQuestionId="loop2"/>
+ <Answer Id="no" answer="i'd rather not" nextQuestionId="ok"/>
+ <Answer Id="endIt" answer="i will go now..." nextQuestionId="end"/>
+ </answers>
+ <events>
+ <execute>
+ <EventListener event="test"/>
+ </execute>
+ </events>
+ </Dialog>
+
+
+
+
+ <DistanceTrigger name="troll" position="100,0,200" target="Pawn" distance=25 stayActive="true" />
+ <Backlight position="100,0,200" visible=true frequency=0.3 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
+
+ <Dialog name="Rick" currentQuestionId="start">
+ <questions>
+ <Question Id= "start" question= "hey can you predect what i will do next?">
+ <answerIds>
+ <AnswerId Id="NeverGonnaGiveMeUp" />
+ <AnswerId Id="DontCare"/>
+ <AnswerId Id="Serious" />
+ </answerIds>
+ </Question>
+
+ <Question Id= "WeAreNoStrangers" question= "We're no strangers to love. You know the rules and so do I. A full commitment's what I'm thinking of,
+You wouldn't get this from any other guy.">
+ <answerIds>
+ <AnswerId Id="whatIamFeeling"/>
+ <AnswerId Id="DontCare"/>
+ <AnswerId Id="IGoNow"/>
+ </answerIds>
+ </Question>
+
+ <Question Id= "NeverGonnaLetYouDown" question= "Never gonna give you up
+Never gonna let you down
+Never gonna run around and desert you
+Never gonna make you cry
+Never gonna say goodbye
+Never gonna tell a lie and hurt you" >
+ <answerIds>
+ <AnswerId Id="Again"/>
+ <AnswerId Id="IGoNow"/>
+ </answerIds>
+ </Question>
+
+ <Question Id= "leave" question= "That was not what i had in mind but that is way better, thanks for the advidce. I will leave now."/>
+
+ </questions>
+
+ <answers>
+ <Answer Id= "NeverGonnaGiveMeUp" nextQuestionId ="WeAreNoStrangers" answer= "wait are you the RICK?!" />
+ <Answer Id= "DontCare" nextQuestionId ="end" answer= "I could not care less" />
+ <Answer Id= "Serious" nextQuestionId ="leave" answer= "The same thing you do every night? - try to take over the world?" />
+ <Answer Id= "whatIamFeeling" nextQuestionId ="NeverGonnaLetYouDown" answer= "I just wanna tell you how I'm feeling, gotta make you understand" />
+ <Answer Id= "IGoNow" nextQuestionId ="" answer= "well that strange i guess i go now..." />
+ <Answer Id= "Again" nextQuestionId ="WeAreNoStrangers" answer= "I didn't quiet get it." />
+ </answers>
+
+ <events>
+ <execute>
+ <EventListener event="troll"/>
+ </execute>
+ </events>
+ </Dialog>
+
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+ <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+
+ </Scene>
+</Level>
Deleted: code/branches/Presentation_HS17/data/levels/DialogueShowcase.oxw
===================================================================
--- code/branches/Presentation_HS17/data/levels/DialogueShowcase.oxw 2017-12-16 12:32:02 UTC (rev 11681)
+++ code/branches/Presentation_HS17/data/levels/DialogueShowcase.oxw 2017-12-16 12:44:42 UTC (rev 11682)
@@ -1,79 +0,0 @@
-<LevelInfo
- name = "DialogueShowcase"
- description = "A level to show and test the functionality of the Dialogue module."
- tags = "test"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
- include("templates/HeavyCruiser.oxt")
-?>
-
-<?lua
- include("templates/spaceshipEscort.oxt")
- include("templates/endurancetest_template.oxt")
-?>
-
-<Level>
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
- <DistanceTrigger name="test" position="100,0,100" target="Pawn" distance=25 stayActive="true" />
- <Backlight position="100,0,100" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
-
- <NextQuestion question="Unknown Spaceship Transmission: Who goes there?" a1="(say your name)" a2="None of your business I'm afraid." >
- <possibleQuestions>
- <NextQuestion question="You're not cleared for this area, turn back." a1="Doesn't look too exciting here anyways." a2="You gotta make me try...(attack)" />
- <NextQuestion question="I'll make it my business. Only military allowed in this area." a1="Whoops, didn't know that, I'll be on my way then." a2="Got an important message for Sgt Smith though." >
- <possibleQuestions>
- <NextQuestion question="Make sure I don't have to see your ugly face again." a1="...thanks, bye." a2="I'll think about it." />
- <NextQuestion question="Oh why didn't you say that in the first place? Off you go." a1="Thanks mate." a2="Just don't be so rude next time." />
- </possibleQuestions>
- </NextQuestion>
- </possibleQuestions>
- <events>
- <execute>
- <EventListener event="test" />
- </execute>
- </events>
- </NextQuestion>
-
- <DistanceTrigger name="test1" position="100,0,-100" target="Pawn" distance=25 stayActive="true" />
- <Backlight position="100,0,-100" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,1,1"/>
-
- <NextQuestion question="Hey, sorry to bother you, could you help me with something?" a1="Yeah sure." a2="Nope get lost." >
- <possibleQuestions>
- <NextQuestion question="Do you like fish" a1="...yes?" a2="This is wasting my time." >
- <possibleQuestions>
- <NextQuestion question="Splendid! Would you like your ship to look like one?" a1="..." a2="I'm going now, okay?" />
- <NextQuestion question="Turtles then?" a1="..." a2="Im going now, okay?" />
- </possibleQuestions>
- </NextQuestion>
- <NextQuestion question="I can pay you know." a1="Got enough money." a2="...are you deaf? Bye."/>
- </possibleQuestions>
- <events>
- <execute>
- <EventListener event="test1" />
- </execute>
- </events>
- </NextQuestion>
-
-
-
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
- <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-
-
-
- </Scene>
-</Level>
Modified: code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo 2017-12-16 12:32:02 UTC (rev 11681)
+++ code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo 2017-12-16 12:44:42 UTC (rev 11682)
@@ -214,8 +214,8 @@
/>
<GUIOverlay
- name = "Dialogue"
- guiname = "Dialogue"
+ name = "Dialog"
+ guiname = "Dialog"
visible = "false"
/>
Modified: code/branches/Presentation_HS17/src/modules/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS17/src/modules/CMakeLists.txt 2017-12-16 12:32:02 UTC (rev 11681)
+++ code/branches/Presentation_HS17/src/modules/CMakeLists.txt 2017-12-16 12:44:42 UTC (rev 11682)
@@ -25,8 +25,8 @@
################ Sub Directories ################
+ADD_SUBDIRECTORY(dialog)
ADD_SUBDIRECTORY(asteroidmining)
-ADD_SUBDIRECTORY(dialogue)
ADD_SUBDIRECTORY(designtools)
ADD_SUBDIRECTORY(gametypes)
ADD_SUBDIRECTORY(notifications)
More information about the Orxonox-commit
mailing list