chsh
/
game
1
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: chsh:3375d6180f09d61d56bbe193095b4463bb63b5c3
Branches Tags
chsh:feat/dialogic
chsh:feat/laptop
chsh:fix/wall
chsh:master
..
compare: chsh:1731b6057221aa5e39a209028e87be6eeb3c5889
Branches Tags
chsh:feat/dialogic
chsh:feat/laptop
chsh:fix/wall
chsh:master

No commits in common. '3375d6180f09d61d56bbe193095b4463bb63b5c3' and '1731b6057221aa5e39a209028e87be6eeb3c5889' have entirely different histories.
3375d6180f ... 1731b60572

16 changed files with 82 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 2
      .gitignore
  2. 0
      CameraFollow.gd
  3. 46
      Ch1S2.tscn
  4. 6
      LivingRoom.tscn
  5. 6
      MainScene.tscn
  6. 0
      Player.gd
  7. 30
      Player.tscn
  8. 0
      UI.tscn
  9. 2
      backroom.tscn
  10. 0
      limbo.tres
  11. 2
      limbo.tscn
  12. 0
      lodge.tres
  13. 2
      project.godot
  14. BIN
      richal/front.png
  15. 35
      richal/front.png.import
  16. 0
      woods.tres

2
.gitignore vendored
Unescape View File

@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
game.pck
.import/

0
Scripts/CameraFollow.gd → CameraFollow.gd
Unescape View File

46
Story/Ch1S2.tscn → Ch1S2.tscn
Unescape View File

