Gremlinsoft
/
SchildDerStaerke
2
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

merge

pull/14/head
Dr. Sascha Woitschetzki 2025-05-02 10:51:52 +07:00
parent cf5c011491
commit 07346fae0d
3 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/libraries/GdSdk_Master.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="GdSdk Master" type="GdScript"> <library name="GdSdk Master" type="GdScript">
<properties path="$USER_HOME$/.cache/JetBrains/Rider2024.3/projects/schildderstärke.d57cb195/sdk/GdSdk Master" version="Master" date="2024-06-01T15:14:16.000+02:00" /> <properties path="C:\Users\Sascha Woitschetzki\AppData\Local\JetBrains\Rider2024.3\projects\schildderstaerke.4893be7a\sdk\GdSdk Master" version="Master" date="2024-06-01T15:14:16.000+02:00" />
<CLASSES /> <CLASSES />
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$USER_HOME$/.cache/JetBrains/Rider2024.3/projects/schildderstärke.d57cb195/sdk/GdSdk Master" /> <root url="file://$USER_HOME$/AppData/Local/JetBrains/Rider2024.3/projects/schildderstaerke.4893be7a/sdk/GdSdk Master" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>

64
.idea/workspace.xml
Unescape Escape View File

@ -4,7 +4,11 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c3091895-9cbd-4d08-bc3f-599dc2d3e86d" name="Changes" comment="" /> <list default="true" id="c3091895-9cbd-4d08-bc3f-599dc2d3e86d" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/libraries/GdSdk_Master.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/GdSdk_Master.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/enemy.gd" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/enemy.gd" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -13,7 +17,7 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
<map> <map>
<entry key="$PROJECT_DIR$" value="GridMap" /> <entry key="$PROJECT_DIR$" value="UI2" />
</map> </map>
</option> </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -35,23 +39,21 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"GdScript Start and Debug.Player GDScript.executor": "Debug", &quot;GdScript Start and Debug.Player GDScript.executor&quot;: &quot;Debug&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.git.unshallow": "true", &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
"gdscript.promo.shown": "true", &quot;gdscript.promo.shown&quot;: &quot;true&quot;,
"git-widget-placeholder": "master", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"ignore.virus.scanning.warn.message": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"nodejs_package_manager_path": "npm", &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
"settings.editor.selected.configurable": "preferences.build.godotPlugin",
"vue.rearranger.settings.migration": "true"
} }
}]]></component> }</component>
<component name="RunManager" selected="GdScript Start and Debug.Player GDScript"> <component name="RunManager" selected="GdScript Start and Debug.Player GDScript">
<configuration name="Player GDScript" type="GDSCRIPT_DEBUG_RUN_CONFIGURATION" factoryName="GdScriptRunFactory" show_console_on_std_err="false" show_console_on_std_out="false" port="6006"> <configuration name="Player GDScript" type="GDSCRIPT_DEBUG_RUN_CONFIGURATION" factoryName="GdScriptRunFactory" show_console_on_std_err="false" show_console_on_std_out="false" port="6006">
<option name="address" value="127.0.0.1" /> <option name="address" value="127.0.0.1" />
@ -64,17 +66,13 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="Editor" type="RunNativeExe" factoryName="Native Executable"> <configuration name="Editor" type="RunNativeExe" factoryName="Native Executable">
<option name="EXE_PATH" value="$USER_HOME$/Godot/Godot_v4.4-stable_linux.x86_64" /> <option name="EXE_PATH" value="$USER_HOME$/Godot/Godot_v4.4-dev6_linux.x86_64" />
<option name="PROGRAM_PARAMETERS" value="--path &quot;./&quot; --editor" /> <option name="PROGRAM_PARAMETERS" value="--path &quot;./&quot; --editor" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="PASS_PARENT_ENVS" value="1" /> <option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" /> <option name="USE_EXTERNAL_CONSOLE" value="0" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<list>
<item itemvalue="GdScript Start and Debug.Player GDScript" />
<item itemvalue="Native Executable.Editor" />
</list>
</component> </component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager"> <component name="TaskManager">
@ -86,8 +84,7 @@
<updated>1733914913603</updated> <updated>1733914913603</updated>
<workItem from="1733914927162" duration="262000" /> <workItem from="1733914927162" duration="262000" />
<workItem from="1733915211671" duration="365000" /> <workItem from="1733915211671" duration="365000" />
<workItem from="1735554556434" duration="163000" /> <workItem from="1744011636834" duration="97000" />
<workItem from="1741342963625" duration="433000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -96,24 +93,7 @@
</component> </component>
<component name="UnityCheckinConfiguration" checkUnsavedScenes="true" /> <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
<component name="UnityProjectConfiguration" hasMinimizedUI="false" /> <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" /> <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
<MESSAGE value="windows" />
<option name="LAST_COMMIT_MESSAGE" value="windows" />
</component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
<select />
</component> </component>
</project> </project>

6
scripts/enemy.gd
Unescape Escape View File

@ -18,7 +18,7 @@ func _physics_process(_delta: float) -> void:
state = States.idle state = States.idle
return return
var distance = global_position.distance_to(player.global_position) var distance: float = global_position.distance_to(player.global_position)
if distance > chasing_range: if distance > chasing_range:
state = States.idle state = States.idle
elif distance <= chasing_range and distance >= attack_range: elif distance <= chasing_range and distance >= attack_range:
@ -50,9 +50,9 @@ func _on_state_changed(_old_state: States, new_state: States) -> void:
func _on_velocity_computed(safe_velocity: Vector3) -> void: func _on_velocity_computed(safe_velocity: Vector3) -> void:
velocity = safe_velocity velocity = safe_velocity
var vy = velocity.y var vy: float = velocity.y
velocity.y = 0 velocity.y = 0
var vl = velocity * model.transform.basis var vl: Vector3 = velocity * model.transform.basis
anim_tree.set("parameters/IWR/blend_position", Vector2(vl.x, -vl.z) / speed) anim_tree.set("parameters/IWR/blend_position", Vector2(vl.x, -vl.z) / speed)
velocity.y = vy velocity.y = vy
move_and_slide() move_and_slide()