Skip to content

Commit

Permalink
Minor brainstorming
Browse files Browse the repository at this point in the history
Also worked on debugging the music minigame, but to no avail
  • Loading branch information
cbcerquiaga committed Mar 12, 2019
1 parent ce5eb13 commit cb90710
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions Locations
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ MOVING LOCATIONS- locations that are the same every time the game is played, but
38. The Plantation- a mansion surrounded by farmland. A family owns and operates the plantation, and they go out into town to capture people to enslave, and force them to work on their plantation.
39. City dump- back in the day, it was where people brought their garbage. Now, it's one of the most fertile places in the city but nobody really lives there.
40. Library- a repository of books. Many were destroyed in the megastorms, but looking around, there are lots still intact.
41. Hotel Peachtree- an upscale hotel that used to be full of rich people but is only full of squatters now.

DYNAMIC LOCATIONS- locations that stay in the same place on the map, but are different each playthrough
1. The mall- could be filled with squatters, a standard settlement, uninhabited, or full of neonazis
Expand Down
6 changes: 4 additions & 2 deletions Random Encounters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ Medium encounters
11. Banished- people kicked out of their towns for comitting crimes
12. Bards- travelling musicians, poets, and writers who travel from town to town carrying news and telling stories of the past.
13. Doctors- travelling doctors of varying qualification who go from town to town practicing or pretending to practice medicine.
14. Zealots of the salt- a group of people that belive consuming salt causes autism
15.

Rare encounters
1. Working car- just sitting there. Who would leave a working car just sitting there?
2. Screwdriver Man- not the superhero we deserve, and not the one we needed either. He just runs up and stabs you with a screwdriver and leaves
2. Screwdriver Man- not the superhero we deserve, and not the one we needed either. He just runs up, stabs you with a screwdriver, and leaves
3. Entertainers- small circuses who travel from town to town doing different acts (things like the trapeze, lifting heavy objects, performing plays, singing songs, reading books, or performing magic) in order to make money from locals before heading to the next town.
4. Seafarers- people who live on boats at sea, scavenging and fishing to survive. When these people come to land to trade, it's a rare sight.
5.
5. Hoarders- like scavengers, but less picky. Instead of trying to take what they can use or what they can sell, these people just collect everything they find for no reason at all. They tend to have good stuff, if you can convince them to part with it.

Special Encounters (only after certain quests)
1. Crow and his men
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ func _process(delta):
time = 0
else:
time = time+1
print(str(time))
#print(str(time))
pass
4 changes: 4 additions & 0 deletions You, Me, and the End of the World/Scripts/MusicP1Emitter.gd
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ var defaultSong = ["A","D","A","D","W","S"]
#maybe we ought to have a tempoArray as well?
var currentNote = 0
var mostRecentNote = ""
var notes = []

func _ready():
time = 0
Expand All @@ -23,6 +24,7 @@ func changeTempo(tempoVal):
tempo = tempoVal

func spawnNote():
#print("spawning a new note")
if currentNote < song.size() - 1:
currentNote = currentNote + 1
else:
Expand All @@ -32,6 +34,8 @@ func spawnNote():
#print("Note: " + str(noteVal))
var tempNote = note.instance()
tempNote.set_position(self.position)
#tempNote.position.x = tempNote.position.x + currentNote *10
notes.append(tempNote)
#tempNote.changeTexture(noteVal, 1)


Expand Down

0 comments on commit cb90710

Please sign in to comment.