mirror of
https://github.com/tonytins/citylimits
synced 2025-06-25 09:24:44 -04:00
Initial foundation for VR Mode
A lot has happened since May that I couldn't begin to describe what was working at the time. What I can tell you that is new as of this commit is an upcoming VR mode.
This commit is contained in:
parent
ef6b097ef2
commit
1f038ea53c
16 changed files with 374 additions and 318 deletions
|
@ -60,18 +60,19 @@ func _init_advisor(file, advisor):
|
|||
rank_label.text = "Transportation Advisor"
|
||||
|
||||
func _launch_advisor_window(key):
|
||||
_index_dialogue()
|
||||
var message: String = dialogue_keys[key].text
|
||||
|
||||
if "[name]" in message:
|
||||
message = message.replace("[name]", SimData.mayor_name)
|
||||
|
||||
if "[city]" in message:
|
||||
message = message.replace("[city]", SimData.city_name)
|
||||
|
||||
description_label.text = message
|
||||
window_title = dialogue_keys[key].name
|
||||
show()
|
||||
# _index_dialogue()
|
||||
# var message: String = dialogue_keys[key].text
|
||||
#
|
||||
# if "[name]" in message:
|
||||
# message = message.replace("[name]", SimData.mayor_name)
|
||||
#
|
||||
# if "[city]" in message:
|
||||
# message = message.replace("[city]", SimData.city_name)
|
||||
#
|
||||
# description_label.text = message
|
||||
# window_title = dialogue_keys[key].name
|
||||
# show()
|
||||
pass
|
||||
|
||||
func _advisor_dialogue(advisor, message):
|
||||
_init_advisor(JsonFile.ANNOUNCEMENTS, advisor)
|
||||
|
|
|
@ -45,3 +45,5 @@ func _on_CheetaBtn_toggled(button_pressed):
|
|||
day_cycle.wait_time = 2
|
||||
turtle_btn.pressed = false
|
||||
|
||||
func _on_VRMode_pressed():
|
||||
get_tree().change_scene("res://scenes/VR Game.tscn")
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
extends Node2D
|
||||
|
||||
var noise: OpenSimplexNoise
|
||||
var map_size = Vector2(80, 60)
|
||||
var terrian_cap = 0.3
|
||||
|
||||
onready var terrian = $Terrian
|
||||
onready var water = $Water
|
||||
|
||||
func _ready():
|
||||
|
||||
randomize()
|
||||
noise = OpenSimplexNoise.new()
|
||||
noise.seed = randi()
|
||||
noise.octaves = 1.5
|
||||
noise.period = 12
|
||||
|
||||
make_terrian_map()
|
||||
make_water()
|
||||
|
||||
func make_terrian_map():
|
||||
for x in map_size.x:
|
||||
for y in map_size.y:
|
||||
var a = noise.get_noise_2d(x, y)
|
||||
if a < terrian_cap:
|
||||
terrian.set_cell(x, y, 0)
|
||||
|
||||
terrian.update_bitmask_region(Vector2(0.0, 0.0), Vector2(map_size.x, map_size.y))
|
||||
|
||||
func make_water():
|
||||
for x in map_size.x:
|
||||
for y in map_size.y:
|
||||
if terrian.get_cell(x, y):
|
||||
water.set_cell(x, y, 0)
|
||||
|
||||
water.update_bitmask_region(Vector2(0.0, 0.0), Vector2(map_size.x, map_size.y))
|
||||
|
||||
|
||||
func _on_ResBtn_pressed():
|
||||
var new_zone = preload("res://scenes/deparments/Zone.tscn")
|
||||
var instance = new_zone.instance()
|
||||
add_child(instance)
|
||||
instance.emit_signal("grabbed")
|
||||
|
||||
func _on_CoalBtn_pressed():
|
||||
var new_zone = preload("res://scenes/deparments/CoalPlant.tscn")
|
||||
var instance = new_zone.instance()
|
||||
add_child(instance)
|
||||
instance.emit_signal("grabbed")
|
|
@ -1,9 +1,9 @@
|
|||
extends ColorRect
|
||||
|
||||
onready var ticker_text = $TickerTxt
|
||||
extends Panel
|
||||
|
||||
const ticker_path = "res://json/ticker/"
|
||||
|
||||
onready var ticker_text = $Ticker
|
||||
|
||||
var news_file: String = ""
|
||||
var rng = RandomNumberGenerator.new()
|
||||
var all_news = []
|
||||
|
@ -67,9 +67,12 @@ func _ready():
|
|||
_random_news(json_files)
|
||||
|
||||
func _start_alert(message):
|
||||
if ticker_text.items.size() > 3:
|
||||
ticker_text.clear()
|
||||
|
||||
SimData.on_alert = true
|
||||
news_file = str(ticker_path + "ticker_alerts.json")
|
||||
ticker_text = all_news
|
||||
ticker_text.add_item(all_news)
|
||||
|
||||
func _random_news(files: Array):
|
||||
for file in files:
|
||||
|
@ -84,14 +87,13 @@ func _random_news(files: Array):
|
|||
var news_range = rng.randi_range(0, all_news.size() - 1)
|
||||
var news_text: String = all_news[news_range]
|
||||
|
||||
if SimData.has_ctower or SimData.city_name == "Furtropolis" or "Furville" and "[outlet]" in news_text:
|
||||
if SimData.city_name == "Furtropolis" or "Furville" and "[outlet]" in news_text:
|
||||
# FNN = Furtropolis/Furry News Network
|
||||
news_text.replace("[outlet]", "FNN")
|
||||
else:
|
||||
elif "[outlet]" in news_text:
|
||||
news_text.replace("[outlet]", "Pawprint Press")
|
||||
|
||||
if "[species]" in news_text:
|
||||
randomize()
|
||||
speices.shuffle()
|
||||
var speices_range = rng.randi_range(speices.size() - 1)
|
||||
news_text.replace("[species]", speices[speices_range])
|
||||
|
@ -102,7 +104,10 @@ func _random_news(files: Array):
|
|||
if "[mayor]" in news_text:
|
||||
news_text.replace("[mayor]", SimData.mayor_name)
|
||||
|
||||
ticker_text.text = news_text
|
||||
if ticker_text.items.size() > 3:
|
||||
ticker_text.clear()
|
||||
|
||||
ticker_text.add_item(news_text)
|
||||
|
||||
func _resume_ticker():
|
||||
_random_news(json_files)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue