Updated Horror Toy Factory with new Mob_Skill_DB Scheme. #2677

Zarbony · 2020-03-31T13:40:25Z

Pull Request Prelude

I have followed proper Hercules code styling.
I have read and understood the contribution guidelines before making this PR.
I am aware that this PR may be closed if the above-mentioned criteria are not fulfilled.

Changes Proposed

Just Use raw data from #1539 and updated setpcblock() script command with work from @Kenpachi2k13 to use it now.
Updated the Mob_Skill_DB.conf to the new Scheme.
Updated the Script.

NPC Script will work after Implement the Update for the *pcblock() script command on #2668

ToDO:

Add Skill IDs 716 and 719

Issues addressed: Episode 14.2 : Eclage #240 as a part of the Official content list

Just Use raw data from HerculesWS#1539 and updated setpcblock() script command with work from Kenpachi2k13 to use it now. ToDO: - Fix setunitdata() to work correctly - Add Skill IDs 716 and 719

dastgirp · 2020-03-31T14:24:20Z

Hi,
It seems there are some script error due to which Travis build is failing.

More details here: https://travis-ci.org/github/HerculesWS/Hercules/jobs/669248207?utm_medium=notification&utm_source=github_status

… Cross and Move some IDs for the right item order.

Emistry

ItemDB / MonsterDB

I am not sure if the name field could handle more than 24 characters.
These new monster/item name doesn't seem like share "similar" prefix for both monster name and card name, sound weird, normally monster name and card name are quite similar to each other with the suffix of "Card".
Most of the card effect, look like just using dummy values? Perhaps recheck to avoid any of it are wrong.

Scripts:

I am not sure if this is conversion from AEGIS script, it look like custom write, the variables names perhaps could be improve to use better/easier name to understand what its use for?
Monster event label - some of those monster event label doesn't do anything, so its okay to remove those event label from them.
NPC name sound too common? it look way too easy to clash with other NPC in future if any? Perhaps just add a prefix to them? Ex: use htf_alert#XXX or htf_xmas_alert#XXX instead of alert#XXX.

Just my 2cents...

Emistry · 2020-04-11T19:00:57Z

db/re/item_db.conf

+	Type: 5
+	Weight: 200
+	Slots: 1
+	Loc: 136


Suggested change

Type: 5

Weight: 200

Slots: 1

Loc: 136

Type: "IT_ARMOR"

Weight: 200

Slots: 1

Loc: "EQP_ACC"

Emistry · 2020-04-11T19:01:35Z

db/re/item_db.conf

+	AegisName: "Hurt_Mind"
+	Name: "Broken Heart"
+	Type: 5
+	Weight: 100
+	Slots: 1
+	Loc: 136


Suggested change

AegisName: "Hurt_Mind"

Name: "Broken Heart"

Type: 5

Weight: 100

Slots: 1

Loc: 136

AegisName: "Hurt_Mind"

Name: "Hurt Mind"

Type: "IT_ARMOR"

Weight: 100

Slots: 1

Loc: "EQP_ACC"

Emistry · 2020-04-11T19:02:08Z

db/re/item_db.conf

+	AegisName: "KindHeart"
+	Name: "Gentle Heart"
+	Type: 5
+	Weight: 100
+	Slots: 1
+	Loc: 136


Suggested change

AegisName: "KindHeart"

Name: "Gentle Heart"

Type: 5

Weight: 100

Slots: 1

Loc: 136

AegisName: "KindHeart"

Name: "Kind Heart"

Type: "IT_ARMOR"

Weight: 100

Slots: 1

Loc: "EQP_ACC"

Emistry · 2020-04-11T19:02:40Z

db/re/item_db.conf

+	AegisName: "Evilspirit_Gloves"
+	Name: "Evilspirit Gloves"
+	Type: 5
+	Weight: 100
+	Slots: 1
+	Loc: 136


Suggested change

AegisName: "Evilspirit_Gloves"

Name: "Evilspirit Gloves"

Type: 5

Weight: 100

Slots: 1

Loc: 136

AegisName: "Evil_Spirit_Gloves"

