Skip to content

Commit dd57c6e

Browse files
authored
Merge pull request #281 from Jeremi360:add-icon-for-RSD-node
add icon for RakuScriptDialogue node
2 parents 797389e + c646c43 commit dd57c6e

File tree

6 files changed

+89
-92
lines changed

6 files changed

+89
-92
lines changed

addons/Rakugo/icons/Dialogue.svg

Lines changed: 0 additions & 62 deletions
This file was deleted.

addons/Rakugo/icons/Script.svg

Lines changed: 48 additions & 0 deletions
Loading
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://bxwnla67st17g"
6+
path="res://.godot/imported/Script.svg-dea73637e445b8402f317284b40db4b3.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://addons/Rakugo/icons/Script.svg"
14+
dest_files=["res://.godot/imported/Script.svg-dea73637e445b8402f317284b40db4b3.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
35+
svg/scale=1.0
36+
editor/scale_with_editor_scale=false
37+
editor/convert_colors_with_editor_theme=false

addons/Rakugo/lib/nodes/RakuScriptDialogue.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
extends Node
2-
1+
@icon("res://addons/Rakugo/icons/Script.svg")
32
## Simple node to load and run Raku Script
43
class_name RakuScriptDialogue
4+
extends Node
55

66
## Raku Script (*.rk) to load and run
77
@export_file("*.rk") var raku_script : String

addons/Rakugo/lib/systems/Parser.gd

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,7 @@ extends RefCounted
99
# _init dialogue is used for code outside other dialogues
1010
const init_dialogue_name = "_init"
1111

12-
# tokens for RenScript
13-
# tokens in this language can be extended by the other addons
14-
15-
# tokens
16-
var Tokens := {
17-
TOKEN_FUNCTION = "^{NAME}\\(",
18-
TOKEN_DICTIONARY_REFERENCE = "^{NAME}\\[",
19-
TOKEN_PARENS_OPEN = "^\\(",
20-
TOKEN_PARENS_CLOSE = "^\\)",
21-
TOKEN_BRACKET_OPEN = "^\\[",
22-
TOKEN_BRACKET_CLOSE = "^\\]",
23-
TOKEN_BRACE_OPEN = "^\\{",
24-
TOKEN_BRACE_CLOSE = "^\\}",
25-
TOKEN_COLON = "^:",
26-
TOKEN_COMPARISON = "^(==|<=|>=|<|>|!=|in )",
27-
TOKEN_NUMBER = "^\\-?\\d+(\\.\\d+)?",
28-
TOKEN_OPERATOR = "^(\\+|-|\\*|/)",
29-
TOKEN_ASSIGNMENT = "^(=|\\+=|\\-=|\\*=|\\/=|\\%=|\\^=|\\|=|\\&=)",
30-
TOKEN_COMMA = "^,",
31-
TOKEN_BOOL = "^(true|false)",
32-
TOKEN_AND_OR = "^(and|or)( |$)",
33-
TOKEN_STRING = "^\".*?\"",
34-
TOKEN_VARIABLE = "^[a-zA-Z_][a-zA-Z_0-9]+",
35-
TOKEN_TAB = "^\\t",
36-
TOKEN_NUMERIC = "-?[0-9]\\.?[0-9]*",
37-
}
38-
12+
# Regex Helpers for RenScript
3913
var Regex := {
4014
NAME = "[a-zA-Z][a-zA-Z_0-9]*",
4115
NUMERIC = "-?[0-9]\\.?[0-9]*",

project.godot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ config/name="Rakugo Dialogue System"
1818
config/tags=PackedStringArray("addon", "rakugo")
1919
config/features=PackedStringArray("4.2")
2020
config/icon="res://WindowIcon.png"
21-
addons/rakugo/game_version="1.0.0"
21+
addons/rakugo/game_version=1.0
2222
addons/rakugo/narrator_name="narrator"
2323
addons/rakugo/debug=false
2424
addons/rakugo/save_folder="user://saves"

0 commit comments

Comments
 (0)