merge

ocgcore/field.h

@@ -916,7 +916,23 @@ public:
 #define MSG_CUSTOM_MSG			180
 
 #define MSG_SELECT_UNSELECT_CARD	190
+
+//card datas for Duel.ReadCard / Card.SetCardData, arranged by database format
+#define CARDDATA_CODE			1
+#define CARDDATA_ALIAS			2
+#define CARDDATA_SETCODE		3
+#define CARDDATA_TYPE			4
+#define CARDDATA_LEVEL			5
+#define CARDDATA_ATTRIBUTE		6
+#define CARDDATA_RACE			7
+#define CARDDATA_ATTACK			8
+#define CARDDATA_DEFENSE		9
+#define CARDDATA_LSCALE			10
+#define CARDDATA_RSCALE			11
+#define CARDDATA_LINK_MARKER	12
+
 //2pick
 #define MSG_SAVE_PICK_DECK		220
 #define MSG_RESET_TIME			221
+
 #endif /* FIELD_H_ */

ocgcore/interpreter.cpp

@@ -662,6 +662,34 @@ interpreter::interpreter(duel* pd): coroutines(256) {
 	load_script((char*) "./script/constant.lua");
 	load_script((char*) "./script/utility.lua");
 	//load kpro constant
+	//card data constants
+	lua_pushinteger(lua_state, CARDDATA_CODE);
+	lua_setglobal(lua_state, "CARDDATA_CODE");
+	lua_pushinteger(lua_state, CARDDATA_ALIAS);
+	lua_setglobal(lua_state, "CARDDATA_ALIAS");
+	lua_pushinteger(lua_state, CARDDATA_SETCODE);
+	lua_setglobal(lua_state, "CARDDATA_SETCODE");
+	lua_pushinteger(lua_state, CARDDATA_TYPE);
+	lua_setglobal(lua_state, "CARDDATA_TYPE");
+	lua_pushinteger(lua_state, CARDDATA_LEVEL);
+	lua_setglobal(lua_state, "CARDDATA_LEVEL");
+	lua_pushinteger(lua_state, CARDDATA_ATTRIBUTE);
+	lua_setglobal(lua_state, "CARDDATA_ATTRIBUTE");
+	lua_pushinteger(lua_state, CARDDATA_ATTRIBUTE);
+	lua_setglobal(lua_state, "CARDDATA_ATTRIBUTE");
+	lua_pushinteger(lua_state, CARDDATA_RACE);
+	lua_setglobal(lua_state, "CARDDATA_RACE");
+	lua_pushinteger(lua_state, CARDDATA_ATTACK);
+	lua_setglobal(lua_state, "CARDDATA_ATTACK");
+	lua_pushinteger(lua_state, CARDDATA_DEFENSE);
+	lua_setglobal(lua_state, "CARDDATA_DEFENSE");
+	lua_pushinteger(lua_state, CARDDATA_LSCALE);
+	lua_setglobal(lua_state, "CARDDATA_LSCALE");
+	lua_pushinteger(lua_state, CARDDATA_RSCALE);
+	lua_setglobal(lua_state, "CARDDATA_RSCALE");
+	lua_pushinteger(lua_state, CARDDATA_LINK_MARKER);
+	lua_setglobal(lua_state, "CARDDATA_LINK_MARKER");
+	//effects
 	lua_pushinteger(lua_state, EFFECT_CHANGE_LINK_MARKER_KOISHI);
 	lua_setglobal(lua_state, "EFFECT_CHANGE_LINK_MARKER_KOISHI");
 	lua_pushinteger(lua_state, EFFECT_ADD_LINK_MARKER_KOISHI);
@@ -670,6 +698,7 @@ interpreter::interpreter(duel* pd): coroutines(256) {
 	lua_setglobal(lua_state, "EFFECT_REMOVE_LINK_MARKER_KOISHI");
 	lua_pushinteger(lua_state, EFFECT_CANNOT_LOSE_KOISHI);
 	lua_setglobal(lua_state, "EFFECT_CANNOT_LOSE_KOISHI");
+	//music hints
 	lua_pushinteger(lua_state, HINT_MUSIC);
 	lua_setglobal(lua_state, "HINT_MUSIC");
 	lua_pushinteger(lua_state, HINT_SOUND);

ocgcore/libcard.cpp

@@ -44,40 +44,40 @@ int32 scriptlib::card_set_card_data(lua_State *L) {
 	card* pcard = *(card**) lua_touserdata(L, 1);
 	int32 stype = lua_tonumberint(L, 2);
 	switch(stype) {
-	case ASSUME_CODE:
+	case CARDDATA_CODE:
 		pcard->data.code = lua_tonumberint(L, 3);
 		break;
-	case ASSUME_TYPE:
-		pcard->data.type = lua_tonumberint(L, 3);
+	case CARDDATA_ALIAS:
+		pcard->data.alias = lua_tonumberint(L, 3);
 		break;
-	case ASSUME_LEVEL:
-		pcard->data.level = lua_tonumberint(L, 3);
+	case CARDDATA_SETCODE:
+		pcard->data.setcode = lua_tonumberint(L, 3);
 		break;
-	case ASSUME_RANK:
+	case CARDDATA_TYPE:
+		pcard->data.type = lua_tonumberint(L, 3);
+		break;
+	case CARDDATA_LEVEL:
 		pcard->data.level = lua_tonumberint(L, 3);
 		break;
-	case ASSUME_ATTRIBUTE:
+	case CARDDATA_ATTRIBUTE:
 		pcard->data.attribute = lua_tonumberint(L, 3);
 		break;
-	case ASSUME_RACE:
+	case CARDDATA_RACE:
 		pcard->data.race = lua_tonumberint(L, 3);
 		break;
-	case ASSUME_ATTACK:
+	case CARDDATA_ATTACK:
 		pcard->data.attack = lua_tonumberint(L, 3);
 		break;
-	case ASSUME_DEFENSE:
+	case CARDDATA_DEFENSE:
 		pcard->data.defense = lua_tonumberint(L, 3);
-		break;		
-	case 9:
-		pcard->data.alias = lua_tonumberint(L, 3);
 		break;
-	case 10:
+	case CARDDATA_LSCALE:
 		pcard->data.lscale = lua_tonumberint(L, 3);
 		break;
-	case 11:
+	case CARDDATA_RSCALE:
 		pcard->data.rscale = lua_tonumberint(L, 3);
 		break;
-	case 12:
+	case CARDDATA_LINK_MARKER:
 		pcard->data.link_marker = lua_tonumberint(L, 3);
 		break;
 	}

ocgcore/libduel.cpp

@@ -113,40 +113,40 @@ int32 scriptlib::duel_read_card(lua_State *L) {
 	for(uint32 i = 0; i < args; ++i) {
 		int32 flag = lua_tonumberint(L, 2 + i);
 		switch(flag) {
-		case 1:
+		case CARDDATA_CODE:
 			lua_pushinteger(L, dat.code);
 			break;
-		case 2:
+		case CARDDATA_ALIAS:
 			lua_pushinteger(L, dat.alias);
 			break;
-		case 3:
+		case CARDDATA_SETCODE:
 			lua_pushinteger(L, dat.setcode);
 			break;
-		case 4:
+		case CARDDATA_TYPE:
 			lua_pushinteger(L, dat.type);
 			break;
-		case 5:
+		case CARDDATA_LEVEL:
 			lua_pushinteger(L, dat.level);
 			break;
-		case 6:
+		case CARDDATA_ATTRIBUTE:
 			lua_pushinteger(L, dat.attribute);
 			break;
-		case 7:
+		case CARDDATA_RACE:
 			lua_pushinteger(L, dat.race);
 			break;
-		case 8:
+		case CARDDATA_ATTACK:
 			lua_pushinteger(L, dat.attack);
 			break;
-		case 9:
+		case CARDDATA_DEFENSE:
 			lua_pushinteger(L, dat.defense);
 			break;
-		case 10:
+		case CARDDATA_LSCALE:
 			lua_pushinteger(L, dat.lscale);
 			break;
-		case 11:
+		case CARDDATA_RSCALE:
 			lua_pushinteger(L, dat.rscale);
 			break;
-		case 12:
+		case CARDDATA_LINK_MARKER:
 			lua_pushinteger(L, dat.link_marker);
 			break;
 		default:

redtexts.txt

+222