Name: "Evil Spirit Gloves"

Type: "IT_ARMOR"

Weight: 100

Slots: 1

Loc: "EQP_ACC"

Emistry · 2020-04-11T19:03:13Z

db/re/item_db.conf

+	AegisName: "Hot_Tee"
+	Name: "Hot Tea"
+	Type: 0


Suggested change

AegisName: "Hot_Tee"

Name: "Hot Tea"

Type: 0

AegisName: "Hot_Tea"

Name: "Hot Tea"

Type: "IT_HEALING"

npc/re/instances/horror_toy_factory.txt

npc/re/merchants/enchan_htf.txt

Co-Authored-By: Emistry Haoyan <Emistry@users.noreply.github.com>

Master

…ror_Toy_Factory # Conflicts: # db/re/item_db.conf # db/re/mob_db.conf # db/re/mob_skill_db.conf

Emistry

conflicts aren't resolved.

Emistry · 2020-07-30T08:58:11Z

db/re/item_db.conf

+	Id: 2976
+	AegisName: "Red_Lantern"
+	Name: "Red Lantern"
+	Type: 5


Suggested change

Type: 5

Type: IT_***

convert to constant, same for other new/updated items.

Emistry · 2020-07-30T08:59:14Z

db/re/item_db.conf

+	Type: 5
+	Weight: 200
+	Slots: 1
+	Loc: 136


Suggested change

Loc: 136

Loc: EQP_***

convert to constant, same for other new/updated items.

Emistry · 2020-07-30T09:00:12Z

db/re/item_db.conf

