Commit Graph

204 Commits

Author SHA1 Message Date
a57416c7a9
Merge branch 'master' of github.com:Cold-Mint/Traveller 2024-06-14 19:26:49 +08:00
b018165e3c
Remove ambiguous comments.
移除有歧义的注释。
2024-06-14 19:25:48 +08:00
霧雨烨
bb44d77805 Ban Packsack nesting
禁止背包嵌套
2024-06-14 19:12:06 +08:00
霧雨烨
0f9e7d0283 Change the index parameter when adding a slot to ItemContainer to automatically get the latest index , add a test slot for Packsack item
更改ItemContainer添加槽位时的index参数为自动获取最新索引,为Packsack加入一个测试用槽位
2024-06-14 12:44:31 +08:00
霧雨烨
e5664f1553 Add PacksackStack for item Packsack
为Packsack物品添加PacksackStack
2024-06-14 12:22:44 +08:00
Cold-Mint
25f2e94ee6
Merge pull request #3 from Web13234/master
Register item types from .yaml files, and others
2024-06-14 07:34:29 +08:00
霧雨烨
edbafdcbda Add gitignore of *.Dotsettings & *.user 2024-06-14 00:47:23 +08:00
霧雨烨
6745324855 Fixed a bug that packsack scenarios did not have item ids set resulting in not being able to pick up the packs.
修复了packsack场景没有设置物品id导致无法捡起背包的bug
2024-06-14 00:44:41 +08:00
霧雨烨
b35fb50073 Subdivision of Misc and Action from UI translation files. 2024-06-14 00:43:31 +08:00
霧雨烨
0efb3d9abf Merge remote-tracking branch 'refs/remotes/upstream/master'
# Conflicts:
#	scripts/item/ItemTypeManager.cs
2024-06-14 00:23:45 +08:00
霧雨烨
e26db60790 Add the prefix "ui_" to the translation items for game UI.
Maybe did not cover all usage, sry for that.
2024-06-14 00:12:06 +08:00
霧雨烨
9558829d15 Add the prefix "log_" to the translation items for the log function. 2024-06-13 23:54:41 +08:00
霧雨烨
3c33b055ab Add the feature to load simple item type information from yaml files 2024-06-13 23:50:07 +08:00
b8b8e81d8f
Review the merged code to resolve an issue where the game is unresponsive after a player dies.
审查合并后的代码,解决玩家死亡后游戏无响应的问题。
2024-06-13 22:29:18 +08:00
霧雨烨
c735851cc3 Add NuGet lib YamlDotNet to project 2024-06-13 21:11:51 +08:00
c957faec76
The translation file is no longer saved.
不再保存translation文件。
2024-06-13 18:51:57 +08:00
Cold-Mint
423fd322f2
Merge pull request #2 from Web13234/item_refactory
Item System Rebuild
2024-06-13 18:33:40 +08:00
霧雨烨
662e9b136a move Packsack.cs to item namespace 2024-06-13 14:18:25 +08:00
霧雨烨
9561b46e1b Clean up the code and fill in the comments 2024-06-13 14:13:55 +08:00
霧雨烨
229098b261 Added all basic item stacks;
Move item stacks to new namespace
2024-06-13 14:05:59 +08:00
霧雨烨
dde7bb16ca Replace metadata of items with export vars 2024-06-13 11:14:24 +08:00
霧雨烨
e307a58299 Make packsack new interface, too. 2024-06-13 11:04:51 +08:00
霧雨烨
c1aecf21d7 Implements IEnumerable<ItemSlotNode> for IItemContainer. 2024-06-13 10:43:54 +08:00
霧雨烨
d12ddc566b Merge remote-tracking branch 'refs/remotes/origin/master' into item_refactory
# Conflicts:
#	locals/Item.csv
#	locals/Weapon.en.translation
#	locals/Weapon.ja.translation
#	locals/Weapon.zh.translation
#	scripts/inventory/UniversalItemContainer.cs
#	scripts/utils/NodeUtils.cs
2024-06-13 10:15:15 +08:00
霧雨烨
23877e82cc Remove old item interfaces,rename new
移除旧的物品接口,重命名新的
2024-06-13 03:07:55 +08:00
霧雨烨
94a2e78efc Fixed all the bugs that prevented the game from working, added static item registration on startup
阻碍游戏运行的bug已尽数修复,添加启动时的静态物品注册
2024-06-13 03:04:12 +08:00
霧雨烨
16a2d40501 It's done. 2024-06-13 01:51:51 +08:00
霧雨烨
16b3a5a106 UniversalItemContainer refactored done
UniversalItemContainer调教完成
2024-06-13 01:18:55 +08:00
f219380a5f
Add a backpack for testing.
加入测试使用的背包。
2024-06-12 23:42:35 +08:00
霧雨烨
76daa88bac Merge branch 'refs/heads/master' into item_refactory_combined
# Conflicts:
#	locals/Slogan.ja.translation
#	scripts/character/CharacterTemplate.cs
#	scripts/character/Player.cs
#	scripts/inventory/HotBar.cs
#	scripts/inventory/IItemContainer.cs
#	scripts/item/weapon/ProjectileWeapon.cs
#	scripts/item/weapon/WeaponTemplate.cs
2024-06-12 22:13:55 +08:00
霧雨烨
3d6b71ef0c implement SingleItemStack, prepare for combine master 2024-06-12 21:53:27 +08:00
856a957c6a
Extracted from UniversalItemContainer.
提取UniversalItemContainer类。
2024-06-12 21:33:29 +08:00
霧雨烨
9b3701b49c (temp):ItemSlot has already changed into new interfaces 2024-06-12 17:57:38 +08:00
霧雨烨
e9656d6992 (temp):
Just a small refactoring in the huge interaction code (regarding ItemSlot and ItemStack), but I think it's necessary to leave a save point, after all, I have to go to sleep first
2024-06-12 02:22:04 +08:00
霧雨烨
7f20a7233c Initial migration of existing item interactions to the new interface 2024-06-12 01:57:55 +08:00
霧雨烨
026c7ff32f Add single item stack type, move the weapon namespace into the item namespace, and I think it's ready to be merged into the new interface 2024-06-12 00:51:40 +08:00
7805a63174
Fixed an issue where items on the ground still carry collision damage.
解决物品在地面上,仍然带有碰撞伤害的问题。
2024-06-11 22:16:10 +08:00
霧雨烨
0880feb298 Add new item interfaces and manager 2024-06-10 23:08:48 +08:00
63a56cbb2c
Unified management scenario instantiation, loot generation in the right place, and allow to specify the probability and quantity.
统一管理场景实例化,战利品生成在正确的位置,且允许指定概率和数量了。
2024-06-10 21:05:18 +08:00
霧雨烨
fcffdf3720 Update C# version to 12 2024-06-10 13:50:12 +08:00
f7ad69440c
Add a loot table.
添加战利品表。
2024-06-09 22:05:49 +08:00
05763c25b1
Created the ability to drop items on the ground after the player dies.
制作玩家死亡后,背包物品掉在地上的功能。
2024-06-08 23:59:24 +08:00
Cold-Mint
0dd3de228e
Merge pull request #1 from Web13234/master
Some optimizations about localized text
2024-06-08 21:12:12 +08:00
霧雨烨
871ea247f0 Replaced hard-coded MaxSloganIndex with automatically fetched Slogan counts on load 2024-06-08 20:27:02 +08:00
霧雨烨
27aec2f754 Corrected the Japanese ID "jp" to "ja" in the translation file. 2024-06-08 20:19:54 +08:00
霧雨烨
067e9fe8c9 idk why filename that was supposed to be "Slogan" became "slogan", but it's "Slogan" now 2024-06-08 19:16:11 +08:00
霧雨烨
759bd31ff3 Corrected a clerical error by ColdMint chan 2024-06-08 18:06:52 +08:00
5ca995d689
Supports throwing items out of a specific item slot.
支持扔出特定物品槽内的物品了。
2024-06-06 22:43:07 +08:00
95515ddab2
When the selected item slot A is selected, pressing the shortcut key of item slot A again will no longer invoke the press event of A.
当选中物品槽A时,再次按下物品槽A的快捷键,就不能再调用A的按下事件了。
2024-06-06 21:05:51 +08:00
21b3691925
Merge branch 'master' of github.com:Cold-Mint/Traveller 2024-06-06 19:46:54 +08:00