From 81eb2da44987fbf78e58803509f3d348a2a1298e Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com> Date: Tue, 11 Jun 2019 01:26:58 -0400 Subject: [PATCH] Removed unused code --- project/scn/CreditsScn.tscn | 22 ++++----- project/src/ClassicScn.gd | 2 +- project/src/CreditsScn.gd | 5 -- project/src/GameKit.gd | 21 -------- project/src/GameScn.gd | 95 ------------------------------------- project/src/ImportItems.gd | 12 ----- project/src/PauseScn.gd | 36 -------------- project/src/Soundtrack.gd | 22 --------- project/src/TitleScn.gd | 26 ---------- 9 files changed, 11 insertions(+), 230 deletions(-) delete mode 100644 project/src/CreditsScn.gd delete mode 100644 project/src/GameKit.gd delete mode 100644 project/src/GameScn.gd delete mode 100644 project/src/ImportItems.gd delete mode 100644 project/src/PauseScn.gd delete mode 100644 project/src/Soundtrack.gd delete mode 100644 project/src/TitleScn.gd diff --git a/project/scn/CreditsScn.tscn b/project/scn/CreditsScn.tscn index 506f7cf..feeb500 100644 --- a/project/scn/CreditsScn.tscn +++ b/project/scn/CreditsScn.tscn @@ -1,20 +1,18 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=5 format=2] -[ext_resource path="res://src/CreditsScn.gd" type="Script" id=1] -[ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=2] -[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=3] -[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/Soundtrack.cs" type="Script" id=5] +[ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=1] +[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=2] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/Soundtrack.cs" type="Script" id=4] [node name="Credits" type="Node"] -script = ExtResource( 1 ) [node name="RichTextLabel" type="RichTextLabel" parent="."] margin_left = 33.0 margin_top = 19.0 margin_right = 320.0 margin_bottom = 206.0 -theme = ExtResource( 2 ) +theme = ExtResource( 1 ) bbcode_text = "Nathan's Dress Up is a remake of Zack's Dress Up, a flash game created from 2006 to 2009. The character use to be a blue fox named Zack but was changed to a blue fennec named Nathan." text = "Nathan's Dress Up is a remake of Zack's Dress Up, a flash game created from 2006 to 2009. The character use to be a blue fox named Zack but was changed to a blue fennec named Nathan." @@ -24,7 +22,7 @@ anchor_right = 0.5 margin_left = -159.0 margin_right = 160.0 margin_bottom = 586.0 -theme = ExtResource( 2 ) +theme = ExtResource( 1 ) bbcode_enabled = true bbcode_text = "[center]Created by Anthony Wilcox @@ -55,10 +53,10 @@ Made with Godot Engine " -[node name="Character" parent="." instance=ExtResource( 3 )] +[node name="Character" parent="." instance=ExtResource( 2 )] position = Vector2( 68.8273, 256.845 ) -[node name="WinDialogs" parent="." instance=ExtResource( 4 )] +[node name="WinDialogs" parent="." instance=ExtResource( 3 )] [node name="Music" type="AudioStreamPlayer" parent="."] -script = ExtResource( 5 ) +script = ExtResource( 4 ) diff --git a/project/src/ClassicScn.gd b/project/src/ClassicScn.gd index 9d0b2ee..014cee9 100644 --- a/project/src/ClassicScn.gd +++ b/project/src/ClassicScn.gd @@ -4,5 +4,5 @@ extends Node func _process(delta): if Input.is_action_pressed("ui_pause"): - GameKit.is_game_paused(true) + # GameKit.is_game_paused(true) $WinDialogs/PauseWin.show() \ No newline at end of file diff --git a/project/src/CreditsScn.gd b/project/src/CreditsScn.gd deleted file mode 100644 index 762845b..0000000 --- a/project/src/CreditsScn.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Node - -func _ready(): -# $Version.text = GameKit.version - pass \ No newline at end of file diff --git a/project/src/GameKit.gd b/project/src/GameKit.gd deleted file mode 100644 index e7f7783..0000000 --- a/project/src/GameKit.gd +++ /dev/null @@ -1,21 +0,0 @@ -# Anthony Wilcox licenses this file to you under the GPL license. -# See the LICENSE file in the project root for more information. -extends Node - -var version = "2.0" - -func is_game_paused(is_paused): - if is_paused == true: - get_tree().paused = true - else: - get_tree().paused = false - -func switch_scenes(new_mode): - if new_mode == "classic": - get_tree().change_scene("res://scn/ClassicScn.tscn") - elif new_mode == "credits": - get_tree().change_scene("res://scn/CreditsScn.tscn") - elif new_mode == "play": - get_tree().change_scene("res://scn/GameScn.tscn") - elif new_mode == "title": - get_tree().change_scene("res://scn/TitleScn.tscn") \ No newline at end of file diff --git a/project/src/GameScn.gd b/project/src/GameScn.gd deleted file mode 100644 index 07398cd..0000000 --- a/project/src/GameScn.gd +++ /dev/null @@ -1,95 +0,0 @@ -# Anthony Wilcox licenses this file to you under the GPL license. -# See the LICENSE file in the project root for more information. -extends "res://src/GameKit.gd" - -# Default clothing -onready var bottoms = load("res://sprites/bottoms_placeholder.png") -onready var tops = load("res://sprites/tops_placeholder.png") -onready var accessory = load("res://sprites/tops_placeholder.png") -# ZC's Dress Up was stylized to be cute, not adult. -# Underwear cam be suggestive but never lewd. -onready var undies = load("res://sprites/briefs.svg") - -func change_bottoms(new_bottom): - bottoms = new_bottom - - if new_bottom == null: - $Nathan/Bottom.texture = bottoms - - if undies == load("res://sprites/owo_censor.svg"): - change_undies(null) - - $Nathan/Bottom.texture = bottoms - -func change_undies(new_undies): - undies = new_undies - $Nathan/Undies.texture = undies - -func change_tops(new_top): - tops = new_top - - if new_top == null: - $Nathan/Top.texture = tops - - $Nathan/Top.texture = tops - -func change_accessoires(new_accessory): - accessory = new_accessory - - if new_accessory == null: - $Nathan/Accessory.texture = accessory - - $Nathan/Accessory.texture = accessory - -# warning-ignore:unused_argument -func _process(delta): - - # Change clothes - # =========================================================== - - if $Clothes/Wordrobe/Accessoires/AccsGrid/CanonCam.is_pressed(): - change_accessoires(load("res://sprites/camera.png")) - - if $Clothes/Wordrobe/Pants/PantsGrid/Jeans.is_pressed(): - change_bottoms(load("res://sprites/jeans.svg")) - - if $Clothes/Wordrobe/Pants/PantsGrid/Sweats.is_pressed(): - change_bottoms(load("res://sprites/sweat_pants.svg")) - - if $Clothes/Wordrobe/Pants/PantsGrid/BeatUpJeans.is_pressed(): - change_bottoms(load("res://sprites/beat_up_jeans.svg")) - - if $Clothes/Wordrobe/Underwear/UndiesGrid/Briefs.is_pressed(): - change_undies(load("res://sprites/briefs.svg")) - - if $Clothes/Wordrobe/Underwear/UndiesGrid/ZBriefs.is_pressed(): - change_undies(load("res://sprites/z_briefs.svg")) - - if $Clothes/Wordrobe/Underwear/UndiesGrid/Fundosi.is_pressed(): - change_undies(load("res://sprites/fundosi.svg")) - - if $Clothes/Wordrobe/Underwear/UndiesGrid/OwOCensor.is_pressed(): - change_bottoms(null) - change_undies(load("res://sprites/owo_censor.svg")) - - - if $Clothes/Wordrobe/Pants/PantsGrid/BlueCamoJeans.is_pressed(): - change_bottoms(load("res://sprites/blue_camo_jeans.svg")) - - if $Clothes/Wordrobe/Shirts/ShirtsGrid/TrainHoodie.is_pressed(): - change_tops(load("res://sprites/train_hoodie.svg")) - - if $Clothes/Wordrobe/Shirts/ShirtsGrid/Sweatshirt.is_pressed(): - change_tops(load("res://sprites/old_sweatshirt.svg")) - - # Remove clothes - # =========================================================== - - if $Clothes/Wordrobe/Accessoires/AccsGrid/RemoveAccessory.is_pressed(): - change_accessoires(null) - - if $Clothes/Wordrobe/Shirts/ShirtsGrid/RemoveShirt.is_pressed(): - change_tops(null) - - if $Clothes/Wordrobe/Pants/PantsGrid/RemovePants.is_pressed(): - change_bottoms(null) \ No newline at end of file diff --git a/project/src/ImportItems.gd b/project/src/ImportItems.gd deleted file mode 100644 index 53d8bb0..0000000 --- a/project/src/ImportItems.gd +++ /dev/null @@ -1,12 +0,0 @@ -extends Node - -# export (String, FILE, "*.json") var item_file : String - -func load_items(file_path) -> Dictionary: - var file = File.new() - assert file.file_exists(file_path) - - file.open(file_path) - var items = parse_json(file.get_as_text()) - assert items.size() > 0 - return items \ No newline at end of file diff --git a/project/src/PauseScn.gd b/project/src/PauseScn.gd deleted file mode 100644 index 990a94b..0000000 --- a/project/src/PauseScn.gd +++ /dev/null @@ -1,36 +0,0 @@ -# Anthony Wilcox licenses this file to you under the GPL license. -# See the LICENSE file in the project root for more information. -extends Node - -func _process(delta): - if Input.is_action_just_pressed("ui_pause"): - $PauseWin.show() - # GameKit.is_game_paused(true) - -func _on_ExitBtn_pressed(): - # GameKit.is_game_paused(false) - # GameKit.switch_scenes("title") - pass - -func _on_SettingsBtn_pressed(): - $SettingsWin.show() - -func _on_CreditsBtn_pressed(): - # GameKit.switch_scenes("credits") - pass - -func _on_LicenseBtn_pressed(): - $LicenseWin.show() - -func _on_CloseAbtBtn_pressed(): - $AboutWin.hide() - -func _on_MusicBtn_toggled(button_pressed): - if button_pressed == true: - $Music.playing = true - else: - $Music.playing = false - -func _on_ResumeBtn_pressed(): - $PauseWin.hide() - # GameKit.is_game_paused(false) \ No newline at end of file diff --git a/project/src/Soundtrack.gd b/project/src/Soundtrack.gd deleted file mode 100644 index 142a26c..0000000 --- a/project/src/Soundtrack.gd +++ /dev/null @@ -1,22 +0,0 @@ -# Anthony Wilcox licenses this file to you under the GPL license. -# See the LICENSE file in the project root for more information. -extends AudioStreamPlayer - -const tracks = [ - 'reminiscing', - 'together_again', - 'at_the_lake', - 'mushrooms', -] - -func _ready(): - connect("finished", self, "play_random_song") - play_random_song() - -func play_random_song(): - randomize() - - var rand_db = randi() % tracks.size() - var audiostream = load('res://music/' + tracks[rand_db] + '.ogg') - stream = audiostream - play() \ No newline at end of file diff --git a/project/src/TitleScn.gd b/project/src/TitleScn.gd deleted file mode 100644 index e25b878..0000000 --- a/project/src/TitleScn.gd +++ /dev/null @@ -1,26 +0,0 @@ -# Anthony Wilcox licenses this file to you under the GPL license. -# See the LICENSE file in the project root for more information. -extends Node - -func _ready(): - # $Version.text = GameKit.version - pass - -func _on_ClassicBtn_pressed(): - # GameKit.switch_scenes("classic") - pass - -func _on_ModernBtn_pressed(): - # GameKit.switch_scenes("play") - pass - -func _on_CreditsBtn_pressed(): - # GameKit.switch_scenes("credits") - pass - -func _on_LicenseBtn_pressed(): - $WinDialogs/LicenseWin.show() - -func _on_PlayBtn_pressed(): - # GameKit.switch_scenes("play") - pass