@@ -157127,6 +157270,103 @@ item_db: (
 	Name: "Shinee_Opal"
 },
 {
+<<<<<<< HEAD


conflict aren't resolved?

Emistry · 2020-07-30T09:00:32Z

db/re/mob_db.conf

@@ -83764,6 +83764,394 @@ mob_db: (
 //2984,TW_TURTLE_GENERAL
 //2985,E_MYSTERIOUS_BUG
 //2986,J_XMAS_SMOKEY_GIFT
+<<<<<<< HEAD


conflict aren't resolved?

Emistry · 2020-07-30T09:00:53Z

db/re/mob_db.conf

@@ -83772,14 +84160,22 @@ mob_db: (
 //2992,XM_LUDE
 //2993,XM_HYLOZOIST
 //2994,XM_MARIONETTE
+>>>>>>> b9bca8ceaa551fd9f9c26bea4b4f738ad94ca2d6


conflict aren't resolved?

Emistry · 2020-07-30T09:16:25Z

npc/re/instances/horror_toy_factory.txt

+	end;
+
+OnTalk_1:
+	switch (rand(1, 10)) {


change into F_Rand(...) to generate the random message?

Emistry · 2020-07-30T09:18:17Z

npc/re/instances/horror_toy_factory.txt

+OnTimer1000:
+	switch (atoi(strnpcinfo(NPC_NAME_HIDDEN))) {
+	case 1:
+		.@idnum001 = rand(4, 8);


what is this .@idnu001 for? seem like not used anywhere. Or you meant .@item_count instead ?

Emistry · 2020-07-30T09:22:03Z

npc/re/merchants/enchan_htf.txt

+			mes("A stubborn person indeed. Come back next time if you need anything.");
+			close();
+		}
+		.@eq_num = EQI_HEAD_TOP;	// Official script sets value to EQI_HEAD_LOW, but gear is EQI_HEAD_TOP in db.


Suggested change

.@eq_num = EQI_HEAD_TOP; // Official script sets value to EQI_HEAD_LOW, but gear is EQI_HEAD_TOP in db.

.@eq_num = getiteminfo(Lush_Rose, ITEMINFO_LOC);

Emistry · 2020-07-30T09:23:46Z

npc/re/merchants/enchan_htf.txt

+			mes("A stubborn person indeed. Come back next time if you need anything.");
+			close();
+		}
+		.@eq_num = EQI_HAND_R;


Suggested change

.@eq_num = EQI_HAND_R;

.@eq_num = getiteminfo(Grand_Cross_, ITEMINFO_LOC);

Emistry · 2020-07-30T09:25:01Z

npc/re/merchants/enchan_htf.txt

+		.@enc_coin = 1;
+		.@sc_type = 2;
+		break;
+	case 2976:


change all these cases into itemID constant

Master

sinju92 · 2022-03-27T11:33:14Z

Any Update for this?

Updated Horror Toy Factory with new Mob_Skill_DB Scheme.

b2a1d99

Just Use raw data from HerculesWS#1539 and updated setpcblock() script command with work from Kenpachi2k13 to use it now. ToDO: - Fix setunitdata() to work correctly - Add Skill IDs 716 and 719

Zarbony added 2 commits April 1, 2020 04:07

Delete Duplicate Entry of Bloody Coin and Closed Mind Box, Edit Noble…

8a0f6fa

… Cross and Move some IDs for the right item order.

Some Hints for unitdata script commands

38920e0

Kenpachi2k13 requested review from dastgirp, Emistry and MishimaHaruna April 11, 2020 11:23

Kenpachi2k13 added this to the Match Official Content milestone Apr 11, 2020

Emistry requested changes Apr 11, 2020

View reviewed changes

Zarbony and others added 5 commits April 12, 2020 10:49

Apply suggestions from code review

2d9bb4c

Co-Authored-By: Emistry Haoyan <Emistry@users.noreply.github.com>

Update npc/re/merchants/enchan_htf.txt

a870364

Co-Authored-By: Emistry Haoyan <Emistry@users.noreply.github.com>

Update npc/re/merchants/enchan_htf.txt

c616e74

Co-Authored-By: Emistry Haoyan <Emistry@users.noreply.github.com>

Merge pull request #1 from HerculesWS/master

b9bca8c

Master

Merge branch 'master' of https://github.com/Zarbony/Hercules into Hor…

82badaa

…ror_Toy_Factory # Conflicts: # db/re/item_db.conf # db/re/mob_db.conf # db/re/mob_skill_db.conf

Emistry requested changes Jul 30, 2020

View reviewed changes

Zarbony and others added 2 commits March 17, 2021 02:32

Merge pull request #2 from HerculesWS/master

6fd80e0

Master

Merge branch 'master' into Horror_Toy_Factory

bfa8bcf

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated Horror Toy Factory with new Mob_Skill_DB Scheme. #2677

Updated Horror Toy Factory with new Mob_Skill_DB Scheme. #2677

Zarbony commented Mar 31, 2020 •

edited

Loading

dastgirp commented Mar 31, 2020

Emistry left a comment

Emistry Apr 11, 2020

Emistry Apr 11, 2020

Emistry Apr 11, 2020

Emistry Apr 11, 2020

Emistry Apr 11, 2020

Emistry left a comment

Emistry Jul 30, 2020

Emistry Jul 30, 2020

Emistry Jul 30, 2020

Emistry Jul 30, 2020

Emistry Jul 30, 2020

Emistry Jul 30, 2020

Emistry Jul 30, 2020

Emistry Jul 30, 2020

Emistry Jul 30, 2020

Emistry Jul 30, 2020

sinju92 commented Mar 27, 2022

	.@eq_num = EQI_HEAD_TOP; // Official script sets value to EQI_HEAD_LOW, but gear is EQI_HEAD_TOP in db.
	.@eq_num = getiteminfo(Lush_Rose, ITEMINFO_LOC);

	.@eq_num = EQI_HAND_R;
	.@eq_num = getiteminfo(Grand_Cross_, ITEMINFO_LOC);

Updated Horror Toy Factory with new Mob_Skill_DB Scheme. #2677

Are you sure you want to change the base?

Updated Horror Toy Factory with new Mob_Skill_DB Scheme. #2677

Conversation

Zarbony commented Mar 31, 2020 • edited Loading

Pull Request Prelude

Changes Proposed

dastgirp commented Mar 31, 2020

Emistry left a comment

Choose a reason for hiding this comment

ItemDB / MonsterDB

Scripts:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Emistry left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sinju92 commented Mar 27, 2022

Zarbony commented Mar 31, 2020 •

edited

Loading