From a91de0702fdb00bc32ecba930b4594ce021a644c Mon Sep 17 00:00:00 2001 From: Harmony Honey Date: Wed, 8 Mar 2023 15:04:31 -0500 Subject: [PATCH] Upgrade to 3.5.2 + NPC in 3A/0, BG.gd posmod() --- src/autoload/BG.gd | 2 +- src/map/worlds/3A/0_hub.tscn | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/autoload/BG.gd b/src/autoload/BG.gd index 903ffb4..86441c7 100644 --- a/src/autoload/BG.gd +++ b/src/autoload/BG.gd @@ -9,7 +9,7 @@ func _ready(): self.colors = 0 func set_colors(arg := 0): - colors = clamp(arg, 0, (palette.size() / 2) - 1) + colors = posmod(arg, palette.size() / 2) #print("BG: ", colors, " pal: ", palette.size(), " / 2 = ", palette.size() / 2) if mat: mat.set_shader_param("col1", palette[colors * 2]) diff --git a/src/map/worlds/3A/0_hub.tscn b/src/map/worlds/3A/0_hub.tscn index 89e58e3..c6d7c42 100644 --- a/src/map/worlds/3A/0_hub.tscn +++ b/src/map/worlds/3A/0_hub.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://src/detail/Tree.tscn" type="PackedScene" id=1] [ext_resource path="res://src/detail/Lamppost.tscn" type="PackedScene" id=2] @@ -14,6 +14,7 @@ [ext_resource path="res://src/detail/FlowerPetals.tscn" type="PackedScene" id=12] [ext_resource path="res://src/detail/RockSquare.tscn" type="PackedScene" id=13] [ext_resource path="res://src/detail/RockCircle.tscn" type="PackedScene" id=14] +[ext_resource path="res://src/actor/NPC.tscn" type="PackedScene" id=15] [node name="Map" type="Node2D"] @@ -62,6 +63,18 @@ scene_path = "res://src/map/worlds/3A/5.tscn" position = Vector2( 2050, 250 ) scene_path = "res://src/map/worlds/3A/6.tscn" +[node name="NPC" parent="Actors" instance=ExtResource( 15 )] +position = Vector2( 1650, 475 ) +dir = 3 +dye = { +"eye": 2, +"fit": 2, +"hair": 1, +"skin": 0 +} +hairstyle_back = 3 +hairstyle_front = 4 + [node name="Details" type="Node2D" parent="."] [node name="Rocks" type="Node2D" parent="Details"]