aaaahh

VacaRoxa · Jan 27, 2019 · 1ba7b8e · 1ba7b8e
1 parent c6f2e7e
commit 1ba7b8e
Show file tree

Hide file tree

Showing 24 changed files with 102 additions and 5 deletions.
diff --git a/Game.agf b/Game.agf
@@ -873,6 +873,48 @@
             </NormalGUI>
             <Controls />
           </GUIMain>
+          <GUIMain>
+            <NormalGUI>
+              <OnClick />
+              <Height>32</Height>
+              <Width>224</Width>
+              <Left>0</Left>
+              <Top>0</Top>
+              <Clickable>True</Clickable>
+              <Visibility>NormalButInitiallyOff</Visibility>
+              <PopupYPos>0</PopupYPos>
+              <ZOrder>0</ZOrder>
+              <BorderColor>0</BorderColor>
+              <Transparency>0</Transparency>
+              <BackgroundColor>0</BackgroundColor>
+              <BackgroundImage>0</BackgroundImage>
+              <ID>9</ID>
+              <Name>gTopGui</Name>
+            </NormalGUI>
+            <Controls>
+              <GUIButton>
+                <OnClick>ResetRoomButton_OnClick</OnClick>
+                <ClickAction>RunScript</ClickAction>
+                <NewModeNumber>0</NewModeNumber>
+                <ClipImage>False</ClipImage>
+                <TextAlignment>TopMiddle</TextAlignment>
+                <TextColor>0</TextColor>
+                <Font>0</Font>
+                <PushedImage>0</PushedImage>
+                <MouseoverImage>0</MouseoverImage>
+                <Image>153</Image>
+                <Text xml:space="preserve">New Button</Text>
+                <Height>22</Height>
+                <Locked>False</Locked>
+                <Width>20</Width>
+                <Left>8</Left>
+                <Top>5</Top>
+                <ZOrder>0</ZOrder>
+                <ID>0</ID>
+                <Name>ResetRoomButton</Name>
+              </GUIButton>
+            </Controls>
+          </GUIMain>
         </GUIs>
       </GUIFolder>
     </GUIs>
@@ -3727,6 +3769,16 @@
               <Sprite Slot="152" Width="96" Height="48" ColorDepth="32" Resolution="LowRes" AlphaChannel="False" />
             </Sprites>
           </SpriteFolder>
+          <SpriteFolder Name="Gui">
+            <SubFolders />
+            <Sprites>
+              <Sprite Slot="153" Width="20" Height="22" ColorDepth="32" Resolution="LowRes" AlphaChannel="True">
+                <Source>
+                  <FileName>img/gui/reset_room.png</FileName>
+                </Source>
+              </Sprite>
+            </Sprites>
+          </SpriteFolder>
         </SubFolders>
         <Sprites>
           <Sprite Slot="0" Width="1" Height="1" ColorDepth="8" Resolution="LowRes" AlphaChannel="False" />

diff --git a/GlobalScript.asc b/GlobalScript.asc
@@ -1,4 +1,6 @@
 // main global script file
+int room_to_go_back;
+bool resetRoom;
 
 // called when the game starts, before the first room is loaded
 function game_start() 
@@ -8,6 +10,7 @@ function game_start()
   cDog.SetIdleView(DOGIDDLE1, 1);
   KeyboardMovement.SetMode(eKMModePressing);
   KeyboardMovement.Enable();
+  KeyboardMovement.SetMovementKeys(eKMMovementArrowKeys);
   cBone1.ChangeRoom(TRASH);
   cBone2.ChangeRoom(TRASH);
   cBone3.ChangeRoom(TRASH);
@@ -27,7 +30,20 @@ function game_start()
 // put anything you want to happen every game cycle in here
 function repeatedly_execute() 
 {
-
+  if(room_to_go_back>0){
+    room_to_go_back = 0;
+   //player.ChangeRoom(room_to_go_back);
+  }
+  if(resetRoom){
+    resetRoom = false; 
+    ResetRoom(1);
+    ResetRoom(2);
+    ResetRoom(3);
+    ResetRoom(4);
+    ResetRoom(5);
+    player.x = 21;
+    player.y = 284; 
+  }
 }
 
 // put here anything you want to happen every game cycle, even when the game is blocked