@ -1,52 +1,52 @@ @@ -1,52 +1,52 @@
[gd_scene load_steps=12 format=2]
[ext_resource path="res://Resources/lodge.tres" type="TileSet" id=1]
[ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=2]
[ext_resource path="res://Sprites/alistair/Alistair-back.tscn" type="PackedScene" id=3]
[ext_resource path="res://Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://UI.tscn" type="PackedScene" id=2]
[ext_resource path="res://Sprites/richal/Richal.tscn" type="PackedScene" id=3]
[ext_resource path="res://Tiles/Furniture/kettle.png" type="Texture" id=4]
[ext_resource path="res://Tiles/Furniture/mug.png" type="Texture" id=5]
[ext_resource path="res://Sprites/charlene/Charlene.tscn" type="PackedScene" id=6]
[ext_resource path="res://Resources/woods.tres" type="TileSet" id=7]
[ext_resource path="res://Scenes/UI.tscn" type="PackedScene" id=8]
[ext_resource path="res://Sprites/jame/James.tscn" type="PackedScene" id=9]
[ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=10]
[ext_resource path="res://Sprites/richal/Richal.tscn" type="PackedScene" id=11]
[ext_resource path="res://Sprites/jame/James.tscn" type="PackedScene" id=6]
[ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=7]
[ext_resource path="res://woods.tres" type="TileSet" id=8]
[ext_resource path="res://Sprites/charlene/Charlene.tscn" type="PackedScene" id=9]
[ext_resource path="res://Sprites/alistair/Alistair-back.tscn" type="PackedScene" id=10]
[ext_resource path="res://lodge.tres" type="TileSet" id=14]
[node name="LivingRoom" type="Node2D"]
[node name="Sky" type="TileMap" parent="."]
tile_set = ExtResource( 7 )
tile_set = ExtResource( 8 )
cell_size = Vector2( 60, 60 )
format = 1
tile_data = PoolIntArray( 0, 0, 0, 4, 0, 0, 8, 0, 0, 12, 0, 0 )
[node name="Woods" type="TileMap" parent="."]
tile_set = ExtResource( 7 )
tile_set = ExtResource( 8 )
cell_size = Vector2( 60, 60 )
format = 1
tile_data = PoolIntArray( 65537, 1, 0, 65538, 1, 0, 65541, 1, 0, 65542, 1, 0 )
[node name="Lodge" type="TileMap" parent="."]
position = Vector2( 60, 0 )
tile_set = ExtResource( 1 )
tile_set = ExtResource( 14 )
cell_size = Vector2( 60, 60 )
cell_quadrant_size = 15
format = 1
tile_data = PoolIntArray( 65535, 15, 0, 0, 16, 0, 2, 16, 0, 4, 16, 0, 6, 17, 0, 7, 31, 0, 8, 5, 0, 9, 5, 0, 10, 5, 0, 11, 5, 0, 12, 5, 0, 13, 5, 0, 14, 5, 0, 131071, 18, 0, 65536, 19, 0, 65538, 19, 0, 65540, 19, 0, 65542, 20, 0, 65543, 31, 0, 65544, 5, 0, 65545, 5, 0, 65546, 5, 0, 65547, 5, 0, 65548, 5, 0, 65549, 5, 0, 65550, 5, 0, 196607, 21, 0, 131072, 22, 0, 131074, 22, 0, 131076, 22, 0, 131078, 23, 0, 131079, 6, 0, 131080, 51, 0, 131082, 51, 0, 131084, 51, 0, 131086, 8, 0, 262143, 24, 0, 196608, 25, 0, 196610, 25, 0, 196612, 25, 0, 196614, 25, 0, 196616, 25, 0, 196618, 25, 0, 196620, 25, 0, 196622, 26, 0, 327679, 24, 0, 262144, 25, 0, 262146, 25, 0, 262148, 25, 0, 262150, 25, 0, 262152, 25, 0, 262154, 25, 0, 262156, 25, 0, 262158, 26, 0, 393215, 50, 0, 327680, 25, 0, 327682, 25, 0, 327684, 25, 0, 327686, 25, 0, 327688, 25, 0, 327690, 25, 0, 327692, 25, 0, 327694, 7, 0, 458751, 50, 0, 393216, 25, 0, 393218, 25, 0, 393220, 25, 0, 393222, 25, 0, 393224, 25, 0, 393226, 25, 0, 393228, 25, 0, 393230, 7, 0, 524287, 27, 0, 458752, 28, 0, 458754, 28, 0, 458756, 28, 0, 458758, 28, 0, 458760, 28, 0, 458762, 28, 0, 458764, 28, 0, 458766, 29, 0 )
[node name="Carpet" type="TileMap" parent="."]
tile_set = ExtResource( 1 )
tile_set = ExtResource( 14 )
cell_size = Vector2( 60, 60 )
format = 1
tile_data = PoolIntArray( 262145, 36, 0, 262146, 37, 0, 262147, 37, 0, 262148, 37, 0, 262149, 37, 0, 262150, 38, 0, 327681, 39, 0, 327682, 40, 0, 327683, 40, 0, 327684, 40, 0, 327685, 40, 0, 327686, 41, 0, 393217, 42, 0, 393218, 43, 0, 393219, 43, 0, 393220, 43, 0, 393221, 43, 0, 393222, 44, 0 )
[node name="YSort" type="YSort" parent="."]
[node name="Player" parent="YSort" instance=ExtResource( 10 )]
[node name="Player" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 453, 309 )
[node name="Furniture" type="TileMap" parent="YSort"]
tile_set = ExtResource( 1 )
tile_set = ExtResource( 14 )
cell_size = Vector2( 30, 30 )
cell_tile_origin = 2
cell_y_sort = true
@ -54,26 +54,26 @@ format = 1 @@ -54,26 +54,26 @@ format = 1
tile_data = PoolIntArray( 131090, 45, 0, 458761, 47, 0, 524300, 48, 0, 589827, 53, 0, 589840, 32, 0, 720899, 54, 0, 720905, 46, 0, 720914, 34, 0, 720916, 34, 0, 720918, 34, 0, 720920, 34, 0, 720922, 34, 0 )
[node name="Chairs" type="TileMap" parent="YSort"]
tile_set = ExtResource( 1 )
tile_set = ExtResource( 14 )
cell_size = Vector2( 30, 30 )
cell_tile_origin = 1
cell_y_sort = true
format = 1
tile_data = PoolIntArray( 524305, 35, 0, 524307, 35, 0, 524309, 35, 0, 524311, 35, 0, 524313, 35, 0 )
[node name="Richal" parent="YSort" instance=ExtResource( 11 )]
[node name="Richal" parent="YSort" instance=ExtResource( 3 )]
position = Vector2( 600, 180 )
[node name="James" parent="YSort" instance=ExtResource( 9 )]
[node name="James" parent="YSort" instance=ExtResource( 6 )]
position = Vector2( 840, 190 )
[node name="Sak" parent="YSort" instance=ExtResource( 2 )]
[node name="Sak" parent="YSort" instance=ExtResource( 7 )]
position = Vector2( 900, 230 )
[node name="Charlene" parent="YSort" instance=ExtResource( 6 )]
[node name="Charlene" parent="YSort" instance=ExtResource( 9 )]
position = Vector2( 380, 380 )
[node name="Alistair" parent="YSort" instance=ExtResource( 3 )]
[node name="Alistair" parent="YSort" instance=ExtResource( 10 )]
position = Vector2( 165, 150 )
[node name="Kettle" type="Sprite" parent="YSort"]
@ -89,11 +89,11 @@ position = Vector2( 580, 155 ) @@ -89,11 +89,11 @@ position = Vector2( 580, 155 )
texture = ExtResource( 5 )
[node name="Floating" type="TileMap" parent="."]
tile_set = ExtResource( 1 )
tile_set = ExtResource( 14 )
cell_size = Vector2( 30, 30 )
format = 1
tile_data = PoolIntArray( 458755, 52, 0 )
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="UI" parent="CanvasLayer" instance=ExtResource( 8 )]
[node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )]

6
Scenes/LivingRoom.tscn → LivingRoom.tscn
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Resources/lodge.tres" type="TileSet" id=1]
[ext_resource path="res://Scenes/UI.tscn" type="PackedScene" id=2]
[ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=3]
[ext_resource path="res://lodge.tres" type="TileSet" id=1]
[ext_resource path="res://UI.tscn" type="PackedScene" id=2]
[ext_resource path="res://Player.tscn" type="PackedScene" id=3]
[node name="LivingRoom" type="Node2D"]
position = Vector2( 60, 0 )

6
Scenes/MainScene.tscn → MainScene.tscn
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://Scenes/UI.tscn" type="PackedScene" id=2]
[ext_resource path="res://Resources/lodge.tres" type="TileSet" id=14]
[ext_resource path="res://Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://UI.tscn" type="PackedScene" id=2]
[ext_resource path="res://lodge.tres" type="TileSet" id=14]
[node name="LivingRoom" type="Node2D"]
position = Vector2( 60, 0 )

0
Scripts/Player.gd → Player.gd
Unescape View File

30
Scenes/Player.tscn → Player.tscn
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
[gd_scene load_steps=16 format=2]
[ext_resource path="res://Scripts/Player.gd" type="Script" id=1]
[ext_resource path="res://Player.gd" type="Script" id=1]
[ext_resource path="res://Sprites/mc/front.png" type="Texture" id=2]
[ext_resource path="res://Sprites/mc/right.png" type="Texture" id=3]
[ext_resource path="res://Sprites/mc/left.png" type="Texture" id=4]
@ -16,16 +16,6 @@ @@ -16,16 +16,6 @@
[sub_resource type="SpriteFrames" id=2]
animations = [ {
"frames": [ ExtResource( 4 ) ],
"loop": true,
"name": "IdleLeft",
"speed": 5.0
}, {
"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ],
"loop": true,
"name": "MoveLeft",
"speed": 5.0
}, {
"frames": [ ExtResource( 5 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 15 ) ],
"loop": true,
"name": "MoveUp",
@ -36,14 +26,19 @@ animations = [ { @@ -36,14 +26,19 @@ animations = [ {
"name": "MoveRight",
"speed": 5.0
}, {
"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ],
"loop": true,
"name": "MoveLeft",
"speed": 5.0
}, {
"frames": [ ExtResource( 2 ), ExtResource( 6 ), ExtResource( 2 ), ExtResource( 7 ) ],
"loop": true,
"name": "MoveDown",
"speed": 5.0
}, {
"frames": [ ExtResource( 5 ) ],
"frames": [ ExtResource( 3 ) ],
"loop": true,
"name": "IdleUp",
"name": "IdleRight",
"speed": 5.0
}, {
"frames": [ ExtResource( 2 ) ],
@ -51,9 +46,14 @@ animations = [ { @@ -51,9 +46,14 @@ animations = [ {
"name": "IdleDown",
"speed": 5.0
}, {
"frames": [ ExtResource( 3 ) ],
"frames": [ ExtResource( 5 ) ],
"loop": true,
"name": "IdleRight",
"name": "IdleUp",
"speed": 5.0
}, {
"frames": [ ExtResource( 4 ) ],
"loop": true,
"name": "IdleLeft",
"speed": 5.0
} ]

0
Scenes/UI.tscn → UI.tscn
Unescape View File

2
Scenes/backroom.tscn → backroom.tscn
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Tiles/backroom.png" type="Texture" id=1]
[ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=2]
[ext_resource path="res://Player.tscn" type="PackedScene" id=2]
[sub_resource type="TileSet" id=1]
0/name = "backroom.png 0"

0
Resources/limbo.tres → limbo.tres
Unescape View File

2
Scenes/limbo.tscn → limbo.tscn
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Resources/limbo.tres" type="TileSet" id=1]
[ext_resource path="res://limbo.tres" type="TileSet" id=1]
[node name="Node2D" type="Node2D"]

0
Resources/lodge.tres → lodge.tres
Unescape View File

2
project.godot
Unescape View File

@ -11,7 +11,7 @@ config_version=4 @@ -11,7 +11,7 @@ config_version=4
[application]
config/name="Fullhouse"
run/main_scene="res://Story/Ch1S2.tscn"
run/main_scene="res://Ch1S2.tscn"
boot_splash/fullsize=false
boot_splash/use_filter=false
boot_splash/bg_color=Color( 0.141176, 0.141176, 0.141176, 1 )

BIN
richal/front.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

35
richal/front.png.import
Unescape View File

@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/front.png-43294f7d19ca1e0c5e3086461b9d7234.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://richal/front.png"
dest_files=[ "res://.import/front.png-43294f7d19ca1e0c5e3086461b9d7234.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

0
Resources/woods.tres → woods.tres
Unescape View File

Write Preview
Loading…
Cancel
Save