@@ -69,4 +85,12 @@ function on_mouse_click(MouseButton button) // called when a mouse button is cli
 
 
 function dialog_request(int param) {
-}
+}
+
+
+function ResetRoomButton_OnClick(GUIControl *control, MouseButton button)
+{
+  room_to_go_back = player.Room;
+  resetRoom = true;
+  player.ChangeRoom(7);
+}
diff --git a/acsprset.spr b/acsprset.spr
diff --git a/img/gui/reset_room.png b/img/gui/reset_room.png
diff --git a/img/hell_puppy/hell_puppy.png b/img/hell_puppy/hell_puppy.png
diff --git a/img/title_screen/title.png b/img/title_screen/title.png
diff --git a/room1.asc b/room1.asc
@@ -42,5 +42,6 @@ function room_Leave()
 
 function room_Load()
 {
+  gTopGui.Visible = true;
   cBonePile.ChangeRoom(1, 21, 285);
 }
diff --git a/room1.crm b/room1.crm
diff --git a/room2.asc b/room2.asc
@@ -44,5 +44,6 @@ function room_Leave()
 
 function room_Load()
 {
+  gTopGui.Visible = true;
   cBonePile.ChangeRoom(2, 21, 285);
 }
diff --git a/room2.crm b/room2.crm
diff --git a/room3.asc b/room3.asc
@@ -42,5 +42,6 @@ function room_Leave()
 
 function room_Load()
 {
+  gTopGui.Visible = true;
   cBonePile.ChangeRoom(3, 21, 285);
 }
diff --git a/room3.crm b/room3.crm
diff --git a/room4.asc b/room4.asc
@@ -42,5 +42,6 @@ function room_Leave()
 
 function room_Load()
 {
+  gTopGui.Visible = true;
   cBonePile.ChangeRoom(4, 21, 285);
 }
diff --git a/room4.crm b/room4.crm
diff --git a/room5.asc b/room5.asc
@@ -42,5 +42,6 @@ function room_Leave()
 
 function room_Load()
 {
+  gTopGui.Visible = true;
   cBonePile.ChangeRoom(5, 21, 285);
 }
diff --git a/room5.crm b/room5.crm
diff --git a/room6.crm b/room6.crm
diff --git a/room7.asc b/room7.asc
@@ -2,18 +2,32 @@
 
 function room_Load()
 {
+  gTopGui.Visible = false;
   CustomTransition_IntantFadeIn();
   aDog_from_hell.Play(eAudioPriorityHigh, eRepeat);
 }
 
-function room_AfterFadeIn()
-{
-  Wait(SecondsToLoops(3.0));
+void goToLevelONE(){
+  Wait(SecondsToLoops(0.1));
   CustomTransition_FadeOut(1.6, eBlockTween);
   player.ChangeRoom(1, 30, 284, eDirectionRight);
+
+}
+
+function room_AfterFadeIn()
+{
 }
 
 function room_Leave()
 {
 
 }
+
+function hHotspot1_AnyClick()
+{
+  goToLevelONE();
+}
+
+function on_key_press(eKeyCode keycode){
+  goToLevelONE();
+}
diff --git a/room7.crm b/room7.crm
diff --git a/room8.asc b/room8.asc
@@ -11,6 +11,7 @@ function room_AfterFadeIn()
 
 function room_Load()
 {
+  gTopGui.Visible = false;
 
 }
 

diff --git a/room8.crm b/room8.crm
diff --git a/room9.asc b/room9.asc
@@ -3,6 +3,7 @@
 
 function room_Load()
 {
+  gTopGui.Visible = false;
   CustomTransition_IntantFadeIn();
   aDog_from_hell.Play(eAudioPriorityHigh, eRepeat);
 }

diff --git a/room9.crm b/room9.crm
diff --git a/sprindex.dat b/sprindex.dat
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ function room_AfterFadeIn() @@
     function room_Load()
     {
+      gTopGui.Visible = false;
     }
@@ Expand Down @@